commit: a854f1b7b93e9ec63d2da4d213d765a9569d120c Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Mon Oct 21 14:21:52 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Mon Oct 21 14:24:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a854f1b7
gui-apps/paperde: fix BDEPEND and broken includes Closes: https://bugs.gentoo.org/860003 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> .../files/paperde-0.1.1_p20210426-fix-deps.patch | 63 ++++++++++++++++++++++ gui-apps/paperde/paperde-0.1.1_p20210426.ebuild | 13 ++--- 2 files changed, 70 insertions(+), 6 deletions(-) diff --git a/gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch b/gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch new file mode 100644 index 000000000..929ff7577 --- /dev/null +++ b/gui-apps/paperde/files/paperde-0.1.1_p20210426-fix-deps.patch @@ -0,0 +1,63 @@ +Explicitly add missing Qt5Netowrk deps. +Fixes: +In file included from /var/tmp/portage/gui-apps/paperde-0.1.1_p20210426/work/paperde-15018307192107e2915671d412f3fc900ac5af4b/papershell/main.cpp:34: +/usr/include/cprime/capplication.h:39:10: fatal error: QLocalServer: No such file or directory + 39 | #include <QLocalServer> + | ^~~~~~~~~~~~~~ +--- a/papershell/CMakeLists.txt ++++ b/papershell/CMakeLists.txt +@@ -25,6 +25,7 @@ set( CMAKE_AUTOUIC ON ) + + find_package( Qt5Core REQUIRED ) + find_package( Qt5Gui REQUIRED ) ++find_package( Qt5Network REQUIRED ) + find_package( Qt5Widgets REQUIRED ) + find_package( Qt5DBus REQUIRED ) + find_package( dbusmenu-qt5 REQUIRED ) +@@ -121,7 +122,7 @@ set ( RESOURCES + add_executable( papershell ${SOURCES} ${HEADERS} ${UIS} ${RESOURCES} ) + target_link_libraries( + papershell +- Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus # Qt5 Libs ++ Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::DBus # Qt5 Libs + dbusmenu-qt5 # DBusMenu Qt5 for tray menu + cprime-widgets cprime-gui cprime-core # CuboCore Libs + paperdegui paperdecore paperdewl # PaperDE Libs +--- a/sessionmanager/CMakeLists.txt ++++ b/sessionmanager/CMakeLists.txt +@@ -25,6 +25,7 @@ set( CMAKE_AUTOUIC ON ) + + find_package( Qt5Core REQUIRED ) + find_package( Qt5DBus REQUIRED ) ++find_package( Qt5Network REQUIRED ) + + set( HEADERS + sessionmgr.h +@@ -38,7 +39,7 @@ set( SOURCES + ) + + add_executable( papersessionmanager ${SOURCES} ${HEADERS} ) +-target_link_libraries( papersessionmanager Qt5::Core Qt5::DBus cprime-core csys paperdecore ) ++target_link_libraries( papersessionmanager Qt5::Core Qt5::DBus Qt5::Network cprime-core csys paperdecore ) + + install( TARGETS papersessionmanager DESTINATION bin ) + install( FILES paperdesktop.desktop DESTINATION share/wayland-sessions/ ) +--- a/settings/CMakeLists.txt ++++ b/settings/CMakeLists.txt +@@ -25,6 +25,7 @@ set( CMAKE_AUTOUIC ON ) + + find_package( Qt5Core REQUIRED ) + find_package( Qt5Gui REQUIRED ) ++find_package( Qt5Network REQUIRED ) + find_package( Qt5Widgets REQUIRED ) + find_package( Qt5UiTools REQUIRED ) + +@@ -50,7 +51,7 @@ set ( RESOURCES + add_executable( papersettings ${SOURCES} ${HEADERS} ${UIS} ${RESOURCES} ) + target_link_libraries( + papersettings +- Qt5::Core Qt5::Gui Qt5::Widgets Qt5::UiTools ++ Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::UiTools + cprime-widgets cprime-core + paperdegui paperdecore paperdewl + ) diff --git a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild index 612f3e01a..498832fd3 100644 --- a/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild +++ b/gui-apps/paperde/paperde-0.1.1_p20210426.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg @@ -22,6 +22,7 @@ LICENSE="GPL-3" SLOT="0" BDEPEND=" + dev-qt/qtwaylandscanner:5 kde-frameworks/extra-cmake-modules " DEPEND=" @@ -30,6 +31,7 @@ DEPEND=" dev-libs/wayland-protocols dev-qt/designer:5 dev-qt/qtcore:5 + dev-qt/qtdbus:5 dev-qt/qtgui:5[wayland,X] dev-qt/qtnetwork:5 dev-qt/qtsvg:5 @@ -45,10 +47,9 @@ RDEPEND=" x11-misc/qt5ct " -src_prepare() { - cmake_src_prepare - xdg_src_prepare -} +PATCHES=( + "${FILESDIR}/${P}-fix-deps.patch" +) src_configure() { local mycmakeargs=(
