[gentoo-commits] repo/gentoo:master commit in: games-strategy/hedgewars/, games-strategy/hedgewars/files/
commit: 35a25bedc6e7aba337607aae0e851124ec7495c9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 13 19:48:45 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 13 20:53:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35a25bed games-strategy/hedgewars: Fix build with CMake 3.24 ...caused by the package copying internal CMake modules... Closes: https://bugs.gentoo.org/870010 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/hedgewars-1.0.0-cmake-3.24.patch | 122 + .../hedgewars/hedgewars-1.0.0-r100.ebuild | 4 +- 2 files changed, 125 insertions(+), 1 deletion(-) diff --git a/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch b/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch new file mode 100644 index ..7c76e4854f50 --- /dev/null +++ b/games-strategy/hedgewars/files/hedgewars-1.0.0-cmake-3.24.patch @@ -0,0 +1,122 @@ +Description: Cherry-pick change 42f7e397894c5132b4706f478e62ce5d648119c1 into our custom embedded version +Author: Gianfranco Costamagna +Forwarded: irc +Last-Update: 2022-08-05 + +--- hedgewars-1.0.0.orig/cmake_modules/CMakeSystemSpecificInformation.cmake hedgewars-1.0.0/cmake_modules/CMakeSystemSpecificInformation.cmake +@@ -1,70 +1,6 @@ +-# XXX Emscripten: +-# This file is copied as-is from the CMake source tree. Due to how CMake +-# platform toolchain files work, we must have a copy of this file located +-# relative to Emscripten platform toolchain file, or file inclusion order +-# in cmGlobalGenerator::EnableLanguage will not find Emscripten.cmake +-# toolchain file, and as a result, it is not possible to set the default +-# compilation output suffix to .js, and as a consequence the script +-# check_function_exists() will not function properly (it will try to +-# build to wrong file suffix) +- +-# CMake - Cross Platform Makefile Generator +-# Copyright 2000-2014 Kitware, Inc. +-# Copyright 2000-2011 Insight Software Consortium +-# All rights reserved. +- +-# Redistribution and use in source and binary forms, with or without +-# modification, are permitted provided that the following conditions +-# are met: +- +-# * Redistributions of source code must retain the above copyright +-# notice, this list of conditions and the following disclaimer. +- +-# * Redistributions in binary form must reproduce the above copyright +-# notice, this list of conditions and the following disclaimer in the +-# documentation and/or other materials provided with the distribution. +- +-# * Neither the names of Kitware, Inc., the Insight Software Consortium, +-# nor the names of their contributors may be used to endorse or promote +-# products derived from this software without specific prior written +-# permission. +- +-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- +-# -- +- +-# The above copyright and license notice applies to distributions of +-# CMake in source and binary form. Some source files contain additional +-# notices of original copyright by their contributors; see each source +-# for details. Third-party software packages supplied with CMake under +-# compatible licenses provide their own copyright notices documented in +-# corresponding subdirectories. +- +-# -- +- +-# CMake was initially developed by Kitware with the following sponsorship: +- +-# * National Library of Medicine at the National Institutes of Health +-#as part of the Insight Segmentation and Registration Toolkit (ITK). +- +-# * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel +-#Visualization Initiative. +- +-# * National Alliance for Medical Image Computing (NAMIC) is funded by the +-#National Institutes of Health through the NIH Roadmap for Medical Research, +-#Grant U54 EB005149. ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. + +-# * Kitware, Inc. + + # This file is included by cmGlobalGenerator::EnableLanguage. +
[gentoo-commits] repo/gentoo:master commit in: games-strategy/hedgewars/, games-strategy/hedgewars/files/
commit: 9730ea41e42bac643aebba00f2a7ada845c90443
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu May 31 20:23:21 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu May 31 21:16:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9730ea41
games-strategy/hedgewars: Drop 0.9.23 and obsolete patches
Package-Manager: Portage-2.3.40, Repoman-2.3.9
games-strategy/hedgewars/Manifest | 2 -
.../hedgewars/files/hedgewars-0.9.23-qt5-1.patch | 81
.../hedgewars/files/hedgewars-0.9.23-qt5-2.patch | 441 -
.../files/hedgewars-0.9.23-settings-saving.patch | 134 ---
.../hedgewars/hedgewars-0.9.23-r3.ebuild | 91 -
5 files changed, 749 deletions(-)
diff --git a/games-strategy/hedgewars/Manifest
b/games-strategy/hedgewars/Manifest
index 9db52a1d12c..37090b09032 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,4 +1,2 @@
-DIST hedgewars-src-0.9.23.tar.bz2 173042171 BLAKE2B
8458cce459e59227a92f70a1a1593ce0e222030f519e554bea067890394322e8346d062a8552472280401272691d5ebb4c2e85d9e8824b3513d70d24cca4b880
SHA512
b9bcd6d32c7bb97c2766aacbc759dd48b7a4c7a72003ab2bf31cdfac94a6e08de740a689458c276d3c35b90e89a1af6c200f98f463e9554e8b176b5706dc3090
DIST hedgewars-src-0.9.24.1.tar.bz2 175069915 BLAKE2B
5c49b91b9a77a110a7bc8667f9621c92d638950071c8db7493b7797c2e504a214052fad6ae8554d844146eecabd794529891aebf4e54ee73f8a447ab11c6c7da
SHA512
b0b166c807e0d08a763e5e88e178d6e629baa420685bbfe381db7b5ecf003175892f8c2e3b75f1f6d7663335bd5b417d1a2afdc89b9d56b348b056ee3490ed2f
-DIST hedgewars_0.9.22-dfsg-7.debian.tar.xz 79016 BLAKE2B
dda854b87db808520e3b6405e6eb28db085d23b78e4cdcce25a94992bc2551e2436401766cc39bf52fb7c5ad0e946a9792cc333813454fdfd615d2569e3fb16a
SHA512
011d44989b6fcad9ae7a20fcb11a4e2b9a75d1ace6c6e4c2139cd7e67f13ea21d90b6c8a7afb76fa9a06c32537b00b8b4b7689967b3019300e93a7a6fe3e0fbf
DIST hedgewars_0.9.23-dfsg-2.debian.tar.xz 77488 BLAKE2B
5de6fa2ad91f1346f679d07b3b445bd119d2cdd3c715ace20fc36abe726330ccf9a9b69ec56c58cfca4cc6256ff248b0cc0b0e27caf2a79df0f1662ea7727e8e
SHA512
03680446930279178ddff85a87fc27b7c26ad6d850c8f26571517ebbd6dff296db216da6b56d4bd55c659786bc5c76e2b67a63052ee38e150655e60c08f7c491
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-1.patch
b/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-1.patch
deleted file mode 100644
index fdd15108b5d..000
--- a/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-1.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-# User unc0rr
-# Node ID 8869b5256720f0378bf9d5edc68ecb7e1f376039
-Configure for Qt5
-
a/QTfrontend/CMakeLists.txtMon Jan 15 12:15:56 2018 -0500
-+++ b/QTfrontend/CMakeLists.txtWed Jan 24 21:05:34 2018 +0100
-@@ -1,24 +1,6 @@
--# Configure for Qt4
--set(QT_MIN_VERSION "4.7.0")
--include(CheckLibraryExists)
-+find_package(Qt5 COMPONENTS Core Gui Network Widgets)
-
--set(QT_USE_QTCORE TRUE)
--set(QT_USE_QTGUI TRUE)
--set(QT_USE_QTNETWORK TRUE)
--set(QT_USE_QTSVG FALSE)
--set(QT_USE_QTXML FALSE)
--set(QT_USE_QTOPENGL FALSE)
--set(QT_USE_QTMAIN TRUE)
--
--find_package(Qt4 REQUIRED)
--include(${QT_USE_FILE})
--
--# https://bugreports.qt-project.org/browse/QTBUG-17333
--if(APPLE AND
-- ${QTVERSION} VERSION_GREATER "4.7.0" AND
-- ${QTVERSION} VERSION_LESS "4.7.4")
-- message(FATAL_ERROR "This version of Qt is known *not* to work, please
update or use a lower version")
--endif()
-+include(CheckLibraryExists)
-
- find_package(SDL2 REQUIRED)
- find_package(SDL2_mixer 2 REQUIRED) #audio in SDLInteraction
-@@ -159,9 +141,9 @@
- endif()
- endif()
-
--qt4_add_resources(hwfr_rez_src ${hwfr_rez})
-+qt5_add_resources(hwfr_rez_src ${hwfr_rez})
-
--qt4_wrap_cpp(hwfr_moc_srcs ${hwfr_moc_hdrs})
-+qt5_wrap_cpp(hwfr_moc_srcs ${hwfr_moc_hdrs})
-
-
- if(APPLE)
-@@ -198,14 +180,14 @@
-
- list(APPEND HW_LINK_LIBS
- physfs physlayer
--${QT_LIBRARIES}
-+Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets
- )
-
- list(APPEND HW_LINK_LIBS
- ${SDL2_LIBRARY}
- ${SDL2_MIXER_LIBRARIES}
- )
--
-+
- if(WIN32 AND NOT UNIX)
- if(NOT SDL2_LIBRARY)
- list(APPEND HW_LINK_LIBS SDL2)
a/share/hedgewars/Data/Locale/CMakeLists.txt Mon Jan 15 12:15:56
2018 -0500
-+++ b/share/hedgewars/Data/Locale/CMakeLists.txt Wed Jan 24 21:05:34
2018 +0100
-@@ -1,5 +1,4 @@
--find_package(Qt4 REQUIRED)
--include(${QT_USE_FILE})
-+find_package(Qt5 COMPONENTS LinguistTools)
-
- file(GLOB txttrans2 ??.txt)
- file(GLOB txttrans5 ?.txt)
-@@ -9,7 +8,7 @@
- file(GLOB campaignfiles campaigns_*.txt)
- file(GLOB tipfiles tips_*.xml)
-
--QT4_ADD_TRANSLATION(QM ${tsfiles})
-+QT5_ADD_TRANSLATION(QM ${tsfiles})
-
- add_custom_target (release-translation ALL
- DEPENDS ${QM}
-
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-2.patch
b/games-strategy/hedgewars/files/hedgewars-0.9.23-qt5-2.patch
deleted file mode 100644
[gentoo-commits] repo/gentoo:master commit in: games-strategy/hedgewars/, games-strategy/hedgewars/files/
commit: 44d97ca6726a2091923be22883125e14b6b01b3e
Author: David Seifert gentoo org>
AuthorDate: Sun Nov 19 09:46:25 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Nov 19 10:50:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d97ca6
games-strategy/hedgewars: Remove RPATHs
Package-Manager: Portage-2.3.14, Repoman-2.3.6
.../hedgewars/files/hedgewars-0.9.22-rpath-fix.patch | 10 ++
games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild| 4
2 files changed, 14 insertions(+)
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
new file mode 100644
index 000..332c0c3ce4a
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
@@ -0,0 +1,10 @@
+diff -up hedgewars-src-0.9.22/cmake_modules/paths.cmake~
hedgewars-src-0.9.22/cmake_modules/paths.cmake
+--- hedgewars-src-0.9.22/cmake_modules/paths.cmake~2015-12-02
15:02:38.0 +0100
hedgewars-src-0.9.22/cmake_modules/paths.cmake 2015-12-02
15:15:24.729980850 +0100
+@@ -67,5 +67,5 @@ else(APPLE AND NOT (${CMAKE_INSTALL_PREF
+ # - the third one is the full path of the system dir
+ #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
+ #skip this if the install prefix is the standard one
+-set(CMAKE_INSTALL_RPATH
"$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
++#set(CMAKE_INSTALL_RPATH
"$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
+ endif(APPLE)
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
index d7016bea411..d447ec2bd15 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
@@ -46,6 +46,7 @@ RDEPEND="${CDEPEND}
>=media-fonts/dejavu-2.28"
S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch )
src_prepare() {
while IFS="" read -r f ; do
@@ -64,6 +65,9 @@ src_configure() {
-DNOSERVER=TRUE
-DCMAKE_VERBOSE_MAKEFILE=TRUE
-DPHYSFS_SYSTEM=ON
+ # upstream sets RPATH that leafs to weird breakage
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1200193
+ -DCMAKE_SKIP_RPATH=ON
)
cmake-utils_src_configure
}
