[SCM] QJson library packaging branch, master, updated. debian/0.8.1-3-5-g1ecc13d

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/qjson.git;a=commitdiff;h=1ecc13d

The following commit has been merged in the master branch:
commit 1ecc13d1db2994db12bdd827abfd57eb2e864234
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Nov 10 15:56:28 2015 -0300

    Add testscannerfix.patch.
---
 debian/changelog                    |  3 ++-
 debian/patches/testscannerfix.patch | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b15d468..f93a5ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-qjson (0.8.1+git103-gee054a7) UNRELEASED; urgency=medium
+qjson (0.8.1+git103-gee054a7-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot.
   * Refresh enable_multiarch.patch.
+  * Add testscannerfix.patch, solving an issue while building the tests.
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 09 Mar 2014 00:18:52 -0300
 
diff --git a/debian/patches/testscannerfix.patch b/debian/patches/testscannerfix.patch
new file mode 100644
index 0000000..e68fee1
--- /dev/null
+++ b/debian/patches/testscannerfix.patch
@@ -0,0 +1,35 @@
+Description: Also use the fix of issue #63 on !WIN32
+ JsonScanner is not for export, but required while building the tests.
+ The fix already appeared in
+ https://github.com/flavio/qjson/commit/eb76d1d5dcebeeb26383cb5ae09e7ab90b6a0f6b
+ but it's also necessary in !WIN32 while building shared libraries.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: https://github.com/flavio/qjson/issues/81
+
+---
+ src/CMakeLists.txt           |    2 +-
+ tests/scanner/CMakeLists.txt |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES(.)
+ # Special hack to fix scanner test compilation on Windows
+ # JsonScanner class is not for export. So need to make static
+ # lib what can be compiled against scanner test.
+-if(WIN32 AND QJSON_BUILD_TESTS AND BUILD_SHARED_LIBS)
++if(QJSON_BUILD_TESTS AND BUILD_SHARED_LIBS)
+   add_library(qjson_scanner STATIC json_scanner.cpp)
+ endif()
+ 
+--- a/tests/scanner/CMakeLists.txt
++++ b/tests/scanner/CMakeLists.txt
+@@ -31,7 +31,7 @@ FOREACH(test ${UNIT_TESTS})
+     ${test}.cpp
+   )
+ 
+-  if(WIN32 AND BUILD_SHARED_LIBS)
++  if(BUILD_SHARED_LIBS)
+     set(QJSON_SCANNER qjson_scanner)
+   endif()
+ 

-- 
QJson library packaging