[gentoo-commits] repo/gentoo:master commit in: games-strategy/julius/files/, games-strategy/julius/

[gentoo-commits] repo/gentoo:master commit in: games-strategy/julius/files/, games-strategy/julius/

[James Le Cuirot]

commit:     2ecbc25f3925991ea36559f0b0e25fa634c34a02
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Tue May  5 19:59:34 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 22:41:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ecbc25f

games-strategy/julius: new package

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
Closes: https://github.com/gentoo/gentoo/pull/15660
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-strategy/julius/Manifest            |  1 +
 games-strategy/julius/files/90julius.sh   |  2 ++
 games-strategy/julius/julius-1.4.1.ebuild | 42 +++++++++++++++++++++++++++++++
 games-strategy/julius/metadata.xml        | 25 ++++++++++++++++++
 4 files changed, 70 insertions(+)

diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest
new file mode 100644
index 00000000000..1e31cd76e50
--- /dev/null
+++ b/games-strategy/julius/Manifest
@@ -0,0 +1 @@
+DIST julius-1.4.1.tar.gz 8592785 BLAKE2B 8eb91522fccdee33600b02de766727beb19f138c0f695eb92aaa77ea2f25ec293906d0c75d31d42159097a12317ba38b22c01e7edf722670f51fe56d625d9ae7 SHA512 8488cee4a229299fd771f7ebddf076888b2e11458b2edbb6058b29b1f7e79d372ec2f913df3afacd8191551ba692a900508e64661ead1029916e28f356f79f7b

diff --git a/games-strategy/julius/files/90julius.sh b/games-strategy/julius/files/90julius.sh
new file mode 100644
index 00000000000..e88111f8994
--- /dev/null
+++ b/games-strategy/julius/files/90julius.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+alias julius-game='julius-game ~/.cache/julius/app'

diff --git a/games-strategy/julius/julius-1.4.1.ebuild b/games-strategy/julius/julius-1.4.1.ebuild
new file mode 100644
index 00000000000..06b33f139f8
--- /dev/null
+++ b/games-strategy/julius/julius-1.4.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Feature-faithful open source re-implementation of Caesar III"
+HOMEPAGE="https://github.com/bvschaik/julius"
+SRC_URI="https://github.com/bvschaik/julius/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	media-libs/libpng:0=
+	media-libs/libsdl2[joystick,video,sound]
+	media-libs/sdl2-mixer
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /etc/profile.d
+	doins "${FILESDIR}"/90julius.sh
+	cmake_src_install
+	mv "${ED}"/usr/bin/julius  "${ED}"/usr/bin/julius-game ||
+		die "Failed to rename executable (required as per conflict with app-accessibility/julius)"
+}
+
+pkg_postinst() {
+	ewarn "Julius requires you to download the original Caesar 3 resources."
+	ewarn
+	ewarn "You need to obtain these files from a vendor of the proprietary software."
+	ewarn "You will then need to copy the 'app' directory into '~/.cache/julius/'."
+	ewarn "One way to obtain this directory is to download the GOG Cesar 3 edition."
+	ewarn "You can then produce this directory by running:"
+	ewarn "    innoextract -m setup_caesar3_2.0.0.9.exe"
+	ewarn
+	ewarn "Lastly, run 'source /etc/profile' to refresh your environment and be able"
+	ewarn "to start the game directly by running 'julius-game' in the command line."
+}

diff --git a/games-strategy/julius/metadata.xml b/games-strategy/julius/metadata.xml
new file mode 100644
index 00000000000..88f523bf415
--- /dev/null
+++ b/games-strategy/julius/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>chr@chymera.eu</email>
+		<name>Horea Christian</name>
+	</maintainer>
+	<longdescription lang="en">
+		The aim of this project is to create an open-source version of
+		Caesar 3, with the same logic as the original, but with some UI
+		enhancements, that is able to be played on multiple platforms.
+		The same logic means that the saved games are 100% compatible,
+		and any gameplay bugs present in the original Caesar 3 game will
+		also be present in Julius. It is meant as a drop-in replacement
+		for Caesar 3, with the same look and feel, so there will be no
+		major UI changes.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">bvschaik/julius</remote-id>
+	</upstream>
+</pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: games-strategy/julius/files/, games-strategy/julius/

[Ionen Wolkens]

commit:     bb24b14931750caa8c0b10e4685e8daf687df566
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 22:06:25 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 22:25:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb24b149

games-strategy/julius: drop 1.4.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-strategy/julius/Manifest            |  1 -
 games-strategy/julius/files/90julius.sh   |  2 --
 games-strategy/julius/julius-1.4.1.ebuild | 48 -------------------------------
 3 files changed, 51 deletions(-)

diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest
index 34cd813e85f..6431ef394db 100644
--- a/games-strategy/julius/Manifest
+++ b/games-strategy/julius/Manifest
@@ -1,2 +1 @@
-DIST julius-1.4.1.tar.gz 8592785 BLAKE2B 8eb91522fccdee33600b02de766727beb19f138c0f695eb92aaa77ea2f25ec293906d0c75d31d42159097a12317ba38b22c01e7edf722670f51fe56d625d9ae7 SHA512 8488cee4a229299fd771f7ebddf076888b2e11458b2edbb6058b29b1f7e79d372ec2f913df3afacd8191551ba692a900508e64661ead1029916e28f356f79f7b
 DIST julius-1.6.0.tar.gz 6884324 BLAKE2B 142f05b8f7165e59678fc56fcdf9e2c00aea880540e16fedc627ed40afb4ce96511d99f0cd99f99997d8d66f776e6d847cc66256fafde771345948ba097b940e SHA512 c21256b9f126011b0961411209d354e713e6de44a30c190a7de5e0a702636961ad0775beb171b17767ec70e334e6101f9c1ad26df6860b4f4d59d74510083905

diff --git a/games-strategy/julius/files/90julius.sh b/games-strategy/julius/files/90julius.sh
deleted file mode 100644
index e88111f8994..00000000000
--- a/games-strategy/julius/files/90julius.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-alias julius-game='julius-game ~/.cache/julius/app'

diff --git a/games-strategy/julius/julius-1.4.1.ebuild b/games-strategy/julius/julius-1.4.1.ebuild
deleted file mode 100644
index dc3f63777c1..00000000000
--- a/games-strategy/julius/julius-1.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="Feature-faithful open source re-implementation of Caesar III"
-HOMEPAGE="https://github.com/bvschaik/julius"
-SRC_URI="https://github.com/bvschaik/julius/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND="
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,video,sound]
-	media-libs/sdl2-mixer
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.1-rename.patch
-)
-
-src_install() {
-	insinto /etc/profile.d
-	doins "${FILESDIR}"/90julius.sh
-	cmake_src_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ewarn "Julius requires you to download the original Caesar 3 resources."
-	ewarn
-	ewarn "You need to obtain these files from a vendor of the proprietary software."
-	ewarn "You will then need to copy the 'app' directory into '~/.cache/julius/'."
-	ewarn "One way to obtain this directory is to download the GOG Cesar 3 edition."
-	ewarn "You can then produce this directory by running:"
-	ewarn "    innoextract -m setup_caesar3_2.0.0.9.exe"
-	ewarn
-	ewarn "Lastly, run 'source /etc/profile' to refresh your environment and be able"
-	ewarn "to start the game directly by running 'julius-game' in the command line."
-}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/julius/files/, games-strategy/julius/

[Sam James]

commit:     b5bc12613a5c80d15642ffaa13f421330674fff3
Author:     brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon Jul 11 15:42:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 01:24:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bc1261

games-strategy/julius: Fix building on musl

execinfo is not available on musl, hence only include that header on
GLIBC systems

Closes: https://bugs.gentoo.org/829246

Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26349
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../julius/files/julius-1.6.0-musl-fix-execinfo.patch      | 14 ++++++++++++++
 games-strategy/julius/julius-1.6.0.ebuild                  |  1 +
 2 files changed, 15 insertions(+)

diff --git a/games-strategy/julius/files/julius-1.6.0-musl-fix-execinfo.patch b/games-strategy/julius/files/julius-1.6.0-musl-fix-execinfo.patch
new file mode 100644
index 000000000000..08a136ef5cb4
--- /dev/null
+++ b/games-strategy/julius/files/julius-1.6.0-musl-fix-execinfo.patch
@@ -0,0 +1,14 @@
+# Fix building on musl
+#
+# Closes: https://bugs.gentoo.org/829246
+--- a/src/core/backtrace.c
++++ b/src/core/backtrace.c
+@@ -2,7 +2,7 @@
+
+ #include "core/log.h"
+
+-#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__)
++#if defined(__GNUC__) && defined(__GLIBC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__)
+
+ #include <execinfo.h>
+

diff --git a/games-strategy/julius/julius-1.6.0.ebuild b/games-strategy/julius/julius-1.6.0.ebuild
index 5730e843db21..9852bbf898ab 100644
--- a/games-strategy/julius/julius-1.6.0.ebuild
+++ b/games-strategy/julius/julius-1.6.0.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.1-rename.patch
+	"${FILESDIR}"/${PN}-1.6.0-musl-fix-execinfo.patch
 )
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: games-strategy/julius/files/, games-strategy/julius/

[James Le Cuirot]

commit:     950c89b972aa979dfc4ccd1a1b8c9c616953c962
Author:     okarfi <magi7936 <AT> proton <DOT> me>
AuthorDate: Fri Aug 25 00:11:33 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 23:36:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950c89b9

games-strategy/julius: add 1.7.0, drop 1.6.0

