diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-04-22 21:59:35 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-04-22 21:59:35 +0000 |
| commit | 9a4cde9d55bf0bdebfebf76b10d2a5a5c3d2ed56 (patch) | |
| tree | c26a7278a04457e5e9d4a4c32f2a730abf3fb670 /app-text/openjade/files | |
| parent | Fixed vm.jar path bug for ppc64 as well. Reported by Brent Baude <ranger@gent... (diff) | |
| download | gentoo-2-9a4cde9d55bf0bdebfebf76b10d2a5a5c3d2ed56.tar.gz gentoo-2-9a4cde9d55bf0bdebfebf76b10d2a5a5c3d2ed56.tar.bz2 gentoo-2-9a4cde9d55bf0bdebfebf76b10d2a5a5c3d2ed56.zip | |
Add patch from Mandriva for underlinking. Remove chunks of our own patches that are included in this one.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'app-text/openjade/files')
| -rw-r--r-- | app-text/openjade/files/openjade-1.3.2-deplibs.patch | 40 | ||||
| -rw-r--r-- | app-text/openjade/files/openjade-1.3.2-la-fix.patch | 14 | ||||
| -rw-r--r-- | app-text/openjade/files/openjade-1.3.2-ldflags.patch | 17 |
3 files changed, 40 insertions, 31 deletions
diff --git a/app-text/openjade/files/openjade-1.3.2-deplibs.patch b/app-text/openjade/files/openjade-1.3.2-deplibs.patch new file mode 100644 index 000000000000..3466ad7d85e3 --- /dev/null +++ b/app-text/openjade/files/openjade-1.3.2-deplibs.patch @@ -0,0 +1,40 @@ +diff -urNp openjade-1.3.2/grove/Makefile.sub devel/grove/Makefile.sub +--- openjade-1.3.2/grove/Makefile.sub 2002-10-20 23:47:24.000000000 +0200 ++++ devel/grove/Makefile.sub 2007-07-23 15:39:23.000000000 +0200 +@@ -1,4 +1,4 @@ + LTVERSION=0:1:0 + LIB=ogrove +-DEPLIBS=-lm ++DEPLIBS=-lm -lstdc++ + OBJS=Node.o LocNode.o +diff -urNp openjade-1.3.2/spgrove/Makefile.sub devel/spgrove/Makefile.sub +--- openjade-1.3.2/spgrove/Makefile.sub 2002-11-15 23:46:50.000000000 +0100 ++++ devel/spgrove/Makefile.sub 2007-07-23 16:06:13.000000000 +0200 +@@ -1,9 +1,10 @@ + LTVERSION=0:1:0 + LIB=ospgrove + INCLUDE=-I$(srcdir)/../grove +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ ++DEPLIBS=$(TOP)/grove/libogrove.la \ ++ -lm -losp -L$(TOP)/grove/.libs \ + -L$(TOP)/lib -L$(TOP)/lib/.libs \ +- $(LIB_THREADS) ++ $(LIB_THREADS) -lstdc++ + OBJS=GroveApp.o GroveBuilder.o SdNode.o + GENSRCS=grove_inst.cxx + +diff -urNp openjade-1.3.2/style/Makefile.sub devel/style/Makefile.sub +--- openjade-1.3.2/style/Makefile.sub 2003-04-18 19:18:10.000000000 +0200 ++++ devel/style/Makefile.sub 2007-07-23 16:08:26.000000000 +0200 +@@ -1,8 +1,8 @@ + LTVERSION=0:1:0 + LIB=ostyle +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ +- -L$(TOP)/lib -L$(TOP)/lib/.libs \ +- -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs ++DEPLIBS=$(TOP)/grove/libogrove.la $(TOP)/spgrove/libospgrove.la \ ++ -lm -losp -L$(TOP)/lib -L$(TOP)/lib/.libs -L$(TOP)/grove/.libs \ ++ -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs -lstdc++ + OBJS=LangObj.o \ + Collector.o \ + DssslApp.o \ diff --git a/app-text/openjade/files/openjade-1.3.2-la-fix.patch b/app-text/openjade/files/openjade-1.3.2-la-fix.patch index eea6efabb978..9f0a13c862f1 100644 --- a/app-text/openjade/files/openjade-1.3.2-la-fix.patch +++ b/app-text/openjade/files/openjade-1.3.2-la-fix.patch @@ -10,20 +10,6 @@ GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \ HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx TeXFOTBuilder_inst.cxx \ TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx ---- spgrove/Makefile.sub.orig 2006-04-30 20:27:32.000000000 +0200 -+++ spgrove/Makefile.sub 2006-04-30 20:59:40.000000000 +0200 -@@ -1,8 +1,7 @@ - LTVERSION=0:1:0 - LIB=ospgrove - INCLUDE=-I$(srcdir)/../grove --DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ -- -L$(TOP)/lib -L$(TOP)/lib/.libs \ -- $(LIB_THREADS) -+DEPLIBS=-lm $(TOP)/grove/libogrove.la \ -+ $(LIB_THREADS) - OBJS=GroveApp.o GroveBuilder.o SdNode.o - GENSRCS=grove_inst.cxx - --- Makefile.prog.in.orig 2006-05-01 19:44:33.000000000 +0200 +++ Makefile.prog.in 2006-05-01 19:45:01.000000000 +0200 @@ -19,7 +19,7 @@ diff --git a/app-text/openjade/files/openjade-1.3.2-ldflags.patch b/app-text/openjade/files/openjade-1.3.2-ldflags.patch index d557a8002088..4ddd4d414854 100644 --- a/app-text/openjade/files/openjade-1.3.2-ldflags.patch +++ b/app-text/openjade/files/openjade-1.3.2-ldflags.patch @@ -11,20 +11,3 @@ Index: openjade-1.3.2/jade/Makefile.sub GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \ HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx TeXFOTBuilder_inst.cxx \ TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx -Index: openjade-1.3.2/spgrove/Makefile.sub -=================================================================== ---- openjade-1.3.2.orig/spgrove/Makefile.sub -+++ openjade-1.3.2/spgrove/Makefile.sub -@@ -1,9 +1,9 @@ - LTVERSION=0:1:0 - LIB=ospgrove - INCLUDE=-I$(srcdir)/../grove --DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ -- -L$(TOP)/lib -L$(TOP)/lib/.libs \ -- $(LIB_THREADS) -+DEPLIBS=-lm -L$(TOP)/lib -L$(TOP)/lib/.libs \ -+ -L$(TOP)/grove -L$(TOP)/grove/.libs \ -+ $(TOP)/grove/libogrove.la $(LIB_THREADS) - OBJS=GroveApp.o GroveBuilder.o SdNode.o - GENSRCS=grove_inst.cxx - |