./packages/openofficeorg/3.2/unstable r1995: adapt fix-system-mythes-for-mythes-1.2.diff to apply
------------------------------------------------------------
revno: 1995
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-05-25 18:53:16 +0200
message:
adapt fix-system-mythes-for-mythes-1.2.diff to apply
modified:
changelog
patches/fix-system-mythes-for-mythes-1.2.diff
=== modified file 'changelog'
--- a/changelog 2010-05-25 15:20:35 +0000
+++ b/changelog 2010-05-25 16:53:16 +0000
@@ -32,7 +32,7 @@
* debian/rules, debian/control.in: stop building libmythes-dev (now built
again by mythes)
- -- Rene Engelhard <rene@debian.org> Thu, 20 May 2010 19:33:30 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 25 May 2010 17:30:57 +0200
openoffice.org (1:3.2.0-9) unstable; urgency=low
=== modified file 'patches/fix-system-mythes-for-mythes-1.2.diff'
--- a/patches/fix-system-mythes-for-mythes-1.2.diff 2010-05-25 15:20:59 +0000
+++ b/patches/fix-system-mythes-for-mythes-1.2.diff 2010-05-25 16:53:16 +0000
@@ -1,6 +1,6 @@
---- openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/apply-old 2010-04-26 23:44:46.000000000 +0200
-+++ openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/apply 2010-04-26 23:45:05.000000000 +0200
-@@ -1648,6 +1648,8 @@
+--- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply-old 2010-04-26 23:44:46.000000000 +0200
++++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply 2010-04-26 23:45:05.000000000 +0200
+@@ -1480,6 +1480,8 @@
# use getopt() and readdir_r() from system glibc
#FIXME src680: system-libc.diff, i#69033, rengelha
@@ -9,7 +9,7 @@
[ TangoIcons ]
# default to large icons in the toolbar
gui-toolbox-large-icons.diff, jholesov
-@@ -2343,15 +2343,11 @@ events-intptr.diff, i#59411, jholesov
+@@ -2278,14 +2280,12 @@
svx-i18n-ordinal-autocorr.diff, i#20348, cbosdo
[ DebianEtchOnly ]
@@ -19,21 +19,20 @@
# use -llpsolve55_pic
system-lpsolve-use-_pic.diff, rengelha
--[ DebianSidOnly ]
+ [ DebianSidOnly ]
-static-libs-use-_pic.diff, rengelha
--
- [ UbuntuOnly ]
- SectionOwner => ccheney
+ # link dynamically with liblpsolve55.so
+ system-lpsolve-rpath.diff, rengelha
-@@ -2361,7 +2357,6 @@ ubuntu-lpi-help-translate.diff, i#64895, mklose
+@@ -2298,7 +2298,6 @@
#ubuntu-lpi-bugs.diff, i#64895, mklose
ubuntu-sparc-hack.diff, mklose
human-icons-add.diff, mklose
-static-libs-use-_pic.diff, rengelha
ubuntu-no-stack-protector.diff, doko
- #gccXXXXX.solenv.javaregistration.diff
- ubuntu-mstopdf.diff, ccheney
-@@ -3398,7 +3393,6 @@ sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
+ # link dynamically with liblpsolve55.so
+ system-lpsolve-rpath.diff, rengelha
+@@ -3368,7 +3367,6 @@
# fixes crasher in xml parser
unoxml-fix-empty-xmlns.diff, rodo
configure-fix-lpsolve-depends.diff, janneke
@@ -41,22 +40,8 @@
build-fix-xulrunner-npapi-inc.diff, janneke
toolkit-proper-erase-fix.diff, i#106575, thorsten
-diff --git a/patches/dev300/system-lpsolve-rpath.diff b/patches/dev300/system-lpsolve-rpath.diff
-index d1099de..56d80dd 100644
---- openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/system-lpsolve-rpath.diff
-+++ openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/system-lpsolve-rpath.diff
-@@ -1,8 +1,8 @@
- --- 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
- .ENDIF
-- MYTHESLIB*=-lmythes
- PYUNOLIB=-lpyuno
- +.IF "$(SYSTEM_LPSOLVE)" == "YES"
- +# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
--- /dev/null 2010-04-22 23:53:48.512914234 +0200
-+++ openoffice.org-3.2.1/ooo-build-3-2-0-99-3/patches/dev300/fix-system-mythes-for-mythes-1.2.diff 2010-04-26 23:42:56.000000000 +0200
++++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/fix-system-mythes-for-mythes-1.2.diff 2010-04-26 23:42:56.000000000 +0200
@@ -0,0 +1,64 @@
+diff --git a/configure.in b/configure.in
+--- configure.in
Reply to: