From c9288921a668dae10f10051affc1eb2080c8120d Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Sep 15 2011 20:36:29 +0000
Subject: Updated Git snapshot

Fix version numbering
Put header in -devel subpackage
Fix overlapping directory ownerships
Enable tests

---

diff --git a/.gitignore b/.gitignore
index a5ceeb5..6955580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /gauche-gtk-0.6-01a6056209d21.tar.xz
+/gauche-gtk-0.6-598828842a339.tar.xz
diff --git a/gauche-gtk-0.6-double_defs.patch b/gauche-gtk-0.6-double_defs.patch
new file mode 100644
index 0000000..c9eea63
--- /dev/null
+++ b/gauche-gtk-0.6-double_defs.patch
@@ -0,0 +1,64 @@
+--- gauche-gtk-0.6/src/gtkfilesel.stub.double_defs	2011-09-15 20:33:07.811629611 +0200
++++ gauche-gtk-0.6/src/gtkfilesel.stub	2011-09-15 20:45:19.032655965 +0200
+@@ -51,7 +51,7 @@
+ (define-cproc gtk-file-selection-set-filename (filesel::<gtk-file-selection> filename::<const-gchar*>) (call <void> "gtk_file_selection_set_filename"))
+ 
+ ;; gtk_file_selection_get_filename
+-(define-cproc gtk-file-selection-get-filename (filesel::<gtk-file-selection>) (call <gchar*> "gtk_file_selection_get_filename"))
++;; (define-cproc gtk-file-selection-get-filename (filesel::<gtk-file-selection>) (call <gchar*> "gtk_file_selection_get_filename"))
+ 
+ ;; gtk_file_selection_complete
+ (define-cproc gtk-file-selection-complete (filesel::<gtk-file-selection> pattern::<const-gchar*>) (call <void> "gtk_file_selection_complete"))
+--- gauche-gtk-0.6/src/gtkentry.stub.double_defs	2011-09-15 20:33:07.807629562 +0200
++++ gauche-gtk-0.6/src/gtkentry.stub	2011-09-15 20:45:56.955124090 +0200
+@@ -139,7 +139,7 @@
+ (define-cproc gtk-entry-set-text (entry::<gtk-entry> text::<const-gchar*>) (call <void> "gtk_entry_set_text"))
+ 
+ ;; gtk_entry_get_text
+-(define-cproc gtk-entry-get-text (entry::<gtk-entry>) (call <gchar*> "gtk_entry_get_text"))
++;; (define-cproc gtk-entry-get-text (entry::<gtk-entry>) (call <gchar*> "gtk_entry_get_text"))
+ 
+ ;; gtk_entry_get_layout
+ (define-cproc gtk-entry-get-layout (entry::<gtk-entry>) (call <pango-layout> "gtk_entry_get_layout"))
+--- gauche-gtk-0.6/src/gtklabel.stub.double_defs	2011-09-15 20:33:07.836629920 +0200
++++ gauche-gtk-0.6/src/gtklabel.stub	2011-09-15 20:48:25.255954748 +0200
+@@ -52,7 +52,7 @@
+ (define-cproc gtk-label-set-text (label::<gtk-label> str::<const-gchar*>) (call <void> "gtk_label_set_text"))
+ 
+ ;; gtk_label_get_text
+-(define-cproc gtk-label-get-text (label::<gtk-label>) (call <gchar*> "gtk_label_get_text"))
++;; (define-cproc gtk-label-get-text (label::<gtk-label>) (call <gchar*> "gtk_label_get_text"))
+ 
+ ;; gtk_label_set_attributes
+ (define-cproc gtk-label-set-attributes (label::<gtk-label> attrs::<pango-attr-list>) (call <void> "gtk_label_set_attributes"))
+@@ -64,7 +64,7 @@
+ (define-cproc gtk-label-set-label (label::<gtk-label> str::<const-gchar*>) (call <void> "gtk_label_set_label"))
+ 
+ ;; gtk_label_get_label
+-(define-cproc gtk-label-get-label (label::<gtk-label>) (call <gchar*> "gtk_label_get_label"))
++;; (define-cproc gtk-label-get-label (label::<gtk-label>) (call <gchar*> "gtk_label_get_label"))
+ 
+ ;; gtk_label_set_markup
+ (define-cproc gtk-label-set-markup (label::<gtk-label> str::<const-gchar*>) (call <void> "gtk_label_set_markup"))
+--- gauche-gtk-0.6/src/gtkprogressbar.stub.double_defs	2011-09-15 20:33:07.886630537 +0200
++++ gauche-gtk-0.6/src/gtkprogressbar.stub	2011-09-15 20:49:59.336584981 +0200
+@@ -60,7 +60,7 @@
+ (define-cproc gtk-progress-bar-set-orientation (pbar::<gtk-progress-bar> orientation::<int>) (call <void> "gtk_progress_bar_set_orientation"))
+ 
+ ;; gtk_progress_bar_get_text
+-(define-cproc gtk-progress-bar-get-text (pbar::<gtk-progress-bar>) (call <gchar*> "gtk_progress_bar_get_text"))
++;; (define-cproc gtk-progress-bar-get-text (pbar::<gtk-progress-bar>) (call <gchar*> "gtk_progress_bar_get_text"))
+ 
+ ;; gtk_progress_bar_get_fraction
+ (define-cproc gtk-progress-bar-get-fraction (pbar::<gtk-progress-bar>) (call <double> "gtk_progress_bar_get_fraction"))
+--- gauche-gtk-0.6/src/gtkwidget.stub.double_defs	2011-09-15 20:33:07.963631487 +0200
++++ gauche-gtk-0.6/src/gtkwidget.stub	2011-09-15 21:10:13.140584986 +0200
+@@ -63,7 +63,7 @@
+ (define-enum GTK_HAS_GRAB)
+ (define-enum GTK_RC_STYLE)
+ (define-enum GTK_COMPOSITE_CHILD)
+-(define-enum GTK_DISABLE_DEPRECATED)
++
+ (define-enum GTK_NO_REPARENT)
+ (define-enum GTK_APP_PAINTABLE)
+ (define-enum GTK_RECEIVES_DEFAULT)
diff --git a/gauche-gtk-0.6-missing_requires.patch b/gauche-gtk-0.6-missing_requires.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/gauche-gtk-0.6-missing_requires.patch
diff --git a/gauche-gtk.spec b/gauche-gtk.spec
index eaf3170..6118d57 100644
--- a/gauche-gtk.spec
+++ b/gauche-gtk.spec
@@ -1,8 +1,8 @@
 %global gauche_main_version 0.9
 %global gauche_version %{gauche_main_version}.2
 
