* [gentoo-commits] repo/gentoo:master commit in: games-arcade/ri-li/files/, games-arcade/ri-li/
@ 2018-04-23 19:17 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-04-23 19:17 UTC (permalink / raw
To: gentoo-commits
commit: ecdf6f2ed86478134b2df76aa7f1f836dac11397
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 18:44:24 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 19:17:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecdf6f2e
games-arcade/ri-li: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch | 44 ++++++++++++------------
games-arcade/ri-li/ri-li-2.0.1-r1.ebuild | 35 +++++++++++++++++++
2 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch b/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch
index 7c7de0f9395..3782627c83b 100644
--- a/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch
+++ b/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch
@@ -1,5 +1,5 @@
---- src/audio.cc
-+++ src/audio.cc
+--- a/src/audio.cc
++++ b/src/audio.cc
@@ -22,7 +22,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -18,8 +18,8 @@
return false;
}
---- src/ecran.cc
-+++ src/ecran.cc
+--- a/src/ecran.cc
++++ b/src/ecran.cc
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -29,8 +29,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
---- src/editeur.cc
-+++ src/editeur.cc
+--- a/src/editeur.cc
++++ b/src/editeur.cc
@@ -25,7 +25,7 @@
#include <windows.h>
#endif
@@ -49,8 +49,8 @@
exit(-1);
}
---- src/jeux.cc
-+++ src/jeux.cc
+--- a/src/jeux.cc
++++ b/src/jeux.cc
@@ -25,7 +25,7 @@
#include <windows.h>
#endif
@@ -60,8 +60,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
---- src/loco.cc
-+++ src/loco.cc
+--- a/src/loco.cc
++++ b/src/loco.cc
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -71,8 +71,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
---- src/main.cc
-+++ src/main.cc
+--- a/src/main.cc
++++ b/src/main.cc
@@ -23,7 +23,7 @@
#include <stdio.h>
@@ -109,8 +109,8 @@
exit(-1);
}
// Change le nom de la fenetre
---- src/menu.cc
-+++ src/menu.cc
+--- a/src/menu.cc
++++ b/src/menu.cc
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -138,8 +138,8 @@
exit(-1);
}
---- src/mouse.cc
-+++ src/mouse.cc
+--- a/src/mouse.cc
++++ b/src/mouse.cc
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -149,8 +149,8 @@
#include <stdio.h>
#include "mouse.h"
#include "preference.h"
---- src/sprite.cc
-+++ src/sprite.cc
+--- a/src/sprite.cc
++++ b/src/sprite.cc
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -205,8 +205,8 @@
return false;
}
return true;
---- src/tableau.cc
-+++ src/tableau.cc
+--- a/src/tableau.cc
++++ b/src/tableau.cc
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -216,8 +216,8 @@
#include <stdio.h>
#include <stdlib.h>
#include "preference.h"
---- src/utils.cc
-+++ src/utils.cc
+--- a/src/utils.cc
++++ b/src/utils.cc
@@ -21,7 +21,7 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild b/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild
new file mode 100644
index 00000000000..9fc7f0cd4a6
--- /dev/null
+++ b/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop
+
+DESCRIPTION="Drive a toy wood engine and collect all the coaches"
+HOMEPAGE="http://ri-li.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ri-li/Ri-li-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]
+ media-libs/sdl-mixer[mod]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/Ri-li-${PV}"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-gcc43.patch
+ mv configure.{in,ac}
+ rm aclocal.m4
+ eautoreconf
+}
+
+src_install() {
+ default
+ rm -f "${ED}/usr/share/Ri-li/"*ebuild
+ newicon data/Ri-li-icon-48x48.png ${PN}.png
+ make_desktop_entry Ri_li Ri-li
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/ri-li/files/, games-arcade/ri-li/
@ 2023-02-04 23:37 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-02-04 23:37 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 3994 bytes --]
commit: 38c49856cf85f12c1ea9c8ad4ab52bc0582568a6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 23:24:53 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 23:36:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38c49856
games-arcade/ri-li: EAPI 8, fix build w/ gcc 11
Closes: https://bugs.gentoo.org/811501
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-arcade/ri-li/files/ri-li-2.0.1-gcc11.patch | 47 ++++++++++++++++++++++
...ri-li-2.0.1-r1.ebuild => ri-li-2.0.1-r2.ebuild} | 25 +++++++-----
2 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/games-arcade/ri-li/files/ri-li-2.0.1-gcc11.patch b/games-arcade/ri-li/files/ri-li-2.0.1-gcc11.patch
new file mode 100644
index 000000000000..e465978789e1
--- /dev/null
+++ b/games-arcade/ri-li/files/ri-li-2.0.1-gcc11.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/811501
+https://sourceforge.net/p/ri-li/bugs/2/
+
+From 317a80608a061a0acdf196a6c148bfe63b1eaad5 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Thu, 21 Apr 2022 07:52:46 +0100
+Subject: [PATCH] Fix build on gcc-11
+
+Without the change build fails on ordered comparison on pointers:
+
+tableau.cc:90:9: error: ordered comparison of pointer with integer zero ('unsigned char*' and 'int')
+ 90 | if(Buf<=0) return false;
+ | ~~~^~~
+--- a/src/sprite.cc
++++ b/src/sprite.cc
+@@ -351,7 +351,7 @@ bool Sprite::Load(unsigned char *Buf,long &P)
+ // Fabrique la surface
+ Image[i]=SDL_CreateRGBSurface((Dim[i].bpp-3)*SDL_SRCALPHA,Dim[i].L,Dim[i].H,Dim[i].bpp*8,
+ 0xff,0xff00,0xff0000,0xff000000*(Dim[i].bpp-3));
+- if(Image[i]<=NULL) {
++ if(Image[i]==NULL) {
+ std::cerr <<"Impossible de créer une Surface SDL!"<<std::endl;
+ return false;
+ }
+@@ -485,7 +485,7 @@ bool Sprite::Nouveau(int Lx,int Ly)
+ // Fabrique la surface
+ Image[0]=SDL_CreateRGBSurface((Dim[0].bpp-3)*SDL_SRCALPHA,Dim[0].L,Dim[0].H,Dim[0].bpp*8,
+ 0xff,0xff00,0xff0000,0xff000000*(Dim[0].bpp-3));
+- if(Image[0]<=NULL) {
++ if(Image[0]==NULL) {
+ std::cerr <<"Impossible de créer une Surface SDL!"<<std::endl;
+ return false;
+ }
+--- a/src/tableau.cc
++++ b/src/tableau.cc
+@@ -87,7 +87,7 @@ bool Tableau::Save(void)
+
+ // Alloue la mémoire
+ Buf=new unsigned char [sizeof(s_Tableau)*N+sizeof(int)+1];
+- if(Buf<=0) return false;
++ if(Buf==NULL) return false;
+
+ // Charge les tableaux
+ Buf[0]=N/256;
+--
+2.35.1
+
diff --git a/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild b/games-arcade/ri-li/ri-li-2.0.1-r2.ebuild
similarity index 66%
rename from games-arcade/ri-li/ri-li-2.0.1-r1.ebuild
rename to games-arcade/ri-li/ri-li-2.0.1-r2.ebuild
index 1a80ceb4ad1c..10ddfd65cb9a 100644
--- a/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild
+++ b/games-arcade/ri-li/ri-li-2.0.1-r2.ebuild
@@ -1,36 +1,43 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools desktop
DESCRIPTION="Drive a toy wood engine and collect all the coaches"
HOMEPAGE="https://ri-li.sourceforge.net/"
SRC_URI="mirror://sourceforge/ri-li/Ri-li-${PV}.tar.bz2"
+S="${WORKDIR}/Ri-li-${PV}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="media-libs/libsdl[sound,video]
- media-libs/sdl-mixer[mod]"
+DEPEND="
+ media-libs/libsdl[sound,video]
+ media-libs/sdl-mixer[mod]
+"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/Ri-li-${PV}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.1-gcc43.patch
+ "${FILESDIR}"/${PN}-2.0.1-gcc11.patch
+)
src_prepare() {
default
- eapply "${FILESDIR}"/${P}-gcc43.patch
- mv configure.{in,ac}
- rm aclocal.m4
+
+ mv configure.{in,ac} || die
+ rm aclocal.m4 || die
eautoreconf
}
src_install() {
default
- rm -f "${ED}/usr/share/Ri-li/"*ebuild
+
+ rm -f "${ED}/usr/share/Ri-li/"*ebuild || die
+
newicon data/Ri-li-icon-48x48.png ${PN}.png
make_desktop_entry Ri_li Ri-li
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-04 23:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-23 19:17 [gentoo-commits] repo/gentoo:master commit in: games-arcade/ri-li/files/, games-arcade/ri-li/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2023-02-04 23:37 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox