diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2019-09-04 07:28:59 -0600 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2019-09-04 07:31:38 -0600 |
| commit | 1d78c775718dbca78456247544e7d3649c33d4f2 (patch) | |
| tree | 94b258038215dbce3af55390c363cbbb915729cb | |
| parent | package.mask: Masked =www-client/seamonkey-2.49.9.1_p0 (diff) | |
| download | gentoo-1d78c775718dbca78456247544e7d3649c33d4f2.tar.gz gentoo-1d78c775718dbca78456247544e7d3649c33d4f2.tar.bz2 gentoo-1d78c775718dbca78456247544e7d3649c33d4f2.zip | |
media-gfx/gmic: fix qt-cmake patch for 2.7.1
Closes: https://bugs.gentoo.org/693486
Signed-off-by: Tim Harder <radhermit@gentoo.org>
| -rw-r--r-- | media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch | 35 | ||||
| -rw-r--r-- | media-gfx/gmic/gmic-2.7.1.ebuild | 2 |
2 files changed, 36 insertions, 1 deletions
diff --git a/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch new file mode 100644 index 000000000000..caf22d04ce94 --- /dev/null +++ b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch @@ -0,0 +1,35 @@ +Fix linking with fftw when thread support is enabled. + +--- gmic-qt/CMakeLists.txt ++++ gmic-qt/CMakeLists.txt +@@ -13,6 +13,7 @@ + set(CMAKE_AUTOUIC OFF) + set(CMAKE_AUTORCC ON) + set(CMAKE_INCLUDE_CURRENT_DIR ON) ++set(EXTRA_LIBRARIES) + + set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita, none, paintdotnet, or digikam.") + if (${GMIC_QT_HOST} STREQUAL "none") +@@ -145,8 +146,13 @@ + # + find_package(FFTW3 REQUIRED) + add_definitions(-Dcimg_use_fftw3 ) +-add_definitions(-Dcimg_use_fftw3_singlethread ) + include_directories(${FFTW3_INCLUDE_DIR}) ++find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS}) ++if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND") ++ add_definitions(-Dcimg_use_fftw3_singlethread) ++else() ++ list(APPEND EXTRA_LIBRARIES "-lfftw3_threads") ++endif() + + # + # CURL +@@ -187,6 +193,7 @@ + ${PNG_LIBRARIES} + ${FFTW3_LIBRARIES} + ${ZLIB_LIBRARIES} ++ ${EXTRA_LIBRARIES} + ) + + if (CURL_FOUND) diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild index d4bacf387446..bd8a5d1a186b 100644 --- a/media-gfx/gmic/gmic-2.7.1.ebuild +++ b/media-gfx/gmic/gmic-2.7.1.ebuild @@ -87,7 +87,7 @@ src_prepare() { if use gimp || use krita || use qt5; then sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die local S="${S}/gmic-qt" - PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch ) + PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch ) cmake-utils_src_prepare fi } |