From unknown Sat Jun 14 19:26:27 2025 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 Cc: Kei Kebreau 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 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 Content-Transfer-Encoding: quoted-printable 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) * 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 f= ile. --- 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-earli= er.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 =3D \ %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.patc= h 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(), othe= rwise 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/") -=20 -+#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 directo= ry for desktop entry to a non-default location.") -+Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the de= sktop 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) -=20 -@@ -164,12 +171,6 @@ Target_Link_Libraries ( - ${LUA_LIBRARIES} - ) -=20 --#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 directo= ry for desktop entry to a non-default location.") --Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the de= sktop 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/) --=20 2.19.2 From unknown Sat Jun 14 19:26:27 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kei Kebreau Subject: bug#33814: closed (Re: [bug#33814] [PATCH] gnu: meandmyshadow: Update to 10.5a.) Message-ID: References: <20181224093854.GJ2581@macbook41> <20181220205741.14493-1-kkebreau@posteo.net> X-Gnu-PR-Message: they-closed 33814 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 33814@debbugs.gnu.org Date: Mon, 24 Dec 2018 09:40:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1545644402-7564-1" This is a multi-part message in MIME format... ------------=_1545644402-7564-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #33814: [PATCH] gnu: meandmyshadow: Update to 10.5a. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 33814@debbugs.gnu.org. --=20 33814: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D33814 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1545644402-7564-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 33814-done) by debbugs.gnu.org; 24 Dec 2018 09:39:03 +0000 Received: from localhost ([127.0.0.1]:34312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbMhS-0001wf-Vj for submit@debbugs.gnu.org; Mon, 24 Dec 2018 04:39:03 -0500 Received: from flashner.co.il ([178.62.234.194]:40244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbMhR-0001wB-O0 for 33814-done@debbugs.gnu.org; Mon, 24 Dec 2018 04:39:02 -0500 Received: from localhost (unknown [141.226.9.73]) by flashner.co.il (Postfix) with ESMTPSA id E6E13402D5 for <33814-done@debbugs.gnu.org>; Mon, 24 Dec 2018 09:38:55 +0000 (UTC) Date: Mon, 24 Dec 2018 11:38:54 +0200 From: Efraim Flashner To: 33814-done@debbugs.gnu.org Subject: Re: [bug#33814] [PATCH] gnu: meandmyshadow: Update to 10.5a. Message-ID: <20181224093854.GJ2581@macbook41> References: <20181220205741.14493-1-kkebreau@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="IuJpT0rwbUevm2bB" Content-Disposition: inline In-Reply-To: <20181220205741.14493-1-kkebreau@posteo.net> User-Agent: Mutt/1.11.0 (2018-11-25) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 33814-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --IuJpT0rwbUevm2bB Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Pushed as b70ff03e59283d77adcb2406f3dbb0eb6d2f98c3 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --IuJpT0rwbUevm2bB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAlwgqS4ACgkQQarn3Mo9 g1HUTxAApxmDtCoKbGCkFCTfnGdhwK8wXfbvdA+GX+5xymzdIJ77CxlAPf0lPw8Q yLBqa+Z8BurrqUbQzoMdfWE/8z989xKGGusqqTAdsu8+J/TmZ/FK8uN6OzfTACTW G2XeLr/t97k0iCyoo2RD/IGX0qIqZTnoyp8/6WQfLxwTc3x46YYwKT0YMFjccazN f1MTBdMTsOQggAKZp2B2jQ1JzMmHoNtESWSz6fk3xSqK6VZvu43/15GbhdI95kRe qNgnxNtk15Z3DPb5m446dFBLeudDH/SyNy5OkL0pskL0xiLQ5zMNKOyyRUY7JorE FM1ZCNoZtN/OTB7p5SEjOS1HFt+s3tT2kWLpuOiyT9UNPPdhoSdPaL/lDtALlB/7 LEoJEqYUdAVSuXhiTxpqF07M+v5zn1PbVEBIw/1wYRXf6wGyGomRFQDkiT/3Oi4B SbE6VBo1aOnCKWJ9ljMcTLL5vOUaClTcL97Dmbbv+bLthOFh/17nrtHfB3EsGYn0 ibfVPYxAPvYXd9w2MuadYvSCuRTKXBdZ3v+iY0DfeM1ett0ITrj4e3tl3DEtLiBw aOhl1PJp4nmSECrEnATm71vlpvyeifjdg44vwos+D8sNp82fa7LPT2uy317kKboJ W7MvVju/xRC1PL15h/TWTuZ+kVDrvauPaWM64vtocuJsI9FeTnI= =VgUG -----END PGP SIGNATURE----- --IuJpT0rwbUevm2bB-- ------------=_1545644402-7564-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: meandmyshadow: Update to 10.5a. 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 Content-Transfer-Encoding: quoted-printable 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) * 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 f= ile. --- 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-earli= er.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 =3D \ %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.patc= h 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(), othe= rwise 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/") -=20 -+#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 directo= ry for desktop entry to a non-default location.") -+Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the de= sktop 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) -=20 -@@ -164,12 +171,6 @@ Target_Link_Libraries ( - ${LUA_LIBRARIES} - ) -=20 --#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 directo= ry for desktop entry to a non-default location.") --Set (DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the de= sktop 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/) --=20 2.19.2 ------------=_1545644402-7564-1--