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
