Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21564
Modified Files:
eog.info eog.patch
Log Message:
new version
Index: eog.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/eog.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- eog.info 27 Nov 2008 19:34:50 -0000 1.13
+++ eog.info 13 Jan 2009 17:28:16 -0000 1.14
@@ -1,5 +1,5 @@
Package: eog
-Version: 2.24.2
+Version: 2.24.3
Revision: 1
Depends: <<
@@ -31,7 +31,7 @@
libglade2-shlibs (>= 2.6.3-1),
libgnome2 (>= 2.24.0-1),
libgnomeui2-shlibs (>= 2.24.0-1),
- libgnomecanvas2 (>= 2.20.1.1-1),
+ libgnomecanvas2 (>= 2.20.1.1-2),
libiconv,
libjpeg-shlibs,
libpng3-shlibs,
@@ -70,7 +70,7 @@
gnome-keyring-dev (>= 0.8.1-1),
gnome-vfs2-unified-dev (>= 1:2.24.0-1),
gtk+2-dev (>= 2.14.0-1),
- gtk-doc (>= 1.8-1),
+ gtk-doc (>= 1.9-1),
intltool40,
lcms,
libart2 (>= 2.3.16-1),
@@ -82,7 +82,7 @@
libglade2 (>= 2.6.3-1),
libgnome2-dev (>= 2.24.0-1),
libgnomeui2-dev (>= 2.24.0-1),
- libgnomecanvas2-dev (>= 2.20.1.1-1),
+ libgnomecanvas2-dev (>= 2.20.1.1-2),
libiconv-dev,
libjpeg,
libpng3,
@@ -99,9 +99,9 @@
xft2-dev
<<
Source: mirror:gnome:sources/%n/2.24/%n-%v.tar.bz2
-Source-MD5: 219896d7b33016bc9b0485937e737d9f
+Source-MD5: ab69b3ed5e8335c8352ffa418379dd1c
PatchFile: %n.patch
-PatchFile-MD5: 1266d297619e2ed06bec71172b6c8a3a
+PatchFile-MD5: 3c8adffcb8f1d11d9c83fb447ca0e6af
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
SetCFLAGS: -Os -pipe
@@ -112,7 +112,7 @@
make
<<
InstallScript: <<
- make -j1 install DESTDIR="%d"
+ make -j1 install DESTDIR="%d" GTKDOC_REBASE=%p/bin/gtkdoc-rebase
mkdir -p %i/lib/eog/plugins
<<
PostInstScript: <<
@@ -140,12 +140,8 @@
DescPort: <<
Added librsvg2-gtk as Depends to be able to open svg files
- Make sure local -I come first. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=560070
- And also pass via correct automake variable.
-
- Link against local libs directly instead of -L/-l. See:
- http://bugzilla.gnome.org/show_bug.cgi?id=560073
+ Make sure local -I come first by passing via correct automake
+ variable.
Uh oh, crc32_combine but it's marked private in 10.4's libz
(fixed in 10.5). Import svn revision 4871. See:
@@ -158,6 +154,9 @@
separate -pyXX package set.
Create plugins dir so that third-party pkgs can use it easily.
+
+ Not sure why autoreconf nukes setting of GTKDOC_REBASE. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=567578
<<
License: GPL
Maintainer: The Gnome Core Team <fink-gnome-c...@lists.sourceforge.net>
Index: eog.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/eog.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- eog.patch 27 Nov 2008 19:34:50 -0000 1.5
+++ eog.patch 13 Jan 2009 17:28:16 -0000 1.6
@@ -75,61 +75,18 @@
-I$(top_srcdir)/src \
$(EOG_CFLAGS) \
$(WARN_CFLAGS)
-diff -Nurd -x'*~' eog-2.24.2.orig/doc/reference/Makefile.am
eog-2.24.2/doc/reference/Makefile.am
---- eog-2.24.2.orig/doc/reference/Makefile.am 2008-10-20 12:31:55.000000000
-0400
-+++ eog-2.24.2/doc/reference/Makefile.am 2008-11-27 12:08:14.000000000
-0500
-@@ -91,13 +91,13 @@
- endif
-
- if ENABLE_JPEG
--jpeg_LIB = -L$(top_builddir)/jpegutils -leog-jpegutils
-+jpeg_LIB = $(top_builddir)/jpegutils/libeog-jpegutils.a
- endif
-
- GTKDOC_LIBS=\
- $(top_builddir)/src/libeog.la \
-- -L$(top_builddir)/cut-n-paste/toolbar-editor -ltoolbareditor \
-- -L$(top_builddir)/cut-n-paste/totem-screensaver -ltotemscrsaver \
-+ $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \
-+ $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \
- $(BINDING_LIBS) \
- $(LIBJPEG) \
- $(X_LIBS) \
-diff -Nurd -x'*~' eog-2.24.2.orig/src/Makefile.am eog-2.24.2/src/Makefile.am
---- eog-2.24.2.orig/src/Makefile.am 2008-10-20 12:31:54.000000000 -0400
-+++ eog-2.24.2/src/Makefile.am 2008-11-27 12:55:22.000000000 -0500
-@@ -1,12 +1,12 @@
- if ENABLE_JPEG
--jpeg_LIB = -L$(top_builddir)/jpegutils -leog-jpegutils
-+jpeg_LIB = $(top_builddir)/jpegutils/libeog-jpegutils.a
- jpeg_DEPS = $(top_builddir)/jpegutils/libeog-jpegutils.a
- endif
-
--toolbar_LIB = -L$(top_builddir)/cut-n-paste/toolbar-editor -ltoolbareditor
-+toolbar_LIB = $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la
- toolbar_DEPS = $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la
-
--screensaver_LIB = -L$(top_builddir)/cut-n-paste/totem-screensaver
-ltotemscrsaver
-+screensaver_LIB =
$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la
- screensaver_DEPS =
$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la
-
- noinst_LTLIBRARIES = libeog.la
-@@ -141,12 +141,12 @@
+diff -Nurd -x'*~' eog-2.24.3.orig/src/Makefile.am eog-2.24.3/src/Makefile.am
+--- eog-2.24.3.orig/src/Makefile.am 2008-12-13 06:53:59.000000000 -0500
++++ eog-2.24.3/src/Makefile.am 2009-01-13 03:36:48.000000000 -0500
+@@ -141,7 +141,7 @@
eog-exif-details.c
endif
-libeog_la_CFLAGS = \
-- $(EOG_CFLAGS) \
-- $(WARN_CFLAGS) \
+libeog_la_CPPFLAGS = \
-I$(top_srcdir)/jpegutils \
-I$(top_srcdir)/cut-n-paste/toolbar-editor \
-I$(top_srcdir)/cut-n-paste/totem-screensaver \
-+ $(EOG_CFLAGS) \
-+ $(WARN_CFLAGS) \
- -DG_LOG_DOMAIN=\"EOG\" \
- -DEOG_PREFIX=\""${prefix}"\" \
- -DEOG_DATA_DIR=\""$(pkgdatadir)"\" \
@@ -155,11 +155,10 @@
-DEOG_PLUGIN_DIR=\""$(libdir)/eog/plugins"\"
@@ -144,19 +101,15 @@
$(NO_STRICT_ALIASING_CFLAGS) \
$(PYGTK_CFLAGS) \
$(PYTHON_CFLAGS) \
-@@ -179,10 +178,10 @@
+@@ -179,7 +178,7 @@
$(toolbar_DEPS) \
$(screensaver_DEPS)
-eog_CFLAGS = \
-- $(EOG_CFLAGS) \
+eog_CPPFLAGS = \
-I$(top_srcdir)/cut-n-paste/toolbar-editor \
-I$(top_srcdir)/cut-n-paste/totem-screensaver \
-+ $(EOG_CFLAGS) \
- -DEOG_DATA_DIR=\""$(pkgdatadir)"\" \
- -DEOG_LOCALE_DIR=\""$(datadir)/locale"\"
-
+ $(EOG_CFLAGS) \
diff -Nurd -x'*~' eog-2.24.2.orig/src/eog-metadata-reader-png.c
eog-2.24.2/src/eog-metadata-reader-png.c
--- eog-2.24.2.orig/src/eog-metadata-reader-png.c 2008-10-20
12:31:54.000000000 -0400
+++ eog-2.24.2/src/eog-metadata-reader-png.c 2008-11-27 12:58:33.000000000
-0500
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
