[mingw-gtk2: 41/65] Update to 2.21.7

epienbro epienbro at fedoraproject.org
Tue Mar 6 20:03:40 UTC 2012 

commit 29490255e58aaafc0f787a6930ce7bc23fc2e341
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Sep 12 19:20:05 2010 +0200

    Update to 2.21.7
    
    - Update to 2.21.7
    - Dropped upstreamed WIMP theme patch
    - Moved all gdk-pixbuf bits to a seperate package as upstream has separated it
    - Added BR: mingw32-gdk-pixbuf
    
    Note: due to the split of gdk-pixbuf, this package can't be built
    until the package review of mingw32-gdk-pixbuf has been approved.
    Review request: https://bugzilla.redhat.com/show_bug.cgi?id=633058

 mingw32-gtk2.spec |  150 +++++------------------------------------------------
 1 files changed, 13 insertions(+), 137 deletions(-)
---
diff --git a/mingw32-gtk2.spec b/mingw32-gtk2.spec
index 2e3ba02..1ab90a1 100644
--- a/mingw32-gtk2.spec
+++ b/mingw32-gtk2.spec
@@ -6,23 +6,19 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-gtk2
-Version:        2.20.1
-Release:        2%{?dist}
+Version:        2.21.7
+Release:        1%{?dist}
 Summary:        MinGW Windows Gtk2 library
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/gtk+/2.20/gtk+-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/gtk+/2.21/gtk+-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# If you want to rebuild this, do:
-# wine %{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe > gdk-pixbuf.loaders
-Source1:        gdk-pixbuf.loaders
-
 # wine %{_mingw32_bindir}/gtk-query-immodules-2.0.exe > gtk.immodules
-Source2:        gtk.immodules
+Source1:        gtk.immodules
 
 # Fix use of extended buttons in gtkstatusicon.
 Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
@@ -30,12 +26,6 @@ Patch1000:      mingw32-gtk2-2.15.0-xbuttons.patch
 # Enable building a static library of GTK
 Patch1001:      mingw32-gtk2-enable_static_build.patch
 
-# Some Fedora-MinGW-specific changes are required by mingw32-libjpeg 7
-Patch1002:      mingw32-gtk2-libjpeg7-compatibility.patch
-
-# Upstream patch which fixes the WIMP theme
-Patch1003:      gtk+-2.20.1-xptheme.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 49
@@ -48,11 +38,8 @@ BuildRequires:  mingw32-dlfcn
 BuildRequires:  mingw32-gettext
 BuildRequires:  mingw32-glib2 >= 2.17.7
 BuildRequires:  mingw32-iconv
-BuildRequires:  mingw32-jasper
-BuildRequires:  mingw32-libjpeg
-BuildRequires:  mingw32-libpng >= 1.2.2
-BuildRequires:  mingw32-libtiff
 BuildRequires:  mingw32-pango >= 1.20.0
+BuildRequires:  mingw32-gdk-pixbuf
 BuildRequires:  mingw32-pixman
 BuildRequires:  mingw32-zlib
 
@@ -91,18 +78,13 @@ Static version of the MinGW Windows Gtk2 library.
 
 %patch1000 -p1
 %patch1001 -p0
-%patch1002 -p0
-%patch1003 -p1
-
-# Add support for libpng1.4
-sed -i s/libpng12/libpng14/ configure
 
 
 %build
 # Need to run the correct version of glib-mkenums.
 PATH=%{_mingw32_bindir}:$PATH
 
-%{_mingw32_configure} --disable-cups --enable-static --enable-gdiplus --with-libjasper
+%{_mingw32_configure} --disable-cups --enable-static
 make %{?_smp_mflags}
 
 
@@ -122,15 +104,13 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc
 # The .def files are only used while compiling the libraries themselves
 # (they contain a list of functions which need to be exported by the linker)
 # so they serve no purpose for other libraries and applications
-rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk_pixbuf-2.0.def
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gdk-win32-2.0.def
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gtk-win32-2.0.def
 rm -f $RPM_BUILD_ROOT%{_mingw32_libdir}/gailutil.def
 
-# Install gdk-pixbuf.loaders and gtk.immodules
+# Install the gtk.immodules file
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/
 
 %find_lang %{name} --all-name
 
@@ -143,8 +123,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING
 %{_mingw32_datadir}/themes/*
-%{_mingw32_bindir}/gdk-pixbuf-csource.exe
-%{_mingw32_bindir}/gdk-pixbuf-query-loaders.exe
 %{_mingw32_bindir}/gtk-builder-convert
 %{_mingw32_bindir}/gtk-demo.exe
 %{_mingw32_bindir}/gtk-query-immodules-2.0.exe
@@ -152,7 +130,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/gtk-update-icon-cache.exe.manifest
 %{_mingw32_bindir}/libgailutil-18.dll
 %{_mingw32_bindir}/libgdk-win32-2.0-0.dll
-%{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll
 %{_mingw32_bindir}/libgtk-win32-2.0-0.dll
 %dir %{_mingw32_libdir}/gtk-2.0
 %dir %{_mingw32_libdir}/gtk-2.0/2.10.0
@@ -197,82 +174,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.dll
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.dll.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.la
-%dir %{_mingw32_libdir}/gtk-2.0/2.10.0/loaders
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la
-%if 1
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.la
-%else
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la
-%endif
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-qtif.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-qtif.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-qtif.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.la
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la
 %{_mingw32_libdir}/gtk-2.0/include/
 %dir %{_mingw32_libdir}/gtk-2.0/modules
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.dll
@@ -282,14 +183,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libgailutil.la
 %{_mingw32_libdir}/libgdk-win32-2.0.dll.a
 %{_mingw32_libdir}/libgdk-win32-2.0.la
-%{_mingw32_libdir}/libgdk_pixbuf-2.0.dll.a
-%{_mingw32_libdir}/libgdk_pixbuf-2.0.la
 %{_mingw32_libdir}/libgtk-win32-2.0.dll.a
 %{_mingw32_libdir}/libgtk-win32-2.0.la
 %{_mingw32_libdir}/pkgconfig/gail.pc
 %{_mingw32_libdir}/pkgconfig/gdk-2.0.pc
 %{_mingw32_libdir}/pkgconfig/gdk-win32-2.0.pc
-%{_mingw32_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
 %{_mingw32_libdir}/pkgconfig/gtk+-2.0.pc
 %{_mingw32_libdir}/pkgconfig/gtk+-win32-2.0.pc
 %{_mingw32_includedir}/gtk-2.0/
@@ -302,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_mingw32_libdir}/libgailutil.a
 %{_mingw32_libdir}/libgdk-win32-2.0.a
-%{_mingw32_libdir}/libgdk_pixbuf-2.0.a
 %{_mingw32_libdir}/libgtk-win32-2.0.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.a
@@ -317,37 +214,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.a
 %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-viqr.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-png.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-qtif.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.a
-%if 1
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-bmp.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-emf.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-gif.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-ico.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-jpeg.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-tiff.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gdip-wmf.a
-%else
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
-%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.a
-%endif
 %{_mingw32_libdir}/gtk-2.0/modules/libgail.a
 
 
 %changelog
+* Sun Sep 12 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21.7-1
+- Update to 2.21.7
+- Dropped upstreamed WIMP theme patch
+- Moved all gdk-pixbuf bits to a seperate package as upstream has separated it
+- Added BR: mingw32-gdk-pixbuf
+
 * Sun Jul  4 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.20.1-2
 - Re-enable the WIMP theme now that upstream has provided a fix for it (RHBZ #608911, GNOME BZ #598299)
 - Rebuild against libpng 1.4.3

More information about the scm-commits mailing list