-%global snapshot_date 20110228
-%global git_revision  01a6056209d21
+%global snapshot_date 20110725
+%global git_revision  598828842a339
 %global alphatag      %{snapshot_date}git%{git_revision}
 
 Name:           gauche-gtk
@@ -18,8 +18,13 @@ URL:            http://www.shiro.dreamhost.com/scheme/gauche
 # (cd Gauche-gtk2 && git archive --format=tar \
 #  --prefix=%%{name}-%%{version}/ %%{git_revision} \
 # | xz ) > %%{name}-%%{version}-%%{git_revision}.tar.xz
-Source:         %{name}-%{version}-%{git_revision}.tar.xz
-Patch4:         %{name}-0.6-pixbufinc.patch
+Source0:        %{name}-%{version}-%{git_revision}.tar.xz
+Patch0:         %{name}-0.6-pixbufinc.patch
+# stub generator generates definitions even for hard-coded functions
+# on F-16+; comment them out after 'make stubs'
+Patch1:         %{name}-0.6-double_defs.patch
+# gtk.scm requires a module that is no longer shipped
+Patch2:         %{name}-0.6-missing_requires.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gauche-devel = %{gauche_version}
 BuildRequires:  gtk2-devel
@@ -28,6 +33,9 @@ BuildRequires:  libX11-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libICE-devel
 BuildRequires:  autoconf
+# used in test
+BuildRequires:  gauche-gl
+Requires:       gauche-gl
 ExcludeArch:    ppc64
 
 
@@ -47,13 +55,15 @@ Development files for %{name}.
 %prep
 %setup -q
 autoconf
-%patch4 -p1
+%patch0 -p1 -b .pixbufinc
+%patch2 -p1 -b .missing_requires
 
 
 %build
 CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags freetype2` -fPIC" \
 %configure --enable-gtkgl --enable-glgd --enable-glgd-pango
 make stubs
+cat %{PATCH1} | patch -p1
 sed -i 's/.*GTK_DISABLE_DEPRECATED.*//g' src/gtkwidget.stub
 make %{?_smp_mflags} OPTFLAGS=
 
@@ -67,6 +77,14 @@ find $RPM_BUILD_ROOT -name '*.so' -exec chmod 0755 '{}' ';'
 chmod -c 644 */*.c # for debuginfo
 
 
+%check
+# 'make check' does not set return code properly;
+# saving output so it can be parsed later
+make check 2>&1 | tee test.log
+# Gtk test currently fails - better than no testing at all
+[ $(grep "^Testing.*failed\." test.log | grep -v Gtk | wc -l) == 0 ]
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 - Fix version numbering
 - Put header in -devel subpackage
 - Fix overlapping directory ownerships
+- Enable tests
 
 * Sat Aug  1 2009 Gerard Milmeister <gemi@bluewin.ch> - 0.4.1-21
 - fix for gtk 2.17
diff --git a/sources b/sources
index 754fe04..e2741d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6031f37f7feffb6396c85cfe50e21e1b  gauche-gtk-0.6-01a6056209d21.tar.xz
+c1749ee6f416485144bc267d9b056ee0  gauche-gtk-0.6-598828842a339.tar.xz