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

[andyrtr at archlinux.org]

    Date: Tuesday, September 25, 2007 @ 23:11:38
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/openoffice-base

   Added: ucb-no-CURL_NO_OLDIES_oog_m5.diff (1.1)
Modified: PKGBUILD (1.54 -> 1.55)

fixed macro settings not accessable


-----------------------------------+
 PKGBUILD                          |    6 ++++--
 ucb-no-CURL_NO_OLDIES_oog_m5.diff |   18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)


Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.54 extra/office/openoffice-base/PKGBUILD:1.55
--- extra/office/openoffice-base/PKGBUILD:1.54	Wed Sep 19 22:58:00 2007
+++ extra/office/openoffice-base/PKGBUILD	Tue Sep 25 23:11:37 2007
@@ -3,7 +3,7 @@
 
 pkgname=openoffice-base
 pkgver=2.3.0
-pkgrel=1.1
+pkgrel=2
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
 #_OO_milestone=oog680-m5
@@ -58,6 +58,7 @@
 	gui-insensitive_oog680_m2.diff
 	neon27-oog680_m3.diff
 	buildfix-agg_2_5_oog680_m3.diff
+	ucb-no-CURL_NO_OLDIES_oog_m5.diff
 	#http://oooconv.free.fr/fontooo/FontOOo.sxw
 	FontOOo_1.7.1.sxw # from http://www.openoffice.org/issues/show_bug.cgi?id=81102
 	awt_x86_64.diff)
@@ -110,6 +111,8 @@
 	patch -Np1 -i ../neon27-oog680_m3.diff || return 1
 	# allows to build against neoin 0.27
 	patch -Np0 -i ../buildfix-agg_2_5_oog680_m3.diff || return 1
+	# allows to build against new system curl
+	patch -Np0 -i ../ucb-no-CURL_NO_OLDIES_oog_m5.diff || return 1
 
 
 	# important bugfixes
@@ -163,7 +166,6 @@
 	--disable-qadevooo\
 	--disable-systray\
 	--disable-gpc\
-	--disable-mozilla\
 	--enable-gtk\
 	--enable-kde\
 	--enable-cups\
Index: extra/office/openoffice-base/ucb-no-CURL_NO_OLDIES_oog_m5.diff
diff -u /dev/null extra/office/openoffice-base/ucb-no-CURL_NO_OLDIES_oog_m5.diff:1.1
--- /dev/null	Tue Sep 25 23:11:38 2007
+++ extra/office/openoffice-base/ucb-no-CURL_NO_OLDIES_oog_m5.diff	Tue Sep 25 23:11:37 2007
@@ -0,0 +1,18 @@
+Index: source/ucp/ftp/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/ftp/makefile.mk,v
+retrieving revision 1.13
+retrieving revision 1.12
+diff -u -u -r1.13 -r1.12
+--- ucb/source/ucp/ftp/makefile.mk	20 Sep 2004 14:32:42 -0000	1.13
++++ ucb/source/ucp/ftp/makefile.mk	2 Feb 2004 18:36:22 -0000	1.12
+@@ -75,9 +75,7 @@
+ 
+ .INCLUDE: settings.mk
+ 
+-.IF "$(SYSTEM_CURL)" == "YES"
+-CFLAGS+=-DCURL_NO_OLDIES
+-.ENDIF
++#CFLAGS +=-fno-inline
+ 
+ # --- General -----------------------------------------------------
\ No newline at end of file