[med-svn] [charls] 06/10: Remove patches applied upstream

[Andreas Tille]

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

tille pushed a commit to branch master
in repository charls.

commit 0ff9be96715bb27b1b007adacc16e22f18b6a8de
Author: Andreas Tille <tille at debian.org>
Date:   Thu May 19 17:36:13 2016 +0200

    Remove patches applied upstream
---
 debian/patches/add_visibility.patch                | 30 ----------------------
 .../charls_fix_clang_compilation_issue.patch       | 16 ------------
 debian/patches/series                              |  2 --
 3 files changed, 48 deletions(-)

diff --git a/debian/patches/add_visibility.patch b/debian/patches/add_visibility.patch
deleted file mode 100644
index 5d2bc0f..0000000
--- a/debian/patches/add_visibility.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: charls-1.0/interface.h
-===================================================================
---- charls-1.0.orig/interface.h	2013-12-08 08:37:24.697462239 +0100
-+++ charls-1.0/interface.h	2013-12-08 08:37:28.109462193 +0100
-@@ -14,8 +14,12 @@
- #endif
- #else
- #ifndef CHARLS_IMEXPORT 
-+#if __GNUC__ >= 4
-+#define CHARLS_IMEXPORT(returntype) __attribute__ ((visibility ("default"))) returntype
-+#else
- #define CHARLS_IMEXPORT(returntype) returntype
- #endif
-+#endif
- #endif /* _WIN32 */
- 
- 
-Index: charls-1.0/interface.cpp
-===================================================================
---- charls-1.0.orig/interface.cpp	2013-12-08 08:37:23.629462252 +0100
-+++ charls-1.0/interface.cpp	2013-12-08 08:37:28.109462193 +0100
-@@ -6,6 +6,8 @@
- //implement correct linkage for win32 dlls
- #if defined(_WIN32)
- #define CHARLS_IMEXPORT(returntype) __declspec(dllexport) returntype __stdcall
-+#else
-+#define CHARLS_IMEXPORT(returntype) __attribute__ ((visibility ("default"))) returntype
- #endif
- 
- #include "config.h"
diff --git a/debian/patches/charls_fix_clang_compilation_issue.patch b/debian/patches/charls_fix_clang_compilation_issue.patch
deleted file mode 100644
index 31d659f..0000000
--- a/debian/patches/charls_fix_clang_compilation_issue.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Mathieu Malaterre <malat at debian.org>
-Last-Update: Wed Nov 27 10:33:27 2013 +0100
-Bug-Debian: http://bugs.debian.org/730612
-Description: Fix a compilation error with clang
-
---- a/processline.h
-+++ b/processline.h
-@@ -144,7 +144,7 @@ class ProcessTransformed : public Proces
- {
- 	typedef typename TRANSFORM::SAMPLE SAMPLE;
- 
--	ProcessTransformed(const ProcessTransformed&) {}
-+	ProcessTransformed(const ProcessTransformed&);
- public:
- 	ProcessTransformed(void* pbyteOutput, const JlsParameters& info, TRANSFORM transform) :
- 		_pbyteOutput((BYTE*)pbyteOutput),
diff --git a/debian/patches/series b/debian/patches/series
index df55c27..20b1fd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 charls_add_cmake_install_target.patch
 charls_add_sharedlib_soname.patch
 charls_fix_tests.patch
-charls_fix_clang_compilation_issue.patch
-add_visibility.patch
 stl_symbols_hack.patch
 fix_EncoderStrategy.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/charls.git