diff --git a/mingw-w64-gdk-pixbuf2/0003-More-of-bug-733137-Don-t-force-no-static-builds-on-W.patch b/mingw-w64-gdk-pixbuf2/0003-More-of-bug-733137-Don-t-force-no-static-builds-on-W.patch new file mode 100644 index 0000000000..aa71822995 --- /dev/null +++ b/mingw-w64-gdk-pixbuf2/0003-More-of-bug-733137-Don-t-force-no-static-builds-on-W.patch @@ -0,0 +1,40 @@ +From 7071a84c138ddb69085dd7f75e4c1cbeff39e400 Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Sat, 9 Jan 2016 17:22:17 +0000 +Subject: [PATCH] More of bug 733137 - Don't force no static builds on Win32 + +And also: https://github.com/Alexpux/MINGW-packages/issues/987 + +From reading recent discussions, I believe static initiailizers +are handled OK now on all MSVC versions and MinGW-w64 GCC never +had any problems. So there is no need to avoid static libraries +globally (though avoiding them globally was never appropriate!) +--- + configure.ac | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0e1654f..a3f0781 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -136,17 +136,6 @@ case $host in + ;; + esac + +-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 +- + dnl Initialize libtool + LT_PREREQ([2.2.6]) + LT_INIT([disable-static win32-dll]) +-- +2.6.3 + diff --git a/mingw-w64-gdk-pixbuf2/PKGBUILD b/mingw-w64-gdk-pixbuf2/PKGBUILD index 5f1c09eab3..03b169604c 100644 --- a/mingw-w64-gdk-pixbuf2/PKGBUILD +++ b/mingw-w64-gdk-pixbuf2/PKGBUILD @@ -1,11 +1,12 @@ # Maintainer: Alexey Pavlov +# Maintainer: Ray Donnelly # Contributor: Renato Silva _realname=gdk-pixbuf2 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.32.1 -pkgrel=3 +pkgrel=4 pkgdesc="An image loading library (mingw-w64)" arch=('any') url="http://www.gtk.org" @@ -19,19 +20,22 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-libtiff") -options=('strip' 'staticlibs' 'emptydirs') +options=('emptydirs') install=${_realname}-${CARCH}.install source=("http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz" 0001-Use-a-regex-to-properly-export-the-symbols.patch - 0002-gdk-pixbuf-introspection.patch) + 0002-gdk-pixbuf-introspection.patch + 0003-More-of-bug-733137-Don-t-force-no-static-builds-on-W.patch) sha256sums=('4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc' 'e8d278e30c44e973e14e3c61e8ab195621d6a9a402e0da557db4616955ca4543' - 'dd496d66f0a6b369410fb4039e116ac7d6c2808c97998932a1f8f70b58f88ce2') + 'dd496d66f0a6b369410fb4039e116ac7d6c2808c97998932a1f8f70b58f88ce2' + 'cf2f92e0beb26bb917383ac0128108ead97ae2ebf120baa8071dced470c8be2a') prepare() { cd ${srcdir}/gdk-pixbuf-${pkgver} - patch -p1 -i ${srcdir}/0001-Use-a-regex-to-properly-export-the-symbols.patch - patch -p1 -i ${srcdir}/0002-gdk-pixbuf-introspection.patch + patch -p1 -i "${srcdir}"/0001-Use-a-regex-to-properly-export-the-symbols.patch + patch -p1 -i "${srcdir}"/0002-gdk-pixbuf-introspection.patch + patch -p1 -i "${srcdir}"/0003-More-of-bug-733137-Don-t-force-no-static-builds-on-W.patch autoreconf -fi }