[113918] trunk/dports/graphics/lib2geom/files

[devans at macports.org]

Revision: 113918
          https://trac.macports.org/changeset/113918
Author:   devans at macports.org
Date:     2013-11-25 12:36:46 -0800 (Mon, 25 Nov 2013)
Log Message:
-----------
lib2geom: bzr 2158, fix broken patch files.

Modified Paths:
--------------
    trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff
    trunk/dports/graphics/lib2geom/files/patch-src-2geom-CMakeLists.txt.diff

Modified: trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff	2013-11-25 20:11:06 UTC (rev 113917)
+++ trunk/dports/graphics/lib2geom/files/patch-CMakeLists.txt.diff	2013-11-25 20:36:46 UTC (rev 113918)
@@ -1,15 +1,15 @@
---- CMakeLists.txt.orig	2013-10-30 14:42:50.000000000 -0700
-+++ CMakeLists.txt	2013-10-30 14:44:28.000000000 -0700
+--- 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")
  
- # enable C++11  (the required flag may depend on your compiler...
- #IF(CMAKE_COMPILER_IS_GNUCXX)
-@@ -75,7 +75,7 @@
+@@ -106,7 +106,7 @@
  ADD_CUSTOM_TARGET(uninstall
    "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
  

Modified: trunk/dports/graphics/lib2geom/files/patch-src-2geom-CMakeLists.txt.diff
===================================================================
--- trunk/dports/graphics/lib2geom/files/patch-src-2geom-CMakeLists.txt.diff	2013-11-25 20:11:06 UTC (rev 113917)
+++ trunk/dports/graphics/lib2geom/files/patch-src-2geom-CMakeLists.txt.diff	2013-11-25 20:36:46 UTC (rev 113918)
@@ -1,15 +1,17 @@
---- src/2geom/CMakeLists.txt.orig	2013-10-30 14:41:47.000000000 -0700
-+++ src/2geom/CMakeLists.txt	2013-10-30 14:42:59.000000000 -0700
-@@ -163,9 +163,9 @@
+--- src/2geom/CMakeLists.txt.orig	2013-11-25 11:38:55.000000000 -0800
++++ src/2geom/CMakeLists.txt	2013-11-25 11:41:49.000000000 -0800
+@@ -163,10 +163,10 @@
  CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/2geom.pc.in
                  ${CMAKE_BINARY_DIR}/2geom.pc @ONLY IMMEDIATE )
  INSTALL(FILES "${CMAKE_BINARY_DIR}/2geom.pc" DESTINATION lib/pkgconfig)
 -ADD_SUBDIRECTORY (toys)
 -ADD_SUBDIRECTORY (tests)
 -ADD_SUBDIRECTORY (py2geom)
+-ADD_SUBDIRECTORY (performance-tests)
 +#ADD_SUBDIRECTORY (toys)
 +#ADD_SUBDIRECTORY (tests)
 +#ADD_SUBDIRECTORY (py2geom)
++#ADD_SUBDIRECTORY (performance-tests)
  
  
- 
+ add_subdirectory(cython-bindings)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131125/c38e072e/attachment.html>