diff options
author | Hanno Meyer-Thurow <h.mth@web.de> | 2011-02-11 13:09:06 +0100 |
---|---|---|
committer | Hanno Meyer-Thurow <h.mth@web.de> | 2011-02-21 18:49:36 +0100 |
commit | 57ebcda54dde472dbd53c51c2a40665bac897eeb (patch) | |
tree | 8f5dbaecb9a747772c9c8ae3d898618b5967b959 | |
parent | 1b6acec4eb7cb00e4c84869fcd76debf9473c843 (diff) |
(GentooOnly) Clean up patchset.
Long overdue removal of old patches.
* patches/dev300/apply: clean up
* patches/dev300/gentoo-pax-fix.diff: bin
* patches/dev300/ibm-j9vm.diff: bin
* patches/dev300/system-db-check.diff: bin
-rw-r--r-- | patches/dev300/apply | 8 | ||||
-rw-r--r-- | patches/dev300/gentoo-pax-fix.diff | 26 | ||||
-rw-r--r-- | patches/dev300/ibm-j9vm.diff | 20 | ||||
-rw-r--r-- | patches/dev300/system-db-check.diff | 69 |
4 files changed, 0 insertions, 123 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 0fef9f86d..b935ca2e1 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -856,16 +856,8 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml [ GentooOnly ] SectionOwner => aprosky -# Allow build to proceed with PaX enabled -gentoo-pax-fix.diff, aprosky # support server-only versions of 64bit JDKs 64bit-jdk-server-paths.diff, i#65974, hmth -# use IBM j9vm over IBM classic JVM -ibm-j9vm.diff, hmth -# system db check -system-db-check.diff, i#65979, hmth -# User ~/.ooo3 as user dir -scp2-user-config-ooo3.diff, pmladek # default inc/lib config_office-XINC-XLIB-defaults.diff, i#65976 # Sandbox problem with wrong path diff --git a/patches/dev300/gentoo-pax-fix.diff b/patches/dev300/gentoo-pax-fix.diff deleted file mode 100644 index e0b4700e6..000000000 --- a/patches/dev300/gentoo-pax-fix.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- solenv/inc/unxlngi4.mk.orig 2005-10-29 17:09:48.000000000 +0200 -+++ solenv/inc/unxlngi4.mk 2005-10-29 17:18:46.000000000 +0200 -@@ -138,8 +138,8 @@ - LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared ---- solenv/inc/unxlngi6.mk.orig 2005-10-29 17:16:27.000000000 +0200 -+++ solenv/inc/unxlngi6.mk 2005-10-29 17:19:08.000000000 +0200 -@@ -147,8 +147,8 @@ - LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -Wl,-z,execheap - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared diff --git a/patches/dev300/ibm-j9vm.diff b/patches/dev300/ibm-j9vm.diff deleted file mode 100644 index 1e865fdc5..000000000 --- a/patches/dev300/ibm-j9vm.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx.orig 2006-08-16 12:13:05.000000000 +0200 -+++ jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx 2006-08-16 12:14:30.000000000 +0200 -@@ -76,6 +76,8 @@ - #ifdef MACOSX - "/../../../JavaVM" - #else -+ "/bin/j9vm/libjvm.so", // for IBM Java -+ "/jre/bin/j9vm/libjvm.so", // for IBM Java - "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC - "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64 - "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC -@@ -101,6 +103,8 @@ - #else - "/bin", - "/jre/bin", -+ "/bin/j9vm", -+ "/jre/bin/j9vm", - "/bin/classic", - "/jre/bin/classic", - "/lib/" JFW_PLUGIN_ARCH "/client", diff --git a/patches/dev300/system-db-check.diff b/patches/dev300/system-db-check.diff deleted file mode 100644 index 4ab65e8c4..000000000 --- a/patches/dev300/system-db-check.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- configure.in.orig 2007-07-15 16:45:32.000000000 +0200 -+++ configure.in 2007-07-15 16:48:19.000000000 +0200 -@@ -3277,14 +3277,12 @@ - test "$with_system_db" != "no"; then - SYSTEM_DB=YES - AC_MSG_RESULT([external]) -- AC_CHECK_HEADER(db.h, [ DB_INCLUDES=/usr/include ], -- [ -- CFLAGS=-I/usr/include/db4 -- AC_CHECK_HEADER(db4/db.h, -- [ DB_INCLUDES=/usr/include/db4 ], -- [ AC_MSG_ERROR(no. install the db4 libraries) ], []+ ) -- ], [] -- ) -+ for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -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]) - AC_TRY_RUN([ - #include <db.h> -@@ -3300,8 +3298,12 @@ - else return 1; - } - ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])]) -- AC_HAVE_LIBRARY(db, [], -- [AC_MSG_ERROR([db not installed or functional])], []) -+ save_LIBS="$LIBS" -+ for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -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" - else - AC_MSG_RESULT([internal]) -@@ -3315,6 +3314,8 @@ - fi - AC_SUBST(SYSTEM_DB) - AC_SUBST(DB_VERSION) -+AC_SUBST(DB_LIB) -+AC_SUBST(DB_CPPLIB) - AC_SUBST(DB_INCLUDES) - AC_SUBST(DB_JAR) - ---- set_soenv.in.orig 2007-07-15 16:45:39.000000000 +0200 -+++ set_soenv.in 2007-07-15 16:48:37.000000000 +0200 -@@ -1832,6 +1832,8 @@ - ToFile( "WITH_EXTRA_FONT", "@WITH_EXTRA_FONT@", "e" ); - ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" ); - ToFile( "DB_VERSION", "@DB_VERSION@", "e" ); -+ToFile( "DB_LIB", "@DB_LIB@", "e" ); -+ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" ); - ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" ); - ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" ); - ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" ); ---- 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,7 +220,7 @@ - NEON3RDLIB=-lneon - .ENDIF - .IF "$(SYSTEM_DB)" == "YES" --BERKELEYLIB=-ldb -+BERKELEYLIB=-l$(DB_LIB) - .ELSE - BERKELEYLIB=-ldb-4.7 - .ENDIF |