From ac6ef77a09658634150ec218305c941cabc81f63 Mon Sep 17 00:00:00 2001 From: "Michael Mair-Keimberger (asterix)" Date: Wed, 4 Jan 2017 17:41:55 +0100 Subject: media-libs/vigra: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3323 --- .../vigra/files/vigra-1.8.0-automagicness.patch | 54 -------------------- media-libs/vigra/files/vigra-1.8.0-doxygen.patch | 57 ---------------------- media-libs/vigra/files/vigra-1.8.0-gcc47.patch | 25 ---------- media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch | 28 ----------- 4 files changed, 164 deletions(-) delete mode 100644 media-libs/vigra/files/vigra-1.8.0-automagicness.patch delete mode 100644 media-libs/vigra/files/vigra-1.8.0-doxygen.patch delete mode 100644 media-libs/vigra/files/vigra-1.8.0-gcc47.patch delete mode 100644 media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch (limited to 'media-libs') diff --git a/media-libs/vigra/files/vigra-1.8.0-automagicness.patch b/media-libs/vigra/files/vigra-1.8.0-automagicness.patch deleted file mode 100644 index 8f0c5fff065..00000000000 --- a/media-libs/vigra/files/vigra-1.8.0-automagicness.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1b75688..18d01ef 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,19 +46,38 @@ ENDIF () - ################################################## - - INCLUDE(VigraFindPackage) -+option(WITH_TIFF "Enable tiff support" ON) -+option(WITH_JPEG "Enable jpeg support" ON) -+option(WITH_PNG "Enable png support" ON) -+option(WITH_OPENEXR "Enable openexr support" ON) -+option(WITH_FFTW3 "Enable fftw support" ON) -+option(ENABLE_DOC "Build documentation" ON) -+ -+if(WITH_TIFF) - VIGRA_FIND_PACKAGE(TIFF NAMES libtiff) -+endif() -+if(WITH_JPEG) - VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg) -+endif() -+if(WITH_PNG) - VIGRA_FIND_PACKAGE(PNG) -+endif() -+if(WITH_OPENEXR) - VIGRA_FIND_PACKAGE(OpenEXR) -+endif() -+if(WITH_FFTW3) - VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3) - VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3) -+endif() - IF(WITH_HDF5) - VIGRA_FIND_PACKAGE(HDF5) - ENDIF() - - SET(DOXYGEN_SKIP_DOT TRUE) -+if(ENABLE_DOC) - FIND_PACKAGE(Doxygen) - FIND_PACKAGE(PythonInterp) -+endif() - - IF(WITH_VIGRANUMPY) - FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES ) -@@ -317,10 +336,4 @@ ELSE() - MESSAGE( STATUS " vigranumpy will NOT be installed" ) - ENDIF() - --IF(NOT TIFF_FOUND OR NOT JPEG_FOUND OR NOT PNG_FOUND OR NOT FFTW3_FOUND OR -- NOT HDF5_FOUND OR NOT VIGRANUMPY_DEPENDENCIES_FOUND) -- MESSAGE( STATUS "" ) -- MESSAGE( STATUS "Consider setting DEPENDENCY_SEARCH_PREFIX to find missing libraries" ) --ENDIF() -- - MESSAGE( STATUS "---------------------------------------------------------" ) diff --git a/media-libs/vigra/files/vigra-1.8.0-doxygen.patch b/media-libs/vigra/files/vigra-1.8.0-doxygen.patch deleted file mode 100644 index c264a67c017..00000000000 --- a/media-libs/vigra/files/vigra-1.8.0-doxygen.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a8fd9ff8062152ccdcec7d63f2d5075f29ee2429 Mon Sep 17 00:00:00 2001 -From: Ullrich Koethe -Date: Wed, 21 Dec 2011 16:31:56 +0100 -Subject: [PATCH] adapted regular expressions for doxygen 1.7.6.1 - ---- - docsrc/makeFunctionIndex.py | 4 ++-- - docsrc/post.py | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/docsrc/makeFunctionIndex.py b/docsrc/makeFunctionIndex.py -index 55e74bc..06300e2 100644 ---- a/docsrc/makeFunctionIndex.py -+++ b/docsrc/makeFunctionIndex.py -@@ -119,8 +119,8 @@ def generateFunctionIndex(functionList): - text = open(path + "/namespaces.html").read() - if text.find('') > -1: # up to doxygen 1.7.1 - header = text[:text.find('')+5] -- else: # for doxygen 1.7.4 -- header = text[:re.search(r'
[^<]*
\s*\s*\n
',text).end()] -+ else: # for doxygen 1.7.4 to 1.7.6.1 -+ header = text[:re.search(r'
[^<]*
\s*
\s*(?:)?\n
',text).end()] - footer = re.search(r'(?s)(.*)', text).group(1) - - text = re.sub(r'Namespace List', r'Function Index', header) -diff --git a/docsrc/post.py b/docsrc/post.py -index a8836d5..fc51f8d 100644 ---- a/docsrc/post.py -+++ b/docsrc/post.py -@@ -51,13 +51,13 @@ -
-
''') - --# tested with doxygen 1.7.5.1 -+# tested with doxygen 1.7.5.1 and 1.7.6.1 - mainHeading4 = re.compile(r'''( -
) - (
-
- )
(.*)
(.*)() --
-+(?:)? -
''') - - mainHeadingReplacement = '''\\1 -@@ -149,7 +149,7 @@ def processFile(fileName): - f.close() - - files = glob.glob(path + '/*.html') # use given path to files --#files = glob.glob('../doc/vigra/index.html') -+#files = glob.glob(path + '/index.html') - - for file in files: - processFile(file) --- -1.8.1.6 - diff --git a/media-libs/vigra/files/vigra-1.8.0-gcc47.patch b/media-libs/vigra/files/vigra-1.8.0-gcc47.patch deleted file mode 100644 index 83d5f7ee5c5..00000000000 --- a/media-libs/vigra/files/vigra-1.8.0-gcc47.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 11113f8f5ffa868e32259e8d6dcdb543fd58848b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tiziano=20M=C3=BCller?= -Date: Mon, 11 Jun 2012 08:33:06 +0200 -Subject: [PATCH] Fix building with gcc-4.7 - ---- - include/vigra/numpy_array.hxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/vigra/numpy_array.hxx b/include/vigra/numpy_array.hxx -index 1d06a79..7806f6b 100644 ---- a/include/vigra/numpy_array.hxx -+++ b/include/vigra/numpy_array.hxx -@@ -1074,7 +1074,7 @@ void NumpyArray::setupArrayView() - - this->m_stride /= sizeof(value_type); - this->m_ptr = reinterpret_cast(pyArray()->data); -- vigra_precondition(checkInnerStride(Stride()), -+ vigra_precondition(this->checkInnerStride(Stride()), - "NumpyArray<..., UnstridedArrayTag>::setupArrayView(): First dimension of given array is not unstrided (should never happen)."); - - } --- -1.7.8.6 - diff --git a/media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch b/media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch deleted file mode 100644 index f4bb98ac62c..00000000000 --- a/media-libs/vigra/files/vigra-1.8.0-numpy_doc.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/vigranumpy/docsrc/CMakeLists.txt b/vigranumpy/docsrc/CMakeLists.txt -index 547cf81..d12a6f7 100644 ---- a/vigranumpy/docsrc/CMakeLists.txt -+++ b/vigranumpy/docsrc/CMakeLists.txt -@@ -1,4 +1,4 @@ --IF(PYTHON_SPHINX) -+IF(PYTHON_SPHINX AND ENABLE_DOC) - # vigranumpy documentation generation using sphinx - IF(DEFINED VIGRANUMPY_DOCDIR) - MESSAGE(SEND_ERROR "VIGRANUMPY_DOCDIR already defined! Please delete from Cache.") -@@ -49,7 +49,7 @@ IF(PYTHON_SPHINX) - ${VIGRANUMPY_DOCDIR} - COMMENT "Generating vigranumpy documentation") - --ELSE(PYTHON_SPHINX) -+ELSE(PYTHON_SPHINX AND ENABLE_DOC) - # no vigranumpy documentation if sphinx not available - ADD_CUSTOM_TARGET (doc_python - ${CMAKE_COMMAND} -E echo -@@ -57,7 +57,7 @@ ELSE(PYTHON_SPHINX) - "(sphinx-build not found)" - VERBATIM) - --ENDIF(PYTHON_SPHINX) -+ENDIF(PYTHON_SPHINX AND ENABLE_DOC) - - ADD_DEPENDENCIES(doc_python vigranumpy) - ADD_DEPENDENCIES(doc_python doc_cpp) -- cgit v1.2.1