diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-06-28 13:30:31 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-06-28 13:30:31 +0000 |
commit | d7d5441782533058dece3ec9ace91a57ec1a61fb (patch) | |
tree | 7cdf3fc296914a3dffe2c7d9d4c52a697775b668 /sci-astronomy | |
parent | stable amd64, bug 229871 (diff) | |
download | historical-d7d5441782533058dece3ec9ace91a57ec1a61fb.tar.gz historical-d7d5441782533058dece3ec9ace91a57ec1a61fb.tar.bz2 historical-d7d5441782533058dece3ec9ace91a57ec1a61fb.zip |
Fix Motif linking problem again, bug 229761.
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686
Diffstat (limited to 'sci-astronomy')
-rw-r--r-- | sci-astronomy/xephem/ChangeLog | 6 | ||||
-rw-r--r-- | sci-astronomy/xephem/Manifest | 11 | ||||
-rw-r--r-- | sci-astronomy/xephem/files/xephem-3.7.3-link-motif.patch | 20 | ||||
-rw-r--r-- | sci-astronomy/xephem/xephem-3.7.3.ebuild | 6 |
4 files changed, 36 insertions, 7 deletions
diff --git a/sci-astronomy/xephem/ChangeLog b/sci-astronomy/xephem/ChangeLog index bb5cc1d09c99..ae7e94820aa5 100644 --- a/sci-astronomy/xephem/ChangeLog +++ b/sci-astronomy/xephem/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-astronomy/xephem # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.24 2008/06/27 10:18:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/ChangeLog,v 1.25 2008/06/28 13:30:30 ulm Exp $ + + 28 Jun 2008; Ulrich Mueller <ulm@gentoo.org> + +files/xephem-3.7.3-link-motif.patch, xephem-3.7.3.ebuild: + Fix Motif linking problem again, bug 229761. 27 Jun 2008; Ulrich Mueller <ulm@gentoo.org> xephem-3.7.2.ebuild, xephem-3.7.3.ebuild: diff --git a/sci-astronomy/xephem/Manifest b/sci-astronomy/xephem/Manifest index 409962077686..db1f0ccd3c3a 100644 --- a/sci-astronomy/xephem/Manifest +++ b/sci-astronomy/xephem/Manifest @@ -2,16 +2,17 @@ Hash: SHA1 AUX 3.7.2.patch 1290 RMD160 e1f2e66a1b417b2fb66a3c13e74760d8f87977f5 SHA1 5d49ec0a316943287a94ad473778b56db02bf7f2 SHA256 c314c3f969eb13cf2151c4698e0721cebe714e62263d15dc3a7406daecf94a35 +AUX xephem-3.7.3-link-motif.patch 889 RMD160 621b76ebeaf85450c485e6a96d26d791153397e9 SHA1 8e9c190a92a10d18dbe465bbd9f5dfbfecda94fc SHA256 b865217258fb13f96523bccc72779fff4db89d524183ff66918e61ce280df7da DIST xephem-3.7.2.tar.gz 19369598 RMD160 585ed51d167869919b512561714d380c83db8865 SHA1 8027f73e934e257316d15c474c88d435241c521d SHA256 51697f36e08000fc5f8f5e5edc570f82c92d0b323331291877814410396d0354 DIST xephem-3.7.3.tar.gz 22148450 RMD160 d292a30cd6acbdd5dabf345aefd34b596534ce68 SHA1 b19c528097f7357e90a18bc605128eca9394b748 SHA256 450fa05a36ce4c8ceca80bd5a003c060bc4d9e07719aebcb13565b563b90e337 EBUILD xephem-3.7.2.ebuild 2271 RMD160 e0693a6b0ec3cb35ec3a1f8a1843584324a2a239 SHA1 d45b122526bb65ea4f1d1272cfc823bceaad59fd SHA256 b6f7d0dde2e57f5ff658d786f8d981a47c6ef2c8afd040cc747dcf42e98088c9 -EBUILD xephem-3.7.3.ebuild 2240 RMD160 46ce5fe3ba3e637feedeec636a65712ab80acb70 SHA1 64cc19c47a44c07c9ac60d630266d8ff3f48a075 SHA256 14d1e34f3795ec223db52c93b2bb099df07ae188cba949455e4b8466b060f48f -MISC ChangeLog 5952 RMD160 1e43f071117e3fba43854480531e632a18a127c9 SHA1 f7c135939b32bfc10f9c31840c7f241cb1233826 SHA256 6e70bebb677791e2407f3b50defeaf84c66dcafaf15e1e2bb159475cecf61892 +EBUILD xephem-3.7.3.ebuild 2331 RMD160 888db93f25eaec6dab0338300fb1e0a4c33d9c30 SHA1 30cc3e3d3c36cceb1f33ac30c8ff1206fab09c63 SHA256 6a6b9e70411dc2ae5330ea4d7f9ffc4bf0334e46620e6a0c3ea40cd93254ec8a +MISC ChangeLog 6108 RMD160 89df079d8b48e35c7aeb1a33f5a8fde3d0c3c3cc SHA1 4268639aa5dcb22df07747636f9157d6b145ada6 SHA256 8cdca3b1610867b39b8c7a47684422df71100b4bb0d52703229ea80da075c86c MISC metadata.xml 607 RMD160 5306c189a61a6ba80120f1710ecf8a93f956b45c SHA1 81b781ce504bd9e905fdd50e4266576436014114 SHA256 3cc09e691f00a06ccfc77a1561e8176128474398ecf451f4a668415494082109 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) -iEYEARECAAYFAkhkvsQACgkQOeoy/oIi7uz9hwCgqulqtP5icFXEDDVI8P4gbhdO -w/sAn0SARJ36qRGg9insioiKZUUVlbQp -=2Bhb +iEYEARECAAYFAkhmPSgACgkQOeoy/oIi7uwu3gCeO84sK6ZfV69oGL7uUb1WAAST +Vj0AoM0pMFjKsGJ4UJl+2kIIUO1GN4ni +=l2IX -----END PGP SIGNATURE----- diff --git a/sci-astronomy/xephem/files/xephem-3.7.3-link-motif.patch b/sci-astronomy/xephem/files/xephem-3.7.3-link-motif.patch new file mode 100644 index 000000000000..4828d2eac39a --- /dev/null +++ b/sci-astronomy/xephem/files/xephem-3.7.3-link-motif.patch @@ -0,0 +1,20 @@ +--- xephem-3.7.3-orig/GUI/xephem/Makefile 2006-05-14 01:06:06.000000000 +0200 ++++ xephem-3.7.3/GUI/xephem/Makefile 2008-06-28 11:23:32.000000000 +0200 +@@ -15,7 +15,7 @@ + LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz + + # MOTIFI is the directory containing the Xm directory of include files. +-# MOTIFL is the directory containing the libXm.a library. ++# MOTIFL is the directory containing libXm + # MOTIF can be used to set one common directory if desired. + # Defaults work ok for Linux and Mac OS X. + ifdef MOTIF +@@ -34,7 +34,7 @@ + CLDFLAGS = -g + CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/usr/X11R6/include + LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/usr/X11R6/lib +-XLIBS = $(MOTIFL)/libXm.a -lXp -lXt -lXext -lXmu -lX11 ++XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11 + LIBS = $(XLIBS) $(LIBLIB) -lm + + # for ppc Apple OS X to make universal (i386 and ppc binary), requires diff --git a/sci-astronomy/xephem/xephem-3.7.3.ebuild b/sci-astronomy/xephem/xephem-3.7.3.ebuild index 748e1c711124..737ea3f430b6 100644 --- a/sci-astronomy/xephem/xephem-3.7.3.ebuild +++ b/sci-astronomy/xephem/xephem-3.7.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.2 2008/06/27 10:18:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/xephem/xephem-3.7.3.ebuild,v 1.3 2008/06/28 13:30:30 ulm Exp $ inherit eutils @@ -17,6 +17,10 @@ DEPEND="!media-gfx/feh src_unpack() { unpack ${A} cd "${S}" + + # Link against Motif shared lib, bug 229761 + epatch "${FILESDIR}/${P}-link-motif.patch" + for i in libastro/Makefile libip/Makefile libjpegd/Makefile \ liblilxml/Makefile GUI/xephem/Makefile GUI/xephem/tools/*/Makefile ; do einfo "Fixing CFLAGS in ${i}" |