diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2009-01-02 21:59:05 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2009-01-02 21:59:05 +0000 |
| commit | 1ddbb042708d09a71f2ca554034825f7d8a81977 (patch) | |
| tree | 8a6b5260bef4cafa97def3cdba8ca9266903f732 /media-gfx/splashutils | |
| parent | Fix building with bzip2 and zlib disabled, closes bug #253284. Thanks to Lifo... (diff) | |
| download | historical-1ddbb042708d09a71f2ca554034825f7d8a81977.tar.gz historical-1ddbb042708d09a71f2ca554034825f7d8a81977.tar.bz2 historical-1ddbb042708d09a71f2ca554034825f7d8a81977.zip | |
Fix bug #253189 (concurrent make problems).
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-rc8 x86_64
Diffstat (limited to 'media-gfx/splashutils')
| -rw-r--r-- | media-gfx/splashutils/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/splashutils/Manifest | 11 | ||||
| -rw-r--r-- | media-gfx/splashutils/files/splashutils-1.5.4.3-makefile.patch | 27 | ||||
| -rw-r--r-- | media-gfx/splashutils/splashutils-1.5.4.3.ebuild | 10 |
4 files changed, 46 insertions, 10 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 60ff4490ede7..f44f82e6a3c9 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/splashutils -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.150 2008/12/28 22:55:23 spock Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.151 2009/01/02 21:59:05 spock Exp $ + + 02 Jan 2009; Michał Januszewski <spock@gentoo.org> + +files/splashutils-1.5.4.3-makefile.patch, splashutils-1.5.4.3.ebuild: + Fix bug #253189 (concurrent make problems). 28 Dec 2008; Michał Januszewski <spock@gentoo.org> +files/splashutils-openrc-0.4-fix.patch, splashutils-1.5.4.2.ebuild, diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest index f562eb4be75c..4153cf16a47d 100644 --- a/media-gfx/splashutils/Manifest +++ b/media-gfx/splashutils/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX splashutils-1.5.4.3-makefile.patch 1257 RMD160 1fb565cb543efe438f5c47cf490aa3cffe07d559 SHA1 011baf9ea9c1313edb3045dc7a52c28d3b84c83e SHA256 6ca31fc77f75bda368642da7effbaa0fd3c69bce86c9e04bfe55b9ab4d259cf3 AUX splashutils-openrc-0.4-fix.patch 2750 RMD160 b9e7694c7e2d2083e62f321f232be9054696f06b SHA1 1d3c6c7418a0ada751dec57dff075af709f0b383 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846 DIST freetype-2.3.5.tar.bz2 1279861 RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 SHA1 45695d44c74be31944d807526a7e69a818e4afd2 SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 SHA1 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d @@ -12,13 +13,13 @@ DIST splashutils-lite-1.5.4.2.tar.bz2 421894 RMD160 defb12e3cedccbfd3f3ebdf75305 DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca EBUILD splashutils-1.5.4.2.ebuild 6944 RMD160 7fa668b3e5219d30822678a048e314da286b107f SHA1 6c74f59a4c59f90a90a3d724653778c59cb12e36 SHA256 3173487db24e8fa897c8afefb680f4fe98f54f9d65840ae4a6759ae82533f207 -EBUILD splashutils-1.5.4.3.ebuild 6969 RMD160 dc5cbbb7db2c5e18f43238c96abd95f488d713a3 SHA1 b4f229bdd14b376d1c23d3936cc960a46f1e412e SHA256 a89bdc5b58cf2924dc62fdb1b0a2a60bf78a404d5a8f5f7479cfcc35bb364834 -MISC ChangeLog 28094 RMD160 3ed52651340530b11f5abf8564d0713608c3dfdc SHA1 2e480b158531314d8cd01ea8a6a3b26b14f82b19 SHA256 168f6cf0aa71a548120aade13be4a5fc095880e53489898d1befb80a92b02289 +EBUILD splashutils-1.5.4.3.ebuild 7051 RMD160 2ff3120013cdddd474f5edfcbb31c6a74c59bf9d SHA1 c091d323866a45386575348292f322bdd65a1ab2 SHA256 c2ccd514bcac648fbd76b4487cb4971db41b8376c5f8fb408c3560af47f3773c +MISC ChangeLog 28268 RMD160 367ac7874de4fce1893fe8297fe71d3f234a23cd SHA1 9ad4ff7f3d01fff559aa8f295b47a2ee60769125 SHA256 c518c8af65ef6e2f34ef7595edba6b2d917089867d371454e86601aeb0063a57 MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAklYA94ACgkQchej4aZK9/fO5wCcDXLYX3ShXwvQPxYPFrCWf6Oj -eM0An0ynJB+2lNTwZ4S3GtkUaE38BdLC -=2V82 +iEYEARECAAYFAklejicACgkQchej4aZK9/eNigCeNaKislQVVH5XwXTdLHbKLPiu +DA4An14ztXcfi191SaOwPf7foFG3wfkt +=/337 -----END PGP SIGNATURE----- diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-makefile.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-makefile.patch new file mode 100644 index 000000000000..060cc9d2b75d --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-makefile.patch @@ -0,0 +1,27 @@ +diff --git a/core/src/Makefile.am b/core/src/Makefile.am +index 20cb03e..fa6919d 100644 +--- a/core/src/Makefile.am ++++ b/core/src/Makefile.am +@@ -119,7 +119,7 @@ libfbsplashrender_la_SOURCES = \ + fbsplash.h + libfbsplashrender_la_CFLAGS = $(AM_CFLAGS) + libfbsplashrender_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(libfbsplashrender_version) +-libfbsplashrender_la_LIBADD = -lfbsplash ++libfbsplashrender_la_LIBADD = libfbsplash.la + + libfbsplashrender_la_CFLAGS += $(JPEG_CFLAGS) + libfbsplashrender_la_LIBADD += $(JPEG_LIBS) +@@ -258,10 +258,10 @@ fbcondecor_helper_LDFLAGS += -static + endif + + # Override automake's generation of target rules for building fbcondecor_helper. +-fbcondecor_helper: $(fbcondecor_helper_LDADD) $(fbcondecor_helper_OBJECTS) ++fbcondecor_helper: $(fbcondecor_helper_LDADD) $(fbcondecor_helper_OBJECTS) $(lib_LTLIBRARIES) + @$(call infmsg,LD,$@) + $(Q)$(MKDIR_P) $(@D) +- $(Q)$(KLCC) $(fbcondecor_helper_CFLAGS) $(fbcondecor_helper_LDFLAGS) $+ $(fbcondecor_helper_LDADD) -o $@ ++ $(Q)$(KLCC) $(fbcondecor_helper_CFLAGS) $(fbcondecor_helper_LDFLAGS) $(fbcondecor_helper_OBJECTS) $(fbcondecor_helper_LDADD) -o $@ + $(Q)$(STRIP) $@ + + # Override automake's generation of target rules for building fbcondecor_helper object files. + diff --git a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild index 401678dffcea..0d62e8b8172d 100644 --- a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild +++ b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.3 2008/12/28 22:55:23 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.4 2009/01/02 21:59:05 spock Exp $ EAPI="1" -inherit eutils multilib toolchain-funcs +inherit autotools eutils multilib toolchain-funcs MISCSPLASH="miscsplashutils-0.1.8" GENTOOSPLASH="splashutils-gentoo-1.0.16" @@ -84,11 +84,15 @@ src_unpack() { sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile" fi + epatch "${FILESDIR}"/splashutils-1.5.4.3-makefile.patch + if has_version ">=sys-apps/openrc-0.4.0"; then cd "${SG}" epatch "${FILESDIR}"/splashutils-openrc-0.4-fix.patch cd "${S}" fi + + eautoreconf } src_compile() { |