gentoo auto-resync : 15:06:2024 - 00:09:17

4 files changed, 99 insertions, 2 deletions

diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index b2cf6fa86a4a..fb1377efe577 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,3 +1,6 @@
+AUX gource-0.53-boost-1.85.patch 1033 BLAKE2B 4dfcd1fcdf9e7a5d092136742c6fbafbe7014fda377a5a4a1c10ca2d59829aff59a4d7dd08f896a3614cb285d6df89527ec2b22fad59aad99ea4b87928c81c02 SHA512 cebeab8de0799765f92368976bf6c3ba01bb5000d73b95a69f526020dd17ab03683d845509bcdb76c95a85472a0ab8cb8445fea04a7acbc52352330ef69da521
 DIST gource-0.53.tar.gz 900932 BLAKE2B 7f2822b11b5eaeb5345ade1326702109dff120d3ef8c523a2425a84b54d357a29cfe23a9c4a253b287d570e74943cb67bb80753c6c698f9f60739735cb41769b SHA512 e4190eb581d9998808d1bb4f18ba5a3ae22bacf643b9a150c7d1607e97fca2eab720592aefdcc6a47f92adb4a8df17db48bb941a67ee3d23a10f300754f473be
-EBUILD gource-0.53.ebuild 1215 BLAKE2B 8dcd9bfdd19ebd55427df717638db5002671950515dc5c9c2540da8f93a0ee1de76f9fcbc1893b7029c6522c69712137ff6c81f10cde03fd929433c30db1d03b SHA512 6fab07354213e49a12d6aa214bbb1c4b534cea995ea62dcec8f9ab7f725c826e1c9f7033d05319dbef780659c9ffaf032d80968cb4fb69378410c85283502747
+DIST gource-0.54.tar.gz 900831 BLAKE2B be0fafa35457532b3cdc5d007ae5935189b60efc415ecd0979b25e4437d39570db90c4ac1883cc6baf7e0d25eeb9c98c2f8b6ec855ef63a874d223af09caa5d9 SHA512 a9fd2ff7c51931a543d4ab6dc85dd4b2c187ecca1be630006bb60ac2507180ccf40561e37f50493e052c839d9f5f896ae8f113fb65844c2fa9bde33fcd6b53e8
+EBUILD gource-0.53.ebuild 1272 BLAKE2B 8c1bd0bcb16ce9765d6d3a022808cc710fd178060932ba0bbcb065752ac2c8e274309ff6f5a73ef6683cd78ab9b5b794bb24d05fff9e8009b7d3b5f1f5ecc6a0 SHA512 df36fe84722ad7716efa5c1c8392004da4890a16b378c572d51601b62e2987dc644110bbb2615a578fb5b1df77c929ac26e1967c5bf2dc826048f728f026aaed
+EBUILD gource-0.54.ebuild 1266 BLAKE2B 6d55a9356ebf6deaca999328d399f60cc3abacaeb4bee9f48266a68ce89966f94cb79d233a0a3f24626c19bed65550d3dca30d83003b70701c001a76e6083329 SHA512 adb5410ca1cb09204bcb75c7ddf048e63df1c92930c67a49e7cf0c3c69fa013958a66358114096b742e883ca8efbe90df35bdf2839105f8a3c58e3ed6b9f6152
 MISC metadata.xml 300 BLAKE2B 23f7c7b46ea61159b545277ae554947169d30f4065c6c405ef99ae5e78481e0af297ef6cc4dcc1b196d7cef9f9d9a7709c240aa642f89243fe14a703a859b8ed SHA512 298f789fe6e827ce647c45ea23d5cde8df085a31f378997d37d081dae9b768c6fe79fa68dad0a4c4110d5b95f59a834d35e8757f8cef5b9806003acd38ae244f
diff --git a/dev-util/gource/files/gource-0.53-boost-1.85.patch b/dev-util/gource/files/gource-0.53-boost-1.85.patch
new file mode 100644
index 000000000000..c7a10da39b63
--- /dev/null
+++ b/dev-util/gource/files/gource-0.53-boost-1.85.patch
@@ -0,0 +1,26 @@
+Bug: https://bugs.gentoo.org/933111
+Patch: https://github.com/acaudwell/Gource/commit/79b967e0dc2a20725568492bc4fcab74a798a089
+
+From 79b967e0dc2a20725568492bc4fcab74a798a089 Mon Sep 17 00:00:00 2001
+From: Michael Cho <michael@michaelcho.dev>
+Date: Thu, 25 Apr 2024 12:38:56 -0400
+Subject: [PATCH] Fix build with Boost 1.85.0
+
+Signed-off-by: Michael Cho <michael@michaelcho.dev>
+---
+ src/gource_settings.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gource_settings.cpp b/src/gource_settings.cpp
+index 27142599..e1ab42d3 100644
+--- a/src/gource_settings.cpp
++++ b/src/gource_settings.cpp
+@@ -833,7 +833,7 @@ void GourceSettings::importGourceSettings(ConfFile& conffile, ConfSection* gourc
+ #else
+             dirfile = p.filename().string();
+ #endif
+-            std::string file_ext = extension(p);
++            std::string file_ext = p.extension().string();
+             boost::algorithm::to_lower(file_ext);
+ 
+             if(file_ext != ".jpg" && file_ext != ".jpeg" && file_ext != ".png") continue;
diff --git a/dev-util/gource/gource-0.53.ebuild b/dev-util/gource/gource-0.53.ebuild
index 6a0c9e75437d..3f0c25d396ef 100644
--- a/dev-util/gource/gource-0.53.ebuild
+++ b/dev-util/gource/gource-0.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,10 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( README.md ChangeLog THANKS )
 
+PATCHES=(
+	"${FILESDIR}"/gource-0.53-boost-1.85.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-util/gource/gource-0.54.ebuild b/dev-util/gource/gource-0.54.ebuild
new file mode 100644
index 000000000000..e5cd7e9c8499
--- /dev/null
+++ b/dev-util/gource/gource-0.54.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A software version control visualization tool"
+HOMEPAGE="https://gource.io/"
+SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	dev-libs/boost:=
+	>=media-libs/glew-1.5:0=
+	>=media-libs/libpng-1.2:0=
+	media-libs/libsdl2[video,opengl,X]
+	media-libs/sdl2-image[jpeg,png]
+	dev-libs/libpcre2:=
+	dev-libs/tinyxml
+	media-libs/libglvnd[X]
+	media-libs/freetype:2
+	virtual/glu:0
+"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/freefont
+"
+DEPEND="${COMMON_DEPEND}
+	>=media-libs/glm-0.9.3
+"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md ChangeLog THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/gource-0.53-boost-1.85.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "/data\/gource.1/s/^/#/" -i Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	# fix bug #386525
+	# this enables gource to be compiled against dev-libs/tinyxml[stl]
+	if has_version dev-libs/tinyxml[stl]; then
+		append-cppflags -DTIXML_USE_STL;
+	fi
+
+	econf \
+		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
+		--with-tinyxml
+}
+
+src_install() {
+	default
+	doman data/gource.1
+}