diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2010-07-05 19:44:44 -0400 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2010-07-05 19:44:44 -0400 |
| commit | 82e3c6f768c1a193e4390f4196b68d7a2d5cc65a (patch) | |
| tree | d6415e0bc41383c1f32bb0e4b65ac4a73c811d01 /media-gfx/eog | |
| parent | gnome-extra/yelp: add patches to (hopefully) make things work in most cases (diff) | |
| download | gnome-82e3c6f768c1a193e4390f4196b68d7a2d5cc65a.tar.gz gnome-82e3c6f768c1a193e4390f4196b68d7a2d5cc65a.tar.bz2 gnome-82e3c6f768c1a193e4390f4196b68d7a2d5cc65a.zip | |
media-gfx/eog: bump to 2.31.4
Diffstat (limited to 'media-gfx/eog')
| -rw-r--r-- | media-gfx/eog/Manifest | 5 | ||||
| -rw-r--r-- | media-gfx/eog/eog-2.31.4.ebuild (renamed from media-gfx/eog/eog-2.31.3.ebuild) | 15 | ||||
| -rw-r--r-- | media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch | 32 |
3 files changed, 5 insertions, 47 deletions
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest index d89a02a1..3e3342e5 100644 --- a/media-gfx/eog/Manifest +++ b/media-gfx/eog/Manifest @@ -1,3 +1,2 @@ -AUX eog-2.30.1-libjpeg-configure.patch 1002 RMD160 0a4b73a2a0128cb61287e9c8896b018925a453c8 SHA1 812433d6b10b144b1b1478267bd89477dd8f4eb8 SHA256 cbb362baaf0681772f3a2d3aac27fcd4787ebf82342d1e03e5d24dc250d0cb19 -DIST eog-2.31.3.tar.bz2 2802928 RMD160 0936170e08a84ae0c4c338b896f85ba7cd2a9aa0 SHA1 1c57a410a5e43fff7f98a4af59cfaf41ec460a35 SHA256 c896cab228cb644fff35946bf03427600bcd8b9ff93d585a4a292bdd66f1e789 -EBUILD eog-2.31.3.ebuild 1753 RMD160 3eddb5e05e6bfb26a309d0fd26886056f8268557 SHA1 346071782c023f1c4c3499f6265a12b1133f4a10 SHA256 10e140de1fd05ace59ba3867e4c6165e852f578fa15702db2424fe8f1938a3c3 +DIST eog-2.31.4.tar.bz2 2869883 RMD160 80e4073b4b09a7120512f513611ec0fced091949 SHA1 2cdfff75d5318704da522bedbbdecf254f960df0 SHA256 5cc733cdb98105fac4b5cc380003e888769c109287c0433f500da205cad50bb7 +EBUILD eog-2.31.4.ebuild 1583 RMD160 ae77d3b870a1d246155d4a3ea2ed04694bbcd606 SHA1 c18c56dfa3c69ee57309ecb269e7b562a7646499 SHA256 306a7535fb68e483a28e3de02b6fb7901cde919c15b4730e528381c251bcdbb4 diff --git a/media-gfx/eog/eog-2.31.3.ebuild b/media-gfx/eog/eog-2.31.4.ebuild index 70022507..ec7dc23f 100644 --- a/media-gfx/eog/eog-2.31.3.ebuild +++ b/media-gfx/eog/eog-2.31.4.ebuild @@ -3,7 +3,7 @@ # $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-2.30.1.ebuild,v 1.2 2010/06/21 11:48:28 ssuominen Exp $ EAPI=2 -inherit eutils gnome2 autotools +inherit gnome2 DESCRIPTION="The Eye of GNOME image viewer" HOMEPAGE="http://www.gnome.org/projects/eog/" @@ -14,10 +14,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="dbus doc exif jpeg lcms python svg tiff xmp" RDEPEND=">=x11-libs/gtk+-2.18:2 - >=dev-libs/glib-2.25.6 + >=dev-libs/glib-2.25.9 >=dev-libs/libxml2-2 >=gnome-base/gconf-2.31.1 - >=gnome-base/gnome-desktop-2.25.1 + >=gnome-base/gnome-desktop-2.25.1:0 >=x11-themes/gnome-icon-theme-2.19.1 >=x11-misc/shared-mime-info-0.20 x11-libs/libX11 @@ -58,12 +58,3 @@ pkg_setup() { --disable-scrollkeeper --disable-schemas-install" } - -src_prepare() { - gnome2_src_prepare - - # Fix build without libjpeg, bug #319157 - epatch "${FILESDIR}/${PN}-2.30.1-libjpeg-configure.patch" - - eautoreconf -} diff --git a/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch b/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch deleted file mode 100644 index 97ab0c5d..00000000 --- a/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d44efad798c313288f4b136b08e88ad580880673 Mon Sep 17 00:00:00 2001 -From: Claudio Saavedra <csaavedra@igalia.com> -Date: Tue, 15 Jun 2010 15:47:18 +0000 -Subject: Fix build without libjpeg - -AM_CONDITIONAL calls should be called always, otherwise configure -gets confused. - -Fixes bug #621616. ---- -diff --git a/configure.ac b/configure.ac -index 3631dd7..8f1e713 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -227,7 +227,6 @@ int main(int c, char**v) { return 0; } - have_libjpeg_80=yes], - [AC_MSG_RESULT(no) - have_libjpeg_80=no]) -- AM_CONDITIONAL(HAVE_LIBJPEG_80, test "x$have_libjpeg_80" = xyes) - - else - AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***) -@@ -243,6 +242,7 @@ int main(int c, char**v) { return 0; } - fi - AC_SUBST(LIBJPEG) - AM_CONDITIONAL(ENABLE_JPEG, test x$have_jpeg = xyes) -+AM_CONDITIONAL(HAVE_LIBJPEG_80, test "x$have_libjpeg_80" = xyes) - - # **************** - # D-Bus activation --- -cgit v0.8.3.1 |