Skip to content

Commit

Permalink
games/quadrapassel: Update to 40.2
Browse files Browse the repository at this point in the history
  • Loading branch information
neelchauhan committed Oct 3, 2021
1 parent 33606c7 commit 850a37d
Show file tree
Hide file tree
Showing 6 changed files with 237 additions and 387 deletions.
27 changes: 12 additions & 15 deletions games/quadrapassel/Makefile
@@ -1,10 +1,9 @@
# Created by: FreeBSD GNOME Team <gnome@freebsd.org>

PORTNAME= quadrapassel
PORTVERSION= 3.22.0
PORTREVISION= 3
PORTVERSION= 40.2
CATEGORIES= games gnome
MASTER_SITES= GNOME
MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
DIST_SUBDIR= gnome3

MAINTAINER= gnome@FreeBSD.org
Expand All @@ -13,26 +12,24 @@ COMMENT= Gnome quadrapassel
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

BUILD_DEPENDS= vala:lang/vala \
BUILD_DEPENDS= appstream-util:devel/appstream-glib \
itstool:textproc/itstool \
appstream-util:devel/appstream-glib
LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
vala:lang/vala
LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libcanberra.so:audio/libcanberra \
libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libclutter-1.0.so:graphics/clutter \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libcogl.so:graphics/cogl \
libjson-glib-1.0.so:devel/json-glib

PORTSCOUT= limitw:1,even

USES= gettext gl gmake gnome localbase pathfix \
pkgconfig tar:xz xorg
USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build
USES= gettext gl gnome localbase meson pathfix pkgconfig tar:xz xorg
USE_GNOME= cairo gsound gtk30 intlhack librsvg2 libxml2:build
INSTALLS_ICONS= yes
USE_GL= gl egl
USE_XORG= x11 xcomposite xext xdamage xfixes xi xrandr
GNU_CONFIGURE= yes
USE_GL= egl gl
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr

GLIB_SCHEMAS= org.gnome.quadrapassel.gschema.xml
GLIB_SCHEMAS= org.gnome.Quadrapassel.gschema.xml

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions games/quadrapassel/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1481306643
SHA256 (gnome3/quadrapassel-3.22.0.tar.xz) = 0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55
SIZE (gnome3/quadrapassel-3.22.0.tar.xz) = 1737252
TIMESTAMP = 1633282591
SHA256 (gnome3/quadrapassel-40.2.tar.xz) = 0bd822414207c73123ed6a49f723da5ac8dd4df5d35edc099ffea2e1399cc00a
SIZE (gnome3/quadrapassel-40.2.tar.xz) = 336896
15 changes: 15 additions & 0 deletions games/quadrapassel/files/patch-meson_build
@@ -0,0 +1,15 @@
$OpenBSD: patch-meson_build,v 1.3 2020/05/14 15:29:34 jasper Exp $

Drop libmanette dependency which requires libevdev/libinput

Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -17,7 +17,6 @@ clutter_gtk_dependency = dependency('clutter-gtk-1.0',
cogl_dependency = dependency('cogl-1.0')
gsound_dependency = dependency('gsound', version: '>= 1.0.2')
gtk_dependency = dependency('gtk+-3.0', version: '>= 3.12.0')
-manette_dependency = dependency('manette-0.2', version: '>= 0.2.0')
pango_depepdency = dependency('pango')
pango_cairo_dependency = dependency('pangocairo')
posix_dependency = meson.get_compiler('vala').find_library('posix')
15 changes: 15 additions & 0 deletions games/quadrapassel/files/patch-src_meson_build
@@ -0,0 +1,15 @@
$OpenBSD: patch-src_meson_build,v 1.2 2019/11/02 14:16:28 jasper Exp $

Drop libmanette dependency which requires libevdev/libinput

Index: src/meson.build
--- src/meson.build.orig
+++ src/meson.build
@@ -23,7 +23,6 @@ executable(meson.project_name(),
cogl_dependency,
gsound_dependency,
gtk_dependency,
- manette_dependency,
pango_depepdency,
pango_cairo_dependency,
posix_dependency,
116 changes: 116 additions & 0 deletions games/quadrapassel/files/patch-src_quadrapassel_vala
@@ -0,0 +1,116 @@
$OpenBSD: patch-src_quadrapassel_vala,v 1.2 2020/05/14 15:29:34 jasper Exp $

Drop libmanette dependency which requires libevdev/libinput

Index: src/quadrapassel.vala
--- src/quadrapassel.vala.orig
+++ src/quadrapassel.vala
@@ -58,8 +58,6 @@ public class Quadrapassel : Gtk.Application
private Gtk.CheckButton sound_toggle;
private Gtk.ListStore controls_model;

- private Manette.Monitor manette_monitor;
-
private const GLib.ActionEntry[] action_entries =
{
{ "new-game", new_game_cb },
@@ -200,13 +198,6 @@ public class Quadrapassel : Gtk.Application

game_grid.attach (pause_play_button, 2, 16, 1, 2);

- manette_monitor = new Manette.Monitor ();
- manette_monitor.device_connected.connect (manette_device_connected_cb);
- var manette_iterator = manette_monitor.iterate ();
- Manette.Device manette_device = null;
- while (manette_iterator.next (out manette_device))
- manette_device_connected_cb (manette_device);
-
history = new History (Path.build_filename (Environment.get_user_data_dir (), "quadrapassel", "history"));
history.load ();

@@ -576,85 +567,6 @@ public class Quadrapassel : Gtk.Application
private void quit_cb ()
{
window.destroy ();
- }
-
- private void manette_device_connected_cb (Manette.Device manette_device)
- {
- manette_device.button_press_event.connect (manette_button_press_event_cb);
- manette_device.button_release_event.connect (manette_button_release_event_cb);
- }
-
- private void manette_button_press_event_cb (Manette.Event event)
- {
- if (game == null)
- return;
-
- uint16 button;
- if (!event.get_button (out button))
- return;
-
- if (button == InputEventCode.BTN_START || button == InputEventCode.BTN_SELECT)
- {
- if (!game.game_over)
- game.paused = !game.paused;
- return;
- }
-
- if (game.paused)
- return;
-
- if (button == InputEventCode.BTN_DPAD_LEFT)
- {
- game.move_left ();
- return;
- }
- else if (button == InputEventCode.BTN_DPAD_RIGHT)
- {
- game.move_right ();
- return;
- }
- else if (button == InputEventCode.BTN_A)
- {
- game.rotate_left ();
- return;
- }
- else if (button == InputEventCode.BTN_B)
- {
- game.rotate_right ();
- return;
- }
- else if (button == InputEventCode.BTN_DPAD_DOWN)
- {
- game.set_fast_forward (true);
- return;
- }
- else if (button == InputEventCode.BTN_DPAD_UP)
- {
- game.drop ();
- return;
- }
- }
-
- private void manette_button_release_event_cb (Manette.Event event)
- {
- if (game == null)
- return;
-
- uint16 button;
- if (!event.get_button (out button))
- return;
-
- if (button == InputEventCode.BTN_DPAD_LEFT ||
- button == InputEventCode.BTN_DPAD_RIGHT)
- {
- game.stop_moving ();
- return;
- }
- else if (button == InputEventCode.BTN_DPAD_DOWN)
- {
- game.set_fast_forward (false);
- return;
- }
}

private bool key_press_event_cb (Gtk.Widget widget, Gdk.EventKey event)

0 comments on commit 850a37d

Please sign in to comment.