[gentoo-commits] repo/gentoo:master commit in: media-gfx/rawtherapee/, media-gfx/rawtherapee/files/

[Pacho Ramos]

commit:     043e8de5728b09812035580454fd9b88123e7a06
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 20:07:07 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 20:16:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043e8de5

Revert "media-gfx/rawtherapee: Fix building with latest glibmm/libsigc++ (#568136)"

This reverts commit 519fe2b101ec4914e62246b72e9ba6139581e0c8.

 .../rawtherapee/files/rawtherapee-4.2-cxx11.patch  | 27 ----------------------
 media-gfx/rawtherapee/rawtherapee-4.2.ebuild       |  4 ----
 2 files changed, 31 deletions(-)

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
deleted file mode 100644
index 48acb5f..0000000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 39ef59ddeb7679c71274b1da3faadd395b650c73 Mon Sep 17 00:00:00 2001
-From: Adam Reichold <adam.reichold@××××××××.de>
-Date: Sun, 29 Nov 2015 11:48:30 +0100
-Subject: [PATCH] Build with '-std=c++11' if libsigc++ version 2.5.1 is used as
- it does require it.
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dd5fcbc..6153484 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -278,10 +278,10 @@ if (OPTION_OMP)
-     endif (OPENMP_FOUND)
- endif (OPTION_OMP)
- 
--if(USE_EXPERIMENTAL_LANG_VERSIONS)
-+if(USE_EXPERIMENTAL_LANG_VERSIONS OR NOT (SIGC_VERSION VERSION_LESS 2.5.1))
- 	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu1x")
- 	SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
--endif (USE_EXPERIMENTAL_LANG_VERSIONS)
-+endif ()
- 
- # find out whether we are building out of source
- get_filename_component(ABS_SOURCE_DIR "${PROJECT_SOURCE_DIR}" ABSOLUTE)

diff --git a/media-gfx/rawtherapee/rawtherapee-4.2.ebuild b/media-gfx/rawtherapee/rawtherapee-4.2.ebuild
index 6702661..6ae07a5 100644
--- a/media-gfx/rawtherapee/rawtherapee-4.2.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-4.2.ebuild
@@ -33,10 +33,6 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig"
 
-PATCHES=(
-        "${FILESDIR}"/${P}-cxx11.patch # Upstream patch for fixing bug #568136
-)
-
 pkg_pretend() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"