CVS commit: pkgsrc/cad/kicad

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Dec 22 21:01:22 UTC 2016

Modified Files:
        pkgsrc/cad/kicad: Makefile distinfo
Added Files:
        pkgsrc/cad/kicad/patches: patch-include_common.h

Log Message:
Don't use non-int values for scancodes. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/cad/kicad/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/cad/kicad/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/cad/kicad/patches/patch-include_common.h

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

Modified files:

Index: pkgsrc/cad/kicad/Makefile
diff -u pkgsrc/cad/kicad/Makefile:1.13 pkgsrc/cad/kicad/Makefile:1.14
--- pkgsrc/cad/kicad/Makefile:1.13      Fri Oct  7 18:25:38 2016
+++ pkgsrc/cad/kicad/Makefile   Thu Dec 22 21:01:21 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2016/10/07 18:25:38 adam Exp $
+# $NetBSD: Makefile,v 1.14 2016/12/22 21:01:21 joerg Exp $
 #
 
 V=             4.0.4
 DISTNAME=      kicad-${V}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    cad
 MASTER_SITES=  https://launchpad.net/kicad/4.0/${V}/+download/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/cad/kicad/distinfo
diff -u pkgsrc/cad/kicad/distinfo:1.6 pkgsrc/cad/kicad/distinfo:1.7
--- pkgsrc/cad/kicad/distinfo:1.6       Wed Sep 21 13:16:06 2016
+++ pkgsrc/cad/kicad/distinfo   Thu Dec 22 21:01:21 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2016/09/21 13:16:06 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2016/12/22 21:01:21 joerg Exp $
 
 SHA1 (kicad-4.0.4.tar.xz) = d0a124218f91cd40958ca0d68f8fe1f36d368cc3
 RMD160 (kicad-4.0.4.tar.xz) = 563b5168bd94b8c4a34f720fdb60e677c75f75fe
@@ -18,6 +18,7 @@ SHA1 (patch-eeschema_sch_component.cpp) 
 SHA1 (patch-eeschema_sch_sheet.cpp) = 83dd03910b1a7f78f46d3fc591bf5ec2670f2ce4
 SHA1 (patch-gerbview_CMakeLists.txt) = 817f7fa3f27e77e42d37e0df4fab1525cfb35053
 SHA1 (patch-include-kicad_string.h) = 16f2db87cab7716171360220a6c41d9a8ee5b8d1
+SHA1 (patch-include_common.h) = 10395bb76634e43a7b4c7cf7f27c44c794793589
 SHA1 (patch-include_hashtables.h) = 4b26adef481406b61c1c9cf660f69847aa76142d
 SHA1 (patch-include_kiway.h) = b8438a192222a4d70266ac612552fd0c76d2867c
 SHA1 (patch-include_tool_coroutine.h) = 635534de04d268a5718ec21e4f86c7dd20f1ffe1

Added files:

Index: pkgsrc/cad/kicad/patches/patch-include_common.h
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-include_common.h:1.3
--- /dev/null   Thu Dec 22 21:01:22 2016
+++ pkgsrc/cad/kicad/patches/patch-include_common.h     Thu Dec 22 21:01:22 2016
@@ -0,0 +1,20 @@
+$NetBSD: patch-include_common.h,v 1.3 2016/12/22 21:01:22 joerg Exp $
+
+Given that the constants are used in integer contexts, make sure that
+the value is a valid int.
+
+--- include/common.h.orig      2016-12-22 11:39:43.778530785 +0000
++++ include/common.h
+@@ -54,10 +54,10 @@ class REPORTER;
+ #define GR_KB_LEFTSHIFT  0x20000000                 /* left shift key depressed
+                                                      */
+ #define GR_KB_CTRL       0x40000000                 // CTRL depressed
+-#define GR_KB_ALT        0x80000000                 // ALT depressed
++#define GR_KB_ALT        0x08000000                 // ALT depressed
+ #define GR_KB_SHIFT      (GR_KB_LEFTSHIFT | GR_KB_RIGHTSHIFT)
+ #define GR_KB_SHIFTCTRL  (GR_KB_SHIFT | GR_KB_CTRL)
+-#define MOUSE_MIDDLE     0x08000000                 /* Middle button mouse
++#define MOUSE_MIDDLE     0x04000000                 /* Middle button mouse
+                                                      * flag for block commands
+                                                      */
+