pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/xfreecell Sprinkle "unsigned" ahead of "char" fo...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c37a76b3a431
branches: trunk
changeset: 375685:c37a76b3a431
user: he <he%pkgsrc.org@localhost>
date: Mon Feb 19 09:51:48 2018 +0000
description:
Sprinkle "unsigned" ahead of "char" for various bitmaps, and
handle the C++ trickle-down type conversion warnings.
Bump PKGREVISION.
diffstat:
games/xfreecell/Makefile | 4 +-
games/xfreecell/distinfo | 17 ++-
games/xfreecell/patches/patch-ad | 21 ----
games/xfreecell/patches/patch-boundingMask.bm | 13 ++
games/xfreecell/patches/patch-card.cpp | 38 +++++++-
games/xfreecell/patches/patch-clipMask.bm | 13 ++
games/xfreecell/patches/patch-face.bm | 112 ++++++++++++++++++++++++
games/xfreecell/patches/patch-rank.bm | 13 ++
games/xfreecell/patches/patch-spade_lg.bm | 12 ++
games/xfreecell/patches/patch-stack.cpp | 33 +++++++
games/xfreecell/patches/patch-suit.bm | 71 +++++++++++++++
games/xfreecell/patches/patch-util.cpp | 120 ++++++++++++++++++++++++++
games/xfreecell/patches/patch-util.h | 13 ++
games/xfreecell/patches/patch-widget_util.cpp | 11 +-
games/xfreecell/patches/patch-widget_widget.h | 30 ++++++
15 files changed, 488 insertions(+), 33 deletions(-)
diffs (truncated from 611 to 300 lines):
diff -r 2cb90c822661 -r c37a76b3a431 games/xfreecell/Makefile
--- a/games/xfreecell/Makefile Mon Feb 19 02:54:59 2018 +0000
+++ b/games/xfreecell/Makefile Mon Feb 19 09:51:48 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/09/06 10:40:28 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2018/02/19 09:51:48 he Exp $
DISTNAME= xfreecell-1.0.5b
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= games
#MASTER_SITES= #http://www2.giganet.net/~nakayama/
EXTRACT_SUFX= .tgz
diff -r 2cb90c822661 -r c37a76b3a431 games/xfreecell/distinfo
--- a/games/xfreecell/distinfo Mon Feb 19 02:54:59 2018 +0000
+++ b/games/xfreecell/distinfo Mon Feb 19 09:51:48 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 20:57:08 agc Exp $
+$NetBSD: distinfo,v 1.11 2018/02/19 09:51:48 he Exp $
SHA1 (xfreecell-1.0.5b.tgz) = b0453b09ea2211822a5f03f532097c9eb14db2a6
RMD160 (xfreecell-1.0.5b.tgz) = 2629217bf29734bb25b30ca8aaec62ae19d0ff6f
@@ -7,11 +7,20 @@
SHA1 (patch-aa) = d5235b5a34df4ea12c249d680cc6e674f1c50626
SHA1 (patch-ab) = a34285fa7e8564d18d91cdb23affd1afb5cd8938
SHA1 (patch-ac) = f2fb8f2db71c4051eb28352f02a0fed09f69f97f
-SHA1 (patch-ad) = cfdf8f50b5bba32ea8a1bc048e89e0594e85c072
SHA1 (patch-ae) = cbdf88cf997d8f4dfd683dc0e0d10a46d3ec848b
-SHA1 (patch-card.cpp) = 7a1f8f07d1a9cdba4427771ab3e7553ae667d7df
+SHA1 (patch-boundingMask.bm) = 80f3632ea2774fdd176c3e8d424cc318f3d104ff
+SHA1 (patch-card.cpp) = 38396dcd23e72ffab6590caab15a98f3fd3b8fce
+SHA1 (patch-clipMask.bm) = e2ca037417396eb5c0c458ce868a7bb0f10d5b6c
+SHA1 (patch-face.bm) = b30e39dc9490f14fe574c2b455ec6767953cfb21
SHA1 (patch-freecell.cpp) = 298cc7c3c65b9371ed65a1e987a5d5c790e2ee73
SHA1 (patch-option.cpp) = 31cc65ae105f5fa3885717a4ff99341a864978dc
+SHA1 (patch-rank.bm) = a36d86bbc6e177de61132b552dcc17671031a338
+SHA1 (patch-spade_lg.bm) = 1f491a350c426739fdb2035782c4be4523b37bbb
+SHA1 (patch-stack.cpp) = ec918200d3e3a1b866671cc41b7f416ff5b113a1
+SHA1 (patch-suit.bm) = 3ee476c43436d8ac25ef48ed5c650f32846dc7a5
+SHA1 (patch-util.cpp) = 319924dbb57de58b2815367ad0f3e28e053f049b
+SHA1 (patch-util.h) = c4c00600f8bab887fc6291b6d44218f8780dc697
SHA1 (patch-widget_font.cpp) = 968f4142220d7470819e8ead79e00195ba2837dd
SHA1 (patch-widget_scrollbar.cpp) = 006e69e6dcb96448fd04d21d049f113fde756cc3
-SHA1 (patch-widget_util.cpp) = 5ea757fee16555cec98b6ba0d983fde22c2345c1
+SHA1 (patch-widget_util.cpp) = 9f84e3268238b58c17315b08764b9dcddbd7a348
+SHA1 (patch-widget_widget.h) = da99f6b9cb99b708c7547f30dada2b5cbaa2732c
diff -r 2cb90c822661 -r c37a76b3a431 games/xfreecell/patches/patch-ad
--- a/games/xfreecell/patches/patch-ad Mon Feb 19 02:54:59 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/05/24 15:59:27 obache Exp $
-
---- widget/widget.h.orig 1999-03-15 16:29:32.000000000 +0000
-+++ widget/widget.h
-@@ -8,6 +8,8 @@
- #include <vector>
- #include <string>
-
-+using namespace std;
-+
- const char defaultFont[] = "7x14";
-
- extern Display* NSdpy;
-@@ -42,6 +44,7 @@ Display* NSdisplay();
- // ##### NSComponent #####
- class NSComponent {
- public:
-+ virtual ~NSComponent() {};
- virtual int x() const = 0;
- virtual int y() const = 0;
- virtual unsigned int width() const = 0;
diff -r 2cb90c822661 -r c37a76b3a431 games/xfreecell/patches/patch-boundingMask.bm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xfreecell/patches/patch-boundingMask.bm Mon Feb 19 09:51:48 2018 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-boundingMask.bm,v 1.1 2018/02/19 09:51:48 he Exp $
+
+--- boundingMask.bm.orig 1999-02-26 19:26:25.000000000 +0000
++++ boundingMask.bm
+@@ -2,7 +2,7 @@
+ #define boundingMask_height 123
+ #define boundingMask_x_hot 0
+ #define boundingMask_y_hot 0
+-static char boundingMask_bits[] = {
++static unsigned char boundingMask_bits[] = {
+ 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0xf8, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xfc, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff,
diff -r 2cb90c822661 -r c37a76b3a431 games/xfreecell/patches/patch-card.cpp
--- a/games/xfreecell/patches/patch-card.cpp Mon Feb 19 02:54:59 2018 +0000
+++ b/games/xfreecell/patches/patch-card.cpp Mon Feb 19 09:51:48 2018 +0000
@@ -1,9 +1,43 @@
-$NetBSD: patch-card.cpp,v 1.1 2011/11/22 18:11:14 joerg Exp $
+$NetBSD: patch-card.cpp,v 1.2 2018/02/19 09:51:48 he Exp $
---- card.cpp.orig 2011-11-22 17:05:24.000000000 +0000
+--- card.cpp.orig 1999-03-27 13:36:28.000000000 +0000
+++ card.cpp
@@ -1,3 +1,4 @@
+#include <cstdlib>
#include <cstdio>
#include <math.h>
#ifdef SHAPE
+@@ -40,7 +41,7 @@ static Pixmap boundingMask;
+ static Pixmap clipMask;
+ #endif
+
+-static char bitmap[bmWidth * (cardHeight - 2)];
++static unsigned char bitmap[bmWidth * (cardHeight - 2)];
+ static MoveMode moveMode;
+
+ Card::Card(Suit s, unsigned int v)
+@@ -49,9 +50,9 @@ Card::Card(Suit s, unsigned int v)
+ #ifdef SHAPE
+ if (Option::roundCard() && !initialized) {
+ //Shape
+- boundingMask = XCreateBitmapFromData(dpy, root(), boundingMask_bits,
++ boundingMask = XCreateBitmapFromData(dpy, root(), (const char*)boundingMask_bits,
+ boundingMask_width, boundingMask_height);
+- clipMask = XCreateBitmapFromData(dpy, root(), clipMask_bits, clipMask_width,
++ clipMask = XCreateBitmapFromData(dpy, root(), (const char*)clipMask_bits, clipMask_width,
+ clipMask_height);
+
+ //Cursor
+@@ -89,10 +90,10 @@ Card::Card(Suit s, unsigned int v)
+ hilight = getColor(dpy, "lightskyblue4");
+
+ _usualPixmap =
+- XCreatePixmapFromBitmapData(dpy, gameWindow, bitmap, cardWidth - 2,
++ XCreatePixmapFromBitmapData(dpy, gameWindow, (char*)bitmap, cardWidth - 2,
+ cardHeight - 2, fore, back, DefaultDepth(dpy, DefaultScreen(dpy)));
+ _hilightedPixmap =
+- XCreatePixmapFromBitmapData(dpy, gameWindow, bitmap, cardWidth - 2,
++ XCreatePixmapFromBitmapData(dpy, gameWindow, (char*)bitmap, cardWidth - 2,
+ cardHeight - 2, fore, hilight, DefaultDepth(dpy, DefaultScreen(dpy)));
+
+ selectInput(ButtonPressMask | EnterWindowMask | LeaveWindowMask);
diff -r 2cb90c822661 -r c37a76b3a431 games/xfreecell/patches/patch-clipMask.bm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xfreecell/patches/patch-clipMask.bm Mon Feb 19 09:51:48 2018 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-clipMask.bm,v 1.1 2018/02/19 09:51:48 he Exp $
+
+--- clipMask.bm.orig 1999-02-26 19:26:25.000000000 +0000
++++ clipMask.bm
+@@ -2,7 +2,7 @@
+ #define clipMask_height 123
+ #define clipMask_x_hot 0
+ #define clipMask_y_hot 0
+-static char clipMask_bits[] = {
++static unsigned char clipMask_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x83, 0xf8, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
diff -r 2cb90c822661 -r c37a76b3a431 games/xfreecell/patches/patch-face.bm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xfreecell/patches/patch-face.bm Mon Feb 19 09:51:48 2018 +0000
@@ -0,0 +1,112 @@
+$NetBSD: patch-face.bm,v 1.1 2018/02/19 09:51:48 he Exp $
+
+--- face.bm.orig 1999-02-26 19:26:25.000000000 +0000
++++ face.bm
+@@ -13,7 +13,7 @@
+ #define king_c_height 92
+ #define king_c_x_hot -1
+ #define king_c_y_hot -1
+-static char king_c_bits[] = {
++static unsigned char king_c_bits[] = {
+ 0x00, 0xb0, 0x20, 0x08, 0x82, 0x06, 0x80, 0xe3, 0x20, 0x08, 0x82, 0x03,
+ 0xc0, 0xc7, 0xdb, 0xb6, 0xed, 0x01, 0xe0, 0x8f, 0x21, 0x08, 0xc2, 0x00,
+ 0xe0, 0x0f, 0xff, 0xff, 0x7f, 0x00, 0xe0, 0x0f, 0x56, 0x55, 0x35, 0x00,
+@@ -64,7 +64,7 @@ static char king_c_bits[] = {
+ #define king_d_height 92
+ #define king_d_x_hot -1
+ #define king_d_y_hot -1
+-static char king_d_bits[] = {
++static unsigned char king_d_bits[] = {
+ 0x00, 0x2c, 0x22, 0x22, 0xa2, 0x01, 0x80, 0x58, 0x55, 0x55, 0xd5, 0x00,
+ 0x80, 0x30, 0x22, 0x22, 0xe2, 0x08, 0xc0, 0xe1, 0x88, 0x88, 0x48, 0x04,
+ 0xc0, 0xc1, 0x55, 0x55, 0x75, 0x06, 0xe0, 0x83, 0x89, 0x88, 0x28, 0x45,
+@@ -115,7 +115,7 @@ static char king_d_bits[] = {
+ #define king_h_height 92
+ #define king_h_x_hot -1
+ #define king_h_y_hot -1
+-static char king_h_bits[] = {
++static unsigned char king_h_bits[] = {
+ 0x00, 0x08, 0x00, 0x00, 0x80, 0x00, 0x00, 0xb0, 0x6d, 0xdb, 0x76, 0x00,
+ 0x00, 0x60, 0x55, 0x55, 0x55, 0x00, 0x00, 0xc0, 0x28, 0x8a, 0x22, 0x03,
+ 0x00, 0x80, 0x10, 0x04, 0xa1, 0x04, 0x38, 0x38, 0x11, 0x04, 0xf1, 0x02,
+@@ -166,7 +166,7 @@ static char king_h_bits[] = {
+ #define king_s_height 92
+ #define king_s_x_hot -1
+ #define king_s_y_hot -1
+-static char king_s_bits[] = {
++static unsigned char king_s_bits[] = {
+ 0x00, 0xa0, 0x10, 0x04, 0x41, 0x02, 0x00, 0xc2, 0x39, 0x8e, 0x63, 0x01,
+ 0x00, 0x82, 0x7d, 0xdf, 0xf7, 0x00, 0x00, 0x07, 0x7d, 0xdf, 0x67, 0x00,
+ 0x00, 0x07, 0x12, 0x04, 0x21, 0x00, 0x80, 0x0f, 0xfc, 0xff, 0x3f, 0x00,
+@@ -217,7 +217,7 @@ static char king_s_bits[] = {
+ #define queen_c_height 92
+ #define queen_c_x_hot -1
+ #define queen_c_y_hot -1
+-static char queen_c_bits[] = {
++static unsigned char queen_c_bits[] = {
+ 0xc0, 0xec, 0x92, 0x02, 0x00, 0x00, 0xe0, 0xef, 0x29, 0x03, 0xe0, 0x00,
+ 0xe1, 0xaf, 0x44, 0x02, 0xf0, 0x01, 0xc3, 0xa6, 0x92, 0x02, 0xf8, 0x03,
+ 0x02, 0xf6, 0x29, 0x03, 0xf8, 0x03, 0x66, 0xb6, 0xcf, 0x03, 0xf8, 0x03,
+@@ -268,7 +268,7 @@ static char queen_c_bits[] = {
+ #define queen_d_height 92
+ #define queen_d_x_hot -1
+ #define queen_d_y_hot -1
+-static char queen_d_bits[] = {
++static unsigned char queen_d_bits[] = {
+ 0x04, 0xf1, 0x49, 0x01, 0x00, 0x00, 0xc8, 0xb7, 0x94, 0x01, 0x80, 0x00,
+ 0x08, 0x79, 0x22, 0x03, 0x80, 0x00, 0x88, 0x58, 0x41, 0x05, 0xc0, 0x01,
+ 0xe8, 0xbf, 0x80, 0x09, 0xc0, 0x01, 0x88, 0xec, 0x77, 0x0b, 0xe0, 0x03,
+@@ -319,7 +319,7 @@ static char queen_d_bits[] = {
+ #define queen_h_height 92
+ #define queen_h_x_hot -1
+ #define queen_h_y_hot -1
+-static char queen_h_bits[] = {
++static unsigned char queen_h_bits[] = {
+ 0x00, 0x54, 0x05, 0x20, 0x00, 0x00, 0x00, 0xac, 0xce, 0x20, 0x0e, 0x0e,
+ 0x00, 0x56, 0xcd, 0x11, 0x1f, 0x1f, 0x00, 0xae, 0xda, 0x91, 0xbf, 0x3f,
+ 0x00, 0x16, 0x15, 0x90, 0xbf, 0x3f, 0x00, 0x0e, 0x3a, 0x93, 0xff, 0x3f,
+@@ -370,7 +370,7 @@ static char queen_h_bits[] = {
+ #define queen_s_height 92
+ #define queen_s_x_hot -1
+ #define queen_s_y_hot -1
+-static char queen_s_bits[] = {
++static unsigned char queen_s_bits[] = {
+ 0x00, 0x96, 0xb4, 0x10, 0x00, 0x00, 0x00, 0x4e, 0x19, 0x08, 0x00, 0x00,
+ 0x00, 0x26, 0xb2, 0x0b, 0x00, 0x00, 0x04, 0x15, 0x34, 0x0b, 0x20, 0x00,
+ 0x04, 0x0d, 0xb8, 0x0a, 0x20, 0x00, 0x0a, 0x75, 0x7c, 0x08, 0x70, 0x00,
+@@ -421,7 +421,7 @@ static char queen_s_bits[] = {
+ #define jack_c_height 92
+ #define jack_c_x_hot -1
+ #define jack_c_y_hot -1
+-static char jack_c_bits[] = {
++static unsigned char jack_c_bits[] = {
+ 0x60, 0xab, 0x6a, 0x6b, 0x03, 0x00, 0xc0, 0xd6, 0x56, 0xb5, 0xe1, 0x00,
+ 0x80, 0xad, 0x6a, 0xdb, 0xf0, 0x01, 0x81, 0xdb, 0x56, 0x6d, 0xf8, 0x03,
+ 0x83, 0xf6, 0x7e, 0x37, 0xf8, 0x03, 0x46, 0x0e, 0x00, 0x18, 0xf8, 0x03,
+@@ -472,7 +472,7 @@ static char jack_c_bits[] = {
+ #define jack_d_height 92
+ #define jack_d_x_hot -1
+ #define jack_d_y_hot -1
+-static char jack_d_bits[] = {
++static unsigned char jack_d_bits[] = {
+ 0x00, 0xce, 0xed, 0x76, 0x0e, 0x00, 0x00, 0x9c, 0xed, 0x36, 0x87, 0x00,
+ 0x00, 0x38, 0x0c, 0x86, 0x83, 0x00, 0x01, 0xf0, 0xff, 0xff, 0xc1, 0x01,
+ 0x03, 0xf0, 0xff, 0xff, 0xc0, 0x01, 0x07, 0xb0, 0x02, 0xc0, 0xe0, 0x03,
+@@ -523,7 +523,7 @@ static char jack_d_bits[] = {
+ #define jack_h_height 92
+ #define jack_h_x_hot -1
+ #define jack_h_y_hot -1
+-static char jack_h_bits[] = {
++static unsigned char jack_h_bits[] = {
+ 0x60, 0xca, 0x64, 0xca, 0x00, 0x00, 0xc0, 0xd4, 0x6a, 0x65, 0x00, 0x00,
+ 0x81, 0xc9, 0x64, 0x32, 0x07, 0x07, 0x03, 0xd3, 0x6a, 0x99, 0x8f, 0x0f,
+ 0x17, 0xc6, 0x60, 0xcc, 0xdf, 0x1f, 0x37, 0xfc, 0xff, 0xcf, 0xdf, 0x1f,
+@@ -574,7 +574,7 @@ static char jack_h_bits[] = {
+ #define jack_s_height 92
+ #define jack_s_x_hot -1
+ #define jack_s_y_hot -1
+-static char jack_s_bits[] = {
++static unsigned char jack_s_bits[] = {
+ 0xb8, 0xba, 0xee, 0xea, 0x40, 0x00, 0x70, 0x75, 0xd7, 0x75, 0xe0, 0x00,
+ 0xe4, 0xba, 0xee, 0x3a, 0xe0, 0x00, 0xca, 0x75, 0xd7, 0x1d, 0xf0, 0x01,
+ 0x8e, 0xff, 0xff, 0x0f, 0xf0, 0x01, 0x0e, 0xff, 0xff, 0x0f, 0xf8, 0x03,
diff -r 2cb90c822661 -r c37a76b3a431 games/xfreecell/patches/patch-rank.bm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xfreecell/patches/patch-rank.bm Mon Feb 19 09:51:48 2018 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-rank.bm,v 1.1 2018/02/19 09:51:48 he Exp $
+
+--- rank.bm.orig 1999-02-26 19:26:25.000000000 +0000
++++ rank.bm
+@@ -11,7 +11,7 @@
+ */
+ #define rank_width 9
+ #define rank_height 14
+-static char rank_bits[13][28] = {
++static unsigned char rank_bits[13][28] = {
+ { 0x38, 0x00, 0x38, 0x00, 0x38, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c, 0x00,
+ 0x6c, 0x00, 0xc6, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xc6, 0x00, 0x83, 0x01,
+ 0x83, 0x01, 0x83, 0x01},
diff -r 2cb90c822661 -r c37a76b3a431 games/xfreecell/patches/patch-spade_lg.bm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xfreecell/patches/patch-spade_lg.bm Mon Feb 19 09:51:48 2018 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-spade_lg.bm,v 1.1 2018/02/19 09:51:48 he Exp $
+
+--- spade_lg.bm.orig 1999-02-26 19:26:25.000000000 +0000
++++ spade_lg.bm
+@@ -1,6 +1,6 @@
+ #define spade_lg_width 39
+ #define spade_lg_height 52
+-static char spade_lg_bits[] = {
++static unsigned char spade_lg_bits[] = {
Home |
Main Index |
Thread Index |
Old Index