[ooo-build-commit] 3 commits - bin/ooinstall patches/dev300
Hanno Meyer-Thurow
hmth at kemper.freedesktop.org
Wed Nov 25 12:30:06 PST 2009
bin/ooinstall | 2 -
patches/dev300/apply | 2 -
patches/dev300/linux-headers.diff | 42 ------------------------------------
patches/dev300/system-db-check.diff | 24 ++++++++------------
4 files changed, 11 insertions(+), 59 deletions(-)
New commits:
commit 292da4610b27cd0a9c307136345276d2a8276fe2
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date: Wed Nov 25 21:26:56 2009 +0100
Bin obsolete linux-headers.diff.
* patches/dev300/linux-headers.diff: Bin.
* patches/dev300/apply: Update.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1553b83..474cb92 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1604,8 +1604,6 @@ system-db-check.diff, i#65979, hmth
scp2-user-config-ooo3.diff, pmladek
# default inc/lib
config_office-XINC-XLIB-defaults.diff, i#65976
-# linux-headers-2.6.22 issue?!
-linux-headers.diff
# Sandbox problem with wrong path
gentoo-sandbox.diff
# specific JVM search path
diff --git a/patches/dev300/linux-headers.diff b/patches/dev300/linux-headers.diff
deleted file mode 100644
index a712846..0000000
--- a/patches/dev300/linux-headers.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- configmgr/source/treemgr/nodeimplobj.cxx.orig 2007-08-02 21:27:38.000000000 +0200
-+++ configmgr/source/treemgr/nodeimplobj.cxx 2007-08-02 21:33:12.000000000 +0200
-@@ -66,6 +66,8 @@
- #include "viewfactory.hxx"
- #endif
-
-+#include <exception>
-+
- namespace configmgr
- {
- namespace configuration
---- configmgr/source/treemgr/setnodeimpl.cxx.orig 2007-08-02 21:31:12.000000000 +0200
-+++ configmgr/source/treemgr/setnodeimpl.cxx 2007-08-02 21:32:47.000000000 +0200
-@@ -104,6 +104,8 @@
- #define INCLUDED_VECTOR
- #endif
-
-+#include <exception>
-+
- namespace configmgr
- {
- namespace configuration
---- psprint/source/printergfx/printerjob.cxx.orig 2007-08-02 22:07:05.000000000 +0200
-+++ psprint/source/printergfx/printerjob.cxx 2007-08-02 22:09:48.000000000 +0200
-@@ -75,6 +75,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <time.h>
- #include <pwd.h>
- #include <sal/alloca.h>
-
---- dtrans/source/X11/X11_selection.cxx.orig 2007-08-02 22:11:07.000000000 +0200
-+++ dtrans/source/X11/X11_selection.cxx 2007-08-02 22:11:23.000000000 +0200
-@@ -37,6 +37,7 @@
- #include "precompiled_dtrans.hxx"
-
- #include <unistd.h>
-+#include <time.h>
- #include <stdio.h>
- #include <string.h>
- #include <sys/time.h>
commit 1403d99df43e11967a6ada8d15774dd79cd7e795
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date: Wed Nov 25 21:17:47 2009 +0100
Install SDK on Gentoo.
* bin/ooinstall: Update.
diff --git a/bin/ooinstall b/bin/ooinstall
index c198056..d2d6a96 100755
--- a/bin/ooinstall
+++ b/bin/ooinstall
@@ -157,7 +157,7 @@ system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " .
"-buildid $BUILD $destdir $strip " .
"-simple $path") && die "Failed to install: $!";
-if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debian' || $setup_vars{'VENDORNAME'} eq 'Mandriva' || $setup_vars{'VENDORNAME'} eq 'Frugalware' ) && $configure_vars{BUILD_TYPE} =~ m/ODK/) {
+if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debian' || $setup_vars{'VENDORNAME'} eq 'Mandriva' || $setup_vars{'VENDORNAME'} eq 'Frugalware' || $setup_vars{'VENDORNAME'} eq 'Gentoo') && $configure_vars{BUILD_TYPE} =~ m/ODK/) {
print "Running SDK installer\n";
system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " .
"perl -w $configure_vars{SOLARENV}/bin/make_installer.pl " .
commit bc80f22626b3b38471c251ad4ee61748453771b4
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date: Wed Nov 25 21:10:18 2009 +0100
Update system-db-check.diff for OOo 3.2.
* patches/dev300/system-db-check.diff: Update.
diff --git a/patches/dev300/system-db-check.diff b/patches/dev300/system-db-check.diff
index 0722f01..2a56d7a 100644
--- a/patches/dev300/system-db-check.diff
+++ b/patches/dev300/system-db-check.diff
@@ -12,35 +12,33 @@
- [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ )
- ], []
- )
-+ for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
++ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+ AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
+ done
+ if test "$DB_INCLUDES" = ""; then
+ AC_MSG_ERROR(no. install the db4-dev package)
+ fi
AC_MSG_CHECKING([whether db is at least 4.1])
- for v in 1 2 3 4 5; do
+ for v in `seq 1 8`; do
AC_TRY_RUN([
-@@ -3302,12 +3300,13 @@
+@@ -3302,11 +3300,12 @@
else
- AC_MSG_RESULT([no. you need at least db 4.1])
+ AC_MSG_ERROR([no. you need at least db 4.1])
fi
- # does not work :/
- #AC_CHECK_LIB(db, db_create, [],
- # [AC_MSG_ERROR([db library not installed or functional])], [])
- AC_HAVE_LIBRARY(db, [],
- [AC_MSG_ERROR([db not installed or functional])], [])
-- SCPDEFS="$SCPDEFS -DSYSTEM_DB"
+ save_LIBS="$LIBS"
-+ for dbver in -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
++ for dbver in -4.8 4.8 -4.7 4.7 -4.6 4.6 -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
+ AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
+ done
+ AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
+ LIBS="$save_LIBS"
-+ SCPDEFS="$SCPDEFS -DSYSTEM_DB"
+ SCPDEFS="$SCPDEFS -DSYSTEM_DB"
else
AC_MSG_RESULT([internal])
- SYSTEM_DB=NO
@@ -3315,6 +3314,8 @@
fi
AC_SUBST(SYSTEM_DB)
@@ -64,13 +62,11 @@
--- solenv/inc/libs.mk.orig 2007-07-15 16:45:47.000000000 +0200
+++ solenv/inc/libs.mk 2007-07-15 16:49:00.000000000 +0200
@@ -220,8 +220,8 @@
- CURLLIB=-lcurl-3
- .ELSE
+ NEON3RDLIB=-lneon
+ .ENDIF
.IF "$(SYSTEM_DB)" == "YES"
-BERKELEYLIB=-ldb
--BERKELEYCPPLIB=-ldb_cxx
+BERKELEYLIB=-l$(DB_LIB)
-+BERKELEYCPPLIB=-l$(DB_CPPLIB)
.ELSE
- BERKELEYLIB=-ldb-4.2
- BERKELEYCPPLIB=-ldb_cxx-4.2
+ BERKELEYLIB=-ldb-4.7
+ .ENDIF
More information about the ooo-build-commit
mailing list