From 468245a38e4dbacc9dee74559c5c04c4337fbf20 Mon Sep 17 00:00:00 2001 From: Mark Loeser Date: Wed, 7 Jun 2006 23:55:32 +0000 Subject: [PATCH] Add patch to fix compilation on amd64; bug #135984 Package-Manager: portage-2.1_rc3-r5 --- media-libs/libpano12/ChangeLog | 6 ++- media-libs/libpano12/Manifest | 26 ++++++---- .../libpano12-2.8.3-insertfilename.patch | 50 +++++++++++++++++++ media-libs/libpano12/libpano12-2.8.3.ebuild | 8 ++- 4 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch diff --git a/media-libs/libpano12/ChangeLog b/media-libs/libpano12/ChangeLog index 68be9e6a14b2..01e5e811cea8 100644 --- a/media-libs/libpano12/ChangeLog +++ b/media-libs/libpano12/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libpano12 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.13 2006/06/06 01:10:49 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/ChangeLog,v 1.14 2006/06/07 23:55:32 halcy0n Exp $ + + 07 Jun 2006; Mark Loeser + +files/libpano12-2.8.3-insertfilename.patch, libpano12-2.8.3.ebuild: + Add patch to fix compilation on amd64; bug #135984 *libpano12-2.8.3 (06 Jun 2006) diff --git a/media-libs/libpano12/Manifest b/media-libs/libpano12/Manifest index 34d36c34f442..a1719a07b20d 100644 --- a/media-libs/libpano12/Manifest +++ b/media-libs/libpano12/Manifest @@ -9,6 +9,10 @@ AUX libpano12-2.7.0.9-dejava.patch 2164 RMD160 5f9a4b8ae223ef62707434e58bce0b4ae MD5 17789ccb47f8831dd2716c6bb3d18ee4 files/libpano12-2.7.0.9-dejava.patch 2164 RMD160 5f9a4b8ae223ef62707434e58bce0b4ae2d3f24d files/libpano12-2.7.0.9-dejava.patch 2164 SHA256 f088f226642e36de11d93f91278b65d7dab61f85b6a124800b8e92d3e1fdf1aa files/libpano12-2.7.0.9-dejava.patch 2164 +AUX libpano12-2.8.3-insertfilename.patch 1230 RMD160 66537d46141253b592816d0d44525829f24e7b28 SHA1 26649554406467b207465477ebe983ec9696075b SHA256 1957d6d681f4a5780661a374c03b847554b4b2d6bb887c24f29c8da86f69ff64 +MD5 f061abc59941331f9c300a684f8c8fd6 files/libpano12-2.8.3-insertfilename.patch 1230 +RMD160 66537d46141253b592816d0d44525829f24e7b28 files/libpano12-2.8.3-insertfilename.patch 1230 +SHA256 1957d6d681f4a5780661a374c03b847554b4b2d6bb887c24f29c8da86f69ff64 files/libpano12-2.8.3-insertfilename.patch 1230 DIST libpano12-2.7.0.10.tar.bz2 445638 DIST libpano12-2.7.0.14.tar.bz2 487861 RMD160 504392c66a143c78234348192905265d3aeb9f20 SHA1 e2857f3d8cf8e84333f95afebfe6770dd1fd8e87 SHA256 7786d9513ae3beab0afa47c77915582bd72b45065841bc949a63cedad0f9c4f4 DIST libpano12-2.8.3.tar.gz 692261 RMD160 ff44cbcecdbea0ad9481f6169a7ef6b80b5c3905 SHA1 aa60c4d21ca815ffbe46b3dd82cb5e8ed931e914 SHA256 faf67329e4b79b919d8893488d083c045f0b508f8a91958a433f81fd1fe02cfd @@ -20,14 +24,14 @@ EBUILD libpano12-2.7.0.14.ebuild 1016 RMD160 3d3c457025f3dab26188b2a12b2f0389a00 MD5 9be730ebbc38445d5f988cae6c5c816e libpano12-2.7.0.14.ebuild 1016 RMD160 3d3c457025f3dab26188b2a12b2f0389a0056f3b libpano12-2.7.0.14.ebuild 1016 SHA256 3dbcbd05d989d062bfd435bf71c88febf9391d9ba96bf2a635c6f15c71bfafe9 libpano12-2.7.0.14.ebuild 1016 -EBUILD libpano12-2.8.3.ebuild 930 RMD160 ab6ace354833b51851bfe3d4e018746509d37475 SHA1 a8f20453ac86c6ed691ee49f2e2b794720789094 SHA256 42d00d45c513f3699b12ccda55491a56374b2796cdb403fbd30af22deced056c -MD5 f504b0963d5d401557a8579f1aef0e30 libpano12-2.8.3.ebuild 930 -RMD160 ab6ace354833b51851bfe3d4e018746509d37475 libpano12-2.8.3.ebuild 930 -SHA256 42d00d45c513f3699b12ccda55491a56374b2796cdb403fbd30af22deced056c libpano12-2.8.3.ebuild 930 -MISC ChangeLog 2364 RMD160 7cf30c89046f37d94fdacdf4e4c6189616367638 SHA1 5fe88f7b80783fe759081705575d703dba46556c SHA256 e630624b4982cbc92ae61646240ee8b3dd6e49fc5533c17ff7e9163aa1261283 -MD5 4cb434d0e51b3513b7bd0d2fe158589b ChangeLog 2364 -RMD160 7cf30c89046f37d94fdacdf4e4c6189616367638 ChangeLog 2364 -SHA256 e630624b4982cbc92ae61646240ee8b3dd6e49fc5533c17ff7e9163aa1261283 ChangeLog 2364 +EBUILD libpano12-2.8.3.ebuild 1020 RMD160 63cd88eb72f442b555dd63129233c8a29adfd029 SHA1 3ac4301d8c100f700329e5da3535a2ea77f1e51a SHA256 a08740f1484d2d8ec9cbbf1c4627e1c675b9390166064c5ff50bbd7c2e283d7a +MD5 2fbe61a159d1bbde0d46f7580719a7bd libpano12-2.8.3.ebuild 1020 +RMD160 63cd88eb72f442b555dd63129233c8a29adfd029 libpano12-2.8.3.ebuild 1020 +SHA256 a08740f1484d2d8ec9cbbf1c4627e1c675b9390166064c5ff50bbd7c2e283d7a libpano12-2.8.3.ebuild 1020 +MISC ChangeLog 2537 RMD160 ec228dc1d2a9a488c577c7c9835bfd57c3a4873d SHA1 21424fd510cb89c22edf8dcf7013590aa4ecd9a3 SHA256 e71e2307ddd7ccad98ff8e433df3c9cc54e0df980f0ede5261c41d4aa84d138a +MD5 241034685851753d09942bf38e3a205e ChangeLog 2537 +RMD160 ec228dc1d2a9a488c577c7c9835bfd57c3a4873d ChangeLog 2537 +SHA256 e71e2307ddd7ccad98ff8e433df3c9cc54e0df980f0ede5261c41d4aa84d138a ChangeLog 2537 MISC metadata.xml 254 RMD160 07f27c4535f9f37ba61b2dff17d6bdab331fbf80 SHA1 55afe3df135a720c19d94a4e549dbb8cd813a4f5 SHA256 f10be72de77f708fc7ccdba9f1f17a9bcf0ba71e27fbd1eeea593e9356a88430 MD5 ab09b5a061b6df1918d1fc2f28ede35f metadata.xml 254 RMD160 07f27c4535f9f37ba61b2dff17d6bdab331fbf80 metadata.xml 254 @@ -44,7 +48,7 @@ SHA256 61b0c7fce1350e03900c3e3ebf41aca3771738d37878dab00dc6a4d8dd8b8fe5 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEhNYuCRZPokWLroQRAn9HAJ4l3JP5cJ4oIeqWIaICVt2VNJOJNgCgodtM -YssP3dmrHokTDvQtEqFsp9w= -=Zk3d +iD8DBQFEh2d+CRZPokWLroQRAmAnAKC9eqPWPJR+D+ny/HSxRiD4309l1wCfW+yq +0aAZqodQ+tyudLjWqc05/c4= +=wtw3 -----END PGP SIGNATURE----- diff --git a/media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch b/media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch new file mode 100644 index 000000000000..d0cd1eec42b4 --- /dev/null +++ b/media-libs/libpano12/files/libpano12-2.8.3-insertfilename.patch @@ -0,0 +1,50 @@ +--- PTcommon.c 2006/06/04 21:43:30 1.17 ++++ PTcommon.c 2006/06/06 19:55:49 1.18 +@@ -52,6 +52,18 @@ + + int ptQuietFlag = 0; + ++void InsertFileName( fullPath *fp, char *fname ){ ++#ifdef __Mac__ ++ strcpy( (char*)(fp->name), fname ); ++ c2pstr( (char*)(fp->name)); ++#else ++ char *c = strrchr((char*)(fp->name), PATH_SEP); ++ if(c != NULL) c++; ++ else c = fp->name; ++ strcpy( c, fname ); ++#endif ++} ++ + void tiffErrorHandler(const char* module, const char* fmt, va_list ap) + { + PrintError("Error in TIFF file (%s) ", module); +--- ptpicker.c 2005/05/07 15:17:07 1.9 ++++ ptpicker.c 2006/06/06 19:55:49 1.10 +@@ -11,7 +11,6 @@ + int loadProject( fullPath *fspec ); + int writeProject( AlignInfo *g, fullPath *pFile); + int jpathTofullPath( const char* jpath, fullPath *fp ); +-void InsertFileName( fullPath *fp, char *fname ); + void BackUp(); + void Restore(); + void SetAlignInfoDefaults( AlignInfo *a); +@@ -975,18 +974,6 @@ + return result; + } + +-void InsertFileName( fullPath *fp, char *fname ){ +-#ifdef __Mac__ +- strcpy( (char*)(fp->name), fname ); +- c2pstr( (char*)(fp->name)); +-#else +- char *c = strrchr((char*)(fp->name), PATH_SEP); +- if(c != NULL) c++; +- else c = fp->name; +- strcpy( c, fname ); +-#endif +-} +- + void BackUp() + { + int i; diff --git a/media-libs/libpano12/libpano12-2.8.3.ebuild b/media-libs/libpano12/libpano12-2.8.3.ebuild index ce9bad821d7a..f7ed6e9e7691 100644 --- a/media-libs/libpano12/libpano12-2.8.3.ebuild +++ b/media-libs/libpano12/libpano12-2.8.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/libpano12-2.8.3.ebuild,v 1.1 2006/06/06 01:10:49 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libpano12/libpano12-2.8.3.ebuild,v 1.2 2006/06/07 23:55:32 halcy0n Exp $ inherit eutils @@ -19,6 +19,12 @@ DEPEND="media-libs/libpng S="${WORKDIR}/libpano12-${PV}" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-insertfilename.patch +} + src_compile() { local myconf="" use java \ -- 2.26.2