GNU bug report logs - #46146
[PATCH 0/3] Add mdpo and dependencies

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 46146 in the body.
You can then email your comments to 46146 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: EuAndreh <eu <at> euandre.org>
To: guix-patches <at> gnu.org
Cc: EuAndreh <eu <at> euandre.org>
Subject: [PATCH 0/3] Add mdpo and dependencies 
Date: Wed, 27 Jan 2021 20:42:37 -0300

Add the mdpo package, a xgettext-like tool for Markdown.

EuAndreh (3):
  gnu: Add md4c.
  gnu: Add python-pymd4c.
  gnu: Add mdpo.

 gnu/packages/gettext.scm    | 26 +++++++++++++++++++++++++-
 gnu/packages/markup.scm     | 23 +++++++++++++++++++++++
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++--
 3 files changed, 77 insertions(+), 3 deletions(-)

-- 
2.30.0

Message #8 received at 46146 <at> debbugs.gnu.org (full text, mbox):

From: EuAndreh <eu <at> euandre.org>
To: 46146 <at> debbugs.gnu.org
Cc: EuAndreh <eu <at> euandre.org>
Subject: [PATCH 1/3] gnu: Add md4c.
Date: Wed, 27 Jan 2021 20:44:42 -0300

* gnu/packages/markup.scm (md4c): New variable.
---
 gnu/packages/markup.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index af08774c70..95a3eb269e 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017 Nikita <nikita <at> n0.is>
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2020 EuAndreh <eu <at> euandre.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -277,3 +278,25 @@ Smu was started as a rewrite of Markdown but became something more
 lightweight and consistent.  The biggest difference between Markdown
 and smu is that smu doesn't support reference style links.")
     (license x11)))
+
+(define-public md4c
+  (package
+    (name "md4c")
+    (version "0.4.7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mity/md4c/")
+             (commit (string-append "release-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0m3202zzjvw4k7jw66z1qi3cbisxzvplq5alkygpifvhzm81gwwx"))))
+    (build-system cmake-build-system)
+    (arguments '(#:tests? #f))
+    (home-page "https://github.com/mity/md4c/")
+    (synopsis "C Markdown parser compliant to CommonMark")
+    (description "MD4C is a C Markdown parser with a
+SAX-like interface.  It is compliant to the CommonMark specification,
+with a few extensions.")
+    (license expat)))
-- 
2.30.0

Message #11 received at 46146 <at> debbugs.gnu.org (full text, mbox):

From: EuAndreh <eu <at> euandre.org>
To: 46146 <at> debbugs.gnu.org
Cc: EuAndreh <eu <at> euandre.org>
Subject: [PATCH 2/3] gnu: Add python-pymd4c.
Date: Wed, 27 Jan 2021 20:44:43 -0300

* gnu/packages/python-xyz.scm (python-pymd4c): New variable.
---
 gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4b8e538168..4825eb7287 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -94,6 +94,7 @@
 ;;; Copyright © 2020 Leo Prikler <leo.prikler <at> student.tugraz.at>
 ;;; Copyright © 2019 Kristian Trandem <kristian <at> devup.no>
 ;;; Copyright © 2020 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2020 EuAndreh <eu <at> euandre.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -196,6 +197,7 @@
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages serialization)
+  #:use-module (gnu packages markup)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -23406,3 +23408,28 @@ Qt applications.")
       "Pivy provides python bindings for Coin, a 3D graphics library with an
 Application Programming Interface based on the Open Inventor 2.1 API.")
     (license license:isc)))
+
+(define-public python-pymd4c
+  (package
+    (name "python-pymd4c")
+    (version "0.4.6.0b1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pymd4c" version))
+       (sha256
+        (base32
+         "07s3arn85ri92im6x3ipljdmrxmpik7irs06i6lm17j1x6j9841d"))))
+    (build-system python-build-system)
+    (inputs
+     `(("md4c" ,md4c)))
+    (native-inputs
+     `(("python-flake8" ,python-flake8)
+       ("python-pkgconfig" ,python-pkgconfig)
+       ("pkg-config" ,pkg-config)))
+    (home-page
+     "https://github.com/dominickpastore/pymd4c")
+    (synopsis "Python bindings for MD4C")
+    (description "PyMD4C provides Python bindings for MD4c, a C
+Markdown parser, compliant to CommonMark.")
+    (license license:expat)))
-- 
2.30.0

Message #14 received at 46146 <at> debbugs.gnu.org (full text, mbox):

From: EuAndreh <eu <at> euandre.org>
To: 46146 <at> debbugs.gnu.org
Cc: EuAndreh <eu <at> euandre.org>
Subject: [PATCH 3/3] gnu: Add mdpo.
Date: Wed, 27 Jan 2021 20:44:44 -0300