Signed-off-by: okarfi <magi7936 <AT> proton.me>
Closes: https://github.com/gentoo/gentoo/pull/32441
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-strategy/julius/Manifest                         |  2 +-
 games-strategy/julius/files/julius-1.4.1-rename.patch  | 18 +++++++++---------
 .../julius/files/julius-1.6.0-musl-fix-execinfo.patch  | 15 ++++++++-------
 .../{julius-1.6.0.ebuild => julius-1.7.0.ebuild}       |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest
index 6431ef394dba..b42038585c67 100644
--- a/games-strategy/julius/Manifest
+++ b/games-strategy/julius/Manifest
@@ -1 +1 @@
-DIST julius-1.6.0.tar.gz 6884324 BLAKE2B 142f05b8f7165e59678fc56fcdf9e2c00aea880540e16fedc627ed40afb4ce96511d99f0cd99f99997d8d66f776e6d847cc66256fafde771345948ba097b940e SHA512 c21256b9f126011b0961411209d354e713e6de44a30c190a7de5e0a702636961ad0775beb171b17767ec70e334e6101f9c1ad26df6860b4f4d59d74510083905
+DIST julius-1.7.0.tar.gz 6448466 BLAKE2B 28318909fca51793585b3d1050da6b63713aacf9813153daa19b872e9760671864cd6393889c707b22b4f8cf4e9077897f86f9faef1991729089912e22a5f0f6 SHA512 a53ff848fe3ef659be96913357b9e435125ab30b41db2fa7e43d80d0dd2dce0be150403e0a1d7b79b03d48f785f612abf06695e0795cb26431d58e5ddf8ac313

diff --git a/games-strategy/julius/files/julius-1.4.1-rename.patch b/games-strategy/julius/files/julius-1.4.1-rename.patch
index cf6b6d53aadd..a477e1d0c939 100644
--- a/games-strategy/julius/files/julius-1.4.1-rename.patch
+++ b/games-strategy/julius/files/julius-1.4.1-rename.patch
@@ -1,20 +1,20 @@
-Avoid conflict with app-accessibility/julius.
+Avoid conflict with app-accessibility/julius
 
-diff --color -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-06-01 14:53:28.000000000 +0100
-+++ b/CMakeLists.txt	2021-02-14 11:51:30.364704957 +0000
-@@ -27,7 +27,7 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,7 +37,7 @@ if(${TARGET_PLATFORM} STREQUAL "emscripten" AND NOT DEFINED CMAKE_TOOLCHAIN_FILE
      endif()
  endif()
  
 -set(SHORT_NAME julius)
 +set(SHORT_NAME julius-game)
+ set(USER_FRIENDLY_NAME Julius)
  project(${SHORT_NAME} C)
  
- if (VITA_BUILD)
-diff --color -Naur a/res/julius.desktop b/res/julius.desktop
---- a/res/julius.desktop	2020-06-01 14:53:28.000000000 +0100
-+++ b/res/julius.desktop	2021-02-14 11:51:45.518122772 +0000
+diff --git a/res/julius.desktop b/res/julius.desktop
+--- a/res/julius.desktop
++++ b/res/julius.desktop
 @@ -2,7 +2,7 @@
  [Desktop Entry]
  Type=Application

diff --git a/games-strategy/julius/files/julius-1.6.0-musl-fix-execinfo.patch b/games-strategy/julius/files/julius-1.6.0-musl-fix-execinfo.patch
index 08a136ef5cb4..2e554ac4c64c 100644
--- a/games-strategy/julius/files/julius-1.6.0-musl-fix-execinfo.patch
+++ b/games-strategy/julius/files/julius-1.6.0-musl-fix-execinfo.patch
@@ -1,14 +1,15 @@
 # Fix building on musl
 #
 # Closes: https://bugs.gentoo.org/829246
+diff --git a/src/core/backtrace.c b/src/core/backtrace.c
 --- a/src/core/backtrace.c
 +++ b/src/core/backtrace.c
 @@ -2,7 +2,7 @@
-
+ 
  #include "core/log.h"
-
--#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__)
-+#if defined(__GNUC__) && defined(__GLIBC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__)
-
- #include <execinfo.h>
-
+ 
+-#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && \
++#if defined(__GNUC__) && defined(__GLIBC__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && \
+     !defined(__vita__) && !defined(__SWITCH__) && !defined(__ANDROID__) && \
+     !defined(__HAIKU__) && !defined(__EMSCRIPTEN__)
+ 

diff --git a/games-strategy/julius/julius-1.6.0.ebuild b/games-strategy/julius/julius-1.7.0.ebuild
similarity index 96%
rename from games-strategy/julius/julius-1.6.0.ebuild
rename to games-strategy/julius/julius-1.7.0.ebuild
index 9852bbf898ab..6b022059c775 100644
--- a/games-strategy/julius/julius-1.6.0.ebuild
+++ b/games-strategy/julius/julius-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7