public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/files/, games-puzzle/sgt-puzzles/
@ 2016-12-12 14:51 NP Hardass
  0 siblings, 0 replies; 4+ messages in thread
From: NP Hardass @ 2016-12-12 14:51 UTC (permalink / raw
  To: gentoo-commits

commit:     49e5e31aabe16db2ee990d5e50701905ae2b4938
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 15:17:55 2016 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 14:50:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e5e31a

games-puzzle/sgt-puzzles: Large changeset, fixes #593480

Drop games eclass support
Bump to EAPI=6
Rename binaries to avoid filename collisions
Sort xdg menu entries
In app help options
Various ebuild improvements

Package-Manager: portage-2.3.0

 games-puzzle/sgt-puzzles/Manifest                  |   1 +
 .../files/sgt-puzzles-20161207-builtin-help.patch  | 107 +++++++++++++++++++++
 .../sgt-puzzles/files/sgt-puzzles.directory        |   4 +
 games-puzzle/sgt-puzzles/files/sgt-puzzles.menu    |  18 ++++
 ...99999999.ebuild => sgt-puzzles-20161207.ebuild} |  67 +++++++------
 .../sgt-puzzles/sgt-puzzles-99999999.ebuild        |  67 +++++++------
 6 files changed, 204 insertions(+), 60 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 2550a33..c45233c 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,2 +1,3 @@
 DIST puzzles-20160315.c0bc13c.tar.gz 2838135 SHA256 fc557d3a1021a1e56ae63589d08788a8ccdfa1772e4c74cbbade5fefcf4e691f SHA512 9317ab26605982d5a97cec57596bd3e75cb1cb93b2bc14f6f295cf3950a759b21c5262e3eb04a3c3cda1d3d1cf4ff9477ee7fac9d310558567714e8e1cfc3496 WHIRLPOOL 7cc52ecabbfda7f71c64c02cc4ca434a20e637e25754d00b3f397318d0dd120aaf7ea19faafbb7eee259b7c2ca91e8e396d7667e4b1fa7fc6a153f15a69fb52f
