pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

khotkeys: update to 5.16.4



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Fri Aug 30 07:23:02 2019 +1200
Changeset:	f4ae44e82611657229b7e7b9d88736a43d4482ef

Modified Files:
	khotkeys/Makefile
	khotkeys/PLIST
	khotkeys/distinfo
Removed Files:
	khotkeys/patches/patch-CMakeLists.txt
	khotkeys/patches/patch-config-X11.h.cmake

Log Message:
khotkeys: update to 5.16.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f4ae44e82611657229b7e7b9d88736a43d4482ef

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 khotkeys/Makefile                         |  4 +---
 khotkeys/PLIST                            | 33 ++++++++++++++++++++++++++-----
 khotkeys/distinfo                         | 10 ++++------
 khotkeys/patches/patch-CMakeLists.txt     | 12 -----------
 khotkeys/patches/patch-config-X11.h.cmake | 11 -----------
 5 files changed, 33 insertions(+), 37 deletions(-)

diffs:
diff --git a/khotkeys/Makefile b/khotkeys/Makefile
index 86c7ee506e..b9be22bf7a 100644
--- a/khotkeys/Makefile
+++ b/khotkeys/Makefile
@@ -17,9 +17,7 @@ USE_TOOLS+=	msgmerge pkg-config
 SUBST_CLASSES+=		fix-moc
 SUBST_STAGE.fix-moc=	post-configure
 SUBST_MESSAGE.fix-moc=	Cleaning up MOC includes
