From: Richard W.M. Jones <"Richard W.M. Jones "> Date: Fri, 23 Jan 2009 14:02:41 +0000 (+0000) Subject: - Rebase to native Fedora version 1.14.11. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=bba404d29c5dd6cea924b47e8115a0ee4626d3bc;p=fedora-mingw.git - Rebase to native Fedora version 1.14.11. - Use find_lang macro. - Remove mingw32-libgsf-1.14.10-better-bz2-detection.patch, now upstream. - Remove mingw32-libgsf-1.14.10-glib-deprecated.patch, now fixed upstream. - +BR mingw32-dlfcn. --- diff --git a/libgsf/mingw32-libgsf-1.14.10-better-bz2-detection.patch b/libgsf/mingw32-libgsf-1.14.10-better-bz2-detection.patch deleted file mode 100644 index 08fc7f0..0000000 --- a/libgsf/mingw32-libgsf-1.14.10-better-bz2-detection.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- libgsf-1.14.10.orig/configure.in 2008-10-19 13:37:35.000000000 +0100 -+++ libgsf-1.14.10.mingw/configure.in 2008-11-22 17:04:10.000000000 +0000 -@@ -321,30 +321,36 @@ - - with_bz2=false - if test "x$test_bz2" = xtrue ; then -- AC_CHECK_LIB(bz2, BZ2_bzDecompressInit, -- bz2_ok=yes, -- bz2_ok=no -- AC_MSG_WARN(*** BZ2 support disabled (BZ2 library not found) ***)) -- -- if test "$bz2_ok" = yes; then -- AC_MSG_CHECKING([for bzlib.h]) -- AC_PREPROC_IFELSE( -- [AC_LANG_SOURCE( -+ dnl AC_CHECK_LIB doesn't work with the Windows port of libbz2 because -+ dnl it uses the __stdcall calling convention where the callee cleans -+ dnl up the stack. You have to include in order to get the -+ dnl right calling convention, and the link fails if not. Since we -+ dnl require both -lbz2 and , just test if a program which -+ dnl uses both can be compiled. -+ -+ old_LIBS="$LIBS" -+ LIBS="-lbz2 $LIBS" -+ AC_LINK_IFELSE( -+ [AC_LANG_SOURCE( - [[#include -- #undef PACKAGE -- #undef VERSION -- #undef HAVE_STDLIB_H -- #include ]])], -- bz2_ok=yes, -- bz2_ok=no) -- AC_MSG_RESULT($bz2_ok) -- fi -+ #undef PACKAGE -+ #undef VERSION -+ #undef HAVE_STDLIB_H -+ #include -+ main () -+ { -+ return BZ2_bzDecompressInit (NULL, 0, 0); -+ } -+ ]])], -+ bz2_ok=yes, -+ bz2_ok=no) -+ LIBS="$old_LIBS" - - if test "$bz2_ok" = yes; then - AC_DEFINE(HAVE_BZ2, 1, [Is bzip2 available and enabled]) - BZ2_LIBS="-lbz2" - else -- AC_MSG_WARN(*** BZ2 support disabled (BZ2 header not found) ***) -+ AC_MSG_WARN(*** BZ2 support disabled (BZ2 header or library not found) ***) - fi - else - AC_MSG_WARN([BZ2 support disabled, as requested (Use --with-bz2 to enable)]) diff --git a/libgsf/mingw32-libgsf-1.14.10-glib-deprecated.patch b/libgsf/mingw32-libgsf-1.14.10-glib-deprecated.patch deleted file mode 100644 index 69c3ab9..0000000 --- a/libgsf/mingw32-libgsf-1.14.10-glib-deprecated.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libgsf-1.14.10.orig/gsf/gsf-utils.c 2008-07-01 13:56:53.000000000 +0100 -+++ libgsf-1.14.10.mingw/gsf/gsf-utils.c 2008-11-22 17:01:35.000000000 +0000 -@@ -19,6 +19,11 @@ - * USA - */ - -+/* Needed for G_WIN32_DLLMAIN_FOR_DLL_NAME below. Maybe a better -+ * solution would be to remove that macro use instead. -+ */ -+#undef G_DISABLE_DEPRECATED -+ - #include - #include - #include diff --git a/libgsf/mingw32-libgsf.spec b/libgsf/mingw32-libgsf.spec index bbacbde..45b016a 100644 --- a/libgsf/mingw32-libgsf.spec +++ b/libgsf/mingw32-libgsf.spec @@ -27,6 +27,7 @@ BuildRequires: mingw32-bzip2 >= 1.0.5-4 BuildRequires: mingw32-gettext BuildRequires: mingw32-iconv BuildRequires: mingw32-zlib +BuildRequires: mingw32-dlfcn # We don't have bonobo in MinGW yet: #BuildRequires: mingw32-libbonobo # We don't build Python packages yet: @@ -38,9 +39,6 @@ BuildRequires: autoconf BuildRequires: pkgconfig BuildRequires: intltool -Patch1000: mingw32-libgsf-1.14.10-better-bz2-detection.patch -Patch1001: mingw32-libgsf-1.14.10-glib-deprecated.patch - %description A library for reading and writing structured files (eg MS OLE and Zip). @@ -51,9 +49,6 @@ This is the MinGW Windows cross-compiled port of libgsf. %prep %setup -q -n libgsf-%{version} -%patch1000 -p1 -%patch1001 -p1 - autoconf @@ -90,7 +85,7 @@ rm -f $RPM_BUILD_ROOT%{_mingw32_bindir}/gsf-office-thumbnailer.exe rm -rf $RPM_BUILD_ROOT -%files -f libgsf.mo +%files -f libgsf.lang %defattr(-,root,root) %{_mingw32_bindir}/gsf.exe %{_mingw32_bindir}/gsf-vba-dump.exe @@ -109,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT * Fri Jan 23 2009 Richard W.M. Jones - 1.14.11-1 - Rebase to native Fedora version 1.14.11. - Use find_lang macro. +- Remove mingw32-libgsf-1.14.10-better-bz2-detection.patch, now upstream. +- Remove mingw32-libgsf-1.14.10-glib-deprecated.patch, now fixed upstream. +- +BR mingw32-dlfcn. * Sat Nov 22 2008 Richard W.M. Jones - 1.14.10-2 - +BR intltool.