* [gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/, games-util/grfcodec/files/
@ 2020-10-22 21:09 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2020-10-22 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 33caed6639914466158fa7c7a16b8e09773a473e
Author: Matt Smith <matt <AT> offtopica <DOT> uk>
AuthorDate: Sat Oct 17 13:53:18 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 21:08:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33caed66
games-util/grfcodec: Fix build failure with GCC 10
Patch taken from Fedora's grfcodec package.
Closes: https://bugs.gentoo.org/707758
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Matt Smith <matt <AT> offtopica.uk>
Closes: https://github.com/gentoo/gentoo/pull/17954
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch | 12 ++++++++++++
games-util/grfcodec/grfcodec-6.0.6.ebuild | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch b/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch
new file mode 100644
index 00000000000..baf84a435f6
--- /dev/null
+++ b/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch
@@ -0,0 +1,12 @@
+diff -Nrup a/src/command.cpp b/src/command.cpp
+--- a/src/command.cpp 2015-05-09 04:59:46.000000000 -0600
++++ b/src/command.cpp 2019-09-24 11:37:06.667911307 -0600
+@@ -303,7 +303,7 @@ bool parse_comment(const string&line){
+ uint val=find_command(command_part,beaut),togglebit;
+ if(val!=(uint)-1&&val!=OFF)_commandState.beautifier=true;
+ switch(val){
+- case -1:
++ case -1u:
+ IssueMessage(0,COMMAND_INVALID_ARG,gen[BEAUTIFY].name);
+ return true;
+ case OFF:_commandState.beautifier=false;break;
diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild b/games-util/grfcodec/grfcodec-6.0.6.ebuild
index ebfb9b894f6..2c4927b3755 100644
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -27,6 +27,8 @@ DEPEND="
dev-libs/boost
"
+PATCHES=("${FILESDIR}/${PN}-6.0.6-gcc10.patch")
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/, games-util/grfcodec/files/
@ 2021-06-28 22:13 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2021-06-28 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 789df6d85b151afd12798f37517bb7d85033de1b
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu May 20 21:04:57 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 22:12:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789df6d8
games-util/grfcodec: drop unused DEPEND, fix HOMEPAGE
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-util/grfcodec/Manifest | 1 -
.../grfcodec/files/grfcodec-6.0.6-gcc10.patch | 12 -----
games-util/grfcodec/grfcodec-6.0.6.ebuild | 53 ----------------------
.../grfcodec/grfcodec-6.0.6_p20210310.ebuild | 7 +--
4 files changed, 2 insertions(+), 71 deletions(-)
diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 972ea1e8461..4cd8f5110c3 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1,2 +1 @@
-DIST grfcodec-6.0.6-source.tar.xz 166820 BLAKE2B ba81e31477fb15bb5273add4d993ee7de88cfd47fd8300743e97c4abd19b0daf736d78b5bafc82569ff110757131501c07d7365a4e7ffde8d3a7fcc2e277bada SHA512 543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480
DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e SHA512 10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8
diff --git a/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch b/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch
deleted file mode 100644
index baf84a435f6..00000000000
--- a/games-util/grfcodec/files/grfcodec-6.0.6-gcc10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrup a/src/command.cpp b/src/command.cpp
---- a/src/command.cpp 2015-05-09 04:59:46.000000000 -0600
-+++ b/src/command.cpp 2019-09-24 11:37:06.667911307 -0600
-@@ -303,7 +303,7 @@ bool parse_comment(const string&line){
- uint val=find_command(command_part,beaut),togglebit;
- if(val!=(uint)-1&&val!=OFF)_commandState.beautifier=true;
- switch(val){
-- case -1:
-+ case -1u:
- IssueMessage(0,COMMAND_INVALID_ARG,gen[BEAUTIFY].name);
- return true;
- case OFF:_commandState.beautifier=false;break;
diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild b/games-util/grfcodec/grfcodec-6.0.6.ebuild
deleted file mode 100644
index 6949b2d473d..00000000000
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [ "${PV%9999}" != "${PV}" ] ; then
- SCM=mercurial
- EHG_REPO_URI="http://hg.openttdcoop.org/${PN}"
-fi
-
-inherit toolchain-funcs ${SCM}
-
-DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files"
-HOMEPAGE="https://dev.openttdcoop.org/projects/grfcodec"
-[[ -z ${SCM} ]] && SRC_URI="https://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libpng:0"
-DEPEND="
- ${RDEPEND}
- !games-util/nforenum
- dev-lang/perl
- dev-libs/boost
-"
-
-PATCHES=("${FILESDIR}/${PN}-6.0.6-gcc10.patch")
-
-src_prepare() {
- default
-
- # Set up Makefile.local so that we respect CXXFLAGS/LDFLAGS
- cat > Makefile.local <<-__EOF__
- CXX=$(tc-getCXX)
- BOOST_INCLUDE=/usr/include
- CXXFLAGS=${CXXFLAGS}
- LDOPT=${LDFLAGS}
- UPX=
- V=1
- FLAGS=
- EXE=
- __EOF__
- sed -i -e 's/-O2//g' Makefile || die
-}
-
-src_install() {
- dobin grfcodec grfid grfstrip nforenum
- doman docs/*.1
- dodoc changelog.txt docs/*.txt
-}
diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
index 29b89e829a3..cab32f9d822 100644
--- a/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20210310.ebuild
@@ -8,18 +8,15 @@ inherit cmake
COMMIT=045774dee7cab1a618a3e0d9b39bff78a12b6efa
DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files"
-HOMEPAGE="https://dev.openttdcoop.org/projects/grfcodec"
+HOMEPAGE="https://github.com/OpenTTD/grfcodec"
SRC_URI="https://github.com/OpenTTD/grfcodec/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
RDEPEND="media-libs/libpng:0"
-DEPEND="
- ${RDEPEND}
- dev-lang/perl
+DEPEND="${RDEPEND}
dev-libs/boost
"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/, games-util/grfcodec/files/
@ 2023-08-11 7:26 Matthew Smith
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Smith @ 2023-08-11 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 091a3e710fc969183bbe7c4d92c8e198fae76691
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 07:05:20 2023 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 07:25:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=091a3e71
games-util/grfcodec: add 6.0.6_p20230811
Also, stop defining _FORTIFY_SOURCE.
Closes: https://bugs.gentoo.org/894648
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
games-util/grfcodec/Manifest | 1 +
...rfcodec-6.0.6_p20230811-no-fortify-source.patch | 19 ++++++++++
.../grfcodec/grfcodec-6.0.6_p20230811.ebuild | 43 ++++++++++++++++++++++
3 files changed, 63 insertions(+)
diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
index 4cd8f5110c37..06a4a62fcc28 100644
--- a/games-util/grfcodec/Manifest
+++ b/games-util/grfcodec/Manifest
@@ -1 +1,2 @@
DIST grfcodec-6.0.6_p20210310.tar.gz 205795 BLAKE2B 24d803e208b2fc465ae71611c0c0fb2737bfa8c5a28375bc08a6220581d7b07bb2f2a390e2ddb7f4beb8a80951862473919d41bce83364af70b6dc646f0f3f8e SHA512 10f4ec28c69d87e397f0fb5b497dbefce8fcd826731d3a0a864cbbd333b7df188ab0087445644ad245aeff65a8b6563dfdfa657ac1a2248e56e296c01f7d58a8
+DIST grfcodec-6.0.6_p20230811.tar.gz 205324 BLAKE2B 00d36b6785d00edec061cc0f0a695225a78c487bc66c4521f0f3da1050304bc382ed78d1df8dff8602b35b167505388ad993c46f01ac39960c131a6f5c7264eb SHA512 95a883636720ad1fdd0a2e17cba60b6cde15b5fe0337cfe2330db75d60e9a2bdb1dea3c06bb8f8acace8989b6abaf6d1845b30c5bc5f6c76f34e5aa76f36ddd4
diff --git a/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-no-fortify-source.patch b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-no-fortify-source.patch
new file mode 100644
index 000000000000..ce71610a0cad
--- /dev/null
+++ b/games-util/grfcodec/files/grfcodec-6.0.6_p20230811-no-fortify-source.patch
@@ -0,0 +1,19 @@
+From a6e90d5121cfd312df535d90d1b939d9f9c616a1 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Fri, 11 Aug 2023 07:59:54 +0100
+Subject: [PATCH] build: Remove -D_FORTIFY_SOURCE=2
+
+Bug: https://bugs.gentoo.org/894648
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,7 +47,6 @@ endif()
+ # it does not appear to support the $<> tags.
+ add_compile_options(
+ "$<$<CONFIG:Debug>:-D_DEBUG>"
+- "$<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>" # FORTIFY_SOURCE should only be used in non-debug builds (requires -O1+)
+ )
+ if(MINGW)
+ add_link_options(
+--
+2.41.0
+
diff --git a/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild b/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild
new file mode 100644
index 000000000000..9effc99b535d
--- /dev/null
+++ b/games-util/grfcodec/grfcodec-6.0.6_p20230811.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake vcs-snapshot
+
+COMMIT=d5a7b850bcef30c0bfd17ceeb4a18c431770f468
+
+DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files"
+HOMEPAGE="https://github.com/OpenTTD/grfcodec"
+SRC_URI="https://github.com/OpenTTD/grfcodec/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="media-libs/libpng:="
+DEPEND="${RDEPEND}
+ dev-libs/boost"
+
+PATCHES=(
+ # Bug #894648
+ "${FILESDIR}"/${P}-no-fortify-source.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ # Make sure we don't use git by accident.
+ # Build system does not care much if it's
+ # executed successfully and populates
+ # YEARS / VERSION with empty values.
+ -DGIT_EXECUTABLE=/bin/do-not-use-git-executable
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ dobin "${BUILD_DIR}"/{grfcodec,grfid,grfstrip,nforenum}
+ doman docs/*.1
+ dodoc changelog.txt docs/*.txt
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-11 7:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-11 7:26 [gentoo-commits] repo/gentoo:master commit in: games-util/grfcodec/, games-util/grfcodec/files/ Matthew Smith
-- strict thread matches above, loose matches on Subject: below --
2021-06-28 22:13 James Le Cuirot
2020-10-22 21:09 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox