Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f939d2430663e82f2823c102a4f74951e6e89238
commit f939d2430663e82f2823c102a4f74951e6e89238 Author: CSÉCSY László <[EMAIL PROTECTED]> Date: Fri Dec 7 09:15:44 2007 +0100 openoffice.org-2.3.1-1-i686 version bump compiled at last, with close introspection of vmiklos@ wasted cpu-cycles donated by KYbest diff --git a/source/xapps/openoffice.org/FrugalBuild b/source/xapps/openoffice.org/FrugalBuild index a2bd7e5..b0381b7 100644 --- a/source/xapps/openoffice.org/FrugalBuild +++ b/source/xapps/openoffice.org/FrugalBuild @@ -41,8 +41,8 @@ else fi 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 '' '' '') + die-pam-die-die-die.patch less-vba.diff store-noinstall.diff) +signatures=($source.asc '' '' '' '') options=([EMAIL PROTECTED] 'scriptlet') _F_gnome_desktop="y" Finclude gnome-scriptlet mono @@ -98,7 +98,11 @@ done build() { unset MAKEFLAGS Fmonoexport - Fcd ooo-build + if [ -n "$branch" ]; then + Fcd ooo-build-$(echo $branch|sed 's/^-//;s/-/./g') + else + Fcd ooo-build + fi # Extra localizations cp $Fsrcdir/hu.sdf src/GSI_hu.sdf || return 1 diff --git a/source/xapps/openoffice.org/die-pam-die-die-die.patch b/source/xapps/openoffice.org/die-pam-die-die-die.patch new file mode 100644 index 0000000..cacbc86 --- /dev/null +++ b/source/xapps/openoffice.org/die-pam-die-die-die.patch @@ -0,0 +1,13 @@ +diff --git a/patches/src680/apply b/patches/src680/apply +index 2dc5da8..71e85ae 100644 +--- a/patches/src680/apply ++++ b/patches/src680/apply +@@ -402,7 +402,7 @@ tools-urlobj-smb-scheme-patch.diff, n#261623, flr + tools-qa-urlobj-unittest.diff, n#261623, flr + + # honour disable-*-link +-config_office-honour-disable-link.diff, i#83088, fridrich ++#config_office-honour-disable-link.diff, i#83088, fridrich + + # misc mozilla checks + config_office-misc-mozilla-checks.diff, i#83090, fridrich diff --git a/source/xapps/openoffice.org/less-vba.diff b/source/xapps/openoffice.org/less-vba.diff new file mode 100644 index 0000000..303e86d --- /dev/null +++ b/source/xapps/openoffice.org/less-vba.diff @@ -0,0 +1,22 @@ +Index: patches/src680/apply +=================================================================== +--- patches/src680/apply (revision 11042) ++++ patches/src680/apply (working copy) +@@ -260,7 +260,7 @@ + cws-npower7.diff + + # npower8 (depends) e.g. must come after npower7 +-cws-npower8.diff ++#cws-npower8.diff + + # major re-work / speed-up of configmgr + # FIXME: when integrated upstream, remove the hack in Makefile.shared +@@ -1386,7 +1386,7 @@ + # core changes not yet upstream + sc-source-ui-vba-makefile-mk.diff + # fix --disable-vba build +-oovbaapi-disable-vba.diff ++#oovbaapi-disable-vba.diff + + # export of macro bindings for shapes + sc-export-shape-macro-bindings.diff, n#304739, noelpwer diff --git a/source/xapps/openoffice.org/store-noinstall.diff b/source/xapps/openoffice.org/store-noinstall.diff new file mode 100644 index 0000000..e1c56db --- /dev/null +++ b/source/xapps/openoffice.org/store-noinstall.diff @@ -0,0 +1,13 @@ +Index: patches/src680/apply +=================================================================== +--- patches/src680/apply (revision 11042) ++++ patches/src680/apply (working copy) +@@ -1875,7 +1875,7 @@ + SectionOwner => rodo + SectionIssue => i#75399 + store-core.diff +-store-install.diff ++#store-install.diff + store-registry.diff + # don't burn 3% of startup doing CRC's we don't need + speed-store.diff, i#78495, michael _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
