diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-11-13 20:59:56 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-11-13 20:59:56 +0000 |
| commit | 5246262d33c8f8c37186dc2f5f65116727d32f8f (patch) | |
| tree | 2b2493ea14d4201f026ba47fb473ab51785c83a7 | |
| parent | try to apply existing patches (diff) | |
| download | prefix-5246262d33c8f8c37186dc2f5f65116727d32f8f.tar.gz prefix-5246262d33c8f8c37186dc2f5f65116727d32f8f.tar.bz2 prefix-5246262d33c8f8c37186dc2f5f65116727d32f8f.zip | |
Add fixed patch, thanks Charles Davis in bug #343603
(Portage version: 2.2.01.17168-prefix/svn/Darwin powerpc)
| -rw-r--r-- | media-sound/gsm/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/gsm/files/gsm-1.0.13-darwin.patch (renamed from media-sound/gsm/files/gsm-1.0.12-darwin.patch) | 20 | ||||
| -rw-r--r-- | media-sound/gsm/gsm-1.0.13.ebuild | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest index 6545f90bf8..b86c692a09 100644 --- a/media-sound/gsm/Manifest +++ b/media-sound/gsm/Manifest @@ -1,9 +1,9 @@ AUX gsm-1.0.12-64bit.patch 591 RMD160 fe48ec8dce98db335118ae699a2bb8d6d10931bf SHA1 949ec26ccd9aaa9a7f09806c7ae0a71a3724afe3 SHA256 1204cf390608e866a7aa06099998a754afdf33095b89ea4bcd0ddeeb699bba84 -AUX gsm-1.0.12-darwin.patch 1430 RMD160 24f6309240900d5e0a63146cfaf8c399a33d0e01 SHA1 79fcbc85165b601d48592003053aebfcd26a8bb4 SHA256 f8008de925b0447e12b5bd80b760ad41d4c71b962d35fb67d3b11b0900802d5c AUX gsm-1.0.12-memcpy.patch 301 RMD160 21c1e4c83046bff547f2bae1b14758dfeeca4a3b SHA1 fe6d55433de5775ff7ec2f4e5b8e65b1375b0390 SHA256 3d6637db82d739c89cb4127bd28ce9d5b97cee7f27862943952d130a0fb6e9fe AUX gsm-1.0.12-shared.patch 3713 RMD160 6d9cd3e0e6eb7354900b990aa6e195cc12e8e733 SHA1 d2e08db4e95fa96661e989b59318e3eca06e01d2 SHA256 30661e6f947e74ce2f1c42452d666e76175e18269490d5adfa695bad3cf4ff47 +AUX gsm-1.0.13-darwin.patch 1430 RMD160 d085a7678b2894db1127487c578a725a7104ac1e SHA1 445022d25a3f2e2bf4ec671fa3f8e4dd1f5d7c7b SHA256 df4c2793eeb7efb00e516f691df83015f4f8abae1d54d2a09d23e4f55911d094 AUX gsm-1.0.13-shared.patch 3723 RMD160 ec8970abb71622dbde4c1ee43f16b7a70efc1474 SHA1 827c552d16bca2ef71bb10ef1bdecc0adad5be00 SHA256 806dc90827785625e73048f1aa39b8c182c55a466c07a66be8883469be72c0af DIST gsm-1.0.13.tar.gz 65318 RMD160 e44f70d481328038b3b16a25cc99b7855113db61 SHA1 668b0a180039a50d379b3d5a22e78da4b1d90afc SHA256 52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad -EBUILD gsm-1.0.13.ebuild 1724 RMD160 4c537ea5a99e92e63273954eb060625b2745a3a1 SHA1 b44a7bd753d00eb319a815d009e3c2ae4cdc0d49 SHA256 e45daa14643405408dc12d36ee369488d5ae09b0980ced8af9a968902bdce446 +EBUILD gsm-1.0.13.ebuild 1716 RMD160 0c774309ac110900aaa03f0eeaf15456d5c180ff SHA1 5599caa43aeae79ca497d52c2a84c73582c9e189 SHA256 1802fd88cc121177f2e5b2e161eb2a366fd3faffb0fe53e240a8a7057d30769c MISC ChangeLog 4739 RMD160 349ce82a6fe3839a296752281eae279a16216d80 SHA1 e658feabd5faeb2074fed6a79e92748576d7cb6c SHA256 8f57f020f29885a9ed8009a93b76a2e079ccb6a4745e0ecf60d218d86141fb7c MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b diff --git a/media-sound/gsm/files/gsm-1.0.12-darwin.patch b/media-sound/gsm/files/gsm-1.0.13-darwin.patch index f4015428ee..fae9e1f1de 100644 --- a/media-sound/gsm/files/gsm-1.0.12-darwin.patch +++ b/media-sound/gsm/files/gsm-1.0.13-darwin.patch @@ -1,7 +1,7 @@ * lazy dylib building ---- gsm-1.0-pl12/Makefile -+++ gsm-1.0-pl12/Makefile +--- gsm-1.0-pl13/Makefile ++++ gsm-1.0-pl13/Makefile @@ -140,7 +140,7 @@ # Targets @@ -15,12 +15,12 @@ # The basic API: libgsm $(LIBGSMSO): $(LIB) $(SHARED_GSM_OBJECTS) -- $(LD) -o $@.1.0.12 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc -- ln -fs libgsm.so.1.0.12 lib/libgsm.so.1 -- ln -fs libgsm.so.1.0.12 lib/libgsm.so -+ $(LD) -o $(LIB)/$@.1.0.12.dylib -dynamiclib -install_name $(GSM_INSTALL_LIB)/$@.1.dylib $(SHARED_GSM_OBJECTS) -lc -+ ln -fs libgsm.1.0.12.dylib lib/libgsm.1.dylib -+ ln -fs libgsm.1.0.12.dylib lib/libgsm.dylib +- $(LD) -o $@.1.0.13 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc +- ln -fs libgsm.so.1.0.13 lib/libgsm.so.1 +- ln -fs libgsm.so.1.0.13 lib/libgsm.so ++ $(LD) -o $(LIB)/$@.1.0.13.dylib -dynamiclib -install_name $(GSM_INSTALL_LIB)/$@.1.dylib $(SHARED_GSM_OBJECTS) -lc ++ ln -fs libgsm.1.0.13.dylib lib/libgsm.1.dylib ++ ln -fs libgsm.1.0.13.dylib lib/libgsm.dylib $(LIBGSM): $(LIB) $(STATIC_GSM_OBJECTS) -rm $(RMFLAGS) $(LIBGSM) @@ -37,9 +37,9 @@ clean: semi-clean -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ -- $(LIBGSMSO) $(LIB)/libgsm.so.1.0.12 \ +- $(LIBGSMSO) $(LIB)/libgsm.so.1.0.13 \ - $(LIB)libgsm.so.1 \ -+ $(LIB)/$(LIBGSMSO).dylib $(LIB)/libgsm.1.0.12.dylib \ ++ $(LIB)/$(LIBGSMSO).dylib $(LIB)/libgsm.1.0.13.dylib \ + $(LIB)libgsm.1.dylib \ $(TOAST) $(TCAT) $(UNTOAST) \ $(ROOT)/gsm-1.0.tar.Z diff --git a/media-sound/gsm/gsm-1.0.13.ebuild b/media-sound/gsm/gsm-1.0.13.ebuild index 3bf0e222fb..f3af1dcc8e 100644 --- a/media-sound/gsm/gsm-1.0.13.ebuild +++ b/media-sound/gsm/gsm-1.0.13.ebuild @@ -20,7 +20,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-shared.patch \ "${FILESDIR}"/${PN}-1.0.12-memcpy.patch \ "${FILESDIR}"/${PN}-1.0.12-64bit.patch - [[ ${CHOST} == *-darwin* ]] && epatch "${FILESDIR}"/${PN}-1.0.12-darwin.patch + [[ ${CHOST} == *-darwin* ]] && epatch "${FILESDIR}"/${P}-darwin.patch } src_compile() { |