diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-07 15:10:29 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-07 15:10:29 +0100 |
| commit | 4c4400925b792b694511bbbf2f645fb34495d5cf (patch) | |
| tree | 86a3b3c62e75fdf9c536306d195bbbcbc7ac974c /extra/libwmf | |
| parent | 08adec2ac14efea1ef452e79ff86f024b9becaf3 (diff) | |
| parent | 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bwbar/PKGBUILD
community/directfb/PKGBUILD
community/extremetuxracer/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gnash/PKGBUILD
community/guake/PKGBUILD
community/pidgin-libnotify/PKGBUILD
community/png2ico/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/torcs/PKGBUILD
community/virtualbox/PKGBUILD
extra/abiword/PKGBUILD
extra/alsaplayer/PKGBUILD
extra/automoc4/PKGBUILD
extra/cagibi/PKGBUILD
extra/fltk/PKGBUILD
extra/gnome-desktop2/PKGBUILD
extra/gnome-python/PKGBUILD
extra/gnome-sharp/PKGBUILD
extra/gnugo/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtkmm/PKGBUILD
extra/imlib2/PKGBUILD
extra/koffice/PKGBUILD
extra/lcms/PKGBUILD
extra/libao/PKGBUILD
extra/libcue/PKGBUILD
extra/libdaemon/PKGBUILD
extra/libgnome-media-profiles/PKGBUILD
extra/libotf/PKGBUILD
extra/libotr/PKGBUILD
extra/libots/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libtiff/PKGBUILD
extra/libwebkit/PKGBUILD
extra/libwmf/PKGBUILD
extra/libxfcegui4/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/netpbm/PKGBUILD
extra/php/PKGBUILD
extra/plotutils/PKGBUILD
extra/poppler/PKGBUILD
extra/qrencode/PKGBUILD
extra/qt/PKGBUILD
extra/qtiplot/PKGBUILD
extra/rssh/PKGBUILD
extra/scim-chewing/PKGBUILD
extra/scim-m17n/PKGBUILD
extra/scim-pinyin/PKGBUILD
extra/scim-tables/PKGBUILD
extra/scim-uim/PKGBUILD
extra/tsocks/PKGBUILD
extra/vigra/PKGBUILD
extra/w3m/PKGBUILD
extra/wv/PKGBUILD
extra/xclip/PKGBUILD
extra/xfce4-datetime-plugin/PKGBUILD
extra/xfce4-notes-plugin/PKGBUILD
extra/xfce4-quicklauncher-plugin/PKGBUILD
extra/xfce4-sensors-plugin/PKGBUILD
extra/xorg-font-util/PKGBUILD
extra/xorg-setxkbmap/PKGBUILD
extra/xorg-xev/PKGBUILD
extra/xsane/PKGBUILD
extra/yakuake/PKGBUILD
extra/zvbi/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-libcanberra/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-libglade/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/wine/PKGBUILD
testing/vlc/PKGBUILD
testing/xulrunner/PKGBUILD
Diffstat (limited to 'extra/libwmf')
| -rw-r--r-- | extra/libwmf/PKGBUILD | 27 | ||||
| -rw-r--r-- | extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch | 12 |
2 files changed, 25 insertions, 14 deletions
diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD index 06f31c7ff..21a887b8f 100644 --- a/extra/libwmf/PKGBUILD +++ b/extra/libwmf/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 87507 2010-08-15 06:45:18Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: FJ <joostef@gmail.com> +# $Id: PKGBUILD 148846 2012-02-05 11:52:43Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libwmf pkgver=0.2.8.4 -pkgrel=8.1 +pkgrel=9 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)" arch=('i686' 'x86_64' 'mips64el') url="http://wvware.sourceforge.net/libwmf.html" -license=("LGPL") -depends=('libpng' 'libx11' 'freetype2' 'libjpeg' 'gsfonts' 'expat') -makedepends=('gtk2' 'libxt' 'pkg-config') +license=('LGPL') +depends=('libpng' 'libx11' 'libjpeg' 'gsfonts') +makedepends=('gtk2' 'libxt') +optdepends=('gdk-pixbuf2: for pixbuf loader') options=('!libtool' '!docs' '!emptydirs') install=libwmf.install source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz - libpng14.patch libwmf-0.2.8.4-useafterfree.patch) -md5sums=('d1177739bf1ceb07f57421f0cee191e0' '33d3c07a1be9f99fd88de220930c5550'\ - '0f02c1cb8a87bf7158634503bf0537e2') -sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' '15edb94eec7c9cea988e83660b334e56bf1fe897'\ - 'ea6d28880840e86c96f9079bfd591da54dcffa5c') + libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch) +sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' + '42aa4c2a82e4e14044c875a7f439baea732a355a' + 'ea6d28880840e86c96f9079bfd591da54dcffa5c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libpng14.patch" - patch -Np1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" + patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch" + patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch" ./configure --prefix=/usr \ --with-gsfontdir=/usr/share/fonts/Type1 \ --with-fontdir=/usr/share/fonts/Type1 \ diff --git a/extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch b/extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch new file mode 100644 index 000000000..3528c74eb --- /dev/null +++ b/extra/libwmf/libwmf-0.2.8.4-libpng-1.5.patch @@ -0,0 +1,12 @@ +diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h +--- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h 2011-05-23 19:14:23.000000000 +0200 ++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h 2011-05-23 19:15:11.000000000 +0200 +@@ -66,7 +66,7 @@ + return; + } + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)"); + png_destroy_write_struct (&png_ptr,&info_ptr); + wmf_free (API,buffer); |