[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

[Johannes Huber]

commit:     62059b22d73b38cdbc1553fba036ad23644b8e49
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 08:55:00 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 08:55:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=62059b22

kde-frameworks/extra-cmake-modules: Remove unused patches

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 ----------------------
 1 file changed, 38 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
deleted file mode 100644
index d1bcf791fd..0000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 2 Dec 2017 19:04:10 +0100
-Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump
-
-Summary:
-Without any hint, qmlplugindump version is whatever default is set by qtchooser.
-Fix uses the same approach as FindQtWaylandScanner.cmake.
-
-Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami.
-
-Reviewers: apol
-
-Subscribers: #frameworks, #build_system
-
-Tags: #frameworks, #build_system
-
-Differential Revision: https://phabricator.kde.org/D9116
----
- modules/ECMFindQMLModule.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 428d60a..d72c52b 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -27,7 +27,7 @@
- 
- include(FindPackageHandleStandardArgs)
- 
--find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
-+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
- if(NOT QMLPLUGINDUMP_PROGRAM)
-     message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
- endif()
--- 
-2.15.1
-

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

[Andreas Sturmlechner]

commit:     0bf8d8508920f66509333f57024a4fa29735b027
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 16:42:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 23:59:22 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0bf8d850

kde-frameworks/extra-cmake-modules: Drop unused patch

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 ----------------------
 1 file changed, 38 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
deleted file mode 100644
index d1bcf791fd..0000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 2 Dec 2017 19:04:10 +0100
-Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump
-
-Summary:
-Without any hint, qmlplugindump version is whatever default is set by qtchooser.
-Fix uses the same approach as FindQtWaylandScanner.cmake.
-
-Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami.
-
-Reviewers: apol
-
-Subscribers: #frameworks, #build_system
-
-Tags: #frameworks, #build_system
-
-Differential Revision: https://phabricator.kde.org/D9116
----
- modules/ECMFindQMLModule.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 428d60a..d72c52b 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -27,7 +27,7 @@
- 
- include(FindPackageHandleStandardArgs)
- 
--find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
-+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
- if(NOT QMLPLUGINDUMP_PROGRAM)
-     message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
- endif()
--- 
-2.15.1
-

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

[Andreas Sturmlechner]

commit:     d67d29299a7347b02b43ccefa5a3884aaf7b7989
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  9 16:01:42 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 16:01:42 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d67d2929

kde-frameworks/extra-cmake-modules: Drop obsolete patch

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../extra-cmake-modules-5.55.0-clazy-1.5.patch     | 41 ----------------------
 1 file changed, 41 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch
deleted file mode 100644
index 0ac07a60ee..0000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001
-From: Elvis Angelaccio <elvis.angelaccio@kde.org>
-Date: Sat, 2 Feb 2019 18:46:27 +0100
-Subject: Fix ENABLE_CLAZY option with clazy >= 1.5
-
-Summary:
-clazy 1.5 renamed its plugin from from `ClangLazy.so` to
-`ClazyPlugin.so` and from `clang-lazy` to `clazy`.
-
-Reviewers: apol, smartins
-
-Subscribers: kde-frameworks-devel, kde-buildsystem
-
-Tags: #frameworks, #build_system
-
-Differential Revision: https://phabricator.kde.org/D18680
----
- kde-modules/KDECMakeSettings.cmake | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake
-index 3f7f5a8..17d79a0 100644
---- a/kde-modules/KDECMakeSettings.cmake
-+++ b/kde-modules/KDECMakeSettings.cmake
-@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     option(ENABLE_CLAZY "Enable Clazy warnings" OFF)
- 
-     if(ENABLE_CLAZY)
--        set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy")
-+        find_library(CLAZY_v1_5_FOUND ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX})
-+        if(CLAZY_v1_5_FOUND) # clazy >= 1.5
-+            set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clazy")
-+        else() # clazy < 1.5
-+            set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy")
-+        endif()
-     endif()
- endif()
- 
--- 
-cgit v1.1
-

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

[Andreas Sturmlechner]

commit:     bfa83df373f42f71c3ed584b9f06021652690c0b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 19:15:23 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 19:15:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bfa83df3

kde-frameworks/extra-cmake-modules: Drop obsolete patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...make-modules-5.74.0-disable-qmlplugindump.patch | 65 ----------------------
 ...make-modules-5.88.0-disable-qmlplugindump.patch | 65 ----------------------
 2 files changed, 130 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
