[gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/files/, games-rpg/manaplus/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/files/, games-rpg/manaplus/

[Lars Wendler]

commit:     f6773157b4cafe701e3745087c99948737f2b65d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 11:05:40 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 11:07:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6773157

games-rpg/manaplus: Revbump for appdata -> metainfo

Bug: https://bugs.gentoo.org/739362
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/manaplus-1.9.3.23-metainfo.patch         | 38 ++++++++++++++++++++++
 ...1.9.3.23.ebuild => manaplus-1.9.3.23-r1.ebuild} | 12 ++++---
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch b/games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch
new file mode 100644
index 00000000000..dd324e5da8b
--- /dev/null
+++ b/games-rpg/manaplus/files/manaplus-1.9.3.23-metainfo.patch
@@ -0,0 +1,38 @@
+From c8e83006fb78b5768de1e3e19993c91a29f5da6d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 1 Oct 2020 12:48:02 +0200
+Subject: [PATCH] Rename appdata to metainfo
+
+See https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+chapter 2.1.2 "Filesystem locations"
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Makefile.am                                   | 4 ++--
+ manaplus.appdata.xml => manaplus.metainfo.xml | 0
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename manaplus.appdata.xml => manaplus.metainfo.xml (100%)
+
+diff --git a/Makefile.am b/Makefile.am
+index 603cf8e16..70c6981be 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,9 +6,9 @@ desktopdir = $(datarootdir)/applications
+ desktop_DATA = manaplus.desktop \
+ 	     manaplustest.desktop
+ 
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ 
+-appdata_DATA = manaplus.appdata.xml
++appdata_DATA = manaplus.metainfo.xml
+ 
+ # Extra files to include
+ EXTRA_DIST = $(desktop_DATA) \
+diff --git a/manaplus.appdata.xml b/manaplus.metainfo.xml
+similarity index 100%
+rename from manaplus.appdata.xml
+rename to manaplus.metainfo.xml
+-- 
+2.28.0
+

diff --git a/games-rpg/manaplus/manaplus-1.9.3.23.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
similarity index 97%
rename from games-rpg/manaplus/manaplus-1.9.3.23.ebuild
rename to games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
index 85e22dbccd8..a319f2a4328 100644
--- a/games-rpg/manaplus/manaplus-1.9.3.23.ebuild
+++ b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
 HOMEPAGE="https://manaplus.org"
 if [[ ${PV} == 9999 ]] ; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
 else
 	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
@@ -56,11 +58,13 @@ BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-metainfo.patch"
+)
+
 src_prepare() {
 	default
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
+	eautoreconf
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-rpg/manaplus/files/, games-rpg/manaplus/

[Sam James]

commit:     c4dc15f9ab3eeea684ffc0f4a322ae231bf730e1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 21:18:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 21:32:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4dc15f9

games-rpg/manaplus: fix build with GCC 12

Closes: https://bugs.gentoo.org/855212
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch | 13 +++++++++++++
 games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild              |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch b/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch
new file mode 100644
index 000000000000..5ded1f0fa9d5
--- /dev/null
+++ b/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc12-time.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/855212
+--- a/src/resources/wallpaper.cpp
++++ b/src/resources/wallpaper.cpp
+@@ -38,9 +38,7 @@
+ #include <sys/time.h>
+ #endif  // WIN32
+ 
+-#ifdef __clang__
+ #include <ctime>
+-#endif  // __clang__
+ 
+ #include "debug.h"
+ 

diff --git a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
index 6c1d04cbb663..f481e1cd9b21 100644
--- a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
+++ b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
@@ -55,6 +55,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.3.23-gcc12-time.patch
+)
+
 src_prepare() {
 	default