[gnome-terminal] fix build

Matthias Clasen mclasen at fedoraproject.org
Thu Oct 7 17:07:31 UTC 2010


commit 585b48a4afcb2056c39176f8796c97ecf053f4d9
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Oct 7 13:06:19 2010 -0400

    fix build

 gnome-terminal.spec |    2 ++
 gtk3-build.patch    |   12 ++++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 6a50481..46fc9ec 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -20,6 +20,7 @@ Source1: profile-new-dialog.ui
 
 # Fix gnome.org Bug 338913 – Terminal resized when switching tabs
 Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
+Patch3: gtk3-build.patch
 
 # gconftool-2
 Requires(pre): GConf2 >= %{gconf_version}
@@ -47,6 +48,7 @@ clickable URLs.
 %prep
 %setup -q
 %patch2 -p1 -b .338913-revert-336325
+%patch3 -p1 -b .gtk3-build
 
 autoreconf -i -f
 
diff --git a/gtk3-build.patch b/gtk3-build.patch
new file mode 100644
index 0000000..50962aa
--- /dev/null
+++ b/gtk3-build.patch
@@ -0,0 +1,12 @@
+diff -up gnome-terminal-2.33.0/configure.ac.gtk3-build gnome-terminal-2.33.0/configure.ac
+--- gnome-terminal-2.33.0/configure.ac.gtk3-build	2010-10-07 13:02:12.307779002 -0400
++++ gnome-terminal-2.33.0/configure.ac	2010-10-07 13:05:13.335779007 -0400
+@@ -129,7 +129,7 @@ AC_SUBST([GLIB_GENMARSHAL])
+ GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
+ AC_SUBST([GLIB_MKENUMS])
+ 
+-AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false])
++AC_PATH_PROGS([GTK_BUILDER_CONVERT],[gtk-builder-convert] [gtk-builder-convert-3.0],[false])
+ if test "$GTK_BUILDER_CONVERT" = "false"; then
+   AC_MSG_ERROR([gtk-builder-convert not found])
+ fi


More information about the scm-commits mailing list