deleted file mode 100644
index 08fcf32338..0000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.74.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 15:01:33 +0100
-Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
- avoid sandbox violations
-
-Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
-BUG: 387753
----
- modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 8109ab8..1edc01d 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -26,23 +26,32 @@
- #=============================================================================
- 
- include(FindPackageHandleStandardArgs)
--include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
- 
--query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
- 
--find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
--if(NOT QMLPLUGINDUMP_PROGRAM)
--    message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
--endif()
--
--execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
--
--if(ExitCode EQUAL 0)
-+if(ECM_DISABLE_QMLPLUGINDUMP)
-+    message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.")
-     set(@GENMODULE@_FOUND TRUE)
--    set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+    set(@GENMODULE@_VERSION @VERSION@)
- else()
--    message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
--    set(@GENMODULE@_FOUND FALSE)
-+    include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-+
-+    query_qmake(qt_binaries_dir QT_INSTALL_BINS)
-+
-+    find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
-+    if(NOT QMLPLUGINDUMP_PROGRAM)
-+        message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
-+    endif()
-+
-+    execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
-+
-+    if(ExitCode EQUAL 0)
-+        set(@GENMODULE@_FOUND TRUE)
-+        set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+    else()
-+        message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
-+        set(@GENMODULE@_FOUND FALSE)
-+    endif()
- endif()
- 
- find_package_handle_standard_args(@GENMODULE@
--- 
-2.24.0
-

diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
deleted file mode 100644
index f2c8368898..0000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.88.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 8bcda9bc1d12e2e8ea54dc8d957e415f9d5469a0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 15:01:33 +0100
-Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
- avoid sandbox violations
-
-Back-story: https://bugzilla.gnome.org/show_bug.cgi?id=744135
-BUG: 387753
----
- modules/ECMFindQMLModule.cmake.in | 35 +++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
-index 4234b702..d9817fe8 100644
---- a/modules/ECMFindQMLModule.cmake.in
-+++ b/modules/ECMFindQMLModule.cmake.in
-@@ -5,23 +5,32 @@
- #=============================================================================
- 
- include(FindPackageHandleStandardArgs)
--include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
- 
--query_qmake(qt_binaries_dir QT_HOST_BINS)
-+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
- 
--find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
--if(NOT QMLPLUGINDUMP_PROGRAM)
--    message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
--endif()
--
--execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30)
--
--if(ExitCode EQUAL 0)
-+if(ECM_DISABLE_QMLPLUGINDUMP)
-+    message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.")
-     set(@GENMODULE@_FOUND TRUE)
--    set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+    set(@GENMODULE@_VERSION @VERSION@)
- else()
--    message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
--    set(@GENMODULE@_FOUND FALSE)
-+    include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake")
-+
-+    query_qmake(qt_binaries_dir QT_HOST_BINS)
-+
-+    find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir})
-+    if(NOT QMLPLUGINDUMP_PROGRAM)
-+        message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
-+    endif()
-+
-+    execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode)
-+
-+    if(ExitCode EQUAL 0)
-+        set(@GENMODULE@_FOUND TRUE)
-+        set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}")
-+    else()
-+        message(STATUS "qmlplugindump failed for @MODULE_NAME@.")
-+        set(@GENMODULE@_FOUND FALSE)
-+    endif()
- endif()
- 
- find_package_handle_standard_args(@GENMODULE@
--- 
-2.33.0
-

[gentoo-commits] proj/kde:master commit in: kde-frameworks/extra-cmake-modules/files/

[Andreas Sturmlechner]

commit:     d414d8d43ee77e45f545fabbf71aaba21cfb2f7a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 21:26:37 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 21:26:49 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d414d8d4

kde-frameworks/extra-cmake-modules: Fix cmake code in patch

skip-ecm_add_test-early.patch broke cmake.

Bug: https://bugs.gentoo.org/837608
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ake-modules-5.93.0-skip-ecm_add_test-early.patch | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
index f9eef60072..84e192919c 100644
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch
@@ -1,4 +1,4 @@
-From 9b53dd107af153b88658ffa246de728a8a6fbd9d Mon Sep 17 00:00:00 2001
+From 36e435f059ee44da78e6900fded348709ea865df Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Sat, 11 Jul 2020 23:04:16 +0200
 Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not
@@ -7,8 +7,8 @@ Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not
 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  modules/ECMAddTests.cmake        | 9 +++++++++
- tests/ECMAddTests/CMakeLists.txt | 4 ++++
- 2 files changed, 13 insertions(+)
+ tests/ECMAddTests/CMakeLists.txt | 5 +++++
+ 2 files changed, 14 insertions(+)
 
 diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake
 index 58c78d05..994ed1e4 100644
@@ -38,20 +38,21 @@ index 58c78d05..994ed1e4 100644
      ecm_add_test(${_test_source}
        NAME_PREFIX ${ARG_NAME_PREFIX}
 diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt
-index aa7e73a1..5fbc1cc7 100644
+index aa7e73a1..f9fb10cb 100644
 --- a/tests/ECMAddTests/CMakeLists.txt
 +++ b/tests/ECMAddTests/CMakeLists.txt
-@@ -2,6 +2,10 @@ if (QT_MAJOR_VERSION EQUAL "6")
-     set(QT_VERSION_OPT "-DBUILD_WITH_QT6=ON")
- else()
+@@ -4,6 +4,11 @@ else()
      set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF")
-+
+ endif()
+ 
 +if(NOT TARGET Qt::Test)
 +    message(STATUS "WARNING: skipping tests that require Qt::Test")
 +    return()
- endif()
- 
++endif()
++
  macro(add_check NAME)
+     string(REPLACE "." "/" dir "${NAME}")
+     string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
 -- 
 2.35.1