* [gentoo-commits] proj/kde:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/
@ 2019-06-08 7:19 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-06-08 7:19 UTC (permalink / raw
To: gentoo-commits
commit: ed57d16f9d3c2365196ff59426384e4af9f96692
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 07:18:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 07:18:54 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed57d16f
kde-plasma/libksysguard: Gentooxplain detailed mem info unavailability
Closes: https://bugs.gentoo.org/684740
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...bksysguard-5.16.0-no-detailed-mem-message.patch | 26 ++++++++++++++++++++++
kde-plasma/libksysguard/libksysguard-5.16.0.ebuild | 2 ++
.../libksysguard/libksysguard-5.16.49.9999.ebuild | 2 ++
kde-plasma/libksysguard/libksysguard-9999.ebuild | 2 ++
4 files changed, 32 insertions(+)
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch
new file mode 100644
index 0000000000..477f88d4e5
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch
@@ -0,0 +1,26 @@
+From 49c5fdcc3bfdfedfaeaabac4f0070b986a166ce2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 7 Jun 2019 22:58:55 +0200
+Subject: [PATCH] Gentooify message about QtWebEngineWidgets
+
+Translations can not be provided for this.
+---
+ processui/scripting.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/processui/scripting.cpp b/processui/scripting.cpp
+index 83cf895..647194a 100644
+--- a/processui/scripting.cpp
++++ b/processui/scripting.cpp
+@@ -242,7 +242,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) {
+ mScriptingHtmlDialog->webView()->load(fileName);
+ #else
+ QMessageBox::critical(this, i18n("QtWebEngineWidgets not available"),
+- i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution."));
++ QStringLiteral("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available."));
+ #endif
+ }
+ #if HAVE_QTWEBENGINEWIDGETS
+--
+2.21.0
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.16.0.ebuild b/kde-plasma/libksysguard/libksysguard-5.16.0.ebuild
index 81e50754ed..10e28b40e0 100644
--- a/kde-plasma/libksysguard/libksysguard-5.16.0.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.16.0.ebuild
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
+PATCHES=( "${FILESDIR}/${P}-no-detailed-mem-message.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package !minimal KF5Plasma)
diff --git a/kde-plasma/libksysguard/libksysguard-5.16.49.9999.ebuild b/kde-plasma/libksysguard/libksysguard-5.16.49.9999.ebuild
index 93e98374df..f7ef3e4408 100644
--- a/kde-plasma/libksysguard/libksysguard-5.16.49.9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.16.49.9999.ebuild
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
+PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package !minimal KF5Plasma)
diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index 93e98374df..f7ef3e4408 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
X? ( x11-base/xorg-proto )
"
+PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package !minimal KF5Plasma)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/
@ 2022-10-11 12:39 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-10-11 12:39 UTC (permalink / raw
To: gentoo-commits
commit: a2b72ad2f7001809ac033e3ff56294072fee195a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 6 08:18:29 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 12:39:11 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2b72ad2
kde-plasma/libksysguard: Fix build with USE -X
Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libksysguard-5.26.0-with_x11.patch | 110 +++++++++++++++++++++
.../libksysguard/libksysguard-5.26.49.9999.ebuild | 10 +-
kde-plasma/libksysguard/libksysguard-9999.ebuild | 10 +-
3 files changed, 126 insertions(+), 4 deletions(-)
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch b/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
new file mode 100644
index 0000000000..d275044133
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
@@ -0,0 +1,110 @@
+From c389fbdaff34e35b0cd5de32b52e818714e13d40 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 1 Aug 2022 16:53:42 +0200
+Subject: [PATCH] Add CMake option to build WITH_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+- Cleanup HAVE_* definitions a bit
+- Clarify X11 PURPOSE a bit
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 44 ++++++++++++++++++++++------------------
+ processui/CMakeLists.txt | 4 ++--
+ 2 files changed, 26 insertions(+), 22 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 55938c4..5d4e085 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,25 +65,31 @@ ecm_setup_version(${PROJECT_VERSION}
+ SOVERSION 9
+ )
+
+-find_package(X11)
+-set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
+- URL "https://www.x.org"
+- TYPE OPTIONAL
+- PURPOSE "Required for building the X11 based workspace"
+- )
+-if(X11_FOUND)
+- if (QT_MAJOR_VERSION STREQUAL "5")
+- find_package(Qt5X11Extras REQUIRED)
+- elseif (QT_MAJOR_VERSION STREQUAL "6")
+- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
+- endif()
+- set(HAVE_X11 1)
+- find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
+- find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
+-
+- if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
+- set(X11_XRes_FOUND TRUE)
++option(WITH_X11 "Build with X11 support." ON)
++if(WITH_X11)
++ find_package(X11)
++ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++ URL "https://www.x.org"
++ TYPE OPTIONAL
++ PURPOSE "Required for building Process UI with X11 support"
++ )
++ if(X11_FOUND)
++ if (QT_MAJOR_VERSION STREQUAL "5")
++ find_package(Qt5X11Extras REQUIRED)
++ elseif (QT_MAJOR_VERSION STREQUAL "6")
++ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
++ endif()
++ set(HAVE_X11 1)
++ find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
++ find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
++
++ if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
++ set(HAVE_XRES 1)
++ endif()
+ endif()
++else()
++ set(HAVE_X11 0)
++ set(HAVE_XRES 0)
+ endif()
+
+ set(WEBENGINE_SCRIPTING_ENABLED FALSE)
+@@ -122,8 +128,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ PURPOSE "Used for reading hardware sensors")
+ endif()
+
+-set(HAVE_X11 ${X11_FOUND})
+-set(HAVE_XRES ${X11_XRes_FOUND})
+ configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h )
+
+ option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt
+index 2932733..c9bd800 100644
+--- a/processui/CMakeLists.txt
++++ b/processui/CMakeLists.txt
+@@ -30,7 +30,7 @@ ki18n_wrap_ui( processui_LIB_SRCS
+ add_library(processui ${processui_LIB_SRCS})
+ add_library(KSysGuard::ProcessUi ALIAS processui)
+
+-if(X11_XRes_FOUND)
++if(HAVE_XRES)
+ target_link_libraries(processui PRIVATE ${X11_XRes_LIB} ${X11_LIBRARIES})
+ include_directories(${X11_XRes_INCLUDE_PATH})
+ endif()
+@@ -59,7 +59,7 @@ target_include_directories(processui
+ "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
+ "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/ksysguard>"
+ )
+-if(X11_FOUND)
++if(HAVE_X11)
+ if (QT_MAJOR_VERSION STREQUAL "5")
+ target_link_libraries(processui PRIVATE Qt::X11Extras KF5::WindowSystem)
+ else()
+--
+2.35.1
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.26.49.9999.ebuild b/kde-plasma/libksysguard/libksysguard-5.26.49.9999.ebuild
index 6354bfcba0..50ffca5ebc 100644
--- a/kde-plasma/libksysguard/libksysguard-5.26.49.9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.26.49.9999.ebuild
@@ -58,13 +58,19 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/plasma-workspace-5.18.80:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
+PATCHES=(
+ # downstream patch
+ "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch"
+ # pending upstream:
+ # https://invent.kde.org/plasma/libksysguard/-/merge_requests/238
+ "${FILESDIR}/${PN}-5.26.0-with_x11.patch"
+)
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package webengine Qt5WebChannel)
$(cmake_use_find_package webengine Qt5WebEngineWidgets)
- $(cmake_use_find_package X X11)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index 39e6ddd19f..aa76374971 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -58,13 +58,19 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/plasma-workspace-5.18.80:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
+PATCHES=(
+ # downstream patch
+ "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch"
+ # pending upstream:
+ # https://invent.kde.org/plasma/libksysguard/-/merge_requests/238
+ "${FILESDIR}/${PN}-5.26.0-with_x11.patch"
+)
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package webengine Qt5WebChannel)
$(cmake_use_find_package webengine Qt5WebEngineWidgets)
- $(cmake_use_find_package X X11)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/
@ 2023-01-09 20:58 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-01-09 20:58 UTC (permalink / raw
To: gentoo-commits
commit: a67db29cac101a46412a67e571319a3005ccf5ca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 20:44:57 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 20:58:08 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a67db29c
kde-plasma/libksysguard: Patch upstreamed
Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libksysguard-5.26.0-with_x11.patch | 110 ---------------------
kde-plasma/libksysguard/libksysguard-9999.ebuild | 9 +-
2 files changed, 2 insertions(+), 117 deletions(-)
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch b/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
deleted file mode 100644
index d275044133..0000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.26.0-with_x11.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From c389fbdaff34e35b0cd5de32b52e818714e13d40 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 1 Aug 2022 16:53:42 +0200
-Subject: [PATCH] Add CMake option to build WITH_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-HAVE_X11 already exists and is set automagically so far, but using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config.
-
-- Cleanup HAVE_* definitions a bit
-- Clarify X11 PURPOSE a bit
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 44 ++++++++++++++++++++++------------------
- processui/CMakeLists.txt | 4 ++--
- 2 files changed, 26 insertions(+), 22 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55938c4..5d4e085 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,25 +65,31 @@ ecm_setup_version(${PROJECT_VERSION}
- SOVERSION 9
- )
-
--find_package(X11)
--set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-- URL "https://www.x.org"
-- TYPE OPTIONAL
-- PURPOSE "Required for building the X11 based workspace"
-- )
--if(X11_FOUND)
-- if (QT_MAJOR_VERSION STREQUAL "5")
-- find_package(Qt5X11Extras REQUIRED)
-- elseif (QT_MAJOR_VERSION STREQUAL "6")
-- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
-- endif()
-- set(HAVE_X11 1)
-- find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
-- find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
--
-- if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
-- set(X11_XRes_FOUND TRUE)
-+option(WITH_X11 "Build with X11 support." ON)
-+if(WITH_X11)
-+ find_package(X11)
-+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+ URL "https://www.x.org"
-+ TYPE OPTIONAL
-+ PURPOSE "Required for building Process UI with X11 support"
-+ )
-+ if(X11_FOUND)
-+ if (QT_MAJOR_VERSION STREQUAL "5")
-+ find_package(Qt5X11Extras REQUIRED)
-+ elseif (QT_MAJOR_VERSION STREQUAL "6")
-+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
-+ endif()
-+ set(HAVE_X11 1)
-+ find_library(X11_XRes_LIB XRes ${X11_LIB_SEARCH_PATH})
-+ find_path(X11_XRes_INCLUDE_PATH X11/extensions/XRes.h ${X11_INC_SEARCH_PATH})
-+
-+ if(X11_XRes_LIB AND X11_XRes_INCLUDE_PATH)
-+ set(HAVE_XRES 1)
-+ endif()
- endif()
-+else()
-+ set(HAVE_X11 0)
-+ set(HAVE_XRES 0)
- endif()
-
- set(WEBENGINE_SCRIPTING_ENABLED FALSE)
-@@ -122,8 +128,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- PURPOSE "Used for reading hardware sensors")
- endif()
-
--set(HAVE_X11 ${X11_FOUND})
--set(HAVE_XRES ${X11_XRes_FOUND})
- configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h )
-
- option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
-diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt
-index 2932733..c9bd800 100644
---- a/processui/CMakeLists.txt
-+++ b/processui/CMakeLists.txt
-@@ -30,7 +30,7 @@ ki18n_wrap_ui( processui_LIB_SRCS
- add_library(processui ${processui_LIB_SRCS})
- add_library(KSysGuard::ProcessUi ALIAS processui)
-
--if(X11_XRes_FOUND)
-+if(HAVE_XRES)
- target_link_libraries(processui PRIVATE ${X11_XRes_LIB} ${X11_LIBRARIES})
- include_directories(${X11_XRes_INCLUDE_PATH})
- endif()
-@@ -59,7 +59,7 @@ target_include_directories(processui
- "$<BUILD_INTERFACE:${libksysguard_SOURCE_DIR}>"
- "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/ksysguard>"
- )
--if(X11_FOUND)
-+if(HAVE_X11)
- if (QT_MAJOR_VERSION STREQUAL "5")
- target_link_libraries(processui PRIVATE Qt::X11Extras KF5::WindowSystem)
- else()
---
-2.35.1
-
diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index 42d7635da9..168f7f068f 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -57,13 +57,8 @@ RDEPEND="${COMMON_DEPEND}
!<kde-plasma/ksysguard-5.21.90:5
"
-PATCHES=(
- # downstream patch
- "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch"
- # pending upstream:
- # https://invent.kde.org/plasma/libksysguard/-/merge_requests/238
- "${FILESDIR}/${PN}-5.26.0-with_x11.patch"
-)
+# downstream patch
+PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-09 20:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-08 7:19 [gentoo-commits] proj/kde:master commit in: kde-plasma/libksysguard/files/, kde-plasma/libksysguard/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-10-11 12:39 Andreas Sturmlechner
2023-01-09 20:58 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox