[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Michael Meeks]

 patches/dev300/apply                                       |   11 -------
 patches/dev300/gcj-HelpLinker-no-NullPointerException.diff |   15 ----------
 patches/dev300/system-db-4.3-use-lpthread.diff             |   19 -------------
 3 files changed, 45 deletions(-)

New commits:
commit c3854d9ecf7934796fb581baaf9f64a3750b8876
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Apr 8 21:32:33 2011 +0100

    remove more obsolete patches

diff --git a/patches/dev300/apply b/patches/dev300/apply
index dcee9f3..a2f3197 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -424,13 +424,6 @@ link-as-needed.diff, i#89511, pmladek
 [ DebianOnly ]
 seamonkey-is-iceape.diff
 
-[ ArkOnly ]
-SectionOwner => brosenk
-
-# Db 4.3/4.4 needs -lpthread
-system-db-4.3-use-lpthread.diff, i#58474, rengelha
-
-
 [ PLDOnly ]
 SectionOwner => arekm
 
@@ -1062,9 +1055,6 @@ ark-default-ExternalMailer.diff
 # Java lib naming scheme and won't work anywhere else.
 # Not applied right now, needs porting
 compiletime-skip-duplicate-jars.diff
-# Don't crash HelpLinker
-# FIXME check if this is still needed with m190
-gcj-HelpLinker-no-NullPointerException.diff, i#61278
 
 # This is faster, and solves gcj -C's private bug. But it's also
 # close to untested.
@@ -1081,7 +1071,6 @@ ark-system-precompiled-java.diff
 [ DebianOnly ]
 #debian-gccXXXXX.solenv.javaregistration.diff
 
-
 [ Experimental ]
 # sal_uInt32 -> sal_uIntPtr for events on some places
 events-intptr.diff, i#59411, jholesov
diff --git a/patches/dev300/gcj-HelpLinker-no-NullPointerException.diff b/patches/dev300/gcj-HelpLinker-no-NullPointerException.diff
deleted file mode 100644
index 0d1f6d9..0000000
--- a/patches/dev300/gcj-HelpLinker-no-NullPointerException.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- xmlhelp/source/com/sun/star/help/makefile.mk.ark	2006-03-02 17:29:27.000000000 +0000
-+++ xmlhelp/source/com/sun/star/help/makefile.mk	2006-03-02 17:31:26.000000000 +0000
-@@ -115,6 +115,12 @@
- 	$(JAVABINCOMPILER) --main=com.sun.star.help.HelpLinker -o $(BIN)$/HelpLinker \
- 		-O2 -Wl,-Bsymbolic -findirect-dispatch -fjni -fno-assert -Wno-deprecated \
- 		$(JAVACPS) $(CLASSPATH) $(JAVAFILES) $(SOLARLIB) -L$(LB) \
-+        -Djavax.xml.datatype.DatatypeFactory=org.apache.xerces.jaxp.datatype.DatatypeFactoryImpl \
-+        -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
-+        -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-+        -Djavax.xml.validation.SchemaFactory=org.apache.xerces.jaxp.validation.XMLSchemaFactory \
-+        -Dorg.w3c.dom.DOMImplementationSourceList=org.apache.xerces.dom.DOMXSImplementationSourceImpl \
-+        -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser \
- 		-ldb.jar -lxmlsearch.jar -lxt.jar -lunoil.jar -ljurt.jar -lridl.jar -lxt-xmlsearch.jar
- 
- .IF "$(SYSTEM_DB)"=="YES"
diff --git a/patches/dev300/system-db-4.3-use-lpthread.diff b/patches/dev300/system-db-4.3-use-lpthread.diff
deleted file mode 100644
index 06b2b0b..0000000
--- a/patches/dev300/system-db-4.3-use-lpthread.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.ark	2007-10-19 11:27:12.000000000 +0200
-+++ configure.in	2007-10-19 11:28:12.000000000 +0200
-@@ -3311,11 +3311,11 @@
-     else
-        AC_MSG_RESULT([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])], [])
-+    # dnl Workaround for a db 4.x bug -- it uses pthreads without linking to
-+    # the lib
-+    LIBS="$LIBS -lpthread"
-+    AC_CHECK_LIB(db, db_create, [],
-+      [AC_MSG_ERROR([db library not installed or functional])], [])
-     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
- else
-     AC_MSG_RESULT([internal])