* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qtfm/, x11-misc/qtfm/files/
@ 2019-06-09 13:46 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2019-06-09 13:46 UTC (permalink / raw
To: gentoo-commits
commit: 9f4dd94a3978cd6f7aa8aa1682e2574583db97d6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 13:46:33 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 13:46:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4dd94a
x11-misc/qtfm: Add live ebuild
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/qtfm/files/qtfm-99999-cmake.patch | 47 ++++++++++++++++++++++++++
x11-misc/qtfm/qtfm-99999.ebuild | 53 ++++++++++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
new file mode 100644
index 00000000000..a89d090510d
--- /dev/null
+++ b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
@@ -0,0 +1,47 @@
+--- 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 @@
+ ${PROJECT_VERSION_MAJOR}
+ )
+ if(ENABLE_MAGICK OR ENABLE_MAGICK7)
+- 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
new file mode 100644
index 00000000000..012984f236a
--- /dev/null
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 xdg-utils cmake-utils
+
+DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+HOMEPAGE="https://qtfm.eu/"
+EGIT_REPO_URI="https://github.com/rodlie/qtfm/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE="+dbus ffmpeg imagemagick"
+
+RDEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ sys-apps/file
+ dbus? ( dev-qt/qtdbus:5 )
+ ffmpeg? ( virtual/ffmpeg )
+ imagemagick? ( >=media-gfx/imagemagick-7:= )
+"
+DEPEND="
+ ${RDEPEND}
+ app-arch/unzip
+ dev-qt/linguist-tools:5
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-99999-cmake.patch
+)
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_DBUS="$(usex dbus)"
+ -DENABLE_FFMPEG="$(usex ffmpeg)"
+ -DENABLE_MAGICK7="$(usex imagemagick)"
+ )
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qtfm/, x11-misc/qtfm/files/
@ 2019-12-15 16:28 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2019-12-15 16:28 UTC (permalink / raw
To: gentoo-commits
commit: edf2d1dc837f9d905ecbbb67ec4ee72f48f020fd
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 14:26:26 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 16:28:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf2d1dc
x11-misc/qtfm: Update live ebuild
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/qtfm/files/qtfm-99999-cmake.patch | 41 ++----------------------------
x11-misc/qtfm/qtfm-99999.ebuild | 2 +-
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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/qtfm/, x11-misc/qtfm/files/
@ 2022-09-26 17:18 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-09-26 17:18 UTC (permalink / raw
To: gentoo-commits
commit: da4a7fe895dbd1b2a44e59b0b8a8196b74283433
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 10:55:00 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 17:15:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4a7fe8
x11-misc/qtfm: update EAPI 7 -> 8, drop broken patch, use xdg.eclass
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-misc/qtfm/files/qtfm-99999-cmake.patch | 10 ----------
x11-misc/qtfm/qtfm-99999.ebuild | 26 +++++++-------------------
2 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
deleted file mode 100644
index 815453760fe2..000000000000
--- a/x11-misc/qtfm/files/qtfm-99999-cmake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -121,7 +121,6 @@ set_target_properties(
- ${PROJECT_VERSION_MAJOR}
- )
- if(ENABLE_MAGICK)
-- target_compile_definitions(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
- target_link_libraries(QtFM ${MAGICK_LIBRARIES})
- if(ENABLE_FFMPEG)
- target_include_directories(QtFM
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
index d61d41015c7a..7f4ff083dd93 100644
--- a/x11-misc/qtfm/qtfm-99999.ebuild
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake git-r3 xdg-utils
+inherit cmake git-r3 xdg
DESCRIPTION="Small, lightweight file manager based on pure Qt"
HOMEPAGE="https://qtfm.eu/"
@@ -14,10 +14,6 @@ SLOT="0"
KEYWORDS=""
IUSE="+dbus ffmpeg imagemagick"
-BDEPEND="
- app-arch/unzip
- dev-qt/linguist-tools:5
-"
RDEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -30,8 +26,10 @@ RDEPEND="
imagemagick? ( >=media-gfx/imagemagick-7:= )
"
DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-99999-cmake.patch )
+BDEPEND="
+ app-arch/unzip
+ dev-qt/linguist-tools:5
+"
src_configure() {
local mycmakeargs=(
@@ -41,13 +39,3 @@ src_configure() {
)
cmake_src_configure
}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-26 17:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-15 16:28 [gentoo-commits] repo/gentoo:master commit in: x11-misc/qtfm/, x11-misc/qtfm/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2022-09-26 17:18 Andreas Sturmlechner
2019-06-09 13:46 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox