summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobody <nobody@gnome.org>2005-10-20 12:51:01 +0000
committernobody <nobody@gnome.org>2005-10-20 12:51:01 +0000
commit1c11af4a0a0393e06c9152b8001bcd7b14f04dfa (patch)
treedeb1ce619b04d6cf48fb13f8e11e2a0511164a3d
parentb5f007b5d1baa1b4f70744d78f889368b411efed (diff)
This commit was manufactured by cvs2svn to create tagDEBIAN-2_0_0-1
'DEBIAN-2_0_0-1'.
Diffstat
-rw-r--r--Makefile.shared2
-rw-r--r--NEWS27
-rwxr-xr-xautogen.sh2
-rwxr-xr-xbin/oowintool128
-rwxr-xr-xbin/setup.in4
-rwxr-xr-xdownload.in23
-rw-r--r--patches/OOO_2_0/apply44
-rw-r--r--patches/cairo/cairo-svx-source-dialog-optgdlg-hrc.diff11
-rw-r--r--patches/src680/apply1175
-rw-r--r--patches/src680/cws-fs04.diff (renamed from patches/src680/cws-fs03-04.diff)17
-rw-r--r--patches/src680/disable-rhino.diff875
-rw-r--r--patches/src680/gengal-tool.diff18
-rw-r--r--patches/src680/help-messagebox.diff2
-rw-r--r--patches/src680/mandriva-splash.diff31
-rwxr-xr-xpatches/src680/mozilla-build-cygpath.diff98
-rw-r--r--patches/src680/mozilla-buildlibs-win32.diff148
-rw-r--r--patches/src680/stlport-ppc-buildfix.diff48
-rw-r--r--patches/src680/win32-msvs-2003-configure.diff134
-rw-r--r--patches/vba/sc-source-ui-vba-vbaapplication-cxx.diff4
-rwxr-xr-xsrc/glib-1.2.10-ooo.patch104
-rwxr-xr-xsrc/libIDL-0.6.8-ooo.patch25
-rw-r--r--src/openabout_nld.pngbin15274 -> 31294 bytes
-rw-r--r--src/openintro_nld.bmpbin394734 -> 394734 bytes
23 files changed, 1651 insertions, 1269 deletions
diff --git a/Makefile.shared b/Makefile.shared
index 7cc289455..6d53d1708 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -45,7 +45,7 @@ patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/patch.apply
$(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \
$(top_srcdir)/patches/*/*.diff \
$(APPLY_DIR)/apply
- cp -f $(top_srcdir)/src/libwpd-0*.tar.gz $(OOBUILDDIR)/libwpd/download/ || echo "cannot copy libwpd"
+ cp -f $(SRCDIR)/libwpd-0*.tar.gz $(OOBUILDDIR)/libwpd/download/ || echo "cannot copy libwpd"
if test "z$(BUILD_WIN32)" != "z"; then \
cp -af $(BUILDDIR)/x86/* $(OOBUILDDIR)/external/dbghelp || true; \
cp -af $(BUILDDIR)/*.dll $(OOBUILDDIR)/external/unicows || true; \
diff --git a/NEWS b/NEWS
index 4837e5b8f..1fbd55883 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,30 @@
+ooo-build-2.0.0
+
+ + features
+ + target 2.0.0
+ + updated artwork (Jimmac,Petr,Guiseppe)
+ + build fixes
+ + Win32 (David, Michael)
+ + enable crystal/industrial icons
+ + fix linux-specific system-bits
+ + gengal rename
+ + PPC stlport fix (Andreas)
+ + libwpd / srcdir (Andreas)
+
+ooo-build-2.0.rc3
+
+ + features:
+ + safer selection of patches (Michael)
+ + VBA update (Noel)
+ + bug fixes:
+ + fix --disable-openldap (Suka)
+ + better message when there is no help (Rene)
+ + fixed layout of Options...->View (Jan)
+ + download & build mozilla on win32 (David)
+ + build fixes:
+ + more parallel build of ooo680-m* (Jan, Caolan)
+ + various smaller fixes (Rene, Fridrich, Michael, Jan)
+
ooo-build-2.0.rc2
+ features:
diff --git a/autogen.sh b/autogen.sh
index 7dcebf72c..9cc32b17a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-if test "z$1" == "z--clean"; then
+if test "z$1" = "z--clean"; then
echo "Cleaning"
rm -Rf autom4te.cache bonobo/autom4te.cache
diff --git a/bin/oowintool b/bin/oowintool
index 7495058e5..d645932dc 100755
--- a/bin/oowintool
+++ b/bin/oowintool
@@ -24,6 +24,17 @@ sub reg_get_value($)
return $value;
}
+sub reg_find_key($)
+{
+ # it is believed that the registry moves keys around
+ # depending on OS version, this will de-mangle that
+ my $key = shift;
+ $key =~ s| |\\ |;
+ $key = `cd /proc/registry/ ; ls $key`;
+
+ return $key;
+}
+
sub print_syntax()
{
print "oowintool [option] ...\n";
@@ -33,10 +44,14 @@ sub print_syntax()
print " commands:\n";
print " --msvc-ver - dump version of MSVC eg. 6.0\n";
print " --msvc-copy-dlls <dest> - copy msvc[pr]??.dlls into <dest>/msvcp??/\n";
+ print " --msvc-copy-instmsi <dest> - copy instmsia.exe, insmsiw.exe into <dest>\n";
print " --msvc-productdir - dump productdir\n";
+ print " --msvs-productdir - dump productdir\n";
+ print " --dotnetsdk-dir - dump .Net SDK path\n";
print " --csc-compilerdir - dump .Net SDK compiler path\n";
print " --psdk-home - dump psdk install dir\n";
print " --jdk-home - dump the jdk install dir\n";
+ print " --nsis-dir - dump NSIS path\n";
print " --help - this message\n";
}
@@ -78,6 +93,11 @@ sub print_psdk_home()
{
my $value;
$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
+ if (!defined $value)
+ {
+ $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
+ $value = reg_get_value ($key);
+ }
defined $value || die "psdk not found";
print cygpath ($value, 'w', $output_format);
@@ -87,22 +107,60 @@ my %msvc6 = (
'ver' => '6.0',
'key' => 'Microsoft/VisualStudio/6.0/Setup/Microsoft Visual C++/ProductDir',
);
-my %msvs_net_2002 = (
+my %msvc_net_2002 = (
'ver' => '7.0',
'key' => 'Microsoft/VisualStudio/7.0/Setup/VC/ProductDir',
+ 'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
'dll_path' => '../Visual Studio .NET Professional - English', # testme ...
'dll_suffix' => '70'
);
-my %msvs_net_2003 = (
+my %msvs_net_2002 = (
+ 'ver' => '7.0',
+ 'key' => 'Microsoft/VisualStudio/7.0/Setup/VS/ProductDir',
+ 'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
+ 'dll_path' => 'Visual Studio .NET Professional - English', # testme ...
+ 'dll_suffix' => '70'
+);
+my %msvc_net_2003 = (
'ver' => '7.1',
'key' => 'Microsoft/VisualStudio/7.1/Setup/VC/ProductDir',
+ 'instmsi_path' => '../Common7/Tools/Deployment/MsiRedist',
'dll_path' => '../SDK/v1.1/Bin',
'dll_suffix' => '71'
);
+my %msvs_net_2003 = (
+ 'ver' => '7.1',
+ 'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
+ 'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
+ 'dll_path' => 'Visual Studio .NET Professional 2003 - English', # testme ...
+ 'dll_suffix' => '71'
+);
+my %msvs_net_2003_ea = (
+ 'ver' => '7.1',
+ 'key' => 'Microsoft/VisualStudio/7.1/Setup/VS/ProductDir',
+ 'instmsi_path' => 'Common7/Tools/Deployment/MsiRedist',
+ 'dll_path' => 'Visual Studio .NET Enterprise Architect 2003 - English', # testme ...
+ 'dll_suffix' => '71'
+);
sub find_msvs()
{
- my @ms_versions = ( \%msvs_net_2003, \%msvs_net_2002, \%msvc6 );
+ my @ms_versions = ( \%msvs_net_2003_ea, \%msvs_net_2003, \%msvs_net_2002, \%msvc6 );
+
+ for $ver (@ms_versions)
+ {
+ my $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/" . $ver->{'key'});
+ if (defined $install && $install ne '') {
+ $ver->{'product_dir'} = $install;
+ return $ver;
+ }
+ }
+ die "Can't find MS Visual Studio / VC++";
+}
+
+sub find_msvc()
+{
+ my @ms_versions = ( \%msvc_net_2003, \%msvc_net_2002, \%msvc6 );
for $ver (@ms_versions)
{
@@ -117,12 +175,18 @@ sub find_msvs()
sub print_msvc_ver()
{
- my $ver = find_msvs();
+ my $ver = find_msvc();
print $ver->{'ver'};
}
sub print_msvc_product_dir()
{
+ my $ver = find_msvc();
+ print cygpath ($ver->{'product_dir'}, 'w', $output_format);
+}
+
+sub print_msvs_productdir()
+{
my $ver = find_msvs();
print cygpath ($ver->{'product_dir'}, 'w', $output_format);
}
@@ -134,12 +198,24 @@ sub print_csc_compiler_dir()
print cygpath ($dir, 'w', $output_format);
}
+sub print_dotnetsdk_dir()
+{
+ my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1");
+ print cygpath ($dir, 'w', $output_format);
+}
+
sub print_jdk_dir()
{
my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome");
print cygpath($dir, 'w', $output_format);
}
+sub print_nsis_dir()
+{
+ my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/NSIS/@");
+ print cygpath ($dir, 'w', $output_format);
+}
+
sub copy_dll($$$)
{
my ($src, $fname, $dest) = @_;
@@ -151,13 +227,25 @@ sub copy_dll($$$)
chmod (0755, "$dest/$fname") || die "failed to set dll executable: $!";
}
+sub msvc_find_version($)
+{
+ my $checkpath = shift;
+ my $ver = find_msvc();
+ my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
+ $ver->{$checkpath});
+ -d $srcdir && return $ver;
+ $ver = find_msvs();
+ $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
+ $ver->{$checkpath});
+ -d $srcdir && return $ver;
+ return "";
+}
+
sub msvc_copy_dlls($)
{
my $dest = shift;
- my $ver = find_msvs();
-
- defined $ver->{'dll_path'} || return;
-
+ my $ver = msvc_find_version('dll_path');
+ defined $ver || return;
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{'dll_path'});
@@ -167,6 +255,20 @@ sub msvc_copy_dlls($)
$dest . $ver->{'dll_suffix'});
}
+sub msvc_copy_instmsi($)
+{
+ my $dest = shift;
+ my $ver = msvc_find_version('instmsi_path');
+ defined $ver || return;
+ my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
+ $ver->{'instmsi_path'});
+
+ copy_dll ($srcdir, "instmsia.exe",
+ $dest);
+ copy_dll ($srcdir, "instmsiw.exe",
+ $dest);
+}
+
if (!@ARGV) {
print_syntax();
exit 1;
@@ -194,14 +296,24 @@ while (@commands) {
my $dest = shift @commands;
defined $dest || die "copy-dlls requires a destination directory";
msvc_copy_dlls( $dest );
+ } elsif ($opt eq '--msvc-copy-instmsi') {
+ my $dest = shift @commands;
+ defined $dest || die "copy-instmsi requires a destination directory";
+ msvc_copy_instmsi( $dest );
+ } elsif ($opt eq '--msvs-productdir') {
+ print_msvs_productdir();
} elsif ($opt eq '--msvc-productdir') {
print_msvc_product_dir();
+ } elsif ($opt eq '--dotnetsdk-dir') {
+ print_dotnetsdk_dir();
} elsif ($opt eq '--csc-compilerdir') {
print_csc_compiler_dir();
} elsif ($opt eq '--psdk-home') {
print_psdk_home();
} elsif ($opt eq '--jdk-home') {
print_jdk_dir();
+ } elsif ($opt eq '--nsis-dir') {
+ print_nsis_dir();
} elsif ($opt eq '--help' || $opt eq '/?') {
print_syntax();
} else {
diff --git a/bin/setup.in b/bin/setup.in
index aebce3874..298d11daa 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -37,7 +37,7 @@ HUNSPELL_LIB_SRC=@HUNSPELL_LIB_SRC@
if test "z$BUILD_WIN32" != "z"; then
CONFIGURE_OPTIONS="--with-lang=\"$OOO_LANGS\" --with-use-shell=tcsh \
--without-gpc --enable-crashdump=no \
- --disable-directx \
+ --disable-directx --enable-build-mozilla \
--disable-binfilter --without-myspell-dicts \
--with-ant-home=$BUILDDIR/apache-ant-1.6.5"
@@ -200,6 +200,8 @@ UNICOWS_SRC=$SRCDIR/unicows.exe;
DBGINST_SRC=$SRCDIR/dbghinst.EXE;
ODMA_SRC=$SRCDIR/5_11_98Odma20.zip;
+BUILD_MOZILLA_SOURCE='@BUILD_MOZILLA_SOURCE@'
+
OPENCLIPART_VER=@OPENCLIPART_VER@
OPENCLIPART_DIR=@OPENCLIPART_DIR@
diff --git a/download.in b/download.in
index c66be48cb..83de600ad 100755
--- a/download.in
+++ b/download.in
@@ -22,6 +22,7 @@ sub usage {
'gcc-.*' => '@MIRROR@/support',
'src680-m.*' => '@MIRROR@/SRC680',
'ooo680-m.*' => '@MIRROR@/OOO680',
+ 'OOO_2_0.*' => '@MIRROR@/OOO680',
'libwpd-snap-.*' => '@MIRROR@',
'libwpd-0.*' => '@MIRROR@/libwpd',
'images_gnome-.*' => '@MIRROR@/SRC680',
@@ -42,7 +43,12 @@ sub usage {
'5_11_98Odma20\.zip' => '@MIRROR@/support',
'openclipart-*' => 'http://www.openclipart.org/downloads/@OPENCLIPART_VER@',
# Win32 ant binaries ...
- 'apache-ant-*' => 'http://apache.mirror.positive-internet.com/ant/binaries'
+ 'apache-ant-*' => 'http://apache.mirror.positive-internet.com/ant/binaries',
+# Mozilla source and libraries
+ 'mozilla-source-1.7.5*' => 'http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source/',
+ 'glib-*' => 'http://ftp.gtk.org/pub/gtk/v1.2/',
+ 'libIDL-*' => 'http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/source/',
+ 'wintools.zip' => 'http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/'
);
$WGET='/usr/bin/wget';
@@ -101,6 +107,11 @@ if ('@BUILD_WIN32@' ne '')
push @files, ( "$tag-system.tar.bz2" );
# push @files, ( '5_11_98Odma20.zip' ); # - ODMA - for when it works.
push @files, ( "apache-ant-1.6.5-bin.tar.gz" );
+ push @files, ( '@BUILD_MOZILLA_SOURCE@' );
+ push @files, ( 'glib-1.2.10.tar.gz' );
+ push @files, ( 'libIDL-0.6.8.tar.gz' );
+# this contains binaries and source, we just use the source
+ push @files, ( 'wintools.zip' );
}
else
{
@@ -108,10 +119,10 @@ else
push @files, ( 'cli_types.dll' );
push @files, ( 'cli_types_bridgetest.dll' );
}
- if ('@CAIRO_ENABLED@' eq 'TRUE' && '@SYSTEM_CAIRO@' ne 'TRUE') {
- push @files, ( 'cairo-@CAIRO_VER@.tar.gz' );
- push @files, ( 'glitz-@GLITZ_VER@.tar.gz' );
- }
+}
+if ('@CAIRO_ENABLED@' eq 'TRUE' && '@SYSTEM_CAIRO@' ne 'TRUE') {
+ push @files, ( 'cairo-@CAIRO_VER@.tar.gz' );
+ push @files, ( 'glitz-@GLITZ_VER@.tar.gz' );
}
if ('@OPENCLIPART_VER@' ne '') {
@@ -126,7 +137,7 @@ push @files, ( "libwpd-0.8.3.tar.gz" );
push @files, ( "$tag-core.tar.bz2" );
push @files, ( '@OOO_CUSTOM_IMAGES@', '@OOO_CRYSTAL_IMAGES@', '@OOO_EXTRA_ARTWORK@' );
-if ('@OOO_LANGS@' ne 'en-US' && "$tag" gt "src680-m113" ) {
+if ('@OOO_LANGS@' ne 'en-US' || '@BUILD_WIN32@' ne '' ) {
push @files, ( "$tag-lang.tar.bz2" );
}
diff --git a/patches/OOO_2_0/apply b/patches/OOO_2_0/apply
index f72992de3..4663351d0 100644
--- a/patches/OOO_2_0/apply
+++ b/patches/OOO_2_0/apply
@@ -9,11 +9,11 @@ PATCHPATH=.:../src680:../evo2:../vba:../mono:../64bit:../cairo
# -------- Functional sub-sets --------
Common : BuildBits, ParallelMake, TemporaryHacks, FixesNotForUpstream, \
- Fixes, Defaults, Features, VCL, SystemMozilla, Misc, \
- Icons, Fpickers, VBABits, CalcFixes, Leaks
+ Fixes, Defaults, Features, VCL, Misc, \
+ Icons, VBABits, CalcFixes, Leaks
Safe64bit : 64bitForUpstream, IntPtr, DXArray
-LinuxCommon : Common, LinuxOnly, CWSBackports, GCJ, AddressBooks, \
- QPro, Lwp, Mono, cairocanvas, VBAObjects, msaccess
+LinuxCommon : Common, LinuxOnly, SystemBits, CWSBackports, GCJ, AddressBooks, \
+ QPro, Lwp, Mono, cairocanvas, VBAObjects, msaccess, Fpickers
Win32Common : Common, NotDebian
# Binfilter patches: a special distro; applied only when building with binfilter
Binfilter : BFFixes, BFIcons
@@ -91,15 +91,6 @@ disable-recovery.diff
# Fix javaloader, #51724
buildfix-testtools.diff
-# Use system icu-3.4 #54479
-system-icu.diff
-
-# use system xmlsec
-system-xmlsec.diff
-
-# fix ure for --with-system-stdlibs
-ure-fix-system-stdlibs.diff
-
# fix crash i#45333, i#55409
crash-doc-load.diff
@@ -245,11 +236,6 @@ print-error.diff
# make nsplugin check MOZILLA_FIVE_HOME, too, i#49590
nsplugin-MOZILLA_FIVE_HOME.diff
-[ Fixes < ooo680-m2 ]
-# fixes some potentialy dangerous warnings in the module np_sdk, i#48819
-# The fix disappeared again in m129.
-warnings-npunix.diff
-
[ Fixes ]
# fix generic fpicker problem i#35830
fpicker-generic-extn.diff
@@ -355,7 +341,7 @@ svtools-unsort-template-dialogentries.diff
# Try to get the font mapping right
gui-metric-fonts.diff
# Add some WP import fixes not yet applied upstream
-cws-fs03-04.diff
+cws-fs04.diff
[ NovellOnly ]
novell-team.diff
@@ -566,7 +552,11 @@ hebrew-culmus.diff
# FIXME: #36763 is marked as fixed; create a new issue for this
cleanup-vcl-kdeint.diff
-[ SystemMozilla ]
+[ SystemBits ]
+# Use system icu-3.4 #54479
+system-icu.diff
+# use system xmlsec
+system-xmlsec.diff
# Enable the use of an internal nss with the symbols we need
internal-nss.diff
internal-nss-xmlsecurity.diff
@@ -697,7 +687,10 @@ win32-msvs-2003-configure.diff
win32-build-fixes.diff
# This is a pretty nasty IE problem #19510
# win32-activex-disable.diff # commented out as it breaks instsetoo_native
-
+# This enables building libIDL, glib and buildtools for mozilla from source
+mozilla-buildlibs-win32.diff
+# This fixes building mozilla in /opt
+mozilla-build-cygpath.diff
[ VBABits ]
# Alt-F11 does something useful #29138
@@ -743,6 +736,12 @@ version-2-0-sysuserconfig.diff
gentoo-splash.diff
# Do not use mozilla-ldap, it breaks for us
no-ldap-mozilla.diff
+# We are not using this
+no-fontooo-wizard.diff
+# Fix the system default fpicker
+default-system-fpicker.diff
+# Fix for build breakage on PPC
+stlport-ppc-buildfix.diff
#
# NOTE: 64 bit OOo is work in progress!
@@ -882,6 +881,7 @@ system-hsqldb.diff
# use system bsh
system-bsh.diff
disable-testtools.diff
+disable-rhino.diff
# don't use SansSerif per default, Debian bug #252014, Ubuntu bus #7409, #2374
no-sans-serif-default.diff
@@ -1082,7 +1082,7 @@ cairo-scp2.diff
# options dialog
cairo-svx-source-dialog-makefile-mk.diff
cairo-svx-source-dialog-optgdlg-cxx.diff
-cairo-svx-source-dialog-optgdlg-hrc.diff
+cairo-svx-source-dialog-optgdlg-src-hrc.diff
# disable cairo bits by default n#106644
default-cairo-disable.diff
diff --git a/patches/cairo/cairo-svx-source-dialog-optgdlg-hrc.diff b/patches/cairo/cairo-svx-source-dialog-optgdlg-hrc.diff
deleted file mode 100644
index 0ce632f45..000000000
--- a/patches/cairo/cairo-svx-source-dialog-optgdlg-hrc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- svx/source/dialog/optgdlg.hrc.U 2005-08-02 12:23:59.000000000 +0200
-+++ svx/source/dialog/optgdlg.hrc 2005-08-03 15:30:30.000000000 +0200
-@@ -99,7 +99,7 @@
- #define ROW_FT_ICONSIZESTYLE (ROW_MF_SCALING+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
- #define ROW_LB_ICONSIZESTYLE (ROW_FT_ICONSIZESTYLE+RSC_CD_FIXEDTEXT_HEIGHT+ROWSPACE)
- #define ROW_CB_SYSTEM_FONT (ROW_LB_ICONSIZESTYLE+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
--#define ROW_CB_FONTANTIALIASING (ROW_CB_SYSTEM_FONT+ (2 * RSC_CD_DROPDOWN_HEIGHT) +ROWSPACE)
-+#define ROW_CB_FONTANTIALIASING (ROW_CB_SYSTEM_FONT+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
- #define ROW_NF_AA_POINTLIMIT (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-
- #define ROW_FL_MENU (ROW_NF_AA_POINTLIMIT+RSC_CD_DROPDOWN_HEIGHT+RSC_SP_FLGR_SPACE_X)
diff --git a/patches/src680/apply b/patches/src680/apply
deleted file mode 100644
index 542430d91..000000000
--- a/patches/src680/apply
+++ /dev/null
@@ -1,1175 +0,0 @@
-#
-# The format of this file is:
-#
-
-# -------- Options --------
-
-PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo
-
-# -------- Functional sub-sets --------
-
-Common : BuildBits, ParallelMake, TemporaryHacks, FixesNotForUpstream, \
- Fixes, Defaults, Features, VCL, SystemMozilla, Misc, \
- Icons, Fpickers, VBABits, CalcFixes, Leaks
-Safe64bit : 64bitForUpstream, IntPtr, DXArray, NumberFormat
-LinuxCommon : Common, LinuxOnly, CWSBackports, GCJ, AddressBooks, \
- QPro, Lwp, Mono, cairocanvas, VBAObjects, msaccess, \
- Safe64bit
-Win32Common : Common, NotDebian
-64bit : 64bitPatches, Trivial
-# Binfilter patches: a special distro; applied only when building with binfilter
-Binfilter : BFFixes, BFIcons
-# Hunspell patches: a special distro; applied only when building with --enable-hunspell
-Hunspell: HunspellPatches
-# Localization patches to localize.sdf files: applied only when we have langpacks
-Localize : SDFPatches
-# Novell
-NLDBase : NLDOnly, LinuxCommon, NovellOnly, NovellOnlyUnix, NotDebian, Lockdown
-SUSEBase : SUSEOnly, LinuxCommon, NovellOnly, NovellOnlyUnix, NotDebian, Lockdown
-#NLD64 : NLDBase, 64bit, JDK150 - java modules cannot register on AMD64 atm, let's disable it
-NLD64 : NLDBase, 64bit, SystemDB
-NLD : NLDBase
-SUSE : SUSEBase
-# Debian
-DebianBase : LinuxCommon, SystemDB, DebianBaseOnly
-Debian : DebianBase, DebianOnly
-Debian64 : DebianBase, 64bit, DebianOnly
-# Ubuntu
-Ubuntu: DebianBase, UbuntuOnly
-Ubuntu64: DebianBase, 64bit, UbuntuOnly
-# Ark Linux
-Ark: LinuxCommon, NotDebian, ArkOnly
-# www.pld-linux.org
-PLDBase: LinuxCommon, NotDebian
-PLD: PLDBase
-PLD64: PLDBase, 64bit
-# Mandriva Linux
-MandrivaBase: MandrivaOnly, LinuxCommon, NovellOnlyUnix
-Mandriva: MandrivaBase
-Mandriva64: MandrivaBase, 64bit
-# Frugalware Linux
-FrugalwareBase: LinuxCommon, FilePicekrs, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, GentooOnly, Gcc34, NovellOnlyUnix, NotDebian, FrugalwareOnly
-Frugalware: FrugalwareBase
-Frugalware64: FrugalwareBase, 64bit
-#Gentoo
-GentooBase : LinuxCommon, GentooOnly, Lockdown
-Gentoo : GentooBase
-Gentoo64: GentooBase, 64bit
-# Win32
-Win32 : Win32Common, NovellOnly, NovellOnlyWin32
-
-# -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
-
-[ TemporaryHacks ]
-# De Sun-ify the recovery report dialog - FIXME file up-stream
-recovery-report.diff
-# Urgh - still ! - Startup notification fixes i#18970
-startup-fix.diff
-# adding glib-2.0 and ORBit-2.0 to pkgconfig modules; i#47923
-buildfix-pkgconfig-gconfbe.diff
-# give a nice warning on user failure to source ./env
-# FIXME: Really just for the Gtk+ vclplug?
-linkoo-warning.diff
-# a simple tool to help re-build IDL interfaces
-tool-ooidlbuild.diff
-# temporary hack to avoid the warning about missing return values in gcc4
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20624
-warning-return-values-stlport.diff
-# a change to the word import filter to improve speed
-# (12-14% in measured cases) #53055
-ww8scan.diff
-# beef up the environment on linux to help catch malloc errors i#53839
-linkoo-ooenv.diff
-# disable recovery dialog when hacking i#54275
-disable-recovery.diff
-
-# Replace myspell linked list implementation with hashed implementation
-# Reduces myspell mem usage by more than half (3.7M to ~680K)
-# See issue #50842
-myspell_hashify.diff
-
-# Fix --without-java build #51194, CWS sb33
-# Fix javaloader, #51724
-buildfix-testtools.diff
-
-# Use system icu-3.4 #54479
-system-icu.diff
-
-# use system xmlsec
-system-xmlsec.diff
-
-# fix ure for --with-system-stdlibs
-ure-fix-system-stdlibs.diff
-
-# fix crash i#45333, i#55409
-crash-doc-load.diff
-
-# LD_LIBRARY_PATH should not end with a ":" N#118188, #55733
-ld-library-path.diff
-
-# tell the user that no help was dound if it wasn't found instead some
-# obscure message, i#55841
-help-messagebox.diff
-
-[ TemporaryHacks < src680-m132 ]
-# Parallel build of readlicense_oo, sc, ... #54963, CWS cmcfixes19
-cws-cmcfixes19.diff
-
-[ GCJ ]
-# work around missing symbol in libgcj...
-bean-gcj-bug-workaround.diff
-# allow gij-4.0...
-jvmfwk-gij-4.0.diff
-gjdoc-no-class-use.diff
-wizards-filter-gcj-access-problems.diff
-hsqldb-gcj-access-problems.diff
-# make gcj-dbtool optional
-gcj-dbtool-optional.diff
-
-# Fixes that were not accepted up-stream, but are still useful
-[ FixesNotForUpstream ]
-# Make debugging nicer under unix i#35336
-debug-bits.diff
-# make menu layout prettier i#17937
-vcl-menu-fixes.diff
-# Make the scroll-wheel / page popup more sane i#20826
-gui-sw-scroll.diff
-
-[ Fixes ]
-# fix check box rendering issue - n#80447
-check-buttons-rendering-fix.diff
-# Fix default Writer bullets not exporting to MS format intact n#10555
-sw-bullet-interop-fix.diff
-# Fix NFS / flock issue n#104655, i#53682
-nfs-flock.diff
-# fix the wizards crasher n#10512, i#43665
-wizards-crasher-fix.diff
-# Disable the printer properties which are unused IZ#14036, n#583
-printer-properties-disable.diff
-# get interactivity right during slow updates #42221
-vcl-gtk-yield.diff
-# File->New->Spreadsheet freezes on some versions of GCC # FIXME: shres
-svx-freeze-fix.diff
-# update pyuno docs from www.oo.o
-pyuno-update-docs.diff
-# Fix impress spellcheck #32320
-crash-sd-spellcheck.diff
-# disable font management dialog in padmin
-padmin-nofontconfig.diff
-# Improve the web bullet export / export to png not gif. #23353
-sd-export-html-theme.diff
-sd-export-html.diff
-sd-export-html-translations.diff
-sd-export-html-descr.diff
-# Escape should cancel the print preview - Writer X#67133 #35777
-sw-escape-print-preview.diff
-# Escape should cancel the print preview - Calc X#67133 #46976
-sc-escape-print-preview.diff
-# adds to Autofilter Empty-NonEmpty options bxc #62165 Issue#35578
-sc-autofilter-empty-nonempty.diff
-# Improves the standard filter options and menu. bxc #62187 #62495 i#35579
-sc-standard-filter-options.diff
-# Hides the filtered rows when height of rows are changed bxc #62161 Issue #35581
-sc-filter-hide-filteredrows.diff
-# allows not to delete nonfiltered rows while deleting the filtered ones bxc #62186 Issue 35582
-sc-no-delete-filteredrows.diff
-# Autofill doesnt fill filtered rows bxc 62499
-sc-filters-fill-fix.diff
-# Provision for dynamic range in data pilot issue #23658 bxc 62522
-sc-datapilot-dynamic-range.diff
-# Provision for data-pilot to give autoformat Issue #37388 bxc #62162
-sc-datapilot-autoformat.diff
-# Make SAL compile on Linux systems that use NPTL without compat hacks
-# (pthread_kill_other_threads_np is dead)
-sal-compile-with-nptl.diff
-# don't bloat the toolbars beyond belief #41833
-vcl-toolbox-height.diff
-# BXC 62488 : Allows insertion of rows by shifting down
-#sc-paste-insert-rows.diff disable...
-# Fix for datapilot crash when clicking outside dialog
-sc-datapilot-crash-fix.diff
-# Fix for datapilot crash on remote databases
-sc-dp-database-crash.diff
-# Fix for autotriming of autofilter choices bxc 65945 Issue FIXME
-sc-autofilter-autotrim-choices.diff
-# Replace usability numb Zoom dialog with a Combo Box
-zoom-combobox.diff
-# Fix broken condition implementation & it's mis-use i#44627
-vcl-gtk-condition.diff
-sal-condition.diff
-# Display min password length in dialog Issue 44979 BINC 773
-sc-save-password-minlength.diff
-# Allow dnd in Change record mode for Data source Issue 44982 BINC 70845
-sc-change-record-dnd.diff
-# Fix for partial libwpd filter removal n#72313, i#45007, CWS kendy06
-crash-iodetect.diff
-# Fix for un-parseable PPDs n#73034, i#53742
-crash-cups-ppd.diff
-# Fix for b.x.c 55943 - insert note on right click i#47442
-sc-insert-note-on-right-click.diff
-# fixes missing return values, i#47960
-warning-return-values-graphics.diff
-# fixes warnings about uninitialized variables, i#49387
-warning-uninitialized-variables-sch.diff
-# fixes warnings about uninitialized variables, i#49381
-warning-uninitialized-variables-sd.diff
-# fixes warnings about uninitialized variables, i#49384
-warning-uninitialized-variables-tools.diff
-# temporary hacks to remove warnings in the unused code,
-# required by the SUSE build system, i#49351, i#49385
-warning-uninitialized-variables-sc.diff
-warning-uninitialized-variables-sw.diff
-# the following three warnings appear just on ppc
-warning-uninitialized-variables-remotebridges.diff
-warning-uninitialized-variables-sw2.diff
-warning-uninitialized-variables-vcl.diff
-# use fast/native gtk+ rendering, unless we have the broken
-# qt<->gtk theme selected i#50857
-gtk-kde-fix.diff
-# run crash_report only when it is built, i#54121
-sal-when-to-run-crash-report.diff
-# fix spin-button event timeout problems i#54335
-vcl-fix-spin-events.diff
-
-# Fix the print error dialog and pop-up when unable to print. BINC 64010 Issue 44695
-print-error.diff
-
-# make nsplugin check MOZILLA_FIVE_HOME, too, i#49590
-nsplugin-MOZILLA_FIVE_HOME.diff
-
-# fixes some potentialy dangerous warnings in the module np_sdk, i#48819
-# The fix disappeared again in m129.
-warnings-npunix.diff
-
-[ Fixes ]
-# fix generic fpicker problem i#35830
-fpicker-generic-extn.diff
-# disable cut-n-paste on right-click menu for datapilot - n#75436
-sc-datapilot-cut-paste-disable.diff
-# eliminate some C style casts. Fixes (possibly g++ 4.0-only) impress load crashers
-# i#44843 i#44846 i#45162 rh#150789
-sd-dynamic-cast.diff
-# Tell the desktop we support the VFS #43504
-uses-vfs.diff
-svx-dynamic-const-cast.diff
-
-# Fix for b.x.c 62193 (i#45245)
-sc-sheet-double-click-rename.diff
-
-[ Leaks ]
-# silly leaks around the place i#50726
-leak-sal-file.diff
-leak-sal-module.diff
-# 3D charting leak i#50777
-leak-sch-3d.diff
-# 3D properties leak i#50808
-leak-svx-3d.diff
-# daft mis-use of rtl_uString i#50776
-leak-registry.diff
-
-[ CalcFixes ]
-# <ctrl> +/‑ to insert/delete a complete line in calc (X#62530) #38108
-calc-new-acceleration.diff
-# Make the delete key happy again in starcalc #17965 - wontfix [!]
-gui-sc-delete.diff
-# improved error/value compatibility - i#47644
-sc-xl-errors.diff
-# compatibility for numbers in string cells (with leading/trailing space) - i#47811
-sc-string-arg.diff
-# fix for the Data Pilot crasher. - i#47145
-sc-pv-crasher.diff
-# add =info() function - i#49498
-sc-info-func.diff
-# changed address function to accept 5 parameters - i#49499
-sc-address.diff
-# div/0 error export by div function - i#47724
-sc-div.diff
-# div/0 error export by other functions - i47724
-sc-div-errs.diff
-# performance problem with xls import of many shared expressions i#50248
-sc-xls-shared-expr.diff
-# COLUMN and ROW return series for arrays i#49906
-sc-column-row-array.diff
-# Support for formula input to start with '+' or '-' - i#20496, i#52179
-sc-startformulawplus.diff
-# To make CSV Text Import settings persistent - i#3687
-sc-preserve-imp-opts.diff
-# An option - 'save as rendered' while exporting to .csv - i#4925
-sc-csvfix-ui.diff
-# Bug in import of control name in calc. - i#54221
-# sc-ctrlname-import.diff
-# Send e-mail in MS format as attachment x#62200, i#46895
-ms-interoperability-email-attachment-as-doc-xls-ppt-m99.diff
-# Extract (most of) cws dr37
-cws-dr37.diff
-
-[ Fixes ]
-# Make impress page navigation easier n#74202 i#46689
-impress-page-flip.diff
-# ordinal suffix iteration i#47233
-sc-iteration.diff
-
-[ LinuxOnly ]
-# Modify the fpicker makefile causing problems in the win32 build
-fpicker-common-build.diff
-# make some symbols from svtools visible for the kde fpicker when compiling with gcc4
-# fix: this breaks win32
-fpicker-kde-gcc4-visibility.diff
-
-[ Misc ]
-# Make the default writer bullet larger i#21829
-# sw-default-bullet.diff - FIXME - FIXME -
-# Insert symbol defaults to the Symbol font - not a random one #15512
-gui-sw-insert-symbol.diff
-# Address data source ordering X#62860
-addrbk-datasrc-ordering.diff
-# Describe the metric compatible fonts for export mappings
-gui-metric-fonts-descr.diff
-# E-mail attachment file name append with "_1" X#67684 #35780
-email-attachment-underscore-zero.diff
-# removing multimedia menu's X66608
-remove-default-multimedia-menu.diff
-# Change the Tooltip Color, #46499, n#10581
-change-tooltipcolor-m90.diff
-db4-jni-casting.diff
-# Fix some IDL comments, i#28045, i#29235, i#36476, i#51098
-idl-doc-fixes.diff
-# Word Completion: Accept with [Tab] i#4148
-tab-key-for-autocomplete.diff
-# Changed the default option in the Templates and Documents dialog.
-svtools-default-new-document.diff
-# a batch of fixes from 2.0.1
-cws-sj22.diff
-# contextual autocomplete i#22961
-context-autocomplete.diff
-# Insensitive menu entries n#105864
-vcl-insensitive-menuitems.diff
-# Grouping items in the templates dialog n#106603
-svtools-unsort-template-dialogentries.diff
-# Try to get the font mapping right
-gui-metric-fonts.diff
-# Add some WP import fixes not yet applied upstream
-cws-fs03-04.diff
-
-[ NovellOnly ]
-novell-team.diff
-
-[ NotDebian ]
-# Fix the system default fpicker
-default-system-fpicker.diff
-# don't display File->Wizards-> install dictionaries/fonts -
-# makes no sense on Linux n#74249
-default-no-install-wizards.diff
-
-[ DebianBaseOnly ]
-odk-remove-non-free.diff
-sdk-remove-non-free.diff
-sensible-ooomua.diff
-sensible-browser.diff
-community-splash.diff
-no-fontooo-wizard.diff
-pyuno-rpath-ooodir.diff
-default-cairo-disable.diff
-sparc-bridges-use-g++-3.4.diff
-
-[ DebianOnly ]
-# fix the About box...
-ooo-vendor-debian.diff
-debian-splash.diff
-
-[ MandrivaOnly ]
-mandriva-splash.diff
-default-system-fpicker.diff
-mozilla-firefox.diff
-gcc401-stlport45-include.diff
-mandriva-archflags.diff
-
-[ NovellOnlyUnix ]
-# Help Support page
-help-support.diff
-# mark the files in share/template/<lang>/wizard/bitmap as lang specific
-build-wizard-bitmap-scp.diff
-# configure some Japanese fonts used on Novell products
-# (patch by Mike Fabian mfabian@suse.de)
-novell-cjk-fonts.diff
-# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre
-version-2-0-pre.diff
-
-[ NovellOnlyWin32 ]
-filebug-support.diff
-
-[ FrugalwareOnly ]
-frugalware.diff
-bdb43.diff
-
-# ( mmp@oo.o deals with defaults apparently )
-[ Defaults ]
-# stop the user having to fight ooimpress constantly #35338
-capitalization.diff
-# default to large icons in the toolbar
-gui-toolbox-large-icons.diff
-# Use nicer colors for the charts X#64359
-sc-default-color-modify.diff
-# default to anti-alias at point size of 1 point
-default-font-aasize.diff
-# set default font size to 10pt #35565
-default-font-size.diff
-# don't use any slow / nasty X fonts #35641
-default-no-x-fonts.diff
-# Dramatically improve MS import / export cf. #8276 et. al.
-default-ms-filter-convert.diff
-# use pair kerning in new documents #35873
-default-pairkerning-on.diff
-# Optimal Page Wrap should be default for graphics insertion (X#59831) #38108
-writer-default-as-optimal-page-wrap.diff
-# double the graphics cache limits, n#62310, #46215
-default-graphics-cache.diff
-# Ted Hager likes this: i#54709
-default-impress-ruler.diff
-# move ahead 1 effect with arrow-right key i#54710
-gui-slide-switch.diff
-# backspace deletes slides like 'delete' in slide sorter i#54714
-gui-slidesort-backspace.diff
-
-
-#
-# Controversial bits - no use filing up-stream
-#
-# pestering people serves no useful purpose
-default-no-registration.diff
-# automatically do any migration we can, with no wizard
-default-no-startup-wizard.diff
-# don't throw up the style dialog on 1st run
-default-no-style-dialog.diff
-# no Help->registration dialog by default
-default-no-registration-menu.diff
-# Use the Gnome VFS on KDE as well if it's there (better than nothing)
-vfs-kde-too.diff
-# Trade speed for reliability with valgrind
-valgrind-alloc.diff
-
-[ SDFPatches ]
-sd-save-image-context-menu-localize.diff
-
-[ Defaults ]
-# Save as menuitem for image context menus in impress #13816
-sd-save-image-context-menu.diff
-
-[ Features ]
-# Make cut and paste nicer i#15509
-sc-paste-dialog.diff
-# utility gengal that allows to create OOo galleries, #49174
-gengal-scp2.diff
-gengal-svx.diff
-gengal-tool.diff
-# cmc's mailmerge implementation in python, Issues 51637 and 51638
-pyuno-registering.diff
-pymailmerge.diff
-
-[ BuildBits ]
-# do an optimizing link
-build-optimized-link.diff
-# add -dontstrip option to the installer, i#48814
-installer-strip-optional.diff
-# enable build with gcc-4.1.x
-buildfix-enable-gcc41.diff
-
-# do not build extras for icu, workaround for http://bugs.debian.org/210608
-icu-build-no-extras.diff
-# Fix up Javac error, known to happen with gcj, probably happens for other
-# JDKs too
-buildfix-qadevOOo-java-encoding.diff
-
-[ BuildBits ]
-# Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3)
-sal-cxa-guard.diff
-# do not pack any potential .orig files with ppds
-psprint_config-no-orig.diff
-# Fix ODK Java bits
-odk-java-wizpanel.diff
-# add possibility to set ARCH_FLAGS when building libnas
-nas-use-arch-flags.diff
-# add possibility to set ARCH_FLAGS when building portaudio, i#53387
-portaudio-use-arch-flags.diff
-# fix building on SUSE Linux 9.3; disable the check for valid symlinks, #46226
-freedesktop-menus-spec.diff
-
-# Detect db 4.3.x when using --with-system-db
-config_office-system-db-4.3.diff
-# fix the configure check for system mozilla and python, thanks to suka
-config_office-system-mozila-python-fix.diff
-# fix the configure check for openldap
-config_office-openldap-fix.diff
-
-# Don't fail when building --without-stlport4
-buildfix-ucb-without-stlport4.diff
-buildfix-svx-without-stlport4.diff
-
-[ ArkOnly ]
-system-db-4.3-use-lpthread.diff
-# FIXME this is generally useful -- currently applied here only because
-# it breaks building with db < 4.3
-xmlhelp-port-to-db-4.3.diff
-
-[ BuildBits ]
-# work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
-powerpc-svx-customshapes-NOOPTFILES.diff
-# fix to build with system libnspr (installed apart from mozilla), i#49720
-buildfix-system-nspr-m112.diff
-# fix to build with system libnss (installed apart from mozilla)
-buildfix-system-nss.diff
-
-# Make the ldap stuff compile even if system openldap is >= 2.3.x
-extensions-ldap-system-openldap-2.3.x.diff
-# fix LINK
-arm-LINK-is-CC.diff
-powerpc-LINK-is-CC.diff
-s390-LINK-is-CXX.diff
-
-# make some symbols from sc visible when compiling with gcc4, necessary since m121, i#53261
-gcc4-visibility-sc.diff
-gcc4-vba-pastespecial-visibility.diff
-
-[ ParallelMake ]
-# Fixes for distributed building (with icecream) #35627
-parallel-solenv-tg_sdi-mk.diff
-# 3 more makefiles in sysui are seriously broken #35628
-parallel-sysui-makefiles.diff
-
-# Fix/workaround race condition with .REMOVE rule #16752
-parallel-dmake-dont-remove.diff
-
-# Fixes for distributed building (with icecream) #35627
-parallel-solenv-target-mk.diff
-
-[ VCL ]
-# Don't let the splash screen take over #23609
-no-splash-takeover.diff
-# Ensure window title is "OpenOffice.org..." rather than "Untitled window" #rh120696#
-splash-title.diff
-# Use nwf for menu item check boxes instead of ugly symbols #48965
-vcl-nwf-menu-checkmarks.diff
-
-# Better fallback when some of the plugins are not available #50857
-vcl-better-fallback.diff
-
-# prioritize hebrew culmus fonts, Debian bugs #280084, #296152, #300642
-hebrew-culmus.diff
-
-# don't use SansSerif per default, Debian bug #252014, Ubuntu bus #7409, #2374
-no-sans-serif-default.diff
-
-[ VCL ]
-# Cleanup of old kdeint pieces - part of #36763
-# FIXME: #36763 is marked as fixed; create a new issue for this
-cleanup-vcl-kdeint.diff
-
-[ SystemMozilla ]
-# Enable the use of an internal nss with the symbols we need
-internal-nss.diff
-internal-nss-xmlsecurity.diff
-internal-nss-xmlsecurity-libnss.diff
-
-[ HunspellPatches ]
-hunspell-config.diff
-hunspell-build.diff
-hunspell-lingucomponent-dep.diff
-hunspell-scp2.diff
-libhunspell-build.diff
-hunspell-no-hunspell_version.diff
-
-[ Icons ]
-# Re-size over-large icons to 24x24 - #15208
-sfx2-toolbox-size.diff
-# Make insensitive toolbar icons look far nicer #35555
-gui-insensitive.diff
-# Installation & appearance of multiple icon sets (Industrial and Crystal)
-# #36518, CWS iconswitching1
-# Cleanup after cut'n'paste in CWS oooicons
-icons-cleanup.diff
-# Implement the icon switching, CWS iconswitching1
-icons-switching-framework.diff
-icons-switching-svtools.diff
-icons-switching-vcl.diff
-# GUI for the icon switching, CWS iconswitching1
-icons-gui-svx.diff
-# Saving of the state, CWS iconswitching1
-icons-saving-officecfg.diff
-icons-saving-svtools.diff
-# Icon style for the help, CWS iconswitching1
-icons-switching-xmlhelp.diff
-
-[ BFIcons ]
-# Installation & appearance of multiple icon sets (Industrial and Crystal)
-# #36518, CWS iconswitching1
-# Cleanup after cut'n'paste in CWS oooicons
-icons-cleanup-binfilter.diff
-
-[ IconsObsolete ]
-# FIXME: Remove, this is the obsolete approach
-# Installation & appearance of multiple icon sets (Industrial and Crystal) #36518
-icons-vcl-according-to-desktop.diff
-icons-xmlhelp-according-to-desktop.diff
-
-[ Fpickers ]
-# Out-of-process implementation of KDE fpicker
-# FIXME: No IZ number for this, because it is necessary to do it internal first
-fpicker-kde-service.diff
-# Out-of-process implementation of KDE fpicker
-# FIXME: No IZ number for this, because it is necessary to do it internal first
-fpicker-kde-dialog.diff
-# Partially support KIO (download the file locally if we cannot handle it in
-# OOo or (FIXME) using gnome-vfs) binc#60527
-fpicker-kde-partial-kio.diff
-# Workaround for 'Filter name (*.blah)' vs. 'Filter name' problem in
-# Insert->Picture->From File... n#66873
-fpicker-kde-filter-name.diff
-# Adapt to changes in resources handling of fpickers
-fpicker-kde-resmgr.diff
-
-# Let the KDE and Gtk+ fpickers build and install FIXME IZ number
-fpicker-common-scp2.diff
-# Show "Use OpenOffice.org dialogs" check box only if the system fpicker is
-# available (better implementation) FIXME IZ number
-fpicker-show-checkbox.diff
-
-# pre-expand the filter choice for 'Export' i#51002
-fpicker-export-expand.diff
-
-# allow the fpicker to set the file type automatically based on extension n#113250
-gnome-fpicker-auto-file-type-by-extension.diff
-
-# make some symbols from svtools visible for the kde fpicker when compiling with gcc4
-#fpicker-kde-gcc4-visibility.diff - now in LinuxOnly section
-
-[ AddressBooks ]
-# KDE Address Book implementation #52449, CWS kaddrbook
-# Snapshot from 2005-09-05
-cws-kaddrbook.diff
-# Avoid warning about missing return values in gcc4
-warning-return-values-connectivity-kab.diff
-
-# Review comments implemented for #34909
-dbaccess-evo-changes.diff
-# Evolution in wizards -> addressbook X#66214
-wizard-evo-local.diff
-
-# Fix mind-mangled evo. addressbook path #26309
-evo-addrbook.diff
-# misc. other fixes / bits for the driver. i#50913
-evo2-fixes-m109.diff
-# Evolution should also be default database(n#66217).
-default-evolution-database.diff
-# Mailmerge column mapping by default (n#73627)
-default-evo-column-mapping.diff
-# fixes for new API, n#104462
-evo-const-crash.diff
-
-[ Lwp ]
-# Lotus Word Pro Import Filter: IZ #11215
-lwp-build.diff
-lwp-detect.diff
-lwp-parse.diff
-
-[ QPro ]
-# Quattro Pro 6.0 import filter: IZ #41688
-qpro-build.diff
-qpro-detect.diff
-biff-hxx.diff
-biff-cxx.diff
-qproform-hxx.diff
-qpro-cxx.diff
-qproform-cxx.diff
-qpro-hxx.diff
-qprostyle-hxx.diff
-qprostyle-cxx.diff
-
-[ Win32Common ]
-# 2 more makefiles in sysui are seriously broken #35628
-# parallel-python-makefile_mk.diff # looks to be upstream
-# Work around G/W mail component crasher bug #FIXME - re-file vs. i#34264
-win32-gw-send-mail.diff
-# use bin/oowintool for the win32 configure stage
-win32-msvs-2003-configure.diff
-# Minor build fixes for win32
-win32-build-fixes.diff
-# This is a pretty nasty IE problem #19510
-# win32-activex-disable.diff # commented out as it breaks instsetoo_native
-
-
-[ VBABits ]
-# Alt-F11 does something useful #29138
-vba-keybinding-f11.diff
-# Prefer interoperability over marginal compatibility i#49495
-default-vba-compatible.diff
-vba-not-comments.diff
-# Parse (& ignore) 'Attribute' statements i#37347
-vba-attribute.diff
-
-[ NLDOnly ]
-# Push fonts into the ps stream always
-pushfont-psstream.diff
-
-# in case the system is panicing; registry/data/org/openoffice/VCL.xcu is
-# not installed or broken; used for example if OOo is installed from an
-# installation set by ./install --interactive
-gui-font-paranoid-fallback.diff
-
-# some branding action cf. doc/splash.txt
-[ NLDOnly ]
-nld-splash.diff
-
-# some branding action cf. doc/splash.txt
-[ SUSEOnly ]
-suse-splash.diff
-
-[ ArkOnly ]
-# some branding action cf. doc/splash.txt
-ark-splash.diff
-# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre
-# shamelessly stolen from NovellUnixOnly
-# version-2-0-pre.diff
-# See what breaks if we build with more optimizations
-testing-more-optimizations-ark.diff
-
-[ RedhatOnly ]
-# Some palette loving
-redhat-standard-colors.diff
-
-[ GentooOnly ]
-version-2-0-pre.diff
-gentoo-splash.diff
-# Do not use mozilla-ldap, it breaks for us
-no-ldap-mozilla.diff
-
-#
-# NOTE: 64 bit OOo is work in progress!
-#
-
-[ 64bitForUpstream ]
-# fix NULL pointer check silly #50485 CWS canvas02
-fix-64bit-basegfx.diff
-
-# long -> sal_Int32 for getAccessibleChildCount and getAccessibleChild #FIXME
-accessibleChild-sc-sd-svx-sw.diff
-
-# sal_uInt32 * pPoints -> unsigned long * pPoints for DrawPolyPolygon.* #FIXME
-polygonpoints-psprint-vcl.diff
-
-# ResId ...( ULONG ) -> ResId ...( sal_uInt32 ) #FIXME
-resid-extensions-padmin.diff
-
-[ IntPtr ]
-# Introduce sal_IntPtr and sal_uIntPtr #54498, CWS intptr
-intptr-basic.diff
-intptr-bridges.diff
-intptr-connectivity.diff
-intptr-cppuhelper.diff
-intptr-dbaccess.diff
-intptr-extensions.diff
-intptr-filter.diff
-intptr-fpicker.diff
-intptr-goodies.diff
-intptr-padmin.diff
-intptr-registry.diff
-intptr-sal.diff
-intptr-sc.diff
-intptr-scaddins.diff
-intptr-sd.diff
-intptr-sfx2.diff
-intptr-stoc.diff
-intptr-svtools.diff
-intptr-svx.diff
-intptr-sw.diff
-intptr-toolkit.diff
-intptr-tools.diff
-intptr-vcl.diff
-intptr-xmlsecurity.diff
-
-[ DXArray ]
-# Fix long *DXArray -> sal_Int32 *DXArray, as prototyped in vcl
-dxarray-extensions.diff
-dxarray-filter.diff
-dxarray-goodies.diff
-dxarray-sc.diff
-dxarray-svtools.diff
-dxarray-svx.diff
-dxarray-sw.diff
-
-[ NumberFormat ]
-# Fix ULONG -> sal_uInt32 in the NumberFormat related parameters
-numberformat-basic.diff
-numberformat-chart2.diff
-numberformat-sc.diff
-numberformat-sch.diff
-numberformat-sd.diff
-numberformat-sfx2.diff
-numberformat-starmath.diff
-numberformat-svtools.diff
-numberformat-svx.diff
-numberformat-sw.diff
-numberformat-vcl.diff
-numberformat-xmloff.diff
-
-[ Trivial ]
-# Trivial long/ULONG -> sal_Int32/sal_uInt32, etc. changes
-trivial-basic.diff
-trivial-canvas.diff
-trivial-chart2.diff
-trivial-dbaccess.diff
-trivial-sch.diff
-trivial-sfx2.diff
-trivial-svtools.diff
-trivial-svx.diff
-trivial-so3.diff
-trivial-starmath.diff
-trivial-vcl.diff
-trivial-xmloff.diff
-
-[ 64bitPatches ]
-# Snapshot of CWS ooo64bit02
-cws-ooo64bit02.2005-04-19.diff
-
-# Change #include <cBLAH> -> #include <BLAH.h> #FIXME
-# TODO - no idea whether this is really necessary
-cincludes.diff
-
-# BigInt related changes #FIXME
-# FIXME - breaks 32bit build
-# TODO - would be best to get rid of BigInt for good ;-)
-bigint-sd-sfx2-sw-tools.diff
-
-# Temporary hacks
-buildfix-64bit-basic.diff
-buildfix-64bit-config_office.diff
-buildfix-64bit-cppcanvas.diff
-buildfix-64bit-dbaccess.diff
-buildfix-64bit-forms.diff
-buildfix-64bit-fpicker.diff
-buildfix-64bit-setup_native.diff
-buildfix-64bit-svtools.diff
-buildfix-64bit-svx.diff
-buildfix-64bit-tools.diff
-
-# Do not install the python bits, they do not register ATM
-buildfix-64bit-scp2-no-python.diff
-
-## Other build fixes - old, not sure whether still needed
-#buildfix-64bit-system-jpeg.diff
-#
-## Fix ambiguous invocations of Min()/Max()/Abs() when OOo with 64 bit patches
-## is built on 32 bit platforms
-#buildfix-64bit-on-32bit-systems.diff
-
-# Fix the x86_64 bridge
-fix-64bit-bridges.diff
-fix-64bit-bridges-2.diff
-
-# Fix SVBT32 <-> long conversion
-fix-64bit-tools-svbt.diff
-
-# Fix ww8 filter
-fix-64bit-sw-filter-ww8.diff
-
-# Pyuno
-buildfix-64bit-pyuno.diff
-
-# fix this error:
-# impgraph.cxx:1105: Error: expected primary-expression before "break"
-buildfix-64bit-vcl-gcc4.diff
-
-# Fix CFLAGS for optimization/no optimization:
-# Use -O0 for no opt.
-# TODO: Probably use -Os (like x86) for opt. case? (-O breaks with gcc 4 and some svx code)
-fix-64bit-solenv-noopt.diff
-
-# in fact this patches automation
-buildfix-64bit-automation.diff
-
-
-[ JDK150 ]
-# You need 64bit java, e.g. JDK 1.5.0 for AMD64:
-# http://java.sun.com/j2se/1.5.0/download.jsp
-# This JDK needs
-# ln -s motif21/libmawt.so /usr/java/jdk1.5.0_01/jre/lib/amd64/libmawt.so
-# to let OOo compile well
-#
-# FIXME No IZ for this one yet
-buildfix-jdk150-berkeleydb.diff
-buildfix-jdk150-jurt.diff
-buildfix-jdk150-jvmfwk.diff
-buildfix-jdk150-qadevOOo.diff
-buildfix-jdk150-rhino.diff
-buildfix-jdk150-sandbox.diff
-buildfix-jdk150-scripting.diff
-buildfix-jdk150-sj2.diff
-buildfix-jdk150-xmerge.diff
-buildfix-jdk150-xmlhelp.diff
-buildfix-jdk150-XmlSearch.diff
-
-[ DebianBaseOnly ]
-disable-helpcontent2.diff
-version-1-9-x.diff
-use-free-xt-xp-jaxp-from-system.diff
-disable-xmlsearch-and-xmlhelp-jar.diff
-dont-build-cfgimport-jar.diff
-use-xalan-xerces-from-system.diff
-dont-copy-and-install-stlport.diff
-static-libs-use-_pic.diff
-debian-hunspell-build.diff
-# use system hsqldb, Issue 52974
-system-hsqldb.diff
-# use system bsh
-system-bsh.diff
-disable-testtools.diff
-
-[ UbuntuOnly ]
-ant-only-main-classes-hack.diff
-
-[ Mono ]
-#
-# These patches are experimental beware ...
-#
-mono-build.diff
-mono-scp2.diff
-bridges-prj.diff
-bridges-source-mono_uno-binaryuno-cs.diff
-bridges-source-mono_uno-bridge-cs.diff
-bridges-source-mono_uno-cli_environment-cs.diff
-bridges-source-mono_uno-makefile-mk.diff
-bridges-source-mono_uno-managed_proxy-cs.diff
-bridges-source-mono_uno-mono_bridge-cxx.diff
-bridges-source-mono_uno-mono_bridge-h.diff
-bridges-source-mono_uno-mono_proxy-cxx.diff
-bridges-source-mono_uno-rtl_ustring-cs.diff
-bridges-source-mono_uno-typeclass-cs.diff
-bridges-source-mono_uno-typedescription-cs.diff
-bridges-source-mono_uno-uik-cs.diff
-bridges-source-mono_uno-uno_glue-cxx.diff
-bridges-source-mono_uno-uno_proxy-cs.diff
-cli_ure-source-bootstrap-assembly-cs.diff
-cli_ure-source-bootstrap-makefile-mk.diff
-cli_ure-source-bootstrap-managed_bootstrap-cs.diff
-cli_ure-source-bootstrap-native_glue-cxx.diff
-mono-testtools.diff
-
-[ VBAObjects ]
-
-offapi-org-openoffice-vba-makefile-mk.diff
-offapi-org-openoffice-vba-xapplication-idl.diff
-offapi-org-openoffice-vba-xcollection-idl.diff
-offapi-org-openoffice-vba-xcolumns-idl.diff
-offapi-org-openoffice-vba-xfont-idl.diff
-offapi-org-openoffice-vba-xglobals-idl.diff
-offapi-org-openoffice-vba-xoutline-idl.diff
-offapi-org-openoffice-vba-xrange-idl.diff
-offapi-org-openoffice-vba-xrows-idl.diff
-offapi-org-openoffice-vba-xworkbook-idl.diff
-offapi-org-openoffice-vba-xworkbooks-idl.diff
-offapi-org-openoffice-vba-xworksheet-idl.diff
-offapi-org-openoffice-vba-xworksheets-idl.diff
-offapi-org-openoffice-vba-MSFormReturnTypes-idl.diff
-offapi-org-openoffice-vba-xvbatoooeventdescgen-idl.diff
-offapi-org-openoffice-vba-excel-xlcelltype-idl.diff
-offapi-org-openoffice-vba-excel-makefile-mk.diff
-offapi-org-openoffice-vba-xdialog-idl.diff
-offapi-org-openoffice-vba-xdialogs-idl.diff
-offapi-org-openoffice-vba-xlbuildindialog-idl.diff
-offapi-org-openoffice-vba-xlpastespecialoperation-idl.diff
-offapi-org-openoffice-vba-xlpastetype-idl.diff
-offapi-org-openoffice-vba-xworksheetfunction-idl.diff
-offapi-org-openoffice-vba-xinterior-idl.diff
-scp_vba_uno_service.diff
-sc-source-ui-vba-makefile-mk.diff
-sc-source-ui-vba-service-cxx.diff
-sc-source-ui-vba-vbaapplication-cxx.diff
-sc-source-ui-vba-vbaapplication-hxx.diff
-sc-source-ui-vba-vbacolumns-cxx.diff
-sc-source-ui-vba-vbacolumns-hxx.diff
-sc-source-ui-vba-vbafont-cxx.diff
-sc-source-ui-vba-vbafont-hxx.diff
-sc-source-ui-vba-vbaglobals-cxx.diff
-sc-source-ui-vba-vbaglobals-hxx.diff
-sc-source-ui-vba-vbahelper-hxx.diff
-sc-source-ui-vba-vbaobj-map.diff
-sc-source-ui-vba-vbaobj-xml.diff
-sc-source-ui-vba-vbaoutline-cxx.diff
-sc-source-ui-vba-vbaoutline-hxx.diff
-sc-source-ui-vba-vbarange-cxx.diff
-sc-source-ui-vba-vbarange-hxx.diff
-sc-source-ui-vba-vbarows-cxx.diff
-sc-source-ui-vba-vbarows-hxx.diff
-sc-source-ui-vba-vbaworkbook-cxx.diff
-sc-source-ui-vba-vbaworkbook-hxx.diff
-sc-source-ui-vba-vbaworkbooks-cxx.diff
-sc-source-ui-vba-vbaworkbooks-hxx.diff
-sc-source-ui-vba-vbaworksheet-cxx.diff
-sc-source-ui-vba-vbaworksheet-hxx.diff
-sc-source-ui-vba-vbaworksheets-cxx.diff
-sc-source-ui-vba-vbaworksheets-hxx.diff
-sc-source-ui-vba-vbadialog-cxx.diff
-sc-source-ui-vba-vbadialog-hxx.diff
-sc-source-ui-vba-vbadialogs-cxx.diff
-sc-source-ui-vba-vbadialogs-hxx.diff
-sc-source-ui-vba-vbainterior-cxx.diff
-sc-source-ui-vba-vbainterior-hxx.diff
-sc-source-ui-vba-vbawsfunction-cxx.diff
-sc-source-ui-vba-vbawsfunction-hxx.diff
-vba-basic-globals.diff
-vba-build.diff
-vba-sc-docuno-hook.diff
-vba-basic-collection.diff
-sc-vba-build-lst.diff
-sc-source-ui-vba-vbahelper-cxx.diff
-sc-source-ui-inc-viewfunc-hxx.diff
-sc-source-ui-inc-tabview-hxx.diff
-svx-source-form-formControlVBAHandler-hxx.diff
-svx-source-form-formControlVBAHandler-cxx.diff
-svx-source-inc-fmundo-hxx.diff
-svx-source-form-makefile.diff
-svx-source-form-fmctrler-cxx.diff
-svx-source-form-fmundo-cxx.diff
-extensions-source-propctrlr-makefile-mk.diff
-extensions-source-propctrlr-formcontroller-cxx.diff
-vbaevents-services-build.diff
-vbaevents-services-sources.diff
-vba-dim-and-constants-patch.diff
-vba-evaluate-support.diff
-vba-support-stoc-typeprovider-xexactname.diff
-vba-basic-default.diff
-vba_configure_set_soenv_in.diff
-
-
-[ Lockdown ]
-# GNOME desktop integration, pick up configuration values from gconf
-gnome-desktop-integration.diff
-# Disable UI [toolbars, menus] customization
-ui-desktop-integration.diff
-# Disable printing where restricted throughout desktop
-printing-desktop-integration.diff
-# add in an entry for a corporate common dictionary
-corporate-dictionary.diff
-
-[ cairocanvas ]
-cairo-canvas-pixmap.diff
-cairo-canvas-component-install.diff
-
-# OOo configure patches
-cairo-config-office-configure-in.diff
-cairo-config-office-set-soenv-in.diff
-
-# canvas build patches
-canvas-source-factory-cf-service-cxx.diff
-canvas-prj-build-lst.diff
-canvas-prj-d-lst.diff
-
-# canvas/source/cairo dir patches
-canvas-source-cairo-cairo_backbuffer-cxx.diff
-canvas-source-cairo-cairo_backbuffer-hxx.diff
-canvas-source-cairo-cairo_bitmapbackbuffer-cxx.diff
-canvas-source-cairo-cairo_bitmapbackbuffer-hxx.diff
-canvas-source-cairo-cairo_cachedbitmap-cxx.diff
-canvas-source-cairo-cairo_cachedbitmap-hxx.diff
-canvas-source-cairo-cairo_cairo-hxx.diff
-canvas-source-cairo-cairo_canvasbitmap-cxx.diff
-canvas-source-cairo-cairo_canvasbitmaphelper-cxx.diff
-canvas-source-cairo-cairo_canvasbitmaphelper-hxx.diff
-canvas-source-cairo-cairo_canvasbitmap-hxx.diff
-canvas-source-cairo-cairo_canvascustomsprite-cxx.diff
-canvas-source-cairo-cairo_canvascustomsprite-hxx.diff
-canvas-source-cairo-cairo_canvasfont-cxx.diff
-canvas-source-cairo-cairo_canvasfont-hxx.diff
-canvas-source-cairo-cairo_canvashelper-cxx.diff
-canvas-source-cairo-cairo_canvashelper-cxx-m.diff
-canvas-source-cairo-cairo_canvashelper-hxx.diff
-canvas-source-cairo-cairo_canvashelper-hxx-m.diff
-canvas-source-cairo-cairo_canvashelper_texturefill-cxx.diff
-canvas-source-cairo-cairo_helper-cxx.diff
-canvas-source-cairo-cairo_helper-hxx.diff
-canvas-source-cairo-cairo_impltools-cxx.diff
-canvas-source-cairo-cairo_impltools-hxx.diff
-canvas-source-cairo-cairo_linepolypolygon-cxx.diff
-canvas-source-cairo-cairo_linepolypolygon-hxx.diff
-canvas-source-cairo-cairo_outdevprovider-hxx.diff
-canvas-source-cairo-cairo_parametricpolypolygon-cxx.diff
-canvas-source-cairo-cairo_parametricpolypolygon-hxx.diff
-canvas-source-cairo-cairo_redrawmanager-cxx.diff
-canvas-source-cairo-cairo_redrawmanager-hxx.diff
-canvas-source-cairo-cairo_repainttarget-hxx.diff
-canvas-source-cairo-cairo_spritecanvas-cxx.diff
-canvas-source-cairo-cairo_spritecanvas-hxx.diff
-canvas-source-cairo-cairo_sprite-hxx.diff
-canvas-source-cairo-cairo_spritesurface-hxx.diff
-canvas-source-cairo-cairo_textlayout-cxx.diff
-canvas-source-cairo-cairo_textlayout-hxx.diff
-canvas-source-cairo-cairo_windowgraphicdevice-cxx.diff
-canvas-source-cairo-cairo_windowgraphicdevice-hxx.diff
-canvas-source-cairo-exports-dxp.diff
-canvas-source-cairo-exports-map.diff
-canvas-source-cairo-makefile-mk.diff
-
-# cairo internal module
-cairo-makefile-mk.diff
-cairo-prj-build-lst.diff
-cairo-prj-d-lst.diff
-
-# scp2 bits
-cairo-scp2.diff
-
-# options dialog
-cairo-svx-source-dialog-makefile-mk.diff
-cairo-svx-source-dialog-optgdlg-cxx.diff
-cairo-svx-source-dialog-optgdlg-hrc.diff
-
-[ msaccess ]
-cws-mdbdriver01.diff
-
-disable-access.diff
-mdbtools.diff
-mdbtools-makefile-mk.diff
-mdbtools-prj-build-lst.diff
-mdbtools-prj-d-lst.diff
-
-connectivity-source-drivers-mdb-dataaccess-xcu.diff
-connectivity-source-drivers-mdb-exports-dxp.diff
-connectivity-source-drivers-mdb-makefile-mk.diff
-connectivity-source-drivers-mdb-mdb-allocator-hxx.diff
-connectivity-source-drivers-mdb-mdb-baseresultset-cxx.diff
-connectivity-source-drivers-mdb-mdb-baseresultset-hxx.diff
-connectivity-source-drivers-mdb-mdb-connection-cxx.diff
-connectivity-source-drivers-mdb-mdb-connection-hxx.diff
-connectivity-source-drivers-mdb-mdb-databasemetadata-cxx.diff
-connectivity-source-drivers-mdb-mdb-databasemetadata-hxx.diff
-connectivity-source-drivers-mdb-mdb-driver-cxx.diff
-connectivity-source-drivers-mdb-mdb-driver-hxx.diff
-connectivity-source-drivers-mdb-mdb-map.diff
-connectivity-source-drivers-mdb-mdb-preparedstatement-cxx.diff
-connectivity-source-drivers-mdb-mdb-preparedstatement-hxx.diff
-connectivity-source-drivers-mdb-mdb-resultset-cxx.diff
-connectivity-source-drivers-mdb-mdb-resultset-hxx.diff
-connectivity-source-drivers-mdb-mdb-resultsetmetadata-cxx.diff
-connectivity-source-drivers-mdb-mdb-resultsetmetadata-hxx.diff
-connectivity-source-drivers-mdb-mdb-sequenceresultset-cxx.diff
-connectivity-source-drivers-mdb-mdb-sequenceresultset-hxx.diff
-connectivity-source-drivers-mdb-mdb-statement-cxx.diff
-connectivity-source-drivers-mdb-mdb-statement-hxx.diff
-connectivity-source-drivers-mdb-mdb-wrapper-cxx.diff
-connectivity-source-drivers-mdb-mdb-wrapper-hxx.diff
-connectivity-source-drivers-mdb-mdb-xml.diff
-connectivity-source-drivers-mdb-config-h.diff
-
-#hack to get the proper msaccess tabpage
-msaccess-db-create-dialog-fix.diff
-
-[ Fixes ]
-# fix for bug n114062 extracted from i53967. it was still present in m125
-sd-new-slide-with-floating-frame.diff
-
-# Ark Linux used to split Qt into qt-mt and qt-base-mt so text mode apps etc.
-# can use Qt base functionality without linking in the whole GUI - this
-# functionality is now obsolete because Qt 4.0 does this by default, and has
-# been undone.
-# If you're building for an older version of Ark Linux, you need to enable
-# this patch again.
-# Needs to be applied after merge-kab
-#ark-handle-split-qt.diff
diff --git a/patches/src680/cws-fs03-04.diff b/patches/src680/cws-fs04.diff
index 5e126d287..2c830525b 100644
--- a/patches/src680/cws-fs03-04.diff
+++ b/patches/src680/cws-fs04.diff
@@ -109,23 +109,6 @@
virtual void write(DocumentHandler &xHandler) const;
const int getListID() { return miListID; }
const bool isListLevelDefined(int iLevel) const;
---- writerperfect/source/filter/OODocumentHandler.cxx 1 Mar 2005 17:05:02 -0000 1.2
-+++ writerperfect/source/filter/OODocumentHandler.cxx 12 Oct 2005 10:50:09 -0000
-@@ -76,8 +76,14 @@
- mxHandler->endElement(OUString::createFromAscii(psName));
- }
-
-+#define LEFT_TO_RIGHT_OVERRIDE 0x202d
-+
- void OODocumentHandler::characters(const WPXString &sCharacters)
- {
-+ // First force LTR rendering of all characters, since in WordPerfect, even text in RTL
-+ // languages has to be entered left to right :-)
-+ OUString sCharLTR=OUString::valueOf((sal_Unicode)LEFT_TO_RIGHT_OVERRIDE);
-+ mxHandler->characters(sCharLTR);
- OUString sCharU16(sCharacters.cstr(), strlen(sCharacters.cstr()), RTL_TEXTENCODING_UTF8);
- mxHandler->characters(sCharU16);
- }
--- writerperfect/source/filter/TableStyle.cxx 1 Mar 2005 17:06:35 -0000 1.2
+++ writerperfect/source/filter/TableStyle.cxx 12 Oct 2005 10:50:09 -0000
@@ -122,6 +122,8 @@
diff --git a/patches/src680/disable-rhino.diff b/patches/src680/disable-rhino.diff
new file mode 100644
index 000000000..1afcf50dd
--- /dev/null
+++ b/patches/src680/disable-rhino.diff
@@ -0,0 +1,875 @@
+--- scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java 2005-10-15 13:15:51.865567480 +0200
++++ /dev/null 2005-03-29 00:33:24.000000000 +0200
+@@ -1,417 +0,0 @@
+-/*************************************************************************
+-*
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: ScriptProviderForJavaScript.java,v $
+- *
+- * $Revision: 1.8 $
+- *
+- * last change: $Author: rt $ $Date: 2005/09/09 02:05:15 $
+- *
+- * The Contents of this file are made available subject to
+- * the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- * GNU Lesser General Public License Version 2.1
+- * =============================================
+- * Copyright 2005 by Sun Microsystems, Inc.
+- * 901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License version 2.1, as published by the Free Software Foundation.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307 USA
+- *
+-************************************************************************/
+-package com.sun.star.script.framework.provider.javascript;
+-
+-import com.sun.star.uno.UnoRuntime;
+-import com.sun.star.uno.XComponentContext;
+-import com.sun.star.lang.XMultiComponentFactory;
+-import com.sun.star.lang.XMultiServiceFactory;
+-import com.sun.star.lang.XSingleServiceFactory;
+-import com.sun.star.frame.XModel;
+-import com.sun.star.registry.XRegistryKey;
+-import com.sun.star.comp.loader.FactoryHelper;
+-import com.sun.star.lang.XTypeProvider;
+-import com.sun.star.lang.XServiceInfo;
+-import com.sun.star.lang.XInitialization;
+-import com.sun.star.uno.AnyConverter;
+-import com.sun.star.uno.Type;
+-import com.sun.star.uno.Any;
+-import com.sun.star.beans.XPropertySet;
+-
+-import com.sun.star.lang.IllegalArgumentException;
+-import com.sun.star.lang.WrappedTargetException;
+-import com.sun.star.reflection.InvocationTargetException;
+-import com.sun.star.script.CannotConvertException;
+-
+-import java.io.*;
+-import java.util.Vector;
+-import java.util.Map;
+-import java.net.MalformedURLException;
+-import java.net.URL;
+-
+-import com.sun.star.script.provider.XScriptProvider;
+-import com.sun.star.script.provider.XScript;
+-import com.sun.star.script.provider.XScriptContext;
+-
+-import com.sun.star.script.provider.ScriptErrorRaisedException;
+-import com.sun.star.script.provider.ScriptExceptionRaisedException;
+-import com.sun.star.script.provider.ScriptFrameworkErrorException;
+-import com.sun.star.script.provider.ScriptFrameworkErrorType;
+-
+-import com.sun.star.script.framework.log.LogUtils;
+-import com.sun.star.script.framework.provider.ScriptContext;
+-import com.sun.star.script.framework.provider.ClassLoaderFactory;
+-import com.sun.star.script.framework.provider.ScriptProvider;
+-import com.sun.star.script.framework.provider.ScriptEditor;
+-import com.sun.star.script.framework.container.ScriptMetaData;
+-import com.sun.star.script.framework.log.*;
+-
+-import org.mozilla.javascript.Context;
+-import org.mozilla.javascript.ImporterTopLevel;
+-import org.mozilla.javascript.Scriptable;
+-import org.mozilla.javascript.JavaScriptException;
+-import org.mozilla.javascript.EcmaError;
+-
+-public class ScriptProviderForJavaScript
+-{
+- public static class _ScriptProviderForJavaScript extends ScriptProvider
+- {
+- public _ScriptProviderForJavaScript(XComponentContext ctx)
+- {
+- super(ctx, "JavaScript");
+- }
+-
+- public XScript getScript( /*IN*/String scriptURI )
+- throws com.sun.star.uno.RuntimeException,
+- ScriptFrameworkErrorException
+- {
+- ScriptMetaData scriptData = null;
+- try
+- {
+- scriptData = getScriptData( scriptURI );
+- ScriptImpl script = new ScriptImpl( m_xContext, scriptData, m_xModel );
+- return script;
+- }
+- catch ( com.sun.star.uno.RuntimeException re )
+- {
+- throw new ScriptFrameworkErrorException( "Failed to create script object: " + re.getMessage(),
+- null, scriptData.getLanguageName(), language, ScriptFrameworkErrorType.UNKNOWN );
+- }
+- }
+-
+- public boolean hasScriptEditor()
+- {
+- return true;
+- }
+-
+- public ScriptEditor getScriptEditor()
+- {
+- return ScriptEditorForJavaScript.getEditor();
+- }
+- }
+-
+- /**
+- * Returns a factory for creating the service.
+- * This method is called by the <code>JavaLoader</code>
+- * <p>
+- *
+- * @param implName the name of the implementation for which a service is desired
+- * @param multiFactory the service manager to be used if needed
+- * @param regKey the registryKey
+- * @return returns a <code>XSingleServiceFactory</code> for creating
+- * the component
+- * @see com.sun.star.comp.loader.JavaLoader
+- */
+- public static XSingleServiceFactory __getServiceFactory( String implName,
+- XMultiServiceFactory multiFactory,
+- XRegistryKey regKey )
+- {
+- XSingleServiceFactory xSingleServiceFactory = null;
+-
+- if ( implName.equals( ScriptProviderForJavaScript._ScriptProviderForJavaScript.class.getName() ) )
+- {
+- xSingleServiceFactory = FactoryHelper.getServiceFactory(
+- ScriptProviderForJavaScript._ScriptProviderForJavaScript.class,
+- "com.sun.star.script.provider.ScriptProviderForJavaScript",
+- multiFactory,
+- regKey );
+- }
+-
+- return xSingleServiceFactory;
+- }
+-
+-
+- /**
+- * Writes the service information into the given registry key.
+- * This method is called by the <code>JavaLoader</code>
+- * <p>
+- *
+- * @param regKey the registryKey
+- * @return returns true if the operation succeeded
+- * @see com.sun.star.comp.loader.JavaLoader
+- */
+- public static boolean __writeRegistryServiceInfo( XRegistryKey regKey )
+- {
+- String impl = "com.sun.star.script.framework.provider.javascript." +
+- "ScriptProviderForJavaScript$_ScriptProviderForJavaScript";
+-
+- String service1 = "com.sun.star.script.provider." +
+- "ScriptProvider";
+- String service2 = "com.sun.star.script.provider." +
+- "LanguageScriptProvider";
+- String service3 = "com.sun.star.script.provider." +
+- "ScriptProviderForJavaScript";
+- String service4 = "com.sun.star.script.browse." +
+- "BrowseNode";
+-
+- if ( FactoryHelper.writeRegistryServiceInfo(impl, service1, regKey) &&
+- FactoryHelper.writeRegistryServiceInfo(impl, service2, regKey) &&
+- FactoryHelper.writeRegistryServiceInfo(impl, service3, regKey) &&
+- FactoryHelper.writeRegistryServiceInfo(impl, service4, regKey) )
+- {
+- return true;
+- }
+- return false;
+- }
+-}
+-class ScriptImpl implements XScript
+-{
+- private ScriptMetaData metaData;
+- private XComponentContext m_xContext;
+- private XMultiComponentFactory m_xMultiComponentFactory;
+- private XModel m_xModel;
+-
+- ScriptImpl( XComponentContext ctx, ScriptMetaData metaData, XModel xModel ) throws com.sun.star.uno.RuntimeException
+- {
+- this.metaData = metaData;
+- this.m_xContext = ctx;
+- this.m_xModel = xModel;
+- try
+- {
+- this.m_xMultiComponentFactory = m_xContext.getServiceManager();
+- }
+- catch ( Exception e )
+- {
+- LogUtils.DEBUG( LogUtils.getTrace( e ) );
+- throw new com.sun.star.uno.RuntimeException(
+- "Error constructing ScriptImpl: [javascript]");
+- }
+- LogUtils.DEBUG("ScriptImpl [javascript] script data = " + metaData );
+- }
+-
+- /**
+- * The invoke method of the ScriptProviderForJavaScript runs the
+- * JavaScript script specified in the URI
+- *
+- *
+- *
+- * @param aParams All parameters; pure, out params are
+- * undefined in sequence, i.e., the value
+- * has to be ignored by the callee
+- *
+- * @param aOutParamIndex Out indices
+- *
+- * @param aOutParam Out parameters
+- *
+- * @returns The value returned from the function
+- * being invoked
+- *
+- * @throws ScriptFrameworkErrorException If there is no matching script name
+- *
+- *
+- * @throws InvocationTargetException If the running script throws
+- * an exception this information
+- * is captured and rethrown as
+- * ScriptErrorRaisedException or
+- * ScriptExceptionRaisedException
+- */
+-
+- public Object invoke(
+- /*IN*/Object[] params,
+- /*OUT*/short[][] aOutParamIndex,
+- /*OUT*/Object[][] aOutParam )
+-
+- throws ScriptFrameworkErrorException, InvocationTargetException
+- {
+- // Initialise the out paramters - not used at the moment
+- aOutParamIndex[0] = new short[0];
+- aOutParam[0] = new Object[0];
+-
+-
+-
+- ClassLoader cl = null;
+- URL sourceUrl = null;
+- try {
+- cl = ClassLoaderFactory.getURLClassLoader( metaData );
+- sourceUrl = metaData.getSourceURL();
+- }
+- catch ( java.net.MalformedURLException mfu )
+- {
+- throw new ScriptFrameworkErrorException(
+- mfu.getMessage(), null,
+- metaData.getLanguageName(), metaData.getLanguage(),
+- ScriptFrameworkErrorType.UNKNOWN );
+- }
+- catch ( com.sun.star.script.framework.provider.NoSuitableClassLoaderException nsc )
+- {
+- // Framework error
+- throw new ScriptFrameworkErrorException(
+- nsc.getMessage(), null,
+- metaData.getLanguageName(), metaData.getLanguage(),
+- ScriptFrameworkErrorType.UNKNOWN );
+- }
+- Context ctxt = null;
+-
+- try
+- {
+- String editorURL = sourceUrl.toString();
+- Object result = null;
+- String source = null;
+- ScriptEditorForJavaScript editor =
+- ScriptEditorForJavaScript.getEditor(
+- metaData.getSourceURL() );
+-
+- if (editor != null)
+- {
+- editorURL = editor.getURL();
+- result = editor.execute();
+- if ( result != null &&
+- result.getClass().getName().equals( "org.mozilla.javascript.Undefined" ) )
+- {
+- // Always return a string
+- // TODO revisit
+- return Context.toString( result );
+- }
+-
+- }
+-
+- if (editor != null && editor.isModified() == true)
+- {
+- LogUtils.DEBUG("GOT A MODIFIED SOURCE");
+- source = editor.getText();
+- }
+- else
+- {
+- metaData.loadSource();
+- source = metaData.getSource();
+-
+- }
+-
+- if ( source == null || source.length() == 0 ) {
+- throw new ScriptFrameworkErrorException(
+- "Failed to read source data for script", null,
+- metaData.getLanguageName(), metaData.getLanguage(),
+- ScriptFrameworkErrorType.UNKNOWN );
+- }
+-
+- /* Set the context ClassLoader on the current thread to
+- be our custom ClassLoader. This is the suggested method
+- for setting up a ClassLoader to be used by the Rhino
+- interpreter
+- */
+- if (cl != null) {
+- Thread.currentThread().setContextClassLoader(cl);
+- }
+-
+- // Initialize a Rhino Context object
+- ctxt = Context.enter();
+-
+- /* The ImporterTopLevel ensures that importClass and
+- importPackage statements work in Javascript scripts
+- Make the XScriptContext available as a global variable
+- to the script
+- */
+- ImporterTopLevel scope = new ImporterTopLevel(ctxt);
+-
+- Scriptable jsCtxt = Context.toObject(
+- ScriptContext.createContext(
+- m_xModel, m_xContext,
+- m_xMultiComponentFactory), scope);
+- scope.put("XSCRIPTCONTEXT", scope, jsCtxt);
+-
+- Scriptable jsArgs = Context.toObject(params, scope);
+- scope.put("ARGUMENTS", scope, jsArgs);
+-
+- result = ctxt.evaluateString(scope,
+- source, "<stdin>", 1, null);
+- result = ctxt.toString(result);
+- return result;
+- }
+- catch (JavaScriptException jse) {
+- LogUtils.DEBUG( "Caught JavaScriptException exception for JavaScript type = " + jse.getClass() );
+- String message = jse.getMessage();
+- //int lineNo = jse.getLineNumber();
+- Object wrap = jse.getValue();
+- LogUtils.DEBUG( "\t message " + message );
+- LogUtils.DEBUG( "\t wrapped type " + wrap.getClass() );
+- LogUtils.DEBUG( "\t wrapped toString " + wrap.toString() );
+- ScriptExceptionRaisedException se = new
+- ScriptExceptionRaisedException( message );
+- se.lineNum = -1;
+- se.language = "JavaScript";
+- se.scriptName = metaData.getLanguageName();
+- se.exceptionType = wrap.getClass().getName();
+- se.language = metaData.getLanguage();
+- LogUtils.DEBUG( "ExceptionRaised exception " );
+- LogUtils.DEBUG( "\t message " + se.getMessage() );
+- LogUtils.DEBUG( "\t lineNum " + se.lineNum );
+- LogUtils.DEBUG( "\t language " + se.language );
+- LogUtils.DEBUG( "\t scriptName " + se.scriptName );
+- raiseEditor( se.lineNum );
+- throw new InvocationTargetException( "JavaScript uncaught exception" + metaData.getLanguageName(), null, se );
+- }
+- catch (Exception ex) {
+- LogUtils.DEBUG("Caught Exception " + ex );
+- LogUtils.DEBUG("rethrowing as ScriptFramework error" );
+- throw new ScriptFrameworkErrorException(
+- ex.getMessage(), null,
+- metaData.getLanguageName(), metaData.getLanguage(),
+- ScriptFrameworkErrorType.UNKNOWN );
+- }
+- finally {
+- if ( ctxt != null )
+- {
+- Context.exit();
+- }
+- }
+- }
+-
+- private void raiseEditor( int lineNum )
+- {
+- ScriptEditorForJavaScript editor = null;
+- try
+- {
+- URL sourceUrl = metaData.getSourceURL();
+- editor = ScriptEditorForJavaScript.getEditor( sourceUrl );
+- if ( editor == null )
+- {
+- editor = ScriptEditorForJavaScript.getEditor();
+- editor.edit(
+- ScriptContext.createContext(m_xModel,
+- m_xContext, m_xMultiComponentFactory), metaData );
+- editor = ScriptEditorForJavaScript.getEditor( sourceUrl );
+- }
+- if ( editor != null )
+- {
+- System.out.println("** Have raised IDE for JavaScript, calling indicateErrorLine for line " + lineNum );
+- editor.indicateErrorLine( lineNum );
+- }
+- }
+- catch( Exception ignore )
+- {
+- }
+- }
+-}
+-
+--- scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java 2005-10-15 13:15:51.843570824 +0200
++++ /dev/null 2005-03-29 00:33:24.000000000 +0200
+@@ -1,385 +0,0 @@
+-/*************************************************************************
+- *
+- * OpenOffice.org - a multi-platform office productivity suite
+- *
+- * $RCSfile: ScriptEditorForJavaScript.java,v $
+- *
+- * $Revision: 1.7 $
+- *
+- * last change: $Author: rt $ $Date: 2005/09/09 02:04:45 $
+- *
+- * The Contents of this file are made available subject to
+- * the terms of GNU Lesser General Public License Version 2.1.
+- *
+- *
+- * GNU Lesser General Public License Version 2.1
+- * =============================================
+- * Copyright 2005 by Sun Microsystems, Inc.
+- * 901 San Antonio Road, Palo Alto, CA 94303, USA
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License version 2.1, as published by the Free Software Foundation.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307 USA
+- *
+- ************************************************************************/
+-
+-package com.sun.star.script.framework.provider.javascript;
+-
+-import org.mozilla.javascript.Context;
+-import org.mozilla.javascript.Scriptable;
+-import org.mozilla.javascript.ImporterTopLevel;
+-import org.mozilla.javascript.tools.debugger.Main;
+-import org.mozilla.javascript.tools.debugger.ScopeProvider;
+-
+-import com.sun.star.script.provider.XScriptContext;
+-import com.sun.star.script.framework.container.ScriptMetaData;
+-import com.sun.star.script.framework.provider.ScriptEditor;
+-import com.sun.star.script.framework.log.LogUtils;
+-
+-import java.io.InputStream;
+-import java.io.IOException;
+-import java.net.URL;
+-
+-import java.util.Map;
+-import java.util.HashMap;
+-
+-import javax.swing.JFrame;
+-import javax.swing.SwingUtilities;
+-import java.awt.event.WindowAdapter;
+-import java.awt.event.WindowEvent;
+-
+-public class ScriptEditorForJavaScript implements ScriptEditor
+-{
+- // global ScriptEditorForJavaScript instance
+- private static ScriptEditorForJavaScript theScriptEditorForJavaScript;
+-
+- // template for JavaScript scripts
+- private static String JSTEMPLATE;
+-
+- static private Main rhinoWindow;
+- private URL scriptURL;
+- // global list of ScriptEditors, key is URL of file being edited
+- private static Map BEING_EDITED = new HashMap();
+-
+- static {
+- try {
+- URL url =
+- ScriptEditorForJavaScript.class.getResource("template.js");
+-
+- InputStream in = url.openStream();
+- StringBuffer buf = new StringBuffer();
+- byte[] b = new byte[1024];
+- int len = 0;
+-
+- while ((len = in.read(b)) != -1) {
+- buf.append(new String(b, 0, len));
+- }
+-
+- in.close();
+-
+- JSTEMPLATE = buf.toString();
+- }
+- catch (IOException ioe) {
+- JSTEMPLATE = "// JavaScript script";
+- }
+- catch (Exception e) {
+- JSTEMPLATE = "// JavaScript script";
+- }
+- }
+-
+- /**
+- * Returns the global ScriptEditorForJavaScript instance.
+- */
+- public static ScriptEditorForJavaScript getEditor()
+- {
+- if (theScriptEditorForJavaScript == null)
+- {
+- synchronized(ScriptEditorForJavaScript.class)
+- {
+- if (theScriptEditorForJavaScript == null)
+- {
+- theScriptEditorForJavaScript =
+- new ScriptEditorForJavaScript();
+- }
+- }
+- }
+- return theScriptEditorForJavaScript;
+- }
+-
+- /**
+- * Get the ScriptEditorForJavaScript instance for this URL
+- *
+- * @param url The URL of the script source file
+- *
+- * @return The ScriptEditorForJavaScript associated with
+- * the given URL if one exists, otherwise null.
+- */
+- public static ScriptEditorForJavaScript getEditor(URL url)
+- {
+- return (ScriptEditorForJavaScript)BEING_EDITED.get(url);
+- }
+-
+- /**
+- * Returns whether or not the script source being edited in this
+- * ScriptEditorForJavaScript has been modified
+- */
+- public boolean isModified()
+- {
+- return rhinoWindow.isModified( scriptURL );
+- }
+-
+- /**
+- * Returns the text being displayed in this ScriptEditorForJavaScript
+- *
+- * @return The text displayed in this ScriptEditorForJavaScript
+- */
+- public String getText()
+- {
+- return rhinoWindow.getText( scriptURL );
+- }
+-
+- /**
+- * Returns the Rhino Debugger url of this ScriptEditorForJavaScript
+- *
+- * @return The url of this ScriptEditorForJavaScript
+- */
+- public String getURL()
+- {
+- return scriptURL.toString();
+- }
+-
+- /**
+- * Returns the template text for JavaScript scripts
+- *
+- * @return The template text for JavaScript scripts
+- */
+- public String getTemplate()
+- {
+- return JSTEMPLATE;
+- }
+-
+- /**
+- * Returns the default extension for JavaScript scripts
+- *
+- * @return The default extension for JavaScript scripts
+- */
+- public String getExtension()
+- {
+- return "js";
+- }
+-
+- /**
+- * Opens an editor window for the specified ScriptMetaData.
+- * If an editor window is already open for that data it will be
+- * moved to the front.
+- *
+- * @param metadata The metadata describing the script
+- * @param context The context in which to execute the script
+- *
+- */
+- public void edit(final XScriptContext context, ScriptMetaData entry)
+- {
+- try {
+- String sUrl = entry.getParcelLocation();
+- if ( !sUrl.endsWith( "/" ) )
+- {
+- sUrl += "/";
+- }
+- sUrl += entry.getLanguageName();
+- URL url = entry.getSourceURL();
+-
+- // check if there is already an editing session for this script
+- //if (BEING_EDITED.containsKey(url))
+- if ( rhinoWindow != null )
+- {
+- ScriptEditorForJavaScript editor =
+- (ScriptEditorForJavaScript) BEING_EDITED.get(url);
+- if ( editor == null )
+- {
+- editor = new ScriptEditorForJavaScript( context, url );
+- editor.edit( context, entry );
+- }
+- else
+- {
+- rhinoWindow.showScriptWindow( url );
+- }
+- }
+- else
+- {
+- ScriptEditorForJavaScript editor =
+- new ScriptEditorForJavaScript( context, url );
+-
+- }
+- rhinoWindow.toFront();
+- }
+- catch ( IOException e )
+- {
+- LogUtils.DEBUG("Caught exception: " + e);
+- LogUtils.DEBUG(LogUtils.getTrace(e));
+- }
+- }
+-
+- // Ensures that new instances of this class can only be created using
+- // the factory methods
+- private ScriptEditorForJavaScript()
+- {
+- }
+-
+- private ScriptEditorForJavaScript(XScriptContext context, URL url)
+- {
+- initUI();
+- Scriptable scope = getScope( context );
+- this.rhinoWindow.openFile(url, scope, new closeHandler( url ) );
+-
+-
+- this.scriptURL = url;
+- synchronized( ScriptEditorForJavaScript.class )
+- {
+- BEING_EDITED.put(url, this);
+- }
+-
+- }
+-
+- /**
+- * Executes the script edited by the editor
+- *
+- */
+-
+- public Object execute() throws Exception
+- {
+- rhinoWindow.toFront();
+-
+- return this.rhinoWindow.runScriptWindow( scriptURL );
+- }
+-
+- /**
+- * Indicates the line where error occured
+- *
+- */
+- public void indicateErrorLine( int lineNum )
+- {
+- this.rhinoWindow.toFront();
+- this.rhinoWindow.highlighLineInScriptWindow( scriptURL, lineNum );
+- }
+- // This code is based on the main method of the Rhino Debugger Main class
+- // We pass in the XScriptContext in the global scope for script execution
+- private void initUI() {
+- try {
+- synchronized ( ScriptEditorForJavaScript.class )
+- {
+- if ( this.rhinoWindow != null )
+- {
+- return;
+- }
+-
+- final Main sdb = new Main("Rhino JavaScript Debugger");
+- swingInvoke(new Runnable() {
+- public void run() {
+- sdb.pack();
+- sdb.setSize(640, 640);
+- sdb.setVisible(true);
+- }
+- });
+- sdb.setExitAction(new Runnable() {
+- public void run() {
+- sdb.clearAllBreakpoints();
+- sdb.dispose();
+- shutdown();
+- }
+- });
+- Context.addContextListener(sdb);
+- sdb.setScopeProvider(new ScopeProvider() {
+- public Scriptable getScope() {
+- return org.mozilla.javascript.tools.shell.Main.getScope();
+- }
+- });
+- sdb.addWindowListener( new WindowAdapter() {
+- public void windowClosing(WindowEvent e) {
+- shutdown();
+- }
+- });
+- this.rhinoWindow = sdb;
+- }
+- } catch (Exception exc) {
+- LogUtils.DEBUG( LogUtils.getTrace( exc ) );
+- }
+- }
+-
+- private static void swingInvoke(Runnable f) {
+- if (SwingUtilities.isEventDispatchThread()) {
+- f.run();
+- return;
+- }
+- try {
+- SwingUtilities.invokeAndWait(f);
+- } catch (Exception exc) {
+- LogUtils.DEBUG( LogUtils.getTrace( exc ) );
+- }
+- }
+-
+- private void shutdown()
+- {
+- // dereference Rhino Debugger window
+- this.rhinoWindow = null;
+- this.scriptURL = null;
+- // remove all scripts from BEING_EDITED
+- synchronized( BEING_EDITED )
+- {
+- java.util.Iterator iter = BEING_EDITED.keySet().iterator();
+- java.util.Vector keysToRemove = new java.util.Vector();
+- while ( iter.hasNext() )
+- {
+-
+- URL key = (URL)iter.next();
+- keysToRemove.add( key );
+- }
+- for ( int i=0; i<keysToRemove.size(); i++ )
+- {
+- BEING_EDITED.remove( keysToRemove.elementAt( i ) );
+- }
+- keysToRemove = null;
+- }
+-
+- }
+- private Scriptable getScope(XScriptContext xsctxt )
+- {
+- Context ctxt = Context.enter();
+- ImporterTopLevel scope = new ImporterTopLevel(ctxt);
+-
+- Scriptable jsCtxt = Context.toObject(xsctxt, scope);
+- scope.put("XSCRIPTCONTEXT", scope, jsCtxt);
+-
+- Scriptable jsArgs = Context.toObject(
+- new Object[0], scope);
+- scope.put("ARGUMENTS", scope, jsArgs);
+-
+- Context.exit();
+- return scope;
+- }
+-
+- class closeHandler implements Runnable
+- {
+- URL url;
+- closeHandler( URL url )
+- {
+- this.url = url;
+- }
+- public void run()
+- {
+- synchronized( BEING_EDITED )
+- {
+- Object o = BEING_EDITED.remove( this.url );
+- }
+- }
+- }
+-}
+--- scripting/java/build.xml-old 2005-10-15 13:03:27.000000000 +0200
++++ scripting/java/build.xml 2005-10-15 13:04:25.000000000 +0200
+@@ -59,7 +59,6 @@
+ <pathelement location="${solar.jar}/java_uno.jar"/>
+ <pathelement location="${solar.jar}/ridl.jar"/>
+ <pathelement location="/usr/share/java/bsh.jar"/>
+- <pathelement location="${solar.jar}/js.jar"/>
+ <pathelement location="${jardir}"/>
+ </path>
+
+@@ -169,19 +168,6 @@
+ </fileset>
+ </jar>
+
+- <jar jarfile="${jardir}/ScriptProviderForJavaScript.jar"
+- basedir="${jardir}">
+- <manifest>
+- <attribute name="Built-By" value="Sun Microsystems"/>
+- <attribute name="RegistrationClassName"
+- value="com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript"/>
+- </manifest>
+- <include name="**/provider/javascript/*.class"/>
+- <fileset dir=".">
+- <include name="**/provider/javascript/*.js"/>
+- </fileset>
+- </jar>
+-
+ <jar jarfile="${jardir}/ScriptFramework.jar"
+ basedir="${jardir}">
+ <manifest>
+@@ -254,7 +240,6 @@
+ <!-- ====================== Clean Generated Files ===================== -->
+ <target name="clean">
+ <delete file="${jardir}/ScriptProviderForJava.jar"/>
+- <delete file="${jardir}/ScriptProviderForJavaScript.jar"/>
+ <delete file="${jardir}/ScriptProviderForBeanShell.jar"/>
+ <delete file="${jardir}/ScriptFramework.jar"/>
+ <delete file="${jardir}/office.jar"/>
+--- scp2/source/ooo/file_ooo.scp-old 2005-10-16 00:54:49.944255848 +0200
++++ scp2/source/ooo/file_ooo.scp 2005-10-16 00:56:44.868784664 +0200
+@@ -626,10 +626,6 @@
+ #endif
+
+ #ifdef SOLAR_JAVA
+-STD_JAR_FILE( gid_File_Jar_Js, js )
+-#endif
+-
+-#ifdef SOLAR_JAVA
+
+ File gid_File_Jar_Juh
+ TXT_FILE_BODY;
+@@ -742,7 +738,6 @@
+ UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
+ UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
+ UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
+-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
+ #endif
+
+ #ifdef SOLAR_JAVA
+--- scripting/prj/build.lst-old 2005-10-16 13:16:18.799921760 +0200
++++ scripting/prj/build.lst 2005-10-16 13:16:30.053211000 +0200
+@@ -1,4 +1,4 @@
+-tc scripting : bridges rdbmaker vcl xmlscript basic sfx2 rhino beanshell javaunohelper NULL
++tc scripting : bridges rdbmaker vcl xmlscript basic sfx2 beanshell javaunohelper NULL
+ tc scripting usr1 - all tc_mkout NULL
+ tc scripting\source\provider nmake - all tc_scriptingprovider NULL
+ tc scripting\source\basprov nmake - all tc_scriptingbasprov NULL
diff --git a/patches/src680/gengal-tool.diff b/patches/src680/gengal-tool.diff
index a7ae1a388..9ed1c2cc7 100644
--- a/patches/src680/gengal-tool.diff
+++ b/patches/src680/gengal-tool.diff
@@ -1,6 +1,6 @@
diff -urN svx.orig/source/gengal/gengal.cxx svx/source/gengal/gengal.cxx
---- /dev/null 2005-03-19 20:36:14.000000000 +0100
-+++ svx/source/gengal/gengal.cxx 2005-05-13 15:07:32.000000000 +0200
+--- svx.orig/source/gengal/gengal.cxx 1970-01-01 02:00:00.000000000 +0200
++++ svx/source/gengal/gengal.cxx 2005-10-14 19:05:38.715250000 +0200
@@ -0,0 +1,291 @@
+#include <stdio.h>
+#include <unistd.h>
@@ -294,8 +294,8 @@ diff -urN svx.orig/source/gengal/gengal.cxx svx/source/gengal/gengal.cxx
+
+GalApp aGalApp;
diff -urN svx.orig/source/gengal/gengal.sh svx/source/gengal/gengal.sh
---- /dev/null 2005-03-19 20:36:14.000000000 +0100
-+++ svx/source/gengal/gengal.sh 2005-05-13 15:07:32.000000000 +0200
+--- svx.orig/source/gengal/gengal.sh 1970-01-01 02:00:00.000000000 +0200
++++ svx/source/gengal/gengal.sh 2005-10-14 19:05:38.730875000 +0200
@@ -0,0 +1,187 @@
+#!/bin/sh
+#*************************************************************************
@@ -485,9 +485,9 @@ diff -urN svx.orig/source/gengal/gengal.sh svx/source/gengal/gengal.sh
+# execute binary
+exec "$sd_prog/$sd_binary" "$@"
diff -urN svx.orig/source/gengal/makefile.mk svx/source/gengal/makefile.mk
---- /dev/null 2005-03-19 20:36:14.000000000 +0100
-+++ svx/source/gengal/makefile.mk 2005-05-13 15:07:04.000000000 +0200
-@@ -0,0 +1,141 @@
+--- svx.orig/source/gengal/makefile.mk 1970-01-01 02:00:00.000000000 +0200
++++ svx/source/gengal/makefile.mk 2005-10-18 10:46:55.421875000 +0200
+@@ -0,0 +1,145 @@
+#*************************************************************************
+#
+# $RCSfile$
@@ -554,7 +554,11 @@ diff -urN svx.orig/source/gengal/makefile.mk svx/source/gengal/makefile.mk
+
+PRJNAME=svx
+
++.IF "$(GUI)"!="UNX"
++TARGET=gengal
++.ELSE
+TARGET=gengal.bin
++.ENDIF
+TARGETTYPE=GUI
+LIBTARGET=NO
+ENABLE_EXCEPTIONS=TRUE
diff --git a/patches/src680/help-messagebox.diff b/patches/src680/help-messagebox.diff
index 33ea68aee..36d51e028 100644
--- a/patches/src680/help-messagebox.diff
+++ b/patches/src680/help-messagebox.diff
@@ -5,7 +5,7 @@
NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) :
- ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPAPPNOTSTARTED ) ) )
-+ ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPAPPNOTSTARTED ) ).Append(String(DEFINE_CONST_UNICODE(".\nHelp is missing; make sure you have the appropriate help installed."))) )
++ ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPAPPNOTSTARTED ) ).Append(String(DEFINE_CONST_UNICODE(".\n"))).Append(String( SfxResId( RID_STR_HLPFILENOTEXIST ))).Append(String(DEFINE_CONST_UNICODE("."))) )
{
// Error message: "No help available"
}
diff --git a/patches/src680/mandriva-splash.diff b/patches/src680/mandriva-splash.diff
index 1a9de190b..0046eab49 100644
--- a/patches/src680/mandriva-splash.diff
+++ b/patches/src680/mandriva-splash.diff
@@ -9,20 +9,19 @@
..\res\ooonologointro.bmp %COMMON_DEST%\pck%_EXT%\openoffice\nologointro.bmp
mkdir: %_DEST%\inc%_EXT%\svx
---- svx/source/intro/ooo.src.mandriva 2005-06-19 11:13:18.000000000 +0200
-+++ svx/source/intro/ooo.src 2005-06-19 11:13:22.000000000 +0200
-@@ -74,8 +74,8 @@
+--- svx/source/intro/ooo.src.mandrivasplash 2005-09-09 01:32:02.000000000 +0200
++++ svx/source/intro/ooo.src 2005-09-17 10:27:26.000000000 +0200
+@@ -48,15 +48,15 @@
#include "svxids.hrc"
#include "intro.hrc"
-#ifdef BUILD_SPECIAL
-#define OOO_VENDOR "Sun Microsystems Inc."
+#if 1
-+#define OOO_VENDOR "Mandriva"
- #define OOO_LICENSE "LGPL"
++#define OOO_VENDOR "Mandriva S.A."
#else
//#define OOO_VENDOR "my company"
-@@ -84,7 +84,7 @@
+ #endif
Bitmap RID_DEFAULT_ABOUT_BMP_LOGO
{
@@ -31,3 +30,23 @@
};
String RID_APPTITLE
+--- scp2/source/ooo/profileitem_ooo.scp.mandriva 2005-09-17 23:41:05.000000000 +0200
++++ scp2/source/ooo/profileitem_ooo.scp 2005-09-18 11:04:19.000000000 +0200
+@@ -523,7 +523,7 @@
+ Section = "Bootstrap";
+ Order = 2;
+ Key = "ProgressBarColor";
+- Value = "0,0,128";
++ Value = "255,255,255";
+ End
+
+ ProfileItem gid_Profileitem_Soffice_ProgressSize
+@@ -541,7 +541,7 @@
+ Section = "Bootstrap";
+ Order = 4;
+ Key = "ProgressPosition";
+- Value = "-1,-1";
++ Value = "-1,-1";
+ End
+
+ ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
diff --git a/patches/src680/mozilla-build-cygpath.diff b/patches/src680/mozilla-build-cygpath.diff
new file mode 100755
index 000000000..fe2065bf1
--- /dev/null
+++ b/patches/src680/mozilla-build-cygpath.diff
@@ -0,0 +1,98 @@
+--- moz/mozilla-source-1.7.5.patch.orig 2005-09-22 15:35:49.000000000 +0200
++++ moz/mozilla-source-1.7.5.patch 2005-10-18 16:19:03.640625000 +0200
+@@ -7098,3 +7098,95 @@
+ #ifndef NSSPKI1T_H
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
++*** misc/mozilla/build/cygwin-wrapper Thu Oct 30 23:05:56 2003
++--- misc/build/mozilla/build/cygwin-wrapper Tue Oct 18 14:52:06 2005
++***************
++*** 54,59 ****
++--- 54,68 ----
++ eval 'no_mountpoint=${i#'${leader}${mountpoint}'/}'
++ driveletter=${no_mountpoint%%/*}
++ i=${leader}${driveletter}:/${pathname}
+++ else
+++ cygstylepath=${i#/[a-zA-Z]*}
+++ if ! test "${cygstylepath}" = "${i}"; then
+++ rootpath=${i#/}
+++ rootpath=/${rootpath%%/*}
+++ if [ -e $rootpath ]; then
+++ i="`cygpath -ma "${i}"`"
+++ fi
+++ fi
++ fi
++ fi
++ fi
++*** misc/mozilla/nsprpub/build/cygwin-wrapper Thu Apr 3 01:22:38 2003
++--- misc/build/mozilla/nsprpub/build/cygwin-wrapper Tue Oct 18 14:52:30 2005
++***************
++*** 18,23 ****
++ shift
++ args=`echo $* | sed -e "s|-I\([a-zA-Z]\):/|-I${mountpoint}/\1/|g;"`
++ else
++! args=`echo $* | sed -e "s|${mountpoint}/\([a-zA-Z]\)/|\1:/|g;"`
++ fi
++ exec $prog $args
++--- 18,42 ----
++ shift
++ args=`echo $* | sed -e "s|-I\([a-zA-Z]\):/|-I${mountpoint}/\1/|g;"`
++ else
++! for i in "${@}"
++! do
++! eval 'leader=${i%%'${mountpoint}'/[a-zA-Z]/*}'
++! if ! test "${leader}" = "${i}"; then
++! eval 'pathname=${i#'${leader}${mountpoint}'/[a-zA-Z]/}'
++! eval 'no_mountpoint=${i#'${leader}${mountpoint}'/}'
++! driveletter=${no_mountpoint%%/*}
++! i=${leader}${driveletter}:/${pathname}
++! else
++! cygstylepath=${i#/[a-zA-Z]*}
++! if ! test "${cygstylepath}" = "${i}"; then
++! rootpath=${i#/}
++! rootpath=/${rootpath%%/*}
++! if [ -e $rootpath ]; then
++! i="`cygpath -ma "${i}"`"
++! fi
++! fi
++! fi
++! args="${args} ${i}"
++! done
++ fi
++ exec $prog $args
++*** misc/mozilla/directory/c-sdk/config/cygwin-wrapper Thu Apr 3 01:22:38 2003
++--- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper Tue Oct 18 14:52:30 2005
++***************
++*** 18,23 ****
++ shift
++ args=`echo $* | sed -e "s|-I\([a-zA-Z]\):/|-I${mountpoint}/\1/|g;"`
++ else
++! args=`echo $* | sed -e "s|${mountpoint}/\([a-zA-Z]\)/|\1:/|g;"`
++ fi
++ exec $prog $args
++--- 18,42 ----
++ shift
++ args=`echo $* | sed -e "s|-I\([a-zA-Z]\):/|-I${mountpoint}/\1/|g;"`
++ else
++! for i in "${@}"
++! do
++! eval 'leader=${i%%'${mountpoint}'/[a-zA-Z]/*}'
++! if ! test "${leader}" = "${i}"; then
++! eval 'pathname=${i#'${leader}${mountpoint}'/[a-zA-Z]/}'
++! eval 'no_mountpoint=${i#'${leader}${mountpoint}'/}'
++! driveletter=${no_mountpoint%%/*}
++! i=${leader}${driveletter}:/${pathname}
++! else
++! cygstylepath=${i#/[a-zA-Z]*}
++! if ! test "${cygstylepath}" = "${i}"; then
++! rootpath=${i#/}
++! rootpath=/${rootpath%%/*}
++! if [ -e $rootpath ]; then
++! i="`cygpath -ma "${i}"`"
++! fi
++! fi
++! fi
++! args="${args} ${i}"
++! done
++ fi
++ exec $prog $args
diff --git a/patches/src680/mozilla-buildlibs-win32.diff b/patches/src680/mozilla-buildlibs-win32.diff
new file mode 100644
index 000000000..3dcc86780
--- /dev/null
+++ b/patches/src680/mozilla-buildlibs-win32.diff
@@ -0,0 +1,148 @@
+--- moz/makefile.mk.orig 2005-09-07 21:59:19.000000000 +0200
++++ moz/makefile.mk 2005-10-14 17:30:15.684000000 +0200
+@@ -79,8 +79,17 @@
+ PATCH_FILE_NAME=mozilla-source-$(MOZILLA_VERSION).patch
+
+ # These files are needed for the W32 build when BUILD_MOZAB is set
++LIBIDL_VERSION*=0.6.8
++LIBIDL_DLLVERSION*=0.6
++LIBIDL_PATCH_NAME*=libIDL-$(LIBIDL_VERSION)-ooo.patch
++LIBIDL_SRCTAR_NAME*=libIDL-$(LIBIDL_VERSION).tar.gz
+ LIBIDL_VC71_ZIPFILE_NAME*=vc71-libIDL-0.6.8-bin.zip
++LIBGLIB_VERSION*=1.2.10
++LIBGLIB_DLLVERSION*=1.2
++LIBGLIB_PATCH_NAME*=glib-$(LIBGLIB_VERSION)-ooo.patch
++LIBGLIB_SRCTAR_NAME*=glib-$(LIBGLIB_VERSION).tar.gz
+ LIBGLIB_VC71_ZIPFILE_NAME*=vc71-glib-1.2.10-bin.zip
++MOZILLA_MAKE_VER=3.79.1
+ WINTOOLS_ZIPFILE_NAME*=wintools.zip
+
+ ADDITIONAL_FILES=mailnews$/addrbook$/src$/nsAbMD5sum.cpp
+@@ -234,15 +243,99 @@
+ +cd $(MOZTOOLSUNPACK)$/buildtools$/windows && $(SET_MOZ_TOOLS_INSTALL_BAT) && cmd /c install.bat
+ +$(TOUCH) $(MISC)$/build$/wintools.install
+
+-$(MISC)$/build$/wintools.complete : \
+- $(MISC)$/build$/wintools.install \
+- $(PRJ)$/download$/$(LIBIDL_VC71_ZIPFILE_NAME) \
+- $(PRJ)$/download$/$(LIBGLIB_VC71_ZIPFILE_NAME)
+- unzip $(PRJ)$/download$/$(LIBIDL_VC71_ZIPFILE_NAME) -d $(MOZTOOLSINST)
+- unzip $(PRJ)$/download$/$(LIBGLIB_VC71_ZIPFILE_NAME) -d $(MOZTOOLSINST)
++$(MISC)$/build$/glib.build : \
++ $(PRJ)$/download$/$(LIBGLIB_SRCTAR_NAME)
++ [
++ tar --directory $(MOZTOOLSUNPACK) -xzf $(PRJ)$/download$/$(LIBGLIB_SRCTAR_NAME)
++ set ABSPRJ=`cygpath -a $(PRJ)`
++ cd $(MOZTOOLSUNPACK)$/glib-$(LIBGLIB_VERSION)
++ patch -p1 < $$ABSPRJ$/download$/$(LIBGLIB_PATCH_NAME)
++ nmake -f Makefile.msc
++ cd $$ABSPRJ
++ $(TOUCH) $(MISC)$/build$/glib.build
++ ]
++
++$(MISC)$/build$/libIDL.build : \
++ $(MISC)$/build$/glib.build \
++ $(PRJ)$/download$/$(LIBIDL_SRCTAR_NAME)
++ [
++ tar --directory $(MOZTOOLSUNPACK) -xzf $(PRJ)$/download$/$(LIBIDL_SRCTAR_NAME)
++ set ABSPRJ=`cygpath -a $(PRJ)`
++ cd $(MOZTOOLSUNPACK)$/libIDL-$(LIBIDL_VERSION)
++ patch -p1 < $$ABSPRJ$/download$/$(LIBIDL_PATCH_NAME)
++ nmake -f Makefile.msc libIDL-$(LIBIDL_DLLVERSION).dll
++ cd $$ABSPRJ
++ $(TOUCH) $(MISC)$/build$/libIDL.build
++ ]
++
++$(MISC)$/build$/make.build : $(MISC)$/build$/wintools.unpack
++ +cd $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/make-$(MOZILLA_MAKE_VER) && nmake -f NMakefile
++ $(TOUCH) $(MISC)$/build$/make.build
++
++$(MISC)$/build$/shmsdos.build : $(MISC)$/build$/wintools.unpack
++ +cd $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/shmsdos && nmake -f shmsdos.mak && nmake -f nsinstall.mak
++ $(TOUCH) $(MISC)$/build$/shmsdos.build
++
++$(MISC)$/build$/uname.build : $(MISC)$/build$/wintools.unpack
++ +cd $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/uname && nmake -f uname.mak
++ $(TOUCH) $(MISC)$/build$/uname.build
++
++LIBVC71_BINFILESLIST+= \
++ glib-$(LIBGLIB_VERSION)$/glib-$(LIBGLIB_DLLVERSION).dll \
++ glib-$(LIBGLIB_VERSION)$/gmodule-$(LIBGLIB_DLLVERSION).dll \
++ libIDL-$(LIBIDL_VERSION)$/libIDL-$(LIBIDL_DLLVERSION).dll
++
++LIBVC71_INCLUDEFILESLIST+= \
++ glib-$(LIBGLIB_VERSION)$/glib.h \
++ glib-$(LIBGLIB_VERSION)$/glibconfig.h
++
++LIBVC71_LIBFILESLIST+= \
++ glib-$(LIBGLIB_VERSION)$/glib-$(LIBGLIB_DLLVERSION).lib \
++ glib-$(LIBGLIB_VERSION)$/gmodule-$(LIBGLIB_DLLVERSION).lib \
++ libIDL-$(LIBIDL_VERSION)$/libIDL-$(LIBIDL_DLLVERSION).lib
++
++$(MISC)$/build$/wintools.build : \
++ $(MISC)$/build$/glib.build \
++ $(MISC)$/build$/libIDL.build \
++ $(MISC)$/build$/make.build \
++ $(MISC)$/build$/shmsdos.build \
++ $(MISC)$/build$/uname.build
+ # chmod is also needed for W32-4nt build (when cygwin unzip is used)
++ @+-$(MKDIR) -p $(MOZTOOLSINST)$/bin
++ @+-$(MKDIR) -p $(MOZTOOLSINST)$/include
++ @+-$(MKDIR) -p $(MOZTOOLSINST)$/lib
++ @+-$(MKDIR) -p $(MOZTOOLSINST)$/vc71$/bin
++ @+-$(MKDIR) -p $(MOZTOOLSINST)$/vc71$/include
++ @+-$(MKDIR) -p $(MOZTOOLSINST)$/vc71$/include$/libIDL
++ @+-$(MKDIR) -p $(MOZTOOLSINST)$/vc71$/lib
++ +$(foreach,file,$(LIBVC71_BINFILESLIST) $(COPY) $(MOZTOOLSUNPACK)$/$(file) \
++ $(MOZTOOLSINST)$/vc71$/bin &&) \
++ echo >& $(NULLDEV)
++ +$(foreach,file,$(LIBVC71_INCLUDEFILESLIST) $(COPY) $(MOZTOOLSUNPACK)$/$(file) \
++ $(MOZTOOLSINST)$/vc71$/include &&) \
++ echo >& $(NULLDEV)
++ +$(COPY) $(MOZTOOLSUNPACK)$/libIDL-$(LIBIDL_VERSION)$/IDL.h $(MOZTOOLSINST)$/vc71$/include$/libIDL
++ +$(foreach,file,$(LIBVC71_LIBFILESLIST) $(COPY) $(MOZTOOLSUNPACK)$/$(file) \
++ $(MOZTOOLSINST)$/vc71$/lib &&) \
++ echo >& $(NULLDEV)
++ +$(COPY) -p $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/make-$(MOZILLA_MAKE_VER)$/WinRel/make.exe \
++ $(MOZTOOLSINST)$/bin$/gmake.exe
++ +$(COPY) -p $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/make-$(MOZILLA_MAKE_VER)$/acconfig.h \
++ $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/make-$(MOZILLA_MAKE_VER)$/config.h \
++ $(MOZTOOLSINST)$/include
++ +$(COPY) -p \
++ $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/shmsdos$/Release$/shmsdos.exe \
++ $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/shmsdos$/Release$/nsinstall.exe \
++ $(MOZTOOLSUNPACK)$/buildtools$/windows$/source$/uname$/Release$/uname.exe \
++ $(MOZTOOLSINST)$/bin
+ -chmod -R +x $(MOZTOOLSINST)$/vc71$/bin
++ +$(TOUCH) $(MISC)$/build$/wintools.build
++
++$(MISC)$/build$/wintools.complete : \
++ $(MISC)$/build$/wintools.unpack \
++ $(MISC)$/build$/wintools.build
+ +$(TOUCH) $(MISC)$/build$/wintools.complete
++
+ .ENDIF # "$(GUI)"=="WNT"
+
+ zip: \
+--- config_office/configure.in 2005-10-13 10:31:41.000000000 +0200
++++ config_office/configure.in 2005-10-14 18:35:17.449625000 +0200
+@@ -2877,13 +2913,14 @@
+ fi
+ if test "$_os" = "WINNT"; then
+ AC_MSG_CHECKING([for glib and libIDL binaries])
+- if test ! -e "../moz/download/vc71-glib-1.2.10-bin.zip" \
+- -o ! -e "../moz/download/vc71-libIDL-0.6.8-bin.zip" \
++ if test ! -e "../moz/download/glib-1.2.10.tar.gz" \
++ -o ! -e "../moz/download/libIDL-0.6.8.tar.gz" \
+ -o ! -e "../moz/download/wintools.zip" ; then
+ AC_MSG_ERROR([One or more of the following archives is missing in moz/download/
+- vc71-glib-1.2.10-bin.zip
+- vc71-libIDL-0.6.8-bin.zip
+-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/)
++ glib-1.2.10.tar.gz
++(from ftp://ftp.gtk.org/pub/gtk/v1.2/)
++ libIDL-0.6.8.tar.gz
++(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/source/)
+ wintools.zip
+ (from http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/wintools.zip)])
+ else
diff --git a/patches/src680/stlport-ppc-buildfix.diff b/patches/src680/stlport-ppc-buildfix.diff
new file mode 100644
index 000000000..8c6922b8b
--- /dev/null
+++ b/patches/src680/stlport-ppc-buildfix.diff
@@ -0,0 +1,48 @@
+--- stlport/STLport-4.5.patch 2005-01-06 12:26:48.770546592 +1100
++++ stlport/STLport-4.5.patch 2005-01-06 12:26:01.125789696 +1100
+@@ -269,6 +269,45 @@
+
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
++--- misc/build/STLport-4.5/src/gcc-linux.mak.old 2005-01-06 12:22:54.127217800 +1100
+++++ misc/build/STLport-4.5/src/gcc-linux.mak 2005-01-06 12:24:28.192917640 +1100
++@@ -46,8 +46,8 @@
++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
++
++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC
+++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
+++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC
++
++ include common_percent_rules.mak
++ include common_rules.mak
++--- misc/build/STLport-4.5/src/gcc.mak.old 2005-01-06 15:20:18.840975336 +1100
+++++ misc/build/STLport-4.5/src/gcc.mak 2005-01-06 15:21:00.373661408 +1100
++@@ -44,8 +44,8 @@
++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g
++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC
++
++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
+++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
++
++ include common_percent_rules.mak
++ include common_rules.mak
++--- misc/build/STLport-4.5/src/gcc-3.0.mak.orig
+++++ misc/build/STLport-4.5/src/gcc-3.0.mak
++@@ -43,8 +43,8 @@
++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
++
++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
+++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static)
+++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic)
++
++ include common_percent_rules.mak
++ include common_rules.mak
+ *** misc/STLport-4.5/stlport/config/stl_gcc.h 2001-09-04 19:10:16.000000000 +0200
+ --- misc/build/STLport-4.5/stlport/config/stl_gcc.h 2005-04-26 15:06:27.000000000 +0200
+ ***************
diff --git a/patches/src680/win32-msvs-2003-configure.diff b/patches/src680/win32-msvs-2003-configure.diff
index ac2245d93..65ddc6a82 100644
--- a/patches/src680/win32-msvs-2003-configure.diff
+++ b/patches/src680/win32-msvs-2003-configure.diff
@@ -1,9 +1,10 @@
---- config_office/configure.in 2005-01-20 14:50:01.328125000 +0530
-+++ config_office/configure.in 2005-01-20 14:55:24.046875000 +0530
-@@ -929,6 +929,16 @@ dnl Check which Microsoft C/C++ or MinG
+--- config_office/configure.in.orig 2005-10-13 10:31:41.000000000 +0200
++++ config_office/configure.in 2005-10-13 13:05:12.000000000 +0200
+@@ -1174,12 +1174,20 @@
dnl ===================================================================
if test "$_os" = "WINNT"; then
if test "$WITH_MINGWIN" != "yes"; then
+- AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
+ AC_MSG_CHECKING([for friendly registry keys])
+ # VS.Net 2003, VS.Net 2002, VC6
+ if test -z "$with_cl_home"; then
@@ -14,10 +15,25 @@
+ fi
+ AC_MSG_RESULT([done])
+
- AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
dnl ===========================================================
- dnl Check for mspdb??.dll
-@@ -1008,7 +1018,7 @@ dnl The following find microsoft, m
+ dnl Check for mspdb71.dll
+ dnl ===========================================================
+ dnl .NET 2003 Compiler
+- AC_PATH_PROG(MSPDB_PATH, mspdb71.dll)
+ if test -n "$MSPDB_PATH";then
+ MSPDB_PATH=`dirname "$MSPDB_PATH"`
+ fi
+@@ -1201,6 +1209,9 @@
+ MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
+ MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
+ PATH="$MSPDB_PATH:$PATH"
++ AC_PATH_PROG(MSPDB_PATH, mspdb71.dll)
++
++ AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
+ if test -x "$with_cl_home/bin/cl.exe"; then
+ CC="$with_cl_home/bin/cl.exe"
+ else
+@@ -1226,7 +1237,7 @@
}
}"`
AC_MSG_RESULT([found Compiler version $CCNUMVER.])
@@ -25,8 +41,38 @@
+ if test "$CCNUMVER" -ge "001300102240"; then
COMEX=10
else
- if test "$CCNUMVER" -ge "001300000000"; then
-@@ -1270,6 +1286,11 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+ AC_MSG_ERROR([Compiler too old. Use Microsoft C/C++ .NET 2003 compiler.])
+@@ -1251,7 +1262,6 @@
+ dnl ===================================================================
+ if test "$COMEX" = "8" -o "$COMEX" = "10"; then
+ dnl Check midl.exe
+- AC_PATH_PROG(MIDL_PATH, midl.exe)
+ if test -n "$MIDL_PATH";then
+ MIDL_PATH=`dirname "$MIDL_PATH"`
+ fi
+@@ -1261,27 +1271,39 @@
+ if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
+ MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
+ fi
++ if test -z "$MIDL_PATH" ; then
++ vstest=`./oowintool --msvs-productdir`;
++ if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
++ MIDL_PATH="$vstest/Common7/Tools/Bin"
++ fi
++ fi
+ if test ! -x "$MIDL_PATH/midl.exe"; then
+ AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
+ fi
+ # Convert to posix path with 8.3 filename restrictions ( No spaces )
+ MIDL_PATH=`cygpath -d "$MIDL_PATH"`
+ MIDL_PATH=`cygpath -u "$MIDL_PATH"`
++ AC_PATH_PROG(MIDL_PATH, midl.exe)
+
+ dnl Check csc.exe
+- AC_PATH_PROG(CSC_PATH, csc.exe)
+ if test -n "$CSC_PATH";then
+ CSC_PATH=`dirname "$CSC_PATH"`
+ fi
if test -x "$with_csc_path/csc.exe"; then
CSC_PATH="$with_csc_path"
fi
@@ -38,7 +84,38 @@
if test ! -x "$CSC_PATH/csc.exe"; then
AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use --with-csc-path])
fi
-@@ -1803,6 +1824,12 @@ if test "$_os" = "Linux" && echo $build_
+ # Convert to posix path with 8.3 filename restrictions ( No spaces )
+ CSC_PATH=`cygpath -d "$CSC_PATH"`
+ CSC_PATH=`cygpath -u "$CSC_PATH"`
++ AC_PATH_PROG(CSC_PATH, csc.exe)
+
+ dnl Check nmake.exe for MS VC Toolkit
+ if test -n "$ENABLE_VCTK"; then
+@@ -1304,15 +1326,23 @@
+ dnl This now has two meanings, for .NET2003 it has to point to the
+ dnl directory with lib/mscoree.lib and for VCTK to lib/msvcrt.lib.
+ if test -z "$ENABLE_VCTK"; then
++ AC_MSG_CHECKING(.NET Framework)
+ if test -f "$with_frame_home/lib/mscoree.lib"; then
+ FRAME_HOME="$with_frame_home"
+ fi
+ if test -z "$FRAME_HOME" -a -e "$with_cl_home/../SDK/v1.1/lib/mscoree.lib"; then
+ FRAME_HOME="$with_cl_home/../SDK/v1.1"
+ fi
++ if test -z "$FRAME_HOME" ; then
++ frametest=`./oowintool --dotnetsdk-dir`
++ if test -x "$frametest/lib/mscoree.lib"; then
++ FRAME_HOME="$frametest"
++ fi
++ fi
+ if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
+ AC_MSG_ERROR([mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home])
+ fi
++ AC_MSG_RESULT(found)
+ else
+ if test ! -f "$COMPATH/../lib/mscoree.lib"; then
+ AC_MSG_ERROR([mscoree.lib not found. Unexpected, ask dev@tools.openoffice.org for help.])
+@@ -1809,6 +1839,12 @@
fi
AC_SUBST(LANG)
@@ -51,16 +128,35 @@
dnl ===================================================================
dnl Checks for java
-@@ -2206,7 +2216,7 @@ if test \( "$_os" = "WINNT" \) ; then
+@@ -3300,7 +3336,7 @@
AC_MSG_CHECKING([for PSDK files])
- if test -z "$with_psdk_home"; then
+ if test -z "$with_psdk_home"; then
# This first line will detect a February 2003 Microsoft Platform SDK
- PSDK_HOME=`cat "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir" 2> /dev/null`
+ PSDK_HOME=`./oowintool --psdk-home`
# But there might be also an April 2005 PSDK, unfortunately MS changed
# the registry entry. (we prefer the old version!?)
if test -z "$PSDK_HOME"; then
-@@ -2454,6 +2464,13 @@ may have to search Microsoft's website.)
+@@ -3408,6 +3444,10 @@
+ if test -e "$with_nsis_path/nsis.exe"; then
+ NSIS_PATH="$with_nsis_path"
+ fi
++ nsistest=`./oowintool --nsis-dir`;
++ if test -x "$nsistest/nsis.exe"; then
++ NSIS_PATH="$nsistest"
++ fi
+ if test -z "$NSIS_PATH"; then
+ AC_MSG_WARN([NSIS not found, no self contained installer will be build.])
+ echo "NSIS not found, no self contained installer will be build." >> warn
+@@ -3535,6 +3575,7 @@
+ if test -z "$ML_EXE"; then
+ if test -x "$with_cl_home/bin/ml.exe"; then
+ with_asm_home=$with_cl_home/bin
++ AC_MSG_RESULT([found ($with_asm_home)])
+ else
+ AC_MSG_ERROR([Configure did not find ml.exe assembler.])
+ fi
+@@ -3624,6 +3665,13 @@
fi
dnl ===================================================================
@@ -74,3 +170,17 @@
dnl Windows builds with .NET need msvcp70.dll/msvcr70.dll in external/msvcp70/
dnl ===================================================================
if test "$_os" = "WINNT" -a "$COMEX" = "8"; then
+@@ -3676,6 +3724,13 @@
+ fi
+
+ dnl ===================================================================
++dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/
++dnl ===================================================================
++if test "$_os" = "WINNT"; then
++ ./oowintool --msvc-copy-instmsi ../external/msi
++fi
++
++dnl ===================================================================
+ dnl Windows builds with .NET 2003 need instmsia.exe and instmsiw.exe in external/msi
+ dnl ===================================================================
+ if test "$_os" = "WINNT" -a "$COMEX" = "10"; then
diff --git a/patches/vba/sc-source-ui-vba-vbaapplication-cxx.diff b/patches/vba/sc-source-ui-vba-vbaapplication-cxx.diff
index 27262a439..683b3a239 100644
--- a/patches/vba/sc-source-ui-vba-vbaapplication-cxx.diff
+++ b/patches/vba/sc-source-ui-vba-vbaapplication-cxx.diff
@@ -1,6 +1,6 @@
--- /dev/null 2005-10-10 09:55:51.712408000 +0100
+++ sc/source/ui/vba/vbaapplication.cxx 2005-10-12 17:18:38.000000000 +0100
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,121 @@
+
+
+#include<com/sun/star/sheet/XSpreadsheetView.hpp>
@@ -60,6 +60,8 @@
+ uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW);
+
+ ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
++ if ( !pViewShell )
++ throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
+ sal_Int32 nCursorX, nCursorY;
+ nCursorX = sal_Int32(pViewShell->GetViewData()->GetCurX()), nCursorY = sal_Int32(pViewShell->GetViewData()->GetCurY());
+ return uno::Reference< vba::XRange >( new ScVbaRange( m_xContext, xRange->getCellRangeByPosition( nCursorX, nCursorY,
diff --git a/src/glib-1.2.10-ooo.patch b/src/glib-1.2.10-ooo.patch
new file mode 100755
index 000000000..d4af95e6c
--- /dev/null
+++ b/src/glib-1.2.10-ooo.patch
@@ -0,0 +1,104 @@
+--- glib-1.2.10/makefile.msc Thu Mar 15 17:48:49 2001
++++ glib-1.2.10/makefile.msc Fri Oct 14 12:30:05 2005
+@@ -1,16 +1,13 @@
+-## Makefile for building the GLib, gmodule and gthread dlls with Microsoft C
++## Makefile for building the GLib and gmodule dlls with Microsoft C
+ ## Use: nmake -f makefile.msc install
++# THREAD SUPPORT HAS BEEN HACKED OUT
+
+ # Change this to wherever you want to install the DLLs. This directory
+ # should be in your PATH.
+-BIN = C:\bin
+-
+-# This is the location of pthreads for Win32,
+-# see http://sourceware.cygnus.com/pthreads-win32/
+-# We want the 1999-04-07 snapshot.
+-PTHREADS = ..\pthreads-snap-1999-04-07
+-PTHREAD_LIB = $(PTHREADS)\pthread.lib
+-PTHREAD_INC = -I$(PTHREADS)
++PREFIX=.
++BIN = $(PREFIX)\bin
++LIBDIR = $(PREFIX)\lib
++INCDIR = $(PREFIX)\include
+
+ ################################################################
+
+@@ -33,17 +30,18 @@
+ glib-$(GLIB_VER).dll \
+ gmodule\gmoduleconf.h \
+ gmodule-$(GLIB_VER).dll \
+- gthread-$(GLIB_VER).dll \
+ testglib.exe \
+ testgmodule.exe \
+ testgdate.exe \
+ testgdateparser.exe \
+- testgthread.exe
+
+ install : all
+ $(INSTALL) glib-$(GLIB_VER).dll $(BIN)
+ $(INSTALL) gmodule-$(GLIB_VER).dll $(BIN)
+- $(INSTALL) gthread-$(GLIB_VER).dll $(BIN)
++ $(INSTALL) glib-$(GLIB_VER).lib $(LIBDIR)
++ $(INSTALL) gmodule-$(GLIB_VER).lib $(LIBDIR)
++ $(INSTALL) glib.h $(INCDIR)
++ $(INSTALL) glibconfig.h $(INCDIR)
+
+ glib_OBJECTS = \
+ garray.obj \
+@@ -96,15 +94,6 @@
+ gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32
+ copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h
+
+-gthread_OBJECTS = \
+- gthread.obj
+-
+-gthread-$(GLIB_VER).dll : $(gthread_OBJECTS)
+- $(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gthread\gthread.def
+-
+-gthread.obj : gthread\gthread.c gthread\gthread-posix.c
+- $(CC) $(CFLAGS) -GD $(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread\gthread.c
+-
+ testglib.exe : glib-$(GLIB_VER).dll testglib.obj
+ $(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
+
+@@ -141,25 +130,19 @@
+ libgplugin_b.obj : gmodule\libgplugin_b.c
+ $(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_b.c
+
+-testgthread.exe : glib-$(GLIB_VER).dll gthread-$(GLIB_VER).dll testgthread.obj
+- $(CC) $(CFLAGS) testgthread.obj glib-$(GLIB_VER).lib gthread-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS) /subsystem:console
+-
+-testgthread.obj : gthread\testgthread.c
+- $(CC) $(CFLAGS) $(PTHREAD_INC) -c gthread\testgthread.c
+-
+ clean:
+- del config.h
+- del glibconfig.h
+- del gmodule\gmoduleconf.h
+- del *.exe
+- del *.obj
+- del *.dll
+- del *.lib
+- del *.err
+- del *.map
+- del *.sym
+- del *.exp
+- del *.lk1
+- del *.mk1
+- del *.pdb
+- del *.ilk
++ -del config.h
++ -del glibconfig.h
++ -del gmodule\gmoduleconf.h
++ -del *.exe
++ -del *.obj
++ -del *.dll
++ -del *.lib
++ -del *.err
++ -del *.map
++ -del *.sym
++ -del *.exp
++ -del *.lk1
++ -del *.mk1
++ -del *.pdb
++ -del *.ilk
diff --git a/src/libIDL-0.6.8-ooo.patch b/src/libIDL-0.6.8-ooo.patch
new file mode 100755
index 000000000..03f046ed7
--- /dev/null
+++ b/src/libIDL-0.6.8-ooo.patch
@@ -0,0 +1,25 @@
+diff -ur libIDL-0.6.8/Makefile.msc libIDL-0.6.8-manual/Makefile.msc
+--- libIDL-0.6.8/Makefile.msc 1999-10-17 20:04:07.000000000 +0200
++++ libIDL-0.6.8/Makefile.msc 2005-10-14 12:42:38.559000000 +0200
+@@ -8,8 +8,8 @@
+ BIN = C:\Bin
+
+ # GLib location
+-GLIB_INCLUDES = -I/Devel/Port/glib
+-GLIB_LIBPATH = c:\Devel\Port\glib
++GLIB_INCLUDES = -I../glib-1.2.10/
++GLIB_LIBPATH = ../glib-1.2.10
+ GLIB_LIB = glib-1.2.lib
+
+ # libIDL dll version
+diff -ur libIDL-0.6.8/util.h libIDL-0.6.8-manual/util.h
+--- libIDL-0.6.8/util.h 1999-06-09 17:33:31.000000000 +0200
++++ libIDL-0.6.8/util.h 2005-10-14 12:49:00.215250000 +0200
+@@ -95,6 +95,7 @@
+ #ifndef HAVE_CPP_PIPE_STDIN
+ extern char * __IDL_tmp_filename;
+ #endif
++#define CPP_NOSTDINC " "
+ extern const char * __IDL_real_filename;
+ extern char * __IDL_cur_filename;
+ extern int __IDL_cur_line;
diff --git a/src/openabout_nld.png b/src/openabout_nld.png
index 3dac65860..97bcd0976 100644
--- a/src/openabout_nld.png
+++ b/src/openabout_nld.png
Binary files differ
diff --git a/src/openintro_nld.bmp b/src/openintro_nld.bmp
index 11da60723..f76127d71 100644
--- a/src/openintro_nld.bmp
+++ b/src/openintro_nld.bmp
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 08:50:55 +0000