summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorZheng Junjie <zhengjunjie@iscas.ac.cn>2024-07-07 00:04:12 +0800
committerZheng Junjie <zhengjunjie@iscas.ac.cn>2024-07-18 10:45:20 +0800
commit6eee6b9e9ff575df0251d1801fc620bcf5be0565 (patch)
treed30514eded02536c5894c9f3aafb765a6ea5df27 /gnu/packages/patches
parentcb27fd498dd701de66aca828d44c710181cad820 (diff)
downloadguix-6eee6b9e9ff575df0251d1801fc620bcf5be0565.tar.gz
gnu: gwenview: Update to 24.05.2.
* gnu/packages/kde.scm (gwenview): Update to 24.05.2.
[inputs]: Remove kactivities, qtimageformats-5, qtsvg-5, qtwayland-5, and
qtx11extras; add plasma-activities, ki18n, libxkbcommon,
qtimageformats, qtsvg, and qtwayland.
[source]: Remove patches.
[arguments]: Set #:qtbase to qtbase.

* gnu/packages/patches/gwenview-kimageannotator.patch: Remove it.
* gnu/local.mk (dist_patch_DATA): Unregister it.

Change-Id: I962edcb3d59542eaf9eccd97c1e08d34ae7ab35b
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/gwenview-kimageannotator.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/gnu/packages/patches/gwenview-kimageannotator.patch b/gnu/packages/patches/gwenview-kimageannotator.patch
deleted file mode 100644
index 92b994a0b5..0000000000
--- a/gnu/packages/patches/gwenview-kimageannotator.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Submitted By:            Douglas R. Reno <renodr at linuxfromscratch dot org>
-Date:                    2024-02-26
-Initial Package Version: 23.08.5
-Upstream Status:         Rejected (Qt6 port is primary now)
-Origin:                  Self
-Description:             Fixes building Gwenview with recent kImageAnnotator
-                         and kColorPicker versions by adjusting their paths
-                         and FOUND variables so that the correct libraries are
-                         selected.
-
---- gwenview-23.08.5.orig/CMakeLists.txt	2024-02-26 15:02:29.702754535 -0600
-+++ gwenview-23.08.5/CMakeLists.txt	2024-02-26 15:09:48.012866877 -0600
-@@ -166,11 +166,11 @@ if(NOT WITHOUT_X11)
- endif()
- 
- if (QT_MAJOR_VERSION STREQUAL "5")
--    find_package(kImageAnnotator)
--    set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED)
--    if(kImageAnnotator_FOUND)
--        set(KIMAGEANNOTATOR_FOUND 1)
--        find_package(kColorPicker REQUIRED)
-+    find_package(kImageAnnotator-Qt5)
-+    set_package_properties(kImageAnnotator-Qt5 PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED)
-+    if(kImageAnnotator-Qt5_FOUND)
-+        set(kImageAnnotator_FOUND 1)
-+        find_package(kColorPicker-Qt5 REQUIRED)
-         if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0)
-             set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1)
-         endif()