From ca30352445f61898ac464842a7d30f533d8f762d Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 8 Mar 2010 22:41:52 +0000 Subject: [PATCH] Version bump, fixes usage of libjpeg, bug #306341. Package-Manager: portage-2.2_rc65/cvs/Linux x86_64 --- media-gfx/gthumb/ChangeLog | 11 ++- media-gfx/gthumb/Manifest | 17 ++++- .../files/gthumb-2.11.2.1-configure.patch | 37 ++++++++++ media-gfx/gthumb/gthumb-2.11.2.1.ebuild | 67 +++++++++++++++++++ media-gfx/gthumb/metadata.xml | 11 ++- media-gfx/pngtools/Manifest | 15 +---- 6 files changed, 136 insertions(+), 22 deletions(-) create mode 100644 media-gfx/gthumb/files/gthumb-2.11.2.1-configure.patch create mode 100644 media-gfx/gthumb/gthumb-2.11.2.1.ebuild diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog index 2e08a7e1ff40..13f039efe151 100644 --- a/media-gfx/gthumb/ChangeLog +++ b/media-gfx/gthumb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/gthumb -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.103 2009/05/23 16:08:58 ssuominen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.104 2010/03/08 22:41:51 eva Exp $ + +*gthumb-2.11.2.1 (08 Mar 2010) + + 08 Mar 2010; Gilles Dartiguelongue + +gthumb-2.11.2.1.ebuild, +files/gthumb-2.11.2.1-configure.patch, + metadata.xml: + Version bump, fixes usage of libjpeg, bug #306341. 23 May 2009; Samuli Suominen gthumb-2.10.11.ebuild: Remove comment about unused gtkunique depend wrt #268722, which has been diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index 1d6dc4878ed8..a7b2acc0d584 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -1,6 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX gthumb-2.11.2.1-configure.patch 1030 RMD160 69f996cec1473ec0bcbe5f35822de09f1afdab2e SHA1 68151dfb026af923cf0a1f59a1c09942711a0fd3 SHA256 a146e4ea4df9763693182ee9d702fd263f5593912ba47d233b172d8adbf129c5 DIST gthumb-2.10.10.tar.bz2 2488828 RMD160 aec19b92c6880706beb35eb80dd328c16e2c5258 SHA1 226f8f413fbe31081f19efad85aee114281de6ec SHA256 4d9e4813699c9ff274a4e8a808f04f9347354bf3af668f90f35f79da9f3161af DIST gthumb-2.10.11.tar.bz2 2839510 RMD160 ceaef54c96cc6dbea23fe6c461d26b685b13778a SHA1 a9c133f3a652249329da8b5be8ff08dfec0ded9f SHA256 68ac6835afdbe32cba09504b4d61ad4f5d98a97776bfb58698338add56eb520e +DIST gthumb-2.11.2.1.tar.bz2 3286902 RMD160 b9b23fffe5bb11d6da795c5eca34bb90150a6346 SHA1 4d5e2710df942b92928162789a9a466c599abd96 SHA256 647cd2e0855817c3091b606bed130da1113545b459755b809177c8d883876312 EBUILD gthumb-2.10.10.ebuild 1331 RMD160 2da05aca0e8743fd952be579aa93dedb270919f5 SHA1 baf1b45c0aad8ec1c9a89c00b3b7302d4a6653ab SHA256 6d032485674ff6a7b556de8735ffc792c7eb82efdd8055a4a03e0518e02440b1 EBUILD gthumb-2.10.11.ebuild 1480 RMD160 e50c762b6c2cabeea4a01f1bc779af55b559f260 SHA1 be531cb4aa9d669c1099fe1da20af29d7cb309ad SHA256 65b275959c7a26be96c40faad934ab25ccba00f26228f2f66358ad2f0f6751fa -MISC ChangeLog 15066 RMD160 cafa0255bfa20de3f31a0870aff6a6540a3806d2 SHA1 7cd4a9f58f39884876fa3bd3aec2ecd61b5c1aca SHA256 300beab397b74cd18584afd46418eea338625365e822b9aafca07746dbac783c -MISC metadata.xml 232 RMD160 26e89fd3270dde585d371f14bcfe45031eabd696 SHA1 c8d186f3747bc8c28d4bc7a510b7bb6376fa4fd4 SHA256 57e23fd4efe93011be4d05a43312eee1980b17b9e60239ad9e1d67cb45cfd900 +EBUILD gthumb-2.11.2.1.ebuild 1690 RMD160 6e7f5e028e35aabca608b438b4484f01ca8622a4 SHA1 5261ced9203b436c38725be19a9a950771617dca SHA256 7276288e5b8dfc54d43d8c9a25d331a9fcb902a86ce13b039d8e4dcfb089e782 +MISC ChangeLog 15283 RMD160 dc026e1144d7e196da42738fa4ee75127246c9fb SHA1 9c3621742fe8c21450f7f5c3a5ddae98390e62a0 SHA256 84631d812336d594b746ebf43cc3298f3565eaf7e60a338584977c1090d99948 +MISC metadata.xml 324 RMD160 ad0ae8082e3497c9221f5c645b597d2a2d92100b SHA1 4888197e15660722e1de31d2bc30d7c2e9edd584 SHA256 003d0bb01f42f679dbb5f6ba71faf6d1aeaf04a41a9e633b17b974af9cf98a70 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkuVfTUACgkQ1fmVwcYIWAblrgCguoiRhhqvxUITd8g73HTSUf19 +6AkAnRYbi9L4kOi+I6yWiJ5rapUK2+Sh +=p9KL +-----END PGP SIGNATURE----- diff --git a/media-gfx/gthumb/files/gthumb-2.11.2.1-configure.patch b/media-gfx/gthumb/files/gthumb-2.11.2.1-configure.patch new file mode 100644 index 000000000000..6eee22d09722 --- /dev/null +++ b/media-gfx/gthumb/files/gthumb-2.11.2.1-configure.patch @@ -0,0 +1,37 @@ +From 62639364a104859e693cfe3a52f1555db646c08e Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Mon, 8 Mar 2010 22:49:04 +0100 +Subject: [PATCH] Revert "fix build problems with libunique and -DGTK_DISABLE_SINGLE_INCLUDES compiler flag" + +Gentoo: This is not a problem as we do not compile with deprecated code +directives. + +This reverts commit e494be096231cc676cebf23cc4f28dddda6e8d1a. +--- + configure.ac | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8aaddb1..cd956ea 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -51,7 +51,6 @@ CLUTTER_REQUIRED=1.0.0 + CLUTTER_GTK_REQUIRED=0.10.0 + GSTREAMER_REQUIRED=0.10 + OPENRAW_REQUIRED=0.0.8 +-UNIQUE_REQUIRED=1.1.2 + LIBSOUP_REQUIRED=2.26 + GNOME_KEYRING_REQUIRED=2.28 + +@@ -120,7 +119,7 @@ PKG_CHECK_MODULES(GTHUMB, [ + gio-unix-2.0 + gtk+-2.0 >= $GTK_REQUIRED + gconf-2.0 >= $GCONF_REQUIRED +- unique-1.0 >= $UNIQUE_REQUIRED ++ unique-1.0 + ]) + AC_SUBST(GTHUMB_LIBS) + AC_SUBST(GTHUMB_CFLAGS) +-- +1.7.0 + diff --git a/media-gfx/gthumb/gthumb-2.11.2.1.ebuild b/media-gfx/gthumb/gthumb-2.11.2.1.ebuild new file mode 100644 index 000000000000..9e0279e102b0 --- /dev/null +++ b/media-gfx/gthumb/gthumb-2.11.2.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.11.2.1.ebuild,v 1.1 2010/03/08 22:41:51 eva Exp $ + +EAPI=2 +inherit autotools eutils gnome2 + +DESCRIPTION="Image viewer and browser for Gnome" +HOMEPAGE="http://gthumb.sourceforge.net" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" +IUSE="exif gnome-keyring http raw tiff test" + +# clutter +RDEPEND=">=dev-libs/glib-2.16:2 + >=x11-libs/gtk+-2.16:2 + >=gnome-base/gconf-2.6 + >=dev-libs/libunique-1 + media-libs/jpeg + exif? ( >=media-gfx/exiv2-0.18 ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 ) + gstreamer? ( + >=media-libs/gstreamer-0.10 + >=media-libs/gst-plugins-base-0.10 ) + http? ( + >=net-libs/libsoup-2.26:2.4 + >=net-libs/libsoup-gnome-2.26:2.4 ) + tiff? ( media-libs/tiff ) + raw? ( >=media-libs/libopenraw-0.0.8 ) + !raw? ( media-gfx/dcraw )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + app-text/scrollkeeper + >=dev-util/intltool-0.35 + app-text/gnome-doc-utils + test? ( ~app-text/docbook-xml-dtd-4.1.2 )" + +DOCS="AUTHORS ChangeLog NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-static + --disable-clutter + $(use_enable exif exiv2) + $(use_enable http libsoup) + $(use_enable raw libopenraw) + $(use_enable test test-suite) + $(use_enable tiff)" +} + +src_prepare() { + gnome2_src_prepare + + # Do not require unstable libunique + epatch "${FILESDIR}/${P}-configure.patch" + + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} + +src_install() { + gnome2_src_install + # gthumb does not need *.la files + find "${D}" -name "*.la" -delete || die "*.la files removal failed" +} diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml index f1edf294bf85..671189e15a2d 100644 --- a/media-gfx/gthumb/metadata.xml +++ b/media-gfx/gthumb/metadata.xml @@ -1,10 +1,9 @@ -gnome - - - Add support for IPTC metadata - - + gnome + + Add support for IPTC metadata + Enable webservice integration through net-libs/libsoup + diff --git a/media-gfx/pngtools/Manifest b/media-gfx/pngtools/Manifest index 8a55e4aab1c0..45547bcd4fc0 100644 --- a/media-gfx/pngtools/Manifest +++ b/media-gfx/pngtools/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX pngtools-0.3-implicit-declarations.patch 1428 RMD160 90a59cff9af1251af6ba93be1c9c27aaeb2ba8de SHA1 2ea57d8b3b393942443e64bfed8f86be8dcb329e SHA256 7ef75837f24736cbba7f7130ba1e31178a70088d883d6581f86acf0fed79ee62 +AUX pngtools-0.4-libpng14.patch 1265 RMD160 bc1e98bfcf752f876493e2d3ba655a37b9ff81e0 SHA1 6f0f89b072654b6e57b63118408778408c318ba7 SHA256 22c623fee58ffc1b2c8f90b12e27ec56b9001decc97935d4caf94f991f4e44ee DIST pngtools_0_4.tgz 1312178 RMD160 10553ce0f4ec956d8996c2325b6a9a741124ad54 SHA1 bc8b4953fbdf993f5837e2df510d2341e0ab7d54 SHA256 da0035d140c5efbc7d42d95a27327928d982866851c4c67bac58d32936075655 -EBUILD pngtools-0.4.ebuild 816 RMD160 ff1ba58c00ef283aeb7762da924986cb7a76cf5b SHA1 4746c30200824795995fccc7ebada69bd4b6c87c SHA256 01ed40124b05848370a1da567e0dfc6fc0d11c41b3bbf6bc8fe4bb7bd6882a8b -MISC ChangeLog 1285 RMD160 4bc8c8274493cae5b6756d13a4c69f67296447fe SHA1 827065c5b30f9aa58cfa2a4a0b1ad008e96f772d SHA256 f2a12d6e6b3516a9db8f696116887632100d423d6d37339a4d764a99d91e0cf9 +EBUILD pngtools-0.4.ebuild 839 RMD160 db492775b2bafdcf99e122e0c92b0221a6bf5ff3 SHA1 2390b6a2ab16f1b4e45b111b4ff827df45c3fc21 SHA256 0166b77b40f043972c962e74623608bbaa787457a2c29f4879969d780ec5c08f +MISC ChangeLog 1452 RMD160 4c369779e6939f975b1fa2d1019434b1d181b5ea SHA1 ea98f2359db9fde0f84ec971497c65ff71e78a3d SHA256 35af86b4771dac37c719845a0c29254f4da041963368e56f253cc3bf1c45563d MISC metadata.xml 224 RMD160 ccd6090ef80b519508172a0c24ea5ad88454b42b SHA1 1460973a0074ede59c646aed8e68d428f8c32988 SHA256 5fc722539b33aa476eae5643bf61f0b9aa31488da230655896b36fa2288acc55 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.13 (GNU/Linux) - -iEYEARECAAYFAksOST0ACgkQkKaRLQcq0GLQsgCePJ239iqAizmZmL7bPM9hVo6o -cBMAniu0Pr0fWmIPchSP15kGdb+9wFOq -=d9qN ------END PGP SIGNATURE----- -- 2.26.2