pool/gtk2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 45089 from GNOME:Factory

Browse Source 
checked in (request 45089)

OBS-URL: https://build.opensuse.org/request/show/45089
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=111
This commit is contained in:
OBS User autobuild 2010-08-09 13:51:51 +00:00 committed by Git OBS Bridge
parent 481de177cd
commit 5d3cb49b50
11 changed files with 237 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.SuSE
View File

@ -9,7 +9,9 @@ To work around this problem, 64 bit version for SuSE Linux uses special
names for following files: names for following files:
/usr/bin/gtk-query-immodules-2.0: /usr/bin/gtk-query-immodules-2.0-64 /usr/bin/gtk-query-immodules-2.0: /usr/bin/gtk-query-immodules-2.0-64
/usr/bin/gdk-pixbuf-query-loaders: /usr/bin/gdk-pixbuf-query-loaders-64
/etc/gtk-2.0/gtk.immodules: /usr/gtk-2.0/gtk.immodules64 /etc/gtk-2.0/gtk.immodules: /usr/gtk-2.0/gtk.immodules64
/etc/gtk-2.0/gdk-pixbuf.loaders: /usr/gtk-2.0/gdk-pixbuf.loaders64
And following variable: And following variable:

8
SuSEconfig.gtk2
View File

@ -26,10 +26,18 @@ if test -f /var/adm/SuSEconfig/run-gtk ; then
/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
fi fi
if [ -x $r/usr/bin/gdk-pixbuf-query-loaders ] ; then
/usr/bin/gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
fi
if [ -x $r/usr/bin/gtk-query-immodules-2.0-64 ] ; then if [ -x $r/usr/bin/gtk-query-immodules-2.0-64 ] ; then
/usr/bin/gtk-query-immodules-2.0-64 > /etc/gtk-2.0/gtk64.immodules /usr/bin/gtk-query-immodules-2.0-64 > /etc/gtk-2.0/gtk64.immodules
fi fi
if [ -x $r/usr/bin/gdk-pixbuf-query-loaders-64 ] ; then
/usr/bin/gdk-pixbuf-query-loaders-64 > /etc/gtk-2.0/gdk-pixbuf64.loaders
fi
rm /var/adm/SuSEconfig/run-gtk rm /var/adm/SuSEconfig/run-gtk
fi fi

1
baselibs.conf
View File

@ -1,4 +1,5 @@
gtk2 gtk2
+/usr/bin/gdk-pixbuf-query-loaders(-64)?
+/usr/bin/gtk-query-immodules-2.0(-64)? +/usr/bin/gtk-query-immodules-2.0(-64)?
prereq "/usr/bin/touch" prereq "/usr/bin/touch"
post "touch var/adm/SuSEconfig/run-gtk" post "touch var/adm/SuSEconfig/run-gtk"

15
gdk-modules-information.diff Normal file
View File

@ -0,0 +1,15 @@
--- gtk+-2.10.1/gdk-pixbuf/queryloaders.c
+++ gtk+-2.10.1/gdk-pixbuf/queryloaders.c
@@ -263,6 +263,12 @@
g_printf ("# GdkPixbuf Image Loader Modules file\n"
"# Automatically generated file, do not edit\n"
"# Created by %s from gtk+-%s\n"
+ "#\n"
+ "# If you need to regenerate the Module Loader\n"
+ "# file, either run\n"
+ "# gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders\n"
+ "# or \n"
+ "# touch /var/adm/SuSEconfig/run-gtk ; SuSEconfig\n"
"#\n",
(prgname ? prgname : "gdk-pixbuf-query-loaders"),
GDK_PIXBUF_VERSION);

43
gtk+-2.20.1-pngmess.patch Normal file
View File

@ -0,0 +1,43 @@
--- gdk-pixbuf/io-png.c
+++ gdk-pixbuf/io-png.c
@@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
gchar *icc_profile_base64;
const gchar *icc_profile_title;
const gchar *icc_profile;
- gulong icc_profile_size;
+ png_uint_32 icc_profile_size;
guint32 retval;
gint compression_type;
@@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
(png_charpp) &icc_profile_title, &compression_type,
(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
if (retval != 0) {
- icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
+ icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profile_base64);
g_free (icc_profile_base64);
}
@@ -607,7 +607,7 @@ png_info_callback (png_structp png_read_ptr,
gchar *icc_profile_base64;
const gchar *icc_profile_title;
const gchar *icc_profile;
- gulong icc_profile_size;
+ png_uint_32 icc_profile_size;
guint32 retval;
gint compression_type;
@@ -679,9 +679,9 @@ png_info_callback (png_structp png_read_ptr,
/* Extract embedded ICC profile */
retval = png_get_iCCP (png_read_ptr, png_info_ptr,
(png_charpp) &icc_profile_title, &compression_type,
- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
+ (png_charpp) &icc_profile, &icc_profile_size);
if (retval != 0) {
- icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
+ icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
gdk_pixbuf_set_option (lc->pixbuf, "icc-profile", icc_profile_base64);
g_free (icc_profile_base64);
}
--
cgit v0.8.3.1

3
gtk+-2.20.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
size 19089076

3
gtk+-2.21.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b8927e4906deea9a848445ea42a3fb4eb8767b410711e0bf826698cd11ab51b
size 18053371

10
gtk2-potfiles.patch Normal file
View File

@ -0,0 +1,10 @@
--- po/POTFILES.in
+++ po/POTFILES.in
@@ -35,7 +35,6 @@
gdk-pixbuf/io-gdip-gif.c
gdk-pixbuf/io-gdip-ico.c
gdk-pixbuf/io-gdip-jpeg.c
-gdk-pixbuf/io-gdip-png.c
gdk-pixbuf/io-gdip-utils.c
gdk-pixbuf/io-gdip-wmf.c
gdk/win32/gdkmain-win32.c

66
gtk2.changes
View File

@ -1,69 +1,3 @@
-------------------------------------------------------------------
Fri Jul 23 08:34:51 CEST 2010 - vuntz@opensuse.org
- Update to version 2.21.5:
+ Deprecations:
- Deprecate GdkRegion apis that have no cairo equivalent
- GtkWindow::allow-grow and ::allow-shrink properties
+ New accessors:
- gdk_window_has_native
+ Introspection: misc annotation fixes
-------------------------------------------------------------------
Wed Jul 21 13:39:48 CEST 2010 - vuntz@opensuse.org
- Clean up update to 2.21.4.
- Update baselibs.conf, README.SuSE, SuSEconfig.gtk2 after
gdk-pixbuf split.
- Stop creating %{_libdir}/gtk-2.0/2.10.0/loaders.
- Move gir files to devel subpackage.
- Add gdk-pixbuf-devel Requires to devel package.
- Create var/adm/SuSEconfig/ in %post if necessary.
-------------------------------------------------------------------
Tue Jul 6 10:20:52 CEST 2010 - dimstar@opensuse.org
- Update to version 2.21.4:
+ Revert a change in GtkCalendar that broke the pygtk build
+ Fix the building of input methods as modules.
+ Include gdk-pixbuf-2.0 in the .pc file requires
- Changes from version 2.21.3:
+ gdk-pixbuf has been moved into a separate module
+ gtk_init warns if it detects GTK2.x and GTK3 being used in the
same process
+ New API for GSeal.
+ Bug fixes.
- Changes from version 2.21.2:
+ The newly added gdk_drag_context_get_action function has been
renamed to gdk_drag_context_get_selected_action to make the
name less confusing.
+ Introspection annotations have been added in many places
+ New accessors for sealed struct members:
- gtk_viewport_get_view_window
- gdk_drag_context_get_source_window
+ Bug fixes.
- Changes from version 2.21.1:
+ GDK has been sealed, with the addition of suitable accessors
+ Bug fixes.
- Changes from version 2.20.1:
+ Support tracker 0.8 and 0.9 in the filechooser search code
+ New API:
- add API to convert coords between parent and child windows
- add gdk_window_get_effective_parent() and
gdk_window_get_effective_toplevel() which are offscreen aware
- add gtk_widget_send_focus_change
- add accessors for GtkTextView adjustments
- add API to reset the im context in GtkTextView and GtkEntry
+ Bug fixes.
+ Updated translations.
- Add gdk-pixbuf-devel BuildRequires.
- Drop gtk2-potfiles.patch: fixed upstream.
- Drop gdk-modules-information.diff: gdk-pixbuf has been split, and
this is not needed anymore.
- Drop gtk+-2.20.1-pngmess.patch: fixed upstream.
- Pass --disable-static to configure and remove .la files.
- Update packaging after split of gdk-pixbuf.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 20 12:49:46 CEST 2010 - fridrich.strba@bluewin.ch Thu May 20 12:49:46 CEST 2010 - fridrich.strba@bluewin.ch

47
gtk2.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gtk2 (Version 2.21.5) # spec file for package gtk2 (Version 2.20.1)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,8 +19,8 @@
Name: gtk2 Name: gtk2
%define _name gtk+ %define _name gtk+
Version: 2.21.5 Version: 2.20.1
Release: 1 Release: 2
# FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions. # FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions.
# FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer) # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
License: LGPLv2.1+ License: LGPLv2.1+
@ -32,8 +32,12 @@ Source1: SuSEconfig.gtk2
Source2: README.SuSE Source2: README.SuSE
Source3: gtkrc Source3: gtkrc
Source4: baselibs.conf Source4: baselibs.conf
# PATCH-FIX-UPSTREAM gtk2-potfiles.patch bgo599774 sbrabec@suse.cz - Fix POTFILES.in referring to missing file.
Patch1: gtk2-potfiles.patch
# PATCH-FIX-OPENSUSE gtk64.patch sbrabec@novell.com - 64-bit dual install. See also the Fedora patch for a simpler way of doing this. # PATCH-FIX-OPENSUSE gtk64.patch sbrabec@novell.com - 64-bit dual install. See also the Fedora patch for a simpler way of doing this.
Patch8: gtk64.patch Patch8: gtk64.patch
# PATCH-FIX-OPENSUSE gdk-modules-information.diff hhetter@suse.de - Info on how to manually regenerate modules information
Patch12: gdk-modules-information.diff
# PATCH-FEATURE-UPSTREAM bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff bnc129753 bgo319484 mfabian@novell.com - Translate the font styles in the GUI # PATCH-FEATURE-UPSTREAM bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff bnc129753 bgo319484 mfabian@novell.com - Translate the font styles in the GUI
Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff
# PATCH-FIX-OPENSUSE bugzilla-131498-allow-xim-for-all-languages.patch bnc131498 mfabian@novell.com - Allow all languages to be run with the X Input Method # PATCH-FIX-OPENSUSE bugzilla-131498-allow-xim-for-all-languages.patch bnc131498 mfabian@novell.com - Allow all languages to be run with the X Input Method
@ -48,12 +52,13 @@ Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.d
# be here instead. # be here instead.
# PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 # PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474
Patch53: gtk-path-local.patch Patch53: gtk-path-local.patch
# PATCH-FIX-UPSTREAM gtk+-2.20.1-pngmess.patch fridrich.strba@bluewin.ch - Fix a memory allocation problem in png loader
Patch54: gtk+-2.20.1-pngmess.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: atk-devel BuildRequires: atk-devel
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: gdk-pixbuf-devel
# Needed for patches touching the build system # Needed for patches touching the build system
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: gnome-patch-translation BuildRequires: gnome-patch-translation
@ -123,7 +128,7 @@ Group: Development/Libraries/X11
Obsoletes: gtk2-devel-64bit Obsoletes: gtk2-devel-64bit
%endif %endif
# #
Requires: %{name} = %{version} atk-devel cairo-devel gdk-pixbuf-devel glibc-devel glib2-devel pango-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}') Requires: %{name} = %{version} atk-devel cairo-devel glibc-devel glib2-devel pango-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}')
# gtk-builder-convert needs this. # gtk-builder-convert needs this.
Requires: pyxml Requires: pyxml
# gail is part of gtk+ as of 2.13.x # gail is part of gtk+ as of 2.13.x
@ -149,6 +154,7 @@ configurable.
%lang_package %lang_package
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
%patch1
translation-update-upstream translation-update-upstream
translation-update-upstream po-properties gtk20-properties translation-update-upstream po-properties gtk20-properties
gnome-patch-translation-prepare gnome-patch-translation-prepare
@ -158,10 +164,12 @@ cp -a %{S:2} .
# WARNING: This patch does not patch not installed demos and tests. # WARNING: This patch does not patch not installed demos and tests.
%patch8 -p1 %patch8 -p1
%endif %endif
%patch12 -p1
%patch22 -p1 %patch22 -p1
%patch23 -p1 %patch23 -p1
%patch24 -p1 %patch24 -p1
%patch53 %patch53
%patch54
gnome-patch-translation-update gnome-patch-translation-update
%build %build
@ -174,7 +182,6 @@ export CFLAGS="$CFLAGS -mminimal-toc"
# fix crash in gdm, nautilus, etc. (bgo#596977) # fix crash in gdm, nautilus, etc. (bgo#596977)
export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'` export CFLAGS=`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'`
%configure \ %configure \
--disable-static \
--enable-man \ --enable-man \
--with-xinput=xfree --with-xinput=xfree
#make %{?jobs:-j%jobs} #make %{?jobs:-j%jobs}
@ -182,23 +189,28 @@ make
%install %install
%makeinstall %makeinstall
find %{buildroot}%{_libdir} -name '*.la' -delete -print
mkdir -p $RPM_BUILD_ROOT/sbin/conf.d mkdir -p $RPM_BUILD_ROOT/sbin/conf.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
install -m 755 SuSEconfig.gtk2 $RPM_BUILD_ROOT/sbin/conf.d install -m 755 SuSEconfig.gtk2 $RPM_BUILD_ROOT/sbin/conf.d
touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0
touch $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list touch $RPM_BUILD_ROOT%{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list
mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/{,2.10.0/}{engines,filesystems,immodules,modules,printbackends} mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/{,2.10.0/}{engines,filesystems,immodules,loaders,modules,printbackends}
%find_lang gtk20 %find_lang gtk20
%find_lang gtk20-properties gtk20.lang %find_lang gtk20-properties gtk20.lang
%if "%_lib" == "lib64" %if "%_lib" == "lib64"
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-2.0\ mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0\
$RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0-64
mv $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules\ mv $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk.immodules\
$RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk64.immodules $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtk64.immodules
mv $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders\
$RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf64.loaders
%endif %endif
rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2*/*/*.la
rm $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/modules/*.la
%fdupes $RPM_BUILD_ROOT %fdupes $RPM_BUILD_ROOT
%clean %clean
@ -206,7 +218,6 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
test -d var/adm/SuSEconfig/ || mkdir -p var/adm/SuSEconfig/
touch var/adm/SuSEconfig/run-gtk touch var/adm/SuSEconfig/run-gtk
%preun %preun
@ -224,9 +235,10 @@ fi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING README NEWS ChangeLog
%if "%_lib" == "lib64" %if "%_lib" == "lib64"
%doc README.SuSE %doc AUTHORS COPYING README README.SuSE NEWS ChangeLog
%else
%doc AUTHORS COPYING README NEWS ChangeLog
%endif %endif
%{_bindir}/*query* %{_bindir}/*query*
%{_bindir}/gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache
@ -243,11 +255,14 @@ fi
%ghost %{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list %ghost %{_localstatedir}/cache/gtk-2.0/icon-theme.cache-list
%if "%_lib" == "lib64" %if "%_lib" == "lib64"
%ghost %{_sysconfdir}/gtk-2.0/gtk64.immodules %ghost %{_sysconfdir}/gtk-2.0/gtk64.immodules
%ghost %{_sysconfdir}/gtk-2.0/gdk-pixbuf64.loaders
%else %else
%ghost %{_sysconfdir}/gtk-2.0/gtk.immodules %ghost %{_sysconfdir}/gtk-2.0/gtk.immodules
%ghost %{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
%endif %endif
%{_sysconfdir}/gtk-2.0/im-multipress.conf %{_sysconfdir}/gtk-2.0/im-multipress.conf
/sbin/conf.d/SuSEconfig.gtk2 /sbin/conf.d/SuSEconfig.gtk2
%{_datadir}/gir-1.0/*.gir
%{_libdir}/girepository-1.0/*.typelib %{_libdir}/girepository-1.0/*.typelib
%files branding-upstream %files branding-upstream
@ -261,17 +276,17 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/gtk-builder-convert %{_bindir}/gtk-builder-convert
%{_bindir}/*-demo %{_bindir}/*-demo
%{_datadir}/gir-1.0/*.gir %{_bindir}/*-csource
%dir %{_datadir}/gtk-2.0 %{_datadir}/gtk-2.0
%{_datadir}/gtk-2.0/demo
%{_datadir}/aclocal/*.m4 %{_datadir}/aclocal/*.m4
%{_includedir}/gail-1.0 %{_includedir}/gail-1.0
%{_includedir}/gtk-2.0 %{_includedir}/gtk-2.0
%{_includedir}/gtk-unix-print-2.0 %{_includedir}/gtk-unix-print-2.0
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/lib*a
%{_libdir}/gtk-2.0/include %{_libdir}/gtk-2.0/include
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%doc %{_mandir}/man*/* %doc %{_mandir}/man*/*
%doc %{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog

141
gtk64.patch
View File

@ -1,20 +1,127 @@
Index: gtk+-2.21.4/gtk/Makefile.am Index: gtk+-2.19.0/demos/Makefile.am
=================================================================== ===================================================================
--- gtk+-2.21.4.orig/gtk/Makefile.am --- gtk+-2.19.0.orig/demos/Makefile.am
+++ gtk+-2.21.4/gtk/Makefile.am +++ gtk+-2.19.0/demos/Makefile.am
@@ -974,7 +974,7 @@ distclean-local: @@ -38,8 +38,8 @@ if CROSS_COMPILING
pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
pixbuf_csource_deps=
else
-pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
-pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders
+pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
+pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders
endif
DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib) test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
Index: gtk+-2.19.0/gdk-pixbuf/Makefile.am
===================================================================
--- gtk+-2.19.0.orig/gdk-pixbuf/Makefile.am
+++ gtk+-2.19.0/gdk-pixbuf/Makefile.am
@@ -612,7 +612,7 @@ MAINTAINERCLEANFILES = \
gdk-pixbuf-enum-types.c \
gdk-pixbuf-marshal.h \
gdk-pixbuf-marshal.c \
- gdk-pixbuf.loaders
+ gdk-pixbuf64.loaders
#
# gdk-pixbuf-enum-types.h
@@ -701,10 +701,10 @@ endif
install-data-hook: install-ms-lib install-def-file
@if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf64.loaders ; \
else \
echo "***" ; \
- echo "*** Warning: gdk-pixbuf.loaders not built" ; \
+ echo "*** Warning: gdk-pixbuf64.loaders not built" ; \
echo "***" ; \
echo "*** Generate this file manually on host" ; \
echo "*** system using gdk-pixbuf-query-loaders" ; \
@@ -712,27 +712,27 @@ install-data-hook: install-ms-lib instal
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
- rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
+ rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf64.loaders
if CROSS_COMPILING
else
-all-local: gdk-pixbuf.loaders
+all-local: gdk-pixbuf64.loaders
endif
if BUILD_DYNAMIC_MODULES
-gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
+gdk-pixbuf64.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
LOADERS=`echo libpixbufloader-*.la` ; \
if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
+ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf64.loaders ;\
else \
echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
- touch gdk-pixbuf.loaders; \
+ touch gdk-pixbuf64.loaders; \
fi
else
-gdk-pixbuf.loaders:
+gdk-pixbuf64.loaders:
echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
- touch gdk-pixbuf.loaders;
+ touch gdk-pixbuf64.loaders;
endif
-include $(top_srcdir)/git.mk
Index: gtk+-2.19.0/gdk-pixbuf/gdk-pixbuf-io.c
===================================================================
--- gtk+-2.19.0.orig/gdk-pixbuf/gdk-pixbuf-io.c
+++ gtk+-2.19.0/gdk-pixbuf/gdk-pixbuf-io.c
@@ -286,7 +286,7 @@ correct_prefix (gchar **path)
/* This is an entry put there by gdk-pixbuf-query-loaders on the
* packager's system. On Windows a prebuilt GTK+ package can be
- * installed in a random location. The gdk-pixbuf.loaders file
+ * installed in a random location. The gdk-pixbuf64.loaders file
* distributed in such a package contains paths from the package
* builder's machine. Replace the build-time prefix with the
* installation prefix on this machine.
@@ -305,7 +305,7 @@ gdk_pixbuf_get_module_file (void)
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_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf64.loaders", NULL);
return result;
}
Index: gtk+-2.19.0/gtk/Makefile.am
===================================================================
--- gtk+-2.19.0.orig/gtk/Makefile.am
+++ gtk+-2.19.0/gtk/Makefile.am
@@ -949,7 +949,7 @@ distclean-local:
DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
-TEST_DEPS = $(DEPS) gtk.immodules -TEST_DEPS = $(DEPS) gtk.immodules
+TEST_DEPS = $(DEPS) gtk64.immodules +TEST_DEPS = $(DEPS) gtk64.immodules
LDADDS = \ LDADDS = \
$(gtktargetlib) \ $(gtktargetlib) \
Index: gtk+-2.21.4/gtk/gtkmodules.c @@ -1311,7 +1311,7 @@ if CROSS_COMPILING
gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
else
gtk_update_icon_cache_program = \
- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
+ GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf64.loaders \
./gtk-update-icon-cache
endif
Index: gtk+-2.19.0/gtk/gtkmodules.c
=================================================================== ===================================================================
--- gtk+-2.21.4.orig/gtk/gtkmodules.c --- gtk+-2.19.0.orig/gtk/gtkmodules.c
+++ gtk+-2.21.4/gtk/gtkmodules.c +++ gtk+-2.19.0/gtk/gtkmodules.c
@@ -68,7 +68,7 @@ get_module_path (void) @@ -68,7 +68,7 @@ get_module_path (void)
if (home_dir) if (home_dir)
home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL); home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
@ -24,10 +131,10 @@ Index: gtk+-2.21.4/gtk/gtkmodules.c
exe_prefix = g_getenv ("GTK_EXE_PREFIX"); exe_prefix = g_getenv ("GTK_EXE_PREFIX");
if (exe_prefix) if (exe_prefix)
Index: gtk+-2.21.4/gtk/gtkrc.c Index: gtk+-2.19.0/gtk/gtkrc.c
=================================================================== ===================================================================
--- gtk+-2.21.4.orig/gtk/gtkrc.c --- gtk+-2.19.0.orig/gtk/gtkrc.c
+++ gtk+-2.21.4/gtk/gtkrc.c +++ gtk+-2.19.0/gtk/gtkrc.c
@@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void) @@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void)
if (im_module_file) if (im_module_file)
result = g_strdup (im_module_file); result = g_strdup (im_module_file);
@ -37,11 +144,11 @@ Index: gtk+-2.21.4/gtk/gtkrc.c
} }
return result; return result;
Index: gtk+-2.21.4/modules/input/Makefile.am Index: gtk+-2.19.0/modules/input/Makefile.am
=================================================================== ===================================================================
--- gtk+-2.21.4.orig/modules/input/Makefile.am --- gtk+-2.19.0.orig/modules/input/Makefile.am
+++ gtk+-2.21.4/modules/input/Makefile.am +++ gtk+-2.19.0/modules/input/Makefile.am
@@ -189,11 +189,11 @@ install-data-hook: @@ -191,11 +191,11 @@ install-data-hook:
@if $(RUN_QUERY_IMMODULES_TEST) ; then \ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
@ -56,7 +163,7 @@ Index: gtk+-2.21.4/modules/input/Makefile.am
echo "***" ; \ echo "***" ; \
echo "*** Generate this file manually on host" ; \ echo "*** Generate this file manually on host" ; \
echo "*** system using gtk-query-immodules-2.0" ; \ echo "*** system using gtk-query-immodules-2.0" ; \
@@ -201,7 +201,7 @@ install-data-hook: @@ -203,7 +203,7 @@ install-data-hook:
fi fi
uninstall-local: uninstall-local:
@ -65,7 +172,7 @@ Index: gtk+-2.21.4/modules/input/Makefile.am
if BUILD_DYNAMIC_MODULES if BUILD_DYNAMIC_MODULES
@@ -237,14 +237,14 @@ noinst_LTLIBRARIES = \ @@ -239,14 +239,14 @@ noinst_LTLIBRARIES = \
included-modules: $(noinst_LTLIBRARIES) included-modules: $(noinst_LTLIBRARIES)