From 2a7869ea678fd7480ed1d333a17d51a653c645ec Mon Sep 17 00:00:00 2001 From: bcallah Date: Sat, 18 Nov 2017 00:03:05 +0000 Subject: [PATCH] Update galois to 0.5 -- workaround in grid.h is now the only code path, so remove patch. Continue to not install Gnome Help files. Take MAINTAINER ok espie@ --- games/galois/Makefile | 35 +++++++------------- games/galois/distinfo | 4 +-- games/galois/patches/patch-doc_makefile_in | 38 ++++++++++++++++++++++ games/galois/patches/patch-src_grid_h | 31 ------------------ games/galois/patches/patch-src_main_cc | 16 --------- games/galois/patches/patch-src_makefile_in | 16 +++++++++ games/galois/pkg/PLIST | 5 ++- 7 files changed, 72 insertions(+), 73 deletions(-) create mode 100644 games/galois/patches/patch-doc_makefile_in delete mode 100644 games/galois/patches/patch-src_grid_h delete mode 100644 games/galois/patches/patch-src_main_cc create mode 100644 games/galois/patches/patch-src_makefile_in diff --git a/games/galois/Makefile b/games/galois/Makefile index c6a29233d01..0774fdb02bb 100644 --- a/games/galois/Makefile +++ b/games/galois/Makefile @@ -1,31 +1,28 @@ -# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:38 naddy Exp $ +# $OpenBSD: Makefile,v 1.13 2017/11/18 00:03:05 bcallah Exp $ COMMENT = free multi-dimensional Tetris-like game -DISTNAME = galois-0.4 +DISTNAME = galois-0.5 CATEGORIES = games x11 -REVISION = 2 HOMEPAGE = http://www.nongnu.org/galois/ +MAINTAINER = Brian Callahan # GPLv3+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender atk-1.0 atkmm-1.6 c cairo cairomm-1.0 -WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 -WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-x11-2.0 -WANTLIB += gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pangomm-1.4 pthread sigc-2.0 xml++-2.6 xml2 z ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} atk-1.0 atkmm-1.6 c cairo cairo-gobject +WANTLIB += cairomm-1.0 gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 +WANTLIB += giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0 +WANTLIB += intl m pango-1.0 pangocairo-1.0 pangomm-1.4 sigc-2.0 +WANTLIB += xml++-2.6 xml2 MASTER_SITES = ${MASTER_SITE_SAVANNAH:=galois/source/} -MODULES = devel/gettext - -# c++11 -COMPILER = base-clang ports-gcc +# C++14 +COMPILER = base-clang ports-clang ports-gcc LIB_DEPENDS = textproc/libxml++>=2.40.0 \ - x11/gtk2mm + x11/gtk3mm RUN_DEPENDS = devel/desktop-file-utils @@ -33,16 +30,8 @@ CONFIGURE_STYLE = gnu MAKE_FILE = makefile ALL_TARGET = default -MAKE_FLAGS = CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -std=c++11" +MAKE_FLAGS = CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -std=c++14" NO_TEST = Yes -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/galois ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/galois.6 ${PREFIX}/man/man6 - ${INSTALL_DATA_DIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/misc/galois.desktop ${PREFIX}/share/applications - ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/misc/galois.png ${PREFIX}/share/pixmaps - .include diff --git a/games/galois/distinfo b/games/galois/distinfo index 34219dcba0c..3f182765082 100644 --- a/games/galois/distinfo +++ b/games/galois/distinfo @@ -1,2 +1,2 @@ -SHA256 (galois-0.4.tar.gz) = oWiuZRTaHtpa/XYfpO6vUQ15mI1FCnFqDEHOl42Z5Ec= -SIZE (galois-0.4.tar.gz) = 289202 +SHA256 (galois-0.5.tar.gz) = lO7NnxA431/RmxTKWyY0vQDQzZxTSlCpllWNisKfs5Q= +SIZE (galois-0.5.tar.gz) = 291895 diff --git a/games/galois/patches/patch-doc_makefile_in b/games/galois/patches/patch-doc_makefile_in new file mode 100644 index 00000000000..7aae958d7fb --- /dev/null +++ b/games/galois/patches/patch-doc_makefile_in @@ -0,0 +1,38 @@ +$OpenBSD: patch-doc_makefile_in,v 1.1 2017/11/18 00:03:05 bcallah Exp $ + +Don't install gnome help pages. + +Index: doc/makefile.in +--- doc/makefile.in.orig ++++ doc/makefile.in +@@ -45,26 +45,12 @@ distclean : clean + - rm -f ${AC} + + install : +- mkdir -p ${prefix}/share/gnome/help/galois/C +- cp ${HELP} ${prefix}/share/gnome/help/galois/C ++ install -d ${prefix}/man/man6 ++ install -c -S -m 644 galois.6 ${prefix}/man/man6 + for L in it ; do \ +- mkdir -p ${prefix}/share/gnome/help/galois/$$L ;\ +- cp galois-$$L.xml \ +- ${prefix}/share/gnome/help/galois/$$L/galois.xml ;\ +- cp ${HELP_DEPS} ${prefix}/share/gnome/help/galois/$$L ;\ +- cp galois-$$L.html \ +- ${prefix}/share/gnome/help/galois/$$L/galois.html ;\ ++ install -d ${prefix}/man/$$L/man6 ;\ ++ install -c -S -m 644 galois-$$L.6 ${prefix}/man/$$L/man6/galois.6 ;\ + done +- mkdir -p ${prefix}/share/man/man6 +- cp galois.6 ${prefix}/share/man/man6 +- gzip -9 -f ${prefix}/share/man/man6/galois.6 +- for L in it ; do \ +- mkdir -p ${prefix}/share/man/$$L/man6 ;\ +- cp galois-$$L.6 ${prefix}/share/man/$$L/man6/galois.6 ;\ +- gzip -9 -f ${prefix}/share/man/$$L/man6/galois.6 ;\ +- done +- mkdir -p ${prefix}/share/omf/galois +- cp ${OMF} ${prefix}/share/omf/galois + uninstall : + - cd ${prefix}/share/gnome/help/galois/C && rm -f ${HELP} + - rmdir ${prefix}/share/gnome/help/galois/C diff --git a/games/galois/patches/patch-src_grid_h b/games/galois/patches/patch-src_grid_h deleted file mode 100644 index d09e25fae15..00000000000 --- a/games/galois/patches/patch-src_grid_h +++ /dev/null @@ -1,31 +0,0 @@ -$OpenBSD: patch-src_grid_h,v 1.1 2017/05/14 12:02:03 espie Exp $ -assigning a slice to a gslice is a gnu extension actually -turns out the non working code does work in both clang and eg++ - -Index: src/grid.h ---- src/grid.h.orig -+++ src/grid.h -@@ -126,10 +126,11 @@ template void grid::add(const coords &c, - size_t len[] = { size_t(rows), size_t(cols), size_t(layers), }; - size_t str[] = { size_t(ncols), 1, size_t(ncols * nrows), }; - // doesn't work? -- // std::gslice g(d0.x + ncols * (d0.y + nrows * d0.z), -- // std::valarray(len, 3), -- // std::valarray(str, 3)); -- // mask[g] = m; -+ std::gslice g(d0.x + ncols * (d0.y + nrows * d0.z), -+ std::valarray(len, 3), -+ std::valarray(str, 3)); -+ mask[g] = m; -+#if 0 - for (int i=0; i void grid::add(const coords &c, - std::slice s(cols * rows * i, cols * rows, 1); - mask[g] = m[s]; - } -+#endif - - c0 = n0; - rows = nrows; diff --git a/games/galois/patches/patch-src_main_cc b/games/galois/patches/patch-src_main_cc deleted file mode 100644 index 4628ba1155f..00000000000 --- a/games/galois/patches/patch-src_main_cc +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_main_cc,v 1.2 2015/07/15 02:26:34 bcallah Exp $ - -Disable HelpContents. This requires yelp, which -requires webkit, which needlessly breaks galois -on archs without webkit. - ---- src/main.cc.orig Sun Jul 12 20:00:13 2015 -+++ src/main.cc Wed Jul 15 02:21:27 2015 -@@ -480,7 +480,6 @@ MainWindow::MainWindow() - " " - " " - " " -- " " - " " - " " - " " diff --git a/games/galois/patches/patch-src_makefile_in b/games/galois/patches/patch-src_makefile_in new file mode 100644 index 00000000000..0b11bcbdb59 --- /dev/null +++ b/games/galois/patches/patch-src_makefile_in @@ -0,0 +1,16 @@ +$OpenBSD: patch-src_makefile_in,v 1.1 2017/11/18 00:03:05 bcallah Exp $ + +Index: src/makefile.in +--- src/makefile.in.orig ++++ src/makefile.in +@@ -50,8 +50,8 @@ distclean : clean + - rm -f ${AC} + + install : galois +- mkdir -p ${prefix}/games +- cp galois ${prefix}/games ++ install -d ${prefix}/bin ++ install -c -S -s -m 755 galois ${prefix}/bin + uninstall : + - rm -f ${prefix}/games/galois + diff --git a/games/galois/pkg/PLIST b/games/galois/pkg/PLIST index 1b0794af63c..e4bbdbf6de4 100644 --- a/games/galois/pkg/PLIST +++ b/games/galois/pkg/PLIST @@ -1,5 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.2 2014/05/15 15:26:48 bcallah Exp $ +@comment $OpenBSD: PLIST,v 1.3 2017/11/18 00:03:05 bcallah Exp $ @bin bin/galois +man/it/ +man/it/man6/ +@man man/it/man6/galois.6 @man man/man6/galois.6 share/applications/galois.desktop share/pixmaps/