Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv13624/stable/main/finkinfo/graphics
Modified Files:
inkscape.info inkscape.patch
Log Message:
new version, taking over with consent of former maintainer
Index: inkscape.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/inkscape.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inkscape.patch 10 Nov 2011 20:58:52 -0000 1.3
+++ inkscape.patch 31 Dec 2011 21:21:51 -0000 1.4
@@ -1,69 +1,111 @@
-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
-@@ -10638,6 +10638,9 @@
+diff -Nurd -x'*~' inkscape-0.48.2.orig/configure inkscape-0.48.2/configure
+--- inkscape-0.48.2.orig/configure 2011-07-08 15:25:02.000000000 -0400
++++ inkscape-0.48.2/configure 2011-12-09 15:32:23.000000000 -0500
+@@ -10840,6 +10840,8 @@
$as_echo "yes" >&6; }
- :
+
fi
+INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -I/usr/X11R6/include"
+INKSCAPE_LIBS="$INKSCAPE_LIBS -L/usr/X11R6/lib -lX11"
-+
# Check for Apple Mac OS X Carbon framework
carbon_ok=no
-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
-@@ -32,6 +32,7 @@
-
- #include "dom.h"
-
-+#include <glib.h>
-
- namespace org
- {
-diff -Nurd inkscape-0.46.orig/src/dom/util/ziptool.h
inkscape-0.46/src/dom/util/ziptool.h
---- inkscape-0.46.orig/src/dom/util/ziptool.h 2008-03-11 00:19:32.000000000
-0400
-+++ inkscape-0.46/src/dom/util/ziptool.h 2008-04-25 02:39:17.000000000
-0400
-@@ -32,6 +32,7 @@
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
+diff -Nurd -x'*~' inkscape-0.48.2.orig/src/Makefile.in
inkscape-0.48.2/src/Makefile.in
+--- inkscape-0.48.2.orig/src/Makefile.in 2011-07-08 15:25:02.000000000
-0400
++++ inkscape-0.48.2/src/Makefile.in 2011-12-13 16:55:27.000000000 -0500
+@@ -2438,6 +2438,9 @@
+ # Add Inkview-only sources here.
+ inkview_SOURCES = inkview.cpp $(win32_sources)
+ INCLUDES = \
++ -I$(top_srcdir)/cxxtest \
++ -I$(srcdir)/bind/javainc \
++ -I$(srcdir)/bind/javainc/linux \
+ $(PERL_CFLAGS) $(PYTHON_CFLAGS) \
+ $(FREETYPE_CFLAGS) \
+ $(GNOME_PRINT_CFLAGS) \
+@@ -2451,10 +2454,7 @@
+ $(POPPLER_GLIB_CFLAGS) \
+ -DPOTRACE=\"potrace\" \
+ $(INKSCAPE_CFLAGS) \
+- -I$(top_srcdir)/cxxtest \
+ $(WIN32_CFLAGS) \
+- -I$(srcdir)/bind/javainc \
+- -I$(srcdir)/bind/javainc/linux \
+ $(AM_CPPFLAGS)
-+#include <glib.h>
+ CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl
+diff -Nurd -x'*~' inkscape-0.48.2.orig/src/box3d.cpp
inkscape-0.48.2/src/box3d.cpp
+--- inkscape-0.48.2.orig/src/box3d.cpp 2011-07-08 14:25:09.000000000 -0400
++++ inkscape-0.48.2/src/box3d.cpp 2011-12-09 15:42:12.000000000 -0500
+@@ -431,6 +431,9 @@
+ static double remember_snap_threshold = 30;
+ static guint remember_snap_index = 0;
- #include <vector>
- #include <string>
-diff -Nurd inkscape-0.46.orig/src/dom/xmlreader.h
inkscape-0.46/src/dom/xmlreader.h
---- inkscape-0.46.orig/src/dom/xmlreader.h 2008-03-11 00:19:32.000000000
-0400
-+++ inkscape-0.46/src/dom/xmlreader.h 2008-04-25 02:39:17.000000000 -0400
-@@ -39,6 +39,7 @@
- namespace dom
- {
++// constant for sizing the array of points to be considered:
++static const int MAX_POINT_COUNT = 4;
++
+ static Proj::Pt3
+ box3d_snap (SPBox3D *box, int id, Proj::Pt3 const &pt_proj, Proj::Pt3 const
&start_pt) {
+ double z_coord = start_pt[Proj::Z];
+@@ -460,7 +463,7 @@
+ Box3D::Line diag2(A, E); // diag2 is only taken into account if id equals
-1, i.e., if we are snapping the center
-+#include <glib.h>
+ int num_snap_lines = (id != -1) ? 3 : 4;
+- Geom::Point snap_pts[num_snap_lines];
++ Geom::Point snap_pts[MAX_POINT_COUNT];
+ snap_pts[0] = pl1.closest_to (pt);
+ snap_pts[1] = pl2.closest_to (pt);
+@@ -472,7 +475,7 @@
+ gdouble const zoom = inkscape_active_desktop()->current_zoom();
- class XmlReader
-diff -Nurd inkscape-0.46.orig/src/dom/xpathparser.h
inkscape-0.46/src/dom/xpathparser.h
---- inkscape-0.46.orig/src/dom/xpathparser.h 2008-03-11 00:19:31.000000000
-0400
-+++ inkscape-0.46/src/dom/xpathparser.h 2008-04-25 02:39:17.000000000
-0400
-@@ -34,6 +34,8 @@
- #include <stdio.h>
- #include <stdarg.h>
+ // determine the distances to all potential snapping points
+- double snap_dists[num_snap_lines];
++ double snap_dists[MAX_POINT_COUNT];
+ for (int i = 0; i < num_snap_lines; ++i) {
+ snap_dists[i] = Geom::L2 (snap_pts[i] - pt) * zoom;
+ }
+diff -Nurd -x'*~' inkscape-0.48.2.orig/src/graphlayout.cpp
inkscape-0.48.2/src/graphlayout.cpp
+--- inkscape-0.48.2.orig/src/graphlayout.cpp 2011-07-08 14:25:09.000000000
-0400
++++ inkscape-0.48.2/src/graphlayout.cpp 2011-12-09 15:59:40.000000000
-0500
+@@ -155,11 +155,12 @@
+ ++i)
+ {
+ SPItem *iu=*i;
+- map<string,unsigned>::iterator i=nodelookup.find(iu->getId());
+- if(i==nodelookup.end()) {
++ map<string,unsigned>::iterator i_iter=nodelookup.find(iu->getId());
++ map<string,unsigned>::iterator i_iter_end=nodelookup.end();
++ if(i_iter==i_iter_end) {
+ continue;
+ }
+- unsigned u=i->second;
++ unsigned u=i_iter->second;
+ GSList *nlist=iu->avoidRef->getAttachedConnectors(Avoid::runningFrom);
+ list<SPItem *> connectors;
-+#include <glib.h>
-+
- #include <string>
- #include <vector>
+diff -Nurd -x'*~' inkscape-0.48.2.orig/src/ui/widget/registered-widget.h
inkscape-0.48.2/src/ui/widget/registered-widget.h
+--- inkscape-0.48.2.orig/src/ui/widget/registered-widget.h 2011-07-08
14:25:09.000000000 -0400
++++ inkscape-0.48.2/src/ui/widget/registered-widget.h 2011-12-09
15:47:53.000000000 -0500
+@@ -61,9 +61,6 @@
-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
-@@ -14,6 +14,7 @@
+ bool is_updating() {if (_wr) return _wr->isUpdating(); else return false;}
- #include <cstdio>
- #include <glibmm.h>
-+#include <glib.h>
+- // provide automatic 'upcast' for ease of use. (do it 'dynamic_cast'
instead of 'static' because who knows what W is)
+- operator const Gtk::Widget () { return dynamic_cast<Gtk::Widget*>(this); }
+-
+ protected:
+ RegisteredWidget() : W() { construct(); }
+ template< typename A >
+diff -Nurd -x'*~' inkscape-0.48.2.orig/src/widgets/desktop-widget.h
inkscape-0.48.2/src/widgets/desktop-widget.h
+--- inkscape-0.48.2.orig/src/widgets/desktop-widget.h 2011-07-08
14:25:09.000000000 -0400
++++ inkscape-0.48.2/src/widgets/desktop-widget.h 2011-12-09
15:52:21.000000000 -0500
+@@ -239,7 +239,7 @@
+ private:
+ GtkWidget *tool_toolbox;
+ GtkWidget *aux_toolbox;
+- GtkWidget *commands_toolbox,;
++ GtkWidget *commands_toolbox;
+ GtkWidget *snap_toolbox;
- namespace Inkscape
- {
+ static void init(SPDesktopWidget *widget);
Index: inkscape.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/inkscape.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- inkscape.info 10 Nov 2011 20:58:52 -0000 1.8
+++ inkscape.info 31 Dec 2011 21:21:51 -0000 1.9
@@ -1,119 +1,149 @@
Package: inkscape
-Version: 0.48.0
+Version: 0.48.2
Revision: 1
GCC: 4.0
-Maintainer: Todai Fink Team <f...@sodan.ecc.u-tokyo.ac.jp>
-Depends: <<
- atk1-shlibs (>= 1.24.0-1),
- cairo-shlibs (>= 1.8-1),
- cairomm1-shlibs (>= 1.6.4-1),
- fontconfig2-shlibs (>= 2.4.1-1),
- freetype219-shlibs(>= 2.3.7-7),
+Maintainer: Daniel Macks <dma...@netspace.org>
+Depends: <<
+ aspell-shlibs (>= 0.60.5-1002),
+ atk1-shlibs (>= 1.28.0-1),
+ cairo-shlibs (>= 1.8.8-3),
+ cairomm1-shlibs (>= 1.8.2-3),
+ default-icon-theme,
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
gc-shlibs (>= 6.4-1001),
- gconf2-shlibs (>= 2.24.0-1),
- glib2-shlibs (>= 2.18.0-1),
- glibmm2.4-shlibs (>= 2.18.0-1),
- gnome-vfs2-unified (>= 1:2.24.0-1),
- gtk+2-shlibs (>= 2.14.0-1),
- gtkmm2.4-shlibs (>= 2.14.0-1),
+ gconf2-shlibs (>= 2.28.0-1),
+ glib2-shlibs (>= 2.22.0-1),
+ glibmm2.4-shlibs (>= 2.22.0-1),
+ gnome-vfs2-unified-shlibs (>= 1:2.24.0-1),
+ gsl-shlibs (>= 1.15-1),
+ gtk+2-shlibs (>= 2.18.0-1),
+ gtkmm2.4-shlibs (>= 2.18.0-1),
gtkspell2-shlibs (>= 2.0.14-1),
+ imagemagick2-shlibs,
lcms-shlibs (>= 1.13-1),
- libgettext3-shlibs,
+ libgettext8-shlibs,
libiconv,
libpng14-shlibs,
libsigc++2-shlibs (>= 2.0.17-1001),
- libxml2-shlibs (>= 2.6.30-1),
+ libwpd-0.8-shlibs,
+ libwpg-shlibs,
+ libxml2-shlibs (>= 2.7.8-1),
libxslt-shlibs (>= 1.1.22-1),
- pango1-xft2-ft219 (>= 1.22.0-4),
- pango1-xft2-ft219-shlibs (>= 1.22.0-4),
+ pango1-xft2-ft219 (>= 1.24.5-4),
+ pango1-xft2-ft219-shlibs (>= 1.24.5-4),
pangomm1.4.1-shlibs,
poppler4-shlibs,
poppler4-glib-shlibs,
popt-shlibs,
- gsl-shlibs,
- default-icon-theme,
x11
<<
BuildDepends: <<
- atk1 (>= 1.20.0-1),
- boost1.35.nopython,
- cairo (>= 1.8-1),
- cairomm1 (>= 1.6.4-1),
- fink (>= 0.24.12-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
+ aspell-dev (>= 0.60.5-1002),
+ atk1 (>= 1.28.0-1),
+ boost1.46.1.cmake,
+ cairo (>= 1.8.8-3),
+ cairomm1 (>= 1.8.2-3),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
gc (>= 6.4-1001),
- gconf2-dev (>= 2.24.0-1),
+ gconf2-dev (>= 2.28.0-1),
gettext-bin,
gettext-tools,
- glib2-dev (>= 2.18.0-1),
- glibmm2.4-dev (>= 2.18.0-1),
+ glib2-dev (>= 2.22.0-1),
+ glibmm2.4-dev (>= 2.22.0-1),
glitz,
- gnome-vfs2-unified-dev (>= 1:2.24.0-1),
- gtk+2-dev (>= 2.14.0-1),
- gtkmm2.4-gtk-dev (>= 2.14.0-1),
+ gnome-vfs2-unified-dev (>= 1:2.24.2-1),
+ gsl (>= 1.15-1),
+ gtk+2-dev (>= 2.18.0-1),
+ gtkmm2.4-gtk-dev (>= 2.18.0-1),
gtkspell2-dev (>= 2.0.14-1),
+ imagemagick2-dev,
intltool40,
lcms (>= 1.13-1),
libart2,
- libgettext3-dev,
+ libgettext8-dev,
libiconv-dev,
libpng14,
libsigc++2 (>= 2.0.17-1001),
- libxml2 (>= 2.6.30-1),
+ libwpd-0.8-dev,
+ libwpg-dev,
+ libxml2 (>= 2.7.8-1),
libxslt (>= 1.1.22-1),
orbit2-dev (>= 2.14.16-1),
- pango1-xft2-ft219-dev (>= 1.22.0-4),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
pangomm1.4.1,
- pixman (>= 0.12.0-1),
+ pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
poppler4,
poppler4-glib,
poppler4-xpdf,
popt,
- gsl,
- dbus-dev,
- x11-dev,
- xft2-dev
+ x11-dev
<<
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"
+Source-MD5: f60b98013bd1121b2cc301f3485076ba
+ConfigureParams: --mandir=%p/share/man --with-xft --enable-dependency-tracking
--with-gnome-vfs --enable-lcms
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
PatchFile: %n.patch
-PatchFile-MD5: 2f50d1936394305d6f3a0f8d79e88e62
+PatchFile-MD5: 73663860dae7e05589437f3b19e3599d
PatchScript: <<
%{default_script}
+
+# # configure.ac needs token to find version in 'gcc -v' output
+# # should rewrite as AC_TRY_RUN with .c comparison of macros:
+# # __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__
+# perl -pi -e 's/gcc version/clang version/' configure
<<
CompileScript: <<
+#!/bin/sh -ev
+
+ # Lots of the source isn't compatible with clang, so we drop
+ # back to legacy compiler if fink (or a new xcode suite from
+ # apple?) is mapping g++ -> clang++ (cannot simply do this
+ # everywhere, since may not have the legacy-name available if
+ # there's no newer one and/or may not have it wrapped for fink
+ # single-arch)
+ if g++ -v 2>&1 | grep -q clang; then
+ export CC=llvm-gcc-4.2
+ export CXX=llvm-g++-4.2
+ fi
+
./configure %c
- make
+ make V=1
+ fink-package-precedence .
<<
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po NEWS README*
TRANSLATORS
Description: SVG application
DescPort: <<
- dmacks: fix -I ordering. See:
- https://bugs.launchpad.net/inkscape/+bug/195214
-
- Insert <glib.h> into many places due to inertia from previous
- versions of the package.
-
- Upgrade gtk include usage. See:
- https://bugs.launchpad.net/inkscape/+bug/282338
-
Add explicit link to libX11. See:
https://bugs.launchpad.net/inkscape/+bug/282338
+
+ Cherry-pick clang-support patches from upstream bzr repo:
+ constant array-size (box3d.cpp)
+ bad type-conversion (registered-widget.h)
+ stray comma (desktop-widget.h)
+ reuse of "i" variable (graphlayout.cpp)
<<
DescPackaging: <<
Formerly maintained by Michael Wybrow
+ then by Todai Fink Team
Needs the older xpdf interface to poppler. See:
- https://bugs.launchpad.net/inkscape/+bug/168980
+ https://bugs.launchpad.net/inkscape/+bug/903919
Could convert to use external potrace?
Could convert to use external croco?
+ See: https://bugs.launchpad.net/inkscape/+bug/648246
Could convert to use external libgdl?
+ See: https://bugs.launchpad.net/inkscape/+bug/792115
+
+ Giving up on clang because there is too much incompatible.
+
+ Would need some hacking to be buildable with libpng15
+ https://bugs.launchpad.net/inkscape/+bug/721029
<<
Homepage: http://www.inkscape.org/
License: GPL
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
