summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-12-22 21:01:21 +0000
committerjoerg <joerg@pkgsrc.org>2016-12-22 21:01:21 +0000
commitb759aaa48ae49dd6f7ff4ff4c0fd8ceb6b39a2bc (patch)
tree00ab37f0dd31a263b40ba7e1d37f330aff949f03 /cad
parenteedc5ed0029c9a0ffaf2e97e899bb37d2b704aad (diff)
downloadpkgsrc-b759aaa48ae49dd6f7ff4ff4c0fd8ceb6b39a2bc.tar.gz
Don't use non-int values for scancodes. Bump revision.
Diffstat (limited to 'cad')
-rw-r--r--cad/kicad/Makefile4
-rw-r--r--cad/kicad/distinfo3
-rw-r--r--cad/kicad/patches/patch-include_common.h20
3 files changed, 24 insertions, 3 deletions
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index d7f5c45a1cd..70fea9c4912 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -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
diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo
index de8effbc393..7655205ddee 100644
--- a/cad/kicad/distinfo
+++ b/cad/kicad/distinfo
@@ -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) = 7b3363a917e408327061f313e7cce8f77f0977
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
diff --git a/cad/kicad/patches/patch-include_common.h b/cad/kicad/patches/patch-include_common.h
new file mode 100644
index 00000000000..6719c9f36bc
--- /dev/null
+++ b/cad/kicad/patches/patch-include_common.h
@@ -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
+ */
+