cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

games/gtkballs: update to a maintained github repo

Browse Source 
- migrated to Gtk+3
- remove g+s games plumbing from PLIST as Gtk+3 refuses to run setgid
  binaries, move /var/games/gtkballs-scores to ~/.config if you want to
  retain your scores.
This commit is contained in:
landry 2021-12-07 10:25:27 +00:00
parent 7a21dc578f
commit faf3def4fa
7 changed files with 56 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
games/gtkballs/Makefile
View File

@ -1,34 +1,29 @@
# $OpenBSD: Makefile,v 1.44 2019/07/12 21:02:20 sthen Exp $
# $OpenBSD: Makefile,v 1.45 2021/12/07 10:25:27 landry Exp $
COMMENT= gtk+ clone of the lines ball logic game
DISTNAME= gtkballs-3.1.5
REVISION= 17
GH_ACCOUNT = emorozov
GH_PROJECT = gtkballs
GH_COMMIT = 6e53b6686de9782e3c0ef2bb26f3f9b70b5b675b
DISTNAME= gtkballs-3.1.5pl0
CATEGORIES= games x11
MASTER_SITES= ${HOMEPAGE}dist/ \
${MASTER_SITE_SUNSITE:=games/strategy/}
HOMEPAGE= http://gtkballs.antex.ru/
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB = GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo expat fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pixman-1 png pthread xcb xcb-render xcb-shm z
WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0
WANTLIB += pangocairo-1.0 pthread
LIB_DEPENDS= x11/gtk+2
LIB_DEPENDS= x11/gtk+3
NO_TEST= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE=autoreconf
AUTORECONF= ./autogen.sh
AUTOMAKE_VERSION=1.16
AUTOCONF_VERSION=2.69
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LOCALSTATEDIR= ${BASELOCALSTATEDIR}/games
FAKE_FLAGS= localstatedir=${PREFIX}/share/examples/gtkballs
.include <bsd.port.mk>

4
games/gtkballs/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gtkballs-3.1.5.tar.gz) = dfoAezlmi39FSmy6ti1VqOY9I0SA01A/h/ll/1ZN4sg=
SIZE (gtkballs-3.1.5.tar.gz) = 1176977
SHA256 (gtkballs-3.1.5pl0-6e53b668.tar.gz) = 2YJsXBIOrO/Kmo3jBb7Dc1dRzv7BHO3qCUaj0XuUens=
SIZE (gtkballs-3.1.5pl0-6e53b668.tar.gz) = 987657

15
games/gtkballs/patches/patch-Makefile_am Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-Makefile_am,v 1.1 2021/12/07 10:25:27 landry Exp $
Index: Makefile.am
--- Makefile.am.orig
+++ Makefile.am
@@ -11,9 +11,4 @@ EXTRA_DIST = README.russian \
appddir = $(datadir)/gtkballs
appd_DATA = COPYING
-install-data-hook:
- if [ ! -f $(DESTDIR)$(localstatedir)/gtkballs-scores ]; then touch $(DESTDIR)$(localstatedir)/gtkballs-scores; fi
- if [ "${UID}" = 0 ]; then chgrp games $(DESTDIR)$(localstatedir)/gtkballs-scores; fi
- chmod 0664 $(DESTDIR)$(localstatedir)/gtkballs-scores
-
ACLOCAL_AMFLAGS = -I autoconf-m4

12
games/gtkballs/patches/patch-src_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2012/04/26 09:58:17 ajacoutot Exp $
--- src/Makefile.in.orig Sun Jun 5 13:55:07 2005
+++ src/Makefile.in Sun Jun 5 13:55:16 2005
@@ -136,7 +136,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
bin_PROGRAMS = gtkballs
-AM_CFLAGS = @CFLAGS@ @GTK_CFLAGS@ -DDATADIR=\"$(datadir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DLOCALEDIR=\"$(nlsdir)\"
+AM_CFLAGS = @CFLAGS@ @GTK_CFLAGS@ -DDATADIR=\"$(datadir)\" -DLOCALSTATEDIR=\"$(localstatedir)/games\" -DLOCALEDIR=\"$(nlsdir)\"
INCLUDES = -I../intl
gtkballs_SOURCES = gtkballs.c gtkballs.h gfx.c gfx.h \

