SF.net SVN: gar:[22454] csw/mgar/pkg/inkscape/trunk

guengel at users.sourceforge.net guengel at users.sourceforge.net
Fri Nov 8 18:36:05 CET 2013


Revision: 22454
          http://gar.svn.sourceforge.net/gar/?rev=22454&view=rev
Author:   guengel
Date:     2013-11-08 17:36:05 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
inkscape/trunk: Added patches. Still work in progress, not guaranteed to build.

Modified Paths:
--------------
    csw/mgar/pkg/inkscape/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/inkscape/trunk/files/0000-lpe-lattice.cpp-resolve-overload-ambiguity.patch
    csw/mgar/pkg/inkscape/trunk/files/0000-round.cpp-resolve-overload-ambiguity.patch
    csw/mgar/pkg/inkscape/trunk/files/0000-svg-length.cpp-resolve-overload-ambiguity.patch

Modified: csw/mgar/pkg/inkscape/trunk/Makefile
===================================================================
--- csw/mgar/pkg/inkscape/trunk/Makefile	2013-11-08 15:38:22 UTC (rev 22453)
+++ csw/mgar/pkg/inkscape/trunk/Makefile	2013-11-08 17:36:05 UTC (rev 22454)
@@ -16,8 +16,10 @@
 PATCHFILES += 0000-desktop-widget.h-Remove-stray-comma.patch
 PATCHFILES += 0000-sp-ellipse.cpp-resolve-overload-ambiguity.patch
 PATCHFILES += 0000-fixed_point.h-Resolved-ambiguity.patch
+PATCHFILES += 0000-lpe-lattice.cpp-resolve-overload-ambiguity.patch
+PATCHFILES += 0000-round.cpp-resolve-overload-ambiguity.patch
+PATCHFILES += 0000-svg-length.cpp-resolve-overload-ambiguity.patch
 
-
 BUILD_DEP_PKGS += CSWlibwpg-dev
 BUILD_DEP_PKGS += CSWpm-xml-parser
 BUILD_DEP_PKGS += CSWlibgc-dev
@@ -46,9 +48,6 @@
 # Use this until GCC boost is moved to /opt/csw
 EXTRA_INC += $(prefix)/gxx/include
 EXTRA_LIB += $(prefix)/gxx/lib
-# Make gcc 4.8 stop yapping about stuff that was previously allowed
-EXTRA_CXXFLAGS += -fpermissive
 
-
 include gar/category.mk
 

Added: csw/mgar/pkg/inkscape/trunk/files/0000-lpe-lattice.cpp-resolve-overload-ambiguity.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-lpe-lattice.cpp-resolve-overload-ambiguity.patch	                        (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-lpe-lattice.cpp-resolve-overload-ambiguity.patch	2013-11-08 17:36:05 UTC (rev 22454)
@@ -0,0 +1,25 @@
+From fdc4bf86cf74476de9d4eb3c04a78de36ebd6cbf Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 17:07:43 +0100
+Subject: [PATCH] lpe-lattice.cpp: resolve overload ambiguity
+
+---
+ src/live_effects/lpe-lattice.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp
+index 50ecdf0..f823e3c 100644
+--- a/src/live_effects/lpe-lattice.cpp
++++ b/src/live_effects/lpe-lattice.cpp
+@@ -150,7 +150,7 @@ LPELattice::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2
+                         // corner = actual corner of the rectangle
+                         // origin = Upperleft point
+                         double dl = dot((*handles[corner+4*i] - (base + origin)), dir)/dot(dir,dir);
+-                        sb2[dim][i][corner] = dl/( dim ? height : width )*pow(4.0,ui+vi);
++                        sb2[dim][i][corner] = dl/( dim ? height : width )*pow(4.0,static_cast<int>(ui+vi));
+                     }
+                 }
+             }
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/inkscape/trunk/files/0000-round.cpp-resolve-overload-ambiguity.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-round.cpp-resolve-overload-ambiguity.patch	                        (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-round.cpp-resolve-overload-ambiguity.patch	2013-11-08 17:36:05 UTC (rev 22454)
@@ -0,0 +1,24 @@
+From b73e07efa8eb3001a331be46a1050d9422851e87 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 17:42:13 +0100
+Subject: [PATCH] round.cpp: resolve overload ambiguity.
+
+---
+ src/svg/round.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/svg/round.cpp b/src/svg/round.cpp
+index 9e7b91e..0fce122 100644
+--- a/src/svg/round.cpp
++++ b/src/svg/round.cpp
+@@ -42,6 +42,6 @@ double rround(double x)
+ double rround(double x, int k)
+ {
+ 	if (k==0) return rround(x);
+-	else return rround(x*pow(10,k)) / pow(10,k);
++	else return rround(x*pow(10.0,k)) / pow(10.0,k);
+ }
+ 
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/inkscape/trunk/files/0000-svg-length.cpp-resolve-overload-ambiguity.patch
===================================================================
--- csw/mgar/pkg/inkscape/trunk/files/0000-svg-length.cpp-resolve-overload-ambiguity.patch	                        (rev 0)
+++ csw/mgar/pkg/inkscape/trunk/files/0000-svg-length.cpp-resolve-overload-ambiguity.patch	2013-11-08 17:36:05 UTC (rev 22454)
@@ -0,0 +1,32 @@
+From f36ec4fec9096d96aeed3d9f1b1dc9e85b380b88 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 8 Nov 2013 18:34:36 +0100
+Subject: [PATCH] svg-length.cpp: resolve overload ambiguity
+
+---
+ src/svg/svg-length.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
+index ae5f758..1f1ec02 100644
+--- a/src/svg/svg-length.cpp
++++ b/src/svg/svg-length.cpp
+@@ -114,13 +114,13 @@ static unsigned sp_svg_number_write_d(gchar *buf, int bufLen, double val, unsign
+     /* Determine the actual number of fractional digits */
+     fprec = MAX(static_cast<int>(fprec), static_cast<int>(tprec) - idigits);
+     /* Round value */
+-    val += 0.5 / pow(10.0, fprec);
++    val += 0.5 / pow(10.0, static_cast<int>(fprec));
+     /* Extract integral and fractional parts */
+     double dival = floor(val);
+     double fval = val - dival;
+     /* Write integra */
+     if (idigits > (int)tprec) {
+-        i += sp_svg_number_write_ui(buf + i, (unsigned int)floor(dival/pow(10.0, idigits-tprec) + .5));
++        i += sp_svg_number_write_ui(buf + i, (unsigned int)floor(dival/pow(10.0, idigits-static_cast<int>(tprec)) + .5));
+         for(unsigned int j=0; j<(unsigned int)idigits-tprec; j++) {
+             buf[i+j] = '0';
+         }
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list