diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-25 16:15:38 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-25 16:15:38 +0000 |
| commit | d21c66293f2c221df30e3142c29126cb47f93395 (patch) | |
| tree | 1f9a5d704763e884fa7e58d8f1eeb5f436dcc8dc /media-video/subtitleripper | |
| parent | Adjust 1.8.4 deps for gtk-sharp-2.12.6 (diff) | |
| download | historical-d21c66293f2c221df30e3142c29126cb47f93395.tar.gz historical-d21c66293f2c221df30e3142c29126cb47f93395.tar.bz2 historical-d21c66293f2c221df30e3142c29126cb47f93395.zip | |
Add patch to fix linking order, closes bug #246862.
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64
Diffstat (limited to 'media-video/subtitleripper')
4 files changed, 51 insertions, 5 deletions
diff --git a/media-video/subtitleripper/ChangeLog b/media-video/subtitleripper/ChangeLog index 7d86731fd0fd..14a827c06334 100644 --- a/media-video/subtitleripper/ChangeLog +++ b/media-video/subtitleripper/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/subtitleripper # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.14 2008/04/11 19:18:30 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/ChangeLog,v 1.15 2008/11/25 16:15:38 flameeyes Exp $ + + 25 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> + +files/subtitleripper-0.3.4-linkingorder.patch, + subtitleripper-0.3.4-r3.ebuild: + Add patch to fix linking order, closes bug #246862. 11 Apr 2008; Ben de Groot <yngwin@gentoo.org> subtitleripper-0.3.4-r3.ebuild: diff --git a/media-video/subtitleripper/Manifest b/media-video/subtitleripper/Manifest index a7d65153ade0..6031d7c980ce 100644 --- a/media-video/subtitleripper/Manifest +++ b/media-video/subtitleripper/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX subtitleripper-0.3.4-linkingorder.patch 732 RMD160 9a9273f6735c95b31391316fc2411369fd20f224 SHA1 fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7 SHA256 fe79f5aa9626cd39346f805d2514e3253ed0e5c239741a01c30e715b1b57fd54 DIST subtitleripper-0.3-4.tgz 47299 RMD160 141355960773ab2dfe3782522858273d197cf797 SHA1 d93ff3578dd5f722c8f4ef16bc0903eec5781a0d SHA256 8af6c2ebe55361900871c731ea1098b1a03efa723cd29ee1d471435bd21f3ac4 EBUILD subtitleripper-0.3.4-r1.ebuild 1285 RMD160 09540b8be67f161ea0c4f0b5f8e85d8c84c8d745 SHA1 f7e7e92d35e83b9d68cd873ab233e175701403e6 SHA256 19ccdde392801a907df312fb5686b6f27d5fb2b409ca95a7b19ef66c3080e957 -EBUILD subtitleripper-0.3.4-r3.ebuild 1196 RMD160 899ccabd50fa7c7aa2990b5c05246ace25d42bad SHA1 1221ef6aba4537e5fdc1b070b9dce7e50bfc7b1f SHA256 5cddabb478be7e3916ad46bb9961c02c63eee2e33fdac469ed86aeeff4ecc970 -MISC ChangeLog 2293 RMD160 348c3170befe9d9348cddb8ec2d52444d4919fb3 SHA1 92033331ac93960c1159708acac4ba4e14cf8890 SHA256 338b73e6d6737f6fb415ef1c6e910451d90fbb8273d569f87dd03a3bfaca83f5 +EBUILD subtitleripper-0.3.4-r3.ebuild 1253 RMD160 5df728258c2f3334dbed8e9f1ca82e2d2acacf85 SHA1 bb1fcd1082d7e74995b8223d80bb8cf8ad020a77 SHA256 3f2db575ed11cbef76d545985975a6cc1671c86c18171f9d65c451afb3581c9b +MISC ChangeLog 2491 RMD160 e195bb2c2279e4142308ee34098b67eb35a5ca27 SHA1 d3605805194209fa58d47a2824bdf502f80ec06d SHA256 98193e224e3d39d71e3e04168fc4863629454e4b4c3f2aca5dfd6b3423fc3030 MISC metadata.xml 228 RMD160 f46510d126d427224df28e4140e05412ad589db5 SHA1 c8d8cbd730e5661e6570d70a2b5f57e945241834 SHA256 6f5a94dbd7a65c9076fc1378c6ae86969579e11d1b8cd1ed5de3cb8fbd9fc83c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkksJL0ACgkQAiZjviIA2Xg8TACdHLLujGEgQhPqAfyR/J5vviC7 +rN4An08EH6iDx7vh0oYwhIq5IzRDNm3h +=AMdt +-----END PGP SIGNATURE----- diff --git a/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch b/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch new file mode 100644 index 000000000000..7efe223460fc --- /dev/null +++ b/media-video/subtitleripper/files/subtitleripper-0.3.4-linkingorder.patch @@ -0,0 +1,28 @@ +Index: subtitleripper/Makefile +=================================================================== +--- subtitleripper.orig/Makefile ++++ subtitleripper/Makefile +@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud + # Target + subtitle2pgm: subtitle2pgm.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + subtitle2vobsub: subtitle2vobsub.o vobsub.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + srttool: srttool.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + .PHONY: clean dist rpm + clean: diff --git a/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild b/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild index f1a6e82e20b8..2a85b2302b16 100644 --- a/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild +++ b/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild,v 1.2 2008/04/11 19:18:30 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleripper/subtitleripper-0.3.4-r3.ebuild,v 1.3 2008/11/25 16:15:38 flameeyes Exp $ -inherit versionator +inherit versionator eutils MY_PV="$(replace_version_separator 2 "-")" @@ -30,6 +30,8 @@ src_unpack() { sed -i -e "s:#include <ppm.h>:#include <netpbm/ppm.h>:g" spudec.c subtitle2pgm.c # we will install the gocrfilters into /usr/share/subtitleripper sed -i -e 's:~/sourceforge/subtitleripper/src/:/usr/share/subtitleripper:' pgm2txt + + epatch "${FILESDIR}/${P}-linkingorder.patch" } src_install () { |