From patchwork Sat Jul 1 14:14:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 51487 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3385427BBEA; Sat, 1 Jul 2023 15:15:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 837C327BBE2 for ; Sat, 1 Jul 2023 15:15:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFbNQ-0007MM-Gr; Sat, 01 Jul 2023 10:15:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFbNO-0007Lo-LA for guix-patches@gnu.org; Sat, 01 Jul 2023 10:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFbNO-0004eU-B1 for guix-patches@gnu.org; Sat, 01 Jul 2023 10:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFbNO-0003TS-1H for guix-patches@gnu.org; Sat, 01 Jul 2023 10:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64362] [PATCH v1 3/3] gnu: Add mc2mt. References: In-Reply-To: Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jul 2023 14:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64362 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64362@debbugs.gnu.org Cc: Liliana Marie Prikler Received: via spool by 64362-submit@debbugs.gnu.org id=B64362.168822087113291 (code B ref 64362); Sat, 01 Jul 2023 14:15:01 +0000 Received: (at 64362) by debbugs.gnu.org; 1 Jul 2023 14:14:31 +0000 Received: from localhost ([127.0.0.1]:58416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFbMs-0003SI-ER for submit@debbugs.gnu.org; Sat, 01 Jul 2023 10:14:30 -0400 Received: from knopi.disroot.org ([178.21.23.139]:36674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFbMn-0003S2-TF for 64362@debbugs.gnu.org; Sat, 01 Jul 2023 10:14:28 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1965844F38; Sat, 1 Jul 2023 16:14:21 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vsMDaMJvECPy; Sat, 1 Jul 2023 16:14:19 +0200 (CEST) Message-ID: <9f2d5602-eec5-88b3-53b4-201c79032fed@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1688220859; bh=Pl8yser97oh2LJEexHLvG76s05Xn2VASe39q1CTcdqE=; h=Date:To:Cc:From:Subject; b=ZiVab8ed1I+BlsWm7Bj4fbRGaFKTu5BlXlWQbWHkFhHIny11XyyAMClzI8aE3KOUV iDJ45AYD5ic0RuxAVUxX06lqFzryEYUW9DfrwokNfqFx+BYVyrrhJ02Ic3ar3k9ISJ s6ColOHgG/mgJpqEKLXkG2Lfow+pCOvsWYOO6pbifhDblWUspZYAkaLjZyx1GgemeW MlhxO2sgq5y3aCWou1VT73PzRiBHkMiwAQQ80u9CxltxGr3NjsPvBTVOxGnwcL5+ad QFSb6OrLlNakNIYppQASvuyCpbDYaRFw4Z8kLvwc69RdyuGWKP3Kj62RU0sHuYQ1fU 46e/PdlmwydsA== Date: Sat, 1 Jul 2023 22:14:15 +0800 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 2722ee387376473ee28f910f2a15c4e983be4172 Mon Sep 17 00:00:00 2001 Message-Id: <2722ee387376473ee28f910f2a15c4e983be4172.1688220784.git.adam.faiz@disroot.org> From: AwesomeAdam54321 Date: Fri, 30 Jun 2023 16:56:23 +0800 Subject: [PATCH v1 3/3] gnu: Add mc2mt. * gnu/packages/game-development.scm (mc2mt): New variable. * gnu/packages/patches/mc2mt-add-packaging-support.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/packages/game-development.scm | 32 +++++++ .../patches/mc2mt-add-packaging-support.patch | 86 +++++++++++++++++++ 3 files changed, 119 insertions(+) create mode 100644 gnu/packages/patches/mc2mt-add-packaging-support.patch base-commit: f25529b08e356f89ca7cecc44295085531a8faba diff --git a/gnu/local.mk b/gnu/local.mk index b4e8fd0b42..57cae21761 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1572,6 +1572,7 @@ dist_patch_DATA = \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ %D%/packages/patches/maven-generate-component-xml.patch \ %D%/packages/patches/maven-generate-javax-inject-named.patch \ + %D%/packages/patches/mc2mt-add-packaging-support.patch \ %D%/packages/patches/mcrl2-fix-1687.patch \ %D%/packages/patches/mcrl2-fix-counterexample.patch \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 503c5e1f73..bb05117714 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -56,6 +56,7 @@ (define-module (gnu packages game-development) #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system scons) #:use-module (gnu packages) @@ -1744,6 +1745,37 @@ (define-public ois (home-page "https://github.com/wgois/OIS") (license license:zlib))) +(define-public mc2mt + (let ((commit "039dbc26466a430e03c646dc5a9bd0822637a87a") + (revision "0")) + (package + (name "mc2mt") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/listia/mc2mt") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vnaznwgm87x0n5dp14363p2h54lpzalynrrd6lbs6wgrqq7fq9i")) + (patches (search-patches "mc2mt-add-packaging-support.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "mc2mtlib/argument_parser.py" + (("mineclone2") "mineclone")))))) + (build-system pyproject-build-system) + (propagated-inputs (list python-anvil-parser)) + (arguments + (list #:tests? #f)) ; no tests + (synopsis "Minecraft to Minetest world converter") + (description "@code{mc2mt} is a Minecraft to Minetest world converter. +It can convert worlds from Minecraft 1.9 and later.") + (home-page "https://github.com/listia/mc2mt") + (license license:expat)))) + (define-public mygui (package (name "mygui") diff --git a/gnu/packages/patches/mc2mt-add-packaging-support.patch b/gnu/packages/patches/mc2mt-add-packaging-support.patch new file mode 100644 index 0000000000..8be32b79e9 --- /dev/null +++ b/gnu/packages/patches/mc2mt-add-packaging-support.patch @@ -0,0 +1,86 @@ +From 84ebbd6001d7cde552dd5b9da5c0528e476ab53d Mon Sep 17 00:00:00 2001 +From: AwesomeAdam54321 +Date: Fri, 30 Jun 2023 22:08:46 +0800 +Subject: [PATCH] mc2mt: Add packaging support. + +* MANIFEST.in: Add it. +* mc2mt.py -> mc2mtlib/mc2mt.py: Move mc2mt.py functionality here. +* mc2mtlib/__init__.py: Import mc2mt. +* pyproject.toml: Add project specification. +--- + MANIFEST.in | 1 + + mc2mtlib/__init__.py | 1 + + mc2mt.py => mc2mtlib/mc2mt.py | 11 +++++++++-- + pyproject.toml | 11 +++++++++++ + 4 files changed, 22 insertions(+), 2 deletions(-) + create mode 100644 MANIFEST.in + rename mc2mt.py => mc2mtlib/mc2mt.py (90%) + mode change 100755 => 100644 + create mode 100644 pyproject.toml + +diff --git a/MANIFEST.in b/MANIFEST.in +new file mode 100644 +index 0000000..d5914df +--- /dev/null ++++ b/MANIFEST.in +@@ -0,0 +1 @@ ++include mc2mtlib/mods/*.json +diff --git a/mc2mtlib/__init__.py b/mc2mtlib/__init__.py +index 047fcf2..315b5dc 100644 +--- a/mc2mtlib/__init__.py ++++ b/mc2mtlib/__init__.py +@@ -1,4 +1,5 @@ + from . import argument_parser ++from . import mc2mt + from . import minetest_world + from . import blob_writer + from . import block_functions +diff --git a/mc2mt.py b/mc2mtlib/mc2mt.py +old mode 100755 +new mode 100644 +similarity index 90% +rename from mc2mt.py +rename to mc2mtlib/mc2mt.py +index 938600b..67affff +--- a/mc2mt.py ++++ b/mc2mtlib/mc2mt.py +@@ -4,10 +4,17 @@ import time + + import anvil + +-from mc2mtlib import * ++from mc2mtlib import argument_parser ++from mc2mtlib import minetest_world ++from mc2mtlib import blob_writer ++from mc2mtlib import block_functions ++from mc2mtlib import block_conversion ++from mc2mtlib import section_conversion ++ ++parse_args = argument_parser.parser.parse_args + + # Main +-if __name__ == '__main__': ++def mc2mt(): + + # Args + args = parse_args() +diff --git a/pyproject.toml b/pyproject.toml +new file mode 100644 +index 0000000..cf9a70d +--- /dev/null ++++ b/pyproject.toml +@@ -0,0 +1,11 @@ ++[build-system] ++requires = ['setuptools'] ++build-backend = 'setuptools.build_meta' ++ ++[project] ++name = 'mc2mt' ++version = '0.1' ++dependencies = ['anvil-parser'] ++ ++[project.scripts] ++mc2mt = 'mc2mtlib:mc2mt.mc2mt' +-- +2.40.1 +