[arch-commits] CVS update of extra/office/openoffice-base (2 files)

[andyrtr at archlinux.org]

    Date: Friday, October 19, 2007 @ 17:38:32
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/openoffice-base

Modified: PKGBUILD (1.58 -> 1.59)
 Removed: buildfix-agg_2_5_oog680_m3.diff (1.1)

removed agg related patch


---------------------------------+
 PKGBUILD                        |    1 -
 buildfix-agg_2_5_oog680_m3.diff |   14 --------------
 2 files changed, 15 deletions(-)


Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.58 extra/office/openoffice-base/PKGBUILD:1.59
--- extra/office/openoffice-base/PKGBUILD:1.58	Fri Oct 19 17:36:40 2007
+++ extra/office/openoffice-base/PKGBUILD	Fri Oct 19 17:38:32 2007
@@ -55,7 +55,6 @@
 	fix-invisible-text.diff
 	gui-insensitive_oog680_m2.diff
 	neon27-oog680_m3.diff
-	buildfix-agg_2_5_oog680_m3.diff
 	ucb-no-CURL_NO_OLDIES_oog_m5.diff
 	libxmlsec-system-nss_oog_m5.diff
 	libxmlsec-findcerts_oog_m5.diff
Index: extra/office/openoffice-base/buildfix-agg_2_5_oog680_m3.diff
diff -u extra/office/openoffice-base/buildfix-agg_2_5_oog680_m3.diff:1.1 extra/office/openoffice-base/buildfix-agg_2_5_oog680_m3.diff:removed
--- extra/office/openoffice-base/buildfix-agg_2_5_oog680_m3.diff:1.1	Mon Sep  3 14:30:06 2007
+++ extra/office/openoffice-base/buildfix-agg_2_5_oog680_m3.diff	Fri Oct 19 17:38:32 2007
@@ -1,14 +0,0 @@
---- config_office/configure.in
-+++ config_office/configure.in
-@@ -4072,7 +4072,10 @@
-             AGG_INCDIR="`echo $AGG_CFLAGS | $SED -e s/-I//`"
-          fi
-          # we could have used pkg-config --modversion but 2.4's libagg.pc.in still contains 2.3 :/
--         if $GREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
-+         if echo Detected agg version is `pkg-config --modversion libagg` | grep 2.5.0
-+         then AGG_VERSION=2500
-+         AC_MSG_RESULT([2.5])
-+         elif $GREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then
-             AC_MSG_RESULT([2.4])
-             AGG_VERSION=2400
-          else