[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/, games-roguelike/scourge/files/
commit: 3ea81b205878724228f404290b70f6e21195025a
Author: Lars Wendler gentoo org>
AuthorDate: Mon Jun 25 14:06:48 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon Jun 25 14:07:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea81b20
games-roguelike/scourge: Replaced freetype-config with pkg-config
Closes: https://bugs.gentoo.org/655374
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/scourge-0.21.1-freetype_pkgconfig.patch | 34 ++
games-roguelike/scourge/scourge-0.21.1-r1.ebuild | 16 ++
2 files changed, 44 insertions(+), 6 deletions(-)
diff --git
a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
new file mode 100644
index 000..d41ee1a4443
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
@@ -0,0 +1,34 @@
+Index: scourge/configure.in
+===
+--- scourge/configure.in (revision 3411)
scourge/configure.in (working copy)
+@@ -56,6 +56,7 @@
+ # Set up binreloc (for a relocatable autopackage file)
+ AM_BINRELOC
+
++PKG_PROG_PKG_CONFIG
+ dnl --
+ dnl General options
+ dnl --
+@@ -413,19 +414,9 @@
+ FREETYPE_LIBS=`/sw/lib/freetype2/bin/freetype-config --libs`
+ have_FREETYPE=yes
+ else
+-AC_MSG_CHECKING([for freetype-config library])
+-
+-AC_PATH_PROG(FREETYPE, freetype-config, no)
+-
+-if test "$FREETYPE" = "no"; then
+- AC_MSG_ERROR(Cannot find freetype2: Is freetype-config in path?)
+- have_FREETYPE=no
+-else
+- FREETYPE_CFLAGS=`freetype-config --cflags`
+- FREETYPE_LIBS=`freetype-config --libs`
+- have_FREETYPE=yes
++ PKG_CHECK_MODULES(FREETYPE, freetype2, have_FREETYPE=yes,
++AC_MSG_ERROR(Cannot find freetype2))
+ fi
+-fi
+
+ LIBS="$saved_LIBS"
+ TR_LIBS="$TR_LIBS $FREETYPE_LIBS"
diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index 6f23afbb419..5eeec7c5231 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools eutils wxwidgets
+inherit autotools desktop wxwidgets
DESCRIPTION="A graphical rogue-like adventure game"
HOMEPAGE="https://sourceforge.net/projects/scourge/;
@@ -25,14 +25,16 @@ RDEPEND="
virtual/opengl
virtual/glu"
DEPEND="${RDEPEND}
- sys-devel/gettext"
+ sys-devel/gettext
+ virtual/pkgconfig"
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
PATCHES=(
"${FILESDIR}"/${P}-gcc47.patch
"${FILESDIR}"/${P}-gcc6.patch
"${FILESDIR}"/${P}-automake-1.13.patch
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch
)
src_prepare() {
@@ -50,9 +52,11 @@ src_prepare() {
}
src_configure() {
- econf \
- --with-data-dir=/usr/share/${PN} \
+ local myeconfargs=(
+ --with-data-dir=/usr/share/${PN}
--localedir=/usr/share/locale
+ )
+ econf "${myeconfargs[@]}"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/, games-roguelike/scourge/files/
commit: 971bbd8c85e82b4538338f5a5919d6ee5f4776d1
Author: Peter Levine gmail com>
AuthorDate: Sun Jul 23 07:17:15 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jul 23 12:32:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971bbd8c
games-roguelike/scourge: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610492
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../scourge/files/scourge-0.21.1-gcc6.patch| 34 ++
games-roguelike/scourge/scourge-0.21.1-r1.ebuild | 3 +-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
b/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
new file mode 100644
index 000..fed15f45ed7
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
@@ -0,0 +1,34 @@
+Bug: https://bugs.gentoo.org/610492
+Upstream ticket: https://sourceforge.net/p/scourge/patches/3/
+
+--- a/src/equip.cpp
b/src/equip.cpp
+@@ -595,7 +595,7 @@
+ }
+ }
+ if ( !found ) {
+- specialSkill = false;
++ specialSkill = NULL;
+ canvas->setTooltip( "" );
+ }
+ glDisable( GL_BLEND );
+--- a/src/render/map.cpp
b/src/render/map.cpp
+@@ -3154,7 +3154,7 @@
+ if ( shape )
+ return shape;
+ }
+- return false;
++ return NULL;
+ }
+ if ( y1 == y2 ) {
+ if ( x1 > x2 ) SWAP( x1, x2 );
+@@ -3163,7 +3163,7 @@
+ if ( shape )
+ return shape;
+ }
+- return false;
++ return NULL;
+ }
+
+
diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index db3edafb19a..6f23afbb419 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -31,6 +31,7 @@ S=${WORKDIR}/${PN}
PATCHES=(
"${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-gcc6.patch
"${FILESDIR}"/${P}-automake-1.13.patch
)
[gentoo-commits] repo/gentoo:master commit in: games-roguelike/scourge/, games-roguelike/scourge/files/
commit: 3e8d4debb48c83d315329375597c87ff6f944a30
Author: Austin English gentoo org>
AuthorDate: Wed Sep 14 19:11:53 2016 +
Commit: Austin English gentoo org>
CommitDate: Wed Sep 14 19:12:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e8d4deb
games-roguelike/scourge: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.3.0
.../files/scourge-0.21.1-automake-1.13.patch | 4 +-
.../scourge/files/scourge-0.21.1-gcc47.patch | 4 +-
games-roguelike/scourge/scourge-0.21.1-r1.ebuild | 64 ++
3 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
b/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
index 44b817e..5c2bc20 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
@@ -1,5 +1,5 @@
scourge-0.21.1.src/scourge/configure.in
-+++ scourge-0.21.1.src/scourge/configure.in
+--- a/configure.in
b/configure.in
@@ -4,7 +4,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/scourge.h)
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
index 50c5cac..6f3f7b3 100644
--- a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
+++ b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
@@ -1,5 +1,5 @@
src/squirrel/squtils.h.old 2012-08-30 18:06:43.474037926 +0200
-+++ src/squirrel/squtils.h 2012-08-30 18:14:13.300261523 +0200
+--- a/src/squirrel/squtils.h 2012-08-30 18:06:43.474037926 +0200
b/src/squirrel/squtils.h 2012-08-30 18:14:13.300261523 +0200
@@ -8,6 +8,9 @@
#define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size);
#define SQ_REALLOC(__ptr,__oldsize,__size)
sq_vm_realloc(__ptr,__oldsize,__size);
diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
new file mode 100644
index ..22ee6cf
--- /dev/null
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils wxwidgets
+
+DESCRIPTION="A graphical rogue-like adventure game"
+HOMEPAGE="https://sourceforge.net/projects/scourge/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz
+ mirror://sourceforge/${PN}/${P}.data.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+ media-libs/freetype:2
+ media-libs/libsdl[joystick,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ media-libs/sdl-net
+ media-libs/sdl-ttf
+ virtual/libintl
+ virtual/opengl
+ virtual/glu"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-automake-1.13.patch
+)
+
+src_prepare() {
+ default
+
+ # bug #257601
+ sed -i \
+ -e '/AC_CHECK_HEADERS.*glext/ s:):, [#include ] ):' \
+ configure.in || die
+ sed -i \
+ -e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
+ src/scourgehandler.cpp || die
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-data-dir=/usr/share/${PN} \
+ --localedir=/usr/share/locale
+}
+
+src_install() {
+ default
+ insinto /usr/share/${PN}
+ doins -r ../scourge_data/*
+ doicon assets/scourge.png
+ make_desktop_entry scourge S.C.O.U.R.G.E.
+}
