summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-12-15 15:26:26 +0100
committerJeroen Roovers <jer@gentoo.org>2019-12-15 17:28:03 +0100
commitedf2d1dc837f9d905ecbbb67ec4ee72f48f020fd (patch)
tree765b152d586e03457876c3e5c582195903b9d6bf /x11-misc/qtfm
parentmedia-sound/csound-9999: dropped python3_5 (diff)
downloadgentoo-edf2d1dc837f9d905ecbbb67ec4ee72f48f020fd.tar.gz
gentoo-edf2d1dc837f9d905ecbbb67ec4ee72f48f020fd.tar.bz2
gentoo-edf2d1dc837f9d905ecbbb67ec4ee72f48f020fd.zip
x11-misc/qtfm: Update live ebuild
Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'x11-misc/qtfm')
-rw-r--r--x11-misc/qtfm/files/qtfm-99999-cmake.patch41
-rw-r--r--x11-misc/qtfm/qtfm-99999.ebuild2
2 files changed, 3 insertions, 40 deletions
diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
index a89d090510d..815453760fe 100644
--- a/x11-misc/qtfm/files/qtfm-99999-cmake.patch
+++ b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
@@ -1,47 +1,10 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -36,7 +36,7 @@
- add_definitions(-DMAGICK7)
- endif()
- find_package(PkgConfig REQUIRED)
-- pkg_check_modules(MAGICK REQUIRED ImageMagick++)
-+ pkg_check_modules(MAGICK REQUIRED Magick++)
- # ffmpeg
- if(ENABLE_FFMPEG)
- pkg_check_modules(AVDEVICE REQUIRED libavdevice)
-@@ -66,7 +66,7 @@
- find_package(Qt5Concurrent REQUIRED)
-
- # inotify
--if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
-+if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(NOTIFY REQUIRED libinotify)
- endif()
-@@ -123,7 +123,7 @@
+@@ -121,7 +121,6 @@ set_target_properties(
${PROJECT_VERSION_MAJOR}
)
- if(ENABLE_MAGICK OR ENABLE_MAGICK7)
+ if(ENABLE_MAGICK)
- target_compile_definitions(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
-+ target_compile_options(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
target_link_libraries(QtFM ${MAGICK_LIBRARIES})
if(ENABLE_FFMPEG)
target_include_directories(QtFM
-@@ -161,7 +161,7 @@
- if(ENABLE_DBUS)
- target_link_libraries(QtFM Qt5::DBus QtFMBus)
- endif()
--if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
-+if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- target_link_libraries(QtFM ${NOTIFY_LIBRARIES})
- endif()
- if(APPLE)
-@@ -192,7 +192,7 @@
- if(ENABLE_DBUS)
- target_link_libraries(${PROJECT_NAME} Qt5::DBus)
- endif()
--if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
-+if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- target_link_libraries(${PROJECT_NAME} ${NOTIFY_LIBRARIES})
- endif()
- if(APPLE)
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
index 012984f236a..61cdeb65e86 100644
--- a/x11-misc/qtfm/qtfm-99999.ebuild
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -37,7 +37,7 @@ src_configure() {
mycmakeargs=(
-DENABLE_DBUS="$(usex dbus)"
-DENABLE_FFMPEG="$(usex ffmpeg)"
- -DENABLE_MAGICK7="$(usex imagemagick)"
+ -DENABLE_MAGICK="$(usex imagemagick)"
)
cmake-utils_src_configure
}