[meego-commits] 5351: Changes to home:xiaoqiang/gtk3
Zhang Qiang
qiang.z.zhang at intel.com
Tue Jul 6 02:47:21 UTC 2010
Hi,
I have made the following changes to gtk3 in project home:xiaoqiang. Please review and accept ASAP.
Thank You,
Zhang Qiang
[This message was auto-generated]
---
Request #5351:
submit: home:xiaoqiang:gnome/gtk3(r5) -> home:xiaoqiang/gtk3
Message:
a
State: new 2010-07-05T14:43:11 xiaoqiang
Comment: None
changes files:
--------------
old:
----
gtk+-2.20.0.tar.bz2
icon-padding.patch
tooltip-positioning.patch
update-gdk-pixbuf-loaders
update-gtk-immodules
new:
----
gtk+-2.90.3.tar.gz
gtk3.spec
update-gdk-pixbuf-loaders-3
update-gtk-immodules-3
spec files:
-----------
--- gtk2.spec
+++ gtk2.spec
@@ -12,15 +12,15 @@
%define xrandr_version 1.2.99
%define base_version 2.19.7
-%define bin_version 2.10.0
+%define bin_version 3.0.0
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2
-Version: 2.20.0
+Version: 2.90.3
Release: 1
License: LGPLv2+
Group: System/Libraries
-Source: http://download.gnome.org/sources/gtk+/2.19/gtk+-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gtk+/2.90/gtk+-%{version}.tar.gz
Source1: update-gdk-pixbuf-loaders
Source2: update-gtk-immodules
Source3: im-cedilla.conf
@@ -29,12 +29,8 @@
# Biarch changes
Patch0: gtk-lib64.patch
Patch1: system-python.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=583273
-Patch2: icon-padding.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=599617
Patch3: fresh-tooltips.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=599618
-Patch4: tooltip-positioning.patch
# Moblin patches
Patch101: gtk+-2.17.9-desktop.patch
Patch102: gtk+-2.19.4-default-theme.patch
@@ -82,7 +78,7 @@
URL: http://www.gtk.org
-# We need to prereq these so we can run gtk-query-immodules-2.0
+# We need to prereq these so we can run gtk-query-immodules-3.0
Requires(post): glib2 >= %{glib2_version}
Requires(post): atk >= %{atk_version}
Requires(post): pango >= %{pango_version}
@@ -155,11 +151,9 @@
%prep
%setup -q -n gtk+-%{version}
-%patch0 -p1 -b .lib64
+#%patch0 -p1 -b .lib64
%patch1 -p1 -b .system-python
-%patch2 -p1 -b .icon-padding
%patch3 -p1 -b .fresh-tooltips
-%patch4 -p1 -b .tooltip-positioning
%patch101 -p1 -b .desktop
%patch102 -p1 -b .default-icon-theme
%patch103 -p1 -b .ellipsizing
@@ -186,7 +180,7 @@
{ if (seen == 2) { print "For older news, see http://git.gnome.org/cgit/gtk+/plain/NEWS"; exit } }' NEWS > tmp; mv tmp NEWS
%install
-# Deriving /etc/gtk-2.0/$host location
+# Deriving /etc/gtk-3.0/$host location
# NOTE: Duplicated below
#
# autoconf changes linux to linux-gnu
@@ -215,10 +209,10 @@
RUN_QUERY_IMMODULES_TEST=false \
RUN_QUERY_LOADER_TEST=false
-%find_lang gtk20
-%find_lang gtk20-properties
+%find_lang gtk30
+%find_lang gtk30-properties
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0
#
# Make cleaned-up versions of tutorials, examples, and faq for installation
#
@@ -240,12 +234,12 @@
# (we might have x86_64 and i686 packages on the same system, for example.)
case "$host" in
alpha*|ia64*|powerpc64*|s390x*|x86_64*)
- mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
- mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-64
+ mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0-64
+ mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0 $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0-64
;;
*)
- mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-32
- mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-32
+ mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0-32
+ mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0 $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0-32
;;
esac
@@ -259,24 +253,24 @@
# Remove unpackaged files
rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/*/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/*/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/*/*.la
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host/gtk.immodules
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host/gdk-pixbuf.loaders
-
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/filesystems
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/$host
+touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/$host/gtk.immodules
+touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/$host/gdk-pixbuf.loaders
+
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/immodules
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/filesystems
#
# We need the substitution of $host so we use an external
# file list
#
-echo %dir %{_sysconfdir}/gtk-2.0/$host >> gtk20.lang
-echo %ghost %{_sysconfdir}/gtk-2.0/$host/gtk.immodules >> gtk20.lang
-echo %ghost %{_sysconfdir}/gtk-2.0/$host/gdk-pixbuf.loaders >> gtk20.lang
+echo %dir %{_sysconfdir}/gtk-3.0/$host >> gtk30.lang
+echo %ghost %{_sysconfdir}/gtk-3.0/$host/gtk.immodules >> gtk30.lang
+echo %ghost %{_sysconfdir}/gtk-3.0/$host/gdk-pixbuf.loaders >> gtk30.lang
%clean
rm -rf $RPM_BUILD_ROOT
@@ -305,80 +299,82 @@
%postun immodule-xim
/usr/bin/update-gtk-immodules %{_host}
-%files -f gtk20.lang
+%files -f gtk30.lang
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README
%{_bindir}/gdk-pixbuf-query-loaders*
-%{_bindir}/gtk-query-immodules-2.0*
+%{_bindir}/gtk-query-immodules-3.0*
%{_bindir}/update-gdk-pixbuf-loaders
%{_bindir}/update-gtk-immodules
-%{_bindir}/gtk-update-icon-cache
-%{_libdir}/libgtk-x11-2.0.so.*
-%{_libdir}/libgdk-x11-2.0.so.*
-%{_libdir}/libgdk_pixbuf-2.0.so.*
-%{_libdir}/libgdk_pixbuf_xlib-2.0.so.*
-%{_libdir}/libgailutil.so.*
-%dir %{_libdir}/gtk-2.0
-%dir %{_libdir}/gtk-2.0/%{bin_version}
-%{_libdir}/gtk-2.0/%{bin_version}/engines
-%{_libdir}/gtk-2.0/%{bin_version}/filesystems
-%dir %{_libdir}/gtk-2.0/%{bin_version}/immodules
-%{_libdir}/gtk-2.0/%{bin_version}/loaders
-%{_libdir}/gtk-2.0/%{bin_version}/printbackends
-%{_libdir}/gtk-2.0/modules
-%{_libdir}/gtk-2.0/immodules
+%{_bindir}/gtk-update-icon-cache-3.0
+%{_libdir}/libgtk-x11-3.0.so.*
+%{_libdir}/libgdk-x11-3.0.so.*
+%{_libdir}/libgdk_pixbuf-3.0.so.*
+%{_libdir}/libgdk_pixbuf_xlib-3.0.so.*
+%{_libdir}/libgailutil-3.0.so.*
+%dir %{_libdir}/gtk-3.0
+%dir %{_libdir}/gtk-3.0/%{bin_version}
+%{_libdir}/gtk-3.0/%{bin_version}/engines
+%{_libdir}/gtk-3.0/%{bin_version}/filesystems
+%dir %{_libdir}/gtk-3.0/%{bin_version}/immodules
+%{_libdir}/gtk-3.0/%{bin_version}/loaders
+%{_libdir}/gtk-3.0/%{bin_version}/printbackends
+%{_libdir}/gtk-3.0/modules
+%{_libdir}/gtk-3.0/immodules
%{_datadir}/themes/Default
# introspection data
%dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/Gdk-2.0.typelib
-%{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib
-%{_libdir}/girepository-1.0/Gtk-2.0.typelib
+%{_libdir}/girepository-1.0/Gdk-3.0.typelib
+%{_libdir}/girepository-1.0/GdkPixbuf-3.0.typelib
+%{_libdir}/girepository-1.0/Gtk-3.0.typelib
+%{_libdir}/girepository-1.0/GdkX11-3.0.typelib
%exclude %{_datadir}/themes/Emacs
%exclude %{_datadir}/themes/Raleigh
-%dir %{_sysconfdir}/gtk-2.0
+%dir %{_sysconfdir}/gtk-3.0
%files immodules
%defattr(-, root, root)
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-am-et.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cedilla.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cyrillic-translit.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-inuktitut.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ipa.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-multipress.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-thai.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-er.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-ti-et.so
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-viqr.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-am-et.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cedilla.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cyrillic-translit.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-inuktitut.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-ipa.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-multipress.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-thai.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-er.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-et.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-viqr.so
%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
-%config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf
+%config(noreplace) %{_sysconfdir}/gtk-3.0/im-multipress.conf
%files immodule-xim
%defattr(-, root, root)
-%{_libdir}/gtk-2.0/%{bin_version}/immodules/im-xim.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-xim.so
-%files devel -f gtk20-properties.lang
+
+%files devel -f gtk30-properties.lang
%defattr(-, root, root)
%{_libdir}/lib*.so
-%{_libdir}/gtk-2.0/include
+%{_libdir}/gtk-3.0/include
%{_includedir}/*
%{_datadir}/aclocal/*
-%{_bindir}/gdk-pixbuf-csource
-%{_bindir}/gtk-builder-convert
+%{_bindir}/gdk-pixbuf-csource-3.0
+%{_bindir}/gtk-builder-convert-3.0
%{_libdir}/pkgconfig/*
-%{_bindir}/gtk-demo
-%{_datadir}/gtk-2.0
+%{_bindir}/gtk3-demo
+%{_datadir}/gtk-3.0
# introspection data
%dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/Gdk-2.0.gir
-%{_datadir}/gir-1.0/GdkPixbuf-2.0.gir
-%{_datadir}/gir-1.0/Gtk-2.0.gir
+%{_datadir}/gir-1.0/Gdk-3.0.gir
+%{_datadir}/gir-1.0/GdkPixbuf-3.0.gir
+%{_datadir}/gir-1.0/Gtk-3.0.gir
+%{_datadir}/gir-1.0/GdkX11-3.0.gir
%files devel-docs
%defattr(-, root, root)
%{_datadir}/gtk-doc/html/*
-# oops, man pages went missing
-# %{_mandir}/man1/*
+%{_mandir}/man1/*
%doc tmpdocs/tutorial
%doc tmpdocs/faq
%doc tmpdocs/examples
++++++ new spec file:
--- gtk3.spec
+++ gtk3.spec
+# Note that this is NOT a relocatable package
+
+%define glib2_base_version 2.23.5
+%define glib2_version %{glib2_base_version}-1
+%define pango_base_version 1.20.0
+%define pango_version %{pango_base_version}-1
+%define atk_base_version 1.29.4
+%define atk_version %{atk_base_version}-1
+%define cairo_base_version 1.6.0
+%define cairo_version %{cairo_base_version}-1
+%define libpng_version 1.2.2
+%define xrandr_version 1.2.99
+
+%define base_version 2.19.7
+%define bin_version 3.0.0
+
+Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
+Name: gtk3
+Version: 2.90.3
+Release: 1
+License: LGPLv2+
+Group: System/Libraries
+Source: http://download.gnome.org/sources/gtk+/2.90/gtk+-%{version}.tar.gz
+Source1: update-gdk-pixbuf-loaders-3
+Source2: update-gtk-immodules-3
+Source3: im-cedilla.conf
+
+# Patches from Fedora
+# Biarch changes
+Patch0: gtk-lib64.patch
+Patch1: system-python.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=599617
+Patch3: fresh-tooltips.patch
+# Moblin patches
+Patch101: gtk+-2.17.9-desktop.patch
+Patch102: gtk+-2.19.4-default-theme.patch
+Patch103: gtk+-2.16.1-file-chooser-filter-combo-ellipsizing.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=613597
+Patch104: gtk+-2.19.7-fix-introspection-parallel-build.patch
+
+BuildRequires: pango-devel >= %{pango_version}
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: libtiff-devel
+BuildRequires: libjpeg-devel
+BuildRequires: jasper-devel
+BuildRequires: libpng-devel >= %{libpng_version}
+BuildRequires: automake autoconf libtool pkgconfig
+BuildRequires: gettext
+BuildRequires: gtk-doc
+BuildRequires: cups-devel
+BuildRequires: cairo-devel >= %{cairo_version}
+BuildRequires: gir-repository-devel
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(ice)
+BuildRequires: pkgconfig(atk)
+BuildRequires: pkgconfig(xi)
+BuildRequires: pkgconfig(gtk-doc)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xrender)
+BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xinerama)
+BuildRequires: pkgconfig(xcomposite)
+BuildRequires: pkgconfig(xdamage)
+BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(gobject-introspection-1.0)
+
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+# Conflicts with packages containing theme engines
+# built against the 2.4.0 ABI
+Conflicts: gtk3-engines < 2.7.4-7
+Conflicts: libgnomeui < 2.15.1cvs20060505-2
+
+Provides: gail = %{version}
+Obsoletes: gail < 2.13.0-1
+
+URL: http://www.gtk.org
+
+# We need to prereq these so we can run gtk-query-immodules-3.0
+Requires(post): glib2 >= %{glib2_version}
+Requires(post): atk >= %{atk_version}
+Requires(post): pango >= %{pango_version}
+# and these for gdk-pixbuf-query-loaders
+Requires(post): libtiff >= 3.6.1
+Requires: libXrandr >= %{xrandr_version}
+
+%description
+GTK+ is a multi-platform toolkit for creating graphical user
+interfaces. Offering a complete set of widgets, GTK+ is suitable for
+projects ranging from small one-off tools to complete application
+suites.
+
+%package immodules
+Summary: Input methods for GTK+
+Group: System/Libraries
+Requires: gtk3 = %{version}
+# for /etc/X11/xinit/xinput.d
+Requires: imsettings
+
+%description immodules
+The gtk3-immodules package contains standalone input methods that are shipped
+as part of GTK+.
+
+%package immodule-xim
+Summary: XIM support for GTK+
+Group: System/Libraries
+Requires: gtk3 = %{version}-%{release}
+
+%description immodule-xim
+The gtk3-immodule-xim package contains XIM support for GTK+.
+
+%package devel
+Summary: Development files for GTK+
+Group: Development/Libraries
+Requires: gtk3 = %{version}
+Requires: pango-devel >= %{pango_version}
+Requires: atk-devel >= %{atk_version}
+Requires: glib2-devel >= %{glib2_version}
+Requires: cairo-devel >= %{cairo_version}
+Requires: libX11-devel, libXcursor-devel
+Requires: libXext-devel, libXi-devel, libXrandr-devel
+Requires: libXfixes-devel, libXcomposite-devel
+Requires: libpng-devel
+Requires: pkgconfig
+Requires: python
+# for /usr/share/aclocal
+Requires: automake
+
+Provides: gail-devel = %{version}
+Obsoletes: gail-devel < 2.13.0-1
+
+%description devel
+This package contains the libraries amd header files that are needed
+for writing applications with the GTK+ widget toolkit. If you plan
+to develop applications with GTK+, consider installing the gtk3-devel-docs
+package.
+
+%package devel-docs
+Summary: Developer documentation for GTK+
+Group: Development/Libraries
+Requires: gtk3 = %{version}-%{release}
+# for /usr/share/gtk-doc/html
+Requires: gtk-doc
+#BuildArch: noarch
+
+%description devel-docs
+This package contains developer documentation for the GTK+ widget toolkit.
+
+%prep
+%setup -q -n gtk+-%{version}
+
+#%patch0 -p1 -b .lib64
+%patch1 -p1 -b .system-python
+%patch3 -p1 -b .fresh-tooltips
+%patch101 -p1 -b .desktop
+%patch102 -p1 -b .default-icon-theme
+%patch103 -p1 -b .ellipsizing
+%patch104 -p1 -b .fix-introspection-parallel-build
+
+%build
+%configure --with-xinput=xfree \
+ --disable-gtk-doc \
+ --disable-rebuilds \
+ --enable-introspection \
+ --with-libjasper \
+ --with-included-loaders=png
+
+# fight unused direct deps
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+make %{?_smp_mflags}
+# turn off for now, since floatingtest needs a display
+#make check
+
+# truncate NEWS
+awk '/^Overview of Changes/ { seen+=1 }
+{ if (seen < 2) print }
+{ if (seen == 2) { print "For older news, see http://git.gnome.org/cgit/gtk+/plain/NEWS"; exit } }' NEWS > tmp; mv tmp NEWS
+
+%install
+# Deriving /etc/gtk-3.0/$host location
+# NOTE: Duplicated below
+#
+# autoconf changes linux to linux-gnu
+case "%{_host}" in
+ *linux) host="%{_host}-gnu"
+ ;;
+ *) host="%{_host}"
+ ;;
+esac
+
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+# autoconf uses ibm-linux not redhat-linux (s390x)
+host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
+
+# Make sure that the host value that is passed to the compile
+# is the same as the host that we're using in the spec file
+#
+compile_host=`grep 'host_triplet =' gtk/Makefile | sed "s/.* = //"`
+
+if test "x$compile_host" != "x$host" ; then
+ echo 1>&2 "Host mismatch: compile='$compile_host', spec file='$host'" && exit 1
+fi
+
+make install DESTDIR=$RPM_BUILD_ROOT \
+ RUN_QUERY_IMMODULES_TEST=false \
+ RUN_QUERY_LOADER_TEST=false
+
+%find_lang gtk30
+%find_lang gtk30-properties
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0
+#
+# Make cleaned-up versions of tutorials, examples, and faq for installation
+#
+mkdir -p tmpdocs
+cp -aR docs/tutorial/html tmpdocs/tutorial
+cp -aR docs/faq/html tmpdocs/faq
+
+for dir in examples/* ; do
+ if [ -d $dir ] ; then
+ mkdir -p tmpdocs/$dir
+ for file in $dir/* ; do
+ install -m 0644 $file tmpdocs/$dir
+ done
+ fi
+done
+
+# We need to have separate 32-bit and 64-bit binaries
+# for places where we have two copies of the GTK+ package installed.
+# (we might have x86_64 and i686 packages on the same system, for example.)
+case "$host" in
+ alpha*|ia64*|powerpc64*|s390x*|x86_64*)
+ mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0-64
+ mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0 $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0-64
+ ;;
+ *)
+ mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0-32
+ mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0 $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0-32
+ ;;
+esac
+
+# Install wrappers for the binaries
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders-3
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules-3
+
+# Input method frameworks want this
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
+cp %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
+
+# Remove unpackaged files
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/*/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/*/*.la
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/$host
+touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/$host/gtk.immodules
+touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/$host/gdk-pixbuf.loaders
+
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/immodules
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/filesystems
+
+#
+# We need the substitution of $host so we use an external
+# file list
+#
+echo %dir %{_sysconfdir}/gtk-3.0/$host >> gtk30.lang
+echo %ghost %{_sysconfdir}/gtk-3.0/$host/gtk.immodules >> gtk30.lang
+echo %ghost %{_sysconfdir}/gtk-3.0/$host/gdk-pixbuf.loaders >> gtk30.lang
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+/sbin/ldconfig
+/usr/bin/update-gdk-pixbuf-loaders-3 %{_host}
+/usr/bin/update-gtk-immodules-3 %{_host}
+
+%post immodules
+/usr/bin/update-gtk-immodules-3 %{_host}
+
+%post immodule-xim
+/usr/bin/update-gtk-immodules-3 %{_host}
+
+%postun
+/sbin/ldconfig
+if [ $1 -gt 0 ]; then
+ /usr/bin/update-gdk-pixbuf-loaders-3 %{_host}
+ /usr/bin/update-gtk-immodules-3 %{_host}
+fi
+
+%postun immodules
+/usr/bin/update-gtk-immodules-3 %{_host}
+
+%postun immodule-xim
+/usr/bin/update-gtk-immodules-3 %{_host}
+
+%files -f gtk30.lang
+%defattr(-, root, root)
+
+%doc AUTHORS COPYING NEWS README
+%{_bindir}/gdk-pixbuf-query-loaders*
+%{_bindir}/gtk-query-immodules-3.0*
+%{_bindir}/update-gdk-pixbuf-loaders-3
+%{_bindir}/update-gtk-immodules-3
+%{_bindir}/gtk-update-icon-cache-3.0
+%{_libdir}/libgtk-x11-3.0.so.*
+%{_libdir}/libgdk-x11-3.0.so.*
+%{_libdir}/libgdk_pixbuf-3.0.so.*
+%{_libdir}/libgdk_pixbuf_xlib-3.0.so.*
+%{_libdir}/libgailutil-3.0.so.*
+%dir %{_libdir}/gtk-3.0
+%dir %{_libdir}/gtk-3.0/%{bin_version}
+%{_libdir}/gtk-3.0/%{bin_version}/engines
+%{_libdir}/gtk-3.0/%{bin_version}/filesystems
+%dir %{_libdir}/gtk-3.0/%{bin_version}/immodules
+%{_libdir}/gtk-3.0/%{bin_version}/loaders
+%{_libdir}/gtk-3.0/%{bin_version}/printbackends
+%{_libdir}/gtk-3.0/modules
+%{_libdir}/gtk-3.0/immodules
+%{_datadir}/themes/Default
+# introspection data
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/Gdk-3.0.typelib
+%{_libdir}/girepository-1.0/GdkPixbuf-3.0.typelib
+%{_libdir}/girepository-1.0/Gtk-3.0.typelib
+%{_libdir}/girepository-1.0/GdkX11-3.0.typelib
+%exclude %{_datadir}/themes/Emacs
+%exclude %{_datadir}/themes/Raleigh
+%dir %{_sysconfdir}/gtk-3.0
+
+%files immodules
+%defattr(-, root, root)
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-am-et.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cedilla.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-cyrillic-translit.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-inuktitut.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-ipa.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-multipress.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-thai.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-er.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-ti-et.so
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-viqr.so
+%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
+%config(noreplace) %{_sysconfdir}/gtk-3.0/im-multipress.conf
+
+%files immodule-xim
+%defattr(-, root, root)
+%{_libdir}/gtk-3.0/%{bin_version}/immodules/im-xim.so
+
+
+%files devel -f gtk30-properties.lang
+%defattr(-, root, root)
+%{_libdir}/lib*.so
+%{_libdir}/gtk-3.0/include
+%{_includedir}/*
+%{_datadir}/aclocal/*
+%{_bindir}/gdk-pixbuf-csource-3.0
+%{_bindir}/gtk-builder-convert-3.0
+%{_libdir}/pkgconfig/*
+%{_bindir}/gtk3-demo
+%{_datadir}/gtk-3.0
+# introspection data
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/Gdk-3.0.gir
+%{_datadir}/gir-1.0/GdkPixbuf-3.0.gir
+%{_datadir}/gir-1.0/Gtk-3.0.gir
+%{_datadir}/gir-1.0/GdkX11-3.0.gir
+
+%files devel-docs
+%defattr(-, root, root)
+%{_datadir}/gtk-doc/html/*
+%{_mandir}/man1/*
+%doc tmpdocs/tutorial
+%doc tmpdocs/faq
+%doc tmpdocs/examples
other changes:
--------------
++++++ fresh-tooltips.patch
--- fresh-tooltips.patch
+++ fresh-tooltips.patch
@@ -1,7 +1,7 @@
-diff -up gtk+-2.19.1/gtk/gtktooltip.c.fresh-tooltips gtk+-2.19.1/gtk/gtktooltip.c
---- gtk+-2.19.1/gtk/gtktooltip.c.fresh-tooltips 2009-11-26 23:54:55.000000000 -0500
-+++ gtk+-2.19.1/gtk/gtktooltip.c 2009-11-30 20:06:37.539580221 -0500
-@@ -29,6 +29,10 @@
+diff -uNr gtk+-2.90.3/gtk/gtktooltip.c gtk+-2.90.3.new/gtk/gtktooltip.c
+--- gtk+-2.90.3/gtk/gtktooltip.c 2010-06-16 23:27:04.000000000 +0800
++++ gtk+-2.90.3.new/gtk/gtktooltip.c 2010-06-21 17:44:18.481664403 +0800
+@@ -33,6 +33,10 @@
#include "gtkhbox.h"
#include "gtkalignment.h"
@@ -11,8 +11,8 @@
+
#include "gtkalias.h"
- #include <string.h>
-@@ -95,6 +99,7 @@ static void gtk_tooltip_display_cl
+ #undef DEBUG_TOOLTIP
+@@ -97,6 +101,7 @@
GtkTooltip *tooltip);
static void gtk_tooltip_set_last_window (GtkTooltip *tooltip,
GdkWindow *window);
@@ -20,7 +20,7 @@
G_DEFINE_TYPE (GtkTooltip, gtk_tooltip, G_TYPE_OBJECT);
-@@ -110,8 +115,43 @@ gtk_tooltip_class_init (GtkTooltipClass
+@@ -112,8 +117,43 @@
}
static void
@@ -64,7 +64,7 @@
tooltip->timeout_id = 0;
tooltip->browse_mode_timeout_id = 0;
-@@ -127,8 +167,12 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -129,8 +169,12 @@
tooltip->last_window = NULL;
tooltip->window = g_object_ref (gtk_window_new (GTK_WINDOW_POPUP));
@@ -77,7 +77,7 @@
gtk_widget_set_app_paintable (tooltip->window, TRUE);
gtk_window_set_resizable (GTK_WINDOW (tooltip->window), FALSE);
gtk_widget_set_name (tooltip->window, "gtk-tooltip");
-@@ -145,7 +189,7 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -147,7 +191,7 @@
gtk_widget_show (tooltip->alignment);
g_signal_connect_swapped (tooltip->window, "style-set",
@@ -86,7 +86,7 @@
g_signal_connect_swapped (tooltip->window, "expose-event",
G_CALLBACK (gtk_tooltip_paint_window), tooltip);
-@@ -162,6 +206,13 @@ gtk_tooltip_init (GtkTooltip *tooltip)
+@@ -164,6 +208,13 @@
gtk_box_pack_start (GTK_BOX (tooltip->box), tooltip->label,
FALSE, FALSE, 0);
@@ -100,7 +100,7 @@
tooltip->custom_widget = NULL;
}
-@@ -508,19 +559,208 @@ gtk_tooltip_window_style_set (GtkTooltip
+@@ -510,19 +561,208 @@
gtk_widget_queue_draw (tooltip->window);
}
@@ -319,19 +319,10 @@
return FALSE;
}
-@@ -660,7 +900,7 @@ find_widget_under_pointer (GdkWindow *wi
-
- #ifdef DEBUG_TOOLTIP
- g_print ("event window %p (belonging to %p (%s)) (%d, %d)\n",
-- window, event_widget, gtk_widget_get_name (event_widget),
-+ gindow, event_widget, gtk_widget_get_name (event_widget),
- *x, *y);
- #endif
-
-diff -up gtk+-2.19.1/gtk/gtkwidget.c.fresh-tooltips gtk+-2.19.1/gtk/gtkwidget.c
---- gtk+-2.19.1/gtk/gtkwidget.c.fresh-tooltips 2009-11-27 20:59:42.000000000 -0500
-+++ gtk+-2.19.1/gtk/gtkwidget.c 2009-11-30 20:00:23.425825787 -0500
-@@ -2557,6 +2557,14 @@ gtk_widget_class_init (GtkWidgetClass *k
+diff -uNr gtk+-2.90.3/gtk/gtkwidget.c gtk+-2.90.3.new/gtk/gtkwidget.c
+--- gtk+-2.90.3/gtk/gtkwidget.c 2010-06-16 23:27:05.000000000 +0800
++++ gtk+-2.90.3.new/gtk/gtkwidget.c 2010-06-21 17:38:48.435442345 +0800
+@@ -2605,6 +2605,14 @@
P_("The length of vertical scroll arrows"),
1, G_MAXINT, 16,
GTK_PARAM_READABLE));
@@ -346,4 +337,3 @@
}
static void
-
++++++ gtk+-2.16.1-file-chooser-filter-combo-ellipsizing.patch
--- gtk+-2.16.1-file-chooser-filter-combo-ellipsizing.patch
+++ gtk+-2.16.1-file-chooser-filter-combo-ellipsizing.patch
@@ -1,26 +1,16 @@
-From b7c3150d8c0aeaa51f1cf50806c1b0a28eb59a34 Mon Sep 17 00:00:00 2001
-From: Thomas Wood <thomas.wood at intel.com>
-Date: Wed, 14 Oct 2009 17:24:01 +0100
-Subject: [PATCH] Turn on ellipsizing in the filter combobox if a filter name is too big
-
----
- gtk/gtkfilechooserdefault.c | 15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
-index 4553f8b..178ac74 100644
---- a/gtk/gtkfilechooserdefault.c
-+++ b/gtk/gtkfilechooserdefault.c
-@@ -145,6 +145,8 @@ typedef struct _GtkFileChooserDefaultClass GtkFileChooserDefaultClass;
+diff -uNr gtk+-2.90.3/gtk/gtkfilechooserdefault.c gtk+-2.90.3.new/gtk/gtkfilechooserdefault.c
+--- gtk+-2.90.3/gtk/gtkfilechooserdefault.c 2010-06-21 18:07:15.710629911 +0800
++++ gtk+-2.90.3.new/gtk/gtkfilechooserdefault.c 2010-06-21 18:11:20.965505023 +0800
+@@ -145,6 +145,8 @@
#define MAX_LOADING_TIME 500
+#define MAX_FILTER_NAME_LENGTH 60
+
+ #define DEFAULT_NEW_FOLDER_NAME _("Type name of new folder")
+
struct _GtkFileChooserDefaultClass
- {
- GtkVBoxClass parent_class;
-@@ -7736,6 +7738,19 @@ gtk_file_chooser_default_add_filter (GtkFileChooser *chooser,
+@@ -7671,6 +7673,19 @@
if (!name)
name = "Untitled filter"; /* Place-holder, doesn't need to be marked for translation */
@@ -40,6 +30,3 @@
gtk_combo_box_append_text (GTK_COMBO_BOX (impl->filter_combo), name);
if (!g_slist_find (impl->filters, impl->current_filter))
---
-1.6.4.3
-
++++++ gtk+-2.17.9-desktop.patch
--- gtk+-2.17.9-desktop.patch
+++ gtk+-2.17.9-desktop.patch
@@ -1,7 +1,6 @@
-Index: gtk+-2.17.9/gtk/gtkfilechooserbutton.c
-===================================================================
---- gtk+-2.17.9.orig/gtk/gtkfilechooserbutton.c
-+++ gtk+-2.17.9/gtk/gtkfilechooserbutton.c
+diff -uNr gtk+-2.90.3/gtk/gtkfilechooserbutton.c gtk+-2.90.3.new/gtk/gtkfilechooserbutton.c
+--- gtk+-2.90.3/gtk/gtkfilechooserbutton.c 2010-06-16 23:27:01.000000000 +0800
++++ gtk+-2.90.3.new/gtk/gtkfilechooserbutton.c 2010-06-21 18:06:04.192504980 +0800
@@ -62,7 +62,7 @@
#define GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonPrivate))
@@ -11,11 +10,10 @@
#define FALLBACK_DISPLAY_NAME N_("(None)")
#define FALLBACK_ICON_NAME "stock_unknown"
#define FALLBACK_ICON_SIZE 16
-Index: gtk+-2.17.9/gtk/gtkfilechooserdefault.c
-===================================================================
---- gtk+-2.17.9.orig/gtk/gtkfilechooserdefault.c
-+++ gtk+-2.17.9/gtk/gtkfilechooserdefault.c
-@@ -1930,7 +1930,7 @@ shortcuts_append_desktop (GtkFileChooser
+diff -uNr gtk+-2.90.3/gtk/gtkfilechooserdefault.c gtk+-2.90.3.new/gtk/gtkfilechooserdefault.c
+--- gtk+-2.90.3/gtk/gtkfilechooserdefault.c 2010-06-16 23:27:01.000000000 +0800
++++ gtk+-2.90.3.new/gtk/gtkfilechooserdefault.c 2010-06-21 18:06:04.195504573 +0800
+@@ -1836,7 +1836,7 @@
}
file = g_file_new_for_path (name);
++++++ gtk+-2.19.4-default-theme.patch
--- gtk+-2.19.4-default-theme.patch
+++ gtk+-2.19.4-default-theme.patch
@@ -1,8 +1,7 @@
-diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
-index a7ca546..936602f 100644
---- a/gtk/gtksettings.c
-+++ b/gtk/gtksettings.c
-@@ -292,7 +292,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
+diff -uNr gtk+-2.90.3/gtk/gtksettings.c gtk+-2.90.3.new/gtk/gtksettings.c
+--- gtk+-2.90.3/gtk/gtksettings.c 2010-06-16 23:27:04.000000000 +0800
++++ gtk+-2.90.3.new/gtk/gtksettings.c 2010-06-21 18:08:21.782442359 +0800
+@@ -293,7 +293,7 @@
g_param_spec_string ("gtk-theme-name",
P_("Theme Name"),
P_("Name of theme RC file to load"),
@@ -11,7 +10,7 @@
GTK_PARAM_READWRITE),
NULL);
g_assert (result == PROP_THEME_NAME);
-@@ -301,7 +301,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
+@@ -302,7 +302,7 @@
g_param_spec_string ("gtk-icon-theme-name",
P_("Icon Theme Name"),
P_("Name of icon theme to use"),
++++++ gtk+-2.19.7-fix-introspection-parallel-build.patch
--- gtk+-2.19.7-fix-introspection-parallel-build.patch
+++ gtk+-2.19.7-fix-introspection-parallel-build.patch
@@ -1,23 +1,11 @@
-diff -urN gtk+-2.19.7.orig/gdk/Makefile.in gtk+-2.19.7/gdk/Makefile.in
---- gtk+-2.19.7.orig/gdk/Makefile.in 2010-03-09 15:22:54.000000000 +0000
-+++ gtk+-2.19.7/gdk/Makefile.in 2010-03-22 15:10:15.000000000 +0000
-@@ -700,6 +700,7 @@
- @HAVE_INTROSPECTION_TRUE@ gdkenumtypes.h \
- @HAVE_INTROSPECTION_TRUE@ $(srcdir)/x11/*.c
+diff -uNr gtk+-2.90.3/gdk/Makefile.in gtk+-2.90.3.new/gdk/Makefile.in
+--- gtk+-2.90.3/gdk/Makefile.in 2010-06-21 17:38:27.492504770 +0800
++++ gtk+-2.90.3.new/gdk/Makefile.in 2010-06-21 18:17:53.107505359 +0800
+@@ -711,6 +711,7 @@
+ @HAVE_INTROSPECTION_TRUE@ gdkenumtypes.c \
+ @HAVE_INTROSPECTION_TRUE@ gdkenumtypes.h
-+ at HAVE_INTROSPECTION_TRUE@Gdk-2.0.gir: $(gdktargetlib) Makefile
- @HAVE_INTROSPECTION_TRUE at Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
- @HAVE_INTROSPECTION_TRUE at Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
- @HAVE_INTROSPECTION_TRUE at Gdk_2_0_gir_LIBS = $(gdktargetlib)
-diff -urN gtk+-2.19.7.orig/gdk-pixbuf/Makefile.in gtk+-2.19.7/gdk-pixbuf/Makefile.in
---- gtk+-2.19.7.orig/gdk-pixbuf/Makefile.in 2010-03-09 15:22:54.000000000 +0000
-+++ gtk+-2.19.7/gdk-pixbuf/Makefile.in 2010-03-22 15:11:20.000000000 +0000
-@@ -1443,6 +1443,8 @@
- gdk-pixbuf-enum-types.c gdk-pixbuf-marshal.h \
- gdk-pixbuf-marshal.c gdk-pixbuf.loaders s-enum-types-h \
- stamp-gdk-pixbuf-marshal.h
-+
-+ at HAVE_INTROSPECTION_TRUE@GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile
- @HAVE_INTROSPECTION_TRUE at GdkPixbuf_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
- @HAVE_INTROSPECTION_TRUE at GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0
- @HAVE_INTROSPECTION_TRUE at GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la
++ at HAVE_INTROSPECTION_TRUE@Gdk-3.0.gir: $(gdktargetlib) Makefile
+ @HAVE_INTROSPECTION_TRUE at Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
+ @HAVE_INTROSPECTION_TRUE at Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-3.0 Pango-1.0
+ @HAVE_INTROSPECTION_TRUE at Gdk_3_0_gir_LIBS = $(gdktargetlib)
++++++ gtk+-2.20.0.tar.bz2 -> gtk+-2.90.3.tar.gz
1826638 lines of diff (skipped)
++++++ gtk-lib64.patch
--- gtk-lib64.patch
+++ gtk-lib64.patch
@@ -1,11 +1,11 @@
-diff -up gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64 gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c
---- gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c.lib64 2009-11-30 13:10:35.000000000 -0500
-+++ gtk+-2.19.1/gdk-pixbuf/gdk-pixbuf-io.c 2009-11-30 20:54:21.842859303 -0500
-@@ -305,7 +305,17 @@ gdk_pixbuf_get_module_file (void)
+diff -uNr gtk+-2.90.3/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.90.3.new/gdk-pixbuf/gdk-pixbuf-io.c
+--- gtk+-2.90.3/gdk-pixbuf/gdk-pixbuf-io.c 2010-06-16 23:26:59.000000000 +0800
++++ gtk+-2.90.3.new/gdk-pixbuf/gdk-pixbuf-io.c 2010-06-21 16:53:19.376801465 +0800
+@@ -305,8 +305,18 @@
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)
-- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
+- result = g_build_filename (GTK_LIBDIR, "gtk-3.0", GTK_BINARY_VERSION, "loaders.cache", NULL);
+ {
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
+ HOST, "gdk-pixbuf.loaders", NULL);
@@ -16,51 +16,30 @@
+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
+ "gdk-pixbuf.loaders", NULL);
+ }
-+ }
++ }
return result;
}
-diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.am
---- gtk+-2.19.1/gdk-pixbuf/Makefile.am.lib64 2009-11-26 01:35:49.000000000 -0500
-+++ gtk+-2.19.1/gdk-pixbuf/Makefile.am 2009-11-30 20:54:21.842859303 -0500
-@@ -521,6 +521,7 @@ INCLUDES = \
+
+diff -uNr gtk+-2.90.3/gdk-pixbuf/Makefile.am gtk+-2.90.3.new/gdk-pixbuf/Makefile.am
+--- gtk+-2.90.3/gdk-pixbuf/Makefile.am 2010-06-16 23:26:59.000000000 +0800
++++ gtk+-2.90.3.new/gdk-pixbuf/Makefile.am 2010-06-21 16:55:46.497771168 +0800
+@@ -510,6 +510,7 @@
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_builddir)/gdk-pixbuf \
- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
-+ -DHOST=\"$(host_triplet)\" \
+ -DGTK_LIBDIR=\"$(libdir)\" \
++ -DHOST=\"$(host_triplet)\" \
-DGTK_VERSION=\"$(GTK_VERSION)\" \
-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DGTK_PREFIX=\"$(prefix)\" \
-diff -up gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64 gtk+-2.19.1/gdk-pixbuf/Makefile.in
---- gtk+-2.19.1/gdk-pixbuf/Makefile.in.lib64 2009-11-30 20:54:58.058857713 -0500
-+++ gtk+-2.19.1/gdk-pixbuf/Makefile.in 2009-11-30 20:55:21.902591753 -0500
-@@ -1344,6 +1344,7 @@ INCLUDES = \
+diff -uNr gtk+-2.90.3/gdk-pixbuf/Makefile.in gtk+-2.90.3.new/gdk-pixbuf/Makefile.in
+--- gtk+-2.90.3/gdk-pixbuf/Makefile.in 2010-06-18 08:11:37.000000000 +0800
++++ gtk+-2.90.3.new/gdk-pixbuf/Makefile.in 2010-06-21 16:55:32.641442600 +0800
+@@ -1350,6 +1350,7 @@
-I$(top_srcdir)/gdk-pixbuf \
-I$(top_builddir)/gdk-pixbuf \
- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
+ -DGTK_LIBDIR=\"$(libdir)\" \
+ -DHOST=\"$(host_triplet)\" \
-DGTK_VERSION=\"$(GTK_VERSION)\" \
-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DGTK_PREFIX=\"$(prefix)\" \
-diff -up gtk+-2.19.1/gtk/gtkrc.c.lib64 gtk+-2.19.1/gtk/gtkrc.c
---- gtk+-2.19.1/gtk/gtkrc.c.lib64 2009-11-26 01:35:50.000000000 -0500
-+++ gtk+-2.19.1/gtk/gtkrc.c 2009-11-30 20:54:21.844826383 -0500
-@@ -450,7 +450,17 @@ gtk_rc_get_im_module_file (void)
- if (im_module_file)
- result = g_strdup (im_module_file);
- else
-- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+ {
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST,
-+ "gtk.immodules", NULL);
-+ if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+ {
-+ g_free (result);
-+
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0",
-+ "gtk.immodules", NULL);
-+ }
-+ }
- }
-
- return result;
++++++ system-python.patch
--- system-python.patch
+++ system-python.patch
@@ -1,6 +1,6 @@
diff -up gtk+-2.18.2/gtk/gtk-builder-convert.system-python gtk+-2.18.2/gtk/gtk-builder-convert
---- gtk+-2.18.2/gtk/gtk-builder-convert.system-python 2009-10-13 15:59:50.423385098 -0400
-+++ gtk+-2.18.2/gtk/gtk-builder-convert 2009-10-13 16:00:31.876142050 -0400
+--- gtk+-2.18.2/gtk/gtk-builder-convert-3.0.system-python 2009-10-13 15:59:50.423385098 -0400
++++ gtk+-2.18.2/gtk/gtk-builder-convert-3.0 2009-10-13 16:00:31.876142050 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
++++++ update-gdk-pixbuf-loaders-3 (new)
--- update-gdk-pixbuf-loaders-3
+++ update-gdk-pixbuf-loaders-3
+#! /bin/sh
+
+if test $# != 1; then
+ echo usage: update-gdk-pixbuf-loaders host_triplet 1>&2
+ exit 1
+fi
+
+umask 022
+# Deriving /etc/gtk-2.0/$host location
+#
+# autoconf changes linux to linux-gnu
+case "$1" in
+ *linux) host="$1-gnu"
+ ;;
+ *) host=$1
+ ;;
+esac
+
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+
+# We have had problems in the past with build systems
+# changing host from i386 to i686 and appending/dropping
+# the -gnu suffix, so try to match up the $host we got
+# with whats actually there.
+if [ ! -d /etc/gtk-2.0/$host ]; then
+ case "$host" in
+ i?86*)
+ for d in $(ls -d /etc/gtk-2.0/i?86*); do
+ host=$(basename $d)
+ break
+ done
+ ;;
+ esac
+fi
+
+FILE=/etc/gtk-2.0/$host/gdk-pixbuf.loaders
+
+case "$host" in
+ alpha*|ia64*|powerpc64*|s390x*|x86_64*)
+ /usr/bin/gdk-pixbuf-query-loaders-64 > $FILE
+ ;;
+ *)
+ /usr/bin/gdk-pixbuf-query-loaders-32 > $FILE
+ ;;
+esac
++++++ update-gtk-immodules-3 (new)
--- update-gtk-immodules-3
+++ update-gtk-immodules-3
+#! /bin/sh
+
+if test $# != 1; then
+ echo usage: update-gtk-immodules host_triplet 1>&2
+ exit 1
+fi
+
+umask 022
+# Deriving /etc/gtk-2.0/$host location
+#
+# autoconf changes linux to linux-gnu
+case "$1" in
+ *linux) host="$1-gnu"
+ ;;
+ *) host=$1
+ ;;
+esac
+
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+
+# We have had problems in the past with build systems
+# changing host from i386 to i686 and appending/dropping
+# the -gnu suffix, so try to match up the $host we got
+# with whats actually there.
+if [ ! -d /etc/gtk-2.0/$host ]; then
+ case "$host" in
+ i?86*)
+ for d in $(ls -d /etc/gtk-2.0/i?86*); do
+ host=$(basename $d)
+ break
+ done
+ ;;
+ esac
+fi
+
+FILE=/etc/gtk-2.0/$host/gtk.immodules
+
+case "$host" in
+ alpha*|ia64*|powerpc64*|s390x*|x86_64*)
+ /usr/bin/gtk-query-immodules-2.0-64 > $FILE
+ ;;
+ *)
+ /usr/bin/gtk-query-immodules-2.0-32 > $FILE
+ ;;
+esac
++++++ deleted files:
--- icon-padding.patch
--- tooltip-positioning.patch
--- update-gdk-pixbuf-loaders
--- update-gtk-immodules
More information about the MeeGo-commits
mailing list