diff --git a/.cvsignore b/.cvsignore index f99a54a..59fdb17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gtk+-2.15.0.tar.bz2 +gtk+-2.15.5.tar.bz2 diff --git a/mingw32-gtk2-enable_static_build.patch b/mingw32-gtk2-enable_static_build.patch new file mode 100644 index 0000000..c04840b --- /dev/null +++ b/mingw32-gtk2-enable_static_build.patch @@ -0,0 +1,29 @@ +--- configure.in.orig 2009-03-08 17:44:05.697993414 +0100 ++++ configure.in 2009-03-08 17:44:14.634993047 +0100 +@@ -171,16 +171,16 @@ + CXXFLAGS="$gtk_save_cxxflags" + AC_LANG_RESTORE + +-if test "$os_win32" = "yes"; then +- if test x$enable_static = xyes -o x$enable_static = x; then +- AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) +- enable_static=no +- fi +- if test x$enable_shared = xno; then +- AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) +- fi +- enable_shared=yes +-fi ++#if test "$os_win32" = "yes"; then ++# if test x$enable_static = xyes -o x$enable_static = x; then ++# AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.]) ++# enable_static=no ++# fi ++# if test x$enable_shared = xno; then ++# AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.]) ++# fi ++# enable_shared=yes ++#fi + + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL diff --git a/mingw32-gtk2.spec b/mingw32-gtk2.spec index 932aaec..cab0c48 100644 --- a/mingw32-gtk2.spec +++ b/mingw32-gtk2.spec @@ -5,8 +5,8 @@ %define __find_provides %{_mingw32_findprovides} Name: mingw32-gtk2 -Version: 2.15.0 -Release: 4%{?dist} +Version: 2.15.5 +Release: 1%{?dist} Summary: MinGW Windows Gtk2 library License: LGPLv2+ @@ -23,6 +23,9 @@ Source1: gdk-pixbuf.loaders # Fix use of extended buttons in gtkstatusicon. Patch1000: mingw32-gtk2-2.15.0-xbuttons.patch +# Enable building a static library of GTK +Patch1001: mingw32-gtk2-enable_static_build.patch + BuildArch: noarch BuildRequires: mingw32-filesystem >= 40 @@ -53,6 +56,11 @@ BuildRequires: gtk2 # Native one for gdk-pixbuf-csource BuildRequires: gtk2-devel +# These are required for the static library patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool + Requires: pkgconfig @@ -60,17 +68,31 @@ Requires: pkgconfig MinGW Windows Gtk2 library. +%package static +Summary: Static version of the MinGW Windows Gtk2 library +Requires: %{name} = %{version}-%{release} + +%description static +Static version of the MinGW Windows Gtk2 library. + + %prep %setup -q -n gtk+-%{version} %patch1000 -p1 +%patch1001 -p0 + +# Regenerate the configure script +aclocal +autoreconf +libtoolize %build # Need to run the correct version of glib-mkenums. PATH=%{_mingw32_bindir}:$PATH -%{_mingw32_configure} --disable-cups --disable-static +%{_mingw32_configure} --disable-cups --enable-static --disable-gdiplus --without-libtiff make %{?_smp_mflags} @@ -87,6 +109,14 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir} # Remove documentation too. 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. mkdir -p $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-2.0/ @@ -99,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYING %{_mingw32_datadir}/themes/* %{_mingw32_bindir}/gdk-pixbuf-csource.exe @@ -112,7 +142,124 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_bindir}/libgdk-win32-2.0-0.dll %{_mingw32_bindir}/libgdk_pixbuf-2.0-0.dll %{_mingw32_bindir}/libgtk-win32-2.0-0.dll -%{_mingw32_libdir}/gtk-2.0/ +%dir %{_mingw32_libdir}/gtk-2.0 +%dir %{_mingw32_libdir}/gtk-2.0/2.10.0 +%dir %{_mingw32_libdir}/gtk-2.0/2.10.0/engines +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libpixmap.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/engines/libwimp.la +%dir %{_mingw32_libdir}/gtk-2.0/2.10.0/immodules +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-er.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.dll +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.dll.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ti-et.la +%{_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 0 +%{_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 +%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-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 +%{_mingw32_libdir}/gtk-2.0/modules/libgail.dll.a +%{_mingw32_libdir}/gtk-2.0/modules/libgail.la %{_mingw32_libdir}/libgailutil.dll.a %{_mingw32_libdir}/libgailutil.la %{_mingw32_libdir}/libgdk-win32-2.0.dll.a @@ -121,9 +268,6 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libgdk_pixbuf-2.0.la %{_mingw32_libdir}/libgtk-win32-2.0.dll.a %{_mingw32_libdir}/libgtk-win32-2.0.la -%{_mingw32_libdir}/gdk_pixbuf-2.0.def -%{_mingw32_libdir}/gdk-win32-2.0.def -%{_mingw32_libdir}/gtk-win32-2.0.def %{_mingw32_libdir}/pkgconfig/gail.pc %{_mingw32_libdir}/pkgconfig/gdk-2.0.pc %{_mingw32_libdir}/pkgconfig/gdk-win32-2.0.pc @@ -136,8 +280,52 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_datadir}/aclocal/gtk-2.0.m4 %{_mingw32_datadir}/gtk-2.0/ +%files static +%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 +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-am-et.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cedilla.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ime.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-inuktitut.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-ipa.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-multipress.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/immodules/im-thai.a +%{_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-bmp.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a +%{_mingw32_libdir}/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.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-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 +%{_mingw32_libdir}/gtk-2.0/modules/libgail.a %changelog +* Sun Mar 8 2009 Erik van Pienbroek - 2.15.5-1 +- Update to 2.15.5 +- Disable gdiplus support for now because of GNOME BZ#552678 +- Use the ./configure flag --without-libtiff until mingw32-libtiff is packaged +- Fixed the %%defattr line +- Dropped the .def files as they aren't used anymore after compilation +- Added -static subpackage + * Wed Feb 25 2009 Fedora Release Engineering - 2.15.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index ccf67bd..a570efd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23ff288d00b24f0820a4ae79a747f25e gtk+-2.15.0.tar.bz2 +aa010d3fa57cba96f32db352eb35754f gtk+-2.15.5.tar.bz2