27
games/gtkballs/patches/patch-src_game_c
View File

@ -1,13 +1,14 @@
$OpenBSD: patch-src_game_c,v 1.2 2009/11/17 19:30:01 naddy Exp $
--- src/game.c.orig Wed Oct 6 13:06:46 2004
+++ src/game.c Mon Nov 16 22:57:02 2009
@@ -495,8 +495,8 @@ gint game_destroy_lines(gboolean count_score) {
lock_actions(1);
draw_board();
for(animtime = 0, i = 0; i < animcadres;) {
- gettimeofday(&tvs, NULL);
gint isav = i;
+ gettimeofday(&tvs, NULL);
for(; animtime == animarray[i].time && i < animcadres; i++) {
draw_ball(animarray[i].color, animarray[i].x, animarray[i].y, 0, animarray[i].phase + 1);
_board_destroys[animarray[i].y * rules_get_width() + animarray[i].x] = animarray[i].phase + 1;
$OpenBSD: patch-src_game_c,v 1.3 2021/12/07 10:25:27 landry Exp $
Index: src/game.c
--- src/game.c.orig
+++ src/game.c
@@ -532,8 +532,8 @@ gint game_destroy_lines(gboolean count_score)
draw_board();
for (animtime = 0, i = 0; i < animcadres;)
{
- gettimeofday(&tvs, NULL);
gint isav = i;
+ gettimeofday(&tvs, NULL);
for (; animtime == animarray[i].time && i < animcadres; i++) {
draw_ball(animarray[i].color, animarray[i].x, animarray[i].y, 0, animarray[i].phase + 1);
_board_destroys[animarray[i].y * rules_get_width() + animarray[i].x] = animarray[i].phase + 1;

19
games/gtkballs/patches/patch-src_gtkballs_c
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-src_gtkballs_c,v 1.1 2009/11/17 19:30:01 naddy Exp $
--- src/gtkballs.c.orig Mon Nov 16 23:00:14 2009
+++ src/gtkballs.c Mon Nov 16 23:00:22 2009
@@ -123,7 +123,7 @@ int main(int argc, char **argv) {
$OpenBSD: patch-src_gtkballs_c,v 1.2 2021/12/07 10:25:27 landry Exp $
Index: src/gtkballs.c
--- src/gtkballs.c.orig
+++ src/gtkballs.c
@@ -151,7 +151,7 @@ int main(int argc, char **argv)
#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- bind_textdomain_codeset(PACKAGE, "UTF8");
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- bind_textdomain_codeset(PACKAGE, "UTF8");
+ bind_textdomain_codeset(PACKAGE, "UTF-8");
#endif /* ENABLE_NLS */
/* drop privileges after spawning child with extra privs */
/* initialize random seed */

14
games/gtkballs/pkg/PLIST
View File

@ -1,17 +1,6 @@
@comment $OpenBSD: PLIST,v 1.9 2012/04/26 09:58:17 ajacoutot Exp $
@mode g+s
@group games
@comment $OpenBSD: PLIST,v 1.10 2021/12/07 10:25:27 landry Exp $
@bin bin/gtkballs
@mode
@group
@man man/man6/gtkballs.6x
share/examples/gtkballs/
share/examples/gtkballs/gtkballs-scores
@mode g+w
@group games
@sample /var/games/gtkballs-scores
@mode
@group
share/gtkballs/
share/gtkballs/COPYING
share/gtkballs/gtkballs-logo.png
@ -543,5 +532,6 @@ share/gtkballs/themes/mascots/walk8.xpm
share/gtkballs/themes/mascots/walk_small.xpm
share/locale/de/LC_MESSAGES/gtkballs.mo
share/locale/fr/LC_MESSAGES/gtkballs.mo
share/locale/nl/LC_MESSAGES/gtkballs.mo
share/locale/pl/LC_MESSAGES/gtkballs.mo
share/locale/ru/LC_MESSAGES/gtkballs.mo