diff -ur oo_1.0.1_src.orig/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java oo_1.0.1_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java
--- oo_1.0.1_src.orig/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java 2000-11-30 12:03:34.000000000 -0600
+++ oo_1.0.1_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java 2002-09-12 18:05:28.000000000 -0500
@@ -79,7 +79,7 @@
Class.forName(className != null
? className
: "sun.net.www.protocol." + protocol + ".Handler");
- return (URLStreamHandler)handlerClass.newInstance();;
+ return (URLStreamHandler)handlerClass.newInstance();
}
catch (Exception e) {
System.err.println(e);
diff -ur oo_1.0.1_src.orig/basctl/source/basicide/makefile.mk oo_1.0.1_src/basctl/source/basicide/makefile.mk
--- oo_1.0.1_src.orig/basctl/source/basicide/makefile.mk 2001-11-02 07:45:10.000000000 -0600
+++ oo_1.0.1_src/basctl/source/basicide/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -153,7 +153,7 @@
.ELSE
.IF "$(GUI)"=="UNX"
$(RM) $@
- echo #define DLL_NAME \"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ echo "#define DLL_NAME "\"libbasctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ELSE
echo #define DLL_NAME "basctl$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
.ENDIF
diff -ur oo_1.0.1_src.orig/berkeleydb/makefile.mk oo_1.0.1_src/berkeleydb/makefile.mk
--- oo_1.0.1_src.orig/berkeleydb/makefile.mk 2002-02-08 09:18:17.000000000 -0600
+++ oo_1.0.1_src/berkeleydb/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -65,6 +65,16 @@
PRJNAME=so_berkeleydb
TARGET=so_berkeleydb
+# --- Hack to get system db libraries ------------------------------
+.IF "$(GUI)"=="UNX"
+all:
+ @echo "Since you're running a real OS, we're assuming you have db..."
+ +$(COPY) /usr$/lib$/libdb-4.0.so $(DLLDEST)
+ +$(COPY) /usr$/lib$/libdb_cxx-4.0.so $(DLLDEST)
+ +$(COPY) /usr$/lib$/libdb_java-4.0.so $(DLLDEST)
+ +$(COPY) /usr$/lib$/db.jar $(DLLDEST)
+.ENDIF
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
diff -ur oo_1.0.1_src.orig/berkeleydb/prj/d.lst oo_1.0.1_src/berkeleydb/prj/d.lst
--- oo_1.0.1_src.orig/berkeleydb/prj/d.lst 2001-06-14 07:37:48.000000000 -0500
+++ oo_1.0.1_src/berkeleydb/prj/d.lst 2002-09-12 18:05:28.000000000 -0500
@@ -1,18 +1,20 @@
mkdir: %_DEST%\inc%_EXT%\berkeleydb
-..\%__SRC%\inc\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
-..\%__SRC%\inc\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
-..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
+\usr\include\db_cxx.h %_DEST%\inc%_EXT%\berkeleydb\db_cxx.h
+\usr\include\cxx_common.h %_DEST%\inc%_EXT%\berkeleydb\cxx_common.h
+\usr\include\cxx_except.h %_DEST%\inc%_EXT%\berkeleydb\cxx_except.h
+\usr\include\db_185.h %_DEST%\inc%_EXT%\berkeleydb\db_185.h
+\usr\include\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
..\%__SRC%\lib\libdb32.lib %_DEST%\lib%_EXT%\libdb32.lib
..\%__SRC%\lib\libdb_java32.lib %_DEST%\lib%_EXT%\libdb_java32.lib
-..\%__SRC%\lib\libdb-3.2.so %_DEST%\lib%_EXT%\libdb-3.2.so
-..\%__SRC%\lib\libdb_java-3.2.so %_DEST%\lib%_EXT%\libdb_java-3.2.so
-..\%__SRC%\lib\libdb_cxx-3.2.so %_DEST%\lib%_EXT%\libdb_cxx-3.2.so
+\usr\lib\libdb-4.0.so %_DEST%\lib%_EXT%\libdb-4.0.so
+\usr\lib\libdb_java-4.0.so %_DEST%\lib%_EXT%\libdb_java-4.0.so
+\usr\lib\libdb_cxx-4.0.so %_DEST%\lib%_EXT%\libdb_cxx-4.0.so
..\%__SRC%\bin\libdb32.dll %_DEST%\bin%_EXT%\libdb32.dll
..\%__SRC%\bin\libdb_java32.dll %_DEST%\bin%_EXT%\libdb_java32.dll
-..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
+\usr\lib\db.jar %_DEST%\bin%_EXT%\db.jar
diff -ur oo_1.0.1_src.orig/bridges/source/c_uno/intelx86.cxx oo_1.0.1_src/bridges/source/c_uno/intelx86.cxx
--- oo_1.0.1_src.orig/bridges/source/c_uno/intelx86.cxx 2001-04-18 06:05:48.000000000 -0500
+++ oo_1.0.1_src/bridges/source/c_uno/intelx86.cxx 2002-09-12 18:05:27.000000000 -0500
@@ -95,24 +95,21 @@
add esp, eax
}
#elif GCC
+ int ecx, edx;
+
__asm__
(
- "mov %2, %%eax\n\t"
- "mov %%eax, %%ecx\n\t"
- "shl $2, %%eax\n\t"
- "add %1, %%eax\n"
- "Lcopy:\n\t"
- "sub $4, %%eax\n\t"
- "pushl (%%eax)\n\t"
- "dec %%ecx\n\t"
- "jne Lcopy\n\t"
- "mov %0, %%eax\n\t"
- "call *%%eax\n\t"
- "mov %%eax, %3\n"
- "mov %2, %%eax\n\t"
- "shl $2, %%eax\n\t"
- "add %%eax, %%esp\n\t"
- : : "m"(fptr), "m"(pParams), "m"(nParams), "m"(retVal)
+ "1:\n\t"
+ "subl $4, %0\n\t"
+ "pushl (%0)\n\t"
+ "decl %1\n\t"
+ "jne 1b\n\t"
+ "call *%2\n\t"
+ "leal 0(%%esp,%3,4), %%esp\n\t"
+ : "=a"(retVal), "=c"(ecx), "=d"(edx)
+ : "S"(nParams),
+ "0" (((int *) pParams) + nParams), "1" (nParams), "2"(fptr)
+ : "memory", "cc"
);
#else
#error "### unsupported x86 compiler!"
diff -ur oo_1.0.1_src.orig/config_office/configure.in oo_1.0.1_src/config_office/configure.in
--- oo_1.0.1_src.orig/config_office/configure.in 2002-06-07 19:49:26.000000000 -0500
+++ oo_1.0.1_src/config_office/configure.in 2002-09-12 18:05:28.000000000 -0500
@@ -268,7 +268,7 @@
dnl parametrise the various gcc pathnames so we can reuse for gcc2.95 and gcc3
if test -n "$enable_gcc3"; then
- _gccincname1="g++-v3"
+ _gccincname1="c++"
else
_gccincname1="g++-3"
fi
@@ -324,6 +324,10 @@
_gxx_include_path=`find $_gxx_include_start -name "$_gccincname1" -print 2> /dev/null`
if test "$_gxx_include_path"; then
+ _gxx_include_path="$_gxx_include_path/$_gcc_version"
+ fi
+
+ if test "$_gxx_include_path"; then
_multiple=`echo $_gxx_include_path | $AWK '{ if ($2) print "true"; else print "false" }'`
if test "$_multiple" = "false"; then
AC_MSG_RESULT([checked])
@@ -808,10 +812,14 @@
if test "$_os" = "Linux" -a "$_machine_type" = "i686" -o "$_os" = "FreeBSD"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
_jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
+ _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'`
if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
_jdk_minor="true"
fi
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle4" = "true"; then
+ _jdk_minor="true"
+ fi
fi
if test "$_os" = "NetBSD"; then
_jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
diff -ur oo_1.0.1_src.orig/config_office/makefile.rc oo_1.0.1_src/config_office/makefile.rc
--- oo_1.0.1_src.orig/config_office/makefile.rc 2002-04-26 07:41:32.000000000 -0500
+++ oo_1.0.1_src/config_office/makefile.rc 2002-09-12 18:05:27.000000000 -0500
@@ -195,7 +195,10 @@
#
bootstrap .PHONY :
- @config_office/bootstrap
+ @bootstrap
+
+clean .PHONY:
+ find . -name $(INPATH)| xargs rm -r -f \;
#
Only in oo_1.0.1_src/config_office: makefile.rc~
diff -ur oo_1.0.1_src.orig/config_office/set_soenv.1 oo_1.0.1_src/config_office/set_soenv.1
--- oo_1.0.1_src.orig/config_office/set_soenv.1 2002-06-30 14:51:05.000000000 -0500
+++ oo_1.0.1_src/config_office/set_soenv.1 2002-09-12 18:05:27.000000000 -0500
@@ -1094,6 +1094,7 @@
$ps.$USR.$BIN.$ds."X11".
$ps.$USR.$ds."X11".$BIN.
$ps.$USR.$LIB;
+ $PATH .= $oldPATH;
}
elsif ($platform eq "$Winnt")
{
@@ -1551,12 +1552,12 @@
$tempstring="perl ".WinFormat(${SOLARENV}.${BIN}.${ds}."zipdep.pl");
if ( $perl_os =~ /cygwin/ ) { $tempstring =~ s#\\#\\\\#g; }
ToFile( "set ZIPDEP=$tempstring", $empty, "x" );
+ ToFile( "HOME", $WIN_HOME, "e" );
} else {
ToFile( "DELIVER", "deliver.pl", "e" );
ToFile( "MKOUT", "mkout.pl", "e" );
ToFile( "ZIPDEP", "zipdep.pl", "e" );
}
-ToFile( "HOME", $WIN_HOME, "e" );
ToFile( "USE_SHELL", $USE_SHELL, "e" );
#
# Writing the aliases to file.
Only in oo_1.0.1_src/config_office: set_soenv.1~
diff -ur oo_1.0.1_src.orig/connectivity/prj/build.lst oo_1.0.1_src/connectivity/prj/build.lst
--- oo_1.0.1_src.orig/connectivity/prj/build.lst 2001-11-07 05:00:01.000000000 -0600
+++ oo_1.0.1_src/connectivity/prj/build.lst 2002-09-12 18:05:28.000000000 -0500
@@ -7,8 +7,6 @@
cn connectivity\source\resource nmake - all cn_res NULL
cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL
cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL
-cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL
cn connectivity\source\drivers\jdbc nmake - all cn_jdbc cn_dbtools NULL
diff -ur oo_1.0.1_src.orig/cppu/inc/uno/lbnames.h oo_1.0.1_src/cppu/inc/uno/lbnames.h
--- oo_1.0.1_src.orig/cppu/inc/uno/lbnames.h 2002-06-07 08:54:40.000000000 -0500
+++ oo_1.0.1_src/cppu/inc/uno/lbnames.h 2002-09-12 18:05:28.000000000 -0500
@@ -98,8 +98,10 @@
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 1)
#define __CPPU_ENV gcc3
+#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 2)
+#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
-#error "Tested gcc 3 version is <= 3.1. Patch uno/lbnames.h to try your gcc 3 version."
+#error "Tested gcc 3 version is <= 3.2. Patch uno/lbnames.h to try your gcc 3 version."
#else
#error "Supported gcc majors are 2 and 3. Unsupported gcc major version."
#endif /* defined (__GNUC__) */
diff -ur oo_1.0.1_src.orig/external/glibc/makefile.mk oo_1.0.1_src/external/glibc/makefile.mk
--- oo_1.0.1_src.orig/external/glibc/makefile.mk 2000-11-21 04:22:34.000000000 -0600
+++ oo_1.0.1_src/external/glibc/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -60,6 +60,11 @@
#
#*************************************************************************
+.IF "$(GUI)" == "UNX"
+all:
+ @echo "Assuming you already have glibc - no need to do anything."
+.ENDIF
+
MAKEFILERC=yes
.IF "$(OS)" == "WNT"
diff -ur oo_1.0.1_src.orig/external/glibc/sdfiles/makefile.mk oo_1.0.1_src/external/glibc/sdfiles/makefile.mk
--- oo_1.0.1_src.orig/external/glibc/sdfiles/makefile.mk 2001-04-09 10:20:01.000000000 -0500
+++ oo_1.0.1_src/external/glibc/sdfiles/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -60,6 +60,13 @@
#
#*************************************************************************
+# We use glibc. There's no need to dupe its functionality, especially not
+# with legacy versions of known good code.
+
+all:
+ @echo ignoring gnu_getopt
+
+
PRJ=..$/..
PRJNAME=3rdparty
diff -ur oo_1.0.1_src.orig/external/prj/d.lst oo_1.0.1_src/external/prj/d.lst
--- oo_1.0.1_src.orig/external/prj/d.lst 2001-06-26 06:07:02.000000000 -0500
+++ oo_1.0.1_src/external/prj/d.lst 2002-09-12 18:05:28.000000000 -0500
@@ -55,8 +55,6 @@
..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a
..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a
..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a
-..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
-..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a
Only in oo_1.0.1_src/external/prj: d.lst~
diff -ur oo_1.0.1_src.orig/freetype/makefile.mk oo_1.0.1_src/freetype/makefile.mk
--- oo_1.0.1_src.orig/freetype/makefile.mk 2002-02-26 05:21:37.000000000 -0600
+++ oo_1.0.1_src/freetype/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -65,6 +65,18 @@
PRJNAME=so_freetype
TARGET=so_freetype
+# --- Hack to get system freetype ----------------------------------
+.IF "$(GUI)"=="UNX"
+all:
+ @echo " An already available installation of freetype should exist on your system."
+ @echo " Therefore the version provided here does not need to be built in addition."
+
+ +$(COPY) /usr$/lib$/libfreetype.so.6* $(DLLDEST)
+ +$(COPY) /usr$/lib$/libfreetype.a $(DLLDEST)
+ +$(COPY) -r /usr$/include$/freetype2$/freetype $(DLLDEST)$/..$/inc
+ +$(COPY) -r /usr$/include$/ft2build.h $(DLLDEST)$/..$/inc$/freetype
+.ENDIF
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
diff -ur oo_1.0.1_src.orig/freetype/prj/d.lst oo_1.0.1_src/freetype/prj/d.lst
--- oo_1.0.1_src.orig/freetype/prj/d.lst 2001-08-14 06:19:34.000000000 -0500
+++ oo_1.0.1_src/freetype/prj/d.lst 2002-09-12 18:05:28.000000000 -0500
@@ -2,14 +2,14 @@
mkdir: %_DEST%\inc%_EXT%\freetype\config
mkdir: %_DEST%\inc%_EXT%\freetype\internal
-..\%__SRC%\inc\ft2build.h %_DEST%\inc%_EXT%\ft2build.h
-..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\freetype\*.h
-..\%__SRC%\inc\config\*.h %_DEST%\inc%_EXT%\freetype\config\*.h
-..\%__SRC%\inc\internal\*.h %_DEST%\inc%_EXT%\freetype\internal\*.h
+\usr\include\ft2build.h %_DEST%\inc%_EXT%\ft2build.h
+\usr\include\freetype2\freetype\*.h %_DEST%\inc%_EXT%\freetype\*.h
+\usr\include\freetype2\freetype\config\*.h %_DEST%\inc%_EXT%\freetype\config\*.h
+\usr\include\freetype2\freetype\internal\*.h %_DEST%\inc%_EXT%\freetype\internal\*.h
-..\%__SRC%\lib\*.so.* %_DEST%\lib%_EXT%\*.so.*
+\usr\lib\libfreetype.so.* %_DEST%\lib%_EXT%\libfreetype.so.*
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+\usr\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a
..\%__SRC%\lib\freetype.lib %_DEST%\lib%_EXT%\freetype.lib
diff -ur oo_1.0.1_src.orig/officecfg/data/org/openoffice/Office/Common.xcd oo_1.0.1_src/officecfg/data/org/openoffice/Office/Common.xcd
--- oo_1.0.1_src.orig/officecfg/data/org/openoffice/Office/Common.xcd 2002-03-05 07:51:34.000000000 -0600
+++ oo_1.0.1_src/officecfg/data/org/openoffice/Office/Common.xcd 2002-09-12 18:05:28.000000000 -0500
@@ -4023,6 +4023,48 @@
Netscape 6.x
+
+
+
+ --composer %s
+
+
+
+
+
+ -c '%s'
+
+
+ -b '%s'
+
+
+ -s %s
+
+
+ --attach %s
+
+
+ --msg %s
+
+
+ %s
+
+
+
+
+
+
+
+ ,
+
+
+ ,
+
+
+ ,
+
+
+
diff -ur oo_1.0.1_src.orig/product/inc/scp/udk_basefiles.scp oo_1.0.1_src/product/inc/scp/udk_basefiles.scp
--- oo_1.0.1_src.orig/product/inc/scp/udk_basefiles.scp 2002-06-07 13:15:12.000000000 -0500
+++ oo_1.0.1_src/product/inc/scp/udk_basefiles.scp 2002-09-12 18:05:28.000000000 -0500
@@ -13,9 +13,10 @@
#if ( CCNUMVER >= 000300010000 )
+#ifdef NOTHING
File gid_File_Lib_Stdc
BIN_FILE_BODY;
- Name = STRING(libstdc++.so.4.0.0);
+ Name = STRING(libstdc++.so.5.0.0);
Dir = GCFG_BINARY_DIR;
Styles = (PACKED, SETUPZIP);
End
@@ -27,6 +28,7 @@
Styles = (NETWORK,RELATIVE);
End
+#endif
#else
File gid_File_Lib_Stdc
diff -ur oo_1.0.1_src.orig/product/util/makefile.mk oo_1.0.1_src/product/util/makefile.mk
--- oo_1.0.1_src.orig/product/util/makefile.mk 2002-06-11 10:09:39.000000000 -0500
+++ oo_1.0.1_src/product/util/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -117,8 +117,8 @@
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/libgcc_s.so.1 \
$(DESTDIRDLL)$/libgcc_s.so \
- $(DESTDIRDLL)$/libstdc++.so.4 \
- $(DESTDIRDLL)$/libstdc++.so.4.0.0
+ $(DESTDIRDLL)$/libstdc++.so.5 \
+ $(DESTDIRDLL)$/libstdc++.so.5.0.0
.ELSE
ADDITIONAL_DLLS= \
$(DESTDIRDLL)$/libgcc_s.so.1 \
@@ -500,13 +500,13 @@
.IF "$(CCNUMVER)">="000300010000"
-$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
+$(DESTDIRDLL)$/libstdc++.so.5.0.0 : $(DLLOUT)$/libstdc++.so.5.0.0 $(DIRLIST)
-rm -f $@
- $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.5.0.0 $@
-$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
+$(DESTDIRDLL)$/libstdc++.so.5 : $(DESTDIRDLL)$/libstdc++.so.5.0.0 $(DIRLIST)
-rm -f $@
- +ln -s libstdc++.so.4.0.0 $@
+ +ln -s libstdc++.so.5.0.0 $@
.ELSE
diff -ur oo_1.0.1_src.orig/psprint/source/printergfx/psheader.ps oo_1.0.1_src/psprint/source/printergfx/psheader.ps
--- oo_1.0.1_src.orig/psprint/source/printergfx/psheader.ps 2001-07-06 11:10:16.000000000 -0500
+++ oo_1.0.1_src/psprint/source/printergfx/psheader.ps 2002-09-12 18:05:28.000000000 -0500
@@ -303,7 +303,7 @@
/h /i /j /k /l /m /n /o
/p /q /r /s /t /u /v /w
/x /y /z /braceleft /bar /braceright /asciitilde /unused
- /euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
+ /Euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl
/circumflex /perthousand /Scaron /guilsinglleft /OE /unused /zcaron /unused
/unused /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash
/tilde /trademark /scaron /guilsinglright /oe /unused /zcaron /Ydieresis
diff -ur oo_1.0.1_src.orig/sal/osl/unx/interlck.c oo_1.0.1_src/sal/osl/unx/interlck.c
--- oo_1.0.1_src.orig/sal/osl/unx/interlck.c 2001-05-02 10:03:13.000000000 -0500
+++ oo_1.0.1_src/sal/osl/unx/interlck.c 2002-09-12 18:05:27.000000000 -0500
@@ -83,9 +83,11 @@
"lock\n\t"
"xadd %0, %2\n\t"
"incl %0"
- : "=a" (nCount), "=m" (*pCount)
+ : "=&r" (nCount), "=m" (*pCount)
: "m" (*pCount)
: "memory");
+
+ return nCount;
}
oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
@@ -97,9 +99,11 @@
"lock\n\t"
"xadd %0, %2\n\t"
"decl %0"
- : "=a" (nCount), "=m" (*pCount)
+ : "=&r" (nCount), "=m" (*pCount)
: "m" (*pCount)
: "memory");
+
+ return nCount;
}
#elif defined ( GCC ) && defined ( POWERPC )
@@ -117,7 +121,7 @@
" addi %0,%0,1\n\t"
" stwcx. %0,0,%2\n\t"
" bne- 1b"
- : "=r" (nCount), "=m" (*pCount)
+ : "=&r" (nCount), "=m" (*pCount)
: "r" (pCount)
: "r4", "memory");
@@ -134,7 +138,7 @@
" subi %0,%0,1\n\t"
" stwcx. %0,0,%2\n\t"
" bne- 1b"
- : "=r" (nCount), "=m" (*pCount)
+ : "=&r" (nCount), "=m" (*pCount)
: "r" (pCount)
: "r4", "memory");
diff -ur oo_1.0.1_src.orig/sal/osl/unx/signal.c oo_1.0.1_src/sal/osl/unx/signal.c
--- oo_1.0.1_src.orig/sal/osl/unx/signal.c 2001-04-26 08:42:23.000000000 -0500
+++ oo_1.0.1_src/sal/osl/unx/signal.c 2002-09-12 18:05:28.000000000 -0500
@@ -162,7 +162,7 @@
char ProgFile[512];
- if ((osl_psz_getExecutableFile(ProgFile, sizeof(ProgFile)) == osl_Process_E_None) &&
+ if (0 && (osl_psz_getExecutableFile(ProgFile, sizeof(ProgFile)) == osl_Process_E_None) &&
(strstr(ProgFile, "soffice") != NULL))
{
char CmdLine[512];
diff -ur oo_1.0.1_src.orig/sal/util/makefile.mk oo_1.0.1_src/sal/util/makefile.mk
--- oo_1.0.1_src.orig/sal/util/makefile.mk 2002-03-17 05:51:30.000000000 -0600
+++ oo_1.0.1_src/sal/util/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -245,14 +245,14 @@
.IF "$(GUI)"=="WNT"
$(OUT)$/inc$/udkversion.h:
- echo #ifndef _SAL_UDKVERSION_H_ > $@
- echo #define _SAL_UDKVERSION_H_ >> $@
- echo. >> $@
- echo #define SAL_UDK_MAJOR "$(UDK_MAJOR)" >> $@
- echo #define SAL_UDK_MINOR "$(UDK_MINOR)" >> $@
- echo #define SAL_UDK_MICRO "$(UDK_MICRO)" >> $@
- echo. >> $@
- echo #endif >> $@
+ echo "#ifndef _SAL_UDKVERSION_H_" > $@
+ echo "#define _SAL_UDKVERSION_H_" >> $@
+ echo >> $@
+ echo "#define SAL_UDK_MAJOR $(UDK_MAJOR)" >> $@
+ echo "#define SAL_UDK_MINOR $(UDK_MINOR)" >> $@
+ echo "#define SAL_UDK_MICRO $(UDK_MICRO)" >> $@
+ echo >> $@
+ echo "#endif" >> $@
.ELSE
diff -ur oo_1.0.1_src.orig/sc/source/ui/app/makefile.mk oo_1.0.1_src/sc/source/ui/app/makefile.mk
--- oo_1.0.1_src.orig/sc/source/ui/app/makefile.mk 2001-10-02 13:25:14.000000000 -0500
+++ oo_1.0.1_src/sc/source/ui/app/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -115,15 +115,15 @@
$(INCCOM)$/scdll0.hxx: makefile.mk
.IF "$(GUI)"=="OS2"
- echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)" >$@
+ echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)\" >$@
.ELSE
.IF "$(GUI)"=="MAC"
echo "$(HASHMARK)define DLL_NAME ¶"sc$(UPD)$(DLLPOSTFIX).dll¶"" > $@
.ELSE
.IF "$(GUI)"=="UNX"
- echo #define DLL_NAME \"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ echo "#define DLL_NAME "\"libsc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ELSE
- echo #define DLL_NAME "sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
+ echo "#define DLL_NAME "\"sc$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ENDIF
.ENDIF
.ENDIF
diff -ur oo_1.0.1_src.orig/sch/source/ui/app/makefile.mk oo_1.0.1_src/sch/source/ui/app/makefile.mk
--- oo_1.0.1_src.orig/sch/source/ui/app/makefile.mk 2001-06-07 11:53:57.000000000 -0500
+++ oo_1.0.1_src/sch/source/ui/app/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -113,16 +113,16 @@
$(INCCOM)$/schlib.hxx: makefile.mk
.IF "$(GUI)"=="OS2"
- echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)" >$@
+ echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)\" >$@
.ELSE
.IF "$(GUI)"=="MAC"
echo "$(HASHMARK)define DLL_NAME ¶"sch$(UPD)$(DLLPOSTFIX).dll¶"" > $@
.ELSE
.IF "$(GUI)"=="UNX"
$(RM) $@
- echo #define DLL_NAME \"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ echo "#define DLL_NAME "\"libsch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ELSE
- echo #define DLL_NAME "sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
+ echo "#define DLL_NAME "\"sch$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ENDIF
.ENDIF
.ENDIF
diff -ur oo_1.0.1_src.orig/scp/source/office/files.scp oo_1.0.1_src/scp/source/office/files.scp
--- oo_1.0.1_src.orig/scp/source/office/files.scp 2002-06-01 00:38:52.000000000 -0500
+++ oo_1.0.1_src/scp/source/office/files.scp 2002-09-12 18:05:28.000000000 -0500
@@ -473,17 +473,6 @@
Dir = GID_DIR_PROGRAM;
Styles = (PACKED);
End
-File GID_FILE_LIB_MOZABDRV
- BIN_FILE_BODY;
- #ifdef UNX
- Name = "libmozabdrv2.so";
- #else
- Name = "mozabdrv2.dll";
- #endif
- Dir = GID_DIR_PROGRAM;
- Styles = (PACKED);
-End
-
STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
@@ -872,18 +861,6 @@
#endif
End
-File GID_FILE_LIB_MOZAB_2
- BIN_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
- RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
- Dir = GID_DIR_PROGRAM;
- #ifdef UNX
- Name = "libmozab2.so";
- #else
- Name = "mozab2.dll";
- #endif
-End
-
File GID_FILE_LIB_SDBC_2
BIN_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
@@ -1037,7 +1014,7 @@
Styles = (PACKED);
Dir = GID_DIR_PROGRAM;
#ifdef UNX
- Name = "libdb-3.2.so";
+ Name = "libdb-4.0.so";
#else
Name = "libdb32.dll";
#endif
@@ -1050,7 +1027,7 @@
Styles = (PACKED);
Dir = GID_DIR_PROGRAM;
#ifdef UNX
- Name = "libdb_java-3.2.so";
+ Name = "libdb_java-4.0.so";
#else
Name = "libdb_java32.dll";
#endif
@@ -1064,7 +1041,7 @@
BIN_FILE_BODY;
Styles = (PACKED);
Dir = GID_DIR_PROGRAM;
- Name = "libdb_cxx-3.2.so";
+ Name = "libdb_cxx-4.0.so";
End
#endif
Only in oo_1.0.1_src/scp/source/office: files.scp~
diff -ur oo_1.0.1_src.orig/sd/source/ui/app/makefile.mk oo_1.0.1_src/sd/source/ui/app/makefile.mk
--- oo_1.0.1_src.orig/sd/source/ui/app/makefile.mk 2001-09-04 09:38:20.000000000 -0500
+++ oo_1.0.1_src/sd/source/ui/app/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -132,15 +132,15 @@
$(INCCOM)$/sddll0.hxx: makefile.mk
+@echo $@
.IF "$(GUI)"=="OS2"
- echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX)" >$@
+ echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX)\" >$@
.ELSE
.IF "$(GUI)"=="MAC"
echo "$(HASHMARK)define DLL_NAME ¶"sd$(UPD)$(DLLPOSTFIX).dll¶"" > $@
.ELSE
.IF "$(GUI)"=="UNX"
- echo #define DLL_NAME \"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ echo "#define DLL_NAME "\"libsd$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ELSE
- echo #define DLL_NAME "sd$(UPD)$(DLLPOSTFIX).DLL" >$@
+ echo "#define DLL_NAME "\"sd$(UPD)$(DLLPOSTFIX).DLL\" >$@
.ENDIF
.ENDIF
.ENDIF
diff -ur oo_1.0.1_src.orig/setup2/script/linux/1.0.0/webinstdb.inf oo_1.0.1_src/setup2/script/linux/1.0.0/webinstdb.inf
--- oo_1.0.1_src.orig/setup2/script/linux/1.0.0/webinstdb.inf 2001-05-24 01:45:47.000000000 -0500
+++ oo_1.0.1_src/setup2/script/linux/1.0.0/webinstdb.inf 2002-09-12 18:05:28.000000000 -0500
@@ -6687,7 +6687,7 @@
End
File gid_File_Lib_Db31
- Name = "libdb-3.1.so";
+ Name = "libdb-4.0.so";
PackedName = "f_0352";
Size = 458008;
Dir = gid_Dir_Program;
@@ -6700,7 +6700,7 @@
End
File gid_File_Lib_Dbjava31
- Name = "libdb_java-3.1.so";
+ Name = "libdb_java-4.0.so";
PackedName = "f_0353";
Size = 506820;
Dir = gid_Dir_Program;
diff -ur oo_1.0.1_src.orig/setup2/script/linux/1.0.1/webinstdb.inf oo_1.0.1_src/setup2/script/linux/1.0.1/webinstdb.inf
--- oo_1.0.1_src.orig/setup2/script/linux/1.0.1/webinstdb.inf 2001-05-17 09:46:41.000000000 -0500
+++ oo_1.0.1_src/setup2/script/linux/1.0.1/webinstdb.inf 2002-09-12 18:05:28.000000000 -0500
@@ -7474,7 +7474,7 @@
End
File gid_File_Lib_Db31
- Name = "libdb-3.1.so";
+ Name = "libdb-4.0.so";
PackedName = "f_0358";
Size = 458008;
DownloadSize = 196814;
@@ -7488,7 +7488,7 @@
End
File gid_File_Lib_Dbjava31
- Name = "libdb_java-3.1.so";
+ Name = "libdb_java-4.0.so";
PackedName = "f_0359";
Size = 506820;
DownloadSize = 212931;
diff -ur oo_1.0.1_src.orig/setup2/script/linux/1.1.1/webinstdb.inf oo_1.0.1_src/setup2/script/linux/1.1.1/webinstdb.inf
--- oo_1.0.1_src.orig/setup2/script/linux/1.1.1/webinstdb.inf 2001-09-19 07:58:58.000000000 -0500
+++ oo_1.0.1_src/setup2/script/linux/1.1.1/webinstdb.inf 2002-09-12 18:05:28.000000000 -0500
@@ -7512,7 +7512,7 @@
End
File gid_File_Lib_Db31
- Name = "libdb-3.1.so";
+ Name = "libdb-4.0.so";
PackedName = "f_0361";
Size = 458008;
DownloadSize = 196814;
@@ -7526,7 +7526,7 @@
End
File gid_File_Lib_Dbjava31
- Name = "libdb_java-3.1.so";
+ Name = "libdb_java-4.0.so";
PackedName = "f_0362";
Size = 506820;
DownloadSize = 212931;
diff -ur oo_1.0.1_src.orig/sj2/stardiv/app/AppletViewer.java oo_1.0.1_src/sj2/stardiv/app/AppletViewer.java
--- oo_1.0.1_src.orig/sj2/stardiv/app/AppletViewer.java 2000-09-18 11:54:03.000000000 -0500
+++ oo_1.0.1_src/sj2/stardiv/app/AppletViewer.java 2002-09-12 18:05:28.000000000 -0500
@@ -196,7 +196,7 @@
public AppletViewer(int x, int y, URL doc, Hashtable atts, PrintStream statusMsgStream) {
// resourceViewer = new stardiv.util.ResourceViewer();
// resourceViewer.show();
- System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
+ // System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
this.statusMsgStream = statusMsgStream;
this.atts = atts;
diff -ur oo_1.0.1_src.orig/sj2/stardiv/applet/DocumentProxy.java oo_1.0.1_src/sj2/stardiv/applet/DocumentProxy.java
--- oo_1.0.1_src.orig/sj2/stardiv/applet/DocumentProxy.java 2000-09-18 11:54:03.000000000 -0500
+++ oo_1.0.1_src/sj2/stardiv/applet/DocumentProxy.java 2002-09-12 18:05:28.000000000 -0500
@@ -68,8 +68,10 @@
import java.applet.AudioClip;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Enumeration;
+import java.util.Iterator;
import java.util.Hashtable;
import java.util.Observer;
import java.util.Observable;
@@ -203,5 +205,13 @@
public Object getJavaScriptJSObjectWindow() {
return document.getJavaScriptJSObjectWindow();
}
+ public void setStream(String key, InputStream stream) throws IOException {
+ }
+ public InputStream getStream(String key) {
+ return null;
+ }
+ public Iterator getStreamKeys() {
+ return null;
+ }
}
diff -ur oo_1.0.1_src.orig/solenv/inc/_tg_app.mk oo_1.0.1_src/solenv/inc/_tg_app.mk
--- oo_1.0.1_src.orig/solenv/inc/_tg_app.mk 2001-11-02 07:18:40.000000000 -0600
+++ oo_1.0.1_src/solenv/inc/_tg_app.mk 2002-09-12 18:05:28.000000000 -0500
@@ -113,8 +113,8 @@
@-+echo 1 ICON $(APP1ICON) >> $(MISC)$/$(APP1LINKRES:b).rc
.ENDIF
.IF "$(APP1VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc
- @-+echo #include "$(APP1VERINFO)" >> $(MISC)$/$(APP1LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP1LINKRES:b).rc
+ @-+echo "#include "\"$(APP1VERINFO)\" >> $(MISC)$/$(APP1LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc
.ENDIF # "$(APP1LINKRES)" != ""
@@ -309,8 +309,8 @@
@-+echo 1 ICON $(APP2ICON) >> $(MISC)$/$(APP2LINKRES:b).rc
.ENDIF
.IF "$(APP2VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc
- @-+echo #include "$(APP2VERINFO)" >> $(MISC)$/$(APP2LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP2LINKRES:b).rc
+ @-+echo "#include "\"$(APP2VERINFO)\" >> $(MISC)$/$(APP2LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc
.ENDIF # "$(APP2LINKRES)" != ""
@@ -505,8 +505,8 @@
@-+echo 1 ICON $(APP3ICON) >> $(MISC)$/$(APP3LINKRES:b).rc
.ENDIF
.IF "$(APP3VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc
- @-+echo #include "$(APP3VERINFO)" >> $(MISC)$/$(APP3LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP3LINKRES:b).rc
+ @-+echo "#include "\"$(APP3VERINFO)\" >> $(MISC)$/$(APP3LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc
.ENDIF # "$(APP3LINKRES)" != ""
@@ -701,8 +701,8 @@
@-+echo 1 ICON $(APP4ICON) >> $(MISC)$/$(APP4LINKRES:b).rc
.ENDIF
.IF "$(APP4VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc
- @-+echo #include "$(APP4VERINFO)" >> $(MISC)$/$(APP4LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP4LINKRES:b).rc
+ @-+echo "#include "\"$(APP4VERINFO)\" >> $(MISC)$/$(APP4LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc
.ENDIF # "$(APP4LINKRES)" != ""
@@ -897,8 +897,8 @@
@-+echo 1 ICON $(APP5ICON) >> $(MISC)$/$(APP5LINKRES:b).rc
.ENDIF
.IF "$(APP5VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc
- @-+echo #include "$(APP5VERINFO)" >> $(MISC)$/$(APP5LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP5LINKRES:b).rc
+ @-+echo "#include \"$(APP5VERINFO)\" >> $(MISC)$/$(APP5LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc
.ENDIF # "$(APP5LINKRES)" != ""
@@ -1093,8 +1093,8 @@
@-+echo 1 ICON $(APP6ICON) >> $(MISC)$/$(APP6LINKRES:b).rc
.ENDIF
.IF "$(APP6VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc
- @-+echo #include "$(APP6VERINFO)" >> $(MISC)$/$(APP6LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP6LINKRES:b).rc
+ @-+echo "#include "\"$(APP6VERINFO)\" >> $(MISC)$/$(APP6LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc
.ENDIF # "$(APP6LINKRES)" != ""
@@ -1289,8 +1289,8 @@
@-+echo 1 ICON $(APP7ICON) >> $(MISC)$/$(APP7LINKRES:b).rc
.ENDIF
.IF "$(APP7VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc
- @-+echo #include "$(APP7VERINFO)" >> $(MISC)$/$(APP7LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP7LINKRES:b).rc
+ @-+echo "#include "\"$(APP7VERINFO)\" >> $(MISC)$/$(APP7LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc
.ENDIF # "$(APP7LINKRES)" != ""
@@ -1485,8 +1485,8 @@
@-+echo 1 ICON $(APP8ICON) >> $(MISC)$/$(APP8LINKRES:b).rc
.ENDIF
.IF "$(APP8VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc
- @-+echo #include "$(APP8VERINFO)" >> $(MISC)$/$(APP8LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP8LINKRES:b).rc
+ @-+echo "#include "\"$(APP8VERINFO)\" >> $(MISC)$/$(APP8LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc
.ENDIF # "$(APP8LINKRES)" != ""
@@ -1681,8 +1681,8 @@
@-+echo 1 ICON $(APP9ICON) >> $(MISC)$/$(APP9LINKRES:b).rc
.ENDIF
.IF "$(APP9VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc
- @-+echo #include "$(APP9VERINFO)" >> $(MISC)$/$(APP9LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP9LINKRES:b).rc
+ @-+echo "#include "\"$(APP9VERINFO)\" >> $(MISC)$/$(APP9LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc
.ENDIF # "$(APP9LINKRES)" != ""
@@ -1877,8 +1877,8 @@
@-+echo 1 ICON $(APP10ICON) >> $(MISC)$/$(APP10LINKRES:b).rc
.ENDIF
.IF "$(APP10VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc
- @-+echo #include "$(APP10VERINFO)" >> $(MISC)$/$(APP10LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP10LINKRES:b).rc
+ @-+echo "#include "\"$(APP10VERINFO)\" >> $(MISC)$/$(APP10LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc
.ENDIF # "$(APP10LINKRES)" != ""
diff -ur oo_1.0.1_src.orig/solenv/inc/_tg_shl.mk oo_1.0.1_src/solenv/inc/_tg_shl.mk
--- oo_1.0.1_src.orig/solenv/inc/_tg_shl.mk 2002-01-02 05:23:22.000000000 -0600
+++ oo_1.0.1_src/solenv/inc/_tg_shl.mk 2002-09-12 18:05:28.000000000 -0500
@@ -226,10 +226,10 @@
@-+echo 1 ICON $(SHL1ICON) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL1TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL1TARGET:b)" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL1DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL1DEFAULTRES:b).rc
.ENDIF # "$(SHL1DEFAULTRES)"!=""
@@ -651,10 +651,10 @@
@-+echo 1 ICON $(SHL2ICON) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL2TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL2TARGET:b)" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL2DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL2DEFAULTRES:b).rc
.ENDIF # "$(SHL2DEFAULTRES)"!=""
@@ -1076,10 +1076,10 @@
@-+echo 1 ICON $(SHL3ICON) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL3TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL3TARGET:b)" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL3DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL3DEFAULTRES:b).rc
.ENDIF # "$(SHL3DEFAULTRES)"!=""
@@ -1501,10 +1501,10 @@
@-+echo 1 ICON $(SHL4ICON) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL4TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL4TARGET:b)" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL4DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL4DEFAULTRES:b).rc
.ENDIF # "$(SHL4DEFAULTRES)"!=""
@@ -1926,10 +1926,10 @@
@-+echo 1 ICON $(SHL5ICON) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL5TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL5TARGET:b)" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL5DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL5DEFAULTRES:b).rc
.ENDIF # "$(SHL5DEFAULTRES)"!=""
@@ -2351,10 +2351,10 @@
@-+echo 1 ICON $(SHL6ICON) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL6TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL6TARGET:b)" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL6DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL6DEFAULTRES:b).rc
.ENDIF # "$(SHL6DEFAULTRES)"!=""
@@ -2776,10 +2776,10 @@
@-+echo 1 ICON $(SHL7ICON) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL7TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL7TARGET:b)" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL7DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL7DEFAULTRES:b).rc
.ENDIF # "$(SHL7DEFAULTRES)"!=""
@@ -3201,10 +3201,10 @@
@-+echo 1 ICON $(SHL8ICON) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL8TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL8TARGET:b)" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL8DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL8DEFAULTRES:b).rc
.ENDIF # "$(SHL8DEFAULTRES)"!=""
@@ -3626,10 +3626,10 @@
@-+echo 1 ICON $(SHL9ICON) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL9TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL9TARGET:b)" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL9DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL9DEFAULTRES:b).rc
.ENDIF # "$(SHL9DEFAULTRES)"!=""
@@ -4051,10 +4051,10 @@
@-+echo 1 ICON $(SHL10ICON) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL10TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL10TARGET:b)" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL10DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL10DEFAULTRES:b).rc
.ENDIF # "$(SHL10DEFAULTRES)"!=""
diff -ur oo_1.0.1_src.orig/solenv/inc/_tg_zip.mk oo_1.0.1_src/solenv/inc/_tg_zip.mk
--- oo_1.0.1_src.orig/solenv/inc/_tg_zip.mk 2002-07-14 18:20:59.000000000 -0500
+++ oo_1.0.1_src/solenv/inc/_tg_zip.mk 2002-09-12 18:05:28.000000000 -0500
@@ -163,7 +163,8 @@
+-$(ZIPDEP) $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )}") $(avoid_cvs_dir) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
.ENDIF # "$(ZIP2DIR)" != ""
.ENDIF # "$(common_build_zip)"!=""
- @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+# (gb) workaround for setup2/script/makefile.mk
+# @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
.ENDIF # "$(make_zip_deps)" != ""
.ENDIF
Only in oo_1.0.1_src/solenv/inc: _tg_zip.mk~
diff -ur oo_1.0.1_src.orig/solenv/inc/libs.mk oo_1.0.1_src/solenv/inc/libs.mk
--- oo_1.0.1_src.orig/solenv/inc/libs.mk 2001-10-26 08:14:41.000000000 -0500
+++ oo_1.0.1_src/solenv/inc/libs.mk 2002-09-12 18:05:28.000000000 -0500
@@ -169,8 +169,8 @@
ZLIB3RDLIB=-lzlib
JPEG3RDLIB=-ljpeglib
NEON3RDLIB=-lneon
-BERKELEYLIB=-ldb-3.2
-BERKELEYCPPLIB=-ldb_cxx-3.2
+BERKELEYLIB=-ldb-4.0
+BERKELEYCPPLIB=-ldb_cxx-4.0
SFX2LIB=-lsfx$(UPD)$(DLLPOSTFIX)
SFXLIB=-lsfx$(UPD)$(DLLPOSTFIX)
SFXDEBUGLIB=
diff -ur oo_1.0.1_src.orig/solenv/inc/settings.mk oo_1.0.1_src/solenv/inc/settings.mk
--- oo_1.0.1_src.orig/solenv/inc/settings.mk 2002-06-07 09:10:00.000000000 -0500
+++ oo_1.0.1_src/solenv/inc/settings.mk 2002-09-12 18:05:28.000000000 -0500
@@ -617,14 +617,14 @@
.IF "$(GUI)"=="UNX"
@+echo \# > $(OUT)$/inc$/myworld.mk
.ELSE # "$(GUI)"=="UNX"
- @+echo # > $(OUT)$/inc$/myworld.mk
+ @+echo "#" > $(OUT)$/inc$/myworld.mk
.ENDIF # "$(GUI)"=="UNX"
.IF "$(common_build)"!=""
@+$(MKOUT) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
.IF "$(GUI)"=="UNX"
@+echo \# > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
.ELSE # "$(GUI)"=="UNX"
- @+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
+ @+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworld.mk
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(common_build)"!=""
@@ -638,10 +638,10 @@
%worldremote.mk :
@+$(MKOUT) -r $(ROUT)
- @+echo # > $(OUT)$/inc$/myworldremote.mk
+ @+echo "#" > $(OUT)$/inc$/myworldremote.mk
.IF "$(common_build)"!=""
@+$(MKOUT) -r $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(ROUT))
- @+echo # > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
+ @+echo "#" > {$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))}$/inc$/myworldremote.mk
.ENDIF # "$(common_build)"!=""
.INCLUDE .IGNORE : $(OUT)$/inc$/myworldremote.mk
diff -ur oo_1.0.1_src.orig/solenv/inc/tg_app.mk oo_1.0.1_src/solenv/inc/tg_app.mk
--- oo_1.0.1_src.orig/solenv/inc/tg_app.mk 2001-11-02 07:19:11.000000000 -0600
+++ oo_1.0.1_src/solenv/inc/tg_app.mk 2002-09-12 18:05:28.000000000 -0500
@@ -208,8 +208,8 @@
@-+echo 1 ICON $(APP$(TNR)ICON) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
.ENDIF
.IF "$(APP$(TNR)VERINFO)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
- @-+echo #include "$(APP$(TNR)VERINFO)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
+ @-+echo "#include "\"$(APP$(TNR)VERINFO)\" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
.ENDIF
$(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
.ENDIF # "$(APP$(TNR)LINKRES)" != ""
diff -ur oo_1.0.1_src.orig/solenv/inc/tg_dep.mk oo_1.0.1_src/solenv/inc/tg_dep.mk
--- oo_1.0.1_src.orig/solenv/inc/tg_dep.mk 2001-11-21 11:07:41.000000000 -0600
+++ oo_1.0.1_src/solenv/inc/tg_dep.mk 2002-09-12 18:05:28.000000000 -0500
@@ -124,9 +124,9 @@
@echo "#" > $(MISC)$/$(TARGET).dpw
.ENDIF
.ELSE # "$(GUI)"=="UNX"
- @echo # > $(MISC)$/$(TARGET).dpc
+ @echo "#" > $(MISC)$/$(TARGET).dpc
.IF "$(GROUP)"=="WRITER"
- @echo # > $(MISC)$/$(TARGET).dpw
+ @echo "#" > $(MISC)$/$(TARGET).dpw
.ENDIF
.ENDIF # "$(GUI)"=="UNX"
diff -ur oo_1.0.1_src.orig/solenv/inc/tg_shl.mk oo_1.0.1_src/solenv/inc/tg_shl.mk
--- oo_1.0.1_src.orig/solenv/inc/tg_shl.mk 2002-01-02 05:23:22.000000000 -0600
+++ oo_1.0.1_src/solenv/inc/tg_shl.mk 2002-09-12 18:05:28.000000000 -0500
@@ -326,10 +326,10 @@
@-+echo 1 ICON $(SHL$(TNR)ICON) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
.ENDIF
.IF "$(use_shl_versions)" != ""
- @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
- @-+echo #define ORG_NAME $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
- @-+echo #define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
- @-+echo #include "shlinfo.rc" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+ @-+echo "#define VERVARIANT $(BUILD)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+ @-+echo "#define ORG_NAME $(SHL$(TNR)TARGET)$(DLLPOST)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+ @-+echo "#define INTERNAL_NAME $(SHL$(TNR)TARGET:b)" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
+ @-+echo "#include "\"shlinfo.rc\" >> $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
$(RC) -DWIN32 -I$(SOLARTESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(SHL$(TNR)DEFAULTRES:b).rc
.ENDIF # "$(SHL$(TNR)DEFAULTRES)"!=""
diff -ur oo_1.0.1_src.orig/solenv/inc/unxlngi4.mk oo_1.0.1_src/solenv/inc/unxlngi4.mk
--- oo_1.0.1_src.orig/solenv/inc/unxlngi4.mk 2002-03-04 09:53:59.000000000 -0600
+++ oo_1.0.1_src/solenv/inc/unxlngi4.mk 2002-09-12 18:05:27.000000000 -0500
@@ -96,14 +96,14 @@
.ENDIF
CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
# flags for the C++ Compiler
-CFLAGSCC= -pipe -mcpu=pentiumpro
+CFLAGSCC= -pipe
# Flags for enabling exception handling
CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
# Flags for disabling exception handling
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti
+CFLAGSCXX= -pipe -fno-for-scope -fpermissive
# HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers
.IF "$(BUILD_SOSL)"==""
diff -ur oo_1.0.1_src.orig/solenv/inc/unxlngppc4.mk oo_1.0.1_src/solenv/inc/unxlngppc4.mk
--- oo_1.0.1_src.orig/solenv/inc/unxlngppc4.mk 2002-06-07 09:11:58.000000000 -0500
+++ oo_1.0.1_src/solenv/inc/unxlngppc4.mk 2002-09-12 18:05:28.000000000 -0500
@@ -107,7 +107,7 @@
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
# -fpermissive should be removed as soon as possible
-CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive -fno-rtti
+CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive
# Compiler flags for compiling static object in single threaded environment with graphical user interface
diff -ur oo_1.0.1_src.orig/starmath/source/makefile.mk oo_1.0.1_src/starmath/source/makefile.mk
--- oo_1.0.1_src.orig/starmath/source/makefile.mk 2001-11-29 07:16:22.000000000 -0600
+++ oo_1.0.1_src/starmath/source/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -140,9 +140,9 @@
$(INCCOM)$/dllname.hxx: makefile.mk
.IF "$(GUI)"=="UNX"
$(RM) $@
- echo #define DLL_NAME \"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ echo "#define DLL_NAME "\"libsm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ELSE
- echo #define DLL_NAME "sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)" >$@
+ echo "#define DLL_NAME "\"sm$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ENDIF
$(SRS)$/smres.srs: $(SOLARINCDIR)$/svx$/globlmn.hrc
diff -ur oo_1.0.1_src.orig/svtools/source/svhtml/htmlout.cxx oo_1.0.1_src/svtools/source/svhtml/htmlout.cxx
--- oo_1.0.1_src.orig/svtools/source/svhtml/htmlout.cxx 2001-11-29 05:41:03.000000000 -0600
+++ oo_1.0.1_src/svtools/source/svhtml/htmlout.cxx 2002-09-12 18:05:27.000000000 -0500
@@ -392,6 +392,15 @@
break;
}
+ // Don't uglify ISO-8859-2 output unnecessarily
+ if( pStr && pStr[0] && eDestEnc == RTL_TEXTENCODING_ISO_8859_2 )
+ {
+ if( !strcmp( pStr + 1, "acute" ) && strchr( "iIyYaAeEoOuU", pStr[0] ) )
+ pStr = 0;
+ else if( !strcmp( pStr + 1, "caron" ) && ( pStr[0] == 's' || pStr[0] == 'S' ) )
+ pStr = 0;
+ }
+
if( pStr )
{
((rDest += '&') += pStr) += ';';
diff -ur oo_1.0.1_src.orig/sw/source/core/txtnode/thints.cxx oo_1.0.1_src/sw/source/core/txtnode/thints.cxx
--- oo_1.0.1_src.orig/sw/source/core/txtnode/thints.cxx 2002-06-01 00:19:06.000000000 -0500
+++ oo_1.0.1_src/sw/source/core/txtnode/thints.cxx 2002-09-12 18:05:27.000000000 -0500
@@ -1851,7 +1851,7 @@
( SFX_ITEM_SET == rNode.GetpSwAttrSet()->GetItemState( nWhich,
FALSE, &pParaItem ) ) && ( pParaItem == &pHint->GetAttr() );
BOOL bReplace = !( SETATTR_DONTREPLACE & nMode );
- SwpHtStart_SAR *pTmpHints = 0;
+ ::SwpHtStart_SAR *pTmpHints = 0;
USHORT i;
// Wir wollen zwar von nHtStart bis nMaxEnd, muessen aber ggf.
@@ -2027,7 +2027,7 @@
// Beim Einfuegen spaltet es sich selbst.
if( pHistory ) pHistory->Add( pOther );
if( !pTmpHints )
- pTmpHints = new SwpHtStart_SAR();
+ pTmpHints = new ::SwpHtStart_SAR();
pTmpHints->C40_INSERT( SwTxtAttr, pOther,
pTmpHints->Count() );
Cut( i );
@@ -2076,7 +2076,7 @@
// Beim Einfuegen spaltet es sich selbst.
if( pHistory ) pHistory->Add( pOther );
if( !pTmpHints )
- pTmpHints = new SwpHtStart_SAR();
+ pTmpHints = new ::SwpHtStart_SAR();
pTmpHints->C40_INSERT( SwTxtAttr, pOther,
pTmpHints->Count() );
Cut( i );
diff -ur oo_1.0.1_src.orig/sw/source/filter/html/htmlforw.cxx oo_1.0.1_src/sw/source/filter/html/htmlforw.cxx
--- oo_1.0.1_src.orig/sw/source/filter/html/htmlforw.cxx 2001-09-28 01:27:53.000000000 -0500
+++ oo_1.0.1_src/sw/source/filter/html/htmlforw.cxx 2002-09-12 18:05:27.000000000 -0500
@@ -330,8 +330,8 @@
if( sListener.EqualsAscii( aEventListenerTable[j] ) &&
sMethod.EqualsAscii( aEventMethodTable[j] ) )
{
- pOpt = (STARBASIC==eScriptType ? aEventSDOptionTable
- : aEventOptionTable)[j];
+ pOpt = STARBASIC==eScriptType ? aEventSDOptionTable[j]
+ : aEventOptionTable[j];
break;
}
}
diff -ur oo_1.0.1_src.orig/sw/source/ui/app/makefile.mk oo_1.0.1_src/sw/source/ui/app/makefile.mk
--- oo_1.0.1_src.orig/sw/source/ui/app/makefile.mk 2001-08-23 08:30:57.000000000 -0500
+++ oo_1.0.1_src/sw/source/ui/app/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -152,12 +152,12 @@
.IF "$(GUIBASE)"=="WIN"
$(INCCOM)$/swdll0.hxx: makefile.mk
- echo #define DLL_NAME "sw$(UPD)$(DLLPOSTFIX).DLL" >$@
+ echo "#define DLL_NAME "\"sw$(UPD)$(DLLPOSTFIX).DLL\" >$@
.ENDIF
.IF "$(GUI)"=="UNX"
$(INCCOM)$/swdll0.hxx: makefile.mk
- echo #define DLL_NAME \"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
+ echo "#define DLL_NAME "\"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ENDIF
diff -ur oo_1.0.1_src.orig/sysui/oounix/office/scripts/soffice.sh oo_1.0.1_src/sysui/oounix/office/scripts/soffice.sh
--- oo_1.0.1_src.orig/sysui/oounix/office/scripts/soffice.sh 2002-04-01 13:56:18.000000000 -0600
+++ oo_1.0.1_src/sysui/oounix/office/scripts/soffice.sh 2002-09-12 18:05:28.000000000 -0500
@@ -181,11 +181,11 @@
SAL_FONTPATH="$sd_fonts/75dpi:unscaled;$sd_fonts/75dpi"
SAL_FONTPATH_PRIVATE="$sd_fonts/truetype;$sd_fonts/type1;$sd_fonts/serverfonts;$userinst/user/fonts"
XPPATH="$sd_inst/share/xp3"
-MOZILLA_FIVE_HOME="$sd_inst/program"
+# MOZILLA_FIVE_HOME="$sd_inst/program"
unset XENVIRONMENT
-export SAL_FONTPATH XPPATH SAL_FONTPATH_PRIVATE MOZILLA_FIVE_HOME
+export SAL_FONTPATH XPPATH SAL_FONTPATH_PRIVATE # MOZILLA_FIVE_HOME
# uncomment line below to disable anti aliasing of fonts
#SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
@@ -248,13 +248,11 @@
export PATH
# execute soffice binary
-# there is a bug in solaris sh that prevents the use of "$@"
-# because it cannot cope with spaces in directory names
if [ "X${plugin_mode}" = "Xtrue" ]; then
SAL_IGNOREXERRORS=true
export SAL_IGNOREXERRORS
- exec "$sd_prog/$sd_binary" -plugin "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+ exec "$sd_prog/$sd_binary" -plugin "$@"
else
- exec "$sd_prog/$sd_binary" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+ exec "$sd_prog/$sd_binary" "$@"
fi
diff -ur oo_1.0.1_src.orig/sysui/unix/office/scripts/soffice.sh oo_1.0.1_src/sysui/unix/office/scripts/soffice.sh
--- oo_1.0.1_src.orig/sysui/unix/office/scripts/soffice.sh 2002-04-10 14:55:40.000000000 -0500
+++ oo_1.0.1_src/sysui/unix/office/scripts/soffice.sh 2002-09-12 18:05:28.000000000 -0500
@@ -194,7 +194,7 @@
# misc. environment variables
SAL_FONTPATH="$sd_fonts/75dpi:unscaled;$sd_fonts/75dpi"
-SAL_FONTPATH_PRIVATE="$sd_fonts/truetype;$sd_fonts/type1;$sd_fonts/serverfonts;$userinst/user/fonts"
+SAL_FONTPATH_PRIVATE="$sd_fonts/truetype;$sd_fonts/type1;$sd_fonts/serverfonts;$userinst/user/fonts;$SAL_FONTPATH_USER"
XPPATH="$sd_inst/share/xp3"
MOZILLA_FIVE_HOME="$sd_inst/program"
Only in oo_1.0.1_src/sysui/unix/office/scripts: soffice.sh~
diff -ur oo_1.0.1_src.orig/tools/bootstrp/addexes/makefile.mk oo_1.0.1_src/tools/bootstrp/addexes/makefile.mk
--- oo_1.0.1_src.orig/tools/bootstrp/addexes/makefile.mk 2001-10-04 12:06:59.000000000 -0500
+++ oo_1.0.1_src/tools/bootstrp/addexes/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -98,7 +98,6 @@
#APP3TARGET= ldump
APP3STACK= 16000
APP3OBJS= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
-APP3STDLIBS=gnu_getopt.lib
APP3DEPN= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
#APP4TARGET= readmap
diff -ur oo_1.0.1_src.orig/tools/bootstrp/cppdep.cxx oo_1.0.1_src/tools/bootstrp/cppdep.cxx
--- oo_1.0.1_src.orig/tools/bootstrp/cppdep.cxx 2001-06-13 08:43:51.000000000 -0500
+++ oo_1.0.1_src/tools/bootstrp/cppdep.cxx 2002-09-12 18:05:28.000000000 -0500
@@ -64,18 +64,18 @@
#ifdef WNT
#ifdef BOOTSTRAPPER
-#include
+#include
#else
-#include
+#include
#endif
#endif
#ifdef UNX
#ifdef MACOSX
#ifdef BOOTSTRAPPER
-#include
+#include
#else
-#include
+#include
#endif
#endif
#include
diff -ur oo_1.0.1_src.orig/tools/bootstrp/cprjexe.cxx oo_1.0.1_src/tools/bootstrp/cprjexe.cxx
--- oo_1.0.1_src.orig/tools/bootstrp/cprjexe.cxx 2000-10-20 10:02:47.000000000 -0500
+++ oo_1.0.1_src/tools/bootstrp/cprjexe.cxx 2002-09-12 18:05:28.000000000 -0500
@@ -62,23 +62,23 @@
#ifdef WNT
#define __STDC__ 1
#ifdef BOOTSTRAPPER
-#include
+#include
#else
-#include
+#include
#endif
#endif
#ifdef UNX
#ifdef BOOTSTRAPPER
#ifndef SOLARIS
-#include
+#include
#endif
#ifdef MACOSX
-#include
+#include
#endif
#else
-#include
+// #include
#ifndef SOLARIS
-#include
+#include
#endif
#endif
#endif
diff -ur oo_1.0.1_src.orig/tools/bootstrp/makefile.mk oo_1.0.1_src/tools/bootstrp/makefile.mk
--- oo_1.0.1_src.orig/tools/bootstrp/makefile.mk 2001-10-16 09:21:13.000000000 -0500
+++ oo_1.0.1_src/tools/bootstrp/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -147,7 +147,7 @@
APP4LIBS= $(LB)$/bootstrp.lib
APP4DEPN= $(LB)$/atools.lib $(LB)$/bootstrp.lib
-#APP5TARGET= zipdep
+APP5TARGET= zipdep
APP5OBJS= $(OBJ)$/zipdep.obj
APP5LIBS= $(LB)$/bootstrp.lib
APP5STDLIBS=$(STATIC_LIBS)
diff -ur oo_1.0.1_src.orig/tools/bootstrp/rscdep.cxx oo_1.0.1_src/tools/bootstrp/rscdep.cxx
--- oo_1.0.1_src.orig/tools/bootstrp/rscdep.cxx 2001-06-13 08:59:43.000000000 -0500
+++ oo_1.0.1_src/tools/bootstrp/rscdep.cxx 2002-09-12 18:05:28.000000000 -0500
@@ -69,23 +69,23 @@
#ifdef WNT
#define __STDC__ 1
#ifdef BOOTSTRAPPER
-#include
+#include
#else
-#include
+#include
#endif
#endif
#ifdef UNX
#ifdef BOOTSTRAPPER
#ifndef SOLARIS
-#include
+#include
#endif
#ifdef MACOSX
-#include
+#include
#endif
#else
-#include
+// #include
#ifndef SOLARIS
-#include
+#include
#endif
#endif
#endif
diff -ur oo_1.0.1_src.orig/tools/bootstrp/static.mk oo_1.0.1_src/tools/bootstrp/static.mk
--- oo_1.0.1_src.orig/tools/bootstrp/static.mk 2001-10-16 09:21:13.000000000 -0500
+++ oo_1.0.1_src/tools/bootstrp/static.mk 2002-09-12 18:05:28.000000000 -0500
@@ -95,9 +95,6 @@
STATIC_LIBS += aosl.lib \
artl.lib
.ENDIF
-.IF "$(UPD)" >= "597"
-STATIC_LIBS += gnu_getopt.lib
-.ENDIF
.IF "$(LIBSTLPORT)" != ""
STATIC_LIBS += $(LIBSTLPORT)
.ENDIF
@@ -137,10 +134,6 @@
-lrtl$(UPD)$(DLLPOSTFIX)
.ENDIF
-.IF "$(UPD)" >= "597"
-STATIC_LIBS += -lgnu_getopt
-.ENDIF
-
.IF "$(COM)"=="C52"
.IF "$(BUILD_SOSL)"==""
STATIC_LIBS += -lCrun_static
diff -ur oo_1.0.1_src.orig/tools/os2/source/wps/makefile.mk oo_1.0.1_src/tools/os2/source/wps/makefile.mk
--- oo_1.0.1_src.orig/tools/os2/source/wps/makefile.mk 2000-09-18 12:03:04.000000000 -0500
+++ oo_1.0.1_src/tools/os2/source/wps/makefile.mk 2002-09-12 18:05:28.000000000 -0500
@@ -211,8 +211,8 @@
@+if exist $(INCCOM)$/wpsdll.h rm -f $(INCCOM)$/wpsdll.h
@echo ----------------------------
@echo Making: $@
- @echo #define _WPS_DLL_NAME "$(SHL1TARGET).dll" > $(INCCOM)$/wpsdll.h
- @echo #define _TEMPLATES_DLL_NAME "$(SHL2TARGET)" >> $(INCCOM)$/wpsdll.h
+ @echo "#define _WPS_DLL_NAME "\"$(SHL1TARGET).dll\" > $(INCCOM)$/wpsdll.h
+ @echo "#define _TEMPLATES_DLL_NAME "\"$(SHL2TARGET)\" >> $(INCCOM)$/wpsdll.h
$(SHL1DEF):
@echo ----------------------------
diff -ur oo_1.0.1_src.orig/unoil/com/sun/star/document/makefile.mk oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk
--- oo_1.0.1_src.orig/unoil/com/sun/star/document/makefile.mk 2000-09-18 10:28:26.000000000 -0500
+++ oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk 2002-09-12 18:05:27.000000000 -0500
@@ -64,7 +64,9 @@
PRJ = ..$/..$/..$/..
TARGET = unoil_document
PACKAGE = com$/sun$/star$/document
-
+KELL_MARKER = 1
# --- Settings -----------------------------------------------------
.INCLUDE : $(PRJ)$/makefile.pmk
+
+KELL_MARKER = 0
diff -ur oo_1.0.1_src.orig/unoil/makefile.pmk oo_1.0.1_src/unoil/makefile.pmk
--- oo_1.0.1_src.orig/unoil/makefile.pmk 2001-08-31 11:04:43.000000000 -0500
+++ oo_1.0.1_src/unoil/makefile.pmk 2002-09-12 18:05:27.000000000 -0500
@@ -74,7 +74,15 @@
JAVAFILESLIST := $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
.ENDIF # "$(L10N_framework)"==""
+# WARNING!!! WARNING!!! THIS IS A HACK!!! Well...so is just about everything
+# else in this package.
+# Do a little something special for project com.sun.star.document.
+.IF "$(KELL_MARKER)"=="1"
+GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i) $(GENJAVADIR)$/com$/sun$/star$/task$/XInteractionContinuation.java
+.ELSE
GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
+.ENDIF
+
GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
# --- Targets ------------------------------------------------------
diff -ur oo_1.0.1_src.orig/vcl/source/glyphs/gcach_ftyp.cxx oo_1.0.1_src/vcl/source/glyphs/gcach_ftyp.cxx
--- oo_1.0.1_src.orig/vcl/source/glyphs/gcach_ftyp.cxx 2002-01-02 04:38:06.000000000 -0600
+++ oo_1.0.1_src/vcl/source/glyphs/gcach_ftyp.cxx 2002-09-12 18:05:27.000000000 -0500
@@ -108,6 +108,13 @@
#include
#include
+#if defined(FT_NEXT_SHORT) && !defined(NEXT_Short)
+// Freetype 2.1 isn't fully compatible with the *internal(!)* API used by OOo
+#define NEXT_Short(x) FT_NEXT_SHORT(x)
+#define NEXT_UShort(x) FT_NEXT_USHORT(x)
+#define NEXT_Long(x) FT_NEXT_LONG(x)
+#endif
+
// Glyph Flags
#define GF_NONE 0
#define GF_ROTMASK 3
diff -ur oo_1.0.1_src.orig/vcl/util/makefile.mk oo_1.0.1_src/vcl/util/makefile.mk
--- oo_1.0.1_src.orig/vcl/util/makefile.mk 2002-02-15 05:44:54.000000000 -0600
+++ oo_1.0.1_src/vcl/util/makefile.mk 2002-09-12 18:05:27.000000000 -0500
@@ -198,7 +198,7 @@
.IF "$(USE_BUILTIN_RASTERIZER)"!=""
LIB1FILES += $(SLB)$/glyphs.lib
- SHL1STDLIBS+= $(FREETYPELIBST)
+ SHL1STDLIBS+= $(FREETYPELIB)
.ENDIF
.IF "$(remote)" == ""