CVS commit: pkgsrc/games/asc

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Dec 21 23:40:43 UTC 2019

Modified Files:
        pkgsrc/games/asc: Makefile distinfo
Added Files:
        pkgsrc/games/asc/patches: patch-source_libs_paragui_include_pgbutton.h

Log Message:
export means something different in C++, nothing is actually correct
here. Fix button IDs to actually allow matching. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/games/asc/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/asc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/asc/patches/patch-source_libs_paragui_include_pgbutton.h

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

Modified files:

Index: pkgsrc/games/asc/Makefile
diff -u pkgsrc/games/asc/Makefile:1.65 pkgsrc/games/asc/Makefile:1.66
--- pkgsrc/games/asc/Makefile:1.65      Mon Oct 28 12:38:35 2019
+++ pkgsrc/games/asc/Makefile   Sat Dec 21 23:40:43 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2019/10/28 12:38:35 nia Exp $
+# $NetBSD: Makefile,v 1.66 2019/12/21 23:40:43 joerg Exp $
 
 DISTNAME=      asc-2.6.1.0
+PKGREVISION=   1
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=asc-hq/}
 EXTRACT_SUFX=  .tar.bz2
@@ -33,7 +34,7 @@ USE_LANGUAGES=        c c++11
 # C++11
 GCC_REQD+=     4.7
 
-CPPFLAGS+=     -D__EXPORT__=export
+CPPFLAGS+=     -D__EXPORT__=
 MAKE_ENV+=     top_builddir=.
 MAKE_ENV+=     src_dir=.
 

Index: pkgsrc/games/asc/distinfo
diff -u pkgsrc/games/asc/distinfo:1.14 pkgsrc/games/asc/distinfo:1.15
--- pkgsrc/games/asc/distinfo:1.14      Mon Oct 28 12:38:35 2019
+++ pkgsrc/games/asc/distinfo   Sat Dec 21 23:40:43 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2019/10/28 12:38:35 nia Exp $
+$NetBSD: distinfo,v 1.15 2019/12/21 23:40:43 joerg Exp $
 
 SHA1 (asc/asc-2.6.1.0.tar.bz2) = 3731e8016143d3c83364f67f4ac7d8e7491b7a50
 RMD160 (asc/asc-2.6.1.0.tar.bz2) = f66fd672638c13661618b0e9a7e364a694793322
@@ -17,3 +17,4 @@ RMD160 (asc/time_to_strike.ogg) = 03f676
 SHA512 (asc/time_to_strike.ogg) = 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee
 Size (asc/time_to_strike.ogg) = 3830679 bytes
 SHA1 (patch-configure) = 03ab5b82af9ec361dd671194554ca30abf9b240e
+SHA1 (patch-source_libs_paragui_include_pgbutton.h) = f4c4f54ddedd68ce956c6fb65d86c599decc6456

Added files:

Index: pkgsrc/games/asc/patches/patch-source_libs_paragui_include_pgbutton.h
diff -u /dev/null pkgsrc/games/asc/patches/patch-source_libs_paragui_include_pgbutton.h:1.1
--- /dev/null   Sat Dec 21 23:40:43 2019
+++ pkgsrc/games/asc/patches/patch-source_libs_paragui_include_pgbutton.h       Sat Dec 21 23:40:43 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-source_libs_paragui_include_pgbutton.h,v 1.1 2019/12/21 23:40:43 joerg Exp $
+
+Since GetId() is declared as integer, make sure the constants fit.
+
+--- source/libs/paragui/include/pgbutton.h.orig        2019-12-21 19:52:56.429548693 +0000
++++ source/libs/paragui/include/pgbutton.h
+@@ -129,13 +129,13 @@ public:
+       Standard button IDs
+       */
+       enum {
+-          OK = 0x80000001,
+-          YES = 0x80000002,
+-          NO = 0x80000003,
+-          APPLY = 0x80000004,
+-          CANCEL = 0x80000005,
+-          CLOSE = 0x80000006,
+-          HELP = 0x80000007
++          OK = 0x70000001,
++          YES = 0x70000002,
++          NO = 0x70000003,
++          APPLY = 0x70000004,
++          CANCEL = 0x70000005,
++          CLOSE = 0x70000006,
++          HELP = 0x70000007
+       };
+ 
+       /**