diff options
| -rw-r--r-- | media-gfx/fotoxx/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/fotoxx/Manifest | 33 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-11.08.1-docdir.patch | 8 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch | 20 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-12.08.patch | 34 | ||||
| -rw-r--r-- | media-gfx/fotoxx/fotoxx-12.08.ebuild (renamed from media-gfx/fotoxx/fotoxx-11.08.1.ebuild) | 21 |
6 files changed, 63 insertions, 62 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index e02b4ee5dac9..8161b4d66646 100644 --- a/media-gfx/fotoxx/ChangeLog +++ b/media-gfx/fotoxx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/fotoxx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.34 2012/06/08 11:48:27 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.35 2012/08/05 02:45:31 grozin Exp $ + +*fotoxx-12.08 (05 Aug 2012) + + 05 Aug 2012; Andrey Grozin <grozin@gentoo.org> -fotoxx-11.08.1.ebuild, + -files/fotoxx-11.08.1-docdir.patch, -files/fotoxx-11.08.1-makefile.patch, + +fotoxx-12.08.ebuild, +files/fotoxx-12.08.patch: + Version bump 08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> fotoxx-12.05.ebuild: x86 stable wrt bug #419065 diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest index 3d56fa91ac8b..f90ba3885d07 100644 --- a/media-gfx/fotoxx/Manifest +++ b/media-gfx/fotoxx/Manifest @@ -1,22 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -AUX fotoxx-11.08.1-docdir.patch 552 RMD160 d67a99dfb2f66f4e56dd516a965391fc5fba6183 SHA1 0a4d2196de9f2439514d8e98dc9eca1f89df2390 SHA256 d0aa130f9b1cd06e299a73922767cab712d2443c0f1f96b0179abb4e511ae282 -AUX fotoxx-11.08.1-makefile.patch 739 RMD160 8786c71dc6f4748ec26c55c7948cbd88a9103633 SHA1 c323f7b4fcad8dd3427189a68b32d6b58db97a9b SHA256 e76d6764113be7c51df2ceb61cba82fe4d95cc43a78c5ccdef5313f5a620162f -AUX fotoxx-12.05.patch 1469 RMD160 3aa49dddb2312981405e256483821e6576456923 SHA1 8b061d113188dc4c5d2e1a233fe7fe437f5e2e0f SHA256 1d0fdaf510f548ea4c65597271aa6b4cd30c264de1c706d72aeb4df4b221e2b7 -AUX fotoxx-12.06.1.patch 1469 RMD160 3aa49dddb2312981405e256483821e6576456923 SHA1 8b061d113188dc4c5d2e1a233fe7fe437f5e2e0f SHA256 1d0fdaf510f548ea4c65597271aa6b4cd30c264de1c706d72aeb4df4b221e2b7 -DIST fotoxx-11.08.1.tar.gz 1477220 RMD160 640ea896325383b495702577c274dfbd75e4dc5f SHA1 cad763c6e6b295166ad8c54c0f74ea0ad47e2254 SHA256 5d161f5311b7dadfb32c03bff6b97cafab1019ac462ea6bb8031c2ea1d341f70 -DIST fotoxx-12.05.tar.gz 1732834 RMD160 c6d8e1b205dbf7fd372fa50df6d55c1277258e96 SHA1 ea06867945aa22b3315326469d418959096460a6 SHA256 e6c3f8df138e5dc46373caa61d8efb04b5af17594b2db3d0f2344655694ef776 -DIST fotoxx-12.06.1.tar.gz 1793276 RMD160 f92add9963cc06aa9a4abb30a69416b08ff34437 SHA1 ff9d14c115f633ca3c74b9ccecd10036328576f0 SHA256 b6a51eeb054db3c105a04b1f65a91f80fc9043242c4d62ba5b2c1bfb1fa8b60b -EBUILD fotoxx-11.08.1.ebuild 1120 RMD160 f0b556812abcf1dfef6cfddd3423e6ca1e4bd0ce SHA1 5b8942c4487ef4780b51a0461ee4ecfe40c1fd2e SHA256 e0e29e109ef7c7f99f7396ed93501b1baab6cd44e0c6b9a52e4b20123f305189 -EBUILD fotoxx-12.05.ebuild 1072 RMD160 ed86d6fae00c120e3552d701c6380d075c4196ee SHA1 950c74f7470ca7acfe004c52f16985c1dfe1eacc SHA256 13dfb12b5d1075cca4b95547167555235ba3df3dffe1b3b7fa5ffcb593752198 -EBUILD fotoxx-12.06.1.ebuild 1072 RMD160 f0ea4a1f0c173c03d6c644278111ae92be41312b SHA1 8299a9314959fccf9bc29a783797e01cc9b7f640 SHA256 b072ac932821456e141608e55164cfdc8ca94a356874944023cbd10c1771e5a3 -MISC ChangeLog 6796 RMD160 86cd25b9174183a0e13a3789182a621f59eadbbb SHA1 2f78bef34229c21783ed853f065d3271ea9a9c09 SHA256 3c5625e5c4dbe9534391f54b7763a585a4c34f8a630c1fef7146f0b61c7e8109 -MISC metadata.xml 846 RMD160 38cd87d0455a77e2d4f4c8d3a3f0ef918ddf97ca SHA1 784b23036f4b98e161f2a499a04da565d24c5d6f SHA256 ff01900af25b8eff99bd0e031c99608cd77d762a293a0432fd2161ad30aee020 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEAREKAAYFAk/R5pEACgkQuUQtlDBCeQLhjwCffapzg6oHvZl3E+7Ush3EpzwR -9lAAn3aib5iCyuVARg1JidK/8+R33DnR -=0DYO ------END PGP SIGNATURE----- +AUX fotoxx-12.05.patch 1469 SHA256 1d0fdaf510f548ea4c65597271aa6b4cd30c264de1c706d72aeb4df4b221e2b7 SHA512 f3488dda7e0f342a5a7f10a9e4327a29cdb2a49f898fb59467c7bdae8518307524026f17dedab05368ed6c0786baef34101ab69e5df16e75cfcf59c0db71c251 WHIRLPOOL 30b6518bddd931ef611acd540d425d81b5f6d411516d6074fdee53f87800acbbff63c44f5d8a9cb8c46b742b40e5a5b8bc54641ef236fcc0be62e6380ddaa135 +AUX fotoxx-12.06.1.patch 1469 SHA256 1d0fdaf510f548ea4c65597271aa6b4cd30c264de1c706d72aeb4df4b221e2b7 SHA512 f3488dda7e0f342a5a7f10a9e4327a29cdb2a49f898fb59467c7bdae8518307524026f17dedab05368ed6c0786baef34101ab69e5df16e75cfcf59c0db71c251 WHIRLPOOL 30b6518bddd931ef611acd540d425d81b5f6d411516d6074fdee53f87800acbbff63c44f5d8a9cb8c46b742b40e5a5b8bc54641ef236fcc0be62e6380ddaa135 +AUX fotoxx-12.08.patch 1469 SHA256 1d0fdaf510f548ea4c65597271aa6b4cd30c264de1c706d72aeb4df4b221e2b7 SHA512 f3488dda7e0f342a5a7f10a9e4327a29cdb2a49f898fb59467c7bdae8518307524026f17dedab05368ed6c0786baef34101ab69e5df16e75cfcf59c0db71c251 WHIRLPOOL 30b6518bddd931ef611acd540d425d81b5f6d411516d6074fdee53f87800acbbff63c44f5d8a9cb8c46b742b40e5a5b8bc54641ef236fcc0be62e6380ddaa135 +DIST fotoxx-12.05.tar.gz 1732834 SHA256 e6c3f8df138e5dc46373caa61d8efb04b5af17594b2db3d0f2344655694ef776 +DIST fotoxx-12.06.1.tar.gz 1793276 SHA256 b6a51eeb054db3c105a04b1f65a91f80fc9043242c4d62ba5b2c1bfb1fa8b60b SHA512 bb6122e3ee04c342b5015bbcbd58b5fd09ccda459a095ce89bd834bcdfffe3a4d773b412937368a1d9b83d454718951e5afd29ada537b7d2fe048e68af1e77bd WHIRLPOOL 8524e6918e7a705bde446074070ad54089b653c943de09d6d1f56fca5f51bb4a3d7cc7e8589ecca45753cb039cad9555ae1d66f27111a86e7a46974004f59376 +DIST fotoxx-12.08.tar.gz 1800791 SHA256 3eb8503aa01889a1814bf15796276361108b2c99aac7216049c7f6d406ccbfcc SHA512 b141181772e5c61674237faf61a138443752dae30ae197dca9575504cc362eaeb12801070504990f831cb3941cd41b290ad35b494601810a56f7f77ba8e599ea WHIRLPOOL 7cbcbd0c8edb679ea31ab1d86236cc790e5e6b50227928d5c47e1c900653db397344c3c6278df6e86c77633a27bc61e63db42c08339ebb36a3fa01af594ee02c +EBUILD fotoxx-12.05.ebuild 1072 SHA256 13dfb12b5d1075cca4b95547167555235ba3df3dffe1b3b7fa5ffcb593752198 SHA512 49e012d35aff95f25aeccd4e52cccf935a3f86b098989518aa29521fd3ad1c60377f025b0deba7945e16f76cec40381e34c5435ff61dd557677241671d3d2ce5 WHIRLPOOL 845dfb9b5ba77f5ef5af45ab7bbdc70e656c3d8dfe64bc7561e549ddb37f79b6ffc8ecf2577fab9f4a6468b4c4c8b00d82ddbc5f43f5d6055d14438d08c3e532 +EBUILD fotoxx-12.06.1.ebuild 1072 SHA256 b072ac932821456e141608e55164cfdc8ca94a356874944023cbd10c1771e5a3 SHA512 4c0038fbd00cf8c3739e522b13c58e1c92c5b774a6ebc6bb9101bb06ef88832bc9f023a1d7b2db0065dd026ffc142d86f0b0ad52c60831d68c477d5f0837da2e WHIRLPOOL 0c2082799ab2475eba4c07727935b144b773732a92992c79a254068cd7c9824d2d6ea9c68aaf4dd06d99a22d4b42bfcb877f0d1bdf3d32c8c77a8bd55e446f5f +EBUILD fotoxx-12.08.ebuild 1014 SHA256 a523e4db6dbb15fb3ee0dfd8bafeb1695a0c417f90c7eeb192601faba32c991c SHA512 29c3016c9b6c72d249e26ebfb03e44fb5e0747a0ac1bc33e205f2a066ed8201de3ffd9b84d17e08111adf96ac99ea2b5ad9b018714796e6b3924f4abd1820640 WHIRLPOOL 7d058a4dccc069772310371bd332076be95dea5ad8f2bfe40d79eb374b61eb1770594ee2a9ed72063e0f9cb2c70b21794ee916161adc74bae2b7cbd98e609767 +MISC ChangeLog 7037 SHA256 fb417eb3617d1c297f6c7035010362f67de608b86939d88fec748dab4ff03243 SHA512 7d69cb03df41f8e855da2c00dadac0657341c5ab303523a5618bdcbb450022fa2f1e40e37d0f284c6c4e4095ef839ccd7194c97a49dec99b9846245dd419de15 WHIRLPOOL 11e2758cb2d7e97ede6c34637565b175bad51793fd1fb3a280ca8cd9e53aeb447d94953730f45c2d109ede71a230c69fabf30213b98c99e1055b15e3082e630a +MISC metadata.xml 846 SHA256 ff01900af25b8eff99bd0e031c99608cd77d762a293a0432fd2161ad30aee020 SHA512 cf07ba54bbfab28b27ca0549bc09539eb585704b9e034cfaee10e571a911b47ded675cc15a0e8b456a9684f9affb5f2cabe7167f6ccac8e8754b7dbcb6cc304e WHIRLPOOL b61518a0d0092d54bb88bd13ee3bff05eb2a94d8445607e3d9e09ae35a742fa3708c1efae7ef6cd54202095a16087c5e420729e30655d348aa6933df9db6750c diff --git a/media-gfx/fotoxx/files/fotoxx-11.08.1-docdir.patch b/media-gfx/fotoxx/files/fotoxx-11.08.1-docdir.patch deleted file mode 100644 index 4c54ba3169a5..000000000000 --- a/media-gfx/fotoxx/files/fotoxx-11.08.1-docdir.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -r -U1 fotoxx-11.06.orig/zfuncs.cc fotoxx-11.06/zfuncs.cc ---- fotoxx-11.06.orig/zfuncs.cc 2011-06-04 20:53:41.000000000 +0700 -+++ fotoxx-11.06/zfuncs.cc 2011-06-07 03:25:04.000000000 +0700 -@@ -2999,3 +2999,3 @@ - strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /installoc/share/appname/locales -- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /installoc/share/doc/appname -+ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /installoc/share/doc/appname - diff --git a/media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch deleted file mode 100644 index 7d0715062500..000000000000 --- a/media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -r -U1 fotoxx-11.08.1.orig/Makefile fotoxx-11.08.1/Makefile ---- fotoxx-11.08.1.orig/Makefile 2011-08-03 16:11:43.000000000 +0700 -+++ fotoxx-11.08.1/Makefile 2011-08-04 14:59:24.000000000 +0700 -@@ -5,4 +5,4 @@ - # defaults for parameters that may be pre-defined --CXXFLAGS ?= -O3 -g -Wall --LDFLAGS ?= -O3 -g -Wall -rdynamic -+CXXFLAGS += -Wall -+LDFLAGS += -rdynamic - PREFIX ?= /usr -@@ -15,3 +15,3 @@ - LOCALESDIR = $(SHAREDIR)/locales --DOCDIR = $(PREFIX)/share/doc/fotoxx -+DOCDIR = $(PREFIX)/share/doc/$(PF) - MANDIR = $(PREFIX)/share/man/man1 -@@ -20,3 +20,3 @@ - --CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` -+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-2.0` - LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` diff --git a/media-gfx/fotoxx/files/fotoxx-12.08.patch b/media-gfx/fotoxx/files/fotoxx-12.08.patch new file mode 100644 index 000000000000..d1ce6b3261fd --- /dev/null +++ b/media-gfx/fotoxx/files/fotoxx-12.08.patch @@ -0,0 +1,34 @@ +diff -r -U1 fotoxx-12.03.orig/Makefile fotoxx-12.03/Makefile +--- fotoxx-12.03.orig/Makefile 2012-03-01 01:57:48.000000000 +0700 ++++ fotoxx-12.03/Makefile 2012-03-03 03:56:44.000000000 +0700 +@@ -5,4 +5,4 @@ + # defaults for parameters that may be pre-defined +-CXXFLAGS ?= -O3 -g -Wall -Wno-deprecated-declarations +-LDFLAGS ?= -O3 -g -Wall -rdynamic ++CXXFLAGS += -Wall -Wno-deprecated-declarations ++LDFLAGS += -rdynamic + PREFIX ?= /usr +@@ -14,3 +14,3 @@ + LOCALESDIR = $(SHAREDIR)/locales +-DOCDIR = $(PREFIX)/share/doc/fotoxx ++DOCDIR = $(PREFIX)/share/doc/$(PF) + MANDIR = $(PREFIX)/share/man/man1 +@@ -18,3 +18,3 @@ + +-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` ++CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0` + LIBS = `pkg-config --libs gtk+-3.0` +@@ -77,5 +77,2 @@ + rm -f fotoxx.1.gz +- # menu (desktop) file +- cp -f desktop $(DESTDIR)$(MENUFILE) +- xdg-desktop-menu install $(DESTDIR)$(MENUFILE) + +diff -r -U1 fotoxx-12.03.orig/zfuncs.cc fotoxx-12.03/zfuncs.cc +--- fotoxx-12.03.orig/zfuncs.cc 2012-03-01 01:57:48.000000000 +0700 ++++ fotoxx-12.03/zfuncs.cc 2012-03-03 03:58:13.000000000 +0700 +@@ -3194,3 +3194,3 @@ + strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales +- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname ++ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/${PF} + diff --git a/media-gfx/fotoxx/fotoxx-11.08.1.ebuild b/media-gfx/fotoxx/fotoxx-12.08.ebuild index b1a13491477c..0c737ea9819a 100644 --- a/media-gfx/fotoxx/fotoxx-11.08.1.ebuild +++ b/media-gfx/fotoxx/fotoxx-12.08.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.08.1.ebuild,v 1.3 2011/09/11 09:30:08 maekke Exp $ -EAPI=3 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-12.08.ebuild,v 1.1 2012/08/05 02:45:31 grozin Exp $ +EAPI=4 inherit eutils toolchain-funcs DESCRIPTION="Program for improving image files made with a digital camera." -HOMEPAGE="http://kornelix.squarespace.com/fotoxx" -SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz" +HOMEPAGE="http://www.kornelix.com/fotoxx.html" +SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="x11-libs/gtk+:2 +DEPEND="x11-libs/gtk+:3 media-libs/tiff" RDEPEND="${DEPEND} media-libs/exiftool @@ -21,19 +21,18 @@ RDEPEND="${DEPEND} x11-misc/xdg-utils" src_prepare() { - epatch "${FILESDIR}"/${PF}-makefile.patch - epatch "${FILESDIR}"/${PF}-docdir.patch + epatch "${FILESDIR}"/${PF}.patch } src_compile() { tc-export CXX - emake || die "emake failed" + emake } src_install() { # For the Help menu items to work, *.html must be in /usr/share/doc/${PF}, # and README, CHANGES, TRANSLATIONS must not be compressed - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install make_desktop_entry ${PN} "Fotoxx" /usr/share/${PN}/icons/${PN}.png \ "Application;Graphics;2DGraphics" } |