[gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/

[Sam James]

commit:     7259054dc8ec790e33f40816fb96a0875d1e4cf2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 21:56:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 21:56:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7259054d

kde-apps/yakuake: add missing patch from ::kde

Closes: https://bugs.gentoo.org/866073
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/yakuake-22.07.90-without_x11.patch       | 87 ++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch b/kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch
new file mode 100644
index 000000000000..2d46600e3dc2
--- /dev/null
+++ b/kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch
@@ -0,0 +1,87 @@
+From 1213c6dfd34583b005d0a2dbe7876951a13361a2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 14:49:51 +0100
+Subject: [PATCH] Add CMake option to build WITHOUT_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.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt     | 30 ++++++++++++++++--------------
+ app/CMakeLists.txt |  4 ++--
+ 2 files changed, 18 insertions(+), 16 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eafad24..f9a8167 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,20 +51,22 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+ )
+ 
+ if(NOT APPLE)
+-  find_package(X11)
+-  set(HAVE_X11 ${X11_FOUND})
+-
+-  if(X11_FOUND)
+-      if (QT_MAJOR_VERSION EQUAL "5")
+-          find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
+-      else()
+-          find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui)
+-      endif()
+-  endif(X11_FOUND)
+-
+-  find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
+-  set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
+-endif(NOT APPLE)
++    option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
++    if(NOT WITHOUT_X11)
++        find_package(X11)
++        set(HAVE_X11 ${X11_FOUND})
++        if(X11_FOUND)
++            if (QT_MAJOR_VERSION EQUAL "5")
++                find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++            else()
++                find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui)
++            endif()
++        endif()
++    endif()
++
++    find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
++    set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
++endif()
+ 
+ add_subdirectory(app)
+ add_subdirectory(data)
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index b2838ec..6ada125 100644
+--- a/app/CMakeLists.txt
++++ b/app/CMakeLists.txt
+@@ -63,13 +63,13 @@ target_link_libraries(yakuake
+     KF5::WidgetsAddons
+     KF5::WindowSystem)
+ 
+-if(X11_FOUND)
++if(HAVE_X11)
+     if (TARGET Qt5::X11Extras)
+         target_link_libraries(yakuake Qt5::X11Extras)
+     elseif (TARGET Qt6::Gui)
+         target_link_libraries(yakuake Qt6::GuiPrivate) # qtx11extras_p.h in knotificationrestrictions
+     endif()
+-endif(X11_FOUND)
++endif()
+ 
+ if(KF5Wayland_FOUND)
+   target_link_libraries(yakuake KF5::WaylandClient)
+-- 
+GitLab
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/

[Andreas Sturmlechner]

commit:     f0c6e575a9ead686b81bfdf6238d2a3ad6ea4fe4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 10:50:07 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 10:50:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c6e575

kde-apps/yakuake: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/yakuake-22.04.3-without_x11.patch        | 78 ----------------------
 1 file changed, 78 deletions(-)

diff --git a/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch b/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch
deleted file mode 100644
index 5daf29c35da4..000000000000
--- a/kde-apps/yakuake/files/yakuake-22.04.3-without_x11.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 68bee7bce59bed1def66518bc254ecf7ae8985c5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 27 Nov 2021 14:49:51 +0100
-Subject: [PATCH] Add CMake option to build WITHOUT_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.
-
-Introducing this option means there is no behavior change by default,
-cmake will just skip finding X11 or adding unwanted features if the
-option is enabled.
-
-* backported to release/22.04
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt     | 22 ++++++++++++----------
- app/CMakeLists.txt |  6 +++---
- 2 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14f6842..0ec65b9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,16 +51,18 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
- )
- 
- if(NOT APPLE)
--  find_package(X11)
--  set(HAVE_X11 ${X11_FOUND})
--
--  if(X11_FOUND)
--    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
--  endif(X11_FOUND)
--
--  find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
--  set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
--endif(NOT APPLE)
-+    option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF)
-+    if(NOT WITHOUT_X11)
-+        find_package(X11)
-+        set(HAVE_X11 ${X11_FOUND})
-+        if(X11_FOUND)
-+            find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
-+        endif()
-+    endif()
-+
-+    find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG)
-+    set(HAVE_KWAYLAND ${KF5Wayland_FOUND})
-+endif()
- 
- add_subdirectory(app)
- add_subdirectory(data)
-diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
-index 69aedcd..994d36f 100644
---- a/app/CMakeLists.txt
-+++ b/app/CMakeLists.txt
-@@ -63,9 +63,9 @@ target_link_libraries(yakuake
-     KF5::WidgetsAddons
-     KF5::WindowSystem)
- 
--if(X11_FOUND)
--  target_link_libraries(yakuake Qt5::X11Extras ${X11_X11_LIB})
--endif(X11_FOUND)
-+if(HAVE_X11)
-+    target_link_libraries(yakuake Qt5::X11Extras)
-+endif()
- 
- if(KF5Wayland_FOUND)
-   target_link_libraries(yakuake KF5::WaylandClient)
--- 
-2.35.1
-

[gentoo-commits] repo/gentoo:master commit in: kde-apps/yakuake/files/

[Conrad Kostecki]

commit:     2c39b203f775ee2ddbe223f5576c22b2b2bf1f6e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Sep 16 15:54:17 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Oct  4 21:43:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c39b203

kde-apps/yakuake: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32836
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch | 28 ----------------------
 1 file changed, 28 deletions(-)

diff --git a/kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch b/kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch
deleted file mode 100644
index 808aa488d0da..000000000000
--- a/kde-apps/yakuake/files/yakuake-23.08.0-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0d0a3639b1c1e33aa49e979879e29064808a0a96 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 26 Aug 2023 12:49:24 +0200
-Subject: [PATCH] Fix broken HAVE_KWAYLAND assignment
-
-Fixes up commit 3e58132f2315b99d0d8c8c233a8183079356506a
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d143f9..bfdcd12 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,7 +80,7 @@ if(NOT APPLE)
-     endif()
- 
-     find_package(KF${KF_MAJOR_VERSION}Wayland ${KF_MIN_VERSION} CONFIG)
--    set(HAVE_KWAYLAND KF${KF_MAJOR_VERSION}Wayland_FOUND)
-+    set(HAVE_KWAYLAND ${KF${KF_MAJOR_VERSION}Wayland_FOUND})
- endif()
- 
- add_subdirectory(app)
--- 
-2.42.0
-