Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7ef0255aab13ec004f8126eb4117ce12dae72d31
commit 7ef0255aab13ec004f8126eb4117ce12dae72d31
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Dec 5 13:13:08 2007 +0100
openoffice.org-2.3.1-1-i686 version bump removed patches, they are all in
ooo-build
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index ec7b20f..a2bd7e5 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -5,14 +5,16 @@
pkgname=openoffice.org
USE_DEVEL=${USE_DEVEL:-"n"}
if ! Fuse $USE_DEVEL; then
- upstream=2.3.0
+ upstream=2.3.1
+ branch=-2-3
tree=oog680
- milestone=5
+ milestone=9
pkgver=$upstream
- pkgrel=2
- snapshot=20070912
+ pkgrel=1
+ snapshot=20071205
else
upstream=2.3
+ branch=
tree=oog680
milestone=5
pkgver=$upstream${tree}_m$milestone
@@ -37,7 +39,7 @@ if ! Fuse $USE_DEVEL; then
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
\
+source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
\
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 '' '' '')
diff --git a/source/xapps/openoffice.org/gcj-4.2.2.patch
b/source/xapps/openoffice.org/gcj-4.2.2.patch
deleted file mode 100644
index 873f604..0000000
--- a/source/xapps/openoffice.org/gcj-4.2.2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 31432c2..0000000
--- a/source/xapps/openoffice.org/ucb-no-CURL_NO_OLDIES.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-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
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
