public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Tim Harder" <radhermit@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/, media-gfx/gmic/files/
Date: Wed,  4 Sep 2019 13:32:06 +0000 (UTC)	[thread overview]
Message-ID: <1567603898.1d78c775718dbca78456247544e7d3649c33d4f2.radhermit@gentoo> (raw)

commit:     1d78c775718dbca78456247544e7d3649c33d4f2
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  4 13:28:59 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 13:31:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d78c775

media-gfx/gmic: fix qt-cmake patch for 2.7.1

Closes: https://bugs.gentoo.org/693486

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch | 35 ++++++++++++++++++++++++++
 media-gfx/gmic/gmic-2.7.1.ebuild               |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

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 00000000000..caf22d04ce9
--- /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 d4bacf38744..bd8a5d1a186 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
 }


             reply	other threads:[~2019-09-04 13:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-04 13:32 Tim Harder [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-06-10 10:35 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/, media-gfx/gmic/files/ Marek Szuba
2023-01-31 23:15 Marek Szuba
2022-11-10 23:26 Marek Szuba
2022-09-01 23:22 Marek Szuba
2022-09-01 14:54 Marek Szuba
2022-02-15 19:51 Sam James
2021-12-12 19:52 Marek Szuba
2020-11-06 17:18 Marek Szuba
2019-07-02 21:06 Tim Harder
2018-12-30  8:27 Tim Harder
2018-12-30  8:27 Tim Harder
2016-10-29  4:49 Tim Harder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1567603898.1d78c775718dbca78456247544e7d3649c33d4f2.radhermit@gentoo \
    --to=radhermit@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox