Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[10757] trunk/debian
|
From: <and...@us...> - 2010-01-19 00:11:37
|
Revision: 10757
http://plplot.svn.sourceforge.net/plplot/?rev=10757&view=rev
Author: andrewross
Date: 2010-01-19 00:11:03 +0000 (Tue, 19 Jan 2010)
Log Message:
-----------
Update debian build to backport wxwidget fix for cmake 2.8.0 from svn.
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/control.in
trunk/debian/patches/series
Added Paths:
-----------
trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2010-01-15 19:38:54 UTC (rev 10756)
+++ trunk/debian/changelog 2010-01-19 00:11:03 UTC (rev 10757)
@@ -17,6 +17,9 @@
which should work for all architectures.
+ Update ada packages so built on all architectures except armel where gnat
seems to be unavailable. (closes: #544187)
+ * debian/patches/16_wxwidget-with-cmake-2.8.diff: New patch ported from
+ upstream to fix wxwidget build with cmake 2.8.0.
+ * debian/control.in: Bump wxgtk version to 2.8. Require cmake 2.8.0 to build.
-- Andrew Ross <and...@us...> Wed, 23 Aug 2009 12:05:07 +0100
Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in 2010-01-15 19:38:54 UTC (rev 10756)
+++ trunk/debian/control.in 2010-01-19 00:11:03 UTC (rev 10757)
@@ -4,14 +4,14 @@
Maintainer: Andrew Ross <and...@us...>
Uploaders: Rafael Laboissiere <ra...@de...>
Standards-Version: 3.8.3
-Build-Depends: cmake (>= 2.4.5), debhelper (>= 7),
+Build-Depends: cmake (>= 2.8.0), debhelper (>= 7),
tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2),
libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev,
libgnomeprintui2.2-dev, libgnomeui-dev,
m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl,
libltdl3-dev, pkg-config, quilt, slice,
- python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev,
+ python-gtk2-dev, libwxgtk2.8-dev, python-gnome2-dev,
python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk,
fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64]
Added: trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff
===================================================================
--- trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff (rev 0)
+++ trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff 2010-01-19 00:11:03 UTC (rev 10757)
@@ -0,0 +1,71 @@
+# Patch from upstream to ensure wxwidgets support works with cmake 2.8.0
+
+diff -ur plplot-5.9.2-orig/cmake/modules/wxwidgets.cmake plplot-5.9.2/cmake/modules/wxwidgets.cmake
+--- plplot-5.9.2.orig/cmake/modules/wxwidgets.cmake 2009-01-18 20:24:12.000000000 +0000
++++ plplot-5.9.2/cmake/modules/wxwidgets.cmake 2010-01-18 23:52:40.000000000 +0000
+@@ -58,12 +58,21 @@
+ wxwidgets_COMPILE_FLAGS
+ "-I${wxWidgets_INCLUDE_DIRS}"
+ )
+- # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8)
+- # when wxWidgets_DEFINITIONS is a list.
++ string(REGEX REPLACE ";" " -D"
++ wxWidgets_DEFINITIONS_wD
++ "-D${wxWidgets_DEFINITIONS}"
++ )
++ set(wxWidgets_DEFINITIONS_DEBUG_wD "")
++ if(wxWidgets_DEFINITIONS_DEBUG)
++ string(REGEX REPLACE ";" " -D"
++ wxWidgets_DEFINITIONS_DEBUG_wD
++ "-D${wxWidgets_DEFINITIONS_DEBUG}"
++ )
++ endif(wxWidgets_DEFINITIONS_DEBUG)
+ string(REGEX REPLACE ";" " "
+ wxwidgets_COMPILE_FLAGS
+ ${wxwidgets_COMPILE_FLAGS}
+- " ${wxWidgets_DEFINITIONS}"
++ " ${wxWidgets_DEFINITIONS_wD} ${wxWidgets_DEFINITIONS_DEBUG_wD}"
+ )
+ # Convert wxWidgets_LIBRARIES to full pathname form.
+ cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}")
+diff -ur plplot-5.9.2.orig/bindings/wxwidgets/CMakeLists.txt plplot-5.9.2/bindings/wxwidgets/CMakeLists.txt
+--- plplot-5.9.2.orig/bindings/wxwidgets/CMakeLists.txt 2009-01-18 20:24:12.000000000 +0000
++++ plplot-5.9.2/bindings/wxwidgets/CMakeLists.txt 2010-01-18 23:55:55.000000000 +0000
+@@ -54,9 +54,18 @@
+ endif(BUILD_SHARED_LIBS)
+
+ INCLUDE_DIRECTORIES( ${wxWidgets_INCLUDE_DIRS} )
+- ADD_DEFINITIONS( ${wxWidgets_DEFINITIONS} )
+
+- target_link_libraries(
++ IF(wxWidgets_DEFINITIONS)
++ SET_PROPERTY(DIRECTORY APPEND
++ PROPERTY COMPILE_DEFINITIONS ${wxWidgets_DEFINITIONS})
++ ENDIF(wxWidgets_DEFINITIONS)
++
++ IF(wxWidgets_DEFINITIONS_DEBUG)
++ SET_PROPERTY(DIRECTORY APPEND
++ PROPERTY COMPILE_DEFINITIONS_DEBUG ${wxWidgets_DEFINITIONS_DEBUG})
++ ENDIF(wxWidgets_DEFINITIONS_DEBUG)
++
++target_link_libraries(
+ plplotwxwidgets${LIB_TAG}
+ plplotcxx${LIB_TAG}
+ ${wxwidgets_LINK_FLAGS}
+@@ -101,9 +110,14 @@
+ endif(LIB_TAG)
+
+ # Determine libplplotwxwidgets${LIB_TAG}_COMPILE_FLAGS
+- STRING(REGEX REPLACE ";" " "
++ set(wxWidgets_DEFINITIONS_all "${wxWidgets_DEFINITIONS}")
++ if(wxWidgets_DEFINITIONS_DEBUG)
++ set(wxWidgets_DEFINITIONS_all "${wxWidgets_DEFINITIONS};${wxWidgets_DEFINITIONS_DEBUG}")
++ endif(wxWidgets_DEFINITIONS_DEBUG)
++
++ STRING(REGEX REPLACE ";" " -D"
+ libplplotwxwidgets${LIB_TAG}_COMPILE_FLAGS
+- "${wxWidgets_DEFINITIONS}"
++ "-D${wxWidgets_DEFINITIONS_all}"
+ )
+ STRING(REGEX REPLACE ";" " -I"
+ wxWidgets_IFLAGS
Property changes on: trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2010-01-15 19:38:54 UTC (rev 10756)
+++ trunk/debian/patches/series 2010-01-19 00:11:03 UTC (rev 10757)
@@ -5,3 +5,4 @@
13_fix-kfreeBSD-build.diff
14_octave-3.0-fixes.diff
15_octave-toggle-plplot-use.diff
+16_wxwidget-with-cmake-2.8.diff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
