From unknown Sun Jun 22 20:55:57 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#40035 <40035@debbugs.gnu.org> To: bug#40035 <40035@debbugs.gnu.org> Subject: Status: Add widelands game Reply-To: bug#40035 <40035@debbugs.gnu.org> Date: Mon, 23 Jun 2025 03:55:57 +0000 retitle 40035 Add widelands game reassign 40035 guix-patches submitter 40035 Alberto EFG severity 40035 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 12 00:29:52 2020 Received: (at submit) by debbugs.gnu.org; 12 Mar 2020 04:29:52 +0000 Received: from localhost ([127.0.0.1]:55807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCFTe-0000B3-RT for submit@debbugs.gnu.org; Thu, 12 Mar 2020 00:29:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:44473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCFTd-0000At-54 for submit@debbugs.gnu.org; Thu, 12 Mar 2020 00:29:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37563) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCFTb-0007r1-Gp for guix-patches@gnu.org; Thu, 12 Mar 2020 00:29:44 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=BAYES_50, RAZOR2_CF_RANGE_51_100,RAZOR2_CHECK,RCVD_IN_DNSWL_MED,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCFTZ-0001F7-VT for guix-patches@gnu.org; Thu, 12 Mar 2020 00:29:43 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51400) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCFTZ-0001AH-Ah for guix-patches@gnu.org; Thu, 12 Mar 2020 00:29:41 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C5C2916005C for ; Thu, 12 Mar 2020 05:29:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.mx; s=2017; t=1583987378; bh=5MzScsjLU/MZW6jgpGJa0/BQJDDOGy1oXmNQeZfLWZw=; h=From:To:Subject:Date:From; b=Hhm7Y7i3fOcUvfj2PXSQmaSpPJC0rNBt/NaJxpR7tKekyX0BRIB7OEt4DyHeeho8R +7tl68WBED3Rf9uw4jMuJSoXr2M3Cnn4vsH/MGWDCfxwTce/z1V7av6EOMAcC/dwLb ADjGkwBjZdd7hDL1v+jQ4NHWjhe6zBHquA1zXmDub0Pg4HJSojdLeCcWDfNAPhQCLE vr4g9XBREKWXbWYhUSkbnIrmFoPlWwAPOm1E2GfQqm3PaOvUlkcs+Qb2QJMYkcrwCh IZQNrx47/2B8W5Ka7n/xNsetoIAmjCFAQbhvzuoOglqhIR2Gt6cFL2rNmACNB6lJuv nVhgUJxE1g3Mw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48dG7j3f9pz6tn8 for ; Thu, 12 Mar 2020 05:29:36 +0100 (CET) User-agent: mu4e 1.2.0; emacs 26.3 From: Alberto EFG To: guix-patches@gnu.org Subject: Add widelands game Date: Wed, 11 Mar 2020 22:29:26 -0600 Message-ID: <87o8t2gpqx.fsf@posteo.mx> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.67.36.65 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit 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: -0.7 (/) --=-=-= Content-Type: text/plain Hello. This is my first patch. I hope everything is correct, but I know there might be some mistakes. Pleaste let me know. guix lint - I ran it and I think I have no errors now. guix size - Around 1.4 gb. I am not sure what to do guix refresh --list-dependent - Nothing is dependent Building in my platform (x86_64) works Building with qemu - armhf - not working aarch64 - working i68 - working x86_64 - working --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-widelands.patch Content-Transfer-Encoding: quoted-printable >From a58ad8525f0293abbc7fd0b93214c40940b7870b Mon Sep 17 00:00:00 2001 From: Alberto Eleuterio Flores Guerrero Date: Wed, 11 Mar 2020 21:50:14 -0600 Subject: [PATCH] gnu: Add widelands. * gnu/packages/games.scm (widelands): New variable. --- gnu/packages/games.scm | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 322e309591..020d31bb70 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -46,6 +46,7 @@ ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar ;;; Copyright =C2=A9 2019 Josh Holland ;;; Copyright =C2=A9 2017, 2019 Hartmut Goebel +;;; Copyright =C2=A9 2020 Alberto Eleuterio Flores Guerrero ;;; ;;; This file is part of GNU Guix. ;;; @@ -10157,3 +10158,48 @@ best human chess grandmasters. It can be used wit= h UCI-compatible GUIs like ChessX.") (home-page "https://stockfishchess.org/") (license license:gpl3+))) + +(define-public widelands + (let ((commit "d9513d413f2558f9ef6f033a7685bf9881fbdbb3") + (revision "1")) + (package + (name "widelands") + (version (git-version "20" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/widelands/widelands.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rsm25kb60xfvib8xk2hcqbppcyjgaiax1rpxxn6vlwrx68nndqp")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f + #:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (list "-DCMAKE_BUILD_TYPE=3DRelease" + (string-append "-DCMAKE_INSTALL_PREFIX=3D" out "/bin") + (string-append "-DWL_INSTALL_BASEDIR=3D" share "/widelands") + (string-append "-DWL_INSTALL_DATADIR=3D" share "/widelands") + "-DOPTION_BUILD_WEBSITE_TOOLS=3DOFF")))) + (inputs + `(("sdl" ,(sdl-union (list sdl2 + sdl2-image + sdl2-mixer + sdl2-ttf))) + ("gettext" ,gettext-minimal) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("zlib" ,zlib) + ("boost" ,boost) + ("python" ,python) + ("glew" ,glew))) + (synopsis "Real-time strategy game") + (description + "Widelands is a free, open source real-time strategy game with + singleplayer campaigns and a multiplayer mode. The game was inspired + by Settlers II but has significantly more variety and depth to it. ") + (home-page "https://www.widelands.org/") + (license license:gpl2+)))) --=20 2.25.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 12 10:31:33 2020 Received: (at 40035) by debbugs.gnu.org; 12 Mar 2020 14:31:33 +0000 Received: from localhost ([127.0.0.1]:57629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCOs1-0004gb-By for submit@debbugs.gnu.org; Thu, 12 Mar 2020 10:31:33 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:39413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCOry-0004gK-8L for 40035@debbugs.gnu.org; Thu, 12 Mar 2020 10:31:31 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 5811820003; Thu, 12 Mar 2020 14:31:21 +0000 (UTC) From: Nicolas Goaziou To: Alberto EFG Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> Date: Thu, 12 Mar 2020 15:31:20 +0100 In-Reply-To: <87o8t2gpqx.fsf@posteo.mx> (Alberto EFG's message of "Wed, 11 Mar 2020 22:29:26 -0600") Message-ID: <87imj9skzr.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40035 Cc: 40035@debbugs.gnu.org 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.7 (-) Hello, Alberto EFG writes: > This is my first patch. Thank you, and congratulations! > +(define-public widelands > + (let ((commit "d9513d413f2558f9ef6f033a7685bf9881fbdbb3") > + (revision "1")) I suggest to add a comment explaining why we rely on a commit, and, if that makes sense, why this particular one, e.g., "No official release." > + (package > + (name "widelands") > + (version (git-version "20" revision commit)) Where is this "20" coming from? > + (source (origin Nitpick: I suggest to move `origin' to a line on its own. > + (arguments > + `(#:tests? #f Why are the tests disabled? We usually provide a comment when disabling tests. > + #:configure-flags > + (let* ((out (assoc-ref %outputs "out")) > + (share (string-append out "/share"))) > + (list "-DCMAKE_BUILD_TYPE=Release" > + (string-append "-DCMAKE_INSTALL_PREFIX=" out "/bin") > + (string-append "-DWL_INSTALL_BASEDIR=" share "/widelands") > + (string-append "-DWL_INSTALL_DATADIR=" share "/widelands") > + "-DOPTION_BUILD_WEBSITE_TOOLS=OFF")))) > + (inputs > + `(("sdl" ,(sdl-union (list sdl2 > + sdl2-image > + sdl2-mixer > + sdl2-ttf))) Nitpick: all can go into a single line. > + ("gettext" ,gettext-minimal) This probably belongs to `native-inputs' not `inputs'. > + ("icu4c" ,icu4c) Indentation is off here. > + ("libpng" ,libpng) > + ("zlib" ,zlib) > + ("boost" ,boost) > + ("python" ,python) This one may also be a native input. Could you check? > + ("glew" ,glew))) Could you re-order inputs alphabetically? > + (synopsis "Real-time strategy game") It is a bit terse. Debian uses the slightly more accurate: "Fantasy real-time strategy game" Maybe it is worth mentioning. Or better, something like: "Fantasy real-time strategy game with singleplayer campaigns and multiplayer mode" It could make sense since in the description I suggest below, there is no reference to campaigns nor multiplayer. > + (description > + "Widelands is a free, open source real-time strategy game with You can remove "free" and "open source". All is free in Guix! > + singleplayer campaigns and a multiplayer mode. The game was inspired > + by Settlers II but has significantly more variety and depth to it. ") Mind the spurious spaces at the end. Again, Debian uses: Widelands is a strategy game aiming for gameplay similar to Settlers II by BlueByte. In this game, you start out on a small piece of land with nothing more than a few of useful resources. Using those, you can build yourself an empire with many thousands of inhabitants. On your way towards this goal, you will have to build up an economic infrastructure, explore the lands around you and face enemies who are trying to rule the world just like you do. Would it be better to use it? > + (home-page "https://www.widelands.org/") Nitpick: home-page is usually located above synopsis. I don't know if there's a strong rule about it, tho. > + (license license:gpl2+)))) You are missing out some licenses (CC-based) from the assets in the game. Could you add them too? Could you send an updated patch? Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 12 23:14:34 2020 Received: (at 40035) by debbugs.gnu.org; 13 Mar 2020 03:14:34 +0000 Received: from localhost ([127.0.0.1]:57998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCamK-0005t1-7u for submit@debbugs.gnu.org; Thu, 12 Mar 2020 23:14:34 -0400 Received: from mout02.posteo.de ([185.67.36.66]:54163) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCamH-0005sf-NH for 40035@debbugs.gnu.org; Thu, 12 Mar 2020 23:14:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 35D4D2400E6 for <40035@debbugs.gnu.org>; Fri, 13 Mar 2020 04:14:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.mx; s=2017; t=1584069259; bh=4ElRH7BYtBz28lAeTP6WfcE0tlFXPEEN4iLjuNoEsrQ=; h=From:To:Subject:Date:From; b=COSvp4X8stc4QCb10hQ/V/5sNlzHFvrbBOK+5mJqh7Onq/H4Zl2znGySXzzHYe2rX hDl1pu4I2DAAHJchNzckYtVMUNsKNDKt5SitxcPWDPRhzp7m5SmRePDi0Ep2R1XF76 kkOiaO7I7rFSbOv7blj0Yz6RBwvWP8s46nJBJLZoIGDrBsWJwk4B6U6lC56mHnxV/8 xmBoMAqWOmXKREq3lTunwnwMpkU/vJtpYkoXKX77PKzRzsgV1yHKb0QSLNBHjvqBM/ XRKSz6wJ6nO5YiJj9MhN+gKdLbTeehN02JqJ43/rQZSZ2td51hBqkJhn7JYpnFUYLo gzNDISHMwzP8Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 48drQL0YBvz9rxH for <40035@debbugs.gnu.org>; Fri, 13 Mar 2020 04:14:17 +0100 (CET) References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> User-agent: mu4e 1.2.0; emacs 26.3 From: Alberto EFG To: 40035@debbugs.gnu.org Subject: Re: [bug#40035] Add widelands game In-reply-to: <87imj9skzr.fsf@nicolasgoaziou.fr> Date: Thu, 12 Mar 2020 21:14:11 -0600 Message-ID: <87k13pkku4.fsf@posteo.mx> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 40035 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 (-) --=-=-= Content-Type: text/plain I added all the changes. The synopsis is slightly different than requested, because of character length. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-widelands.patch Content-Transfer-Encoding: quoted-printable >From f8b1cf1bbfe49ab9ae683a89bbeda23b363689fa Mon Sep 17 00:00:00 2001 From: Alberto Eleuterio Flores Guerrero Date: Wed, 11 Mar 2020 21:50:14 -0600 Subject: [PATCH] gnu: Add widelands. * gnu/packages/games.scm (widelands): New variable. --- gnu/packages/games.scm | 53 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 322e309591..eb61341794 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -46,6 +46,7 @@ ;;; Copyright =C2=A9 2019, 2020 Timotej Lazar ;;; Copyright =C2=A9 2019 Josh Holland ;;; Copyright =C2=A9 2017, 2019 Hartmut Goebel +;;; Copyright =C2=A9 2020 Alberto Eleuterio Flores Guerrero ;;; ;;; This file is part of GNU Guix. ;;; @@ -10157,3 +10158,55 @@ best human chess grandmasters. It can be used wit= h UCI-compatible GUIs like ChessX.") (home-page "https://stockfishchess.org/") (license license:gpl3+))) + +(define-public widelands + (package + (name "widelands") + (version "20") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/widelands/build20/build2= 0/+download/" + name "-build" version ".tar.bz2")) + (sha256 + (base32 "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (list "-DCMAKE_BUILD_TYPE=3DRelease" + (string-append "-DCMAKE_INSTALL_PREFIX=3D" out "/bin") + (string-append "-DWL_INSTALL_BASEDIR=3D" share "/widelan= ds") + (string-append "-DWL_INSTALL_DATADIR=3D" share "/widelan= ds") + "-DOPTION_BUILD_WEBSITE_TOOLS=3DOFF")))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("python" ,python))) + (inputs + `(("boost" ,boost) + ("glew" ,glew) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) + ("zlib" ,zlib))) + (home-page "https://www.widelands.org/") + (synopsis "Real-time strategy game with singleplayer campaigns and + multiplayer mode") + (description + "Widelands is a strategy game aiming for gameplay similar to Settlers= II by + BlueByte. + + In this game, you start out on a small piece of land with nothing more= than + a few of useful resources. Using those, you can build yourself an emp= ire + with many thousands of inhabitants. On your way towards this goal, yo= u will + have to build up an economic infrastructure, explore the lands around = you + and face enemies who are trying to rule the world just like you do.") + (license (list + license:gpl2+ + license:gpl3+ + license:expat + license:zlib + license:silofl1.1 + license:asl2.0 + license:cc-by-sa3.0)))) --=20 2.25.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 13 04:16:47 2020 Received: (at 40035) by debbugs.gnu.org; 13 Mar 2020 08:16:47 +0000 Received: from localhost ([127.0.0.1]:58095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCfUt-00014z-2u for submit@debbugs.gnu.org; Fri, 13 Mar 2020 04:16:47 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:43011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCfUr-00014g-7n for 40035@debbugs.gnu.org; Fri, 13 Mar 2020 04:16:46 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 149CBFF80D; Fri, 13 Mar 2020 08:16:37 +0000 (UTC) From: Nicolas Goaziou To: Alberto EFG Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> Date: Fri, 13 Mar 2020 09:16:37 +0100 In-Reply-To: <87k13pkku4.fsf@posteo.mx> (Alberto EFG's message of "Thu, 12 Mar 2020 21:14:11 -0600") Message-ID: <874kussm8q.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40035 Cc: 40035@debbugs.gnu.org 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.7 (-) Hello, Alberto EFG writes: > I added all the changes. The synopsis is slightly different than > requested, because of character length. Thanks! > +(define-public widelands > + (package > + (name "widelands") > + (version "20") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "https://launchpad.net/widelands/build20/build20/+download/" > + name "-build" version ".tar.bz2")) I suggest to use version everywhere in the `uri' string: (string-append "https://launchpad.net/widelands/build" version "/build" version "/" ...) > + (description > + "Widelands is a strategy game aiming for gameplay similar to Settlers II by > + BlueByte. > + > + In this game, you start out on a small piece of land with nothing more than > + a few of useful resources. Using those, you can build yourself an empire > + with many thousands of inhabitants. On your way towards this goal, you will > + have to build up an economic infrastructure, explore the lands around you > + and face enemies who are trying to rule the world just like you do.") The description should not be indented. > + (license (list > + license:gpl2+ > + license:gpl3+ > + license:expat > + license:zlib > + license:silofl1.1 > + license:asl2.0 > + license:cc-by-sa3.0)))) I suggest to add a comment explaining that the software, as a whole, is gpl2+, but assets are released under various licenses. BTW, the source ships with "minizip" and "gettext" in "src/third_party". Could you try unbundling them and use the ones provided by Guix? Otherwise, LGTM! Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 18 17:23:20 2020 Received: (at 40035) by debbugs.gnu.org; 18 Jun 2020 21:23:20 +0000 Received: from localhost ([127.0.0.1]:54515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jm20A-0003PX-AF for submit@debbugs.gnu.org; Thu, 18 Jun 2020 17:23:20 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:60649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jm205-0003PG-AX for 40035@debbugs.gnu.org; Thu, 18 Jun 2020 17:23:13 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 6BCACC0004; Thu, 18 Jun 2020 21:23:01 +0000 (UTC) From: Nicolas Goaziou To: Alberto EFG Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> Date: Thu, 18 Jun 2020 23:22:59 +0200 In-Reply-To: <874kussm8q.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Fri, 13 Mar 2020 09:16:37 +0100") Message-ID: <87lfkk83ws.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40035 Cc: 40035@debbugs.gnu.org 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.7 (-) --=-=-= Content-Type: text/plain Hello, I integrated the previous suggestions. I am not sure about the version string. Upstream seems to use "build-20", and most distributions use "20", some use "build20" or "b20". I used "build20" because it makes it easier to build the download URL. I'm sending the updated patch for review. Regards, -- Nicolas Goaziou --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-widelands.patch Content-Transfer-Encoding: quoted-printable Content-Description: Add widelands >From 186efb0ba86c431e57d535968450bdfd30c1fc43 Mon Sep 17 00:00:00 2001 From: Alberto Eleuterio Flores Guerrero Date: Wed, 17 Jun 2020 11:45:17 +0200 Subject: [PATCH] gnu: Add widelands. * gnu/local.mk (widelands): New variable. * gnu/packages/patches/widelands-system-wide_minizip.patch: New file. (dist_patch_DATA): Register file above. Co-authored-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/games.scm | 98 +++++++++++ .../widelands-system-wide_minizip.patch | 153 ++++++++++++++++++ 3 files changed, 252 insertions(+) create mode 100644 gnu/packages/patches/widelands-system-wide_minizip.patch diff --git a/gnu/local.mk b/gnu/local.mk index fd3cc88af5..b9cd455fa0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1592,6 +1592,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ %D%/packages/patches/wicd-wpa2-ttls.patch \ + %D%/packages/patches/widelands-system-wide_minizip.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 39669ba1c9..f121d7f5c3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4018,6 +4018,104 @@ tactics.") license:gpl2+ license:lgpl2.1+)))) =20 +(define-public widelands + (package + (name "widelands") + (version "build20") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/widelands/" + version "/" version "/+download/" + "widelands-" version ".tar.bz2")) + (sha256 + (base32 "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/third_party/minizip") + #t)) + (patches + ;; Use system Minizip. This is discussed updstream at + ;; . + (search-patches "widelands-system-wide_minizip.patch")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (list "-DCMAKE_BUILD_TYPE=3DRelease" + (string-append "-DCMAKE_INSTALL_PREFIX=3D" out "/bin") + (string-append "-DWL_INSTALL_BASEDIR=3D" share "/widelands") + (string-append "-DWL_INSTALL_DATADIR=3D" share "/widelands") + "-DOPTION_BUILD_WEBSITE_TOOLS=3DOFF")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'install-desktop-file-and-icons + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/shar= e")) + (applications (string-append share "/applications")) + (icons (string-append share "/icons/hicolor"))) + ;; Create desktop entry. + (mkdir-p applications) + (copy-file "debian/org.widelands.widelands.desktop" + (string-append applications "/widelands.desktop"= )) + ;; Install icons. + (for-each (lambda (size) + (let* ((dim (string-append size "x" size)) + (apps (string-append icons "/" dim "/app= s"))) + (mkdir-p apps) + (copy-file (string-append "data/images/logos" + "/wl-ico-" size ".p= ng") + (string-append apps "/widelands.pn= g")))) + '("16" "32" "48" "64" "128")) + #t))) + (add-after 'unpack 'unbundle-fonts + ;; Unbundle fonts already packaged in Guix. XXX: missing fonts= are + ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala. + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "data/i18n/fonts" + (for-each (lambda (font) + (delete-file-recursively font) + (symlink (string-append (assoc-ref inputs font) + "/share/fonts/truetype") + font)) + '("DejaVu" "MicroHei"))) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("python" ,python-wrapper))) + (inputs + `(("boost" ,boost) + ("DejaVu" ,font-dejavu) ;case matters in name + ("glew" ,glew) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("MicroHei" ,font-wqy-microhei) ;case matters in name + ("minizip" ,minizip) + ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) + ("zlib" ,zlib))) + (home-page "https://www.widelands.org/") + (synopsis "Fantasy real-time strategy game") + (description + "Widelands is a real-time strategy game with singleplayer campaigns a= nd +multiplayer mode, aiming for gameplay similar to Settlers II by BlueByte. + +In this game, you start out on a small piece of land with nothing more than +a few of useful resources. Using those, you can build yourself an empire = with +many thousands of inhabitants. On your way towards this goal, you will ha= ve +to build up an economic infrastructure, explore the lands around you and f= ace +enemies who are trying to rule the world just like you do.") + ;; Game is released as GPL2+. Some parts, e.g., art, are released und= er + ;; different licenses. + (license (list license:gpl2+ + license:gpl3+ + license:expat + license:zlib + license:silofl1.1 + license:asl2.0 + license:cc-by-sa3.0)))) + (define-public starfighter (package (name "starfighter") diff --git a/gnu/packages/patches/widelands-system-wide_minizip.patch b/gnu= /packages/patches/widelands-system-wide_minizip.patch new file mode 100644 index 0000000000..1fac0d5396 --- /dev/null +++ b/gnu/packages/patches/widelands-system-wide_minizip.patch @@ -0,0 +1,153 @@ +Description: use the system-wide minizip instead of the embeeded one if fo= und. +Forwarded-Upstream: It was provided by upstream: http://bazaar.launchpad.n= et/~widelands-dev/widelands/b19-debian/revision/8147 + . + Thanks to F=C3=B2ram na G=C3=A0idhlig for the patch. +=20 +I just added this line to make its use easier: + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Modul= es) + +=3D=3D=3D modified file 'CMakeLists.txt' +--- + CMakeLists.txt | 3 +++ + Modules/FindMinizip.cmake | 37 +++++++++++++++++++++++++++++++= ++++++ + cmake/WlFunctions.cmake | 7 +++++++ + src/io/CMakeLists.txt | 2 +- + src/third_party/CMakeLists.txt | 20 +++++++++++--------- + src/third_party/minizip/README.txt | 4 ++++ + 6 files changed, 63 insertions(+), 10 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,7 @@ + endif(POLICY CMP0074) +=20 + include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake") ++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Module= s) +=20 + option(OPTION_USE_GLBINDING "Use glbinding instead of GLEW" OFF) + option(OPTION_GLEW_STATIC "Use static GLEW Library" OFF) +@@ -105,6 +106,8 @@ + find_package(SDL2_ttf REQUIRED) + find_package(ZLIB REQUIRED) + find_package(ICU REQUIRED) ++find_package(Minizip) ++ + if(OPTION_USE_GLBINDING) + find_package(glbinding REQUIRED) + else() +--- /dev/null ++++ b/Modules/FindMinizip.cmake +@@ -0,0 +1,37 @@ ++# - Try to find Minizip ++# Once done this will define ++#=20=20 ++# MINIZIP_FOUND - system has MINIZIP ++# MINIZIP_INCLUDE_DIR - the MINIZIP include directory ++# MINIZIP_LIBRARY_DIR - where the libraries are ++# MINIZIP_LIBRARY - Link these to use MINIZIP ++#=20=20=20 ++ ++IF (MINIZIP_INCLUDE_DIR) ++ # Already in cache, be silent ++ SET(MINIZIP_FIND_QUIETLY TRUE) ++ENDIF (MINIZIP_INCLUDE_DIR) ++ ++FIND_PATH( MINIZIP_INCLUDE_DIR=20 ++ NAMES zip.h unzip.h ioapi.h ++ PATHS /usr/local/include /usr/include ++ PATH_SUFFIXES minizip/ ) ++SET( MINIZIP_NAMES minizip MINIZIP ) ++FIND_LIBRARY( MINIZIP_LIBRARY ++ NAMES ${MINIZIP_NAMES} ++ PATHS /usr/lib /usr/local/lib ) ++ ++GET_FILENAME_COMPONENT( MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} PATH ) ++ ++IF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ SET(MINIZIP_FOUND TRUE) ++ SET(MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} ) ++ IF (NOT MINIZIP_FIND_QUIETLY) ++ MESSAGE (STATUS "Found Minizip: ${MINIZIP_LIBRARY} ${MINIZIP_INCLUDE= _DIR}") ++ ENDIF (NOT MINIZIP_FIND_QUIETLY) ++ELSE (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ SET( MINIZIP_FOUND FALSE ) ++ SET( MINIZIP_LIBRARY_DIR ) ++ SET( MINIZIP_EXTRA_DEFINITIONS ) ++ENDIF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ +--- a/cmake/WlFunctions.cmake ++++ b/cmake/WlFunctions.cmake +@@ -81,6 +81,14 @@ + if(ARG_USES_ZLIB) + wl_include_system_directories(${NAME} ${ZLIB_INCLUDE_DIRS}) + target_link_libraries(${NAME} ${ZLIB_LIBRARY}) ++ if (MINIZIP_FOUND) ++ wl_include_system_directories(${NAME} ${MINIZIP_INCLUDE_DIR}) ++ target_link_libraries(${NAME} ${MINIZIP_LIBRARY}) ++ target_compile_definitions(${NAME} PUBLIC -DHAVE_SYSTEM_MINIZIP) ++ else(MINIZIP_FOUND) ++ target_link_libraries(${NAME} third_party_minizip) ++ message(FATAL_ERROR "You are using widelands-bundled minizip source= s. Please install your distribution's minizip dev library or urge your dist= ribution maintainer to include the minizip library in your package reposito= ry. Thank you.") ++ endif(MINIZIP_FOUND) + endif() +=20 + # OpenGL and GLEW are one thing for us. If you use the one, you also us= e the +--- a/src/third_party/CMakeLists.txt ++++ b/src/third_party/CMakeLists.txt +@@ -1,12 +1,14 @@ +-wl_library(third_party_minizip +- THIRD_PARTY +- SRCS +- minizip/ioapi.h +- minizip/unzip.cc +- minizip/unzip.h +- minizip/zip.h +- USES_ZLIB +-) ++if(NOT MINIZIP_FOUND) ++ wl_library(third_party_minizip ++ THIRD_PARTY ++ SRCS ++ ioapi.h ++ unzip.cc ++ unzip.h ++ zip.h ++ USES_ZLIB ++ ) ++endif(NOT MINIZIP_FOUND) +=20 + wl_library(third_party_eris + THIRD_PARTY +--- a/src/io/filesystem/CMakeLists.txt ++++ b/src/io/filesystem/CMakeLists.txt +@@ -12,6 +12,7 @@ + zip_exceptions.h + zip_filesystem.cc + zip_filesystem.h ++ USES_ZLIB + DEPENDS + base_exceptions + base_i18n +@@ -19,5 +20,4 @@ + base_macros + graphic_text_layout + io_stream +- third_party_minizip + ) +--- a/src/io/filesystem/zip_filesystem.h ++++ b/src/io/filesystem/zip_filesystem.h +@@ -28,8 +28,14 @@ + #include "io/filesystem/filesystem.h" + #include "io/streamread.h" + #include "io/streamwrite.h" ++ ++#ifndef HAVE_SYSTEM_MINIZIP + #include "third_party/minizip/unzip.h" + #include "third_party/minizip/zip.h" ++#else ++#include ++#include ++#endif +=20 + class ZipFilesystem : public FileSystem { + public: --=20 2.26.2 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 18 18:58:16 2020 Received: (at 40035) by debbugs.gnu.org; 18 Jun 2020 22:58:16 +0000 Received: from localhost ([127.0.0.1]:54628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jm3U7-0005kh-T9 for submit@debbugs.gnu.org; Thu, 18 Jun 2020 18:58:16 -0400 Received: from mout.web.de ([217.72.192.78]:60763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jm3U4-0005kJ-1q for 40035@debbugs.gnu.org; Thu, 18 Jun 2020 18:58:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1592521084; bh=6lC+dFN31gbSfVgvq+oawHfdLHawFI1h6w5tyFcq6Do=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=fWO6G8WLC44pF+7hUQySdwXqvwapZz1ZmozMu5s5jG+whENPc4Pt7ZSZwt951eI3G RkTtS48/uMU/xhDvr7fDadqCicxAmxxdpjWYJAkTQyb3ShM56kKxjmO+iijPGHRWdX FRFhfB8z2OQiTSOu6X9eCz08BxrfvZxtOJYR13hg= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.20] ([88.152.184.127]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1Myv72-1iyt4Q0N1u-00vv6F; Fri, 19 Jun 2020 00:58:04 +0200 Subject: Re: [bug#40035] Add widelands game To: Nicolas Goaziou , Alberto EFG References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> <87lfkk83ws.fsf@nicolasgoaziou.fr> From: Jonathan Brielmaier Message-ID: <9e375eb8-839c-7dac-173d-2f2a23075a3c@web.de> Date: Fri, 19 Jun 2020 00:58:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.9.0 MIME-Version: 1.0 In-Reply-To: <87lfkk83ws.fsf@nicolasgoaziou.fr> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:LZ3/IsgrRqXfRkPqCH8ZRfC97pE3RiKSh8s6AmLA72S23Kqjmup UiJMVOR1Jqb1aV0T5bJmRLNoY1Ag2Q2vEySJJkbQJMbfPEF2sOaOy7Imjh/DC1riE7y3Hsj w7cf57jor3Da/rOZm2chj2XmJ/zVj5Ka2NFG89Q5+05JIouEAoJ9PpFvCo1n+dIcrapGnPn sO+DH9XKNYx+IYCOVjaJA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:RyFdAFUq5tw=:tTCxg0UL4iOzpLN8PhFTVh n7c9YtDDU3ioWJcBfmzE2c2jilsnTkaY2APh7TcZ7Fvoyz0wTqzvwxYsxSMj7ov+LQFDs/41y WLF/2f32f3dwBfKmodRjC5GNypGxrSEFF9xUb9Kc58Es3d5f16/qqsLy3o58swdrZiWMDN950 u7m0Fn06LQ6wDqCpFu/Y46L3+FOzDUle2qXT4oMRLpEEBAwrB25QHZ2+KadIPfc3TyCrr/mtU PUXtkKp+JpGDu3Za80E+3TkRN3cQ0QzUW+5ylcQQtWbttav0D+9OIb2iioleE54i4tnaRG5Cq /F2gUc3cco97zdKZeSKP2DmZTv7amomQsq5m41vd0hdqWT9bbKv7smHECLy/7zsT3Uosn6G6b ei93RroQMC0nw8gM7/vw6GKHbIGiKgLNQRfqt8VtUli6YaLUFl23Fhj5cx4MyrT7wKRHaa9na 6Jfaa4Pku+dY09Ps2shuTbPR3HxQH64EV+iOBYJBeqNph6tQEYBB0XU+3CD21Hi2qLKsn+H6n l/faMdEng2CY4RCTQm4ggMPNbmB3QmXCEy0Gypj7nJp31RRe3/OtJlHhbNewGNtxDjuo+YiZT a2rGYXEJIxIepCOaeXROYEKmD3ll4Es94fiS1TpgB4HExezPyIEhyOskaELKmpF3YVDNKPeiZ dD8TgCttBe/aHtc43BEoPYt4qb830GWUD/Nx2O/7fEA9LD/tl9iSam61yBslLJhCRLfajsE4J fLmqW4NEJQcgQnXKlTQsIjiLGC0rr+8+LWLDzFa/YWxjR3EkUrWP7hb9cJsJG2ajl0XR/3JTV lKvq1HE32UW7Oy0pxwfBFUtJCeJTULv+UIJFRyRzMWcDwhvFVFsNtiA20DAwanQa6c8eNhoHA 3VWOYWjRN8R5N6doW4xcudSy8QQsJ4vlkJ4OkOnnTCZgtihZW42KDuVWoztFKdJhstrHJxte5 GaxGg2+uYsgwe6LARubA63yJT1rI/5/wU4mFk4/qWz7bnF+dXJjh5Rko5rvDcCrCSeyGTWJ5O dwAdJydYWyADZmHUE45Q7xoMpaJpOw1WbTn/LP/gAIeCfsdo+Z1NnO2EUCz3fz7Q6J+4oAGph wn8mPoXKbMVy1vYUcH059mXn/YkkvzlXL2Ko7SytknF+m3yhuLWMwRxmmVa4ejhDZsE0M/Az7 +KWyPoW57ACPmJTsNQPlPMDR7Zi/cx8N3Rpi5hZGzBK5jOPI5waW7HINs0mZFzEEVYIvGCgY0 JzuMTa5gRcA2RvrMe9PgTTM91XWBZNw4zn9XLAPq/VJFK7my1h4RRtBJWGDMv/h0JqDe83NpJ MRjdH/D7JPRE00aMFOPkpfrjhAEccWh4Wvub1oheMz7jmpbSGq8mSFOohWpORXoAn+KBcM1m X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40035 Cc: 40035@debbugs.gnu.org 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.7 (-) On 18.06.20 23:22, Nicolas Goaziou wrote: > Hello, > > I integrated the previous suggestions. I am not sure about the version > string. Upstream seems to use "build-20", and most distributions use > "20", some use "build20" or "b20". I used "build20" because it makes it > easier to build the download URL. Couldn't we just use the most recent tag on Github? https://github.com/widelands/widelands/releases/tag/bzr9203 > + (home-page "https://www.widelands.org/") > + (synopsis "Fantasy real-time strategy game") > + (description > + "Widelands is a real-time strategy game with singleplayer campaign= s and > +multiplayer mode, aiming for gameplay similar to Settlers II by BlueByt= e. > + > +In this game, you start out on a small piece of land with nothing more = than > +a few of useful resources. Using those, you can build yourself an empi= re with > +many thousands of inhabitants. On your way towards this goal, you will= have > +to build up an economic infrastructure, explore the lands around you an= d face > +enemies who are trying to rule the world just like you do.") Are we allowed to just copy descriptions from Debian packages? Is this license compatible? From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 19 03:01:39 2020 Received: (at 40035) by debbugs.gnu.org; 19 Jun 2020 07:01:39 +0000 Received: from localhost ([127.0.0.1]:54892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmB1v-000338-Hy for submit@debbugs.gnu.org; Fri, 19 Jun 2020 03:01:39 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:55313) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmB1s-00032q-8L for 40035@debbugs.gnu.org; Fri, 19 Jun 2020 03:01:38 -0400 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 1CEF210000D; Fri, 19 Jun 2020 07:01:28 +0000 (UTC) From: Nicolas Goaziou To: Jonathan Brielmaier Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> <87lfkk83ws.fsf@nicolasgoaziou.fr> <9e375eb8-839c-7dac-173d-2f2a23075a3c@web.de> Date: Fri, 19 Jun 2020 09:01:28 +0200 In-Reply-To: <9e375eb8-839c-7dac-173d-2f2a23075a3c@web.de> (Jonathan Brielmaier's message of "Fri, 19 Jun 2020 00:58:02 +0200") Message-ID: <87a70z35fb.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40035 Cc: Alberto EFG , 40035@debbugs.gnu.org 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.7 (-) Hello, Jonathan Brielmaier writes: > On 18.06.20 23:22, Nicolas Goaziou wrote: >> Hello, >> >> I integrated the previous suggestions. I am not sure about the version >> string. Upstream seems to use "build-20", and most distributions use >> "20", some use "build20" or "b20". I used "build20" because it makes it >> easier to build the download URL. > > Couldn't we just use the most recent tag on Github? > https://github.com/widelands/widelands/releases/tag/bzr9203 Despite its name, "build-20" is the official stable release. OTOH, I don't know what "bzr9203" is. Considering the game is still under active development, I think we should stick to the stable release. >> + (description >> + "Widelands is a real-time strategy game with singleplayer campaigns and >> +multiplayer mode, aiming for gameplay similar to Settlers II by BlueByte. >> + >> +In this game, you start out on a small piece of land with nothing more than >> +a few of useful resources. Using those, you can build yourself an empire with >> +many thousands of inhabitants. On your way towards this goal, you will have >> +to build up an economic infrastructure, explore the lands around you and face >> +enemies who are trying to rule the world just like you do.") > > Are we allowed to just copy descriptions from Debian packages? Is this > license compatible? Good question. I think copying Debian's description is fine, although it may be nicer to add a comment explaining where it was "borrowed". But I am also curious to know what other developers think about it. In the current case, however, I think Debian's description is more or a less a glorified rewording of the documentation. IOW, I don't think there is anything to claim authorship on. We can change it nonetheless. What about the following excerpt from upstream? In Widelands, you are the regent of a small clan. You start out with nothing but your headquarters, where all your resources are stored. In the course of the game, you will build an ever growing settlement. Every member of your clan will do his or her part to produce more resources---wood, food, iron, gold and more---to further this growth. The economic network is complex and different in the four tribes (Barbarians, Empire, Atlanteans, and Frisians). As you are not alone in the world, you will meet other clans sooner or later. Some of them may be friendly and you may eventually trade with them. However, if you want to rule the world, you will have to train soldiers and fight. Widelands offers single-player mode with different campaigns; the campaigns all tell stories of tribes and their struggle in the Widelands universe! However, settling really starts when you unite with friends over the Internet or LAN to build up new empires together---or to crush each other in the dusts of war. Widelands also offers an Artificial Intelligence to challenge you. Thank you for the review, Regards, -- Nicolas Goaziou From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 19 08:09:52 2020 Received: (at submit) by debbugs.gnu.org; 19 Jun 2020 12:09:52 +0000 Received: from localhost ([127.0.0.1]:55334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmFqC-0004QX-D7 for submit@debbugs.gnu.org; Fri, 19 Jun 2020 08:09:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:40746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmFqA-0004QP-VP for submit@debbugs.gnu.org; Fri, 19 Jun 2020 08:09:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmFqA-0001J9-PY for guix-patches@gnu.org; Fri, 19 Jun 2020 08:09:50 -0400 Received: from tobias.gr ([2a02:c205:2020:6054::1]:60152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmFq8-000892-BB for guix-patches@gnu.org; Fri, 19 Jun 2020 08:09:50 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 2ebb9510; Fri, 19 Jun 2020 12:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:references:in-reply-to:date:message-id:mime-version :content-type; s=2018; i=me@tobias.gr; bh=p6ETRVOt9HntS37+rboJI5 C15H3xMt8QYAjWkXsPooA=; b=EfQZQtmwDBUcf23J3gqYTwTVZPMp/NdJTVrDdE 11Qz/aABgKREU8Gq3QOX5N5znnjf5vj5jX/DIftsqV2n7Ma1FntrzkER7561Ba3/ Lsud8SIOWPatolrpoe6i1aW/kUwycHCPqhuqE1yWfPjG72LBMVA9eDjizi4ciNRO RXbrwEIwZMRsqzqr1ZtWiO5ILVR08A9Kd65/VnpTObO1d8MRwm5LMG7L2LyFo1QN CvkHpvGgN79YFxVdiH7FpkpAl+i67KfknPpu9vqs+AIpgXuhCLwTDHgKjK1g518o qEyp3NJoPBErjvHRfOfOgmQNBTf8v7qwW69sZscAzkwjsQ5A== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 036d0a3f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 19 Jun 2020 12:09:43 +0000 (UTC) BIMI-Selector: v=BIMI1; s=default; From: Tobias Geerinckx-Rice To: Nicolas Goaziou Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> <87lfkk83ws.fsf@nicolasgoaziou.fr> In-reply-to: <87lfkk83ws.fsf@nicolasgoaziou.fr> Date: Fri, 19 Jun 2020 14:09:42 +0200 Message-ID: <871rmbw92x.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Alberto EFG , guix-patches@gnu.org, 40035@debbugs.gnu.org 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: -2.4 (--) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Alberto, Nicolas, Nicolas Goaziou =E5=86=99=E9=81=93=EF=BC=9A > I integrated the previous suggestions. I am not sure about the=20 > version > string. Upstream seems to use "build-20", and most distributions=20 > use > "20", some use "build20" or "b20". I used "build20" because it=20 > makes it > easier to build the download URL. Does =E2=80=98build=E2=80=99 mean beta or (stable) preview here? Then we s= hould=20 append =E2=80=980.0.0-=E2=80=99 or similar, like we do for git snapshots, t= o the=20 front in case upstream releases a 1.x at some point. Otherwise, =E2=80=9820=E2=80=99's fine, really. > I'm sending the updated patch for review. Thank you both! I'm building it now. > + (patches > + ;; Use system Minizip. This is discussed updstream at > + ;; . > + (search-patches=20 > "widelands-system-wide_minizip.patch")))) Minor typo (=E2=80=98embeeded=E2=80=99). Are you the =E2=80=98I=E2=80=99 i= n the patch? Is it=20 pending upstream application? If so, a link to the upstream bug=20 report/commit would be nice. > + (list "-DCMAKE_BUILD_TYPE=3DRelease" Why not the default RelWithDebInfo? Please note in a comment. > + ("DejaVu" ,font-dejavu) ;case matters in name [=E2=80=A6] > + ("MicroHei" ,font-wqy-microhei) ;case matters in name Mkay I guess. No point in a codebase chock-full of repetitive=20 alists if we're not going to take advantage of it once in a while=20 :-) I'd put both at the end with a single ;; Fonts for the =E2=80=98unbundle-fonts=E2=80=99 phase. Case matters in= name! comment. > + ("minizip" ,minizip) > + ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer=20 > sdl2-ttf))) > + ("zlib" ,zlib))) > + (home-page "https://www.widelands.org/") > + (synopsis "Fantasy real-time strategy game") > + (description > + "Widelands is a real-time strategy game with singleplayer=20 > campaigns and > +multiplayer mode, aiming for gameplay similar to Settlers II by=20 > BlueByte. > + > +In this game, you start out on a small piece of land with=20 > nothing more than > +a few of useful resources. Using those, you can build yourself=20 > an empire with > +many thousands of inhabitants. On your way towards this goal,=20 > you will have > +to build up an economic infrastructure, explore the lands=20 > around you and face > +enemies who are trying to rule the world just like you do.") I think Debian(-derived) descriptions are OK but I prefer=20 yours/upstream's anyway. > + ;; Game is released as GPL2+. Some parts, e.g., art, are=20 > released under > + ;; different licenses. At least Culmus and Sinhala are GPL2-only. The title screen also=20 says =E2=80=98GNU General Public License V2.0=E2=80=99. > + (license (list license:gpl2+ > + license:gpl3+ Which parts are gpl3+? That sounds problematic. > + license:expat > + license:zlib > + license:silofl1.1 > + license:asl2.0 > + license:cc-by-sa3.0)))) It's built now, I will test it extensively on the bus=E2=80=A6 Thanks! T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXuyrBgAKCRANsP+IT1Vt ecEhAP4muwDmY7Vkhr2IIAPADA4lLBun/s2ecKfun0TYnX/8yQD/euV4qHVwDXxL SZAVAtCzSuY2EcH6YJyn6+XIrmQGtgc= =1cMl -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 19 08:30:20 2020 Received: (at 40035) by debbugs.gnu.org; 19 Jun 2020 12:30:20 +0000 Received: from localhost ([127.0.0.1]:55370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmGA0-0004wi-9n for submit@debbugs.gnu.org; Fri, 19 Jun 2020 08:30:20 -0400 Received: from tobias.gr ([80.241.217.52]:52828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmG9z-0004wX-0y for 40035@debbugs.gnu.org; Fri, 19 Jun 2020 08:30:19 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 96ea3594; Fri, 19 Jun 2020 12:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:references:in-reply-to:date:message-id:mime-version :content-type; s=2018; i=me@tobias.gr; bh=krVyWWpJjPrfNmdWR3A8Sv dmABAvUnqhiXC3v7blLiM=; b=g9PtJJDbdn8zb1pQQy88tXCj4pA8esA4jZwIba O2I1aSzPEcFCZgstFne4pR2AmUrXMsH+eW9Vo+8SRRsJd0rRtAyyOU86brE6kV4e F7awtR4JVPaYXkM4K+8LItr2TJjERUptkJlpth7+rEnqp1MfUu77ZRuXpH8eDslo vPhz2mVbgDOBgAt/GqUjSTjY8W6V3s2qfpxV9IOyZB+CxU738pmSA+WBLtsoHf/0 m0+UXRWbV7CpiuGvfA+PgHTmG8BVPq28r/EQp2cFTEem5SVa9dTT9+XfEdn+WWHE BTzFqPdHK9YAppPm6Ejx/wVBDMXCZCL/IPWBvidvlC0jUTiA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 10d093ac (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 19 Jun 2020 12:30:17 +0000 (UTC) BIMI-Selector: v=BIMI1; s=default; From: Tobias Geerinckx-Rice To: Alberto EFG Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> In-reply-to: <87o8t2gpqx.fsf@posteo.mx> Date: Fri, 19 Jun 2020 14:30:16 +0200 Message-ID: <87y2ojutk7.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 40035 Cc: 40035@debbugs.gnu.org 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: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Alberto, Alberto EFG =E5=86=99=E9=81=93=EF=BC=9A > guix size - Around 1.4 gb. I am not sure what to do You don't need to do anything. Games like these are expected to=20 be biggish, and people tend not to mind because, well, they're=20 games. 95% of people (if not more) who play widelands already have almost=20 all of its dependencies installed already, for their desktop.=20 =E2=80=98guix size=E2=80=99 is the absolute worst case. There are some large dependencies that probably aren't used by the=20 game itself: $ guix graph --path widelands ghostscript-with-cups # read each newline as =E2=80=98depends on=E2=80=99: widelands@build20 sdl-union@1.2.15 sdl2@2.0.12 fcitx@4.2.9.7 gtk+@2.24.32 cups@2.3.3 cups-filters@1.27.4 ghostscript-with-cups@9.52 but that's nothing you need to can fix in widelands itself. > guix refresh --list-dependent - Nothing is dependent This command lists the number of other packages that depend on=20 your package. It's useful mainly for updates. For a new package the number will always be 0 =E2=80=94 unless you created= =20 a dependency yourself. That would require modifying an existing=20 package which you didn't do. Kind regards, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXuyv2AAKCRANsP+IT1Vt eVFmAP47InYIIR3LX8NGXUjhfChpg3Z5aEkNSBjZf3Txs60svQD/SuCkyj9uAfx1 qz1mcMi3KPa8qI/YZTkUpotZY40KmAE= =LZpv -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 19 14:59:22 2020 Received: (at 40035) by debbugs.gnu.org; 19 Jun 2020 18:59:22 +0000 Received: from localhost ([127.0.0.1]:56805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmMEN-0008Ei-OP for submit@debbugs.gnu.org; Fri, 19 Jun 2020 14:59:22 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:50287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmMEJ-0008Dz-1G for 40035@debbugs.gnu.org; Fri, 19 Jun 2020 14:59:14 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 9673BC0007; Fri, 19 Jun 2020 18:59:03 +0000 (UTC) From: Nicolas Goaziou To: Tobias Geerinckx-Rice Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> <87lfkk83ws.fsf@nicolasgoaziou.fr> <871rmbw92x.fsf@nckx> Date: Fri, 19 Jun 2020 20:59:02 +0200 In-Reply-To: <871rmbw92x.fsf@nckx> (Tobias Geerinckx-Rice's message of "Fri, 19 Jun 2020 14:09:42 +0200") Message-ID: <87366q287d.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40035 Cc: Alberto EFG , 40035@debbugs.gnu.org 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 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, Tobias Geerinckx-Rice writes: > Otherwise, =E2=80=9820=E2=80=99's fine, really. Fair enough. >> + ;; Use system Minizip. This is discussed updstream at >> + ;; . >> + (search-patches "widelands-system-wide_minizip.patch")))) > > Minor typo (=E2=80=98embeeded=E2=80=99). Are you the =E2=80=98I=E2=80=99= in the patch? Is it pending > upstream application? If so, a link to the upstream bug report/commit > would be nice. Typo fixed. I'm not the "I" in the patch. It is shipped in "debian/" subdir. I mentioned it in a comment. >> + (list "-DCMAKE_BUILD_TYPE=3DRelease" > > Why not the default RelWithDebInfo? Please note in a comment. I don't know. It seems to build fine without it, so I removed it. > I'd put both at the end with a single > > ;; Fonts for the =E2=80=98unbundle-fonts=E2=80=99 phase. Case matters i= n name! OK. > I think Debian(-derived) descriptions are OK but I prefer > yours/upstream's anyway. I used upstream's. >> + ;; Game is released as GPL2+. Some parts, e.g., art, are >> released under >> + ;; different licenses. > > At least Culmus and Sinhala are GPL2-only.=20=20 Are you sure? For example, I see GPL2 for Culmus, but it doesn't mention "only" anywhere. Also, Debian's copyright file considers it GPL2+. > The title screen also says > =E2=80=98GNU General Public License V2.0=E2=80=99. Source code is definitely GPL2+. I think Debian has a patch to fix the title screen. >> + (license (list license:gpl2+ >> + license:gpl3+ > > Which parts are gpl3+? That sounds problematic. None. That was probably an oversight. >> + license:expat >> + license:zlib >> + license:silofl1.1 >> + license:asl2.0 >> + license:cc-by-sa3.0)))) I also removed zlib (minizip) and asl2.0 (microhei). Thanks for the review. V3 attached. Regards, --=20 Nicolas Goaziou --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=v3-0001-gnu-Add-widelands.patch Content-Transfer-Encoding: quoted-printable Content-Description: Add widelands >From fa7351a369a0fd249d28ad97a55a28d29f38ee22 Mon Sep 17 00:00:00 2001 From: Alberto Eleuterio Flores Guerrero Date: Wed, 17 Jun 2020 11:45:17 +0200 Subject: [PATCH v3] gnu: Add widelands. * gnu/local.mk (widelands): New variable. * gnu/packages/patches/widelands-system-wide_minizip.patch: New file. (dist_patch_DATA): Register file above. Co-authored-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/games.scm | 106 ++++++++++++ .../widelands-system-wide_minizip.patch | 153 ++++++++++++++++++ 3 files changed, 260 insertions(+) create mode 100644 gnu/packages/patches/widelands-system-wide_minizip.patch diff --git a/gnu/local.mk b/gnu/local.mk index fd3cc88af5..b9cd455fa0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1592,6 +1592,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ %D%/packages/patches/wicd-wpa2-ttls.patch \ + %D%/packages/patches/widelands-system-wide_minizip.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 39669ba1c9..2d1c2a4e6d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4018,6 +4018,112 @@ tactics.") license:gpl2+ license:lgpl2.1+)))) =20 +(define-public widelands + (package + (name "widelands") + (version "20") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/widelands/" + "build" version "/build" version "/+download/" + "widelands-build" version ".tar.bz2")) + (sha256 + (base32 "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/third_party/minizip") + #t)) + (patches + ;; Use system Minizip. Following patch is included in "debian/" + ;; sub-directory. This discussed upstream at + ;; . + (search-patches "widelands-system-wide_minizip.patch")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (list (string-append "-DCMAKE_INSTALL_PREFIX=3D" out "/bin") + (string-append "-DWL_INSTALL_BASEDIR=3D" share "/widelands") + (string-append "-DWL_INSTALL_DATADIR=3D" share "/widelands") + "-DOPTION_BUILD_WEBSITE_TOOLS=3DOFF")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'install-desktop-file-and-icons + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/shar= e")) + (applications (string-append share "/applications")) + (icons (string-append share "/icons/hicolor"))) + ;; Move desktop entry. + (mkdir-p applications) + (copy-file "debian/org.widelands.widelands.desktop" + (string-append applications "/widelands.desktop"= )) + ;; Install icons. + (for-each (lambda (size) + (let* ((dim (string-append size "x" size)) + (apps (string-append icons "/" dim "/app= s"))) + (mkdir-p apps) + (copy-file (string-append "data/images/logos" + "/wl-ico-" size ".p= ng") + (string-append apps "/widelands.pn= g")))) + '("16" "32" "48" "64" "128")) + #t))) + (add-after 'unpack 'unbundle-fonts + ;; Unbundle fonts already packaged in Guix. XXX: missing fonts= are + ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala. + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "data/i18n/fonts" + (for-each (lambda (font) + (delete-file-recursively font) + (symlink (string-append (assoc-ref inputs font) + "/share/fonts/truetype") + font)) + '("DejaVu" "MicroHei"))) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("python" ,python-wrapper))) + (inputs + `(("boost" ,boost) + ("glew" ,glew) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("minizip" ,minizip) + ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) + ("zlib" ,zlib) + ;; Fonts for the =E2=80=98unbundle-fonts=E2=80=99 phase. Case matt= ers in name! + ("DejaVu" ,font-dejavu) + ("MicroHei" ,font-wqy-microhei))) + (home-page "https://www.widelands.org/") + (synopsis "Fantasy real-time strategy game") + (description + "In Widelands, you are the regent of a small clan. You start out with +nothing but your headquarters, where all your resources are stored. + +In the course of the game, you will build an ever growing settlement. Eve= ry +member of your clan will do his or her part to produce more resources---wo= od, +food, iron, gold and more---to further this growth. The economic network = is +complex and different in the four tribes (Barbarians, Empire, Atlanteans, = and +Frisians). + +As you are not alone in the world, you will meet other clans sooner or lat= er. +Some of them may be friendly and you may eventually trade with them. Howe= ver, +if you want to rule the world, you will have to train soldiers and fight. + +Widelands offers single-player mode with different campaigns; the campaigns +all tell stories of tribes and their struggle in the Widelands universe! +However, settling really starts when you unite with friends over the Inter= net +or LAN to build up new empires together---or to crush each other in the du= sts +of war. Widelands also offers an Artificial Intelligence to challenge you= .") + ;; Game is released as GPL2+. Some parts, e.g., art, are released und= er + ;; different licenses. + (license (list license:gpl2+ + license:expat ;src/third_party/eris + license:silofl1.1 ;Widelands.ttf + license:cc-by-sa3.0)))) ;some music files + (define-public starfighter (package (name "starfighter") diff --git a/gnu/packages/patches/widelands-system-wide_minizip.patch b/gnu= /packages/patches/widelands-system-wide_minizip.patch new file mode 100644 index 0000000000..1fac0d5396 --- /dev/null +++ b/gnu/packages/patches/widelands-system-wide_minizip.patch @@ -0,0 +1,153 @@ +Description: use the system-wide minizip instead of the embeeded one if fo= und. +Forwarded-Upstream: It was provided by upstream: http://bazaar.launchpad.n= et/~widelands-dev/widelands/b19-debian/revision/8147 + . + Thanks to F=C3=B2ram na G=C3=A0idhlig for the patch. +=20 +I just added this line to make its use easier: + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Modul= es) + +=3D=3D=3D modified file 'CMakeLists.txt' +--- + CMakeLists.txt | 3 +++ + Modules/FindMinizip.cmake | 37 +++++++++++++++++++++++++++++++= ++++++ + cmake/WlFunctions.cmake | 7 +++++++ + src/io/CMakeLists.txt | 2 +- + src/third_party/CMakeLists.txt | 20 +++++++++++--------- + src/third_party/minizip/README.txt | 4 ++++ + 6 files changed, 63 insertions(+), 10 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,7 @@ + endif(POLICY CMP0074) +=20 + include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake") ++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Module= s) +=20 + option(OPTION_USE_GLBINDING "Use glbinding instead of GLEW" OFF) + option(OPTION_GLEW_STATIC "Use static GLEW Library" OFF) +@@ -105,6 +106,8 @@ + find_package(SDL2_ttf REQUIRED) + find_package(ZLIB REQUIRED) + find_package(ICU REQUIRED) ++find_package(Minizip) ++ + if(OPTION_USE_GLBINDING) + find_package(glbinding REQUIRED) + else() +--- /dev/null ++++ b/Modules/FindMinizip.cmake +@@ -0,0 +1,37 @@ ++# - Try to find Minizip ++# Once done this will define ++#=20=20 ++# MINIZIP_FOUND - system has MINIZIP ++# MINIZIP_INCLUDE_DIR - the MINIZIP include directory ++# MINIZIP_LIBRARY_DIR - where the libraries are ++# MINIZIP_LIBRARY - Link these to use MINIZIP ++#=20=20=20 ++ ++IF (MINIZIP_INCLUDE_DIR) ++ # Already in cache, be silent ++ SET(MINIZIP_FIND_QUIETLY TRUE) ++ENDIF (MINIZIP_INCLUDE_DIR) ++ ++FIND_PATH( MINIZIP_INCLUDE_DIR=20 ++ NAMES zip.h unzip.h ioapi.h ++ PATHS /usr/local/include /usr/include ++ PATH_SUFFIXES minizip/ ) ++SET( MINIZIP_NAMES minizip MINIZIP ) ++FIND_LIBRARY( MINIZIP_LIBRARY ++ NAMES ${MINIZIP_NAMES} ++ PATHS /usr/lib /usr/local/lib ) ++ ++GET_FILENAME_COMPONENT( MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} PATH ) ++ ++IF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ SET(MINIZIP_FOUND TRUE) ++ SET(MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} ) ++ IF (NOT MINIZIP_FIND_QUIETLY) ++ MESSAGE (STATUS "Found Minizip: ${MINIZIP_LIBRARY} ${MINIZIP_INCLUDE= _DIR}") ++ ENDIF (NOT MINIZIP_FIND_QUIETLY) ++ELSE (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ SET( MINIZIP_FOUND FALSE ) ++ SET( MINIZIP_LIBRARY_DIR ) ++ SET( MINIZIP_EXTRA_DEFINITIONS ) ++ENDIF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ +--- a/cmake/WlFunctions.cmake ++++ b/cmake/WlFunctions.cmake +@@ -81,6 +81,14 @@ + if(ARG_USES_ZLIB) + wl_include_system_directories(${NAME} ${ZLIB_INCLUDE_DIRS}) + target_link_libraries(${NAME} ${ZLIB_LIBRARY}) ++ if (MINIZIP_FOUND) ++ wl_include_system_directories(${NAME} ${MINIZIP_INCLUDE_DIR}) ++ target_link_libraries(${NAME} ${MINIZIP_LIBRARY}) ++ target_compile_definitions(${NAME} PUBLIC -DHAVE_SYSTEM_MINIZIP) ++ else(MINIZIP_FOUND) ++ target_link_libraries(${NAME} third_party_minizip) ++ message(FATAL_ERROR "You are using widelands-bundled minizip source= s. Please install your distribution's minizip dev library or urge your dist= ribution maintainer to include the minizip library in your package reposito= ry. Thank you.") ++ endif(MINIZIP_FOUND) + endif() +=20 + # OpenGL and GLEW are one thing for us. If you use the one, you also us= e the +--- a/src/third_party/CMakeLists.txt ++++ b/src/third_party/CMakeLists.txt +@@ -1,12 +1,14 @@ +-wl_library(third_party_minizip +- THIRD_PARTY +- SRCS +- minizip/ioapi.h +- minizip/unzip.cc +- minizip/unzip.h +- minizip/zip.h +- USES_ZLIB +-) ++if(NOT MINIZIP_FOUND) ++ wl_library(third_party_minizip ++ THIRD_PARTY ++ SRCS ++ ioapi.h ++ unzip.cc ++ unzip.h ++ zip.h ++ USES_ZLIB ++ ) ++endif(NOT MINIZIP_FOUND) +=20 + wl_library(third_party_eris + THIRD_PARTY +--- a/src/io/filesystem/CMakeLists.txt ++++ b/src/io/filesystem/CMakeLists.txt +@@ -12,6 +12,7 @@ + zip_exceptions.h + zip_filesystem.cc + zip_filesystem.h ++ USES_ZLIB + DEPENDS + base_exceptions + base_i18n +@@ -19,5 +20,4 @@ + base_macros + graphic_text_layout + io_stream +- third_party_minizip + ) +--- a/src/io/filesystem/zip_filesystem.h ++++ b/src/io/filesystem/zip_filesystem.h +@@ -28,8 +28,14 @@ + #include "io/filesystem/filesystem.h" + #include "io/streamread.h" + #include "io/streamwrite.h" ++ ++#ifndef HAVE_SYSTEM_MINIZIP + #include "third_party/minizip/unzip.h" + #include "third_party/minizip/zip.h" ++#else ++#include ++#include ++#endif +=20 + class ZipFilesystem : public FileSystem { + public: --=20 2.26.2 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 19 16:46:26 2020 Received: (at 40035) by debbugs.gnu.org; 19 Jun 2020 20:46:26 +0000 Received: from localhost ([127.0.0.1]:56916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmNtz-0002Q6-G4 for submit@debbugs.gnu.org; Fri, 19 Jun 2020 16:46:26 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:39777) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmNtu-0002Pp-Tr for 40035@debbugs.gnu.org; Fri, 19 Jun 2020 16:46:18 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id A1673C0002; Fri, 19 Jun 2020 20:46:07 +0000 (UTC) From: Nicolas Goaziou To: Tobias Geerinckx-Rice Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> <87lfkk83ws.fsf@nicolasgoaziou.fr> <871rmbw92x.fsf@nckx> <87366q287d.fsf@nicolasgoaziou.fr> Date: Fri, 19 Jun 2020 22:46:06 +0200 In-Reply-To: <87366q287d.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Fri, 19 Jun 2020 20:59:02 +0200") Message-ID: <87wo42zsvl.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40035 Cc: Alberto EFG , 40035@debbugs.gnu.org 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 (-) --=-=-= Content-Type: text/plain Correcting myself, Nicolas Goaziou writes: > Tobias Geerinckx-Rice writes: >> Why not the default RelWithDebInfo? Please note in a comment. > > I don't know. It seems to build fine without it, so I removed it. It builds, but doesn't run properly with RelWithDebInfo. Indeed, no game data is installed when using this build type. Time for a v4. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=v4-0001-gnu-Add-widelands.patch Content-Transfer-Encoding: quoted-printable Content-Description: Add widelands >From 9427f07a83381613344053d6f496474ae6bbe09c Mon Sep 17 00:00:00 2001 From: Alberto Eleuterio Flores Guerrero Date: Wed, 17 Jun 2020 11:45:17 +0200 Subject: [PATCH v4] gnu: Add widelands. * gnu/local.mk (widelands): New variable. * gnu/packages/patches/widelands-system-wide_minizip.patch: New file. (dist_patch_DATA): Register file above. Co-authored-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/games.scm | 109 +++++++++++++ .../widelands-system-wide_minizip.patch | 153 ++++++++++++++++++ 3 files changed, 263 insertions(+) create mode 100644 gnu/packages/patches/widelands-system-wide_minizip.patch diff --git a/gnu/local.mk b/gnu/local.mk index fd3cc88af5..b9cd455fa0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1592,6 +1592,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/wicd-get-selected-profile-fix.patch \ %D%/packages/patches/wicd-urwid-1.3.patch \ %D%/packages/patches/wicd-wpa2-ttls.patch \ + %D%/packages/patches/widelands-system-wide_minizip.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 39669ba1c9..9407966151 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4018,6 +4018,115 @@ tactics.") license:gpl2+ license:lgpl2.1+)))) =20 +(define-public widelands + (package + (name "widelands") + (version "20") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/widelands/" + "build" version "/build" version "/+download/" + "widelands-build" version ".tar.bz2")) + (sha256 + (base32 "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/third_party/minizip") + #t)) + (patches + ;; Use system Minizip. Following patch is included in "debian/" + ;; sub-directory. This is discussed upstream at + ;; . + (search-patches "widelands-system-wide_minizip.patch")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (let* ((out (assoc-ref %outputs "out")) + (share (string-append out "/share"))) + (list (string-append "-DCMAKE_INSTALL_PREFIX=3D" out "/bin") + (string-append "-DWL_INSTALL_BASEDIR=3D" share "/widelands") + (string-append "-DWL_INSTALL_DATADIR=3D" share "/widelands") + ;; CMakeLists.txt does not handle properly RelWithDebInfo b= uild + ;; type. When used, no game data is installed! + "-DCMAKE_BUILD_TYPE=3DRelease" + "-DOPTION_BUILD_WEBSITE_TOOLS=3DOFF")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'install-desktop-file-and-icons + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/shar= e")) + (applications (string-append share "/applications")) + (icons (string-append share "/icons/hicolor"))) + ;; Move desktop entry. + (mkdir-p applications) + (copy-file "debian/org.widelands.widelands.desktop" + (string-append applications "/widelands.desktop"= )) + ;; Install icons. + (for-each (lambda (size) + (let* ((dim (string-append size "x" size)) + (apps (string-append icons "/" dim "/app= s"))) + (mkdir-p apps) + (copy-file (string-append "data/images/logos" + "/wl-ico-" size ".p= ng") + (string-append apps "/widelands.pn= g")))) + '("16" "32" "48" "64" "128")) + #t))) + (add-after 'unpack 'unbundle-fonts + ;; Unbundle fonts already packaged in Guix. XXX: missing fonts= are + ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala. + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "data/i18n/fonts" + (for-each (lambda (font) + (delete-file-recursively font) + (symlink (string-append (assoc-ref inputs font) + "/share/fonts/truetype") + font)) + '("DejaVu" "MicroHei"))) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("python" ,python-wrapper))) + (inputs + `(("boost" ,boost) + ("glew" ,glew) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("minizip" ,minizip) + ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) + ("zlib" ,zlib) + ;; Fonts for the =E2=80=98unbundle-fonts=E2=80=99 phase. Case matt= ers in name! + ("DejaVu" ,font-dejavu) + ("MicroHei" ,font-wqy-microhei))) + (home-page "https://www.widelands.org/") + (synopsis "Fantasy real-time strategy game") + (description + "In Widelands, you are the regent of a small clan. You start out with +nothing but your headquarters, where all your resources are stored. + +In the course of the game, you will build an ever growing settlement. Eve= ry +member of your clan will do his or her part to produce more resources---wo= od, +food, iron, gold and more---to further this growth. The economic network = is +complex and different in the four tribes (Barbarians, Empire, Atlanteans, = and +Frisians). + +As you are not alone in the world, you will meet other clans sooner or lat= er. +Some of them may be friendly and you may eventually trade with them. Howe= ver, +if you want to rule the world, you will have to train soldiers and fight. + +Widelands offers single-player mode with different campaigns; the campaigns +all tell stories of tribes and their struggle in the Widelands universe! +However, settling really starts when you unite with friends over the Inter= net +or LAN to build up new empires together---or to crush each other in the du= sts +of war. Widelands also offers an Artificial Intelligence to challenge you= .") + ;; Game is released as GPL2+. Some parts, e.g., art, are released und= er + ;; different licenses. + (license (list license:gpl2+ + license:expat ;src/third_party/eris + license:silofl1.1 ;Widelands.ttf + license:cc-by-sa3.0)))) ;some music files + (define-public starfighter (package (name "starfighter") diff --git a/gnu/packages/patches/widelands-system-wide_minizip.patch b/gnu= /packages/patches/widelands-system-wide_minizip.patch new file mode 100644 index 0000000000..1fac0d5396 --- /dev/null +++ b/gnu/packages/patches/widelands-system-wide_minizip.patch @@ -0,0 +1,153 @@ +Description: use the system-wide minizip instead of the embeeded one if fo= und. +Forwarded-Upstream: It was provided by upstream: http://bazaar.launchpad.n= et/~widelands-dev/widelands/b19-debian/revision/8147 + . + Thanks to F=C3=B2ram na G=C3=A0idhlig for the patch. +=20 +I just added this line to make its use easier: + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Modul= es) + +=3D=3D=3D modified file 'CMakeLists.txt' +--- + CMakeLists.txt | 3 +++ + Modules/FindMinizip.cmake | 37 +++++++++++++++++++++++++++++++= ++++++ + cmake/WlFunctions.cmake | 7 +++++++ + src/io/CMakeLists.txt | 2 +- + src/third_party/CMakeLists.txt | 20 +++++++++++--------- + src/third_party/minizip/README.txt | 4 ++++ + 6 files changed, 63 insertions(+), 10 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,6 +43,7 @@ + endif(POLICY CMP0074) +=20 + include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake") ++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Module= s) +=20 + option(OPTION_USE_GLBINDING "Use glbinding instead of GLEW" OFF) + option(OPTION_GLEW_STATIC "Use static GLEW Library" OFF) +@@ -105,6 +106,8 @@ + find_package(SDL2_ttf REQUIRED) + find_package(ZLIB REQUIRED) + find_package(ICU REQUIRED) ++find_package(Minizip) ++ + if(OPTION_USE_GLBINDING) + find_package(glbinding REQUIRED) + else() +--- /dev/null ++++ b/Modules/FindMinizip.cmake +@@ -0,0 +1,37 @@ ++# - Try to find Minizip ++# Once done this will define ++#=20=20 ++# MINIZIP_FOUND - system has MINIZIP ++# MINIZIP_INCLUDE_DIR - the MINIZIP include directory ++# MINIZIP_LIBRARY_DIR - where the libraries are ++# MINIZIP_LIBRARY - Link these to use MINIZIP ++#=20=20=20 ++ ++IF (MINIZIP_INCLUDE_DIR) ++ # Already in cache, be silent ++ SET(MINIZIP_FIND_QUIETLY TRUE) ++ENDIF (MINIZIP_INCLUDE_DIR) ++ ++FIND_PATH( MINIZIP_INCLUDE_DIR=20 ++ NAMES zip.h unzip.h ioapi.h ++ PATHS /usr/local/include /usr/include ++ PATH_SUFFIXES minizip/ ) ++SET( MINIZIP_NAMES minizip MINIZIP ) ++FIND_LIBRARY( MINIZIP_LIBRARY ++ NAMES ${MINIZIP_NAMES} ++ PATHS /usr/lib /usr/local/lib ) ++ ++GET_FILENAME_COMPONENT( MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} PATH ) ++ ++IF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ SET(MINIZIP_FOUND TRUE) ++ SET(MINIZIP_LIBRARY_DIR ${MINIZIP_LIBRARY} ) ++ IF (NOT MINIZIP_FIND_QUIETLY) ++ MESSAGE (STATUS "Found Minizip: ${MINIZIP_LIBRARY} ${MINIZIP_INCLUDE= _DIR}") ++ ENDIF (NOT MINIZIP_FIND_QUIETLY) ++ELSE (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ SET( MINIZIP_FOUND FALSE ) ++ SET( MINIZIP_LIBRARY_DIR ) ++ SET( MINIZIP_EXTRA_DEFINITIONS ) ++ENDIF (MINIZIP_INCLUDE_DIR AND MINIZIP_LIBRARY) ++ +--- a/cmake/WlFunctions.cmake ++++ b/cmake/WlFunctions.cmake +@@ -81,6 +81,14 @@ + if(ARG_USES_ZLIB) + wl_include_system_directories(${NAME} ${ZLIB_INCLUDE_DIRS}) + target_link_libraries(${NAME} ${ZLIB_LIBRARY}) ++ if (MINIZIP_FOUND) ++ wl_include_system_directories(${NAME} ${MINIZIP_INCLUDE_DIR}) ++ target_link_libraries(${NAME} ${MINIZIP_LIBRARY}) ++ target_compile_definitions(${NAME} PUBLIC -DHAVE_SYSTEM_MINIZIP) ++ else(MINIZIP_FOUND) ++ target_link_libraries(${NAME} third_party_minizip) ++ message(FATAL_ERROR "You are using widelands-bundled minizip source= s. Please install your distribution's minizip dev library or urge your dist= ribution maintainer to include the minizip library in your package reposito= ry. Thank you.") ++ endif(MINIZIP_FOUND) + endif() +=20 + # OpenGL and GLEW are one thing for us. If you use the one, you also us= e the +--- a/src/third_party/CMakeLists.txt ++++ b/src/third_party/CMakeLists.txt +@@ -1,12 +1,14 @@ +-wl_library(third_party_minizip +- THIRD_PARTY +- SRCS +- minizip/ioapi.h +- minizip/unzip.cc +- minizip/unzip.h +- minizip/zip.h +- USES_ZLIB +-) ++if(NOT MINIZIP_FOUND) ++ wl_library(third_party_minizip ++ THIRD_PARTY ++ SRCS ++ ioapi.h ++ unzip.cc ++ unzip.h ++ zip.h ++ USES_ZLIB ++ ) ++endif(NOT MINIZIP_FOUND) +=20 + wl_library(third_party_eris + THIRD_PARTY +--- a/src/io/filesystem/CMakeLists.txt ++++ b/src/io/filesystem/CMakeLists.txt +@@ -12,6 +12,7 @@ + zip_exceptions.h + zip_filesystem.cc + zip_filesystem.h ++ USES_ZLIB + DEPENDS + base_exceptions + base_i18n +@@ -19,5 +20,4 @@ + base_macros + graphic_text_layout + io_stream +- third_party_minizip + ) +--- a/src/io/filesystem/zip_filesystem.h ++++ b/src/io/filesystem/zip_filesystem.h +@@ -28,8 +28,14 @@ + #include "io/filesystem/filesystem.h" + #include "io/streamread.h" + #include "io/streamwrite.h" ++ ++#ifndef HAVE_SYSTEM_MINIZIP + #include "third_party/minizip/unzip.h" + #include "third_party/minizip/zip.h" ++#else ++#include ++#include ++#endif +=20 + class ZipFilesystem : public FileSystem { + public: --=20 2.26.2 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 19 17:14:38 2020 Received: (at 40035) by debbugs.gnu.org; 19 Jun 2020 21:14:38 +0000 Received: from localhost ([127.0.0.1]:56945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmOLN-0005Eg-Ov for submit@debbugs.gnu.org; Fri, 19 Jun 2020 17:14:37 -0400 Received: from tobias.gr ([80.241.217.52]:38350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmOLK-0005EV-BK for 40035@debbugs.gnu.org; Fri, 19 Jun 2020 17:14:36 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id f8dc666c; Fri, 19 Jun 2020 21:14:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:references:in-reply-to:message-id:date:mime-version :content-type; s=2018; i=me@tobias.gr; bh=6hAbdDvOtOrvbJpI9jrgyK Zjqg/tenGTlo5vHbtSgo0=; b=HjQnwJLtWAbkM+dFY+w19UyC0JEn3zDRkHvuLV /LVKhR/CZjMfTFZUosJ478FsyenQxBUAevs2QZy+OzXLtmbjc8e9Zy40OICFrpQ8 Iyc2wkbdgONfsluXYwHQj7uiVQ5FdGDOEAyiXN/OuwnooRCsoHnXvVmUxI57wEWK 4cy6Ta7kNcZ4dweYYjP0qPFKGn5Zga8go4hkcYtik43UFuaRNTlyZ5ZujVi612wN RDt/pqD5r+fAWK6Wpb5Tt5BP/DGlXMLj6bZpPp94fFX5ju/RzkmqCM3SQtinnr5p 7bGMroZi1j34ZNZwQ6NmutrKDM2QBKtJesKD/y2Kmu3IdBTw== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id b433fde6 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Fri, 19 Jun 2020 21:14:32 +0000 (UTC) BIMI-Selector: v=BIMI1; s=default; From: Tobias Geerinckx-Rice To: Nicolas Goaziou Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> <87lfkk83ws.fsf@nicolasgoaziou.fr> <871rmbw92x.fsf@nckx> <87366q287d.fsf@nicolasgoaziou.fr> In-reply-to: <87366q287d.fsf@nicolasgoaziou.fr> Message-ID: <87eeqan4ga.fsf@nckx> Date: Fri, 19 Jun 2020 23:14:29 +0200 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 40035 Cc: Alberto EFG , 40035@debbugs.gnu.org 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: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Nicolas, Thanks, I got slaughtered by Barbarians on the bus >:-( Nicolas Goaziou =E5=86=99=E9=81=93=EF=BC=9A > It is shipped in "debian/" subdir. I mentioned it in a comment. I don't get it: there's a debian/ subdir in the tarball. It does=20 not contain this patch. It's not here[0] either. I'm not=20 familiar enough with Widelands/Debian packaging to know where else=20 to look. It's not the end of the world though. It'll be gone by=20 the next build. > Are you sure? For example, I see GPL2 for Culmus, but it doesn't=20 > mention > "only" anywhere. From=20data/i18n/fonts/Culmus/TaameyFrankCLM-Bold.ttf (yes, I opened=20 the TTF file in =E2=80=98less=E2=80=99, shoot me): Distributed under the terms of GNU General Public License version 2(http://www.gnu.org/licenses/gpl.html). So GPL2-only. > Also, Debian's copyright file considers it GPL2+. Quite the opposite[1]: Files: data/i18n/fonts/Culmus/* Copyright: 2010 by Yoram Gnat (gyoramg@users.sourceforge.net). License: GPL-2 I'm not lawyerly enough to know if the combined work can be=20 distributed as GPL2+. I don't see how. I'd love to be proved=20 wrong! Kind regards, T G-R [0]: https://github.com/widelands/widelands/tree/master/debian [1]:=20 https://metadata.ftp-master.debian.org/changelogs//main/w/widelands/widelan= ds_20-2_copyright --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXu0qtQAKCRANsP+IT1Vt ed/vAP9Zz/KgaG++Kg0iJ3ZMhInjqUFx1oIegA/g3HNqNnB9xgD+KBkToVWAuRKw z2y3qQ3gSZfDd42javH9MxkNZ7Sfzw8= =z1Cn -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 19 17:55:41 2020 Received: (at 40035) by debbugs.gnu.org; 19 Jun 2020 21:55:41 +0000 Received: from localhost ([127.0.0.1]:56976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmOz7-0008R2-FL for submit@debbugs.gnu.org; Fri, 19 Jun 2020 17:55:41 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:35063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmOz3-0008Qm-Ud for 40035@debbugs.gnu.org; Fri, 19 Jun 2020 17:55:40 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id AE524240007; Fri, 19 Jun 2020 21:55:30 +0000 (UTC) From: Nicolas Goaziou To: Tobias Geerinckx-Rice Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> <87lfkk83ws.fsf@nicolasgoaziou.fr> <871rmbw92x.fsf@nckx> <87366q287d.fsf@nicolasgoaziou.fr> <87eeqan4ga.fsf@nckx> Date: Fri, 19 Jun 2020 23:55:29 +0200 In-Reply-To: <87eeqan4ga.fsf@nckx> (Tobias Geerinckx-Rice's message of "Fri, 19 Jun 2020 23:14:29 +0200") Message-ID: <87sgeqzpny.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40035 Cc: Alberto EFG , 40035@debbugs.gnu.org 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.7 (-) Tobias Geerinckx-Rice writes: > I don't get it: there's a debian/ subdir in the tarball. It does not > contain this patch. It's not here[0] either. I'm not familiar enough > with Widelands/Debian packaging to know where else to look. It's not > the end of the world though. It'll be gone by the next build. I was confused. The patch comes from Debian's package[=C2=B9], not from upstream. >> Also, Debian's copyright file considers it GPL2+. > > Quite the opposite[1]: > > Files: data/i18n/fonts/Culmus/* > Copyright: 2010 by Yoram Gnat (gyoramg@users.sourceforge.net). > License: GPL-2 Oh! You're right. > I'm not lawyerly enough to know if the combined work can be > distributed as GPL2+. I don't see how. I'd love to be proved wrong! Debian does it nonetheless[=C2=B2]. [=C2=B9] https://salsa.debian.org/games-team/widelands/-/tree/master/debia= n/patches [=C2=B2] https://salsa.debian.org/games-team/widelands/-/blob/master/debia= n/copyright Regards, From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 21 02:34:41 2020 Received: (at 40035) by debbugs.gnu.org; 21 Jun 2020 06:34:41 +0000 Received: from localhost ([127.0.0.1]:59149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmtYu-0003w6-QS for submit@debbugs.gnu.org; Sun, 21 Jun 2020 02:34:41 -0400 Received: from flashner.co.il ([178.62.234.194]:53398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmtYr-0003vp-I0 for 40035@debbugs.gnu.org; Sun, 21 Jun 2020 02:34:39 -0400 Received: from localhost (unknown [31.210.181.184]) by flashner.co.il (Postfix) with ESMTPSA id 4F22C40056; Sun, 21 Jun 2020 06:34:31 +0000 (UTC) Date: Sun, 21 Jun 2020 09:33:58 +0300 From: Efraim Flashner To: Jonathan Brielmaier Subject: Re: [bug#40035] Add widelands game Message-ID: <20200621063358.GA2024@E5400> References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> <87lfkk83ws.fsf@nicolasgoaziou.fr> <9e375eb8-839c-7dac-173d-2f2a23075a3c@web.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tKW2IUtsqtDRztdT" Content-Disposition: inline In-Reply-To: <9e375eb8-839c-7dac-173d-2f2a23075a3c@web.de> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 40035 Cc: Alberto EFG , Nicolas Goaziou , 40035@debbugs.gnu.org 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 (-) --tKW2IUtsqtDRztdT Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 19, 2020 at 12:58:02AM +0200, Jonathan Brielmaier wrote: > On 18.06.20 23:22, Nicolas Goaziou wrote: > > Hello, > > > > I integrated the previous suggestions. I am not sure about the version > > string. Upstream seems to use "build-20", and most distributions use > > "20", some use "build20" or "b20". I used "build20" because it makes it > > easier to build the download URL. >=20 > Couldn't we just use the most recent tag on Github? > https://github.com/widelands/widelands/releases/tag/bzr9203 >=20 > > + (home-page "https://www.widelands.org/") > > + (synopsis "Fantasy real-time strategy game") > > + (description > > + "Widelands is a real-time strategy game with singleplayer campaig= ns and > > +multiplayer mode, aiming for gameplay similar to Settlers II by BlueBy= te. > > + > > +In this game, you start out on a small piece of land with nothing more= than > > +a few of useful resources. Using those, you can build yourself an emp= ire with > > +many thousands of inhabitants. On your way towards this goal, you wil= l have > > +to build up an economic infrastructure, explore the lands around you a= nd face > > +enemies who are trying to rule the world just like you do.") >=20 > Are we allowed to just copy descriptions from Debian packages? Is this > license compatible? We do sometimes just grab the license from Debian. Sometimes it's just more convenient when a description is missing or is marketing speak. Infact, for widelands, the description as they've written is under the GPL2+ https://sources.debian.org/src/widelands/1:20-2/debian/copyright/#L65 --=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 --tKW2IUtsqtDRztdT Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl7u/1MACgkQQarn3Mo9 g1G0xBAAk4Rnyaph+ioAaKSl4dLsSndZSRdWLTE+2Su1TAs5QqjZPxf1fQV4opdk /ZgwydHri7+Fa24XJCf8Xxy6exXG+Um3lI8BHtbHQMIcMWeduG4UmE5U1TJ/8aHM VfZZQklW3YVpJv1+kOxnT4A09zy8Di2ILG5nAWz7ctnlubtw0f9fzhMmlf82j1OS nz3eDsRn9oV4jJtu3faUQVoWVKnwk4hZSR1XKh7NqiqbyVYmnz4vT0seQMNWPDoe Nifufe84hKOUbUfqT5BfthcRzVehS3Mg4xCHTfA0DewzPpfUt1fL9gbuW1UhWs/H 6l9GKlUeEnek8UZ7Oa6e2U/+pRVA91yZX2V22C8TvnaJeT/3AlTLJWkP7/HqS/Le jm7WGpw6dwat3OTNa57wlx24TC3cr7uD5ijTjeDn15B6W1tAc2NK4tyJX8NeKXUk UppFSk5vueIfRvEJtVS77ffUyrI7AUiFDnjSNaNXjZ6WZqwEfXOi9QMidgDkGkE5 /mNeVFfxE3ONe/Kq4ZGPGqLjEuvE3tmtzMz4n/AU/TXsHOr+n8casLO1Co1lxbgE 91Sv8TFEK+MmOndwvSzTC56Yim55na/F6w2VEq79uaWSYg1+SD+XyAfJ8nTl0670 B6vnS91b/FkrartKHfvHYeLeqgGfi510qPfoWWo4qDrcNib5XKA= =77JW -----END PGP SIGNATURE----- --tKW2IUtsqtDRztdT-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 30 11:50:50 2020 Received: (at 40035-done) by debbugs.gnu.org; 30 Jun 2020 15:50:50 +0000 Received: from localhost ([127.0.0.1]:51508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqIX4-0007BN-AM for submit@debbugs.gnu.org; Tue, 30 Jun 2020 11:50:50 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:39483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqIX2-0007B8-0l for 40035-done@debbugs.gnu.org; Tue, 30 Jun 2020 11:50:48 -0400 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 1EDFA40003; Tue, 30 Jun 2020 15:50:39 +0000 (UTC) From: Nicolas Goaziou To: Tobias Geerinckx-Rice Subject: Re: [bug#40035] Add widelands game References: <87o8t2gpqx.fsf@posteo.mx> <87imj9skzr.fsf@nicolasgoaziou.fr> <87k13pkku4.fsf@posteo.mx> <874kussm8q.fsf@nicolasgoaziou.fr> <87lfkk83ws.fsf@nicolasgoaziou.fr> <871rmbw92x.fsf@nckx> <87366q287d.fsf@nicolasgoaziou.fr> <87eeqan4ga.fsf@nckx> <87sgeqzpny.fsf@nicolasgoaziou.fr> Date: Tue, 30 Jun 2020 17:50:36 +0200 In-Reply-To: <87sgeqzpny.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Fri, 19 Jun 2020 23:55:29 +0200") Message-ID: <87v9j8h7sj.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40035-done Cc: Alberto EFG , 40035-done@debbugs.gnu.org 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.7 (-) Hello, Nicolas Goaziou writes: >> I'm not lawyerly enough to know if the combined work can be >> distributed as GPL2+. I don't see how. I'd love to be proved wrong! > > Debian does it nonetheless[=C2=B2]. Since there was no further comment, I pushed widelands. We can always reconsider the license later.=20 Thank you for the feedback, and to Alberto for writing the patch in the first place. Regards, --=20 Nicolas Goaziou From unknown Sun Jun 22 20:55:57 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 29 Jul 2020 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator