[hamradio-commits] [cubicsdr] 05/11: Refresh patches

[Andreas E. Bombe]

This is an automated email from the git hooks/post-receive script.

aeb pushed a commit to branch master
in repository cubicsdr.

commit e1b942f55a64cae8c6dbe854376237c1c8963139
Author: Andreas Bombe <aeb at debian.org>
Date:   Wed Mar 8 20:52:31 2017 +0100

    Refresh patches
---
 debian/patches/disable-deb-processing | 16 +++++++++---
 debian/patches/use-system-tinyxml     | 47 ++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/debian/patches/disable-deb-processing b/debian/patches/disable-deb-processing
index 86bf82f..b120817 100644
--- a/debian/patches/disable-deb-processing
+++ b/debian/patches/disable-deb-processing
@@ -4,12 +4,22 @@ Author: Andreas Bombe <aeb at debian.org>
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -944,8 +944,6 @@
+@@ -988,9 +988,6 @@
+     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro")
+     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro")
+ 
+-    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/external/deb/deb_post.sh.in" 
+-            "${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE)
+-
+     CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CubicSDR.desktop.in"
+             "${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop" @ONLY IMMEDIATE)
+ 
+@@ -1042,8 +1039,6 @@
      INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop"
-         	DESTINATION share/applications)
+             DESTINATION share/applications)
          
 -    CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/external/deb/deb_post.sh.in" 
--			"${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE)
+-            "${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE)
      CONFIGURE_FILE(
        "${PROJECT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
        "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
diff --git a/debian/patches/use-system-tinyxml b/debian/patches/use-system-tinyxml
index 4324d43..a64249d 100644
--- a/debian/patches/use-system-tinyxml
+++ b/debian/patches/use-system-tinyxml
@@ -6,34 +6,35 @@ Author: Andreas Bombe <aeb at debian.org>
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -126,6 +126,10 @@
- include_directories(${RTAUDIO_INCLUDE_DIRS})
- SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${RTAUDIO_LIBRARIES})
+@@ -137,6 +137,11 @@
+     SET( EX_PLATFORM_NAME "x86" )
+ endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
  
++find_package(PkgConfig REQUIRED)
 +pkg_check_modules(TIXML REQUIRED tinyxml)
 +include_directories(${TIXML_INCLUDE_DIRS})
 +SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${TIXML_LIBRARIES})
 +
  
- find_package(wxWidgets COMPONENTS gl core propgrid adv base REQUIRED)
- set(wxWidgets_CONFIGURATION mswu)
-@@ -312,10 +316,6 @@
-     src/forms/SDRDevices/SDRDeviceAdd.cpp
-     src/forms/SDRDevices/SDRDeviceAddForm.cpp
- 	external/lodepng/lodepng.cpp
--	external/tinyxml/tinyxml.cpp
--	external/tinyxml/tinystr.cpp
--	external/tinyxml/tinyxmlparser.cpp
--	external/tinyxml/tinyxmlerror.cpp
- 	external/cubicvr2/math/cubic_math.cpp
+ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME})
+ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME})
+@@ -379,10 +384,6 @@
+     src/forms/Dialog/AboutDialogBase.cpp
+     src/forms/Dialog/AboutDialog.cpp
+     external/lodepng/lodepng.cpp
+-    external/tinyxml/tinyxml.cpp
+-    external/tinyxml/tinystr.cpp
+-    external/tinyxml/tinyxmlparser.cpp
+-    external/tinyxml/tinyxmlerror.cpp
+     external/cubicvr2/math/cubic_math.cpp
  )
  
-@@ -415,8 +415,6 @@
-     src/forms/SDRDevices/SDRDeviceAdd.h
-     src/forms/SDRDevices/SDRDeviceAddForm.h
- 	external/lodepng/lodepng.h
--	external/tinyxml/tinyxml.h
--	external/tinyxml/tinystr.h
- 	external/cubicvr2/math/aabb.h
- 	external/cubicvr2/math/cubic_math.h
- 	external/cubicvr2/math/cubic_types.h
+@@ -486,8 +487,6 @@
+     src/forms/Dialog/AboutDialogBase.h
+     src/forms/Dialog/AboutDialog.h
+     external/lodepng/lodepng.h
+-    external/tinyxml/tinyxml.h
+-    external/tinyxml/tinystr.h
+     external/cubicvr2/math/aabb.h
+     external/cubicvr2/math/cubic_math.h
+     external/cubicvr2/math/cubic_types.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/cubicsdr.git