gnu/packages/gettext.scm (mdpo): New variable.
gnu/packages/python-xyz (python-polib): Update to 1.1.0.
---
 gnu/packages/gettext.scm    | 26 +++++++++++++++++++++++++-
 gnu/packages/python-xyz.scm |  4 ++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index de28c2341b..abf6c4ad5a 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2019 Miguel <rosen644835 <at> gmail.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2020 EuAndreh <eu <at> euandre.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,12 +28,13 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gettext)
-  #:use-module ((guix licenses) #:select (gpl2+ gpl3+))
+  #:use-module ((guix licenses) #:select (gpl2+ gpl3+ bsd-3))
   #:use-module (gnu packages)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages hurd)
@@ -42,6 +44,7 @@
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages python-xyz)
   #:use-module (guix utils))
 
 (define-public gettext-minimal
@@ -254,3 +257,24 @@ color, font attributes (weight, posture), or underlining.")
 more interestingly, the maintenance of translations) using gettext tools on
 areas where they were not expected like documentation.")
     (license gpl2+)))
+
+(define-public mdpo
+  (package
+    (name "mdpo")
+    (version "0.3.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "mdpo" version))
+       (sha256
+        (base32
+         "0d5w759k0a8kfyclxdvfihlbmk19vp81w1mh9fc3nx13wcc64581"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-polib" ,python-polib)
+       ("python-pymd4c" ,python-pymd4c)))
+    (home-page "https://github.com/mondeja/mdpo")
+    (synopsis "Markdown file translation utilities using pofiles")
+    (description "The mdpo utility creates pofiles, the format
+stabilished by GNU Gettext, from Markdown files.")
+    (license bsd-3)))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4825eb7287..fe0902ce5d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2234,13 +2234,13 @@ syntax.")
 (define-public python-polib
   (package
     (name "python-polib")
-    (version "1.0.8")
+    (version "1.1.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "polib" version))
                (sha256
                 (base32
-                  "1pq2hbm3m2q0cjdszk8mc4qa1vl3wcblh5nfyirlfnzb2pcy7zss"))))
+                  "0aikb8gcarhifn3sadrbbs5czagih9hjv250gsrgy9v1d49pvn7s"))))
     (build-system python-build-system)
     (home-page "https://bitbucket.org/izi/polib/wiki/Home")
     (synopsis "Manipulate, create and modify gettext files")
-- 
2.30.0

Message #17 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: guix-patches--- via <guix-patches <at> gnu.org>
Cc: 46146-done <at> debbugs.gnu.org, EuAndreh <eu <at> euandre.org>
Subject: Re: [bug#46146] [PATCH 0/3] Add mdpo and dependencies
Date: Tue, 02 Feb 2021 10:30:02 +0100

Hello,

guix-patches--- via <guix-patches <at> gnu.org> writes:

> Add the mdpo package, a xgettext-like tool for Markdown.

I fixed some merge conflicts (please avoid adding new packages at the
end of a file, unless it it is their "natural" place), updated mdpo to
0.3.6 and pushed.

Thank you.

Regards,
-- 
Nicolas Goaziou

Message #25 received at submit <at> debbugs.gnu.org (full text, mbox):

From: EuAndreh <eu <at> euandre.org>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>, guix-patches--- via
 <guix-patches <at> gnu.org>
Cc: , 46146-done <at> debbugs.gnu.org
Subject: Re: bug#46146: [PATCH 0/3] Add mdpo and dependencies
Date: Wed, 03 Feb 2021 09:06:54 -0300

> I fixed some merge conflicts (please avoid adding new packages at the
> end of a file, unless it it is their "natural" place), updated mdpo to
> 0.3.6 and pushed.

How can I best avoid this type of merge conflict in the future? Is
picking a random-ish position on the file a good solution?

Message #31 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: EuAndreh <eu <at> euandre.org>
Cc: 46146-done <at> debbugs.gnu.org, guix-patches--- via <guix-patches <at> gnu.org>
Subject: Re: bug#46146: [PATCH 0/3] Add mdpo and dependencies
Date: Wed, 03 Feb 2021 13:27:47 +0100

Hello,

EuAndreh <eu <at> euandre.org> writes:

>> I fixed some merge conflicts (please avoid adding new packages at the
>> end of a file, unless it it is their "natural" place), updated mdpo to
>> 0.3.6 and pushed.
>
> How can I best avoid this type of merge conflict in the future? Is
> picking a random-ish position on the file a good solution?

Yes, that or alphabetically. It depends on the structure of the file.
Exception is packages inheriting from another package, which must be
located after the latter.

Regards,
-- 
Nicolas Goaziou

Message #37 received at submit <at> debbugs.gnu.org (full text, mbox):

From: EuAndreh <eu <at> euandre.org>
To: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
Cc: , 46146-done <at> debbugs.gnu.org, guix-patches--- via <guix-patches <at> gnu.org>
Subject: Re: bug#46146: [PATCH 0/3] Add mdpo and dependencies
Date: Wed, 03 Feb 2021 16:15:52 -0300

OK, thanks for the tip!

I'll adopt it on my next contribution :)

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.