-SUBST_FILES.fix-moc=	_KDE_build/app/CMakeFiles/kded_khotkeys_autogen.dir/AutogenInfo.cmake
-SUBST_FILES.fix-moc+=	_KDE_build/test/CMakeFiles/khotkeys_standalone_autogen.dir/AutogenInfo.cmake
-SUBST_FILES.fix-moc+=	_KDE_build/kcm_hotkeys/CMakeFiles/kcm_hotkeys_autogen.dir/AutogenInfo.cmake
+SUBST_FILES.fix-moc=	_KDE_build/*/CMakeFiles/*_autogen.dir/AutogenInfo.cmake 
 SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
 
 .include "../../devel/kcmutils/buildlink3.mk"
diff --git a/khotkeys/PLIST b/khotkeys/PLIST
index 3e52e98a0a..a63ccbc026 100644
--- a/khotkeys/PLIST
+++ b/khotkeys/PLIST
@@ -5,16 +5,18 @@ lib/libkhotkeysprivate.so.${PKGVERSION}
 qt5/plugins/kcm_hotkeys.so
 qt5/plugins/kf5/kded/khotkeys.so
 share/dbus-1/interfaces/org.kde.khotkeys.xml
+share/doc/HTML/ca/kcontrol/khotkeys/document-open.png
 share/doc/HTML/ca/kcontrol/khotkeys/groups-comment.png
 share/doc/HTML/ca/kcontrol/khotkeys/index.cache.bz2
 share/doc/HTML/ca/kcontrol/khotkeys/index.docbook
 share/doc/HTML/ca/kcontrol/khotkeys/manage-export.png
 share/doc/HTML/ca/kcontrol/khotkeys/oxygen-22x22-edit-clear-locationbar-rtl.png
 share/doc/HTML/ca/kcontrol/khotkeys/settings.png
-share/doc/HTML/ca/kcontrol/khotkeys/shorcuts-action-command.png
-share/doc/HTML/ca/kcontrol/khotkeys/shorcuts-action-keyboard.png
-share/doc/HTML/ca/kcontrol/khotkeys/shorcuts-trigger-keyboard.png
-share/doc/HTML/ca/kcontrol/khotkeys/shorcuts-trigger-mouse.png
+share/doc/HTML/ca/kcontrol/khotkeys/shortcuts-action-command.png
+share/doc/HTML/ca/kcontrol/khotkeys/shortcuts-action-dbus.png
+share/doc/HTML/ca/kcontrol/khotkeys/shortcuts-action-keyboard.png
+share/doc/HTML/ca/kcontrol/khotkeys/shortcuts-trigger-keyboard.png
+share/doc/HTML/ca/kcontrol/khotkeys/shortcuts-trigger-mouse.png
 share/doc/HTML/de/kcontrol/khotkeys/index.cache.bz2
 share/doc/HTML/de/kcontrol/khotkeys/index.docbook
 share/doc/HTML/en/kcontrol/khotkeys/document-open.png
@@ -37,15 +39,36 @@ share/doc/HTML/pt/kcontrol/khotkeys/index.cache.bz2
 share/doc/HTML/pt/kcontrol/khotkeys/index.docbook
 share/doc/HTML/pt_BR/kcontrol/khotkeys/index.cache.bz2
 share/doc/HTML/pt_BR/kcontrol/khotkeys/index.docbook
+share/doc/HTML/ru/kcontrol/khotkeys/document-open.png
+share/doc/HTML/ru/kcontrol/khotkeys/groups-comment.png
+share/doc/HTML/ru/kcontrol/khotkeys/index.cache.bz2
+share/doc/HTML/ru/kcontrol/khotkeys/index.docbook
+share/doc/HTML/ru/kcontrol/khotkeys/manage-export.png
+share/doc/HTML/ru/kcontrol/khotkeys/oxygen-22x22-edit-clear-locationbar-rtl.png
+share/doc/HTML/ru/kcontrol/khotkeys/settings.png
+share/doc/HTML/ru/kcontrol/khotkeys/shortcuts-action-command.png
+share/doc/HTML/ru/kcontrol/khotkeys/shortcuts-action-dbus.png
+share/doc/HTML/ru/kcontrol/khotkeys/shortcuts-action-keyboard.png
+share/doc/HTML/ru/kcontrol/khotkeys/shortcuts-trigger-keyboard.png
+share/doc/HTML/ru/kcontrol/khotkeys/shortcuts-trigger-mouse.png
+share/doc/HTML/sv/kcontrol/khotkeys/index.cache.bz2
+share/doc/HTML/sv/kcontrol/khotkeys/index.docbook
+share/doc/HTML/uk/kcontrol/khotkeys/groups-comment.png
 share/doc/HTML/uk/kcontrol/khotkeys/index.cache.bz2
 share/doc/HTML/uk/kcontrol/khotkeys/index.docbook
+share/doc/HTML/uk/kcontrol/khotkeys/manage-export.png
+share/doc/HTML/uk/kcontrol/khotkeys/settings.png
+share/doc/HTML/uk/kcontrol/khotkeys/shortcuts-action-command.png
+share/doc/HTML/uk/kcontrol/khotkeys/shortcuts-action-dbus.png
+share/doc/HTML/uk/kcontrol/khotkeys/shortcuts-action-keyboard.png
+share/doc/HTML/uk/kcontrol/khotkeys/shortcuts-trigger-keyboard.png
+share/doc/HTML/uk/kcontrol/khotkeys/shortcuts-trigger-mouse.png
 share/khotkeys/defaults.khotkeys
 share/khotkeys/kde32b1.khotkeys
 share/khotkeys/konqueror_gestures_kde321.khotkeys
 share/kservices5/khotkeys.desktop
 share/locale/af/LC_MESSAGES/khotkeys.mo
 share/locale/ar/LC_MESSAGES/khotkeys.mo
-share/locale/ast/LC_MESSAGES/khotkeys.mo
 share/locale/be/LC_MESSAGES/khotkeys.mo
 share/locale/bg/LC_MESSAGES/khotkeys.mo
 share/locale/bn_IN/LC_MESSAGES/khotkeys.mo
diff --git a/khotkeys/distinfo b/khotkeys/distinfo
index 43745da271..292c594743 100644
--- a/khotkeys/distinfo
+++ b/khotkeys/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-SHA1 (khotkeys-5.12.4.tar.xz) = 0905c317459f52fb64055f05dd5b4c9914c37749
-RMD160 (khotkeys-5.12.4.tar.xz) = a94e85457138294c60236f4f6224ee0fabe59a65
-SHA512 (khotkeys-5.12.4.tar.xz) = dacf62abbd13ce37b308f797ca9c6fac740f0ae950c5ee7abd96eb561e6b5b817fd0ccd72b4d5d0ca1fe5a77bec4f1d14c9426877ebcb6cd852a5aa3441b49a4
-Size (khotkeys-5.12.4.tar.xz) = 1058428 bytes
-SHA1 (patch-CMakeLists.txt) = 76c5d572dce339d106ecee11952e28e7de9a2fb0
-SHA1 (patch-config-X11.h.cmake) = 896b0c53e14c0150d9003cca36046e36befa95e0
+SHA1 (khotkeys-5.16.4.tar.xz) = 7c344f56d95a780467e7133b8dae1b482b5b9952
+RMD160 (khotkeys-5.16.4.tar.xz) = b6f8a8eae6a576803c01160e2ea2f87e8c534eff
+SHA512 (khotkeys-5.16.4.tar.xz) = ea38d8822d83703ea6bb58d9a3ff1517c97b544ceba16094ef34eafff62fdc47bb8a2c02411699d34365ec077d41f02063cf28b9aecb5875833aa0eb117ad48f
+Size (khotkeys-5.16.4.tar.xz) = 1866004 bytes
diff --git a/khotkeys/patches/patch-CMakeLists.txt b/khotkeys/patches/patch-CMakeLists.txt
deleted file mode 100644
index 4fd2420933..0000000000
--- a/khotkeys/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- CMakeLists.txt.orig	2019-04-27 19:24:43.601064954 +0000
-+++ CMakeLists.txt
-@@ -37,6 +37,7 @@ find_package(LibKWorkspace CONFIG REQUIR
- if(X11_FOUND)
-     find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras )
-     set(HAVE_XTEST ${X11_XTest_FOUND})
-+    set(HAVE_X11 ${X11_FOUND})
- endif()
- 
- configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
diff --git a/khotkeys/patches/patch-config-X11.h.cmake b/khotkeys/patches/patch-config-X11.h.cmake
deleted file mode 100644
index 10daf80d19..0000000000
--- a/khotkeys/patches/patch-config-X11.h.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
---- config-X11.h.cmake.orig	2018-03-27 11:10:16.000000000 +0000
-+++ config-X11.h.cmake
-@@ -41,4 +41,4 @@
- #cmakedefine HAS_RANDR_1_3 1
- 
- /* Define if you have X11 at all */
--#define HAVE_X11 ${X11_FOUND}
-\ No newline at end of file
-+#cmakedefine01 HAVE_X11


Home | Main Index | Thread Index | Old Index