pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/slim Fix patch to actually correct the real error ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4afbe0dbe10
branches:  trunk
changeset: 381279:c4afbe0dbe10
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jun 02 21:00:03 2018 +0000

description:
Fix patch to actually correct the real error here.

diffstat:

 x11/slim/distinfo                |  4 ++--
 x11/slim/patches/patch-panel.cpp |  6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r a172014f58bb -r c4afbe0dbe10 x11/slim/distinfo
--- a/x11/slim/distinfo Sat Jun 02 20:02:04 2018 +0000
+++ b/x11/slim/distinfo Sat Jun 02 21:00:03 2018 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2018/06/02 16:46:50 jmcneill Exp $
+$NetBSD: distinfo,v 1.4 2018/06/02 21:00:03 joerg Exp $
 
 SHA1 (slim-1.3.6.tar.gz) = 9407ea2ee7b2ed649f17a8ddbf1f7b26a7c7b9fb
 RMD160 (slim-1.3.6.tar.gz) = 1bf3269b23275c50b67ada8cb5709e093eb6764f
 SHA512 (slim-1.3.6.tar.gz) = 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c
 Size (slim-1.3.6.tar.gz) = 232547 bytes
 SHA1 (patch-CMakeLists.txt) = 27f0222a206465e12f22f78e418b1615f7825cd4
-SHA1 (patch-panel.cpp) = 38ae847eb34f90ee7ca5c23daf515067e5c3b844
+SHA1 (patch-panel.cpp) = 51f87c90214cbc55fd5628f7d852d6287d763903
 SHA1 (patch-slim.conf) = c85fb8f14e02e602f1dd5a72ffa20de7a34e5a13
diff -r a172014f58bb -r c4afbe0dbe10 x11/slim/patches/patch-panel.cpp
--- a/x11/slim/patches/patch-panel.cpp  Sat Jun 02 20:02:04 2018 +0000
+++ b/x11/slim/patches/patch-panel.cpp  Sat Jun 02 21:00:03 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-panel.cpp,v 1.1 2018/06/02 16:46:50 jmcneill Exp $
+$NetBSD: patch-panel.cpp,v 1.2 2018/06/02 21:00:03 joerg Exp $
+
+XCreateGC returns a null pointer on failure, not a negative value.
 
 --- panel.cpp.orig     2013-10-01 22:38:05.000000000 +0000
 +++ panel.cpp
@@ -7,7 +9,7 @@
                gcv.graphics_exposures = False;
                WinGC = XCreateGC(Dpy, Win, gcm, &gcv);
 -              if (WinGC < 0) {
-+              if ((intptr_t)WinGC < 0) {
++              if (!WinGC) {
                        cerr << APPNAME
                                << ": failed to create pixmap\n.";
                        exit(ERR_EXIT);



Home | Main Index | Thread Index | Old Index