[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Michael Meeks]

 patches/dev300/apply                      |   29 ++++++++------------
 patches/dev300/ooo86080.unopkg.bodge.diff |   43 ------------------------------
 2 files changed, 12 insertions(+), 60 deletions(-)

New commits:
commit bb2ebccc6b86246cff675e0c9eb7ecd8e3d0fa59
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Thu Apr 7 11:43:54 2011 +0100

    prune obsolete patch, and empty sections

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9adcad7..fad1b97 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -11,19 +11,17 @@ OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
 
 # -------- Functional sub-sets --------
 Common : BuildBits, TemporaryHacks, \
-	 Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
-	 Icons, CalcFixes, WriterFixes, EasterEgg, \
-	 Cleanups, WMF, GnomeVFS, \
-	 VBABits, VBAObjects, CalcErrors, GCJ, \
+	 Fixes, DefaultSettings, Features, VCL, Misc, \
+	 CalcFixes, WriterFixes, EasterEgg, \
+	 Cleanups, GnomeVFS, \
+	 VBABits, VBAObjects, CalcErrors, \
 	 OOXML, OOXMLExportDevel, OOXMLExport, \
-	 FedoraCommonFixes, Fuzz, \
 	 BuildFix, WriterDocComparison, \
 	 MySQL, BorderTypes
 
 LinuxCommon : Common, FontConfigTemporaryHacks, \
-	      FedoraLinuxOnlyFixes, LinuxOnly, msaccess, \
-	      CliMonoCommon, Mono, MonoComp, QuickStarter, KDE4, Netbook, \
-	      GlobalNSPluginSupport
+	      LinuxOnly, msaccess, \
+	      CliMonoCommon, Mono, MonoComp, Netbook
 MacOSXCommon : Common
 Win32Common : Common, Win32Only, CliMonoCommon, CliComponent
 # Experimental sections
@@ -75,7 +73,7 @@ UbuntuL10n : UbuntuBased, UbuntuL10nOnly
 DroplineGNOME : LinuxCommon, Mono, msaccess
 DroplineGNOME64 : LinuxCommon, Mono, msaccess
 # Ark Linux
-Ark: LinuxCommon, ArkOnly, BerkeleyDB43, KDE4
+Ark: LinuxCommon, ArkOnly, BerkeleyDB43
 # www.pld-linux.org
 PLDBase: LinuxCommon, PLDOnly
 PLD: PLDBase
@@ -117,9 +115,8 @@ Pardus2008: PardusOnly, LinuxCommon
 # Solaris
 Solaris: NovellBase, UnstableExtensions
 # OxygenOffice Professional
-OxygenOfficeLinuxCommon :	Common,  FontConfigTemporaryHacks, LinuxOnly, \
-				msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, QuickStarter, KDE4,\
-				Netbook, GlobalNSPluginSupport
+OxygenOfficeLinuxCommon :	Common,  FontConfigTemporaryHacks, LinuxOnly, Netbook
+				msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp
 OxygenOfficeMacOSXCommon :	Common
 OxygenOfficeWin32Common :	Common, Win32Only, CliMonoCommon, CliComponent
 
@@ -149,6 +146,9 @@ cli-component.diff
 
 [ TemporaryHacks ]
 
+# originally from Fedora
+oooXXXX.partial-revert-ooo95118.diff
+
 # add idl target to toplevel makefile
 makefile-idl-build.diff, noelpwer
 
@@ -1139,11 +1139,6 @@ unxlngi6-notune.diff, doko
 [ UbuntuL10nOnly ]
 human-icons-i18n.diff, mklose
 
-[ FedoraCommonFixes ]
-ooo86080.unopkg.bodge.diff
-
-oooXXXX.partial-revert-ooo95118.diff
-
 [ DebianBaseOnly ]
 soffice-opengl-and-locking-config.diff, mklose
 
diff --git a/patches/dev300/ooo86080.unopkg.bodge.diff b/patches/dev300/ooo86080.unopkg.bodge.diff
deleted file mode 100644
index 5850521..0000000
--- a/patches/dev300/ooo86080.unopkg.bodge.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- desktop/scripts/unopkg.sh
-+++ desktop/scripts/unopkg.sh
-@@ -43,6 +43,29 @@ fi
-     ;;
- esac
- 
-+isshared=0
-+for arg in $@
-+do
-+if [ "$arg" = "--shared" ]; then
-+    isshared=1
-+fi
-+done
-+if [ $isshared -eq 1 ]; then
-+    echo $@ | grep -q env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
-+    if [ $? -ne 0 ]; then
-+        set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
-+    fi
-+    echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA
-+    if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ]; then
-+        set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml'
-+    fi
-+    echo $@ | grep -q env:UserInstallation
-+    if [ $? -ne 0 ]; then
-+        INSTDIR=`mktemp -d -t unoinstall.XXXXXX`
-+        set -- $@ '-env:UserInstallation=file://'$INSTDIR
-+    fi
-+fi
-+
- #collect all bootstrap variables specified on the command line
- #so that they can be passed as arguments to javaldx later on
- #Recognize the "sync" option. sync must be applied without any other
-@@ -71,6 +94,8 @@ unset XENVIRONMENT
- # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
- 
- # execute binary
--exec "$sd_prog/unopkg.bin" "$@"  "$JVMFWKPARAMS" \
-+"$sd_prog/unopkg.bin" "$@" "$JVMFWKPARAMS" \
-     "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
--
-+if [ -n "$INSTDIR" ]; then
-+   rm -rf $INSTDIR
-+fi