+DIST puzzles-20161207.b958129.tar.gz 2897516 SHA256 d8b93252c06a1fb25e0888e67b9e92a435a02fc746c89149e9cff77b44760ec3 SHA512 d937ebcf9aa7d4aa603a5ffec8bb2b3c533df855718288d380072b5e2518ed791eb5b23388c489e31decc9c25ef6a7b42b26fae5b76f1e75df246487d05a8d78 WHIRLPOOL 06f98af4e476421d3a6207f98de0851cdf4dae3446568c10808326acde24de8b54afb03c3667bef88ebdd3fba1d693993a64c0f2d6a2eeb8e43ff2ca32dc2c50
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57 WHIRLPOOL 17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
new file mode 100644
index 00000000..a5c3a36
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
@@ -0,0 +1,107 @@
+Based on http://sources.debian.net/patches/sgt-puzzles/20160429.b31155b-1/202_online-help.diff/
+Simply opens HTML help files with xdg-open
+
+Author: Ben Hutchings <ben@decadent.org.uk>
+Description: Add HTML-based online help
+
+This works along the same lines as the Windows implementation,
+though we have to try a bit harder to find a help browser.
+
+--- a/gtk.c	2016-12-08 07:53:06.812409184 -0500
++++ b/gtk.c	2016-12-08 07:58:06.426415886 -0500
+@@ -2,6 +2,10 @@
+  * gtk.c: GTK front end for my puzzle collection.
+  */
+ 
++#ifndef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 1 /* for PATH_MAX */
++#endif
++
+ #include <stdio.h>
+ #include <assert.h>
+ #include <stdlib.h>
+@@ -10,6 +14,9 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <math.h>
++#include <limits.h>
++#include <unistd.h>
++#include <locale.h>
+ 
+ #include <sys/time.h>
+ #include <sys/resource.h>
+@@ -2270,6 +2277,37 @@
+     resize_fe(fe);
+ }
+ 
++static void show_help(frontend *fe, const char *topic)
++{
++    char path[PATH_MAX + 1];
++
++    sprintf(path, "%s/%s.html", HTMLDIR, topic);
++    if (access(path, R_OK) != 0) {
++        error_box(fe->window, "Help file could not be found");
++        return;
++    }
++
++    const char *argv[3];
++
++    argv[0] = "xdg-open";
++    argv[1] = path;
++    argv[2] = NULL;
++    if (! g_spawn_async(NULL, (char **)argv, NULL,
++                      G_SPAWN_SEARCH_PATH,
++                      NULL, NULL, NULL, NULL))
++        error_box(fe->window, "Failed to open help file");
++}
++
++static void menu_help_contents_event(GtkMenuItem *menuitem, gpointer data)
++{
++    show_help((frontend *)data, "index");
++}
++
++static void menu_help_specific_event(GtkMenuItem *menuitem, gpointer data)
++{
++    show_help((frontend *)data, thegame.htmlhelp_topic);
++}
++
+ static void menu_about_event(GtkMenuItem *menuitem, gpointer data)
+ {
+     frontend *fe = (frontend *)data;
+@@ -2590,6 +2628,25 @@
+     menu = gtk_menu_new();
+     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
+ 
++    menuitem = gtk_menu_item_new_with_label("Contents");
++    gtk_container_add(GTK_CONTAINER(menu), menuitem);
++    g_signal_connect(G_OBJECT(menuitem), "activate",
++                     G_CALLBACK(menu_help_contents_event), fe);
++    gtk_widget_show(menuitem);
++
++    if (thegame.htmlhelp_topic) {
++        char *item;
++        assert(thegame.name);
++        item = snewn(9+strlen(thegame.name), char); /*ick*/
++        sprintf(item, "Help on %s", thegame.name);
++        menuitem = gtk_menu_item_new_with_label(item);
++        sfree(item);
++        gtk_container_add(GTK_CONTAINER(menu), menuitem);
++        g_signal_connect(G_OBJECT(menuitem), "activate",
++                         G_CALLBACK(menu_help_specific_event), fe);
++        gtk_widget_show(menuitem);
++    }
++
+     menuitem = gtk_menu_item_new_with_label("About");
+     gtk_container_add(GTK_CONTAINER(menu), menuitem);
+     g_signal_connect(G_OBJECT(menuitem), "activate",
+--- a/Recipe
++++ b/Recipe
+@@ -95,6 +95,7 @@ Puzzles.dmg: Puzzles
+
+ !begin am
+ bin_PROGRAMS = $(GAMES)
++GTK_CFLAGS += -DHTMLDIR="\"$(htmldir)\""
+ !end
+ !begin am_begin
+ GAMES =
+

diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory b/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory
new file mode 100644
index 00000000..25aa1ae
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Directory
+Name=Puzzles
+Icon=sgt-puzzles_map

diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
new file mode 100644
index 00000000..ddcb2df
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
@@ -0,0 +1,18 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Applications</Name>
+  <Menu>
+    <Name>Games</Name>
+    <Menu>
+      <Name>Puzzles</Name>
+      <Directory>sgt-puzzles.directory</Directory>
+      <Include>
+      	<And>
+	  <All></All>
+          <Category>sgt-puzzles</Category>
+	</And>
+      </Include>
+    </Menu> <!-- End Puzzles -->
+  </Menu> <!-- End Games -->
+</Menu> <!-- End Applications -->

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20161207.ebuild
similarity index 57%
copy from games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
copy to games-puzzle/sgt-puzzles/sgt-puzzles-20161207.ebuild
index 6f1a68d..7f49fa3 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20161207.ebuild
@@ -2,49 +2,54 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils gnome2-utils toolchain-funcs games autotools
+inherit eutils gnome2-utils toolchain-funcs autotools
 
 if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
 	inherit git-r3
-	SRC_URI=""
+	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
+	GENTOO_ICONS="20160315"
+	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
 	KEYWORDS=""
 else
-	MAGIC=c0bc13c
+	MAGIC=b958129
 	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="~amd64 ~x86"
 fi
 
-GENTOO_ICONS="20160315"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz
-"
-
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
 HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc gtk3 icons"
+IUSE="+doc gtk3"
 
-RDEPEND="
+COMMON_DEPEND="
 	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
+	gtk3? ( x11-libs/gtk+:3 )"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils" # Used by builtin help patch
+
+DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	virtual/pkgconfig
 	doc? ( >=app-doc/halibut-1.0 )"
 
+PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
+
 src_unpack() {
-	[[ ${PV} == "99999999" ]] && git-r3_src_unpack
-	unpack ${A}
+	default
+	if [[ ${PV} == "99999999" ]]; then
+		git-r3_src_unpack
+	fi
 }
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \
 		-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
@@ -52,14 +57,16 @@ src_prepare() {
 	./mkfiles.pl || die
 	eautoreconf
 
-	# Import icons from latest Gentoo tarball
-	if [[ ${PV} == "99999999" ]] || use icons; then
+	# Import icons from latest Gentoo tarball for live
+	if [[ ${PV} == "99999999" ]]; then
 		cp -R ../${PN}-icons/icons . || die
 	fi
 }
 
 src_configure() {
-	econf --with-gtk=$(usex gtk3 3 2)
+	econf \
+		--program-prefix="${PN}_" \
+		--with-gtk=$(usex gtk3 3 2)
 }
 
 src_compile() {
@@ -70,35 +77,35 @@ src_compile() {
 }
 
 src_install() {
-	dodir "${GAMES_BINDIR}"
-	emake DESTDIR="${D}" bindir="${GAMES_BINDIR}" install
-	dodoc README
+	default
 
 	local file name
 	for file in *.R ; do
 		[[ ${file} == "nullgame.R" ]] && continue
 		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
 		file=${file%.R}
-		newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png
-		make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
+		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
+		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;${PN};"
 	done
 
 	if use doc ; then
-		dohtml *.html
+		DOCS=( puzzles.{pdf,ps,txt} )
+		HTML_DOCS=( *.html )
+		einstalldocs
 		doinfo puzzles.info{,-1,-2,-3}
-		dodoc puzzles.pdf puzzles.ps puzzles.txt
 	fi
 
-	prepgamesdirs
+	insinto /etc/xdg/menus/applications-merged
+	doins "${FILESDIR}/${PN}.menu"
+	insinto /usr/share/desktop-directories
+	doins "${FILESDIR}/${PN}.directory"
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
index 6f1a68d..7f49fa3 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
@@ -2,49 +2,54 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils gnome2-utils toolchain-funcs games autotools
+inherit eutils gnome2-utils toolchain-funcs autotools
 
 if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
 	inherit git-r3
-	SRC_URI=""
+	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
+	GENTOO_ICONS="20160315"
+	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
 	KEYWORDS=""
 else
-	MAGIC=c0bc13c
+	MAGIC=b958129
 	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="~amd64 ~x86"
 fi
 
-GENTOO_ICONS="20160315"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz
-"
-
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
 HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="doc gtk3 icons"
+IUSE="+doc gtk3"
 
-RDEPEND="
+COMMON_DEPEND="
 	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
+	gtk3? ( x11-libs/gtk+:3 )"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils" # Used by builtin help patch
+
+DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	virtual/pkgconfig
 	doc? ( >=app-doc/halibut-1.0 )"
 
+PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
+
 src_unpack() {
-	[[ ${PV} == "99999999" ]] && git-r3_src_unpack
-	unpack ${A}
+	default
+	if [[ ${PV} == "99999999" ]]; then
+		git-r3_src_unpack
+	fi
 }
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \
 		-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
@@ -52,14 +57,16 @@ src_prepare() {
 	./mkfiles.pl || die
 	eautoreconf
 
-	# Import icons from latest Gentoo tarball
-	if [[ ${PV} == "99999999" ]] || use icons; then
+	# Import icons from latest Gentoo tarball for live
+	if [[ ${PV} == "99999999" ]]; then
 		cp -R ../${PN}-icons/icons . || die
 	fi
 }
 
 src_configure() {
-	econf --with-gtk=$(usex gtk3 3 2)
+	econf \
+		--program-prefix="${PN}_" \
+		--with-gtk=$(usex gtk3 3 2)
 }
 
 src_compile() {
@@ -70,35 +77,35 @@ src_compile() {
 }
 
 src_install() {
-	dodir "${GAMES_BINDIR}"
-	emake DESTDIR="${D}" bindir="${GAMES_BINDIR}" install
-	dodoc README
+	default
 
 	local file name
 	for file in *.R ; do
 		[[ ${file} == "nullgame.R" ]] && continue
 		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
 		file=${file%.R}
-		newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png
-		make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
+		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
+		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;${PN};"
 	done
 
 	if use doc ; then
-		dohtml *.html
+		DOCS=( puzzles.{pdf,ps,txt} )
+		HTML_DOCS=( *.html )
+		einstalldocs
 		doinfo puzzles.info{,-1,-2,-3}
-		dodoc puzzles.pdf puzzles.ps puzzles.txt
 	fi
 
-	prepgamesdirs
+	insinto /etc/xdg/menus/applications-merged
+	doins "${FILESDIR}/${PN}.menu"
+	insinto /usr/share/desktop-directories
+	doins "${FILESDIR}/${PN}.directory"
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/files/, games-puzzle/sgt-puzzles/
@ 2017-04-10 17:22 NP Hardass
  0 siblings, 0 replies; 4+ messages in thread
From: NP Hardass @ 2017-04-10 17:22 UTC (permalink / raw
  To: gentoo-commits

commit:     c5df9eb77cfebf99930f846ad59140f2693680c6
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  7 06:21:39 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 17:21:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5df9eb7

games-puzzle/sgt-puzzles: Bump to 20170314

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 games-puzzle/sgt-puzzles/Manifest                                    | 1 +
 games-puzzle/sgt-puzzles/files/sgt-puzzles.menu                      | 5 ++++-
 .../{sgt-puzzles-99999999.ebuild => sgt-puzzles-20170314.ebuild}     | 4 ++--
 games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild                 | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 67721e6b50c..2359e3454b5 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,2 +1,3 @@
 DIST puzzles-20170228.1f613ba.tar.gz 2898117 SHA256 e53bf0800daae37c9be25fd260b0010a44178ca7a5ccc70b29b96fe85060d80a SHA512 41d73461984c589ed18ca2a8cab3871e87a1b56b2d38a8b11c0cb95150423cecbf5ddb76a2e9db4b9109980576527ae2fa7d2663e41dceee8847efc0044766b2 WHIRLPOOL 482c88b96d97878708771ccb6aacd38de527787e0a2ca9c6ba16ef48f917d0f269022530e849cfbc5ec74a04753f0aea42dd20a76a24bbd804566b1c07131e88
+DIST puzzles-20170314.eedea41.tar.gz 2897824 SHA256 57c156fa7de2605a4ae0f18e54ce20ef4e08b8faf32d26eccf5a7fa545940fa8 SHA512 ef7d12e0e20aef487a18b572a4464f3e23b226fae599cc22fdb34348f6c3baf3dcd21207c8fedef0ac3a6c4344b13e520767efef8830aaa2ad4b914285f8aa3c WHIRLPOOL 17b069ae171497212411ed6696fafd00108064f3a28ce38925a4fc6d9040e3d072a14920b024c329e597fe1fdedc9723089ea5c17d7df9226ac45ba612a1de70
 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57 WHIRLPOOL 17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac

diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
index ddcb2df5b6a..e3f3264cff9 100644
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
@@ -4,13 +4,16 @@
   <Name>Applications</Name>
   <Menu>
     <Name>Games</Name>
+    <Exclude>
+      <Category>X-sgt-puzzles</Category>
+    </Exclude>
     <Menu>
       <Name>Puzzles</Name>
       <Directory>sgt-puzzles.directory</Directory>
       <Include>
       	<And>
 	  <All></All>
-          <Category>sgt-puzzles</Category>
+          <Category>X-sgt-puzzles</Category>
 	</And>
       </Include>
     </Menu> <!-- End Puzzles -->

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
similarity index 98%
copy from games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
copy to games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
index d67926d4458..824c7f94307 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
 	KEYWORDS=""
 else
-	MAGIC=1f613ba
+	MAGIC=eedea41
 	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="~amd64 ~x86"
@@ -84,7 +84,7 @@ src_install() {
 		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
 		file=${file%.R}
 		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
-		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;${PN};"
+		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
 	done
 
 	if use doc ; then

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
index d67926d4458..824c7f94307 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
 	KEYWORDS=""
 else
-	MAGIC=1f613ba
+	MAGIC=eedea41
 	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
 	KEYWORDS="~amd64 ~x86"
@@ -84,7 +84,7 @@ src_install() {
 		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
 		file=${file%.R}
 		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
-		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;${PN};"
+		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
 	done
 
 	if use doc ; then


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/files/, games-puzzle/sgt-puzzles/
@ 2025-09-06 15:03 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-09-06 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     812d18c10b0feb47d0cceca2db547ad44b64a1c4
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Jul 14 11:03:06 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  6 15:02:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812d18c1

games-puzzle/sgt-puzzles: add 20250904

* Add missing ImageMagick BDEPEND. It is needed to generate icons.
* This version no longer needs X11 headers to compile.
* This version fixes linking issues.

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Part-of: https://github.com/gentoo/gentoo/pull/42993
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-puzzle/sgt-puzzles/Manifest                  |  1 +
 .../files/sgt-puzzles-20250904-no-cli.patch        | 13 +++++
 .../sgt-puzzles/sgt-puzzles-20250904.ebuild        | 65 ++++++++++++++++++++++
 3 files changed, 79 insertions(+)

diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 4f6e984c3a1d..ae5c4ea96c32 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,2 +1,3 @@
 DIST puzzles-20190415.e2135d5.tar.gz 3286744 BLAKE2B 6b19cde3f95b5375bde74923a5f8e3deb9abb7d4d737ad5f2d18aa7895b973a9ca1ed4a495cf80da8390ed7fb63f1eb973c8053d52145e5752c56e38d3ac19d7 SHA512 5f38c96cff4e745a1c1615762c0e5f3f3dd056ff7dbf0f80a5953e658ae1460503c6394fe29301f5682485d6a6121869853a270dc60327821a3059ca6d971fa1
 DIST sgt-puzzles-20250627.tar.gz 2467512 BLAKE2B 8d19d3bee5b171ed2645cf47f7bc84fd94ef7c0ea8dc47ad758c7e74131e8e34060fceb471082007f61b4a03e2e9e9c6419906357e43993e80fcd27a56b1b138 SHA512 6ffc2eda1abc0f6808b044571478cf543339785049ab8adb0d7755a65a7ea969747637c0ac9fc440a780db3145abf3c0a881b42fd2c115481db8023ac0a60423
+DIST sgt-puzzles-20250904.tar.gz 2468223 BLAKE2B 1da3846645a073f0f86865321cdf238603da271c12cc5761df572ec1019035213067e72100cbf931e5f2103af43b82c8c5ddd32daadc4de105c414e1e8015ea1 SHA512 6faa3c6d735632f7434d8cd888f97f5c69cb519d0a872292367fcb10836487fac4bd4df172c4c8e93e50be70308834790c662ec2c2d44cbacf5075c18b2c990f

diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-20250904-no-cli.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20250904-no-cli.patch
new file mode 100644
index 000000000000..8c70d6f11dca
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20250904-no-cli.patch
@@ -0,0 +1,13 @@
+Don't build cli programs. Build system doesn't install them anyway.
+
+--- a/cmake/setup.cmake
++++ b/cmake/setup.cmake
+@@ -3,7 +3,7 @@ set(PUZZLES_ENABLE_UNFINISHED ""
+ to build as if official (separated by ';')")
+ 
+ set(build_individual_puzzles TRUE)
+-set(build_cli_programs TRUE)
++set(build_cli_programs FALSE)
+ set(build_gui_programs TRUE)
+ set(build_icons FALSE)
+ set(need_c_icons FALSE)

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20250904.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20250904.ebuild
new file mode 100644
index 000000000000..5d890194da1f
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20250904.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+MY_HASH=2376227
+SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MY_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/puzzles-${PV}.${MY_HASH}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="x11-libs/gtk+:3"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-misc/xdg-utils
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	app-text/halibut
+	dev-lang/perl
+	virtual/imagemagick-tools[png]
+	virtual/pkgconfig
+"
+
+DOCS=( puzzles.txt HACKING )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20250904-no-cli.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DNAME_PREFIX="${PN}_"
+		-DPUZZLES_GTK_VERSION=3
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	sed -i "s/^Categories=.*/&X-${PN};/" "${BUILD_DIR}"/*.desktop || die
+
+	cmake_src_install
+
+	einstalldocs
+
+	insinto /etc/xdg/menus/applications-merged
+	doins "${FILESDIR}/${PN}.menu"
+	insinto /usr/share/desktop-directories
+	doins "${FILESDIR}/${PN}.directory"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/files/, games-puzzle/sgt-puzzles/
@ 2025-09-06 15:03 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-09-06 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     86d47a8573901765fe154b37ccdcf24cf6cdfb56
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Aug 23 15:57:53 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  6 15:02:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d47a85

games-puzzle/sgt-puzzles: remove 20250627

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Part-of: https://github.com/gentoo/gentoo/pull/42993
Closes: https://github.com/gentoo/gentoo/pull/42993
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-puzzle/sgt-puzzles/Manifest                  |  1 -
 .../files/sgt-puzzles-20250627-fix-linking.patch   | 27 ---------
 .../sgt-puzzles/sgt-puzzles-20250627.ebuild        | 64 ----------------------
 3 files changed, 92 deletions(-)

diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index ae5c4ea96c32..9246f1f1d298 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -1,3 +1,2 @@
 DIST puzzles-20190415.e2135d5.tar.gz 3286744 BLAKE2B 6b19cde3f95b5375bde74923a5f8e3deb9abb7d4d737ad5f2d18aa7895b973a9ca1ed4a495cf80da8390ed7fb63f1eb973c8053d52145e5752c56e38d3ac19d7 SHA512 5f38c96cff4e745a1c1615762c0e5f3f3dd056ff7dbf0f80a5953e658ae1460503c6394fe29301f5682485d6a6121869853a270dc60327821a3059ca6d971fa1
-DIST sgt-puzzles-20250627.tar.gz 2467512 BLAKE2B 8d19d3bee5b171ed2645cf47f7bc84fd94ef7c0ea8dc47ad758c7e74131e8e34060fceb471082007f61b4a03e2e9e9c6419906357e43993e80fcd27a56b1b138 SHA512 6ffc2eda1abc0f6808b044571478cf543339785049ab8adb0d7755a65a7ea969747637c0ac9fc440a780db3145abf3c0a881b42fd2c115481db8023ac0a60423
 DIST sgt-puzzles-20250904.tar.gz 2468223 BLAKE2B 1da3846645a073f0f86865321cdf238603da271c12cc5761df572ec1019035213067e72100cbf931e5f2103af43b82c8c5ddd32daadc4de105c414e1e8015ea1 SHA512 6faa3c6d735632f7434d8cd888f97f5c69cb519d0a872292367fcb10836487fac4bd4df172c4c8e93e50be70308834790c662ec2c2d44cbacf5075c18b2c990f

diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-20250627-fix-linking.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20250627-fix-linking.patch
deleted file mode 100644
index 7e6d6acc4bb2..000000000000
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles-20250627-fix-linking.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-* Make common lib static. It is built as a shared library by default but doesn't
-  get installed which results in a broken executables.
-* Fix linking issues due to relocations in core_obj.
-* cli programs fails to link. Disable them for now.
---- a/CMakeLists.txt	2025-06-23 18:39:56.200000000 +0300
-+++ b/CMakeLists.txt	2025-06-23 18:42:08.060000000 +0300
-@@ -12,7 +12,8 @@ add_library(core_obj OBJECT
-   version.c
-   ${platform_common_sources})
- add_library(core $<TARGET_OBJECTS:core_obj>)
--add_library(common $<TARGET_OBJECTS:core_obj> hat.c spectre.c)
-+add_library(common STATIC $<TARGET_OBJECTS:core_obj> hat.c spectre.c)
-+set_property(TARGET core_obj PROPERTY POSITION_INDEPENDENT_CODE ON)
- 
- cliprogram(polygon-test draw-poly.c
-   SDL2_LIB COMPILE_DEFINITIONS STANDALONE_POLYGON)
---- a/cmake/setup.cmake	2025-06-23 18:27:11.510000000 +0300
-+++ b/cmake/setup.cmake	2025-06-23 18:33:07.400000000 +0300
-@@ -3,7 +3,7 @@ set(PUZZLES_ENABLE_UNFINISHED ""
- to build as if official (separated by ';')")
- 
- set(build_individual_puzzles TRUE)
--set(build_cli_programs TRUE)
-+set(build_cli_programs FALSE)
- set(build_gui_programs TRUE)
- set(build_icons FALSE)
- set(need_c_icons FALSE)

diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20250627.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20250627.ebuild
deleted file mode 100644
index 6dc471e19daa..000000000000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20250627.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-MY_HASH=8314b03
-SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MY_HASH}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/puzzles-${PV}.${MY_HASH}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="x11-libs/gtk+:3"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-misc/xdg-utils
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	app-text/halibut
-	dev-lang/perl
-	virtual/pkgconfig
-"
-
-DOCS=( puzzles.txt HACKING )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20250627-fix-linking.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DNAME_PREFIX="${PN}_"
-		-DPUZZLES_GTK_VERSION=3
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	sed -i "s/^Categories=.*/&X-${PN};/" "${BUILD_DIR}"/*.desktop || die
-
-	cmake_src_install
-
-	einstalldocs
-
-	insinto /etc/xdg/menus/applications-merged
-	doins "${FILESDIR}/${PN}.menu"
-	insinto /usr/share/desktop-directories
-	doins "${FILESDIR}/${PN}.directory"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-09-06 15:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-06 15:03 [gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/files/, games-puzzle/sgt-puzzles/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2025-09-06 15:03 Sam James
2017-04-10 17:22 NP Hardass
2016-12-12 14:51 NP Hardass

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox