From patchwork Thu Dec 20 20:57:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 504 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 98664169AD; Thu, 20 Dec 2018 20:59:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id C7647169AB for ; Thu, 20 Dec 2018 20:59:09 +0000 (GMT) Received: from localhost ([::1]:39830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga5PQ-0007J8-N7 for patchwork@mira.cbaines.net; Thu, 20 Dec 2018 15:59:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga5PN-0007Gb-6w for guix-patches@gnu.org; Thu, 20 Dec 2018 15:59:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ga5PJ-0006x8-TU for guix-patches@gnu.org; Thu, 20 Dec 2018 15:59:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52521) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ga5PJ-0006wr-Ph for guix-patches@gnu.org; Thu, 20 Dec 2018 15:59:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ga5PJ-0002GX-OG for guix-patches@gnu.org; Thu, 20 Dec 2018 15:59:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33814] [PATCH] gnu: meandmyshadow: Update to 10.5a. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Dec 2018 20:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33814@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15453394948651 (code B ref -1); Thu, 20 Dec 2018 20:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Dec 2018 20:58:14 +0000 Received: from localhost ([127.0.0.1]:56779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ga5OX-0002FR-HY for submit@debbugs.gnu.org; Thu, 20 Dec 2018 15:58:13 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ga5OV-0002FF-H7 for submit@debbugs.gnu.org; Thu, 20 Dec 2018 15:58:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ga5OP-0005qK-9e for submit@debbugs.gnu.org; Thu, 20 Dec 2018 15:58:06 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:44773) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ga5OP-0005q6-50 for submit@debbugs.gnu.org; Thu, 20 Dec 2018 15:58:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga5OO-0006dU-58 for guix-patches@gnu.org; Thu, 20 Dec 2018 15:58:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ga5OJ-0005g7-Dv for guix-patches@gnu.org; Thu, 20 Dec 2018 15:58:03 -0500 Received: from mout01.posteo.de ([185.67.36.65]:49434) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ga5OG-0005YJ-LP for guix-patches@gnu.org; Thu, 20 Dec 2018 15:57:57 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id DCA1116005F for ; Thu, 20 Dec 2018 21:57:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1545339473; bh=fTLT8cgOUKQZhYfYnIIjtlrPW1hG1sgUvzmrWuakoXg=; h=From:To:Cc:Subject:Date:From; b=L8qQyMr8j/Y1qVe2WwZwKvOzE+LXdsnVodWUJxrNTiifOKesfw7fcSDt/e1yokwE2 NeHrIpLWS/edPAPyEyaWaFGEVkFeBp12f6OodYr96EHLgboPzrepKzhH4mKA41TYxu JGpHfG5a89D1pe3aFHKwoTH2oniC0GyfPKtNmpSuPnBKgGZZa+y0F/4+QSyP5Q7dz/ EL6i37glTWMmHkTjC+Jfw8MrpjLXOJ5GyLlZ0kWzFJLbWI3bCqDNalspLFPuD2B0OR Sb+IqmJ9IsVgKVI5a6J3Nw+INqkt97+WBzxAN239ueRBNwS/wTXI4cMIMYsbvpb9rP 70KCufEU8NzmQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 43LPGm6m3sz6tmB; Thu, 20 Dec 2018 21:57:52 +0100 (CET) From: Kei Kebreau Date: Thu, 20 Dec 2018 15:57:41 -0500 Message-Id: <20181220205741.14493-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kei Kebreau Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (meandmyshadow): Update to 10.5a. [source]: Remove patch. * gnu/local.mk (dist_patch_DATA): Unregister patch. * gnu/packages/patches/meandmyshadow-define-paths-earlier.patch: Delete file. --- gnu/local.mk | 1 - gnu/packages/games.scm | 7 +-- .../meandmyshadow-define-paths-earlier.patch | 50 ------------------- 3 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/meandmyshadow-define-paths-earlier.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8e1ce88bc..5f6826e27 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -965,7 +965,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ - %D%/packages/patches/meandmyshadow-define-paths-earlier.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 04521d399..55817dc75 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -573,7 +573,7 @@ automata. The following features are available: (define-public meandmyshadow (package (name "meandmyshadow") - (version "0.5") + (version "0.5a") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/meandmyshadow/" @@ -581,10 +581,7 @@ automata. The following features are available: "-src.tar.gz")) (sha256 (base32 - "1b6qf83vdfv8jwn2jq9ywmda2qn2f5914i7mwfy04m17wx593m3m")) - (patches (search-patches - ;; This will not be needed in the next release. - "meandmyshadow-define-paths-earlier.patch")))) + "0i98v6cgmpsxy7mbb0s2y6f6qq6mkwzk2nrv1nz39ncf948aky2h")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; there are no tests diff --git a/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch b/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch deleted file mode 100644 index 505cbd23f..000000000 --- a/gnu/packages/patches/meandmyshadow-define-paths-earlier.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Wed, 31 Oct 2018 02:24:26 +0100 -Subject: [PATCH] gnu: meandmyshadow: Define paths earlier. - -The following patch was taken verbatim from the upstream repository[0] -and will be included in the next release. - -[0]: https://github.com/acmepjz/meandmyshadow/pull/29 ---- -From 4847e6b5755258a1e0534f2d4b91dce2ce3b459e Mon Sep 17 00:00:00 2001 -From: Dmitry Marakasov -Date: Wed, 24 Oct 2018 23:31:19 +0300 -Subject: [PATCH] Define paths earlier in CMakeLists.txt - -At the very least, paths should be defined before Configure_File(), otherwise empty DATAROOTDIR is substituted in config.h ---- - CMakeLists.txt | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e79639a..6321d9d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,6 +2,13 @@ Project (meandmyshadow) - CMake_Minimum_Required (VERSION 3.1) - Set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") - -+#Path options -+Set (BINDIR "bin" CACHE STRING "Where to install binaries") -+Set (DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location") -+Set (ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.") -+Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.") -+ -+#Options - Option (DEBUG_MODE "Compile the game with debug mode enabled" OFF) - Option (DISABLED_DEBUG_STUFF "Enable this you'll see a lot of annoying script debug messages which will lag the game." OFF) - -@@ -164,12 +171,6 @@ Target_Link_Libraries ( - ${LUA_LIBRARIES} - ) - --#Path options --Set (BINDIR "bin" CACHE STRING "Where to install binaries") --Set (DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location") --Set (ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.") --Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.") -- - #Install locations - Install (DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${DATAROOTDIR}/meandmyshadow/) - Install (FILES AUTHORS DESTINATION ${DATAROOTDIR}/meandmyshadow/)