+++ /dev/null
-diff -urN ooo-build-1.3.5.org/patches/vclplug/vcl-util.diff ooo-build-1.3.5/patches/vclplug/vcl-util.diff
---- ooo-build-1.3.5.org/patches/vclplug/vcl-util.diff 2004-10-09 16:20:24.877368692 +0200
-+++ ooo-build-1.3.5/patches/vclplug/vcl-util.diff 2004-10-09 16:23:56.866954895 +0200
-@@ -129,11 +129,10 @@
- # --- UNX ----------------------------------------------------------------
-
- .IF "$(GUI)"=="UNX"
--@@ -278,53 +256,126 @@ SHL1STDLIBS += -ldl
-+@@ -256,53 +256,125 @@
- SHL1STDLIBS += -framework Cocoa
- .ENDIF
-
--+
- +SHL1STDLIBS += -lX11
- +
- +.ENDIF # "$(GUI)"=="UNX"
-@@ -144,26 +143,26 @@
- +# basic pure X11 plugin
- +LIB2TARGET=$(SLB)$/ipure_x
- +LIB2FILES= \
--+ $(SLB)$/salwin.lib \
--+ $(SLB)$/salgdi.lib \
--+ $(SLB)$/salapp.lib
-++ $(SLB)$/salwin.lib \
-++ $(SLB)$/salgdi.lib \
-++ $(SLB)$/salapp.lib
- +SHL2TARGET=vclplug_gen$(UPD)$(DLLPOSTFIX)
- +SHL2IMPLIB=ipure_x
- +SHL2LIBS= $(LIB2TARGET)
- +
- +# libs for generic plugin
- +SHL2STDLIBS=\
--+ $(VCLLIB)\
--+ -lpsp$(VERSION)$(DLLPOSTFIX)\
--+ $(SOTLIB) \
--+ $(UNOTOOLSLIB) \
--+ $(TOOLSLIB) \
--+ $(COMPHELPERLIB) \
--+ $(UCBHELPERLIB) \
--+ $(CPPUHELPERLIB) \
--+ $(CPPULIB) \
--+ $(VOSLIB) \
--+ $(SALLIB)
-++ $(VCLLIB)\
-++ -lpsp$(VERSION)$(DLLPOSTFIX)\
-++ $(SOTLIB) \
-++ $(UNOTOOLSLIB) \
-++ $(TOOLSLIB) \
-++ $(COMPHELPERLIB) \
-++ $(UCBHELPERLIB) \
-++ $(CPPUHELPERLIB) \
-++ $(CPPULIB) \
-++ $(VOSLIB) \
-++ $(SALLIB)
- +
- +.IF "$(OS)"=="MACOSX"
- +SHL2STDLIBS += -lXinerama
-@@ -207,56 +206,57 @@
- +SHL2STDLIBS += -lXinerama
- .ELSE
- -SHL1STDLIBS += -Wl,-Bstatic -lXinerama -Wl,-Bdynamic
--+SHL2STDLIBS += -Wl,-Bstatic -lXinerama -Wl,-Bdynamic
-++SHL2STDLIBS += -Wl,-Bstatic -lXinerama -Wl,-Bdynamic
- .ENDIF # $(XINERAMA_LINK)
- .ENDIF # $(USE_XINERAMA)
- -SHL1STDLIBS += -lXext -lSM -lICE -lX11
- -.ENDIF # "$(USE_XPRINT)" == "TRUE"
- +SHL2STDLIBS += -lXext -lSM -lICE -lX11
- .ENDIF # "$(OS)"=="SOLARIS"
--+
-- .ENDIF # "$(GUIBASE)"=="unx"
-+-.ENDIF # "$(GUIBASE)"=="unx"
-
- -.IF "$(OS)"=="MACOSX"
- -SHL1STDLIBS += -lXinerama
- -.ENDIF
--+# dummy plugin
--+LIB3TARGET=$(SLB)$/idummy_plug_
--+LIB3FILES= \
--+ $(SLB)$/dapp.lib
--+SHL3TARGET=vclplug_dummy$(UPD)$(DLLPOSTFIX)
--+SHL3IMPLIB=idummy_plug_
--+SHL3LIBS= $(LIB3TARGET)
--+
--+# libs for dummy plugin
--+SHL3STDLIBS=\
--+ $(VCLLIB)\
--+ $(SOTLIB) \
--+ $(UNOTOOLSLIB) \
--+ $(TOOLSLIB) \
--+ $(COMPHELPERLIB) \
--+ $(UCBHELPERLIB) \
--+ $(CPPUHELPERLIB) \
--+ $(CPPULIB) \
--+ $(VOSLIB) \
--+ $(SALLIB)
-++.ENDIF # "$(GUIBASE)"=="unx"
-
- -.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
- -# some nas versions need -lXt, too
---SHL1STDLIBS += -lXt
-+-#we must not link with Xt !!! it requires Xm which is not available on all platforms
- -SHL1STDLIBS += -laudio
- -.IF "$(OS)"=="SOLARIS"
- -# needed by libaudio.a
- -SHL1STDLIBS += -ldl -lnsl -lsocket
- -.ENDIF # SOLARIS
- -.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
-++# dummy plugin
-++LIB3TARGET=$(SLB)$/idummy_plug_
-++LIB3FILES= \
-++ $(SLB)$/dapp.lib
-++SHL3TARGET=vclplug_dummy$(UPD)$(DLLPOSTFIX)
-++SHL3IMPLIB=idummy_plug_
-++SHL3LIBS= $(LIB3TARGET)
-++
-++# libs for dummy plugin
-++SHL3STDLIBS=\
-++ $(VCLLIB)\
-++ $(SOTLIB) \
-++ $(UNOTOOLSLIB) \
-++ $(TOOLSLIB) \
-++ $(COMPHELPERLIB) \
-++ $(UCBHELPERLIB) \
-++ $(CPPUHELPERLIB) \
-++ $(CPPULIB) \
-++ $(VOSLIB) \
-++ $(SALLIB)
-++
- +# gtk plugin
- +.IF "$(ENABLE_GTK)" != ""
- +LIB4TARGET=$(SLB)$/igtk_plug_
- +LIB4FILES=\
--+ $(SLB)$/gtkapp.lib\
--+ $(SLB)$/gtkgdi.lib\
--+ $(SLB)$/gtkwin.lib
-++ $(SLB)$/gtkapp.lib\
-++ $(SLB)$/gtkgdi.lib\
-++ $(SLB)$/gtkwin.lib
- +SHL4TARGET=vclplug_gtk$(UPD)$(DLLPOSTFIX)
- +SHL4IMPLIB=igtk_plug_
- +SHL4LIBS=$(LIB4TARGET)
-Index: bin/package-ooo
-===================================================================
-RCS file: /cvs/gnome/ooo-build/bin/package-ooo,v
-retrieving revision 1.51
-diff -u -u -r1.51 package-ooo
---- ooo-build.org/bin/package-ooo 24 Sep 2004 17:43:51 -0000 1.51
-+++ ooo-build/bin/package-ooo 10 Oct 2004 14:03:37 -0000
-@@ -52,6 +52,33 @@
- cat <<EOT >$2
- #!/bin/sh
-
-+# Keep in ~sync with ooo-wrapper
-+
-+SystemInstallDir="$OOINSTBASE"
-+
-+if [ -n "\$GNOME_DESKTOP_SESSION_ID" -a -d "\$SystemInstallDir/program/resource.gnome" ]; then
-+ icon_set="gnome"
-+elif [ -n "\$KDE_FULL_SESSION" -a -d "\$SystemInstallDir/program/resource.kde" ]; then
-+ icon_set="kde"
-+fi
-+
-+if [ -z "\$icon_set" ]; then
-+ if [ -d "\$SystemInstallDir/program/resource.default" ]; then
-+ icon_set="default"
-+ elif [ -d "\$SystemInstallDir/program/resource.kde" ]; then
-+ icon_set="kde"
-+ elif [ -d "\$SystemInstallDir/program/resource.gnome" ]; then
-+ icon_set="gnome"
-+ else
-+ icon_set="default"
-+ fi
-+fi
-+
-+if [ -d "\$SystemInstallDir/program/resource.\$icon_set" ]; then
-+ OOO_PREFERRED_RESOURCE_PATH="\$SystemInstallDir/program/resource.\$icon_set"
-+ export OOO_PREFERRED_RESOURCE_PATH
-+fi
-+
- exec "$1" "\$@"
- EOT
- chmod 755 $2
+++ /dev/null
-diff -urN ooo-build-1.3.5.org/patches/OOO_1_1_3/apply ooo-build-1.3.5/patches/OOO_1_1_3/apply
---- ooo-build-1.3.5.org/patches/OOO_1_1_3/apply 2004-10-09 16:20:25.371262887 +0200
-+++ ooo-build-1.3.5/patches/OOO_1_1_3/apply 2004-10-09 18:49:06.563106761 +0200
-@@ -285,6 +285,9 @@
- # fix updating symlinks; the symlink must be removed before it is replaced [X#66902]
- setup2-update-symlink.diff
-
-+# fix Resource larger than 64K cannot be handled [#34210]
-+scresplit.diff
-+
- [ ODKFixes ]
-
- # Fix ODK Java bits
-diff -urN ooo-build-1.3.5.org/patches/OOO_1_1_3/scresplit.diff ooo-build-1.3.5/patches/OOO_1_1_3/scresplit.diff
---- ooo-build-1.3.5.org/patches/OOO_1_1_3/scresplit.diff 1970-01-01 01:00:00.000000000 +0100
-+++ ooo-build-1.3.5/patches/OOO_1_1_3/scresplit.diff 2004-10-09 19:21:48.470814047 +0200
-@@ -0,0 +1,118 @@
-+Index: inc/sc.hrc
-+===================================================================
-+RCS file: /cvs/sc/sc/inc/sc.hrc,v
-+retrieving revision 1.35
-+retrieving revision 1.35.288.2
-+diff -u -r1.35 -r1.35.288.2
-+--- sc/inc/sc.hrc 3 Dec 2002 15:26:06 -0000 1.35
-++++ sc/inc/sc.hrc 17 Sep 2004 14:25:38 -0000 1.35.288.2
-+@@ -1141,8 +1141,12 @@
-+ #define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40)
-+ #define RID_BMP_REFBTN1 (SC_RESOURCE_START+41)
-+ #define RID_BMP_REFBTN2 (SC_RESOURCE_START+42)
-+-#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43)
-+-#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44)
-++// #i34210# split function resources due to 64k limit, don't reuse old values
-++// to have obviously empty function lists in case some localisation used the
-++// old values for any reason. Don't even reuse the exact name because of the
-++// translation database IDs.
-++//#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43)
-++//#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44)
-+ #define RID_POPUP_CONTROL (SC_RESOURCE_START+45)
-+ #define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46)
-+ #define RID_OBJECTBAR_DRAWFORM (SC_RESOURCE_START+47)
-+@@ -1158,6 +1162,10 @@
-+ #define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57)
-+ #define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58)
-+ #define RID_OBJECTMENU_EDIT (SC_RESOURCE_START+59)
-++#define RID_SC_FUNCTION_DESCRIPTIONS_1 (SC_RESOURCE_START+60)
-++#define RID_SC_FUNCTION_DESCRIPTIONS_2 (SC_RESOURCE_START+61)
-++#define RID_SC_FUNCTION_DESCRIPTIONS_3 (SC_RESOURCE_START+62)
-++#define RID_SC_FUNCTION_DESCRIPTIONS_4 (SC_RESOURCE_START+63)
-+
-+ #define STR_START (SC_RESOURCE_START+100)
-+ #define STR_ROWHEIGHT (STR_START)
-+Index: source/core/data/global.cxx
-+===================================================================
-+RCS file: /cvs/sc/sc/source/core/data/global.cxx,v
-+retrieving revision 1.31
-+retrieving revision 1.31.166.2
-+diff -u -r1.31 -r1.31.166.2
-+--- sc/source/core/data/global.cxx 17 Apr 2003 09:54:45 -0000 1.31
-++++ sc/source/core/data/global.cxx 17 Sep 2004 14:25:38 -0000 1.31.166.2
-+@@ -1475,10 +1475,12 @@
-+ USHORT i,j;
-+ USHORT nDescBlock[] =
-+ {
-+- RID_SC_FUNCTION_DESCRIPTIONS1,
-+- RID_SC_FUNCTION_DESCRIPTIONS2
-++ RID_SC_FUNCTION_DESCRIPTIONS_1,
-++ RID_SC_FUNCTION_DESCRIPTIONS_2,
-++ RID_SC_FUNCTION_DESCRIPTIONS_3,
-++ RID_SC_FUNCTION_DESCRIPTIONS_4
-+ };
-+- const USHORT nBlocks = sizeof(nDescBlock) / sizeof(USHORT);
-++ const USHORT nBlocks = sizeof(nDescBlock) / sizeof(nDescBlock[0]);
-+
-+ aFunctionList.Clear();
-+
-+Index: source/ui/src/scfuncs.src
-+===================================================================
-+RCS file: /cvs/sc/sc/source/ui/src/scfuncs.src,v
-+retrieving revision 1.76.22.8
-+retrieving revision 1.76.22.8.4.2
-+diff -u -r1.76.22.8 -r1.76.22.8.4.2
-+--- sc/source/ui/src/scfuncs.src 10 Sep 2004 14:45:52 -0000 1.76.22.8
-++++ sc/source/ui/src/scfuncs.src 17 Sep 2004 14:25:39 -0000 1.76.22.8.4.2
-+@@ -93,10 +93,16 @@
-+ // RID_SC_FUNCTION_DESCRIPTIONS1
-+ // RID_SC_FUNCTION_DESCRIPTIONS2
-+
-++ // #i34210# again splitted resources due to 64k limit
-++ // RID_SC_FUNCTION_DESCRIPTIONS_1
-++ // RID_SC_FUNCTION_DESCRIPTIONS_2
-++ // RID_SC_FUNCTION_DESCRIPTIONS_3
-++ // RID_SC_FUNCTION_DESCRIPTIONS_4
-++
-+ #include "scfuncs.hrc" // ID_FUNCTION_GRP_XXX, HID_FUNC_XXX
-+ #include "compiler.hrc" // SC_OPCODE_XXX
-+
-+-Resource RID_SC_FUNCTION_DESCRIPTIONS1
-++Resource RID_SC_FUNCTION_DESCRIPTIONS_1
-+ {
-+ // -=*# Resource for function DBANZAHL #*=-
-+ Resource SC_OPCODE_DB_COUNT
-+@@ -15963,6 +15969,11 @@
-+ Text[ galician ] = "Valor 1; Valor 2;... son de 1 a 30 argumentos que representan os pagamentos e ingresos.";
-+ };
-+ };
-++};
-++
-++
-++Resource RID_SC_FUNCTION_DESCRIPTIONS_2
-++{
-+ // -=*# Resource for function IKV #*=-
-+ Resource SC_OPCODE_IKV
-+ {
-+@@ -32174,7 +32185,8 @@
-+ };
-+ };
-+
-+-Resource RID_SC_FUNCTION_DESCRIPTIONS2
-++
-++Resource RID_SC_FUNCTION_DESCRIPTIONS_3
-+ {
-+ // -=*# Resource for function DBANZAHL2 #*=-
-+ // -=*# Resource for function HÄUFIGKEIT #*=-
-+@@ -49230,6 +49242,11 @@
-+ Text[ galician ] = "é o número de graos de liberdade.";
-+ };
-+ };
-++};
-++
-++
-++Resource RID_SC_FUNCTION_DESCRIPTIONS_4
-++{
-+ // -=*# Resource for function STANDARDISIERUNG #*=-
-+ Resource SC_OPCODE_STANDARD
-+ {
projects / packages / libreoffice.git / commitdiff