CVS commit: pkgsrc/games/xscorch

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/xscorch
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Fri, 20 Nov 2020 15:15:25 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Nov 20 15:15:24 UTC 2020

Modified Files:
        pkgsrc/games/xscorch: Makefile distinfo
Added Files:
        pkgsrc/games/xscorch/patches: patch-libj_jstr_str__trim.c
            patch-sgtk_sgtk.h
Removed Files:
        pkgsrc/games/xscorch/patches: patch-aa patch-ac patch-ad

Log Message:
xscorch: Update to 0.2.1

Changes in 0.2.1
------------------

   KNOWN BUGS:
    * Leap Frogs fail to leap in Interleaved Mode, because the land
      is not cleared by one explosion before the next missile is animated.
    * Some moves/items are interpreted locally instead of sent through
      the network server like they should be.  It contributes to desync.
    * Graphics/Computers are fast - hangs and crashes have been reported.
    * The wedge code sometimes draws straight ends instead of rounded ones.
    * The man page is out of date enough to notice.

   BUG FIXES:
    * Audited for 64-bit pointers and should now run on 64-bit platforms.
    * Hans de Goede of the Fedora project fixed a stack smash in saddconf.
    * Fix from Sayu for roller infinite loop on elastic/rubbery walls bug.

   MISCELLANEOUS:
    * Updated the FSF's address in our GPL notices.
    * Upgraded various autotools cruft so it kinda works with newer versions.
    * Patch from Ilya Barygin to allow linking with the --as-needed option.
    * Added autoselection of h_addr_list[0] vs. h_addr.
    * Updated the libtoolization.

   GTK 2.0 CONVERSION
    * GTK >= 2.20 is now required.  I got tired of the GTK habit of
      constantly coming up with a new shiny thing and deprecating every
      way that used to be the right way to do stuff, so I am not going
      to even vaguely try to support GTK < 2.20.
    * Fixed segfault in some menus caused by incorrect use of GtkDialogBox.
    * Changed yet more random interfaces GTK changed for whatever reason.
    * We need to finish GTK2 support.  We are using allow deprecated some.
      1. GdkFont is deprecated, so all the font code still needs rewritten.
      2. The chat window used GtkText and still need to be rewritten.
      3. sgtk/swidgets/sconsole.c:#define  __ALLOW_DEPRECATED_GDK__
         sgtk/swidgets/sdialog.c:#define  __ALLOW_DEPRECATED_GDK__
         sgtk/swindow-gtk.c:#define  __ALLOW_DEPRECATED_GDK__


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/games/xscorch/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/xscorch/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/games/xscorch/patches/patch-aa \
    pkgsrc/games/xscorch/patches/patch-ac
cvs rdiff -u -r1.2 -r0 pkgsrc/games/xscorch/patches/patch-ad
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/xscorch/patches/patch-libj_jstr_str__trim.c \
    pkgsrc/games/xscorch/patches/patch-sgtk_sgtk.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/xscorch/Makefile
diff -u pkgsrc/games/xscorch/Makefile:1.34 pkgsrc/games/xscorch/Makefile:1.35
--- pkgsrc/games/xscorch/Makefile:1.34  Mon Aug 31 18:09:35 2020
+++ pkgsrc/games/xscorch/Makefile       Fri Nov 20 15:15:24 2020
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.34 2020/08/31 18:09:35 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2020/11/20 15:15:24 nia Exp $
 
-DISTNAME=      xscorch-0.2.0
-PKGREVISION=   14
+DISTNAME=      xscorch_0.2.1.orig
+PKGNAME=       ${DISTNAME:S/_/-/1:S/.orig//1}
 CATEGORIES=    games
-#MASTER_SITES= http://www.xscorch.org/releases/
+MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/x/xscorch/}
 
 MAINTAINER=    snj%NetBSD.org@localhost
-#HOMEPAGE=     http://www.xscorch.org/
+HOMEPAGE=      https://web.archive.org/web/20200117143419/http://www.xscorch.org/
 COMMENT=       Multiplayer tank shoot-em-up
+LICENSE=       gnu-gpl-v2
+
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
 USE_LIBTOOL=           YES
 USE_TOOLS+=            perl
 GNU_CONFIGURE=         YES
 
-CONFIGURE_ARGS+=       --without-gnome
-
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/xscorch/distinfo
diff -u pkgsrc/games/xscorch/distinfo:1.8 pkgsrc/games/xscorch/distinfo:1.9
--- pkgsrc/games/xscorch/distinfo:1.8   Tue Nov  3 20:57:09 2015
+++ pkgsrc/games/xscorch/distinfo       Fri Nov 20 15:15:24 2020
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 20:57:09 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/11/20 15:15:24 nia Exp $
 
