]> git.pld-linux.org Git - packages/libreoffice.git/blobdiff - openoffice-pld-section.patch
- DON'T hardcode java paths!
[packages/libreoffice.git] / openoffice-pld-section.patch
index f192e981c5d7ad0d9baa6f316e3b58c4ea6fda7f..427455559f27c5a0f4f49162b4e7c353285309ea 100644 (file)
@@ -1,58 +1,48 @@
-diff -urN ooo-build-1.1.54.org/patches/OOO_1_1/pld-splash.diff ooo-build-1.1.54/patches/OOO_1_1/pld-splash.diff
---- ooo-build-1.1.54.org/patches/OOO_1_1/pld-splash.diff       1970-01-01 01:00:00.000000000 +0100
-+++ ooo-build-1.1.54/patches/OOO_1_1/pld-splash.diff   2004-05-05 19:21:30.684403432 +0200
-@@ -0,0 +1,30 @@
-+Index: offmgr/source/offapp/intro/ooo.src
+diff -urN ooo-build-1.1.55.org/patches/OOO_1_1/module-buildset-crashrep.diff ooo-build-1.1.55/patches/OOO_1_1/module-buildset-crashrep.diff
+--- ooo-build-1.1.55.org/patches/OOO_1_1/module-buildset-crashrep.diff 1970-01-01 01:00:00.000000000 +0100
++++ ooo-build-1.1.55/patches/OOO_1_1/module-buildset-crashrep.diff     2004-05-13 03:04:38.203467760 +0200
+@@ -0,0 +1,12 @@
++Index: instsetoo/prj/build.lst
 +===================================================================
-+RCS file: /cvs/framework/offmgr/source/offapp/intro/Attic/ooo.src,v
-+retrieving revision 1.44.16.7
-+diff -u -p -u -r1.44.16.7 ooo.src
-+--- offmgr/source/offapp/intro/ooo.src        19 Feb 2004 15:38:23 -0000      1.44.16.7
-++++ offmgr/source/offapp/intro/ooo.src        15 Mar 2004 23:07:54 -0000
-+@@ -76,10 +76,10 @@
-+ #include "app.hrc"
-+ #include "intro.hrc"
-+ 
-+-#ifdef BUILD_SPECIAL
-+-#define OOO_VENDOR "Sun Microsystems Inc."
-++#if 1
-++#define OOO_VENDOR "PLD/Linux"
-+ #define OOO_LICENSE "LGPL"
-+-#define OOO_INTRO "openintro_sun.bmp"
-++#define OOO_INTRO "openintro_pld.bmp"
-+ #else
-+ //#define OOO_VENDOR "my company"
-+ #define OOO_LICENSE "LGPL"
-+@@ -88,7 +88,7 @@
-+ 
-+ Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
-+ {
-+-     File = "openabout.bmp" ;
-++     File = "openabout_pld.bmp" ;
-+ };
-+ 
-+ Bitmap RID_DEFAULTINTRO
-diff -urN ooo-build-1.1.54.org/patches/OOO_1_1_1/apply ooo-build-1.1.54/patches/OOO_1_1_1/apply
---- ooo-build-1.1.54.org/patches/OOO_1_1_1/apply       2004-05-05 19:21:18.493256768 +0200
-+++ ooo-build-1.1.54/patches/OOO_1_1_1/apply   2004-05-05 19:22:07.789762560 +0200
-@@ -22,6 +22,7 @@
- RHShrike : RedHatBase, RHShrikeOnly, OldLibArt
- KDE : LinuxCommon, NativeWidgets, StartupNotification, ODKFixes
- SuSE : SuSEOnly, LinuxCommon, KDE, GlobalDesktopFiles, VBABits
-+PLD: PLDOnly, LinuxCommon, KDE, OOoCUPS, GlobalDesktopFiles, StartupNotification, ODKFixes, VBABits
- # somewhat odder:
- Win32 : Common, ODKFixes, VBABits, Win32Only
-@@ -305,7 +306,7 @@
- gui-ft-pt-not-pixel.diff
++RCS file: /cvs/installation/instsetoo/prj/build.lst,v
++retrieving revision 1.15.10.1
++diff -u -p -u -r1.15.10.1 build.lst
++--- instsetoo/prj/build.lst   28 Jan 2004 17:14:21 -0000      1.15.10.1
+++++ instsetoo/prj/build.lst   4 Mar 2004 10:39:17 -0000
++@@ -1,3 +1,3 @@
++-oo   instsetoo       :       UnoControls chaos configmgr cpputools dbaccess desktop eventattacher extensions extras fileaccess forms io package padmin readlicense_oo remotebridges scaddins scp shell ucb wizards officecfg xmlhelp helpcontent MathMLDTD dictionaries bitstream_vera_fonts filter psprint_config i18n_simple fpicker odk embedserv pyuno crashrep virgule NULL
+++oo   instsetoo       :       UnoControls chaos configmgr cpputools dbaccess desktop eventattacher extensions extras fileaccess forms io package padmin readlicense_oo remotebridges scaddins scp shell ucb wizards officecfg xmlhelp helpcontent MathMLDTD dictionaries bitstream_vera_fonts filter psprint_config i18n_simple fpicker odk embedserv pyuno virgule NULL
++ oo   instsetoo                                                               usr1    -       all     oo_mkout NULL
++ oo   instsetoo\util                                                  nmake   -       all     oo_util NULL
+diff -urN ooo-build-1.1.55.org/patches/OOO_1_1/module-buildset.diff ooo-build-1.1.55/patches/OOO_1_1/module-buildset.diff
+--- ooo-build-1.1.55.org/patches/OOO_1_1/module-buildset.diff  2004-05-13 03:04:20.769118184 +0200
++++ ooo-build-1.1.55/patches/OOO_1_1/module-buildset.diff      2004-05-13 03:04:38.205467456 +0200
+@@ -6,7 +6,7 @@
+ --- instsetoo/prj/build.lst   28 Jan 2004 17:14:21 -0000      1.15.10.1
+ +++ instsetoo/prj/build.lst   4 Mar 2004 10:39:17 -0000
+ @@ -1,3 +1,3 @@
+--oo   instsetoo       :       UnoControls chaos configmgr cpputools dbaccess desktop eventattacher extensions extras fileaccess forms io package padmin readlicense_oo remotebridges scaddins scp shell ucb wizards officecfg xmlhelp helpcontent MathMLDTD dictionaries bitstream_vera_fonts filter psprint_config i18n_simple fpicker odk embedserv pyuno crashrep virgule NULL
++-oo   instsetoo       :       UnoControls chaos configmgr cpputools dbaccess desktop eventattacher extensions extras fileaccess forms io package padmin readlicense_oo remotebridges scaddins scp shell ucb wizards officecfg xmlhelp helpcontent MathMLDTD dictionaries bitstream_vera_fonts filter psprint_config i18n_simple fpicker odk embedserv pyuno virgule NULL
+ +oo   instsetoo       :       UnoControls chaos configmgr cpputools dbaccess desktop eventattacher extensions extras fileaccess forms io package readlicense_oo remotebridges scaddins scp shell ucb wizards officecfg xmlhelp helpcontent MathMLDTD dictionaries bitstream_vera_fonts filter psprint_config i18n_simple fpicker odk embedserv pyuno virgule NULL
+  oo   instsetoo                                                               usr1    -       all     oo_mkout NULL
+  oo   instsetoo\util                                                  nmake   -       all     oo_util NULL
+diff -urN ooo-build-1.1.55.org/patches/OOO_1_1_1/apply ooo-build-1.1.55/patches/OOO_1_1_1/apply
+--- ooo-build-1.1.55.org/patches/OOO_1_1_1/apply       2004-05-13 03:04:20.850105872 +0200
++++ ooo-build-1.1.55/patches/OOO_1_1_1/apply   2004-05-13 03:13:27.246041064 +0200
+@@ -315,7 +315,11 @@
  gui-ft-use-system-font.diff
  
