Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8a84fe6fd8b82e1189c2e02afe03f262b7a629c5
commit 8a84fe6fd8b82e1189c2e02afe03f262b7a629c5
Author: CSÉCSY László <[EMAIL PROTECTED]>
Date: Wed Nov 28 19:44:19 2007 +0100
openoffice.org-2.3.0-2-i686
rebuild for hunspell=1.2.1
fixed build for newer curl
fixed build for gcc-4.2.2
with close supervision of vmiklos & janny ;)
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index daf85e7..ec7b20f 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -9,7 +9,7 @@ if ! Fuse $USE_DEVEL; then
tree=oog680
milestone=5
pkgver=$upstream
- pkgrel=1
+ pkgrel=2
snapshot=20070912
else
upstream=2.3
@@ -29,7 +29,7 @@ rodepends=('flac')
makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'firefox' 'apache-ant'
'gcc-gcj' 'kdelibs>=3.5.5' \
'evolution-data-server-ldap' 'boost' 'icu' 'hunspell' 'imake' 'gccmakedep'
'xalan-j' \
'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 'gst-plugins-base'
'gnome-vfs' \
- 'libbonobo' 'procps' 'openldap' 'mono' 'gperf' 'xulrunner')
+ 'libbonobo' 'procps' 'openldap' 'mono' 'gperf' 'xulrunner'
'java-gcj-compat>=1.0.72-7')
groups=('xapps')
archs=('i686' 'x86_64')
if ! Fuse $USE_DEVEL; then
@@ -38,8 +38,9 @@ else
up2date="lynx -dump
http://svn.gnome.org/viewcvs/ooo-build/trunk/configure.in?view=markup |grep
^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'"
fi
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build-$snapshot.tar.bz2
\
-
http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.3.0/SDF/hu.sdf)
-signatures=($source.asc '')
+
http://hu.openoffice.org/source/browse/*checkout*/hu/src/2.3.0/SDF/hu.sdf \
+ gcj-4.2.2.patch ucb-no-CURL_NO_OLDIES.diff)
+signatures=($source.asc '' '' '')
options=([EMAIL PROTECTED] 'scriptlet')
_F_gnome_desktop="y"
Finclude gnome-scriptlet mono
@@ -93,6 +94,7 @@ done
# http://wiki.frugalware.org/OOo_building
build() {
+ unset MAKEFLAGS
Fmonoexport
Fcd ooo-build
diff --git a/source/xapps/openoffice.org/gcj-4.2.2.patch
b/source/xapps/openoffice.org/gcj-4.2.2.patch
new file mode 100644
index 0000000..873f604
--- /dev/null
+++ b/source/xapps/openoffice.org/gcj-4.2.2.patch
@@ -0,0 +1,18 @@
+diff --git a/patches/src680/buildfix-jvmfwk-gcc-4.2.diff
b/patches/src680/buildfix-jvmfwk-gcc-4.2.diff
+index 1907383..0b98ddf 100644
+--- a/patches/src680/buildfix-jvmfwk-gcc-4.2.diff
++++ b/patches/src680/buildfix-jvmfwk-gcc-4.2.diff
+@@ -1,11 +1,12 @@
+ --- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx.ark 2006-11-10
23:23:34.000000000 +0100
+ +++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 2006-11-10
23:24:11.000000000 +0100
+-@@ -71,6 +71,9 @@
++@@ -71,6 +71,10 @@
+ {
+ static char const* ar[]= {
+ "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ + "/gcj-4.2.0/libjvm.so",
+ + "/gcj-4.2.1/libjvm.so",
+++ "/gcj-4.2.2/libjvm.so",
+ + "/gcj-4.3.0/libjvm.so",
+ "/gcj-4.1.1/libjvm.so",
+ "/gcj-4.2/libjvm.so",
diff --git a/source/xapps/openoffice.org/ucb-no-CURL_NO_OLDIES.diff
b/source/xapps/openoffice.org/ucb-no-CURL_NO_OLDIES.diff
new file mode 100644
index 0000000..31432c2
--- /dev/null
+++ b/source/xapps/openoffice.org/ucb-no-CURL_NO_OLDIES.diff
@@ -0,0 +1,37 @@
+diff --git a/patches/src680/apply b/patches/src680/apply
+index 4f5b1f9..022e5a7 100644
+--- a/patches/src680/apply
++++ b/patches/src680/apply
+@@ -777,6 +777,7 @@ SectionOwner => davidf
+
+ [ FrugalwareOnly ]
+ gcc401-stlport45-include.diff, gghibo
++ucb-no-CURL_NO_OLDIES.diff
+
+
+ # ( [EMAIL PROTECTED] deals with defaults apparently )
+diff --git a/patches/src680/ucb-no-CURL_NO_OLDIES.diff
b/patches/src680/ucb-no-CURL_NO_OLDIES.diff
+new file mode 100644
+index 0000000..4ec2d7a
+--- /dev/null
++++ b/patches/src680/ucb-no-CURL_NO_OLDIES.diff
+@@ -0,0 +1,19 @@
++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 -----------------------------------------------------
++
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
