fix build

This commit is contained in:
Matthias Clasen 2010-10-07 13:06:19 -04:00
parent a575af084d
commit 585b48a4af
2 changed files with 14 additions and 0 deletions

View File

@ -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

12
gtk3-build.patch Normal file
View File

@ -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