From 343fc520f8ea1becfe212fe5c3b59e5aaa110845 Mon Sep 17 00:00:00 2001
From: martin <martin@pkgsrc.org>
Date: Thu, 9 Nov 2006 13:45:33 +0000
Subject: Make it compile with gcc 4.x again

---
 games/xmahjongg/distinfo         |  4 ++--
 games/xmahjongg/patches/patch-ac | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'games/xmahjongg')

diff --git a/games/xmahjongg/distinfo b/games/xmahjongg/distinfo
index 238e364455b..caf9e939804 100644
--- a/games/xmahjongg/distinfo
+++ b/games/xmahjongg/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2006/11/05 18:46:57 rillig Exp $
+$NetBSD: distinfo,v 1.8 2006/11/09 13:45:33 martin Exp $
 
 SHA1 (xmahjongg-3.6.1.tar.gz) = 35e380e53412568e6af7f4fcc1677693f52fc60e
 RMD160 (xmahjongg-3.6.1.tar.gz) = acfc0161322b22296639dff313bae8d57e012618
 Size (xmahjongg-3.6.1.tar.gz) = 462833 bytes
 SHA1 (patch-aa) = 5305cfb0c0c8c0fcc507bc3730043331255a94a5
 SHA1 (patch-ab) = d3c2574c8de7e85c8e38670017d0eda64fe3b0be
-SHA1 (patch-ac) = f8ea278393d81ad0503350f88c7b3a352b78bf22
+SHA1 (patch-ac) = ea3083eff9216833153c1ad68e31a4282938e9d9
diff --git a/games/xmahjongg/patches/patch-ac b/games/xmahjongg/patches/patch-ac
index 565e772d9be..6c189076093 100644
--- a/games/xmahjongg/patches/patch-ac
+++ b/games/xmahjongg/patches/patch-ac
@@ -1,18 +1,18 @@
-$NetBSD: patch-ac,v 1.1 2006/11/05 18:46:58 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2006/11/09 13:45:33 martin Exp $
 
 SunPro sees an overloading ambiguity between operator bool() and
-operator const char *().
+operator const char *(). ISO C++ and gcc 4.2 agree.
 
 --- permstr.cc.orig	2001-09-06 20:30:10.000000000 +0200
-+++ permstr.cc	2006-11-05 19:12:50.020399608 +0100
-@@ -183,8 +183,8 @@ PermString::static_initialize()
++++ permstr.cc	2006-11-09 14:35:55.000000000 +0100
+@@ -183,8 +183,8 @@
  bool
  operator==(PermString a, const char *b)
  {
 -  if (!a || !b)
 -    return !a && !b;
-+  if (a == false || !b)
-+    return (a == false) && !b;
++  if (operator==(a, false) || !b)
++    return (operator==(a, false)) && !b;
    int l = strlen(b);
    return a.length() == l && memcmp(a.cc(), b, l) == 0;
  }
-- 
cgit v1.2.3