CVS commit: pkgsrc/x11/lxqt-globalkeys

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Jan  7 01:26:15 UTC 2023

Modified Files:
        pkgsrc/x11/lxqt-globalkeys: Makefile distinfo
        pkgsrc/x11/lxqt-globalkeys/patches: patch-daemon_core.cpp

Log Message:
lxqt-globalkeys: adjust previous LOG_MAKEPRI patch

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


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/lxqt-globalkeys/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/lxqt-globalkeys/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/x11/lxqt-globalkeys/patches/patch-daemon_core.cpp

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

Modified files:

Index: pkgsrc/x11/lxqt-globalkeys/Makefile
diff -u pkgsrc/x11/lxqt-globalkeys/Makefile:1.21 pkgsrc/x11/lxqt-globalkeys/Makefile:1.22
--- pkgsrc/x11/lxqt-globalkeys/Makefile:1.21    Fri Jan  6 02:35:47 2023
+++ pkgsrc/x11/lxqt-globalkeys/Makefile Sat Jan  7 01:26:14 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2023/01/06 02:35:47 gutteridge Exp $
+# $NetBSD: Makefile,v 1.22 2023/01/07 01:26:14 gutteridge Exp $
 
 DISTNAME=      lxqt-globalkeys-1.2.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}

Index: pkgsrc/x11/lxqt-globalkeys/distinfo
diff -u pkgsrc/x11/lxqt-globalkeys/distinfo:1.11 pkgsrc/x11/lxqt-globalkeys/distinfo:1.12
--- pkgsrc/x11/lxqt-globalkeys/distinfo:1.11    Fri Jan  6 02:35:47 2023
+++ pkgsrc/x11/lxqt-globalkeys/distinfo Sat Jan  7 01:26:14 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2023/01/06 02:35:47 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2023/01/07 01:26:14 gutteridge Exp $
 
 BLAKE2s (lxqt-globalkeys-1.2.0.tar.xz) = 5a8b8e15213f1dcdbf822e47b36d7a8e6291d903c6b7ab19df507369edb01938
 SHA512 (lxqt-globalkeys-1.2.0.tar.xz) = c1270ae03fcb2fd8b8e548898c36d57ead6b5bea62f246a1587f4093a937141c6c7339f838d1f4ff0b9bd9b9c8079ba8cf0229b575d323e6d78e8b7ccc2eb624
 Size (lxqt-globalkeys-1.2.0.tar.xz) = 73504 bytes
 SHA1 (patch-autostart_CMakeLists.txt) = e5c4b76a3b116ee9b4781783a6ada3838f8e570c
-SHA1 (patch-daemon_core.cpp) = f765304ce23efd0ea2b69f6366453b3410adfc04
+SHA1 (patch-daemon_core.cpp) = 6a8ddb797c39986fe35021e14a6c3c2324b7f189

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