[gentoo-commits] repo/gentoo:master commit in: app-misc/kanatest/files/, app-misc/kanatest/

[gentoo-commits] repo/gentoo:master commit in: app-misc/kanatest/files/, app-misc/kanatest/

[David Seifert]

commit:     ca104f8cc9831c67f144a10e52786c00f4491ffd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 13:58:32 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 13:58:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca104f8c

app-misc/kanatest: port to EAPI 8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../kanatest/files/kanatest-0.4.8-desktop-QA.patch | 16 ++++++++
 app-misc/kanatest/kanatest-0.4.8.ebuild            | 47 +++++++++-------------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/app-misc/kanatest/files/kanatest-0.4.8-desktop-QA.patch b/app-misc/kanatest/files/kanatest-0.4.8-desktop-QA.patch
new file mode 100644
index 00000000000..83169e34a9a
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8-desktop-QA.patch
@@ -0,0 +1,16 @@
+--- a/data/kanatest.desktop
++++ b/data/kanatest.desktop
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Hiragana and Katakana Test
+ Comment=Hiragana and Katakana drill tool
+ Exec=kanatest
+-Icon=kanatest.png
++Icon=kanatest
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+ X-Desktop-File-Install-Version=0.10
+-Categories=Game;Application;X-Fedora;
++Categories=Game;X-Fedora;

diff --git a/app-misc/kanatest/kanatest-0.4.8.ebuild b/app-misc/kanatest/kanatest-0.4.8.ebuild
index d24f05ecee8..187ad8bee1a 100644
--- a/app-misc/kanatest/kanatest-0.4.8.ebuild
+++ b/app-misc/kanatest/kanatest-0.4.8.ebuild
@@ -1,48 +1,37 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch gnome2-utils
+inherit autotools xdg
 
 DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet"
-HOMEPAGE="http://www.clayo.org/kanatest"
-SRC_URI="http://www.clayo.org/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.clayo.org/kanatest"
+SRC_URI="https://www.clayo.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
-RDEPEND=">=x11-libs/gtk+-2.12:2=
+RDEPEND="
+	x11-libs/gtk+:2
 	dev-libs/libxml2:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS TRANSLATORS ChangeLog README )
+PATCHES=(
+	"${FILESDIR}"/${P}+gtk-2.22.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-desktop-QA.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}+gtk-2.22.patch \
-		"${FILESDIR}"/${P}-autoconf.patch \
-		"${FILESDIR}"/${P}-cflags.patch
-
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/^Categories/s:Application;::' \
-		-e '/^Icon/s:.png::' \
-		data/${PN}.desktop || die
-
+	default
 	eautoreconf
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+src_install() {
+	default
+	dodoc TRANSLATORS
 }

[gentoo-commits] repo/gentoo:master commit in: app-misc/kanatest/files/, app-misc/kanatest/

[David Seifert]

commit:     fe235bbe8df4e0271669eeda58d6710ae5efc021
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 13:58:33 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 13:58:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe235bbe

app-misc/kanatest: fix -Wformat-security

Closes: https://bugs.gentoo.org/521098
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/kanatest-0.4.8-format-security.patch     | 22 ++++++++++++++++++++++
 app-misc/kanatest/kanatest-0.4.8.ebuild            |  1 +
 2 files changed, 23 insertions(+)

diff --git a/app-misc/kanatest/files/kanatest-0.4.8-format-security.patch b/app-misc/kanatest/files/kanatest-0.4.8-format-security.patch
new file mode 100644
index 00000000000..7493d0a7bd1
--- /dev/null
+++ b/app-misc/kanatest/files/kanatest-0.4.8-format-security.patch
@@ -0,0 +1,22 @@
+--- a/src/stats.c
++++ b/src/stats.c
+@@ -84,7 +84,7 @@ gchar buffer[BUFFER_SIZE];
+ 
+     info_dialog = gtk_message_dialog_new (GTK_WINDOW(appGUI->sts->stat_window),
+                                           GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+-                                          GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, buffer);
++                                          GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", buffer);
+ 
+     gtk_window_set_title(GTK_WINDOW(info_dialog), _("Question"));
+     gtk_widget_show (info_dialog);
+--- a/src/test.c
++++ b/src/test.c
+@@ -538,7 +538,7 @@ test_info(GUI *appGUI) {
+ 
+     info_dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(appGUI->main_window),
+                                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+-                                                      GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, message);
++                                                      GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", message);
+ 
+     gtk_window_set_title (GTK_WINDOW(info_dialog), _("Information"));
+     gtk_widget_show (info_dialog);

diff --git a/app-misc/kanatest/kanatest-0.4.8.ebuild b/app-misc/kanatest/kanatest-0.4.8.ebuild
index 187ad8bee1a..c1d64fbe9eb 100644
--- a/app-misc/kanatest/kanatest-0.4.8.ebuild
+++ b/app-misc/kanatest/kanatest-0.4.8.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-autoconf.patch
 	"${FILESDIR}"/${P}-cflags.patch
 	"${FILESDIR}"/${P}-desktop-QA.patch
+	"${FILESDIR}"/${P}-format-security.patch
 )
 
 src_prepare() {