[ooo-build-commit] .: patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Aug 24 05:43:04 PDT 2010
patches/dev300/apply | 5 -
patches/dev300/linkoo-dev300.diff | 101 --------------------------------------
patches/dev300/linkoo-type.diff | 34 ------------
3 files changed, 140 deletions(-)
New commits:
commit 45f16bc56741a9fb4bc60737361f8e180522dbfa
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Aug 24 14:42:02 2010 +0200
linkoo-dev300.diff and linkoo-type.diff moved to the repos too.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3109db6..7a2dbac 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -224,8 +224,6 @@ plus-minus-sw-navigator2.diff, i#64886, n#129410, jianhua
#set default varchar lenght to 100.
dbaccess-default-varchar-lenght.diff, i#62664, jianhua
-#make oovbaapi as a link
-linkoo-type.diff
#for selection delete crash
selection-crash-svx-svdmrkv.diff, i#76084, jianhua
@@ -244,9 +242,6 @@ warning-return-values-stlport.diff, jholesov
# fix a11y bug
fix-gtk-a11y.diff, i#98533, michael
-# Update linkoo for dev300 TODO file upstream
-linkoo-dev300.diff, jholesov
-
# gcc OOMs here otherwise (x86_64)
writerfilter-qnametostr-NOOPTFILES.diff
diff --git a/patches/dev300/linkoo-dev300.diff b/patches/dev300/linkoo-dev300.diff
deleted file mode 100644
index 7f096c7..0000000
--- a/patches/dev300/linkoo-dev300.diff
+++ /dev/null
@@ -1,101 +0,0 @@
----
- solenv/bin/linkoo | 31 +++++++++++++++++--------------
- 1 files changed, 17 insertions(+), 14 deletions(-)
-
-diff --git solenv/bin/linkoo solenv/bin/linkoo
-index 3284522..fc15fa4 100755
---- solenv/bin/linkoo
-+++ solenv/bin/linkoo
-@@ -38,12 +38,12 @@
- # ends up in program/ooenv
- ( $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
- $env_script = '
--java_path=`./javaldx`
-+java_path=`../basis-link/ure-link/bin/javaldx`
- export LD_LIBRARY_PATH=".:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
- ulimit -c unlimited
--export PATH=".:$PATH"
-+export PATH=".:../basis-link/program:../basis-link/ure-link/bin:$PATH"
- export GNOME_DISABLE_CRASH_DIALOG=1
--export STAR_RESOURCEPATH=`pwd`/resource
-+export STAR_RESOURCEPATH=`pwd`/../basis-link/program/resource
- # debugging assistance
- export OOO_FORCE_SYSALLOC=1
- export MALLOC_CHECK_=2
-@@ -51,8 +51,11 @@ export OOO_DISABLE_RECOVERY=1
- export SAL_ALLOW_LINKOO_SYMLINKS=1
- ';
-
--$program_dir = 'program';
--$program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX');
-+$program_dir = 'basis-link/program';
-+$brand_program_dir = 'program';
-+$ure_misc_dir = 'basis-link/ure-link/share/misc';
-+
-+$program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong
-
- my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
-
-@@ -60,7 +63,7 @@ my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
- $program_dir => '\.so',
- $program_dir . '/resource' => '\.res$',
- $program_dir . '/classes' => '\.jar$',
-- 'share/config' => '\.zip$',
-+ 'basis-link/share/config' => '\.zip$',
- # 'share/uno_packages' => '\.zip$'
- );
-
-@@ -258,8 +261,8 @@ sub evilness($)
- sub link_iso_res()
- {
- print "Special iso.res case: ";
-- my $ooo_res="$OOO_INSTALL/" . $program_dir . "/resource/ooo".$LIBVER.$LANG.".res";
-- my $star_res="$OOO_INSTALL/" . $program_dir . "/resource/iso".$LIBVER.$LANG.".res";
-+ my $ooo_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/ooo".$LIBVER.$LANG.".res";
-+ my $star_res="$OOO_INSTALL/" . $brand_program_dir . "/resource/iso".$LIBVER.$LANG.".res";
- if (-l $ooo_res && -l $star_res) {
- if ($dry_run) {
- print "link $ooo_res to $star_res";
-@@ -277,7 +280,7 @@ sub link_oovbaapi_rdb()
- {
- print "oovbaapi.rdb case:";
- my $src = "$OOO_BUILD/oovbaapi/$TARGET/ucr";
-- my $dest = "$OOO_INSTALL/program";
-+ my $dest = "$OOO_INSTALL/" . $program_dir;
- do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
- print "\n";
- }
-@@ -285,7 +288,7 @@ sub link_types_rdb()
- {
- print "Types.rdb case:";
- my $src = "$OOO_BUILD/offapi/$TARGET/ucr";
-- my $dest = "$OOO_INSTALL/" . $program_dir;
-+ my $dest = "$OOO_INSTALL/" . $ure_misc_dir;
- do_link ($src, $dest, 'types.db', 'types.rdb');
- print "\n";
- }
-@@ -294,7 +297,7 @@ sub link_types_rdb()
- sub link_soffice_bin_files()
- {
- my $dest;
-- my $src = "$OOO_INSTALL/" . $program_dir;
-+ my $src = "$OOO_INSTALL/" . $brand_program_dir;
-
- print "soffice files";
- $dest = "$OOO_BUILD/desktop/$TARGET/bin";
-@@ -358,9 +361,9 @@ link_types_rdb();
- link_oovbaapi_rdb();
- link_soffice_bin_files();
-
--if (!-f "$OOO_INSTALL/" . $program_dir . "/ooenv") {
-- print "Creating '$OOO_INSTALL/", $program_dir, "/ooenv'\n";
-- open ($ooenv, ">$OOO_INSTALL/" . $program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $program_dir . "/ooenv: $!";
-+if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") {
-+ print "Creating '$OOO_INSTALL/", $brand_program_dir, "/ooenv'\n";
-+ open ($ooenv, ">$OOO_INSTALL/" . $brand_program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $brand_program_dir . "/ooenv: $!";
- print $ooenv $env_script;
- print $ooenv "# testtool\nexport SRC_ROOT=$OOO_BUILD\n";
- close ($ooenv);
---
-1.7.0.1
-
diff --git a/patches/dev300/linkoo-type.diff b/patches/dev300/linkoo-type.diff
deleted file mode 100644
index 13fabc6..0000000
--- a/patches/dev300/linkoo-type.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- solenv/bin/linkoo | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git solenv/bin/linkoo solenv/bin/linkoo
-index 363e864..ee9d745 100755
---- solenv/bin/linkoo
-+++ solenv/bin/linkoo
-@@ -272,6 +272,14 @@ sub link_iso_res()
- }
-
- # Hack for (renamed) types.rdb (types.db)
-+sub link_oovbaapi_rdb()
-+{
-+ print "oovbaapi.rdb case:";
-+ my $src = "$OOO_BUILD/oovbaapi/$TARGET/ucr";
-+ my $dest = "$OOO_INSTALL/program";
-+ do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
-+ print "\n";
-+}
- sub link_types_rdb()
- {
- print "Types.rdb case:";
-@@ -346,6 +354,7 @@ my $installed_files = build_installed_list ($OOO_INSTALL);
- scan_and_link_files ($OOO_BUILD, $installed_files, $TARGET);
- link_iso_res();
- link_types_rdb();
-+link_oovbaapi_rdb();
- link_soffice_bin_files();
-
- if (!-f "$OOO_INSTALL/" . $program_dir . "/ooenv") {
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list