diff options
Diffstat (limited to 'main/abiword')
| -rw-r--r-- | main/abiword/APKBUILD | 30 | ||||
| -rw-r--r-- | main/abiword/abiword-2.8.6-glib-2.31.patch | 40 | ||||
| -rw-r--r-- | main/abiword/abiword-2.8.6-no-undefined.patch | 21 | ||||
| -rw-r--r-- | main/abiword/abiword-png15.patch | 81 |
4 files changed, 13 insertions, 159 deletions
diff --git a/main/abiword/APKBUILD b/main/abiword/APKBUILD index 5a5fcc42c7..c647e33c9c 100644 --- a/main/abiword/APKBUILD +++ b/main/abiword/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=abiword -pkgver=2.8.6 -pkgrel=14 +pkgver=3.0.0 +pkgrel=0 pkgdesc="A fully-featured word processor" url="http://www.abisource.com" arch="all" license="GPL" -makedepends="pkgconfig libglade-dev libgsf-dev enchant-dev fribidi-dev wv-dev - popt-dev libjpeg-turbo-dev librsvg-dev bzip2-dev goffice0.8-dev pcre-dev - autoconf automake libtool" +makedepends="gtk+3.0-dev libgsf-dev enchant-dev fribidi-dev wv-dev + popt-dev libjpeg-turbo-dev librsvg-dev bzip2-dev goffice-dev pcre-dev + libxslt-dev" # openxml plugin makedepends="$makedepends boost-dev" @@ -19,19 +19,17 @@ makedepends="$makedepends gnutls-dev libsoup-dev dbus-glib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-plugins" -_plugins="applix babelfish bmp clarisworks collab docbook eml freetranslation - garble gdict gimp google hancom hrtext iscii kword loadbindings mht - mif mswrite openwriter openxml opml paint passepartout pdb pdf - presentation s5 sdw t602 urldict wikipedia wml xslfo" +_plugins="applix babelfish bmp clarisworks collab docbook eml epub + freetranslation garble gdict gimp google hancom hrtext iscii kword + latex loadbindings mht mif mswrite openwriter openxml opml paint + passepartout pdb pdf presentation s5 sdw t602 urldict wikipedia wml + xslfo" for _i in $_plugins; do subpackages="$subpackages $pkgname-plugin-$_i:$_i" done source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz - abiword-png15.patch - abiword-2.8.6-no-undefined.patch - abiword-2.8.6-glib-2.31.patch " prepare() { @@ -41,7 +39,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - autoreconf --force --install } build() { @@ -86,7 +83,6 @@ plugins() { mkdir -p "$subpkgdir" } -md5sums="f883b0a7f26229a9c66fd6a1a94381aa abiword-2.8.6.tar.gz -1d0bb11ed10b431ab312173de81d12c4 abiword-png15.patch -42e2614b6e0aad457d91f6ce20b6f225 abiword-2.8.6-no-undefined.patch -2cd22b0c06cf1d285731e5bade666c26 abiword-2.8.6-glib-2.31.patch" +md5sums="8d9c41cff3a8fbef8d0c835c65600e65 abiword-3.0.0.tar.gz" +sha256sums="d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01 abiword-3.0.0.tar.gz" +sha512sums="3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637 abiword-3.0.0.tar.gz" diff --git a/main/abiword/abiword-2.8.6-glib-2.31.patch b/main/abiword/abiword-2.8.6-glib-2.31.patch deleted file mode 100644 index beff2289fd..0000000000 --- a/main/abiword/abiword-2.8.6-glib-2.31.patch +++ /dev/null @@ -1,40 +0,0 @@ ------------------------------------------------------------------------- -r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines -Changed paths: - M /abiword/trunk/src/af/util/xp/ut_go_file.h - -Bug 13197: only import glib.h -Patch by Dominique Leuenberger. ------------------------------------------------------------------------- -r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines -Changed paths: - M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h - -Bug 13247 - Fix glib headers. Patch by Funda Wang -(safe to backport) ------------------------------------------------------------------------- -Index: src/af/util/xp/ut_go_file.h -=================================================================== ---- ./src/af/util/xp/ut_go_file.h (revision 30478) -+++ ./src/af/util/xp/ut_go_file.h (revision 30479) -@@ -31,7 +31,6 @@ - - #include <glib.h> - #include <gsf/gsf.h> --#include <glib/gerror.h> - #include <time.h> - - G_BEGIN_DECLS -Index: goffice-bits/goffice/app/goffice-app.h -=================================================================== ---- ./goffice-bits/goffice/app/goffice-app.h (revision 30601) -+++ ./goffice-bits/goffice/app/goffice-app.h (revision 30602) -@@ -22,7 +22,7 @@ - #ifndef GOFFICE_APP_H - #define GOFFICE_APP_H - --#include <glib/gmacros.h> -+#include <glib.h> - - G_BEGIN_DECLS - diff --git a/main/abiword/abiword-2.8.6-no-undefined.patch b/main/abiword/abiword-2.8.6-no-undefined.patch deleted file mode 100644 index c07000edbf..0000000000 --- a/main/abiword/abiword-2.8.6-no-undefined.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am ---- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200 -+++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200 -@@ -107,7 +107,7 @@ - - AbiWord_LDFLAGS = \ - $(DEPS_LIBS) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic \ - -headerpad_max_install_names -@@ -129,7 +129,7 @@ - - abiword_LDFLAGS = \ - $(platform_ldflags) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic - diff --git a/main/abiword/abiword-png15.patch b/main/abiword/abiword-png15.patch deleted file mode 100644 index b17bb85bff..0000000000 --- a/main/abiword/abiword-png15.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur abiword-vanilla//src/af/util/xp/ut_png.cpp abiword-2.8.6//src/af/util/xp/ut_png.cpp ---- abiword-vanilla//src/af/util/xp/ut_png.cpp 2008-02-24 04:33:07.000000000 +0100 -+++ abiword-2.8.6//src/af/util/xp/ut_png.cpp 2011-02-24 11:53:18.954524499 +0100 -@@ -71,7 +71,7 @@ - * 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)); -diff -Naur abiword-vanilla//src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp abiword-2.8.6//src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp ---- abiword-vanilla//src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2009-07-01 06:02:04.000000000 +0200 -+++ abiword-2.8.6//src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2011-02-24 11:53:19.039523946 +0100 -@@ -185,7 +185,7 @@ - /** 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 @@ - * 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); ---- abiword-vanilla/plugins/garble/xp/abiword-garble-png.cpp -+++ abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp -@@ -79,7 +79,7 @@ - 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 ); - } - ---- abiword-vanilla/plugins/bmp/xp/ie_impGraphic_BMP.cpp -+++ abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp -@@ -191,7 +191,6 @@ - - /* Clean Up Memory Used */ - -- FREEP(m_pPNGInfo->palette); - DELETEP(pBB); - png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); - -@@ -313,7 +312,7 @@ - * 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 +331,7 @@ - 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 +371,7 @@ - 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; |