[120051] trunk/dports/graphics/lib2geom
devans at macports.org
devans at macports.org
Wed May 14 12:08:11 PDT 2014
Revision: 120051
https://trac.macports.org/changeset/120051
Author: devans at macports.org
Date: 2014-05-14 12:08:11 -0700 (Wed, 14 May 2014)
Log Message:
-----------
lib2geom: update to bzr 2188, update patchfiles.
Modified Paths:
--------------
trunk/dports/graphics/lib2geom/Portfile
Added Paths:
-----------
trunk/dports/graphics/lib2geom/files/patch-pow-ambiguous.diff
Removed Paths:
-------------
trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff
Modified: trunk/dports/graphics/lib2geom/Portfile
===================================================================
--- trunk/dports/graphics/lib2geom/Portfile 2014-05-14 17:12:00 UTC (rev 120050)
+++ trunk/dports/graphics/lib2geom/Portfile 2014-05-14 19:08:11 UTC (rev 120051)
@@ -5,7 +5,7 @@
PortGroup cmake 1.0
name lib2geom
-bzr.revision 2182
+bzr.revision 2188
version 0.3-${bzr.revision}
license {LGPL-2.1 MPL-1.1}
maintainers devans openmaintainer
@@ -30,8 +30,8 @@
port:boost \
port:gsl
-patchfiles patch-CMakeLists.txt.diff \
- patch-src-2geom-CMakeLists.txt.diff
+patchfiles patch-src-2geom-CMakeLists.txt.diff \
+ patch-pow-ambiguous.diff
configure.args-append \
-D2GEOM_BUILD_SHARED=YES
Deleted: trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff 2014-05-14 17:12:00 UTC (rev 120050)
+++ trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff 2014-05-14 19:08:11 UTC (rev 120051)
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig 2013-11-25 11:43:20.000000000 -0800
-+++ CMakeLists.txt 2013-11-25 11:48:07.000000000 -0800
-@@ -30,7 +30,7 @@
- ENDIF(pycairo_FOUND)
-
- # Set Compiler Flags
--SET(CXX_WARNINGS_FLAGS "-Wall -Wformat -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch -Werror=return-type")
-+SET(CXX_WARNINGS_FLAGS "-Wall -Wformat -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch -Wreturn-type")
- # set the general CXX flags, note that subproject folders may add to this list for themselves
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTK2_CFLAGS} ${cairo_CFLAGS} ${gsl_CFLAGS} ${pycairo_CFLAGS} ${CXX_WARNINGS_FLAGS} -O2")
-
Added: trunk/dports/graphics/lib2geom/files/patch-pow-ambiguous.diff
===================================================================
--- trunk/dports/graphics/lib2geom/files/patch-pow-ambiguous.diff (rev 0)
+++ trunk/dports/graphics/lib2geom/files/patch-pow-ambiguous.diff 2014-05-14 19:08:11 UTC (rev 120051)
@@ -0,0 +1,108 @@
+diff -ur src/2geom.orig/toys/boolops-topo.cpp src/2geom/toys/boolops-topo.cpp
+--- src/2geom.orig/toys/boolops-topo.cpp 2014-05-14 11:12:00.000000000 -0700
++++ src/2geom/toys/boolops-topo.cpp 2014-05-14 11:19:40.000000000 -0700
+@@ -19,7 +19,7 @@
+
+ #include "topology.cpp"
+
+-static double exp_rescale(double x){ return pow(10, x);}
++static double exp_rescale(double x){ return pow(10.0, x);}
+ std::string exp_formatter(double x){ return default_formatter(exp_rescale(x));}
+
+
+diff -ur src/2geom.orig/toys/intersect-data.cpp src/2geom/toys/intersect-data.cpp
+--- src/2geom.orig/toys/intersect-data.cpp 2014-05-14 11:12:00.000000000 -0700
++++ src/2geom/toys/intersect-data.cpp 2014-05-14 11:20:07.000000000 -0700
+@@ -20,7 +20,7 @@
+ #include "topology.cpp"
+
+
+-static double exp_rescale(double x){ return pow(10, x);}
++static double exp_rescale(double x){ return pow(10.0, x);}
+ std::string exp_formatter(double x){ return default_formatter(exp_rescale(x));}
+
+
+diff -ur src/2geom.orig/toys/levelsets-test.cpp src/2geom/toys/levelsets-test.cpp
+--- src/2geom.orig/toys/levelsets-test.cpp 2014-05-14 11:12:00.000000000 -0700
++++ src/2geom/toys/levelsets-test.cpp 2014-05-14 11:21:03.000000000 -0700
+@@ -9,7 +9,7 @@
+ using namespace std;
+ using namespace Geom;
+
+-static double exp_rescale(double x){ return std::pow(10, x);}
++static double exp_rescale(double x){ return std::pow(10.0, x);}
+ std::string exp_formatter(double x){ return default_formatter(exp_rescale(x));}
+
+
+diff -ur src/2geom.orig/toys/pencil-2.cpp src/2geom/toys/pencil-2.cpp
+--- src/2geom.orig/toys/pencil-2.cpp 2014-05-14 11:12:00.000000000 -0700
++++ src/2geom/toys/pencil-2.cpp 2014-05-14 11:21:44.000000000 -0700
+@@ -982,7 +982,7 @@
+ cairo_stroke(cr);
+ ostringstream val_s;
+ double scale0=(450-adjuster2.pos[1])/300;
+- double curve_precision = pow(10, scale0*5-2);
++ double curve_precision = pow(10.0, scale0*5-2);
+ val_s << curve_precision;
+ draw_text(cr, adjuster2.pos, val_s.str().c_str());
+ cairo_restore(cr);
+diff -ur src/2geom.orig/toys/pencil.cpp src/2geom/toys/pencil.cpp
+--- src/2geom.orig/toys/pencil.cpp 2014-05-14 11:12:00.000000000 -0700
++++ src/2geom/toys/pencil.cpp 2014-05-14 11:22:10.000000000 -0700
+@@ -275,7 +275,7 @@
+ cairo_stroke(cr);
+ ostringstream val_s;
+ double scale0=(450-adjuster2.pos[1])/300;
+- double curve_precision = pow(10, scale0*5-2);
++ double curve_precision = pow(10.0, scale0*5-2);
+ val_s << curve_precision;
+ draw_text(cr, adjuster2.pos, val_s.str().c_str());
+
+diff -ur src/2geom.orig/toys/sb-to-bez.cpp src/2geom/toys/sb-to-bez.cpp
+--- src/2geom.orig/toys/sb-to-bez.cpp 2014-05-14 11:12:00.000000000 -0700
++++ src/2geom/toys/sb-to-bez.cpp 2014-05-14 11:22:43.000000000 -0700
+@@ -330,7 +330,7 @@
+ cairo_stroke(cr);
+ ostringstream val_s;
+ double scale0=(450-adjuster2.pos[1])/300;
+- double curve_precision = pow(10, scale0*5-2);
++ double curve_precision = pow(10.0, scale0*5-2);
+ val_s << curve_precision;
+ draw_text(cr, adjuster2.pos, val_s.str().c_str());
+
+diff -ur src/2geom.orig/toys/sketch-fitter.cpp src/2geom/toys/sketch-fitter.cpp
+--- src/2geom.orig/toys/sketch-fitter.cpp 2014-05-14 11:24:53.000000000 -0700
++++ src/2geom/toys/sketch-fitter.cpp 2014-05-14 11:25:25.000000000 -0700
+@@ -284,7 +284,7 @@
+
+ double exp_rescale(double x)
+ {
+- return pow(10, x*5-2);
++ return pow(10.0, x*5-2);
+ }
+ std::string exp_formatter(double x)
+ {
+diff -ur src/2geom.orig/toys/smash-intersector.cpp src/2geom/toys/smash-intersector.cpp
+--- src/2geom.orig/toys/smash-intersector.cpp 2014-05-14 11:12:00.000000000 -0700
++++ src/2geom/toys/smash-intersector.cpp 2014-05-14 11:25:51.000000000 -0700
+@@ -59,7 +59,7 @@
+
+ #define VERBOSE 0
+
+-static double exp_rescale(double x){ return ::pow(10, x);}
++static double exp_rescale(double x){ return ::pow(10.0, x);}
+ std::string exp_formatter(double x){ return default_formatter(exp_rescale(x));}
+
+
+diff -ur src/2geom.orig/toys/sweeper-toy.cpp src/2geom/toys/sweeper-toy.cpp
+--- src/2geom.orig/toys/sweeper-toy.cpp 2014-05-14 11:12:00.000000000 -0700
++++ src/2geom/toys/sweeper-toy.cpp 2014-05-14 11:26:34.000000000 -0700
+@@ -22,7 +22,7 @@
+
+ #include "sweeper.cpp"
+
+-double exp_rescale(double x){ return pow(10, x);}
++double exp_rescale(double x){ return pow(10.0, x);}
+ std::string exp_formatter(double x){ return default_formatter(exp_rescale(x));}
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140514/cc229de9/attachment.html>
More information about the macports-changes
mailing list