[gentoo-commits] gentoo-x86 commit in app-text/openjade/files: openjade-1.3.2-deplibs.patch openjade-1.3.2-ldflags.patch openjade-1.3.2-la-fix.patch

[Peter Alfredsen (loki_val)]

loki_val    09/04/22 21:59:34

  Modified:             openjade-1.3.2-ldflags.patch
                        openjade-1.3.2-la-fix.patch
  Added:                openjade-1.3.2-deplibs.patch
  Log:
  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)

Revision  Changes    Path
1.2                  app-text/openjade/files/openjade-1.3.2-ldflags.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/openjade/files/openjade-1.3.2-ldflags.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/openjade/files/openjade-1.3.2-ldflags.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/openjade/files/openjade-1.3.2-ldflags.patch?r1=1.1&r2=1.2

Index: openjade-1.3.2-ldflags.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/openjade/files/openjade-1.3.2-ldflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openjade-1.3.2-ldflags.patch	26 Jan 2007 20:53:53 -0000	1.1
+++ openjade-1.3.2-ldflags.patch	22 Apr 2009 21:59:34 -0000	1.2
@@ -11,20 +11,3 @@
  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
- 



1.2                  app-text/openjade/files/openjade-1.3.2-la-fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/openjade/files/openjade-1.3.2-la-fix.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/openjade/files/openjade-1.3.2-la-fix.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/openjade/files/openjade-1.3.2-la-fix.patch?r1=1.1&r2=1.2

Index: openjade-1.3.2-la-fix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/openjade/files/openjade-1.3.2-la-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openjade-1.3.2-la-fix.patch	26 Jan 2007 20:53:53 -0000	1.1
+++ openjade-1.3.2-la-fix.patch	22 Apr 2009 21:59:34 -0000	1.2
@@ -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 @@



1.1                  app-text/openjade/files/openjade-1.3.2-deplibs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/openjade/files/openjade-1.3.2-deplibs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/openjade/files/openjade-1.3.2-deplibs.patch?rev=1.1&content-type=text/plain

Index: openjade-1.3.2-deplibs.patch
===================================================================
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 \