Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv1693/graphics
Modified Files:
inkscape.info inkscape.patch
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: inkscape.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/graphics/inkscape.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inkscape.patch 6 Jan 2012 20:05:31 -0000 1.3
+++ inkscape.patch 3 Jul 2012 19:50:09 -0000 1.4
@@ -1,19 +1,20 @@
-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; }
+diff -Nurd -x'*~' inkscape-0.48.3.1.orig/configure inkscape-0.48.3.1/configure
+--- inkscape-0.48.3.1.orig/configure 2012-02-18 20:43:51.000000000 -0500
++++ inkscape-0.48.3.1/configure 2012-02-21 21:44:53.000000000 -0500
+@@ -10966,7 +10966,8 @@
+ # Add X11 library if needed
+ if test "x$gtk_backend_target" = "xx11"; then
+- INKSCAPE_LIBS="$INKSCAPE_LIBS -lX11"
++ INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -I/usr/X11R6/include"
++ INKSCAPE_LIBS="$INKSCAPE_LIBS -L/usr/X11R6/lib -lX11"
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 -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 @@
+diff -Nurd -x'*~' inkscape-0.48.3.1.orig/src/Makefile.in
inkscape-0.48.3.1/src/Makefile.in
+--- inkscape-0.48.3.1.orig/src/Makefile.in 2012-02-18 20:43:50.000000000
-0500
++++ inkscape-0.48.3.1/src/Makefile.in 2012-02-21 21:44:53.000000000 -0500
+@@ -2447,6 +2447,9 @@
# Add Inkview-only sources here.
inkview_SOURCES = inkview.cpp $(win32_sources)
INCLUDES = \
@@ -23,7 +24,7 @@
$(PERL_CFLAGS) $(PYTHON_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(GNOME_PRINT_CFLAGS) \
-@@ -2451,10 +2454,7 @@
+@@ -2460,10 +2463,7 @@
$(POPPLER_GLIB_CFLAGS) \
-DPOTRACE=\"potrace\" \
$(INKSCAPE_CFLAGS) \
@@ -34,59 +35,9 @@
$(AM_CPPFLAGS)
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;
-
-+// 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
-
- 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();
-
- // 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;
-
-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
+diff -Nurd -x'*~' inkscape-0.48.3.1.orig/src/ui/widget/registered-widget.h
inkscape-0.48.3.1/src/ui/widget/registered-widget.h
+--- inkscape-0.48.3.1.orig/src/ui/widget/registered-widget.h 2011-07-08
14:25:09.000000000 -0400
++++ inkscape-0.48.3.1/src/ui/widget/registered-widget.h 2012-02-21
21:44:53.000000000 -0500
@@ -61,9 +61,6 @@
bool is_updating() {if (_wr) return _wr->isUpdating(); else return false;}
@@ -97,9 +48,9 @@
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
+diff -Nurd -x'*~' inkscape-0.48.3.1.orig/src/widgets/desktop-widget.h
inkscape-0.48.3.1/src/widgets/desktop-widget.h
+--- inkscape-0.48.3.1.orig/src/widgets/desktop-widget.h 2011-07-08
14:25:09.000000000 -0400
++++ inkscape-0.48.3.1/src/widgets/desktop-widget.h 2012-02-21
21:44:53.000000000 -0500
@@ -239,7 +239,7 @@
private:
GtkWidget *tool_toolbox;
Index: inkscape.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/graphics/inkscape.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inkscape.info 6 Jan 2012 20:05:30 -0000 1.3
+++ inkscape.info 3 Jul 2012 19:50:09 -0000 1.4
@@ -1,5 +1,5 @@
Package: inkscape
-Version: 0.48.2
+Version: 0.48.3.1
Revision: 1
GCC: 4.0
Maintainer: Daniel Macks <[email protected]>
@@ -26,8 +26,8 @@
libiconv,
libpng14-shlibs,
libsigc++2-shlibs (>= 2.0.17-1001),
- libwpd-0.8-shlibs,
- libwpg-shlibs,
+ libwpd-0.9-shlibs,
+ libwpg-0.2-shlibs,
libxml2-shlibs (>= 2.7.8-1),
libxslt-shlibs (>= 1.1.22-1),
pango1-xft2-ft219 (>= 1.24.5-4),
@@ -63,13 +63,12 @@
imagemagick2-dev,
intltool40,
lcms (>= 1.13-1),
- libart2,
libgettext8-dev,
libiconv-dev,
libpng14,
libsigc++2 (>= 2.0.17-1001),
- libwpd-0.8-dev,
- libwpg-dev,
+ libwpd-0.9-dev,
+ libwpg-0.2-dev,
libxml2 (>= 2.7.8-1),
libxslt (>= 1.1.22-1),
orbit2-dev (>= 2.14.16-1),
@@ -85,17 +84,23 @@
<<
Suggests: default-icon-theme
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: f60b98013bd1121b2cc301f3485076ba
+Source-MD5: f0fcc02088cc643634806064e7ab4ec3
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: 73663860dae7e05589437f3b19e3599d
+PatchFile-MD5: a48d5b2d9f21a8fe0d18c300614cc3e7
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__
+ # 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
+
+ # fink doesn't have gtk >= 2.22 yet, make sure
+ # we get consistent build results when it does
+ perl -pi -e 's/(gtkmm-2.4 >=) 2\.22/${1} >= 99999.FORCE.NONDETECT/g'
configure
+ perl -pi -e 's/(gtkmm-2.4 >=) 2\.24/${1} >= 99999.FORCE.NONDETECT/g'
configure
+ perl -pi -e 's/(glibmm-2.4 >=) 2\.28/${1} >= 99999.FORCE.NONDETECT/g'
configure
<<
CompileScript: <<
#!/bin/sh -ev
@@ -119,14 +124,14 @@
DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po NEWS README*
TRANSLATORS
Description: SVG application
DescPort: <<
- Add explicit link to libX11. See:
- https://bugs.launchpad.net/inkscape/+bug/282338
+# Add explicit link to libX11. See:
+# https://bugs.launchpad.net/inkscape/+bug/282338
+ -lX11 is there but need -L to find it (and may as well do -I
+ for symmetry).
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
@@ -145,6 +150,10 @@
Would need some hacking to be buildable with libpng15
https://bugs.launchpad.net/inkscape/+bug/721029
+ (still not buildable as of 0.48.3)
+
+ Uptream claims lcms2 2.2 and 2.3 are buggy on OS X, so staying
+ with older lcms lib for now.
<<
Homepage: http://www.inkscape.org/
License: GPL
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
