summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/openoffice/files/gentoo-3.1.1.diff')
-rw-r--r--app-office/openoffice/files/gentoo-3.1.1.diff54
1 files changed, 0 insertions, 54 deletions
diff --git a/app-office/openoffice/files/gentoo-3.1.1.diff b/app-office/openoffice/files/gentoo-3.1.1.diff
deleted file mode 100644
index 68e8f6a1de65..000000000000
--- a/app-office/openoffice/files/gentoo-3.1.1.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- patches/dev300/apply
-+++ patches/dev300/apply
-@@ -452,10 +452,6 @@
-
- # avoid error messages about missing directories with templates
- sfx2-check-existing-template-dirs.diff, i#100518, pmladek
--
--[ FedoraLinuxOnlyFixes ]
--# fix for new SQLLEN in unixodbc. Update internal headers.
--new-SQLLEN.diff, i#104088
-
- [ LinuxOnly ]
- # fix that allows OOo to work with a standard (unpatched) libjpeg,
-@@ -1528,6 +1528,8 @@
- gentoo-sandbox.diff
- # specific JVM search path
- jvm-search-path.diff
-+# build against xulrunner 1.9.1+
-+xulrunner-1.9.1.diff, ccheney
-
- [ DebianBaseOnly ]
- SectionOwner => rengelha
---- patches/dev300/kde4-configure2.diff
-+++ patches/dev300/kde4-configure2.diff
-@@ -7,7 +7,7 @@
- - qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
- - qt_libdirs="$QTLIB /usr/lib $x_libraries"
- + qt_incdirs="$QT4INC $QT4DIR $QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
--+ qt_libdirs="$QT4LIB $QTLIB /usr/lib $x_libraries"
-++ qt_libdirs="$QT4LIB $QTLIB /usr/lib/qt4 /usr/lib $x_libraries"
-
- kde_incdirs="/usr/include $x_includes"
- kde_libdirs="/usr/lib $x_libraries"
---- patches/dev300/system-db-check.diff
-+++ patches/dev300/system-db-check.diff
-@@ -12,7 +12,7 @@
- - [ 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
-@@ -32,7 +32,7 @@
- - [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]) ])
-