Sat Jan 7 01:26:15 2023 UTC ()
lxqt-globalkeys: adjust previous LOG_MAKEPRI patch

This is also actually relevant to NetBSD, which defines it incorrectly
(PR lib/57172).


(gutteridge)
diff -r1.21 -r1.22 pkgsrc/x11/lxqt-globalkeys/Makefile
diff -r1.11 -r1.12 pkgsrc/x11/lxqt-globalkeys/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/lxqt-globalkeys/patches/patch-daemon_core.cpp
cvs diff -r1.21 -r1.22 pkgsrc/x11/lxqt-globalkeys/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/lxqt-globalkeys/Makefile 2023/01/06 02:35:47 1.21
+++ pkgsrc/x11/lxqt-globalkeys/Makefile 2023/01/07 01:26:14 1.22
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.21 2023/01/06 02:35:47 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.22 2023/01/07 01:26:14 gutteridge Exp $
2 2
3DISTNAME= lxqt-globalkeys-1.2.0 3DISTNAME= lxqt-globalkeys-1.2.0
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=lxqt/}
7GITHUB_RELEASE= ${PKGVERSION_NOREV} 7GITHUB_RELEASE= ${PKGVERSION_NOREV}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://github.com/lxqt/lxqt-globalkeys/ 11HOMEPAGE= https://github.com/lxqt/lxqt-globalkeys/
12COMMENT= Daemon and library for global keyboard shortcuts registration 12COMMENT= Daemon and library for global keyboard shortcuts registration
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15USE_CMAKE= yes 15USE_CMAKE= yes
16USE_TOOLS+= pkg-config perl 16USE_TOOLS+= pkg-config perl
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
cvs diff -r1.11 -r1.12 pkgsrc/x11/lxqt-globalkeys/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/lxqt-globalkeys/distinfo 2023/01/06 02:35:47 1.11
+++ pkgsrc/x11/lxqt-globalkeys/distinfo 2023/01/07 01:26:14 1.12
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.11 2023/01/06 02:35:47 gutteridge Exp $ 1$NetBSD: distinfo,v 1.12 2023/01/07 01:26:14 gutteridge Exp $
2 2
3BLAKE2s (lxqt-globalkeys-1.2.0.tar.xz) = 5a8b8e15213f1dcdbf822e47b36d7a8e6291d903c6b7ab19df507369edb01938 3BLAKE2s (lxqt-globalkeys-1.2.0.tar.xz) = 5a8b8e15213f1dcdbf822e47b36d7a8e6291d903c6b7ab19df507369edb01938
4SHA512 (lxqt-globalkeys-1.2.0.tar.xz) = c1270ae03fcb2fd8b8e548898c36d57ead6b5bea62f246a1587f4093a937141c6c7339f838d1f4ff0b9bd9b9c8079ba8cf0229b575d323e6d78e8b7ccc2eb624 4SHA512 (lxqt-globalkeys-1.2.0.tar.xz) = c1270ae03fcb2fd8b8e548898c36d57ead6b5bea62f246a1587f4093a937141c6c7339f838d1f4ff0b9bd9b9c8079ba8cf0229b575d323e6d78e8b7ccc2eb624
5Size (lxqt-globalkeys-1.2.0.tar.xz) = 73504 bytes 5Size (lxqt-globalkeys-1.2.0.tar.xz) = 73504 bytes
6SHA1 (patch-autostart_CMakeLists.txt) = e5c4b76a3b116ee9b4781783a6ada3838f8e570c 6SHA1 (patch-autostart_CMakeLists.txt) = e5c4b76a3b116ee9b4781783a6ada3838f8e570c
7SHA1 (patch-daemon_core.cpp) = f765304ce23efd0ea2b69f6366453b3410adfc04 7SHA1 (patch-daemon_core.cpp) = 6a8ddb797c39986fe35021e14a6c3c2324b7f189
cvs diff -r1.3 -r1.4 pkgsrc/x11/lxqt-globalkeys/patches/patch-daemon_core.cpp (expand / switch to unified diff)

--- pkgsrc/x11/lxqt-globalkeys/patches/patch-daemon_core.cpp 2023/01/06 02:35:47 1.3
+++ pkgsrc/x11/lxqt-globalkeys/patches/patch-daemon_core.cpp 2023/01/07 01:26:14 1.4
@@ -1,17 +1,23 @@ @@ -1,17 +1,23 @@
1$NetBSD: patch-daemon_core.cpp,v 1.3 2023/01/06 02:35:47 gutteridge Exp $ 1$NetBSD: patch-daemon_core.cpp,v 1.4 2023/01/07 01:26:14 gutteridge Exp $
2 2
3Fix SunOS builds. 3Fix SunOS and OpenBSD builds, and work around a bug in NetBSD with the same
 4macro (PR lib/57172).
4 5
5--- daemon/core.cpp.orig 2022-11-05 08:17:16.000000000 +0000 6--- daemon/core.cpp.orig 2022-11-05 08:17:16.000000000 +0000
6+++ daemon/core.cpp 7+++ daemon/core.cpp
7@@ -59,6 +59,10 @@ 8@@ -59,6 +59,15 @@
8  9
9 #include "core.h" 10 #include "core.h"
10  11
11+#ifndef LOG_MAKEPRI 12+/*
 13+ * SunOS and modern OpenBSD don't define this, and NetBSD's version has an
 14+ * incorrect shift applied (log facilities are already defined with "<<3", it
 15+ * shouldn't be done a second time).
 16+ */
 17+#if !defined(LOG_MAKEPRI) || defined(__NetBSD__)
12+#define LOG_MAKEPRI(fac, pri) ((fac) | (pri)) 18+#define LOG_MAKEPRI(fac, pri) ((fac) | (pri))
13+#endif 19+#endif
14+ 20+
15  21
16 enum 22 enum
17 { 23 {