Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv3710/10.4-stable/main/finkinfo/graphics
Modified Files:
inkscape.info inkscape.patch
Log Message:
sync latest version from unstable to stable (WorksForMe)
Index: inkscape.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/inkscape.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- inkscape.patch 28 Dec 2009 07:37:19 -0000 1.2
+++ inkscape.patch 10 Nov 2011 20:58:52 -0000 1.3
@@ -1,8 +1,8 @@
diff -Nurd -x'*~' inkscape-0.46.orig/configure inkscape-0.46/configure
--- inkscape-0.46.orig/configure 2008-03-11 00:47:08.000000000 -0400
+++ inkscape-0.46/configure 2008-10-29 01:36:01.000000000 -0400
-@@ -14010,6 +14010,9 @@
- echo "${ECHO_T}yes" >&6; }
+@@ -10638,6 +10638,9 @@
+ $as_echo "yes" >&6; }
:
fi
+INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -I/usr/X11R6/include"
@@ -11,60 +11,6 @@
# Check for Apple Mac OS X Carbon framework
carbon_ok=no
-diff -Nurd inkscape-0.46.orig/src/Makefile.in inkscape-0.46/src/Makefile.in
---- inkscape-0.46.orig/src/Makefile.in 2008-03-11 00:47:10.000000000 -0400
-+++ inkscape-0.46/src/Makefile.in 2008-04-25 02:38:53.000000000 -0400
-@@ -1476,6 +1476,7 @@
- # so perhaps 1.6 will work.
- AUTOMAKE_OPTIONS = 1.7 subdir-objects
- INCLUDES = \
-+ -I$(top_srcdir)/cxxtest \
- $(PERL_CFLAGS) $(PYTHON_CFLAGS) \
- $(FREETYPE_CFLAGS) \
- $(GNOME_PRINT_CFLAGS) \
-@@ -1486,8 +1487,7 @@
- $(POPPLER_CFLAGS) \
- $(POPPLER_GLIB_CFLAGS) \
- -DPOTRACE=\"potrace\" \
-- $(INKSCAPE_CFLAGS) \
-- -I$(top_srcdir)/cxxtest
-+ $(INKSCAPE_CFLAGS)
-
- @PLATFORM_WIN32_TRUE@win32_sources = winmain.cpp registrytool.cpp
registrytool.h
- @PLATFORM_WIN32_TRUE@win32ldflags = -lcomdlg32
-diff -Nurd inkscape-0.46.orig/src/dom/cssparser.h
inkscape-0.46/src/dom/cssparser.h
---- inkscape-0.46.orig/src/dom/cssparser.h 2008-03-11 00:19:31.000000000
-0400
-+++ inkscape-0.46/src/dom/cssparser.h 2008-04-25 02:39:17.000000000 -0400
-@@ -29,6 +29,7 @@
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+#include <glib.h>
-
- #include "dom.h"
-
-diff -Nurd inkscape-0.46.orig/src/dom/lsimpl.h inkscape-0.46/src/dom/lsimpl.h
---- inkscape-0.46.orig/src/dom/lsimpl.h 2008-03-11 00:19:30.000000000
-0400
-+++ inkscape-0.46/src/dom/lsimpl.h 2008-04-25 02:39:17.000000000 -0400
-@@ -33,6 +33,7 @@
- #include "events.h"
- #include "traversal.h"
- #include "ls.h"
-+#include <glib.h>
-
-
- #include "xmlreader.h"
-diff -Nurd inkscape-0.46.orig/src/dom/svg/svgparser.h
inkscape-0.46/src/dom/svg/svgparser.h
---- inkscape-0.46.orig/src/dom/svg/svgparser.h 2008-03-11 00:19:30.000000000
-0400
-+++ inkscape-0.46/src/dom/svg/svgparser.h 2008-04-25 02:39:17.000000000
-0400
-@@ -30,6 +30,7 @@
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+#include <glib.h>
-
- #include "svgimpl.h"
-
diff -Nurd inkscape-0.46.orig/src/dom/uri.h inkscape-0.46/src/dom/uri.h
--- inkscape-0.46.orig/src/dom/uri.h 2008-03-11 00:19:31.000000000 -0400
+++ inkscape-0.46/src/dom/uri.h 2008-04-25 02:39:17.000000000 -0400
@@ -113,23 +59,11 @@
diff -Nurd inkscape-0.46.orig/src/io/inkscapestream.h
inkscape-0.46/src/io/inkscapestream.h
--- inkscape-0.46.orig/src/io/inkscapestream.h 2008-03-11 00:20:06.000000000
-0400
+++ inkscape-0.46/src/io/inkscapestream.h 2008-04-25 02:39:17.000000000
-0400
-@@ -13,6 +13,7 @@
-
+@@ -14,6 +14,7 @@
+ #include <cstdio>
#include <glibmm.h>
+#include <glib.h>
namespace Inkscape
{
-diff -Nurd -x'*~' inkscape-0.46.orig/src/widgets/sp-xmlview-attr-list.h
inkscape-0.46/src/widgets/sp-xmlview-attr-list.h
---- inkscape-0.46.orig/src/widgets/sp-xmlview-attr-list.h 2008-03-11
00:20:13.000000000 -0400
-+++ inkscape-0.46/src/widgets/sp-xmlview-attr-list.h 2008-10-28
11:00:20.000000000 -0400
-@@ -13,7 +13,7 @@
- */
-
- #include <stdio.h>
--#include <gtk/gtkclist.h>
-+#include <gtk/gtk.h>
- #include "../xml/repr.h"
-
- #include <glib.h>
Index: inkscape.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/inkscape.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- inkscape.info 28 Dec 2009 07:37:19 -0000 1.7
+++ inkscape.info 10 Nov 2011 20:58:52 -0000 1.8
@@ -1,6 +1,6 @@
Package: inkscape
-Version: 0.46
-Revision: 5
+Version: 0.48.0
+Revision: 1
GCC: 4.0
Maintainer: Todai Fink Team <[email protected]>
Depends: <<
@@ -20,15 +20,18 @@
lcms-shlibs (>= 1.13-1),
libgettext3-shlibs,
libiconv,
- libpng3-shlibs,
+ libpng14-shlibs,
libsigc++2-shlibs (>= 2.0.17-1001),
libxml2-shlibs (>= 2.6.30-1),
libxslt-shlibs (>= 1.1.22-1),
+ pango1-xft2-ft219 (>= 1.22.0-4),
pango1-xft2-ft219-shlibs (>= 1.22.0-4),
pangomm1.4.1-shlibs,
- poppler2-shlibs,
- poppler2-glib-shlibs,
+ poppler4-shlibs,
+ poppler4-glib-shlibs,
popt-shlibs,
+ gsl-shlibs,
+ default-icon-theme,
x11
<<
BuildDepends: <<
@@ -55,7 +58,7 @@
libart2,
libgettext3-dev,
libiconv-dev,
- libpng3,
+ libpng14,
libsigc++2 (>= 2.0.17-1001),
libxml2 (>= 2.6.30-1),
libxslt (>= 1.1.22-1),
@@ -64,19 +67,21 @@
pangomm1.4.1,
pixman (>= 0.12.0-1),
pkgconfig (>= 0.23),
- poppler2,
- poppler2-glib,
- poppler2-xpdf,
+ poppler4,
+ poppler4-glib,
+ poppler4-xpdf,
popt,
+ gsl,
dbus-dev,
x11-dev,
xft2-dev
<<
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 3bae9034047379012127e52f9b138d32
+Suggests: default-icon-theme
+Source: mirror:sourceforge:%n/%n-%v.tar.bz2
+Source-MD5: fd8b17a3f06668603807176a77167bb9
ConfigureParams: --mandir=%p/share/man --with-xinerama --with-xft
--disable-dependency-tracking --with-gnome-vfs --enable-lcms
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
PatchFile: %n.patch
-PatchFile-MD5: 5f01037f0757e3c2a5b2d9f444ec0f00
+PatchFile-MD5: 2f50d1936394305d6f3a0f8d79e88e62
PatchScript: <<
%{default_script}
<<
@@ -85,7 +90,7 @@
make
<<
InstallScript: make install DESTDIR=%d
-DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po HACKING* NEWS
README* TRANSLATORS
+DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po NEWS README*
TRANSLATORS
Description: SVG application
DescPort: <<
dmacks: fix -I ordering. See:
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
