projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: abc2634)
Allow the package to build with LDFLAGS="-Wl,--as-needed", thanks to a patch by Chris...
authorTony Vroon <chainsaw@gentoo.org>
Fri, 26 Jan 2007 20:53:53 +0000 (20:53 +0000)
committerTony Vroon <chainsaw@gentoo.org>
Fri, 26 Jan 2007 20:53:53 +0000 (20:53 +0000)
Package-Manager: portage-2.1.2

app-text/openjade/ChangeLog patch | blob | history
app-text/openjade/Manifest patch | blob | history
app-text/openjade/files/openjade-1.3.2-la-fix.patch [new file with mode: 0644] patch | blob
app-text/openjade/files/openjade-1.3.2-ldflags.patch [new file with mode: 0644] patch | blob
app-text/openjade/openjade-1.3.2-r1.ebuild patch | blob | history

diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index d64cdf442e0ebbaa153202de7660c5f2a98d6847..074db146ba1e4e9e78a0cf50cb47d92823025eb3 100644 (file)
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/openjade
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.48 2006/12/21 02:12:17 uberlord Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.49 2007/01/26 20:53:53 chainsaw Exp $
+
+  26 Jan 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/openjade-1.3.2-la-fix.patch, +files/openjade-1.3.2-ldflags.patch,
+  openjade-1.3.2-r1.ebuild:
+  Allow the package to build with LDFLAGS="-Wl,--as-needed", thanks to a patch
+  by Christian Heim <phreak@gentoo.org>. Closes bug #131335. Text-markup herd
+  approval: leonardop.
 
   21 Dec 2006; Roy Marples <uberlord@gentoo.org> openjade-1.3.2-r1.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index b5291a17853f1c32181d63531cc6f06c6a541699..5f457bbeec72f31bbae3fbf2e8f107037c3901cb 100644 (file)
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX openjade-1.3.2-la-fix.patch 1613 RMD160 57c5797e6978ec0b78f0ad7fb764669def4601ef SHA1 0871c2ee0205c5d517ef86e5bc37e78626c84b27 SHA256 a4836205a25fc5deb303cc93f87c9285e6f39667b712234ec93513a6bf17378d
+MD5 19d5a014a400630cc082649964201019 files/openjade-1.3.2-la-fix.patch 1613
+RMD160 57c5797e6978ec0b78f0ad7fb764669def4601ef files/openjade-1.3.2-la-fix.patch 1613
+SHA256 a4836205a25fc5deb303cc93f87c9285e6f39667b712234ec93513a6bf17378d files/openjade-1.3.2-la-fix.patch 1613
+AUX openjade-1.3.2-ldflags.patch 1393 RMD160 e230cfbc1bb3242cd7a98f1507c539d4c988b7d1 SHA1 41bcae1dd6cb0931e8ae5e7b45b21505edcafb1f SHA256 3e68a96ef4e1c0f4a15a97fc44e032160a44af622edf943eddbaeaf262d465f4
+MD5 eb3ed66b2a9752ea13f5b420230348ff files/openjade-1.3.2-ldflags.patch 1393
+RMD160 e230cfbc1bb3242cd7a98f1507c539d4c988b7d1 files/openjade-1.3.2-ldflags.patch 1393
+SHA256 3e68a96ef4e1c0f4a15a97fc44e032160a44af622edf943eddbaeaf262d465f4 files/openjade-1.3.2-ldflags.patch 1393
 AUX openjade-1.3.2-msggen.pl.patch 418 RMD160 6af41427403575117dd03e157d8a5d057ed4743c SHA1 fa30539b34b7fda9d74a384465c69cb25dfc3660 SHA256 4dfb6018f13fcc0ec17637fc24fe69785e6efe6531d5ed248407046d31832449
 MD5 97ffae1d667ab6f72f6e716bac5f3833 files/openjade-1.3.2-msggen.pl.patch 418
 RMD160 6af41427403575117dd03e157d8a5d057ed4743c files/openjade-1.3.2-msggen.pl.patch 418
@@ -7,14 +18,14 @@ MD5 7b4fc3abf04cdb88a197065eaf3b4e53 files/openjade-1.3.2.dsssl-catalog 269
 RMD160 fc328d135bf956fe7ae60f705979accd08bf74a8 files/openjade-1.3.2.dsssl-catalog 269
 SHA256 f33d7ce1b564b91bbdf5b8983f21ce4c6a0e420f0e8676a8439f460a49b16abc files/openjade-1.3.2.dsssl-catalog 269
 DIST openjade-1.3.2.tar.gz 894834 RMD160 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 SHA1 54e1999f41450fbd62c5d466002d79d3efca2321 SHA256 1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
-EBUILD openjade-1.3.2-r1.ebuild 2737 RMD160 9aba1216338d468ceff5a9134f2a29213c5530db SHA1 82c55551b64c12f1f76beb7e2359c39f0ed66331 SHA256 ab0e64dc48f60c9aa7ead158ef451aaab72e1c641b08ddaa681a60ade0d44e68
-MD5 8bc2a49d70e44f2baba9285cf802e003 openjade-1.3.2-r1.ebuild 2737
-RMD160 9aba1216338d468ceff5a9134f2a29213c5530db openjade-1.3.2-r1.ebuild 2737
-SHA256 ab0e64dc48f60c9aa7ead158ef451aaab72e1c641b08ddaa681a60ade0d44e68 openjade-1.3.2-r1.ebuild 2737
-MISC ChangeLog 6949 RMD160 1e143f8ad05a61f6c06db9ab88303e0103a96e05 SHA1 ee0b7f0b0539a0a69068e102947adf83401be54e SHA256 388ebe7bf83a379c93e9228d32aca25b7d2a54fc581d1b9a56719f98de18435b
-MD5 eed0a486b438ff8e26740657612f40e4 ChangeLog 6949
-RMD160 1e143f8ad05a61f6c06db9ab88303e0103a96e05 ChangeLog 6949
-SHA256 388ebe7bf83a379c93e9228d32aca25b7d2a54fc581d1b9a56719f98de18435b ChangeLog 6949
+EBUILD openjade-1.3.2-r1.ebuild 2778 RMD160 769d379da3adc771de095f2c61fd82e154a61998 SHA1 d2cf7311cf8f803a4e4f8eece821f19542d4f7a9 SHA256 1de7a972bfa0a201a3c799986f657255649100925b3b5219812e5b0922c3d743
+MD5 7924e27da22e7d5baa23c9cb7a6bee65 openjade-1.3.2-r1.ebuild 2778
+RMD160 769d379da3adc771de095f2c61fd82e154a61998 openjade-1.3.2-r1.ebuild 2778
+SHA256 1de7a972bfa0a201a3c799986f657255649100925b3b5219812e5b0922c3d743 openjade-1.3.2-r1.ebuild 2778
+MISC ChangeLog 7281 RMD160 cbc1fdd6e10ad74e6c07f923c374bdf77c3fba89 SHA1 24a05a95ee3eef5bc94d03c1e3112e8fa8b8dfce SHA256 8b2472243d5dd893185db1a75c38988dfd92e7723c3de6be2f9e3aab84b2c4fd
+MD5 1513a06a6c0a3d5c751ebd3da7b6a660 ChangeLog 7281
+RMD160 cbc1fdd6e10ad74e6c07f923c374bdf77c3fba89 ChangeLog 7281
+SHA256 8b2472243d5dd893185db1a75c38988dfd92e7723c3de6be2f9e3aab84b2c4fd ChangeLog 7281
 MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
@@ -22,3 +33,10 @@ SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata
 MD5 3a2602feee0cca5738bbbc0866bf9c8d files/digest-openjade-1.3.2-r1 244
 RMD160 9421b9f397c5b662f2ff7fc28c21789f8e2a5b3b files/digest-openjade-1.3.2-r1 244
 SHA256 9a39adb0a14a6c4de165db0e09a7a41b0e067c1679e11900b34506f4ca799227 files/digest-openjade-1.3.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFumo0p5vW4rUFj5oRAuKqAKCchJ2mW+2jgahvkDaY2SN94hArZwCfSLhO
+Hzw70m0iK2sp5J9b9+RZIM4=
+=ickF
+-----END PGP SIGNATURE-----
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
new file mode 100644 (file)
index 0000000..eea6efa
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-la-fix.patch
@@ -0,0 +1,37 @@
+--- jade/Makefile.sub.orig     2002-11-15 23:46:50.000000000 +0100
++++ jade/Makefile.sub  2006-04-30 19:48:30.000000000 +0200
+@@ -4,7 +4,8 @@
+ INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
+ # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
+ #   ../lib/libosp.a
+-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a
++SPLIBS=-L$(splibdir) -losp
++XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a
+ 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 @@
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
+-      $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
++      $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(SPLIBS)
+ 
+ install: $(PROG)
+       -test -d $(DESTDIR)$(bindir) || \
diff --git a/app-text/openjade/files/openjade-1.3.2-ldflags.patch b/app-text/openjade/files/openjade-1.3.2-ldflags.patch
new file mode 100644 (file)
index 0000000..d557a80
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-ldflags.patch
@@ -0,0 +1,30 @@
+Index: openjade-1.3.2/jade/Makefile.sub
+===================================================================
+--- openjade-1.3.2.orig/jade/Makefile.sub
++++ openjade-1.3.2/jade/Makefile.sub
+@@ -4,7 +4,7 @@ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuild
+ INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
+ # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
+ #   ../lib/libosp.a
+-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a
++XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a $(splibdir)/libosp.a
+ 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
+ 
diff --git a/app-text/openjade/openjade-1.3.2-r1.ebuild b/app-text/openjade/openjade-1.3.2-r1.ebuild
index d14d43ded86b1a649f4f9cc9a979229d2070fdbc..da5f6dc0c5eddf3c516fb6aa0b93cbefade7eef3 100644 (file)
--- a/app-text/openjade/openjade-1.3.2-r1.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r1.ebuild,v 1.34 2006/12/21 02:12:17 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r1.ebuild,v 1.35 2007/01/26 20:53:53 chainsaw Exp $
 
 inherit libtool sgml-catalog eutils flag-o-matic multilib
 
@@ -22,6 +22,7 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/${P}-msggen.pl.patch
+       epatch "${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_compile() {
Unnamed repository; edit this file 'description' to name the repository.