* [gentoo-commits] repo/gentoo:master commit in: games-board/pioneers/files/, games-board/pioneers/
@ 2020-07-02 0:03 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-07-02 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 55672a7ee7ce86981de4cfaaac2899083162a112
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 2 00:00:46 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 2 00:03:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55672a7e
games-board/pioneers: 15.5 version bump, fix build w/ -fno-common
Bug: https://bugs.gentoo.org/728984
Closes: https://bugs.gentoo.org/708834
Closes: https://bugs.gentoo.org/636342
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
games-board/pioneers/Manifest | 1 +
.../pioneers/files/pioneers-15.5-fno-common.patch | 12 ++++++
games-board/pioneers/pioneers-15.5.ebuild | 46 ++++++++++++++++++++++
3 files changed, 59 insertions(+)
diff --git a/games-board/pioneers/Manifest b/games-board/pioneers/Manifest
index a1195e54057..5f1e718393f 100644
--- a/games-board/pioneers/Manifest
+++ b/games-board/pioneers/Manifest
@@ -1 +1,2 @@
DIST pioneers-15.3.tar.gz 4154470 BLAKE2B 536b2100ac0dd75d8c118741bffdd433bebcbdef2df54a75a5e9004f5fb2f7859bc75c27935251fc94b3428e730a7be522b88a7ab13224cb545180eb84ad86f9 SHA512 57aa8bc48019c87a683a4728d28d56f6bd755a0566922dddb4de825904820d1204f893e73fd13465fcec63cecb4a5735a90338f6ff915b7f17113dc0f1e834c1
+DIST pioneers-15.5.tar.gz 4975627 BLAKE2B 8cae5df3e122743819196f0442ba18cedcfd4fee51d9e76ef4137f120e3429456f58ca9d6e537b8e0206c937d882b4a22d76ae333a7d5d7dc69d65f7bbd94b18 SHA512 a3261197348d7e994da81ad4948755520bf29678614a9ea2b2cacc81622093c6460b0cee671a04c125684d88a9ee1deb9206ccb73ab1440be1a1505e24b2ed2a
diff --git a/games-board/pioneers/files/pioneers-15.5-fno-common.patch b/games-board/pioneers/files/pioneers-15.5-fno-common.patch
new file mode 100644
index 00000000000..5d8522b772e
--- /dev/null
+++ b/games-board/pioneers/files/pioneers-15.5-fno-common.patch
@@ -0,0 +1,12 @@
+diff -up a/common/game.h.me b/common/game.h
+--- a/common/game.h.me 2020-02-06 12:05:24.472403768 +0100
++++ b/common/game.h 2020-02-06 12:05:45.662644226 +0100
+@@ -137,7 +137,7 @@ typedef enum {
+ typedef void (*WriteLineFunc) (gpointer user_data, const gchar *);
+
+ /** Default style for a player. */
+-const gchar *default_player_style;
++extern const gchar *default_player_style;
+
+ GameParams *params_new(void);
+ GameParams *params_copy(const GameParams * params);
diff --git a/games-board/pioneers/pioneers-15.5.ebuild b/games-board/pioneers/pioneers-15.5.ebuild
new file mode 100644
index 00000000000..afd322eae4c
--- /dev/null
+++ b/games-board/pioneers/pioneers-15.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Clone of the popular board game The Settlers of Catan"
+HOMEPAGE="http://pio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pio/${P}.tar.gz"
+
+LICENSE="GPL-2 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated help nls"
+
+# dev-util/gob only for autoreconf
+RDEPEND="
+ >=dev-libs/glib-2.28:2
+ !dedicated? (
+ >=x11-libs/gtk+-3.22:3
+ >=x11-libs/libnotify-0.7.4
+ help? ( app-text/yelp-tools )
+ )
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/gob:2
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog README TODO NEWS )
+
+PATCHES=( "${FILESDIR}/${P}-fno-common.patch" )
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable nls) \
+ $(use_enable help) \
+ --includedir=/usr/include \
+ $(use_with !dedicated gtk)
+}
+
+src_install() {
+ gnome2_src_install scrollkeeper_localstate_dir="${ED%/}"/var/lib/scrollkeeper/
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pioneers/files/, games-board/pioneers/
@ 2021-08-12 17:58 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-08-12 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 57de01f121e9f2c9c882b892fcbe1222cec92569
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 12 17:10:42 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 17:58:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57de01f1
games-board/pioneers: Drop 15.5
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
games-board/pioneers/Manifest | 1 -
.../pioneers/files/pioneers-15.5-fno-common.patch | 12 ------
games-board/pioneers/pioneers-15.5.ebuild | 47 ----------------------
3 files changed, 60 deletions(-)
diff --git a/games-board/pioneers/Manifest b/games-board/pioneers/Manifest
index d9b0752862d..4d63012252d 100644
--- a/games-board/pioneers/Manifest
+++ b/games-board/pioneers/Manifest
@@ -1,2 +1 @@
-DIST pioneers-15.5.tar.gz 4975627 BLAKE2B 8cae5df3e122743819196f0442ba18cedcfd4fee51d9e76ef4137f120e3429456f58ca9d6e537b8e0206c937d882b4a22d76ae333a7d5d7dc69d65f7bbd94b18 SHA512 a3261197348d7e994da81ad4948755520bf29678614a9ea2b2cacc81622093c6460b0cee671a04c125684d88a9ee1deb9206ccb73ab1440be1a1505e24b2ed2a
DIST pioneers-15.6.tar.gz 5054353 BLAKE2B 0e6cbe51a801c3eb84b8f4f08359f9d1d166e6ae1c8e66e748d15214d23a9f11b9deea7645778d453e32ea2dc171bca2d70b2f54fb88e5f50e9d0726bdff7a0e SHA512 683ba851d4dc85244edea7f9b183d6c9b7ef93cdc948f3375f8434f2f455ac0a3688a6a914ab8ad8a86d5067bba8f563c181ef8c8ccf00df6a985e801dc1c213
diff --git a/games-board/pioneers/files/pioneers-15.5-fno-common.patch b/games-board/pioneers/files/pioneers-15.5-fno-common.patch
deleted file mode 100644
index 5d8522b772e..00000000000
--- a/games-board/pioneers/files/pioneers-15.5-fno-common.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up a/common/game.h.me b/common/game.h
---- a/common/game.h.me 2020-02-06 12:05:24.472403768 +0100
-+++ b/common/game.h 2020-02-06 12:05:45.662644226 +0100
-@@ -137,7 +137,7 @@ typedef enum {
- typedef void (*WriteLineFunc) (gpointer user_data, const gchar *);
-
- /** Default style for a player. */
--const gchar *default_player_style;
-+extern const gchar *default_player_style;
-
- GameParams *params_new(void);
- GameParams *params_copy(const GameParams * params);
diff --git a/games-board/pioneers/pioneers-15.5.ebuild b/games-board/pioneers/pioneers-15.5.ebuild
deleted file mode 100644
index bb0f050eb11..00000000000
--- a/games-board/pioneers/pioneers-15.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Clone of the popular board game The Settlers of Catan"
-HOMEPAGE="http://pio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pio/${P}.tar.gz"
-
-LICENSE="GPL-2 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated help nls"
-
-# dev-util/gob only for autoreconf
-RDEPEND="
- >=dev-libs/glib-2.28:2
- !dedicated? (
- >=x11-libs/gtk+-3.22:3
- >=x11-libs/libnotify-0.7.4
- help? ( app-text/yelp-tools )
- )
- nls? ( virtual/libintl )"
-DEPEND="
- ${RDEPEND}
- dev-util/gob:2
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS ChangeLog README TODO NEWS )
-
-PATCHES=( "${FILESDIR}/${P}-fno-common.patch" )
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable nls) \
- $(use_enable help) \
- --includedir=/usr/include \
- $(use_with !dedicated gtk)
-}
-
-src_install() {
- gnome2_src_install scrollkeeper_localstate_dir="${ED%/}"/var/lib/scrollkeeper/
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-12 17:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-02 0:03 [gentoo-commits] repo/gentoo:master commit in: games-board/pioneers/files/, games-board/pioneers/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-08-12 17:58 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox