packages: gtk+2/gtk+2.spec, gtk+2/gtk+2-arch_confdir.patch, gtk+2/gobject-i...

megabajt megabajt at pld-linux.org
Mon Sep 27 21:40:13 CEST 2010 

Author: megabajt                     Date: Mon Sep 27 19:40:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.22.0; merged from DEVEL

---- Files affected:
packages/gtk+2:
   gtk+2.spec (1.336 -> 1.337) , gtk+2-arch_confdir.patch (1.3 -> 1.4) , gobject-introspection.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/gtk+2/gtk+2.spec
diff -u packages/gtk+2/gtk+2.spec:1.336 packages/gtk+2/gtk+2.spec:1.337
--- packages/gtk+2/gtk+2.spec:1.336	Wed Sep 22 23:06:52 2010
+++ packages/gtk+2/gtk+2.spec	Mon Sep 27 21:40:08 2010
@@ -20,16 +20,15 @@
 Summary(pl.UTF-8):	GIMP Toolkit
 Summary(tr.UTF-8):	GIMP ToolKit arayüz kitaplığı
 Name:		gtk+2
-Version:	2.20.1
-Release:	5
+Version:	2.22.0
+Release:	1
 Epoch:		2
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.20/gtk+-%{version}.tar.bz2
-# Source0-md5:	53e6f3a93bd22934878fc4a4a34c68aa
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.22/gtk+-%{version}.tar.bz2
+# Source0-md5:	abdb282a0ee55384babae7e82f5e7296
 Patch0:		%{name}-arch_confdir.patch
-Patch1:		revert_64bit_fix.patch
-Patch2:		gobject-introspection.patch
+Patch1:		gobject-introspection.patch
 URL:		http://www.gtk.org/
 BuildRequires:	atk-devel >= 1:1.30.0-3
 BuildRequires:	autoconf >= 2.62
@@ -38,19 +37,16 @@
 %{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
+BuildRequires:	gdk-pixbuf2-devel >= 2.22.0
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.24.0
+BuildRequires:	glib2-devel >= 1:2.26.0
 BuildRequires:	gobject-introspection-devel >= 0.9.5
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.11}
 BuildRequires:	gtk-doc-automake >= 1.11
-BuildRequires:	jasper-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel >= 1.4.0
-BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libxml2-progs >= 1:2.6.31
 BuildRequires:	libxslt-progs >= 1.1.20
-BuildRequires:	pango-devel >= 1:1.26.0
+BuildRequires:	pango-devel >= 1:1.28.1-4
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
@@ -68,7 +64,8 @@
 BuildRequires:	xorg-lib-libXrender-devel
 Requires:	atk >= 1:1.30.0
 Requires:	cairo >= 1.6.0
-Requires:	glib2 >= 1:2.24.0
+Requires:	gdk-pixbuf2 >= 2.22.0
+Requires:	glib2 >= 1:2.26.0
 Requires:	pango >= 1:1.26.0
 Requires:	xorg-lib-libXrandr >= 1.3.0
 %if %{with cups}
@@ -152,7 +149,8 @@
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	atk-devel >= 1:1.30.0
-Requires:	glib2-devel >= 1:2.24.0
+Requires:	gdk-pixbuf2-devel >= 2.22.0
+Requires:	glib2-devel >= 1:2.26.0
 Requires:	pango-devel >= 1:1.26.0
 Requires:	shared-mime-info
 Requires:	xorg-lib-libX11-devel
@@ -231,8 +229,7 @@
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1
-%patch1 -p1 -R
-%patch2 -p1
+%patch1 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -251,7 +248,6 @@
 	--%{?with_static_libs:en}%{!?with_static_libs:dis}able-static \
 	--with-gdktarget=x11 \
 	--with-html-dir=%{_gtkdocdir} \
-	--with-libjasper \
 	--with-xinput=yes
 %{__make}
 
@@ -265,7 +261,6 @@
 	m4datadir=%{_aclocaldir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gdk-pixbuf.loaders
 touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk.immodules
 
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -277,7 +272,6 @@
 %if "%{_lib}" != "lib"
 # We need to have 32-bit and 64-bit binaries as they have hardcoded LIBDIR.
 # (needed when multilib is used)
-mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders{,%{pqext}}
 mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-2.0{,%{pqext}}
 %endif
 
@@ -297,7 +291,6 @@
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders
 %{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules
 exit 0
 
@@ -309,7 +302,6 @@
 	# if we remove the other arch pkg will be still present.
 	# i.e we have installed gtk+2-2.16.5-1.x86_64 and gtk+2-2.16.5-1.i686, and remove gtk+2-2.16.5-1.i686
 	if [ -d %{_sysconfdir} ]; then
-		%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders
 		%{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules
 	fi
 fi
@@ -317,14 +309,12 @@
 
 %triggerpostun -- gtk+2 < 2:2.4.0
 umask 022
-%{_bindir}/gdk-pixbuf-query-loaders%{pqext} > %{_sysconfdir}/gdk-pixbuf.loaders
 %{_bindir}/gtk-query-immodules-2.0%{pqext} > %{_sysconfdir}/gtk.immodules
 exit 0
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
-%attr(755,root,root) %{_bindir}/gdk-pixbuf-query-loaders%{pqext}
 %attr(755,root,root) %{_bindir}/gtk-demo
 %attr(755,root,root) %{_bindir}/gtk-query-immodules-2.0%{pqext}
 %attr(755,root,root) %{_bindir}/gtk-update-icon-cache
@@ -332,10 +322,6 @@
 %attr(755,root,root) %ghost %{_libdir}/libgailutil.so.18
 %attr(755,root,root) %{_libdir}/libgdk-x11-2.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgdk-x11-2.0.so.0
-%attr(755,root,root) %{_libdir}/libgdk_pixbuf-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgdk_pixbuf-2.0.so.0
-%attr(755,root,root) %{_libdir}/libgdk_pixbuf_xlib-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgdk_pixbuf_xlib-2.0.so.0
 %attr(755,root,root) %{_libdir}/libgtk-x11-2.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgtk-x11-2.0.so.0
 
@@ -349,13 +335,11 @@
 %dir %{_libdir}/gtk-2.0/%{abivers}/filesystems
 %dir %{_libdir}/gtk-2.0/%{abivers}/immodules
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/immodules/im-*.so
-%dir %{_libdir}/gtk-2.0/%{abivers}/loaders
-%attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/loaders/libpixbufloader-*.so
 %dir %{_libdir}/gtk-2.0/%{abivers}/printbackends
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-file.so
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-lpr.so
 %{_libdir}/girepository-1.0/Gdk-2.0.typelib
-%{_libdir}/girepository-1.0/GdkPixbuf-2.0.typelib
+%{_libdir}/girepository-1.0/GdkX11-2.0.typelib
 %{_libdir}/girepository-1.0/Gtk-2.0.typelib
 
 # XXX: just demo data - move to examples?
@@ -363,7 +347,6 @@
 
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/im-multipress.conf
-%ghost %{_sysconfdir}/gdk-pixbuf.loaders
 %ghost %{_sysconfdir}/gtk.immodules
 %dir %{_datadir}/themes/Default/gtk-*
 %{_datadir}/themes/Default/gtk-*/gtkrc
@@ -373,24 +356,18 @@
 %dir %{_datadir}/themes/Raleigh
 %dir %{_datadir}/themes/Raleigh/gtk-*
 %{_datadir}/themes/Raleigh/gtk-*/gtkrc
-%{_mandir}/man1/gdk-pixbuf-query-loaders.1*
 %{_mandir}/man1/gtk-query-immodules-2.0.1*
 %{_mandir}/man1/gtk-update-icon-cache.1*
 
 %files devel
 %defattr(644,root,root,755)
 %doc ChangeLog
-%attr(755,root,root) %{_bindir}/gdk-pixbuf-csource
 %attr(755,root,root) %{_bindir}/gtk-builder-convert
 %attr(755,root,root) %{_libdir}/libgailutil.so
 %attr(755,root,root) %{_libdir}/libgdk-x11-2.0.so
-%attr(755,root,root) %{_libdir}/libgdk_pixbuf-2.0.so
-%attr(755,root,root) %{_libdir}/libgdk_pixbuf_xlib-2.0.so
 %attr(755,root,root) %{_libdir}/libgtk-x11-2.0.so
 %{_libdir}/libgailutil.la
 %{_libdir}/libgdk-x11-2.0.la
-%{_libdir}/libgdk_pixbuf-2.0.la
-%{_libdir}/libgdk_pixbuf_xlib-2.0.la
 %{_libdir}/libgtk-x11-2.0.la
 %{_includedir}/gail-1.0
 %{_includedir}/gtk-2.0
@@ -399,16 +376,13 @@
 %{_libdir}/gtk-2.0/include
 %{_pkgconfigdir}/gail.pc
 %{_pkgconfigdir}/gdk-2.0.pc
-%{_pkgconfigdir}/gdk-pixbuf-2.0.pc
-%{_pkgconfigdir}/gdk-pixbuf-xlib-2.0.pc
 %{_pkgconfigdir}/gdk-x11-2.0.pc
 %{_pkgconfigdir}/gtk+-2.0.pc
 %{_pkgconfigdir}/gtk+-unix-print-2.0.pc
 %{_pkgconfigdir}/gtk+-x11-2.0.pc
 %{_datadir}/gir-1.0/Gdk-2.0.gir
-%{_datadir}/gir-1.0/GdkPixbuf-2.0.gir
+%{_datadir}/gir-1.0/GdkX11-2.0.gir
 %{_datadir}/gir-1.0/Gtk-2.0.gir
-%{_mandir}/man1/gdk-pixbuf-csource.1*
 %{_mandir}/man1/gtk-builder-convert.1*
 
 %if %{with static_libs}
@@ -416,8 +390,6 @@
 %defattr(644,root,root,755)
 %{_libdir}/libgailutil.a
 %{_libdir}/libgdk-x11-2.0.a
-%{_libdir}/libgdk_pixbuf-2.0.a
-%{_libdir}/libgdk_pixbuf_xlib-2.0.a
 %{_libdir}/libgtk-x11-2.0.a
 %endif
 
@@ -426,7 +398,6 @@
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gail-libgail-util
 %{_gtkdocdir}/gdk
-%{_gtkdocdir}/gdk-pixbuf
 %{_gtkdocdir}/gtk
 %endif
 
@@ -446,16 +417,45 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.337  2010/09/27 19:40:08  megabajt
+- updated to 2.22.0; merged from DEVEL
+
 Revision 1.336  2010/09/22 21:06:52  patrys
- rel 5
+- rel 5
 
 Revision 1.335  2010/09/22 20:00:51  patrys
 - rebuild with new gir format
 - rel 4
 
+Revision 1.333.2.8  2010/09/22 19:34:24  patrys
+- 2.21.8
+
+Revision 1.333.2.7  2010/08/31 14:20:29  patrys
+- 2.21.7
+
+Revision 1.333.2.6  2010/08/18 08:38:01  patrys
+- 2.21.6
+
 Revision 1.334  2010/07/13 08:58:59  patrys
 - rebuild with latest git
 - rel 3
+
+Revision 1.333.2.5  2010/07/01 22:41:46  megabajt
+- updated to 2.21.4
+
+Revision 1.333.2.4  2010/06/12 14:02:12  lisu
+- up to 2.21.2
+- glib2-devel >= 1:2.25.8 is required
+
+Revision 1.333.2.3  2010/06/01 07:10:01  lisu
+- builds on x86_64 without patching, patch removed from spec
+
+Revision 1.333.2.2  2010/06/01 06:54:13  lisu
+- updated to 2.21.1
+- revert_64bit_fix.patch commented to check if gtk+2 now builds on 64 bits
+
+Revision 1.333.2.1  2010/05/13 08:50:34  lisu
+- 2.21.0
 
 Revision 1.333  2010/05/06 09:43:28  patrys
 - revert the 64-bit "fix" as it causes apps to crash

================================================================
Index: packages/gtk+2/gtk+2-arch_confdir.patch
diff -u packages/gtk+2/gtk+2-arch_confdir.patch:1.3 packages/gtk+2/gtk+2-arch_confdir.patch:1.4
--- packages/gtk+2/gtk+2-arch_confdir.patch:1.3	Sat Mar 22 00:20:51 2008
+++ packages/gtk+2/gtk+2-arch_confdir.patch	Mon Sep 27 21:40:08 2010
@@ -1,36 +1,3 @@
---- gtk+-2.8.12/gdk-pixbuf/gdk-pixbuf-io.c	2005-10-03 17:11:49.000000000 +0200
-+++ gtk+-2.8.12.arch_confdir/gdk-pixbuf/gdk-pixbuf-io.c	2006-02-20 22:10:52.000000000 +0100
-@@ -276,7 +276,7 @@
-   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, "gdk-pixbuf.loaders", NULL);
- 
-   return result;
- }
---- gtk+-2.8.12/gdk-pixbuf/Makefile.am	2005-10-26 20:13:22.000000000 +0200
-+++ gtk+-2.8.12.arch_confdir/gdk-pixbuf/Makefile.am	2006-02-20 22:10:21.000000000 +0100
-@@ -467,8 +468,8 @@
- # after the libraries are installed in their final locations.
- 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 ; \
-+	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
-+	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gdk-pixbuf.loaders ; \
- 	else \
- 	  echo "***" ; \
- 	  echo "*** Warning: gdk-pixbuf.loaders not built" ; \
-@@ -479,7 +480,7 @@
- 	fi
- 
- uninstall-local: uninstall-ms-lib uninstall-def-file
--	rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
-+	rm -f $(DESTDIR)$(sysconfdir)/gdk-pixbuf.loaders
- 
- if CROSS_COMPILING
- else
 --- gtk+-2.8.12/gtk/gtkrc.c	2005-11-23 15:24:51.000000000 +0100
 +++ gtk+-2.8.12.arch_confdir/gtk/gtkrc.c	2006-02-20 22:14:36.000000000 +0100
 @@ -364,7 +364,7 @@

================================================================
Index: packages/gtk+2/gobject-introspection.patch
diff -u packages/gtk+2/gobject-introspection.patch:1.2 packages/gtk+2/gobject-introspection.patch:1.3
--- packages/gtk+2/gobject-introspection.patch:1.2	Wed Sep 22 23:06:31 2010
+++ packages/gtk+2/gobject-introspection.patch	Mon Sep 27 21:40:08 2010
@@ -1,42 +1,12 @@
---- gtk+-2.20.1/gdk-pixbuf/Makefile.am~	2010-09-22 21:35:35.766910029 +0200
-+++ gtk+-2.20.1/gdk-pixbuf/Makefile.am	2010-09-22 21:40:41.460243363 +0200
-@@ -692,7 +692,7 @@
- if HAVE_INTROSPECTION
+diff -urN gtk+-2.22.0/gdk/Makefile.am gtk+-2.22.0.new//gdk/Makefile.am
+--- gtk+-2.22.0/gdk/Makefile.am	2010-09-23 05:00:45.000000000 +0200
++++ gtk+-2.22.0.new//gdk/Makefile.am	2010-09-27 20:45:46.955178923 +0200
+@@ -238,7 +238,7 @@
+         x11/gdkx.h
  
- GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile
--GdkPixbuf_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
-+GdkPixbuf_2_0_gir_SCANNERFLAGS = --identifier-prefix=Gdk
- GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0
- GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la
- GdkPixbuf_2_0_gir_CFLAGS = $(INCLUDES)
---- gtk+-2.20.1/gtk/Makefile.am~	2010-05-03 01:33:18.000000000 +0200
-+++ gtk+-2.20.1/gtk/Makefile.am	2010-09-22 21:41:55.953576697 +0200
-@@ -982,7 +982,7 @@
-     gtktypebuiltins.c
- 
- Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile
--Gtk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
-+Gtk_2_0_gir_SCANNERFLAGS = --identifier-prefix=Gtk --symbol-prefix=gtk
- Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
- Gtk_2_0_gir_CFLAGS = \
- 		$(INCLUDES) \
---- gtk+-2.20.1/gdk/Makefile.am~	2010-05-03 01:33:18.000000000 +0200
-+++ gtk+-2.20.1/gdk/Makefile.am	2010-09-22 21:46:40.213576696 +0200
-@@ -195,7 +195,7 @@
- if HAVE_INTROSPECTION
- 
- introspection_files = \
--		$(gdk_public_h_sources) \
-+		$(filter-out gdkkeysyms.h, $(gdk_public_h_sources))	\
- 		$(gdk_c_sources) \
-         gdkenumtypes.c \
-         gdkenumtypes.h \
-@@ -202,7 +202,7 @@
-         $(srcdir)/x11/*.c
- 
- Gdk-2.0.gir: $(gdktargetlib) Makefile
--Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
-+Gdk_2_0_gir_SCANNERFLAGS = --identifier-prefix=Gdk --symbol-prefix=gdk --add-include-path=../gdk-pixbuf
- Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
- Gdk_2_0_gir_LIBS = $(gdktargetlib)
- Gdk_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
+ GdkX11-2.0.gir: $(gdktargetlib) Gdk-2.0.gir Makefile
+-GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
++GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Gdk --symbol-prefix=gdk
+ GdkX11_2_0_gir_INCLUDES = Gio-2.0 Gdk-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+ GdkX11_2_0_gir_LIBS = $(gdktargetlib)
+ GdkX11_2_0_gir_FILES = $(x11_introspection_files)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+2/gtk+2.spec?r1=1.336&r2=1.337&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+2/gtk+2-arch_confdir.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+2/gobject-introspection.patch?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list