[Libreoffice-commits] .: patches/dev300

[Bjoern Michaelsen]

 patches/dev300/apply                                |    6 ----
 patches/dev300/system-lpsolve-link-with-colamd.diff |   27 --------------------
 patches/dev300/system-lpsolve-rpath.diff            |   27 --------------------
 3 files changed, 60 deletions(-)

New commits:
commit 2786d0238b25d7bcc1408bb1a45a8f7f4bd1febd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 24 18:51:52 2011 +0100

    remove system-lpsolve-link-with-colamd.diff and system-lpsolve-rpath.diff, already downstreamed to debian

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 73b9c4e..f0e07a1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -359,8 +359,6 @@ soffice-opengl-and-locking-config.diff, mklose
 
 icu-arm.diff, doko
 
-# link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
-system-lpsolve-link-with-colamd.diff, rengelha
 
 [ LocalizeFixes and DebianBaseOnly ]
 # mention openoffice.org-report-builder instead of getting people
@@ -1248,10 +1246,6 @@ SectionOwner => jholesov
 # fix mysqlc to use the SONAME instead of the .so symlink...
 mysqlcppconn-mysqlclient-SONAME.diff
 
-[ DebianSidOnly ]
-# link dynamically with liblpsolve55.so
-system-lpsolve-rpath.diff, rengelha
-
 [ Speed ]
 # don't throw unnecessary exceptions in sfx2
 speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
diff --git a/patches/dev300/system-lpsolve-link-with-colamd.diff b/patches/dev300/system-lpsolve-link-with-colamd.diff
deleted file mode 100644
index 0c3c7c2..0000000
--- a/patches/dev300/system-lpsolve-link-with-colamd.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/configure.in b/configure.in
---- configure.in
-+++ configure.in
-@@ -5185,6 +5185,7 @@
-     # some systems need this. Like Ubuntu....
-     AC_CHECK_LIB(m, floor)
-     AC_CHECK_LIB(dl, dlopen)
-+    AC_CHECK_LIB(colamd, colamd)
-     AC_CHECK_LIB(lpsolve55, make_lp, ,
-         [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
- else
-diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk
---- sccomp/source/solver/makefile.mk
-+++ sccomp/source/solver/makefile.mk
-@@ -58,6 +58,12 @@
-                 $(TOOLSLIB)         \
-                 $(LPSOLVELIB)
- 
-+# DebianBaseOnly; we build lp_solve without colamd included but with system-colamd
-+# (which is not linked into the .a...) so we need -lcolamd here, too
-+.IF "$(SYSTEM_LPSOLVE)" == "YES"
-+SHL1STDLIBS += -lcolamd
-+.ENDIF
-+
- SHL1DEPN=       makefile.mk
- SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
- SHL1VERSIONMAP= $(SOLARENV)/src/component.map
diff --git a/patches/dev300/system-lpsolve-rpath.diff b/patches/dev300/system-lpsolve-rpath.diff
deleted file mode 100644
index 24c72cc..0000000
--- a/patches/dev300/system-lpsolve-rpath.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- solenv/inc/libs.mk-old	2008-04-29 12:50:10.000000000 +0200
-+++ solenv/inc/libs.mk	2008-04-29 12:51:27.000000000 +0200
-@@ -340,7 +340,13 @@
- MYTHESLIB=-lmythes-1.2
- .ENDIF
- PYUNOLIB=-lpyuno
-+.IF "$(SYSTEM_LPSOLVE)" == "YES"
-+# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
-+# /usr/lib gets picked and we get a static link...
-+LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
-+.ELSE
- LPSOLVELIB=-llpsolve55
-+.ENDIF
- SOFFICELIB=-lsofficeapp
- UNOPKGAPPLIB=-lunopkgapp
- TESTLIB=-ltest
---- configure.in-old	2008-04-29 12:59:49.000000000 +0200
-+++ configure.in	2008-04-29 13:00:07.000000000 +0200
-@ -5401,7 +5401,7 @@
-     AC_CHECK_LIB(m, floor)
-     AC_CHECK_LIB(dl, dlopen)
-     AC_CHECK_LIB(lpsolve55, make_lp, ,
--        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
-+        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lp_solve])
- else
-     AC_MSG_RESULT([internal])
-     SYSTEM_LPSOLVE=NO