| 1 |
commit: e4de64c9978b82a66c7d07913a32058f3d54c07d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 22 21:20:20 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 22 21:59:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4de64c9 |
| 7 |
|
| 8 |
app-portage/kuroo: Drop bogus dependencies |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/811693 |
| 11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-portage/kuroo/files/kuroo-1.2.1-cmake.patch | 108 ++++++++++++++++++++++++ |
| 15 |
app-portage/kuroo/kuroo-1.2.1.ebuild | 2 + |
| 16 |
2 files changed, 110 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-portage/kuroo/files/kuroo-1.2.1-cmake.patch b/app-portage/kuroo/files/kuroo-1.2.1-cmake.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..a84a503f7d7 |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-portage/kuroo/files/kuroo-1.2.1-cmake.patch |
| 23 |
@@ -0,0 +1,108 @@ |
| 24 |
+Drop bogus dependencies, add implicit. |
| 25 |
+ |
| 26 |
+--- a/CMakeLists.txt |
| 27 |
++++ b/CMakeLists.txt |
| 28 |
+@@ -11,25 +11,32 @@ |
| 29 |
+ include(ECMInstallIcons) |
| 30 |
+ include(ECMAddTests) |
| 31 |
+ |
| 32 |
+-find_package(Qt5Widgets REQUIRED) |
| 33 |
++# Works without this explicit declaration but it ought to be here for correctness |
| 34 |
++find_package( SQLite3 REQUIRED ) |
| 35 |
+ |
| 36 |
+-find_package( KF5 ${KF5_MIN_VERSION} REQUIRED |
| 37 |
+- Auth |
| 38 |
+- Config |
| 39 |
+- ConfigWidgets |
| 40 |
+- CoreAddons |
| 41 |
+- I18n |
| 42 |
+- IconThemes |
| 43 |
+- ItemModels |
| 44 |
+- ItemViews |
| 45 |
++# These are actually all deps of other things |
| 46 |
++find_package( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS |
| 47 |
++ Core |
| 48 |
++ Gui |
| 49 |
++ Widgets |
| 50 |
++) |
| 51 |
++ |
| 52 |
++find_package( KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
| 53 |
++ # These are all required directly and not provided by any dependencies. It "compiles and works" on the development system with just these |
| 54 |
+ KIO |
| 55 |
+ Notifications |
| 56 |
+ ThreadWeaver |
| 57 |
+ TextWidgets |
| 58 |
+- Su |
| 59 |
+- WidgetsAddons |
| 60 |
+- WindowSystem |
| 61 |
+- XmlGui |
| 62 |
++ # Required in link step |
| 63 |
++ XmlGui # MainWindow is XmlGuiWindow |
| 64 |
++ ItemViews # TreeWidgetSearchLine |
| 65 |
++ # These seem to be provided by deps, but should be direct deps too |
| 66 |
++ ConfigWidgets |
| 67 |
++ I18n # i18n(QStr) |
| 68 |
++ Config # Config dialogs |
| 69 |
++ Auth # KAuthExecuteJob &c. |
| 70 |
++ CoreAddons # AboutData? Job Process User? |
| 71 |
++ WidgetsAddons # Font(Chooser|Requester)? PageWidget? MessageBox ... |
| 72 |
+ ) |
| 73 |
+ |
| 74 |
+ # |
| 75 |
+--- a/src/CMakeLists.txt |
| 76 |
++++ b/src/CMakeLists.txt |
| 77 |
+@@ -102,25 +102,37 @@ |
| 78 |
+ kde_enable_exceptions() |
| 79 |
+ |
| 80 |
+ target_link_libraries( kuroo |
| 81 |
++ # These are all used directly and not provided by any other dependency. It "compiles and works" on the development system with just these |
| 82 |
++ KF5::KIOCore |
| 83 |
++ KF5::Notifications |
| 84 |
++ KF5::ThreadWeaver |
| 85 |
++ KF5::TextWidgets |
| 86 |
++ KF5::XmlGui |
| 87 |
++ sqlite3 # TODO: use some sort of ORM maybe find_package? |
| 88 |
++ KF5::ItemViews |
| 89 |
++ # Builds without these specified, but they should be necessary |
| 90 |
+ Qt5::Core |
| 91 |
++ Qt5::Gui |
| 92 |
++ Qt5::Widgets |
| 93 |
+ KF5::Auth |
| 94 |
++ KF5::AuthCore |
| 95 |
+ KF5::ConfigCore |
| 96 |
+ KF5::ConfigGui |
| 97 |
++ KF5::ConfigWidgets |
| 98 |
+ KF5::CoreAddons |
| 99 |
+ KF5::I18n |
| 100 |
+- KF5::ItemViews |
| 101 |
+- KF5::KIOCore |
| 102 |
+- KF5::Notifications |
| 103 |
+- KF5::ThreadWeaver |
| 104 |
+- KF5::TextWidgets |
| 105 |
+ KF5::WidgetsAddons |
| 106 |
+- KF5::WindowSystem |
| 107 |
+- KF5::XmlGui |
| 108 |
+- sqlite3 |
| 109 |
+ ) |
| 110 |
+ |
| 111 |
+ add_executable( kuroo_helper auth/kuroohelper.cpp ) |
| 112 |
+-target_link_libraries( kuroo_helper Qt5::Core KF5::KIOCore KF5::Auth KF5::CoreAddons ) |
| 113 |
++target_link_libraries( kuroo_helper |
| 114 |
++ # These are all used directly and not provided by any other dependency. It "compiles and works" on the development system with just these |
| 115 |
++ KF5::KIOCore |
| 116 |
++ KF5::Auth |
| 117 |
++ # Builds without explicit declaration, but these make sense |
| 118 |
++ Qt5::Core |
| 119 |
++ KF5::CoreAddons # KProcess |
| 120 |
++) |
| 121 |
+ install( TARGETS kuroo_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR} ) |
| 122 |
+ kauth_install_helper_files( kuroo_helper org.gentoo.portage.kuroo root ) |
| 123 |
+ kauth_install_actions( org.gentoo.portage.kuroo auth/org.gentoo.portage.kuroo.actions ) |
| 124 |
+@@ -139,6 +151,6 @@ |
| 125 |
+ ########### install ############### |
| 126 |
+ install( TARGETS kuroo ${INSTALL_TARGETS_DEFAULT_ARGS} ) |
| 127 |
+ #install( FILES DESTINATION ${DATA_INSTALL_DIR}/autostart ) |
| 128 |
+-install( FILES config/kurooconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) |
| 129 |
++install( FILES config/kurooconfig.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} ) |
| 130 |
+ install( FILES kurooui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kuroo ) |
| 131 |
+ install( FILES kuroo.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/System ) |
| 132 |
|
| 133 |
diff --git a/app-portage/kuroo/kuroo-1.2.1.ebuild b/app-portage/kuroo/kuroo-1.2.1.ebuild |
| 134 |
index 8924ea2ecde..c8ec7215a7e 100644 |
| 135 |
--- a/app-portage/kuroo/kuroo-1.2.1.ebuild |
| 136 |
+++ b/app-portage/kuroo/kuroo-1.2.1.ebuild |
| 137 |
@@ -38,6 +38,8 @@ RDEPEND="${DEPEND} |
| 138 |
kde-apps/kompare:5 |
| 139 |
" |
| 140 |
|
| 141 |
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 811693 |
| 142 |
+ |
| 143 |
pkg_postinst() { |
| 144 |
if ! has_version app-admin/logrotate ; then |
| 145 |
elog "Installing app-admin/logrotate is recommended to keep" |
Archives