This commit is contained in:
Matthias Clasen 2011-02-02 00:41:42 -05:00
parent a6e3e5366f
commit 3238d3d0ae
2 changed files with 21 additions and 4 deletions

11
gtk3-build-fix.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up gtk+-2.99.3/gtk/Makefile.in.build-fix gtk+-2.99.3/gtk/Makefile.in
--- gtk+-2.99.3/gtk/Makefile.in.build-fix 2011-02-02 00:37:00.362804590 -0500
+++ gtk+-2.99.3/gtk/Makefile.in 2011-02-02 00:37:08.668700753 -0500
@@ -2903,7 +2903,6 @@ stamp-icons: $(STOCK_ICONS)
&& touch stamp-icons
gtkbuiltincache.h: @REBUILD@ stamp-icons
- $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
$(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index \
--source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
mv gtkbuiltincache.h.tmp gtkbuiltincache.h

View File

@ -18,6 +18,7 @@ URL: http://www.gtk.org
#VCS: git:git://git.gnome.org/gtk+
Source: http://download.gnome.org/sources/gtk+/2.99/gtk+-%{version}.tar.bz2
Source1: im-cedilla.conf
Patch0: gtk3-build-fix.patch
BuildRequires: gnome-common autoconf automake intltool gettext
BuildRequires: atk-devel >= %{atk_version}
@ -110,16 +111,21 @@ widget toolkit.
%prep
%setup -q -n gtk+-%{version}
%patch0 -p1 -b .build-fix
%build
# For the gobject-introspection patch
autoreconf -f
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
%configure $CONFIGFLAGS \
--with-xinput \
--enable-gtk2-dependency \
--enable-xkb \
--enable-xinerama \
--enable-xinput \
--enable-xrandr \
--enable-xfixes \
--enable-xcomposite \
--enable-xdamage \
--enable-x11-backend \
)
# fight unused direct deps