Move to guile3.
This commit is contained in:
ajacoutot
parent
672454c4e5
commit
330eb997f7
@ -2,6 +2,7 @@ COMMENT = suite of solitaire card games
|
||||
|
||||
GNOME_PROJECT = aisleriot
|
||||
GNOME_VERSION = 3.22.24
|
||||
REVISION = 0
|
||||
|
||||
# override gnome MODULE
|
||||
MASTER_SITES = https://gitlab.gnome.org/GNOME/${GNOME_PROJECT}/-/archive/${GNOME_VERSION}/
|
||||
@ -13,7 +14,7 @@ CATEGORIES = games
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += atk-1.0 c cairo canberra canberra-gtk3 gdk-3 gdk_pixbuf-2.0
|
||||
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 guile-2.2 intl rsvg-2
|
||||
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 guile-3.0 intl rsvg-2
|
||||
|
||||
MODULES = devel/dconf \
|
||||
devel/meson \
|
||||
@ -24,22 +25,21 @@ MODGNOME_TOOLS = desktop-file-utils gtk-update-icon-cache yelp
|
||||
|
||||
CFLAGS += -Wno-strict-prototypes
|
||||
|
||||
# need to matche lang/guile2
|
||||
# need to match lang/guile3
|
||||
COMPILER = base-clang ports-gcc
|
||||
COMPILER_LANGS = c
|
||||
|
||||
LIB_DEPENDS = audio/libcanberra,-gtk3 \
|
||||
lang/guile2
|
||||
lang/guile3
|
||||
|
||||
BUILD_DEPENDS = shells/bash
|
||||
|
||||
CONFIGURE_ARGS = -Dguile=2.2 \
|
||||
-Dtheme_kde=false
|
||||
CONFIGURE_ARGS = -Dtheme_kde=false
|
||||
|
||||
# XXX horrible hack: make it possible to build when both guile and guile2 are
|
||||
# XXX horrible hack: make it possible to build when multiple guile versions are
|
||||
# installed (take precedence over -I${LOCALBASE}/include because meson reorders
|
||||
# FLAGS so we can't use MODGNOME_CPPFLAGS)
|
||||
post-configure:
|
||||
sed -i "s,cc,cc -I${LOCALBASE}/include/guile/2.2," ${WRKDIR}/bin/cc
|
||||
sed -i "s,cc,cc -I${LOCALBASE}/include/guile/3.0," ${WRKDIR}/bin/cc
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
don't pick up guile version newer than specified
|
||||
|
||||
Index: meson.build
|
||||
--- meson.build.orig
|
||||
+++ meson.build
|
||||
@@ -331,16 +331,6 @@ endif
|
||||
|
||||
guile_req = 'guile-' + guile_version
|
||||
|
||||
-if guile_version == '3.0'
|
||||
- guile_req_version = guile_3_0_req_version
|
||||
-elif guile_version == '2.2'
|
||||
- guile_req_version = guile_2_2_req_version
|
||||
-elif guile_version == '2.0'
|
||||
- guile_req_version = guile_2_0_req_version
|
||||
-else
|
||||
- assert(false, 'unsupported guile version')
|
||||
-endif
|
||||
-
|
||||
ar_pkgguiledir = ar_pkglibdir / 'guile' / guile_version
|
||||
|
||||
# Dependencies
|
||||
@@ -349,7 +339,7 @@ cairo_dep = dependency('cairo', version: '>=' + ca
|
||||
gio_dep = dependency('gio-2.0', version: '>=' + gio_req_version,)
|
||||
glib_dep = dependency('glib-2.0', version: '>=' + glib_req_version,)
|
||||
gtk_dep = dependency('gtk+-3.0', version: '>=' + gtk_req_version,)
|
||||
-guile_dep = dependency(guile_req, version: '>=' + guile_req_version,)
|
||||
+guile_dep = dependency(guile_req,)
|
||||
|
||||
if get_option('gconf')
|
||||
gconf_dep = dependency('gconf-2.0', version: '>=' + gconf_req_version, required: true,)
|
||||
@ -1,99 +1,99 @@
|
||||
@bin bin/sol
|
||||
lib/aisleriot/
|
||||
lib/aisleriot/guile/
|
||||
lib/aisleriot/guile/2.2/
|
||||
lib/aisleriot/guile/2.2/accordion.go
|
||||
lib/aisleriot/guile/2.2/agnes.go
|
||||
lib/aisleriot/guile/2.2/aisleriot/
|
||||
lib/aisleriot/guile/2.2/aisleriot/api.go
|
||||
lib/aisleriot/guile/2.2/athena.go
|
||||
lib/aisleriot/guile/2.2/auld-lang-syne.go
|
||||
lib/aisleriot/guile/2.2/aunt-mary.go
|
||||
lib/aisleriot/guile/2.2/backbone.go
|
||||
lib/aisleriot/guile/2.2/bakers-dozen.go
|
||||
lib/aisleriot/guile/2.2/bakers-game.go
|
||||
lib/aisleriot/guile/2.2/bear-river.go
|
||||
lib/aisleriot/guile/2.2/beleaguered-castle.go
|
||||
lib/aisleriot/guile/2.2/block-ten.go
|
||||
lib/aisleriot/guile/2.2/bristol.go
|
||||
lib/aisleriot/guile/2.2/camelot.go
|
||||
lib/aisleriot/guile/2.2/canfield.go
|
||||
lib/aisleriot/guile/2.2/carpet.go
|
||||
lib/aisleriot/guile/2.2/chessboard.go
|
||||
lib/aisleriot/guile/2.2/clock.go
|
||||
lib/aisleriot/guile/2.2/cover.go
|
||||
lib/aisleriot/guile/2.2/cruel.go
|
||||
lib/aisleriot/guile/2.2/diamond-mine.go
|
||||
lib/aisleriot/guile/2.2/doublets.go
|
||||
lib/aisleriot/guile/2.2/eagle-wing.go
|
||||
lib/aisleriot/guile/2.2/easthaven.go
|
||||
lib/aisleriot/guile/2.2/eight-off.go
|
||||
lib/aisleriot/guile/2.2/elevator.go
|
||||
lib/aisleriot/guile/2.2/eliminator.go
|
||||
lib/aisleriot/guile/2.2/escalator.go
|
||||
lib/aisleriot/guile/2.2/first-law.go
|
||||
lib/aisleriot/guile/2.2/fortress.go
|
||||
lib/aisleriot/guile/2.2/fortunes.go
|
||||
lib/aisleriot/guile/2.2/forty-thieves.go
|
||||
lib/aisleriot/guile/2.2/fourteen.go
|
||||
lib/aisleriot/guile/2.2/freecell.go
|
||||
lib/aisleriot/guile/2.2/gaps.go
|
||||
lib/aisleriot/guile/2.2/gay-gordons.go
|
||||
lib/aisleriot/guile/2.2/giant.go
|
||||
lib/aisleriot/guile/2.2/glenwood.go
|
||||
lib/aisleriot/guile/2.2/gold-mine.go
|
||||
lib/aisleriot/guile/2.2/golf.go
|
||||
lib/aisleriot/guile/2.2/gypsy.go
|
||||
lib/aisleriot/guile/2.2/hamilton.go
|
||||
lib/aisleriot/guile/2.2/helsinki.go
|
||||
lib/aisleriot/guile/2.2/hopscotch.go
|
||||
lib/aisleriot/guile/2.2/isabel.go
|
||||
lib/aisleriot/guile/2.2/jamestown.go
|
||||
lib/aisleriot/guile/2.2/jumbo.go
|
||||
lib/aisleriot/guile/2.2/kansas.go
|
||||
lib/aisleriot/guile/2.2/king-albert.go
|
||||
lib/aisleriot/guile/2.2/kings-audience.go
|
||||
lib/aisleriot/guile/2.2/klondike.go
|
||||
lib/aisleriot/guile/2.2/labyrinth.go
|
||||
lib/aisleriot/guile/2.2/lady-jane.go
|
||||
lib/aisleriot/guile/2.2/maze.go
|
||||
lib/aisleriot/guile/2.2/monte-carlo.go
|
||||
lib/aisleriot/guile/2.2/napoleons-tomb.go
|
||||
lib/aisleriot/guile/2.2/neighbor.go
|
||||
lib/aisleriot/guile/2.2/odessa.go
|
||||
lib/aisleriot/guile/2.2/osmosis.go
|
||||
lib/aisleriot/guile/2.2/peek.go
|
||||
lib/aisleriot/guile/2.2/pileon.go
|
||||
lib/aisleriot/guile/2.2/plait.go
|
||||
lib/aisleriot/guile/2.2/poker.go
|
||||
lib/aisleriot/guile/2.2/quatorze.go
|
||||
lib/aisleriot/guile/2.2/royal-east.go
|
||||
lib/aisleriot/guile/2.2/saratoga.go
|
||||
lib/aisleriot/guile/2.2/scorpion.go
|
||||
lib/aisleriot/guile/2.2/scuffle.go
|
||||
lib/aisleriot/guile/2.2/seahaven.go
|
||||
lib/aisleriot/guile/2.2/sir-tommy.go
|
||||
lib/aisleriot/guile/2.2/spider-three-decks.go
|
||||
lib/aisleriot/guile/2.2/spider.go
|
||||
lib/aisleriot/guile/2.2/spiderette.go
|
||||
lib/aisleriot/guile/2.2/straight-up.go
|
||||
lib/aisleriot/guile/2.2/streets-and-alleys.go
|
||||
lib/aisleriot/guile/2.2/ten-across.go
|
||||
lib/aisleriot/guile/2.2/terrace.go
|
||||
lib/aisleriot/guile/2.2/thieves.go
|
||||
lib/aisleriot/guile/2.2/thirteen.go
|
||||
lib/aisleriot/guile/2.2/thumb-and-pouch.go
|
||||
lib/aisleriot/guile/2.2/treize.go
|
||||
lib/aisleriot/guile/2.2/triple-peaks.go
|
||||
lib/aisleriot/guile/2.2/union-square.go
|
||||
lib/aisleriot/guile/2.2/valentine.go
|
||||
lib/aisleriot/guile/2.2/wall.go
|
||||
lib/aisleriot/guile/2.2/westhaven.go
|
||||
lib/aisleriot/guile/2.2/whitehead.go
|
||||
lib/aisleriot/guile/2.2/will-o-the-wisp.go
|
||||
lib/aisleriot/guile/2.2/yield.go
|
||||
lib/aisleriot/guile/2.2/yukon.go
|
||||
lib/aisleriot/guile/2.2/zebra.go
|
||||
lib/aisleriot/guile/3.0/
|
||||
lib/aisleriot/guile/3.0/accordion.go
|
||||
lib/aisleriot/guile/3.0/agnes.go
|
||||
lib/aisleriot/guile/3.0/aisleriot/
|
||||
lib/aisleriot/guile/3.0/aisleriot/api.go
|
||||
lib/aisleriot/guile/3.0/athena.go
|
||||
lib/aisleriot/guile/3.0/auld-lang-syne.go
|
||||
lib/aisleriot/guile/3.0/aunt-mary.go
|
||||
lib/aisleriot/guile/3.0/backbone.go
|
||||
lib/aisleriot/guile/3.0/bakers-dozen.go
|
||||
lib/aisleriot/guile/3.0/bakers-game.go
|
||||
lib/aisleriot/guile/3.0/bear-river.go
|
||||
lib/aisleriot/guile/3.0/beleaguered-castle.go
|
||||
lib/aisleriot/guile/3.0/block-ten.go
|
||||
lib/aisleriot/guile/3.0/bristol.go
|
||||
lib/aisleriot/guile/3.0/camelot.go
|
||||
lib/aisleriot/guile/3.0/canfield.go
|
||||
lib/aisleriot/guile/3.0/carpet.go
|
||||
lib/aisleriot/guile/3.0/chessboard.go
|
||||
lib/aisleriot/guile/3.0/clock.go
|
||||
lib/aisleriot/guile/3.0/cover.go
|
||||
lib/aisleriot/guile/3.0/cruel.go
|
||||
lib/aisleriot/guile/3.0/diamond-mine.go
|
||||
lib/aisleriot/guile/3.0/doublets.go
|
||||
lib/aisleriot/guile/3.0/eagle-wing.go
|
||||
lib/aisleriot/guile/3.0/easthaven.go
|
||||
lib/aisleriot/guile/3.0/eight-off.go
|
||||
lib/aisleriot/guile/3.0/elevator.go
|
||||
lib/aisleriot/guile/3.0/eliminator.go
|
||||
lib/aisleriot/guile/3.0/escalator.go
|
||||
lib/aisleriot/guile/3.0/first-law.go
|
||||
lib/aisleriot/guile/3.0/fortress.go
|
||||
lib/aisleriot/guile/3.0/fortunes.go
|
||||
lib/aisleriot/guile/3.0/forty-thieves.go
|
||||
lib/aisleriot/guile/3.0/fourteen.go
|
||||
lib/aisleriot/guile/3.0/freecell.go
|
||||
lib/aisleriot/guile/3.0/gaps.go
|
||||
lib/aisleriot/guile/3.0/gay-gordons.go
|
||||
lib/aisleriot/guile/3.0/giant.go
|
||||
lib/aisleriot/guile/3.0/glenwood.go
|
||||
lib/aisleriot/guile/3.0/gold-mine.go
|
||||
lib/aisleriot/guile/3.0/golf.go
|
||||
lib/aisleriot/guile/3.0/gypsy.go
|
||||
lib/aisleriot/guile/3.0/hamilton.go
|
||||
lib/aisleriot/guile/3.0/helsinki.go
|
||||
lib/aisleriot/guile/3.0/hopscotch.go
|
||||
lib/aisleriot/guile/3.0/isabel.go
|
||||
lib/aisleriot/guile/3.0/jamestown.go
|
||||
lib/aisleriot/guile/3.0/jumbo.go
|
||||
lib/aisleriot/guile/3.0/kansas.go
|
||||
lib/aisleriot/guile/3.0/king-albert.go
|
||||
lib/aisleriot/guile/3.0/kings-audience.go
|
||||
lib/aisleriot/guile/3.0/klondike.go
|
||||
lib/aisleriot/guile/3.0/labyrinth.go
|
||||
lib/aisleriot/guile/3.0/lady-jane.go
|
||||
lib/aisleriot/guile/3.0/maze.go
|
||||
lib/aisleriot/guile/3.0/monte-carlo.go
|
||||
lib/aisleriot/guile/3.0/napoleons-tomb.go
|
||||
lib/aisleriot/guile/3.0/neighbor.go
|
||||
lib/aisleriot/guile/3.0/odessa.go
|
||||
lib/aisleriot/guile/3.0/osmosis.go
|
||||
lib/aisleriot/guile/3.0/peek.go
|
||||
lib/aisleriot/guile/3.0/pileon.go
|
||||
lib/aisleriot/guile/3.0/plait.go
|
||||
lib/aisleriot/guile/3.0/poker.go
|
||||
lib/aisleriot/guile/3.0/quatorze.go
|
||||
lib/aisleriot/guile/3.0/royal-east.go
|
||||
lib/aisleriot/guile/3.0/saratoga.go
|
||||
lib/aisleriot/guile/3.0/scorpion.go
|
||||
lib/aisleriot/guile/3.0/scuffle.go
|
||||
lib/aisleriot/guile/3.0/seahaven.go
|
||||
lib/aisleriot/guile/3.0/sir-tommy.go
|
||||
lib/aisleriot/guile/3.0/spider-three-decks.go
|
||||
lib/aisleriot/guile/3.0/spider.go
|
||||
lib/aisleriot/guile/3.0/spiderette.go
|
||||
lib/aisleriot/guile/3.0/straight-up.go
|
||||
lib/aisleriot/guile/3.0/streets-and-alleys.go
|
||||
lib/aisleriot/guile/3.0/ten-across.go
|
||||
lib/aisleriot/guile/3.0/terrace.go
|
||||
lib/aisleriot/guile/3.0/thieves.go
|
||||
lib/aisleriot/guile/3.0/thirteen.go
|
||||
lib/aisleriot/guile/3.0/thumb-and-pouch.go
|
||||
lib/aisleriot/guile/3.0/treize.go
|
||||
lib/aisleriot/guile/3.0/triple-peaks.go
|
||||
lib/aisleriot/guile/3.0/union-square.go
|
||||
lib/aisleriot/guile/3.0/valentine.go
|
||||
lib/aisleriot/guile/3.0/wall.go
|
||||
lib/aisleriot/guile/3.0/westhaven.go
|
||||
lib/aisleriot/guile/3.0/whitehead.go
|
||||
lib/aisleriot/guile/3.0/will-o-the-wisp.go
|
||||
lib/aisleriot/guile/3.0/yield.go
|
||||
lib/aisleriot/guile/3.0/yukon.go
|
||||
lib/aisleriot/guile/3.0/zebra.go
|
||||
lib/valgrind/
|
||||
lib/valgrind/aisleriot.supp
|
||||
libexec/aisleriot/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user