diff options
Diffstat (limited to 'extra/abiword')
-rw-r--r-- | extra/abiword/PKGBUILD | 37 | ||||
-rw-r--r-- | extra/abiword/abiword-2.8.6-libpng15.patch | 100 |
2 files changed, 127 insertions, 10 deletions
diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD index 2bb71bb52..b02d1bc68 100644 --- a/extra/abiword/PKGBUILD +++ b/extra/abiword/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 139550 2011-10-03 12:22:58Z jgc $ +# $Id: PKGBUILD 148668 2012-02-05 11:46:18Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Maƫl Lavault <moimael@neuf.fr> pkgbase=abiword pkgname=('abiword' 'abiword-plugins') pkgver=2.8.6 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') license=('GPL') url="http://www.abisource.com" -makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup') +makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' + 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup') options=('!makeflags' '!libtool') source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz" - compat_libwpg_0_9.patch - abiword-2.8.6-no-undefined.patch) -sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df' - 'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea' - '159b1cd0b9354868ab86f851b64a03dae7d254dc') + 'compat_libwpg_0_9.patch' + 'abiword-2.8.6-no-undefined.patch' + 'abiword-2.8.6-libpng15.patch') +md5sums=('f883b0a7f26229a9c66fd6a1a94381aa' + '09446a2ebba8288fc611e88f7cf17298' + '42e2614b6e0aad457d91f6ce20b6f225' + '40e370e7e88c5437140ef18037abfbd3') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -24,10 +27,23 @@ build() { patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch" # fix a gcc 4.6.x build issue, patch from Fedora patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch" + patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch" + libtoolize --force autoreconf - ./configure --prefix=/usr --enable-clipart --enable-templates --enable-collab-backend-xmpp --enable-collab-backend-tcp --enable-collab-backend-service --disable-collab-backend-sugar --enable-plugins --without-gnomevfs --with-gio --with-goffice --disable-static --with-psiconv-config=/nothere + ./configure --prefix=/usr \ + --enable-clipart \ + --enable-templates \ + --enable-collab-backend-xmpp \ + --enable-collab-backend-tcp \ + --enable-collab-backend-service \ + --disable-collab-backend-sugar \ + --enable-plugins --without-gnomevfs \ + --with-gio \ + --with-goffice \ + --disable-static \ + --with-psiconv-config=/nothere make } @@ -54,7 +70,8 @@ package_abiword() { package_abiword-plugins() { pkgdesc="Additional plugins for Abiword" - depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') + depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' + 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') cd "${srcdir}/${pkgbase}-${pkgver}/plugins" for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do diff --git a/extra/abiword/abiword-2.8.6-libpng15.patch b/extra/abiword/abiword-2.8.6-libpng15.patch new file mode 100644 index 000000000..7eded4c83 --- /dev/null +++ b/extra/abiword/abiword-2.8.6-libpng15.patch @@ -0,0 +1,100 @@ +$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ + +Fix build with png-1.5. + +--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2009-06-25 04:02:06.000000000 +0000 ++++ plugins/bmp/xp/ie_impGraphic_BMP.cpp +@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap + + /* Clean Up Memory Used */ + +- FREEP(m_pPNGInfo->palette); ++ png_colorp palette; ++ int num_palette; ++ png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette ); ++ FREEP(palette); + DELETEP(pBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + +@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB) + { + /* Reset error handling for libpng */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + return UT_ERROR; +@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB) + { + /* Reset error handling for libpng */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + return UT_ERROR; + +$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ + +Fix build with png-1.5. + +--- plugins/garble/xp/abiword-garble-png.cpp.orig 2009-09-05 15:34:44.000000000 +0000 ++++ plugins/garble/xp/abiword-garble-png.cpp +@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void* + png_set_strip_alpha( png_ptr ); + png_set_interlace_handling( png_ptr ); + png_set_bgr( png_ptr ); +- rowbytes = info_ptr->rowbytes; ++ rowbytes = png_get_rowbytes( png_ptr, info_ptr ); + png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); + } + +$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $ + +Fix build with png-1.5. + +--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig 2009-07-01 04:02:04.000000000 +0000 ++++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp +@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import + /** needed for the stejmp context */ + UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf) + { +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + DELETEP(m_pPngBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $ + +Fix build with png-1.5. + +--- src/af/util/xp/ut_png.cpp.orig 2008-02-24 03:33:07.000000000 +0000 ++++ src/af/util/xp/ut_png.cpp +@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL)); |