--[ XimianOnly, RedHatOnly ]
-+[ XimianOnly, RedHatOnly, PLDOnly ]
- # Disable custom staroffice printer admin thing & broken crashdialog bits
+ [ XimianOnly, RedHatOnly, PLDOnly ]
+-# Disable custom staroffice printer admin thing & broken crashdialog bits
++# Disable broken crashdialog bits
++module-buildset-crashrep.diff
++
++[ XimianOnly, RedHatOnly ]
++# Disable custom staroffice printer admin thing
  module-buildset.diff
  
-@@ -362,7 +363,7 @@
+ [ GlobalDesktopFiles ]
+@@ -369,7 +373,7 @@
  # Add support for the freedesktop.org ~/.recently-used spec. #24253
  recent-files.diff
  
@@ -61,22 +51,29 @@ diff -urN ooo-build-1.1.54.org/patches/OOO_1_1_1/apply ooo-build-1.1.54/patches/
  build-instsetoo-lang.diff
  
  [ DebianOnly ]
-@@ -639,11 +640,18 @@
+@@ -646,12 +650,6 @@
+ # Add SuSE specific /opt/kde3 path for dtint search
+ # gui-kde-dtint.diff - obsoleted by native-widget work.
+-# hackish system-libstdc++ patch
+-system-libstdcpp.diff
+-
+-# in case the system is panicing
+-gui-font-paranoid-fallback.diff
+-
  # drop pyuno bits
  disable-pyuno.diff
  
-+[ SuSEOnly, PLDOnly ]
-+
+@@ -660,6 +658,12 @@
  # resolution independant printing bits
  print-resolution-generic.diff
  
- #######################################################
-+[ PLDOnly ]
++# hackish system-libstdc++ patch
++system-libstdcpp.diff
 +
-+# splash
-+pld-splash.diff
-+#######################################################
- [ Win32Only ]
++# in case the system is panicing
++gui-font-paranoid-fallback.diff
++
+ #######################################################
+ [ PLDOnly ]
  
- # A number of nasty VS.Net 2003 fixes #27980
This page took 0.031528 seconds and 4 git commands to generate.