-SHA1 (xscorch-0.2.0.tar.gz) = b6d36e2b68e86e1f828d1312bf7789afd4085386
-RMD160 (xscorch-0.2.0.tar.gz) = 243a97eaadd6b29c354c6e0fe679055c0cdb53e2
-SHA512 (xscorch-0.2.0.tar.gz) = 5f35d4889d5deedea17544efd3263cc71821d38e278658887c38f5e83c91f1ef2b773c7b625b61b2f8a74120059d4899a1676c69f5cd643a84338b43b5255ac6
-Size (xscorch-0.2.0.tar.gz) = 818449 bytes
-SHA1 (patch-aa) = d30e33fcf5ccf8a8207524251a16b3912f6a0721
-SHA1 (patch-ac) = 812b75dda107434dd0ea38fd141560b22e8b368e
-SHA1 (patch-ad) = 9526c5cf549c431e189ff8e2d6ef275ce3045e65
+SHA1 (xscorch_0.2.1.orig.tar.gz) = 07f903e3767c1d6b7ad6fde2ea72ed58a597646a
+RMD160 (xscorch_0.2.1.orig.tar.gz) = ac8688e40162834db064c2aa18f904748ef56d0e
+SHA512 (xscorch_0.2.1.orig.tar.gz) = 69eeba82dc128221ae46c185a5d830cf4ce3a4e6371b51c3e7d1f79a6dfa389069759d872e6704ab2f60ff2963c6340525e74bddc937f2a0b0b386985c699d0e
+Size (xscorch_0.2.1.orig.tar.gz) = 849773 bytes
+SHA1 (patch-libj_jstr_str__trim.c) = a20309b8d5f3945e3256d7a2bb207bdb2dd7b6b4
+SHA1 (patch-sgtk_sgtk.h) = 4c97786f6160f452202a6c89d60c9c5ae2a4a7f7

Added files:

Index: pkgsrc/games/xscorch/patches/patch-libj_jstr_str__trim.c
diff -u /dev/null pkgsrc/games/xscorch/patches/patch-libj_jstr_str__trim.c:1.1
--- /dev/null   Fri Nov 20 15:15:25 2020
+++ pkgsrc/games/xscorch/patches/patch-libj_jstr_str__trim.c    Fri Nov 20 15:15:24 2020
@@ -0,0 +1,27 @@
+$NetBSD: patch-libj_jstr_str__trim.c,v 1.1 2020/11/20 15:15:24 nia Exp $
+
+Use memmove() instead of memcpy() for overlapping memory.
+
+From Debian:
+https://sources.debian.org/patches/xscorch/0.2.1-1+nmu5/overlapping-memcpy/
+
+--- libj/jstr/str_trim.c.orig  2009-04-26 17:39:30.000000000 +0000
++++ libj/jstr/str_trim.c
+@@ -47,7 +47,7 @@ char *trim(char *s) {
+       SET_LAST_NWS(ws, s);
+ 
+       /* Copy the non-ws characters in <s>. */
+-      if(ws.fnws > d) MEMCPY(d, ws.fnws, NWS_SIZE(ws));
++      if(ws.fnws > d) MEMMOVE(d, ws.fnws, NWS_SIZE(ws));
+       *(d + NWS_SIZE(ws)) = '\0';
+       return(d);
+ 
+@@ -93,7 +93,7 @@ char *ltrim(char *s) {
+ 
+    if(s != NULL) {
+       SKIM_WHITESPACE(s);
+-      MEMCPY(d, s, STRLEN(s) + 1);
++      MEMMOVE(d, s, STRLEN(s) + 1);
+       return(d);
+    }
+    return(NULL);
Index: pkgsrc/games/xscorch/patches/patch-sgtk_sgtk.h
diff -u /dev/null pkgsrc/games/xscorch/patches/patch-sgtk_sgtk.h:1.1
--- /dev/null   Fri Nov 20 15:15:25 2020
+++ pkgsrc/games/xscorch/patches/patch-sgtk_sgtk.h      Fri Nov 20 15:15:24 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-sgtk_sgtk.h,v 1.1 2020/11/20 15:15:24 nia Exp $
+
+Avoid implicit function declaration.
+
+From Debian:
+https://sources.debian.org/patches/xscorch/0.2.1-1+nmu5/gdk-include/
+
+--- sgtk/sgtk.h.orig   2009-04-26 17:39:48.000000000 +0000
++++ sgtk/sgtk.h
+@@ -24,6 +24,7 @@
+ #ifndef __sgtk_h_included
+ #define __sgtk_h_included
+ 
++#include <gdk/gdk.h>
+ 
+ /* This file implies xscorch.h. */
+ #include <xscorch.h>

Prev by Date: CVS commit: pkgsrc/lang/php74
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/php74
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index