20 files changed, 174 insertions, 456 deletions

diff --git a/graphics/aeskulap/files/patch-Makefile.am b/graphics/aeskulap/files/patch-Makefile.am
deleted file mode 100644
index 41593c823680..000000000000
--- a/graphics/aeskulap/files/patch-Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.am.orig	2010-07-26 18:23:45.000000000 +0000
-+++ Makefile.am	2010-07-26 18:24:07.000000000 +0000
-@@ -1,6 +1,5 @@
- SUBDIRS = \
- 	po \
--	dcmtk \
- 	configuration \
- 	imagepool \
- 	widgets \
-@@ -33,17 +32,6 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--dist-hook:
--	mkdir -p $(distdir)/dcmtk
--	cp -Rf $(top_srcdir)/dcmtk/* $(distdir)/dcmtk
--	cd $(distdir)/dcmtk && make distclean
--	list=`find $(distdir)/dcmtk -name "CVS"` && rm -Rf $$list
--	list=`find $(distdir)/dcmtk -name ".cvsignore"` && rm -f $$list
--	list=`find $(distdir)/dcmtk -name ".#*"` && rm -f $$list
--	list=`find $(distdir)/dcmtk -name "*.a"` && rm -f $$list
--	list=`find $(distdir)/dcmtk -name "*.so"` && rm -f $$list
--
- distclean: distclean-recursive
--	cd $(top_builddir)/dcmtk && make distclean
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- 	-rm -f Makefile
diff --git a/graphics/aeskulap/files/patch-Makefile.in b/graphics/aeskulap/files/patch-Makefile.in
deleted file mode 100644
index ab7f21074846..000000000000
--- a/graphics/aeskulap/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	2010-07-26 18:25:22.000000000 +0000
-+++ Makefile.in	2010-07-26 18:25:37.000000000 +0000
-@@ -237,7 +237,6 @@
- target_alias = @target_alias@
- SUBDIRS = \
- 	po \
--	dcmtk \
- 	configuration \
- 	imagepool \
- 	widgets \
-@@ -709,18 +708,7 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--dist-hook:
--	mkdir -p $(distdir)/dcmtk
--	cp -Rf $(top_srcdir)/dcmtk/* $(distdir)/dcmtk
--	cd $(distdir)/dcmtk && make distclean
--	list=`find $(distdir)/dcmtk -name "CVS"` && rm -Rf $$list
--	list=`find $(distdir)/dcmtk -name ".cvsignore"` && rm -f $$list
--	list=`find $(distdir)/dcmtk -name ".#*"` && rm -f $$list
--	list=`find $(distdir)/dcmtk -name "*.a"` && rm -f $$list
--	list=`find $(distdir)/dcmtk -name "*.so"` && rm -f $$list
--
- distclean: distclean-recursive
--	cd $(top_builddir)/dcmtk && make distclean
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- 	-rm -f Makefile
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/graphics/aeskulap/files/patch-configure b/graphics/aeskulap/files/patch-configure
deleted file mode 100644
index 9885c129608a..000000000000
--- a/graphics/aeskulap/files/patch-configure
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.orig	2010-07-26 19:30:23.000000000 +0000
-+++ configure	2010-07-26 19:30:02.000000000 +0000
-@@ -23827,17 +23827,11 @@
- 
- 
- 
--DCMJPEG_LIBS="-L../dcmtk/dcmjpeg/libijg8 -L../dcmtk/dcmjpeg/libijg12 -L../dcmtk/dcmjpeg/libijg16 -lijg8 -lijg12 -lijg16"
-+DCMJPEG_LIBS="-lijg8 -lijg12 -lijg16"
- 
- 
--DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(top_srcdir)/dcmtk/config/include -I\$(top_srcdir)/dcmtk/ofstd/include -I\$(top_srcdir)/dcmtk/dcmdata/include -I\$(top_srcdir)/dcmtk/dcmnet/include -I\$(top_srcdir)/dcmtk/dcmimage/include -I\$(top_srcdir)/dcmtk/dcmimgle/include -I\$(top_srcdir)/dcmtk/dcmjpeg/include"
--DCMTK_LIBS="-L../dcmtk/ofstd/libsrc \
---L../dcmtk/dcmdata/libsrc \
---L../dcmtk/dcmnet/libsrc \
---L../dcmtk/dcmjpeg/libsrc \
---L../dcmtk/dcmimage/libsrc \
---L../dcmtk/dcmimgle/libsrc \
---ldcmjpeg \$(DCMJPEG_LIBS) -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
-+DCMTK_CFLAGS=""
-+DCMTK_LIBS="-ldcmjpeg \$(DCMJPEG_LIBS) -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
- 
- 
- 
-@@ -25432,9 +25426,3 @@
-   # would make configure fail if this is the last instruction.
-   $ac_cs_success || { (exit 1); exit 1; }
- fi
--
--
--cd $srcdir/dcmtk
--export CFLAGS="$CFLAGS"
--export CXXFLAGS="$CXXFLAGS"
--sh ./configure --without-openssl --without-zlib --without-libwrap --prefix=${prefix} --libdir=${prefix}/lib/aeskulap
diff --git a/graphics/aeskulap/files/patch-configure.in b/graphics/aeskulap/files/patch-configure.in
deleted file mode 100644
index fb418a5e1dfd..000000000000
--- a/graphics/aeskulap/files/patch-configure.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.in.orig	2010-07-26 19:28:08.000000000 +0000
-+++ configure.in	2010-07-26 19:28:57.000000000 +0000
-@@ -77,17 +77,11 @@
- 
- dnl AC_CONFIG_SUBDIRS(dcmtk)
- 
--DCMJPEG_LIBS="-L../dcmtk/dcmjpeg/libijg8 -L../dcmtk/dcmjpeg/libijg12 -L../dcmtk/dcmjpeg/libijg16 -lijg8 -lijg12 -lijg16"
-+DCMJPEG_LIBS="-lijg8 -lijg12 -lijg16"
- AC_SUBST(DCMJPEG_LIBS)
- 
--DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(top_srcdir)/dcmtk/config/include -I\$(top_srcdir)/dcmtk/ofstd/include -I\$(top_srcdir)/dcmtk/dcmdata/include -I\$(top_srcdir)/dcmtk/dcmnet/include -I\$(top_srcdir)/dcmtk/dcmimage/include -I\$(top_srcdir)/dcmtk/dcmimgle/include -I\$(top_srcdir)/dcmtk/dcmjpeg/include"
--DCMTK_LIBS="-L../dcmtk/ofstd/libsrc \
---L../dcmtk/dcmdata/libsrc \
---L../dcmtk/dcmnet/libsrc \
---L../dcmtk/dcmjpeg/libsrc \
---L../dcmtk/dcmimage/libsrc \
---L../dcmtk/dcmimgle/libsrc \
---ldcmjpeg \$(DCMJPEG_LIBS) -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
-+DCMTK_CFLAGS=""
-+DCMTK_LIBS="-ldcmjpeg \$(DCMJPEG_LIBS) -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
- 
- AC_SUBST(DCMTK_CFLAGS)
- AC_SUBST(DCMTK_LIBS)
-@@ -111,8 +105,3 @@
- widgets/Makefile
- pixmaps/Makefile
- ])
--
--cd $srcdir/dcmtk
--export CFLAGS="$CFLAGS"
--export CXXFLAGS="$CXXFLAGS"
--sh ./configure --without-openssl --without-zlib --without-libwrap --prefix=${prefix} --libdir=${prefix}/lib/aeskulap
diff --git a/graphics/aeskulap/files/patch-dcmtk-config_configure b/graphics/aeskulap/files/patch-dcmtk-config_configure
new file mode 100644
index 000000000000..c47dc0443901
--- /dev/null
+++ b/graphics/aeskulap/files/patch-dcmtk-config_configure
@@ -0,0 +1,13 @@
+--- dcmtk/config/configure.orig	2010-08-23 17:05:16.000000000 +0200
++++ dcmtk/config/configure	2010-08-23 17:05:39.000000000 +0200
+@@ -17757,8 +17757,8 @@
+ 	  CFLAGS="-D_POSIX_C_SOURCE=199506L $CFLAGS"
+ 	  ;;
+ 	*)
+-	  CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
+-	  CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
++	  CXXFLAGS="-D__BSD_VISIBLE -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
++	  CFLAGS="-D__BSD_VISIBLE -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
+ 	  ;;
+     esac
+ 
diff --git a/graphics/aeskulap/files/patch-dcmtk-dcmnet-include_dcompat.h b/graphics/aeskulap/files/patch-dcmtk-dcmnet-include_dcompat.h
new file mode 100644
index 000000000000..9cad061e0d60
--- /dev/null
+++ b/graphics/aeskulap/files/patch-dcmtk-dcmnet-include_dcompat.h
@@ -0,0 +1,12 @@
+--- dcmtk/dcmnet/include/dcompat.h.orig	2010-08-23 16:36:30.000000000 +0200
++++ dcmtk/dcmnet/include/dcompat.h	2010-08-23 16:37:57.000000000 +0200
+@@ -146,9 +146,6 @@
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
+-#ifdef HAVE_SYS_FILE_H
+-#include <sys/file.h>
+-#endif
+ 
+ END_EXTERN_C
+ 
diff --git a/graphics/aeskulap/files/patch-dcmtk-dcmnet-libsrc_dcompat.cc b/graphics/aeskulap/files/patch-dcmtk-dcmnet-libsrc_dcompat.cc
new file mode 100644
index 000000000000..b062760f46f3
--- /dev/null
+++ b/graphics/aeskulap/files/patch-dcmtk-dcmnet-libsrc_dcompat.cc
@@ -0,0 +1,12 @@
+--- dcmtk/dcmnet/libsrc/dcompat.cc.orig	2010-08-23 16:38:21.000000000 +0200
++++ dcmtk/dcmnet/libsrc/dcompat.cc	2010-08-23 16:38:31.000000000 +0200
+@@ -113,9 +113,6 @@
+ #ifdef HAVE_SYS_UTSNAME_H
+ #include <sys/utsname.h>
+ #endif
+-#ifdef HAVE_SYS_FILE_H
+-#include <sys/file.h>
+-#endif
+ #ifdef HAVE_IO_H
+ #include <io.h>  /* for access() on Win32 */
+ #endif
diff --git a/graphics/aeskulap/files/patch-dcmtk-ofstd-include_ofthread.h b/graphics/aeskulap/files/patch-dcmtk-ofstd-include_ofthread.h
new file mode 100644
index 000000000000..159fd460ff70
--- /dev/null
+++ b/graphics/aeskulap/files/patch-dcmtk-ofstd-include_ofthread.h
@@ -0,0 +1,37 @@
+--- dcmtk/ofstd/include/ofthread.h.orig	2010-08-23 16:28:30.000000000 +0200
++++ dcmtk/ofstd/include/ofthread.h	2010-08-23 16:33:06.000000000 +0200
+@@ -118,14 +118,14 @@
+    *  provided in this class.
+    *  @return thread ID of target thread if started, 0 otherwise.
+    */
+-  unsigned long threadID();
++  pthread_t threadID();
+ 
+   /** checks if the given thread ID matches the thread ID of the thread
+    *  referenced by this object.
+    *  @param tID thread ID to be compared
+    *  @return OFTrue if equal, OFFalse otherwise.
+    */
+-  OFBool equal(unsigned long tID);
++  OFBool equal(pthread_t tID);
+ 
+   /** converts any of the error codes returned by the methods of this class
+    *  into a textual description, which is written into the string object.
+@@ -158,7 +158,7 @@
+    *  provided in this class.
+    *  @return thread ID of the calling thread.
+    */
+-  static unsigned long self();
++  static pthread_t self();
+ 
+ private:
+ 
+@@ -177,7 +177,7 @@
+ #endif
+ 
+   /** thread identifier */
+-  unsigned long theThread;
++  pthread_t theThread;
+ 
+   /** unimplemented private copy constructor */
+   OFThread(const OFThread& arg);
diff --git a/graphics/aeskulap/files/patch-dcmtk-ofstd-libsrc_ofthread.cc b/graphics/aeskulap/files/patch-dcmtk-ofstd-libsrc_ofthread.cc
new file mode 100644
index 000000000000..41ebe3e0ce62
--- /dev/null
+++ b/graphics/aeskulap/files/patch-dcmtk-ofstd-libsrc_ofthread.cc
@@ -0,0 +1,52 @@
+--- dcmtk/ofstd/libsrc/ofthread.cc.orig	2010-08-23 16:27:34.000000000 +0200
++++ dcmtk/ofstd/libsrc/ofthread.cc	2010-08-23 16:32:49.000000000 +0200
+@@ -145,7 +145,7 @@
+ #elif defined(POSIX_INTERFACE)
+   pthread_t tid=0;
+   int result = pthread_create(&tid, NULL, thread_stub, OFstatic_cast(void *, this));
+-  if (0 == result) theThread = static_cast<unsigned long>(tid); else theThread = 0;      
++  if (0 == result) theThread = tid; else theThread = 0;      
+   return result;     
+ #elif defined(SOLARIS_INTERFACE)
+   thread_t tid=0;
+@@ -174,21 +174,21 @@
+ #endif
+ }
+   
+-unsigned long OFThread::threadID()
++pthread_t OFThread::threadID()
+ {
+   return theThread;
+ }
+ 
+ #if defined(WINDOWS_INTERFACE) || defined(POSIX_INTERFACE) || defined(SOLARIS_INTERFACE)
+-OFBool OFThread::equal(unsigned long tID)
++OFBool OFThread::equal(pthread_t tID)
+ #else
+-OFBool OFThread::equal(unsigned long /* tID */ )
++OFBool OFThread::equal(pthread_t /* tID */ )
+ #endif
+ {
+ #ifdef WINDOWS_INTERFACE
+   if (theThread == tID) return OFTrue; else return OFFalse;
+ #elif defined(POSIX_INTERFACE)
+-  if (pthread_equal(static_cast<pthread_t>(theThread), static_cast<pthread_t>(tID))) return OFTrue; else return OFFalse;
++  if (pthread_equal(theThread, tID)) return OFTrue; else return OFFalse;
+ #elif defined(SOLARIS_INTERFACE)
+   if (OFstatic_cast(thread_t, theThread) == OFstatic_cast(thread_t, tID)) return OFTrue; else return OFFalse;
+ #else
+@@ -209,12 +209,12 @@
+   return; // will never be reached
+ }
+ 
+-unsigned long OFThread::self()
++pthread_t OFThread::self()
+ {
+ #ifdef WINDOWS_INTERFACE
+   return OFstatic_cast(unsigned long, GetCurrentThreadId());
+ #elif defined(POSIX_INTERFACE)
+-  return OFstatic_cast(unsigned long, pthread_self());
++  return pthread_self();
+ #elif defined(SOLARIS_INTERFACE)
+   return OFstatic_cast(unsigned long, thr_self());
+ #else
diff --git a/graphics/aeskulap/files/patch-imagepool_fileloader.cpp b/graphics/aeskulap/files/patch-imagepool_fileloader.cpp
deleted file mode 100644
index 579b66728d7d..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_fileloader.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
---- imagepool/fileloader.cpp.orig	2010-07-26 21:27:54.000000000 +0000
-+++ imagepool/fileloader.cpp	2010-07-26 21:41:27.000000000 +0000
-@@ -56,7 +56,8 @@
- }
- 
- void FileLoader::prescan_files(std::list< Glib::ustring >* filelist) {
--	std::string studyinstanceuid;
-+	OFString studyinstanceuid;
-+	const char *studyinstanceuid_str;
- 	std::list< Glib::ustring >::iterator i = filelist->begin();
- 	unsigned int curr = 0;
- 	unsigned int max = filelist->size();
-@@ -70,16 +71,18 @@
- 							(*i).c_str(),
- 							EXS_Unknown,
- 							EGL_noChange,
--							DCM_MaxReadLength,
--							false);
-+							DCM_MaxReadLength);
- 	
- 		if(cond.good() && dfile.getDataset()->findAndGetOFString(DCM_StudyInstanceUID, studyinstanceuid).good()) {
--			std::string seriesinstanceuid;
-+			studyinstanceuid_str = studyinstanceuid.c_str();
-+			OFString seriesinstanceuid;
-+			const char *seriesinstanceuid_str;
- 			dfile.getDataset()->findAndGetOFString(DCM_SeriesInstanceUID, seriesinstanceuid);
-+			seriesinstanceuid_str = seriesinstanceuid.c_str();
- 
--			m_cache[studyinstanceuid].m_instancecount++;
--			m_cache[studyinstanceuid].m_seriesuid.insert(seriesinstanceuid);
--			m_cache[studyinstanceuid].m_seriescount = m_cache[studyinstanceuid].m_seriesuid.size();
-+			m_cache[studyinstanceuid_str].m_instancecount++;
-+			m_cache[studyinstanceuid_str].m_seriesuid.insert(seriesinstanceuid_str);
-+			m_cache[studyinstanceuid_str].m_seriescount = m_cache[studyinstanceuid_str].m_seriesuid.size();
- 		}
- 	}
- }
-@@ -87,7 +90,7 @@
- bool FileLoader::run() {
- 	std::list< Glib::ustring >* filelist = m_filelist;
- 	std::list< Glib::ustring >::iterator i = filelist->begin();
--	std::string studyinstanceuid;
-+	OFString studyinstanceuid;
- 
- 	for(; i != filelist->end(); i++) {
- 		DcmFileFormat dfile;
-@@ -96,8 +99,7 @@
- 							(*i).c_str(),
- 							EXS_Unknown,
- 							EGL_noChange,
--							DCM_MaxReadLength,
--							false);
-+							DCM_MaxReadLength);
- 		
- 		if(!cond.good()) {
- 			std::cout << "unable to open file !!!" << std::endl;
diff --git a/graphics/aeskulap/files/patch-imagepool_imagepool.h b/graphics/aeskulap/files/patch-imagepool_imagepool.h
new file mode 100644
index 000000000000..53f6cef5bb02
--- /dev/null
+++ b/graphics/aeskulap/files/patch-imagepool_imagepool.h
@@ -0,0 +1,10 @@
+--- imagepool/imagepool.h.orig	2010-08-23 17:14:59.000000000 +0200
++++ imagepool/imagepool.h	2010-08-23 17:15:08.000000000 +0200
+@@ -36,6 +36,7 @@
+ 
+ #include <glibmm/slisthandle.h>
+ #include <string>
++#include <libintl.h>
+ 
+ 
+ class DcmDataset;
diff --git a/graphics/aeskulap/files/patch-imagepool_netquery.cpp b/graphics/aeskulap/files/patch-imagepool_netquery.cpp
deleted file mode 100644
index 5b8dec5fc694..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_netquery.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
---- imagepool/netquery.cpp.orig	2010-07-26 21:45:52.000000000 +0000
-+++ imagepool/netquery.cpp	2010-07-26 21:53:57.000000000 +0000
-@@ -31,10 +31,11 @@
- #include "dcdeftag.h"
- #include "poolfindassociation.h"
- #include "netclient.h"
--#include "gettext.h"
- 
- #include <iostream>
- 
-+#include <libintl.h>
-+
- namespace ImagePool {
- 	
- static void fix_date(std::string& date) {
-@@ -50,7 +51,7 @@
- }
- 
- static void fix_time(std::string& time) {
--	unsigned int i = time.find(".");
-+	size_t i = time.find(".");
- 	if(i != std::string::npos) {
- 		time = time.substr(0, i);
- 	}
-@@ -88,28 +89,35 @@
- 
- Glib::RefPtr< ImagePool::Series > create_query_series(DcmDataset* dset) {
- 	Glib::RefPtr< ImagePool::Series > result = Glib::RefPtr< ImagePool::Series >(new Series);
-+	OFString res;
- 
--	dset->findAndGetOFString(DCM_SeriesInstanceUID, result->m_seriesinstanceuid);
--	dset->findAndGetOFString(DCM_SeriesDescription, result->m_description);
-+	dset->findAndGetOFString(DCM_SeriesInstanceUID, res);
-+	result->m_seriesinstanceuid = res.c_str();
-+	dset->findAndGetOFString(DCM_SeriesDescription, res);
-+	result->m_description = res.c_str();
- 	if(result->m_description.empty()) {
--		dset->findAndGetOFString(DCM_StudyDescription, result->m_description);
-+		dset->findAndGetOFString(DCM_StudyDescription, res);
-+		result->m_description = res.c_str();
- 	}
- 	if(result->m_description.empty()) {
- 		result->m_description = gettext("no description");
- 	}
- 
--	dset->findAndGetOFString(DCM_Modality, result->m_modality);
-+	dset->findAndGetOFString(DCM_Modality, res);
-+	result->m_modality = res.c_str();
- 
--	dset->findAndGetOFString(DCM_SeriesTime, result->m_seriestime);
-+	dset->findAndGetOFString(DCM_SeriesTime, res);
-+	result->m_seriestime = res.c_str();
- 	if(result->m_seriestime.empty()) {
--		dset->findAndGetOFString(DCM_StudyTime, result->m_seriestime);
-+		dset->findAndGetOFString(DCM_StudyTime, res);
-+		result->m_seriestime = res.c_str();
- 	}
- 
--	dset->findAndGetOFString(DCM_StationName, result->m_stationname);
-+	dset->findAndGetOFString(DCM_StationName, res);
-+	result->m_stationname = res.c_str();
- 
--	std::string buffer;
--	dset->findAndGetOFString(DCM_NumberOfSeriesRelatedInstances, buffer);
--	int i = atoi(buffer.c_str());
-+	dset->findAndGetOFString(DCM_NumberOfSeriesRelatedInstances, res);
-+	int i = atoi(res.c_str());
- 	if(i != 0) {
- 		result->m_instancecount = i;
- 	}
diff --git a/graphics/aeskulap/files/patch-imagepool_poolinstance.cpp b/graphics/aeskulap/files/patch-imagepool_poolinstance.cpp
deleted file mode 100644
index 0f7d21000548..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_poolinstance.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
---- imagepool/poolinstance.cpp.orig	2010-07-26 21:55:22.000000000 +0000
-+++ imagepool/poolinstance.cpp	2010-07-27 14:33:34.000000000 +0000
-@@ -37,6 +37,8 @@
- 
- #include <iostream>
- 
-+#include <libintl.h>
-+
- namespace ImagePool {
- 	
- Instance::Instance(const std::string& sopinstanceuid) :
-@@ -279,35 +281,35 @@
- 
- 	// get SOPInstanceUID
- 	
--	std::string sop;
-+	OFString sop;
- 	dset->findAndGetOFString(DCM_SOPInstanceUID, sop).bad();
- 	
- 	// wrap in smartpointer
--	Glib::RefPtr<ImagePool::Instance> r = Glib::RefPtr<ImagePool::Instance>(new ImagePool::Instance(sop));
-+	Glib::RefPtr<ImagePool::Instance> r = Glib::RefPtr<ImagePool::Instance>(new ImagePool::Instance(sop.c_str()));
- 
- 	// set encoding
--	std::string enc[2];
-+	OFString enc[2];
- 	dset->findAndGetOFString(DCM_SpecificCharacterSet, enc[0], 0);
- 	dset->findAndGetOFString(DCM_SpecificCharacterSet, enc[1], 1);
--	r->set_encoding(enc[0], enc[1]);
-+	r->set_encoding(enc[0].c_str(), enc[1].c_str());
- 
- 	// set dicom uid's
--	r->m_sopinstanceuid = sop;
-+	r->m_sopinstanceuid = sop.c_str();
- 
--	std::string seriesuid;
-+	OFString seriesuid;
- 	if(dset->findAndGetOFString(DCM_SeriesInstanceUID, seriesuid).good()) {
--		r->m_seriesinstanceuid = seriesuid;
-+		r->m_seriesinstanceuid = seriesuid.c_str();
- 	}
- 
--	std::string studyuid;
-+	OFString studyuid;
- 	if(dset->findAndGetOFString(DCM_StudyInstanceUID, studyuid).good()) {
--		r->m_studyinstanceuid = studyuid;
-+		r->m_studyinstanceuid = studyuid.c_str();
- 	}
- 
- 	r->m_default_windowcenter = 0;
- 	r->m_default_windowwidth = 0;
- 
--	std::string value;
-+	OFString value;
- 
- 	// get instancenumber
- 	if(dset->findAndGetOFString(DCM_InstanceNumber, value).good()) {
-@@ -438,29 +440,29 @@
- 
- 	// set date
- 	if(dset->findAndGetOFString(DCM_AcquisitionDate, value).good()) {
--		r->m_date = value;
-+		r->m_date = value.c_str();
- 	}
- 	else if(dset->findAndGetOFString(DCM_SeriesDate, value).good()) {
--		r->m_date = value;
-+		r->m_date = value.c_str();
- 	}
- 	else if(dset->findAndGetOFString(DCM_StudyDate, value).good()) {
--		r->m_date = value;
-+		r->m_date = value.c_str();
- 	}
- 
- 	// set time
- 	if(dset->findAndGetOFString(DCM_AcquisitionTime, value).good()) {
--		r->m_time = value;
-+		r->m_time = value.c_str();
- 	}
- 	else if(dset->findAndGetOFString(DCM_SeriesTime, value).good()) {
--		r->m_time = value;
-+		r->m_time = value.c_str();
- 	}
- 	else if(dset->findAndGetOFString(DCM_StudyTime, value).good()) {
--		r->m_time = value;
-+		r->m_time = value.c_str();
- 	}
- 
- 	// set ManufacturersModelName
- 	if(dset->findAndGetOFString(DCM_ManufacturersModelName, value).good()) {
--		r->m_model = value;
-+		r->m_model = value.c_str();
- 	}
- 	
- 	// set pixelspacing
-@@ -512,8 +514,10 @@
- 	if(dset->findAndGetOFString(DCM_PatientsName, value).good()) {
- 		r->m_patientsname = r->convert_string(value.c_str());
- 	}
--	dset->findAndGetOFString(DCM_PatientsBirthDate, r->m_patientsbirthdate);
--	dset->findAndGetOFString(DCM_PatientsSex, r->m_patientssex);
-+	dset->findAndGetOFString(DCM_PatientsBirthDate, value);
-+	r->m_patientsbirthdate = value.c_str();
-+	dset->findAndGetOFString(DCM_PatientsSex, value);
-+	r->m_patientssex = value.c_str();
- 	if(dset->findAndGetOFString(DCM_StudyDescription, value).good()) {
- 		r->m_studydescription = r->convert_string(value.c_str());
- 	}
-@@ -528,8 +532,10 @@
- 		r->m_studydescription = gettext("no description");
- 	}
- 
--	dset->findAndGetOFString(DCM_StudyDate, r->m_studydate);
--	dset->findAndGetOFString(DCM_StudyTime, r->m_studytime);
-+	dset->findAndGetOFString(DCM_StudyDate, value);
-+	r->m_studydate = value.c_str();
-+	dset->findAndGetOFString(DCM_StudyTime, value);
-+	r->m_studytime = value.c_str();
- 
- 	// series params
- 	if(dset->findAndGetOFString(DCM_InstitutionName, value).good()) {
-@@ -549,7 +555,8 @@
- 		r->m_seriesdescription = gettext("no description");
- 	}
- 
--	dset->findAndGetOFString(DCM_Modality, r->m_modality);
-+	dset->findAndGetOFString(DCM_Modality, value);
-+	r->m_modality = value.c_str();
- 
- 	Glib::RefPtr<ImagePool::Study> new_study = get_study(r->m_studyinstanceuid);
- 	if(new_study->size() == 0) {
diff --git a/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp b/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp
deleted file mode 100644
index 3d8631bf70eb..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- imagepool/poolmoveassociation.cpp.orig	2010-07-27 14:42:55.000000000 +0000
-+++ imagepool/poolmoveassociation.cpp	2010-07-27 14:53:04.000000000 +0000
-@@ -33,7 +33,6 @@
- #include "djencode.h"
- #include "djrplol.h"
- 
--
- MoveAssociation::MoveAssociation() {
- 	m_abstractSyntax = UID_MOVEStudyRootQueryRetrieveInformationModel;
- 	m_maxReceivePDULength = ASC_DEFAULTMAXPDU;
-@@ -175,6 +174,9 @@
- 					knownAbstractSyntaxes, DIM_OF(knownAbstractSyntaxes),
- 					transferSyntaxes, DIM_OF(transferSyntaxes));
- 
-+		/* FIXME
-+		 * dcmStorageSOPClassUIDs and numberOfDcmStorageSOPClassUIDs
-+		 * are not defined anymore
- 		if (cond.good()) {
- 			// the array of Storage SOP Class UIDs comes from dcuid.h
- 			cond = ASC_acceptContextsWithPreferredTransferSyntaxes(
-@@ -182,6 +184,7 @@
- 					dcmStorageSOPClassUIDs, numberOfDcmStorageSOPClassUIDs,
- 					transferSyntaxes, DIM_OF(transferSyntaxes));
- 		}
-+		*/
- 	}
- 
- 	if (cond.good()) {
diff --git a/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp b/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp
deleted file mode 100644
index b94f3bc50bfe..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- imagepool/poolnetwork.cpp.orig	2010-07-27 14:53:57.000000000 +0000
-+++ imagepool/poolnetwork.cpp	2010-07-27 14:55:07.000000000 +0000
-@@ -227,10 +227,14 @@
- 	}
- 
- 	/* the array of Storage SOP Class UIDs comes from dcuid.h */
-+	/* FIXME
-+	 * dcmStorageSOPClassUIDs and numberOfDcmStorageSOPClassUIDs
-+	 * are not defined anymore
- 	for (i=0; i<numberOfDcmStorageSOPClassUIDs && SUCCESS(cond); i++) {
- 		cond = ASC_addPresentationContext(params, pid, dcmStorageSOPClassUIDs[i], transferSyntaxes, transferSyntaxes_count);
--		pid += 2;	/* only odd presentation context id's */
-+		pid += 2;
- 	}
-+	*/
- 
-     return cond;
- }
diff --git a/graphics/aeskulap/files/patch-imagepool_poolservers.cpp b/graphics/aeskulap/files/patch-imagepool_poolservers.cpp
deleted file mode 100644
index bb3bc6360606..000000000000
--- a/graphics/aeskulap/files/patch-imagepool_poolservers.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- imagepool/poolservers.cpp.orig	2010-07-26 18:39:13.000000000 +0000
-+++ imagepool/poolservers.cpp	2010-07-26 18:39:33.000000000 +0000
-@@ -29,6 +29,8 @@
- #include "imagepool.h"
- #include "poolassociation.h"
- 
-+#include <libintl.h>
-+
- namespace ImagePool {
- 
- extern Network net;
diff --git a/graphics/aeskulap/files/patch-src_Makefile.am b/graphics/aeskulap/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..87ebcdeb3ea5
--- /dev/null
+++ b/graphics/aeskulap/files/patch-src_Makefile.am
@@ -0,0 +1,19 @@
+--- src/Makefile.am.orig	2010-08-23 17:40:05.000000000 +0200
++++ src/Makefile.am	2010-08-23 17:40:14.000000000 +0200
+@@ -25,14 +25,14 @@
+ 
+ 
+ aeskulap_LDADD = \
++	$(DCMTK_LIBS) \
+ 	$(GTKMM_LIBS) \
+ 	$(GLADEMM_LIBS) \
+ 	$(GTHREAD_LIBS) \
+ 	../widgets/libgtkdicom.la \
+ 	../imagepool/libimagepool.la \
+ 	../configuration/libconfiguration.la \
+-	$(GCONFMM_LIBS) \
+-	$(DCMTK_LIBS)
++	$(GCONFMM_LIBS)
+ 
+ aeskulap_LDFLAGS = \
+ 	-Wl,-rpath,${prefix}/lib/aeskulap
diff --git a/graphics/aeskulap/files/patch-src_Makefile.in b/graphics/aeskulap/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..023335d4190b
--- /dev/null
+++ b/graphics/aeskulap/files/patch-src_Makefile.in
@@ -0,0 +1,19 @@
+--- src/Makefile.in.orig	2010-08-23 17:39:47.000000000 +0200
++++ src/Makefile.in	2010-08-23 17:40:00.000000000 +0200
+@@ -286,14 +286,14 @@
+ 	main.cpp
+ 
+ aeskulap_LDADD = \
++	$(DCMTK_LIBS) \
+ 	$(GTKMM_LIBS) \
+ 	$(GLADEMM_LIBS) \
+ 	$(GTHREAD_LIBS) \
+ 	../widgets/libgtkdicom.la \
+ 	../imagepool/libimagepool.la \
+ 	../configuration/libconfiguration.la \
+-	$(GCONFMM_LIBS) \
+-	$(DCMTK_LIBS)
++	$(GCONFMM_LIBS)
+ 
+ aeskulap_LDFLAGS = \
+ 	-Wl,-rpath,${prefix}/lib/aeskulap
diff --git a/graphics/aeskulap/files/patch-src_main.cpp b/graphics/aeskulap/files/patch-src_main.cpp
deleted file mode 100644
index 36c4351f418c..000000000000
--- a/graphics/aeskulap/files/patch-src_main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.cpp.orig	2010-07-27 15:12:57.000000000 +0000
-+++ src/main.cpp	2010-07-27 15:13:13.000000000 +0000
-@@ -43,6 +43,8 @@
- 
- #include <iostream>
- 
-+#include <libintl.h>
-+
- int main(int argc, char* argv[]) {
- 
- 	br_init(NULL);
diff --git a/graphics/aeskulap/files/patch-widgets_seriesview.cpp b/graphics/aeskulap/files/patch-widgets_seriesview.cpp
deleted file mode 100644
index cff78089da0d..000000000000
--- a/graphics/aeskulap/files/patch-widgets_seriesview.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- widgets/seriesview.cpp.orig	2010-07-27 15:03:43.000000000 +0000
-+++ widgets/seriesview.cpp	2010-07-27 15:03:57.000000000 +0000
-@@ -36,6 +36,8 @@
- 
- #include <iostream>
- 
-+#include <libintl.h>
-+
- SeriesView::SeriesView(const Glib::RefPtr<ImagePool::Series>& series) : 
- Aeskulap::Tiler<Aeskulap::Display>(1, 1),
- m_selected(false),