Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25430/10.7/main/finkinfo/gnome
Modified Files:
evince.info
Added Files:
evince.patch
Log Message:
poppler upgrade (and blindly assuming it's okay on 10.8 now)
--- NEW FILE: evince.patch ---
diff -Nurd -x'*~' evince-2.22.2.orig/backend/pdf/ev-poppler.cc
evince-2.22.2/backend/pdf/ev-poppler.cc
--- evince-2.22.2.orig/backend/pdf/ev-poppler.cc 2008-05-28
17:13:58.000000000 -0400
+++ evince-2.22.2/backend/pdf/ev-poppler.cc 2013-03-08 17:19:41.000000000
-0500
@@ -960,6 +960,8 @@
const char *unimplemented_action = NULL;
switch (action->type) {
+ case POPPLER_ACTION_NONE:
+ break;
case POPPLER_ACTION_GOTO_DEST: {
EvLinkDest *dest;
@@ -989,6 +991,15 @@
case POPPLER_ACTION_MOVIE:
unimplemented_action = "POPPLER_ACTION_MOVIE";
break;
+ case POPPLER_ACTION_RENDITION:
+ unimplemented_action = "POPPLER_ACTION_RENDITION";
+ break;
+ case POPPLER_ACTION_OCG_STATE:
+ unimplemented_action = "POPPLER_ACTION_OGG_STATE";
+ break;
+ case POPPLER_ACTION_JAVASCRIPT:
+ unimplemented_action = "POPPLER_ACTION_JAVASCRIPT";
+ break;
case POPPLER_ACTION_UNKNOWN:
unimplemented_action = "POPPLER_ACTION_UNKNOWN";
}
@@ -1979,7 +1990,7 @@
r.x2 = points->x2;
r.y2 = height - points->y1;
- retval = poppler_page_get_text (poppler_page,
+ retval = poppler_page_get_selected_text (poppler_page,
(PopplerSelectionStyle)style,
&r);
Index: evince.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/gnome/evince.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- evince.info 28 Oct 2012 17:24:28 -0000 1.6
+++ evince.info 8 Mar 2013 22:37:54 -0000 1.7
@@ -3,15 +3,14 @@
# cannot upgrade past 2.22.2 until we get working libspectre
# or lose PS support
Version: 2.22.2
-Revision: 3
-Distribution: 10.7
+Revision: 4
Description: GNOME document viewer
License: GPL
Maintainer: The Gnome Core Team <[email protected]>
Depends: <<
atk1-shlibs (>= 1.28.0-1),
- cairo-shlibs (>= 1.8.8-3),
+ cairo-shlibs (>= 1.12.8-1),
dbus (>= 1.2.1-1),
dbus-glib1.2-shlibs,
dbus1.3-shlibs,
@@ -41,7 +40,7 @@
libxml2-shlibs (>= 2.8.0-1),
orbit2-shlibs (>= 2.14.17-2),
pango1-xft2-ft219-shlibs (>= 1.24.5-4),
- poppler4-glib-shlibs,
+ poppler8-glib-shlibs,
popt-shlibs,
rarian-compat,
tetex-base,
@@ -49,7 +48,7 @@
<<
BuildDepends: <<
atk1 (>= 1.28.0-1),
- cairo (>= 1.8.8-3),
+ cairo (>= 1.12.8-1),
dbus-glib1.2-dev,
dbus1.3-dev,
fink (>= 0.28),
@@ -84,10 +83,8 @@
libxml2 (>= 2.8.0-1),
orbit2-dev (>= 2.14.17-2),
pango1-xft2-ft219-dev (>= 1.24.5-4),
- pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
- poppler4,
- poppler4-glib,
+ poppler8-glib,
popt,
x11-dev
<<
@@ -95,7 +92,12 @@
Source-MD5: 3661f901ab40cee44d5350a045a8bdb1
GCC: 4.0
ConfigureParams: --enable-dependency-tracking --disable-schemas-install
--disable-scrollkeeper --enable-dvi --mandir=%p/share/man
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
--disable-gtk-doc --disable-static
+PatchFile: %n.patch
+PatchFile-MD5: 9c736608ff29fe8ef21901d3e4bc4832
PatchScript: <<
+ # upgrades for newer-poppler's API based on upstream
+ %{default_script}
+
find . -name Makefile.in | xargs perl -pi -e 's,LINK = \$\(LIBTOOL\)
--tag=CC,LINK = \$\(LIBTOOL\) --tag=CXX,'
perl -pi -e 's,/usr/share/gtk-doc/html,%p/share/gtk-doc/html,g'
help/reference/html/*.html
# avoid detecting spectre (might be in fink eventually)
@@ -104,6 +106,13 @@
perl -pi -e 's|\$\(LIBS\)|$& \$\(INTLLIBS\)|g' libdocument/Makefile.in
### pass -lX11
perl -pi -e 's|^LIBS = |LIBS = -L/usr/X11R6/lib -lX11|g'
shell/Makefile.in
+
+ # poppler announces itself as major.minor.micro via its .h,
+ # don't bother trying to parse from its pc...
+ perl -ni -e 'print unless /POPPLER_.*_VERSION/' config.h.in
+ # ...and definitely don't parse that as 0.major.minor
+ perl -pi -e 's/POPPLER_MINOR_VERSION/POPPLER_MICRO_VERSION/g'
backend/pdf/ev-poppler.cc
+ perl -pi -e 's/POPPLER_MAJOR_VERSION/POPPLER_MINOR_VERSION/g'
backend/pdf/ev-poppler.cc
<<
CompileScript: <<
#!/bin/sh -ev
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
