Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31577
Modified Files:
eog.info eog.patch
Log Message:
dep upgrades
Index: eog.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/eog.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- eog.info 2 Aug 2011 20:36:14 -0000 1.1
+++ eog.info 11 Sep 2013 04:03:13 -0000 1.2
@@ -1,16 +1,16 @@
Package: eog
Version: 2.28.2
-Revision: 2
+Revision: 3
Depends: <<
atk1-shlibs (>= 1.28.0-1),
- cairo-shlibs (>= 1.8.8-3),
+ cairo-shlibs (>= 1.12.14-1),
dbus (>= 1.2.1-1),
dbus-glib1.2-shlibs,
dbus1.3-shlibs,
dpkg-base-files,
- fontconfig2-shlibs (>= 2.8.0-4),
- freetype219-shlibs (>= 2.3.12-1),
+ fontconfig2-shlibs (>= 2.10.0-1),
+ freetype219-shlibs (>= 2.4.11-1),
gconf2 (>= 2.28.0-1),
gconf2-shlibs (>= 2.28.0-1),
glib2-shlibs (>= 2.22.0-1),
@@ -18,13 +18,12 @@
gnome-icon-theme (>= 2.28.0-1),
gtk+2 (>= 2.18.0-1),
gtk+2-shlibs (>= 2.18.0-1),
- lcms-shlibs,
+ lcms2-shlibs,
libexif12-shlibs,
libgettext8-shlibs,
- libiconv,
- libjpeg8-shlibs,
+ libjpeg9-shlibs,
librsvg2-gtk (>= 2.26.0-2),
- libxml2-shlibs (>= 2.6.30-1),
+ libxml2-shlibs (>= 2.9.1-1),
pango1-xft2-ft219-shlibs (>= 1.24.5-4),
rarian-compat,
shared-mime-info (>= 0.51-1),
@@ -34,34 +33,31 @@
BuildDepends: <<
atk1 (>= 1.28.0-1),
autoconf2.6,
- automake1.11,
- cairo (>= 1.8.8-3),
+ automake1.14,
+ cairo (>= 1.12.14-1),
dbus-glib1.2-dev,
dbus1.3-dev,
- fink (>= 0.24.12-1),
fink-package-precedence,
- fontconfig2-dev (>= 2.8.0-4),
- freetype219 (>= 2.3.12-1),
+ fontconfig2-dev (>= 2.10.0-1),
+ freetype219 (>= 2.4.11-1),
gconf2-dev (>= 2.28.0-1),
gettext-bin,
gettext-tools (>= 0.17),
glib2-dev (>= 2.22.0-1),
- glitz,
gnome-desktop2.11-dev (>= 2.28.0-1),
gnome-doc-utils (>= 0.18.1-1),
gtk+2-dev (>= 2.18.0-1),
gtk-doc (>= 1.13-5),
intltool40,
- lcms,
+ lcms2,
libexif12 (>= 0.6.16-1),
libgettext8-dev,
libiconv-dev,
- libjpeg8,
+ libjpeg9,
librsvg2 (>= 2.26.0-2),
libtool2,
- libxml2 (>= 2.6.30-1),
+ libxml2 (>= 2.9.1-1),
pango1-xft2-ft219-dev (>= 1.24.5-4),
- pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
startup-notification-dev,
x11-dev
@@ -69,14 +65,12 @@
Source: mirror:gnome:sources/%n/2.28/%n-%v.tar.bz2
Source-MD5: ee5fd7f3cdd37467cb86052a858757c3
PatchFile: %n.patch
-PatchFile-MD5: 3624b70a5f35b2cb8b2d05857d60b755
+PatchFile-MD5: 989e52c9f8e9218296290093f4248a77
PatchScript: <<
%{default_script}
<<
-SetCPPFLAGS: -I%p/lib/fontconfig2/include
-SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os -pipe
-ConfigureParams: --libexecdir=%p/lib/X%n --mandir=%p/share/man
--enable-dependency-tracking --disable-scrollkeeper --disable-schemas-install
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
--without-xmp --disable-python --disable-static --disable-silent-rules
+ConfigureParams: --libexecdir=%p/lib/X%n --mandir=%p/share/man
--enable-dependency-tracking --disable-scrollkeeper --disable-schemas-install
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
--without-xmp --disable-python --disable-static --disable-silent-rules
CompileScript: <<
autoreconf -f -i
./configure %c
@@ -132,6 +126,9 @@
# Create plugins dir so that third-party pkgs can use it easily.
We have plugins now, so dir is created automatically
+
+ Import upstream migration to lcms2. See:
+
https://git.gnome.org/browse/eog/patch/?id=3c3a83506256ade465bd817453202296b1cda618
<<
License: GPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Index: eog.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/eog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- eog.patch 2 Aug 2011 20:36:14 -0000 1.1
+++ eog.patch 11 Sep 2013 04:03:13 -0000 1.2
@@ -12,7 +12,7 @@
-I$(top_srcdir)/src \
diff -Nurd -x'*~' eog-2.28.2.orig/configure.ac eog-2.28.2/configure.ac
--- eog-2.28.2.orig/configure.ac 2009-12-16 15:53:29.000000000 -0500
-+++ eog-2.28.2/configure.ac 2010-03-02 01:18:40.000000000 -0500
++++ eog-2.28.2/configure.ac 2013-09-10 23:33:13.000000000 -0400
@@ -96,6 +96,7 @@
EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED \
@@ -21,8 +21,17 @@
gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED \
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED \
gconf-2.0 >= $GCONF_REQUIRED \
-@@ -153,6 +154,7 @@
- EOG_MODULES="$EOG_MODULES lcms"
+@@ -146,13 +147,14 @@
+ AC_ARG_WITH([cms], AC_HELP_STRING([--without-cms], [disable colour management
support]))
+ have_lcms=no
+ if test x$with_cms != xno; then
+- PKG_CHECK_MODULES(LCMS, lcms, have_lcms=yes, have_lcms=no)
++ PKG_CHECK_MODULES(LCMS, lcms2, have_lcms=yes, have_lcms=no)
+ fi
+ if test "x$have_lcms" = "xyes"; then
+ AC_DEFINE(HAVE_LCMS, 1, [Little CMS Support.])
+- EOG_MODULES="$EOG_MODULES lcms"
++ EOG_MODULES="$EOG_MODULES lcms2"
fi
+AM_CONDITIONAL([HAVE_LCMS], [test "x$have_lcms" = "xyes"])
@@ -127,3 +136,169 @@
$(LIBJPEG) \
$(toolbar_LIB) \
$(screensaver_LIB) \
+diff -Nurd -x'*~' eog-2.28.2.orig/src/eog-image.c eog-2.28.2/src/eog-image.c
+--- eog-2.28.2.orig/src/eog-image.c 2009-12-16 15:53:29.000000000 -0500
++++ eog-2.28.2/src/eog-image.c 2013-09-10 23:33:13.000000000 -0400
+@@ -58,7 +58,7 @@
+ #endif
+
+ #ifdef HAVE_LCMS
+-#include <lcms.h>
++#include <lcms2.h>
+ #ifndef EXIF_TAG_GAMMA
+ #define EXIF_TAG_GAMMA 0xa500
+ #endif
+@@ -629,8 +629,8 @@
+ if (screen == NULL || priv->profile == NULL) return;
+
+ /* TODO: support other colorspaces than RGB */
+- if (cmsGetColorSpace (priv->profile) != icSigRgbData ||
+- cmsGetColorSpace (screen) != icSigRgbData) {
++ if (cmsGetColorSpace (priv->profile) != cmsSigRgbData ||
++ cmsGetColorSpace (screen) != cmsSigRgbData) {
+ eog_debug_message (DEBUG_LCMS, "One or both ICC profiles not in
RGB colorspace; not correcting");
+ return;
+ }
+diff -Nurd -x'*~' eog-2.28.2.orig/src/eog-image.h eog-2.28.2/src/eog-image.h
+--- eog-2.28.2.orig/src/eog-image.h 2009-12-16 15:53:29.000000000 -0500
++++ eog-2.28.2/src/eog-image.h 2013-09-10 23:33:13.000000000 -0400
+@@ -37,7 +37,7 @@
+ #endif
+
+ #ifdef HAVE_LCMS
+-#include <lcms.h>
++#include <lcms2.h>
+ #endif
+
+ #ifdef HAVE_EXEMPI
+diff -Nurd -x'*~' eog-2.28.2.orig/src/eog-metadata-reader-jpg.c
eog-2.28.2/src/eog-metadata-reader-jpg.c
+--- eog-2.28.2.orig/src/eog-metadata-reader-jpg.c 2009-08-11
06:49:55.000000000 -0400
++++ eog-2.28.2/src/eog-metadata-reader-jpg.c 2013-09-10 23:33:13.000000000
-0400
+@@ -513,8 +513,6 @@
+ priv = emr->priv;
+
+ if (priv->icc_chunk) {
+- cmsErrorAction (LCMS_ERROR_SHOW);
+-
+ profile = cmsOpenProfileFromMem(priv->icc_chunk + 14,
priv->icc_len - 14);
+
+ if (profile) {
+@@ -562,7 +560,7 @@
+ {
+ cmsCIExyY whitepoint;
+ cmsCIExyYTRIPLE primaries;
+- LPGAMMATABLE gamma[3];
++ cmsToneCurve *gamma[3];
+ double gammaValue;
+ ExifRational r;
+
+@@ -619,11 +617,11 @@
+ gammaValue = 2.2;
+ }
+
+- gamma[0] = gamma[1] = gamma[2] = cmsBuildGamma (256,
gammaValue);
++ gamma[0] = gamma[1] = gamma[2] = cmsBuildGamma (NULL,
gammaValue);
+
+ profile = cmsCreateRGBProfile (&whitepoint, &primaries,
gamma);
+
+- cmsFreeGamma(gamma[0]);
++ cmsFreeToneCurve(gamma[0]);
+
+ eog_debug_message (DEBUG_LCMS, "JPEG is calibrated");
+
+diff -Nurd -x'*~' eog-2.28.2.orig/src/eog-metadata-reader-png.c
eog-2.28.2/src/eog-metadata-reader-png.c
+--- eog-2.28.2.orig/src/eog-metadata-reader-png.c 2009-12-16
15:53:29.000000000 -0500
++++ eog-2.28.2/src/eog-metadata-reader-png.c 2013-09-10 23:33:13.000000000
-0400
+@@ -569,8 +569,6 @@
+ return NULL;
+ }
+
+- cmsErrorAction (LCMS_ERROR_SHOW);
+-
+ profile = cmsOpenProfileFromMem(outbuf, zstr.total_out);
+ inflateEnd (&zstr);
+ g_free (outbuf);
+@@ -589,7 +587,7 @@
+ if (!profile && priv->cHRM_chunk) {
+ cmsCIExyY whitepoint;
+ cmsCIExyYTRIPLE primaries;
+- LPGAMMATABLE gamma[3];
++ cmsToneCurve *gamma[3];
+ double gammaValue = 2.2; // 2.2 should be a sane default gamma
+
+ /* This uglyness extracts the chromacity and whitepoint values
+@@ -617,11 +615,11 @@
+ if (priv->gAMA_chunk)
+ gammaValue = (double)
1.0/EXTRACT_DOUBLE_UINT_BLOCK_OFFSET (priv->gAMA_chunk, 0, 100000);
+
+- gamma[0] = gamma[1] = gamma[2] = cmsBuildGamma (256,
gammaValue);
++ gamma[0] = gamma[1] = gamma[2] = cmsBuildGamma (NULL,
gammaValue);
+
+ profile = cmsCreateRGBProfile (&whitepoint, &primaries, gamma);
+
+- cmsFreeGamma(gamma[0]);
++ cmsFreeToneCurve(gamma[0]);
+ }
+
+ return profile;
+diff -Nurd -x'*~' eog-2.28.2.orig/src/eog-metadata-reader.h
eog-2.28.2/src/eog-metadata-reader.h
+--- eog-2.28.2.orig/src/eog-metadata-reader.h 2009-08-11 06:49:55.000000000
-0400
++++ eog-2.28.2/src/eog-metadata-reader.h 2013-09-10 23:33:13.000000000
-0400
+@@ -30,7 +30,7 @@
+ #include <exempi/xmp.h>
+ #endif
+ #if HAVE_LCMS
+-#include <lcms.h>
++#include <lcms2.h>
+ #endif
+
+ G_BEGIN_DECLS
+diff -Nurd -x'*~' eog-2.28.2.orig/src/eog-scroll-view.c
eog-2.28.2/src/eog-scroll-view.c
+--- eog-2.28.2.orig/src/eog-scroll-view.c 2009-12-16 15:53:29.000000000
-0500
++++ eog-2.28.2/src/eog-scroll-view.c 2013-09-10 23:55:41.000000000 -0400
+@@ -2,6 +2,7 @@
+ #include <config.h>
+ #endif
+
++#include <stdlib.h>
+ #include <math.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk/gdkkeysyms.h>
+diff -Nurd -x'*~' eog-2.28.2.orig/src/eog-window.c eog-2.28.2/src/eog-window.c
+--- eog-2.28.2.orig/src/eog-window.c 2009-12-16 15:53:29.000000000 -0500
++++ eog-2.28.2/src/eog-window.c 2013-09-10 23:33:13.000000000 -0400
+@@ -71,7 +71,7 @@
+ #ifdef GDK_WINDOWING_X11
+ #include <gdk/gdkx.h>
+ #endif
+-#include <lcms.h>
++#include <lcms2.h>
+ #endif
+
+ #define EOG_WINDOW_GET_PRIVATE(object) \
+@@ -638,7 +638,6 @@
+ int result;
+ cmsHPROFILE *profile;
+ char *atom_name;
+- int lcms_error_action;
+
+ dpy = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
+
+@@ -685,17 +684,8 @@
+ return NULL;
+ }
+
+- /* Make lcms errors non-fatal here, as it is possible
+- * to load invalid profiles with XICC.
+- * We don't want lcms to abort EOG in that case.
+- */
+- lcms_error_action = cmsErrorAction (LCMS_ERROR_IGNORE);
+-
+ profile = cmsOpenProfileFromMem (str, length);
+
+- // Restore the previous error setting
+- cmsErrorAction (lcms_error_action);
+-
+ if (G_UNLIKELY (profile == NULL)) {
+ eog_debug_message (DEBUG_LCMS,
+ "Invalid display profile, "
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
