Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=boost149.git;a=commitdiff;h=a59f8352a0098a1afbf928c3b66950810a21b649
commit a59f8352a0098a1afbf928c3b66950810a21b649 Author: Elentir <[email protected]> Date: Sun Apr 29 23:29:39 2012 +0200 abiword-2.8.6-4-x86_64 * rebuild with boost>=1.49.0 * add abiword-gcc47.patch * add abiword-glib2.patch diff --git a/source/xapps-extra/abiword/FrugalBuild b/source/xapps-extra/abiword/FrugalBuild index efa147a..647fe8a 100644 --- a/source/xapps-extra/abiword/FrugalBuild +++ b/source/xapps-extra/abiword/FrugalBuild @@ -4,7 +4,7 @@ pkgname=abiword pkgver=2.8.6 abivers=2.8 -pkgrel=3 +pkgrel=4 pkgdesc="AbiWord is a free word processing program similar to Microsoft(R) Word." url="http://www.abisource.com"; groups=('xapps-extra') @@ -13,13 +13,16 @@ depends=('pango>=1.28.0-2' 'libpng>=1.4.1' 'fontconfig' 'freetype2' 'libxft' \ 'enchant' 'perl' 'fribidi' 'wv' 'atk' 'cairo>=1.8.10-2' 'libxau>=1.0.4' 'libxdmcp' \ 'libsm' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' \ 'libxcursor' 'openssl>=1.0.0' 'libjpeg>=8a' 'libglade' 'librsvg') -makedepends=('boost>=1.46.1') +makedepends=('boost>=1.49.0') options=('scriptlet') _F_gnome_desktop="y" Finclude gnome-scriptlet up2date="lynx -dump http://www.abisource.com/|grep -m1 'stable release is'|tr -d '[:alpha:] [:blank:]' |sed 's/\(.*\)./\1/;s/.//6'" -source=($url/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz) -sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df') +source=($url/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz \ + abiword-glib2.patch abiword-gcc47.patch) +sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df' \ + '82bd2dba9b2b42dfdece0bc80e3bbdec9b62efc9' \ + '1783a4a32eea6e4e2a9044c8ecc87529f9f70244') license="GPL2" conflicts=('abiword-gnome') replaces=('abiword-gnome') @@ -53,6 +56,7 @@ subreplaces=("${subreplaces[@]}" '') build() { unset MAKEFLAGS + Fpatchall Fmake --disable-menubutton --enable-clipart --enable-plugins \ --without-goffice --enable-templates --with-gio --without-gucharmap Fmakeinstall diff --git a/source/xapps-extra/abiword/abiword-gcc47.patch b/source/xapps-extra/abiword/abiword-gcc47.patch new file mode 100644 index 0000000..da2e596 --- /dev/null +++ b/source/xapps-extra/abiword/abiword-gcc47.patch @@ -0,0 +1,30 @@ +diff -Naur abiword-2.8.6new/src/Makefile.in abiword-2.8.6newnew/src/Makefile.in +--- abiword-2.8.6new/src/Makefile.in 2010-06-13 23:17:56.000000000 +0200 ++++ abiword-2.8.6newnew/src/Makefile.in 2012-04-29 23:18:52.506215430 +0200 +@@ -503,7 +503,7 @@ + $(WP_CPPFLAGS) \ + -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\"" + +-libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \ ++libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -Wl,--no-undefined -avoid-version \ + -export-dynamic $(am__append_6) + libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \ + text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \ +@@ -538,7 +538,7 @@ + + @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \ + @TOOLKIT_COCOA_TRUE@ $(DEPS_LIBS) \ +-@TOOLKIT_COCOA_TRUE@ --no-undefined \ ++@TOOLKIT_COCOA_TRUE@ -Wl,--no-undefined \ + @TOOLKIT_COCOA_TRUE@ -avoid-version \ + @TOOLKIT_COCOA_TRUE@ -export-dynamic \ + @TOOLKIT_COCOA_TRUE@ -headerpad_max_install_names +@@ -554,7 +554,7 @@ + + @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \ + @TOOLKIT_COCOA_FALSE@ $(platform_ldflags) \ +-@TOOLKIT_COCOA_FALSE@ --no-undefined \ ++@TOOLKIT_COCOA_FALSE@ -Wl,--no-undefined \ + @TOOLKIT_COCOA_FALSE@ -avoid-version \ + @TOOLKIT_COCOA_FALSE@ -export-dynamic + diff --git a/source/xapps-extra/abiword/abiword-glib2.patch b/source/xapps-extra/abiword/abiword-glib2.patch new file mode 100644 index 0000000..b7f3c1b --- /dev/null +++ b/source/xapps-extra/abiword/abiword-glib2.patch @@ -0,0 +1,23 @@ +diff -Naur abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h abiword-2.8.6new/goffice-bits/goffice/app/goffice-app.h +--- abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h 2007-01-17 00:17:27.000000000 +0100 ++++ abiword-2.8.6new/goffice-bits/goffice/app/goffice-app.h 2012-04-29 22:46:25.342093871 +0200 +@@ -22,7 +22,7 @@ + #ifndef GOFFICE_APP_H + #define GOFFICE_APP_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + +diff -Naur abiword-2.8.6/src/af/util/xp/ut_go_file.h abiword-2.8.6new/src/af/util/xp/ut_go_file.h +--- abiword-2.8.6/src/af/util/xp/ut_go_file.h 2009-08-27 15:27:10.000000000 +0200 ++++ abiword-2.8.6new/src/af/util/xp/ut_go_file.h 2012-04-29 22:49:58.262107164 +0200 +@@ -31,7 +31,6 @@ + + #include <glib.h> + #include <gsf/gsf.h> +-#include <glib/gerror.h> + #include <time.h> + + G_BEGIN_DECLS _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
