[med-svn] r15020 - trunk/packages/papyrus/trunk/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2013-10-28 14:38:19 +0000 (Mon, 28 Oct 2013)
New Revision: 15020

Added:
   trunk/packages/papyrus/trunk/debian/patches/fixcmake.patch
Modified:
   trunk/packages/papyrus/trunk/debian/patches/series
Log:
Compile as C lib instead of mixed C++

Added: trunk/packages/papyrus/trunk/debian/patches/fixcmake.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/fixcmake.patch	                        (rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/fixcmake.patch	2013-10-28 14:38:19 UTC (rev 15020)
@@ -0,0 +1,76 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ papyrus (3.7.1-1) unstable; urgency=low
+ .
+   * Initial release. (Closes: #)
+Author: Mathieu Malaterre <malat at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- papyrus-3.7.1.orig/CMakeLists.txt
++++ papyrus-3.7.1/CMakeLists.txt
+@@ -92,6 +92,14 @@ list(APPEND SOURCES
+     JpegDir/JpgLless/READ.C
+     JpegDir/JpgLless/WRITE.C
+     )
++  set_source_files_properties(
++    JpegDir/JpgLless/IO.H
++    JpegDir/JpgLless/JPEG.H
++    JpegDir/JpgLless/JPEGLESS.H
++    JpegDir/JpgLless/MCU.H
++    JpegDir/JpgLless/PREDICT.H
++    JpegDir/JpgLless/PROTO.H
++    PROPERTIES LANGUAGE C)
+ 
+ list(APPEND SOURCES 
+      JpegDir/JpgLossy/JCAPIMIN.C
+@@ -151,6 +159,7 @@ list(APPEND SOURCES
+      )
+ 
+ add_library(Papyrus3 ${SOURCES})
++set_target_properties(Papyrus3 PROPERTIES COMPILE_FLAGS "-x c")
+ set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
+ set_target_properties(Papyrus3 PROPERTIES LINKER_LANGUAGE C)
+ #target_link_libraries(Papyrus3 DicomDir JpgLless JpgLossy)
+--- papyrus-3.7.1.orig/JpegDir/JpgLless/CMakeLists.txt
++++ papyrus-3.7.1/JpegDir/JpgLless/CMakeLists.txt
+@@ -11,9 +11,8 @@ set(SOURCES
+ 	READ.C
+ 	WRITE.C
+ 	)
+-
+-set_source_files_properties(PROTO.H PROPERTIES LANGUAGE "C")
++set_source_files_properties(PROTO.H PROPERTIES LANGUAGE C)
+ 
+ add_library(JpgLless ${SOURCES})
+-set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE "C")
+-set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE "C")
++set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
++set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE C)
+--- papyrus-3.7.1.orig/TESTS/CMakeLists.txt
++++ papyrus-3.7.1/TESTS/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # Tests
+ add_executable(TestRead TestRead.c)
+ target_link_libraries(TestRead Papyrus3)
+-#set_source_files_properties(TestRead.c PROPERTIES LANGUAGE CXX)
++set_source_files_properties(TestRead.c PROPERTIES LANGUAGE C)
+ 
+ #add_executable(TestWrite TestWrite.c)
+ #target_link_libraries(TestWrite Papyrus3)

Modified: trunk/packages/papyrus/trunk/debian/patches/series
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/series	2013-10-28 14:32:32 UTC (rev 15019)
+++ trunk/packages/papyrus/trunk/debian/patches/series	2013-10-28 14:38:19 UTC (rev 15020)
@@ -5,3 +5,4 @@
 redo.patch
 ya.patch
 fixcxx.patch
+fixcmake.patch