[med-svn] r20464 - in trunk/packages/dicomscope/trunk/debian: . patches
Gert Wollny
gert-guest at moszumanska.debian.org
Mon Nov 9 22:06:32 UTC 2015
Author: gert-guest
Date: 2015-11-09 22:06:31 +0000 (Mon, 09 Nov 2015)
New Revision: 20464
Removed:
trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp-dicom361.patch
trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch
trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch
trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch
Modified:
trunk/packages/dicomscope/trunk/debian/changelog
trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch
trunk/packages/dicomscope/trunk/debian/patches/correct_status_returns.patch
trunk/packages/dicomscope/trunk/debian/patches/series
Log:
Update patches and changelog
Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog 2015-11-09 21:53:42 UTC (rev 20463)
+++ trunk/packages/dicomscope/trunk/debian/changelog 2015-11-09 22:06:31 UTC (rev 20464)
@@ -1,3 +1,17 @@
+dicomscope (3.6.0-15) UNRELEASED; urgency=medium
+
+ [ Gert Wollny ]
+ * update build dependency to libdicom-dev (Closes: #804569)
+ * correct build with current dcmtk version merge related patches into:
+ - DSRDocument.cpp.patch
+ - correct_status_returns.patch
+ old, now removed patches were:
+ - DVPresentationState.patch
+ - dicom_2009.patch
+ - log4cplus.patch
+
+ -- Gert Wollny <gw.fossdev at gmail.com> Mon, 09 Nov 2015 23:01:01 +0100
+
dicomscope (3.6.0-14) unstable; urgency=medium
* dicomscope: Depend on libdicomscope-jni (thanks for the patch to
Deleted: trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp-dicom361.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp-dicom361.patch 2015-11-09 21:53:42 UTC (rev 20463)
+++ trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp-dicom361.patch 2015-11-09 22:06:31 UTC (rev 20464)
@@ -1,249 +0,0 @@
-diff -ru dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp dicomscope-3.6.0.new/interface/libsrc/DSRDocument.cpp
---- dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp 2015-11-03 12:18:18.000000000 +0100
-+++ dicomscope-3.6.0.new/interface/libsrc/DSRDocument.cpp 2015-11-09 22:00:14.363053534 +0100
-@@ -195,6 +195,13 @@
- }
-
-
-+#define GET_STRING_PROPERTY(getPropertyFunction) \
-+ OFString value; \
-+ OFCondition res = doc->getPropertyFunction(value, 0); \
-+ if (res.bad()) return NULL; \
-+ const char *string = value.c_str()
-+
-+
- /*
- * Class: J2Ci_jDSRDocument
- * Method: getCompletionFlagDescription
-@@ -205,7 +212,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getCompletionFlagDescription();
-+ GET_STRING_PROPERTY(getCompletionFlagDescription);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -323,7 +330,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getModality();
-+ GET_STRING_PROPERTY(getModality);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -340,8 +347,8 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getSOPClassUID();
--
-+ GET_STRING_PROPERTY(getSOPClassUID);
-+
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
- }
-@@ -357,7 +364,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getStudyInstanceUID();
-+ GET_STRING_PROPERTY(getStudyInstanceUID);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -374,7 +381,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getSeriesInstanceUID();
-+ GET_STRING_PROPERTY(getSeriesInstanceUID);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -391,7 +398,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getSOPInstanceUID();
-+ GET_STRING_PROPERTY(getSOPInstanceUID);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -408,7 +415,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getInstanceCreatorUID();
-+ GET_STRING_PROPERTY(getInstanceCreatorUID);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -425,7 +432,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getSpecificCharacterSet();
-+ GET_STRING_PROPERTY(getSpecificCharacterSet);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -442,7 +449,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getPatientsName();
-+ GET_STRING_PROPERTY(getPatientsName);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -459,7 +466,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getPatientsBirthDate();
-+ GET_STRING_PROPERTY(getPatientsBirthDate);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -476,7 +483,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getPatientsSex();
-+ GET_STRING_PROPERTY(getPatientsSex);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -493,7 +500,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getReferringPhysiciansName();
-+ GET_STRING_PROPERTY(getReferringPhysiciansName);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -510,7 +517,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getStudyDescription();
-+ GET_STRING_PROPERTY(getStudyDescription);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -527,7 +534,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getSeriesDescription();
-+ GET_STRING_PROPERTY(getSeriesDescription);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -544,7 +551,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getManufacturer();
-+ GET_STRING_PROPERTY(getManufacturer);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -561,7 +568,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getStudyDate();
-+ GET_STRING_PROPERTY(getStudyDate);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -578,7 +585,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getStudyTime();
-+ GET_STRING_PROPERTY(getStudyTime);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -595,7 +602,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getInstanceCreationDate();
-+ GET_STRING_PROPERTY(getInstanceCreationDate);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -612,7 +619,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getInstanceCreationTime();
-+ GET_STRING_PROPERTY(getInstanceCreationTime);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -629,7 +636,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getContentDate();
-+ GET_STRING_PROPERTY(getContentDate);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -646,7 +653,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getContentTime();
-+ GET_STRING_PROPERTY(getContentTime);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -663,7 +670,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getStudyID();
-+ GET_STRING_PROPERTY(getStudyID);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -680,7 +687,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getPatientID();
-+ GET_STRING_PROPERTY(getPatientID);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -714,7 +721,7 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getInstanceNumber();
-+ GET_STRING_PROPERTY(getInstanceNumber);
-
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
-@@ -731,8 +738,11 @@
- {
- DSRDocument *doc = getAddressOfDSRDocument (env, obj);
-
-- const char *string = doc->getAccessionNumber();
--
-+ OFString ofstring;
-+ OFCondition res = doc->getAccessionNumber(ofstring, 0);
-+ if (res.bad()) return NULL;
-+
-+ const char *string = ofstring-c_str();
- if (string == NULL) return NULL;
- return env->NewStringUTF (string);
- }
Modified: trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch 2015-11-09 21:53:42 UTC (rev 20463)
+++ trunk/packages/dicomscope/trunk/debian/patches/DSRDocument.cpp.patch 2015-11-09 22:06:31 UTC (rev 20464)
@@ -1,3 +1,7 @@
+Description: Unified patch (1) to correct build errors with dcmtk 3.6.1
+Author: Gert Wollny <gw.fossdev at gmail.com"
+Forwarded: no
+
--- dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp 2015-11-03 12:18:18.000000000 +0100
+++ dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp 2015-11-09 22:18:02.614361290 +0100
@@ -106,7 +106,7 @@
Deleted: trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch 2015-11-09 21:53:42 UTC (rev 20463)
+++ trunk/packages/dicomscope/trunk/debian/patches/DVPresentationState.patch 2015-11-09 22:06:31 UTC (rev 20464)
@@ -1,27 +0,0 @@
-Description: Apparently the original package was compiled on 32bits and thus
- long and Sint32 could be interchanged
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: not-needed
-
-Index: dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp
-===================================================================
---- dicomscope-3.6.0.orig/interface/libsrc/DVPresentationState.cpp 2011-06-15 01:16:11.000000000 +0200
-+++ dicomscope-3.6.0/interface/libsrc/DVPresentationState.cpp 2011-06-15 01:17:26.000000000 +0200
-@@ -979,7 +979,7 @@
- {
- DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-
-- long tx, ty, bx, by;
-+ Sint32 tx, ty, bx, by;
-
- OFCondition res = ps->getStandardDisplayedArea (tx, ty, bx, by);
-
-@@ -1014,7 +1014,7 @@
- {
- DVPresentationState *ps = getAddressOfDVPresentationState (env, obj);
-
-- long tx, ty, bx, by;
-+ Sint32 tx, ty, bx, by;
-
- OFCondition res = ps->getImageRelativeDisplayedArea (tx, ty, bx, by);
-
Modified: trunk/packages/dicomscope/trunk/debian/patches/correct_status_returns.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/correct_status_returns.patch 2015-11-09 21:53:42 UTC (rev 20463)
+++ trunk/packages/dicomscope/trunk/debian/patches/correct_status_returns.patch 2015-11-09 22:06:31 UTC (rev 20464)
@@ -1,3 +1,7 @@
+Description: Unified patch (2) to correct build errors with dcmtk 3.6.1
+Author: Gert Wollny <gw.fossdev at gmail.com"
+Forwarded: no
+
diff -ru dicomscope-3.6.0/interface/libsrc/DVInterface.cpp build-area/dicomscope-3.6.0/interface/libsrc/DVInterface.cpp
--- src/dicomscope-3.6.0/interface/libsrc/DVInterface.cpp 2015-11-03 12:18:18.000000000 +0100
+++ dicomscope-3.6.0/interface/libsrc/DVInterface.cpp 2015-11-09 22:47:10.896690624 +0100
Deleted: trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch 2015-11-09 21:53:42 UTC (rev 20463)
+++ trunk/packages/dicomscope/trunk/debian/patches/dicom_2009.patch 2015-11-09 22:06:31 UTC (rev 20464)
@@ -1,43 +0,0 @@
-Description: This patch is due to the following change:
- http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=de4ba95922ebce6c30a21ee73f6790cb0aa31912#patch20
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: not-needed
-
-Index: dicomscope-3.6.0/interface/libsrc/DSRDocument.cpp
-===================================================================
-@@ -812,7 +812,7 @@
- {
- jbyte *string = env->GetByteArrayElements(array, 0);
-
-- res = doc->setPatientsName(OFString((char *)string, env->GetArrayLength(array)));
-+ res = doc->setPatientName(OFString((char *)string, env->GetArrayLength(array)));
-
- env->ReleaseByteArrayElements(array, string, 0);
- }
-@@ -834,7 +834,7 @@
-
- char *str = (value) ? (char *) env->GetStringUTFChars (value, 0) : NULL;
-
-- OFCondition res = doc->setPatientsBirthDate(str);
-+ OFCondition res = doc->setPatientBirthDate(str);
-
- env->ReleaseStringUTFChars (value, str);
-
-@@ -854,7 +854,7 @@
-
- char *str = (value) ? (char *) env->GetStringUTFChars (value, 0) : NULL;
-
-- OFCondition res = doc->setPatientsSex(str);
-+ OFCondition res = doc->setPatientSex(str);
-
- env->ReleaseStringUTFChars (value, str);
-
-@@ -884,7 +884,7 @@
- {
- jbyte *string = env->GetByteArrayElements(array, 0);
-
-- res = doc->setReferringPhysiciansName(OFString((char *)string, env->GetArrayLength(array)));
-+ res = doc->setReferringPhysicianName(OFString((char *)string, env->GetArrayLength(array)));
-
- env->ReleaseByteArrayElements(array, string, 0);
- }
Deleted: trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch 2015-11-09 21:53:42 UTC (rev 20463)
+++ trunk/packages/dicomscope/trunk/debian/patches/log4cplus.patch 2015-11-09 22:06:31 UTC (rev 20464)
@@ -1,27 +0,0 @@
-Description: This patch simply remove the call to the old API for logging
- until a better fix is to be found
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: not-needed
-
-Index: dicomscope-3.6.0/interface/libsrc/DVInterface.cpp
-===================================================================
---- dicomscope-3.6.0.orig/interface/libsrc/DVInterface.cpp 2011-06-15 01:16:05.000000000 +0200
-+++ dicomscope-3.6.0/interface/libsrc/DVInterface.cpp 2011-06-15 01:17:58.000000000 +0200
-@@ -2828,7 +2828,7 @@
- {
- DVInterface *dvi = getAddressOfDVInterface (env, obj);
-
-- dvi->setLogFilter ((DVPSLogMessageLevel)level);
-+// dvi->setLogFilter ((DVPSLogMessageLevel)level);
- }
-
-
-@@ -2845,7 +2845,7 @@
- char *mod = (char*) env->GetStringUTFChars (module, 0);
- char *msg = (char*) env->GetStringUTFChars (message, 0);
-
-- OFCondition res = dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg);
-+ OFCondition res = EC_Normal; //dvi->writeLogMessage ((DVPSLogMessageLevel)level, mod, msg);
-
- env->ReleaseStringUTFChars (module, mod);
- env->ReleaseStringUTFChars (message, msg);
Modified: trunk/packages/dicomscope/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicomscope/trunk/debian/patches/series 2015-11-09 21:53:42 UTC (rev 20463)
+++ trunk/packages/dicomscope/trunk/debian/patches/series 2015-11-09 22:06:31 UTC (rev 20464)
@@ -1,10 +1,6 @@
dicomscope_defaultpackage.patch
-DVPresentationState.patch
dicomscope.cfg.patch
maincontext.java.patch
DSRDocument.cpp.patch
-#dicom_2009.patch
-log4cplus.patch
cmakelists.txt.patch
-#DSRDocument.cpp-dicom361.patch
correct_status_returns.patch
More information about the debian-med-commit
mailing list