summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-06-15 16:16:14 +0000
committerPacho Ramos <pacho@gentoo.org>2010-06-15 16:16:14 +0000
commitae7416ec5e9ebb6a2f7c7b1b66b3cb304380a639 (patch)
tree5fcb841e2ff6e74b1d2ba06251c44d8faf635606 /media-gfx/eog/files
parentVersion bump <http://my.opera.com/desktopteam/blog/2010/06/15/10-60-beta-rc>. (diff)
downloadgentoo-2-ae7416ec5e9ebb6a2f7c7b1b66b3cb304380a639.tar.gz
gentoo-2-ae7416ec5e9ebb6a2f7c7b1b66b3cb304380a639.tar.bz2
gentoo-2-ae7416ec5e9ebb6a2f7c7b1b66b3cb304380a639.zip
Add new version for Gnome 2.30. Also fix bug #319157
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/eog/files')
-rw-r--r--media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch32
1 files changed, 32 insertions, 0 deletions
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
new file mode 100644
index 000000000000..97ab0c5d2674
--- /dev/null
+++ b/media-gfx/eog/files/eog-2.30.1-libjpeg-configure.patch
@@ -0,0 +1,32 @@
+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