GNU bug report logs - #39365
LibreOffice 6.4

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 39365 in the body.
You can then email your comments to 39365 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: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: LibreOffice 6.4
Date: Thu, 30 Jan 2020 22:05:09 -0500

[Message part 1 (text/plain, inline)]

These patches update LibreOffice to the new release, 6.4. Works for me!

[signature.asc (application/pgp-signature, inline)]

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

From: Leo Famulari <leo <at> famulari.name>
To: 39365 <at> debbugs.gnu.org
Subject: [PATCH 2/6] gnu: mdds: Update to 1.5.0.
Date: Thu, 30 Jan 2020 22:06:23 -0500

* gnu/packages/boost.scm (mdds): Update to 1.5.0.
---
 gnu/packages/boost.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 0a2a5c5c01..11fb8e1201 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -283,14 +283,14 @@ signals and slots system.")
 (define-public mdds
   (package
     (name "mdds")
-    (version "1.4.3")
+    (version "1.5.0")
     (source (origin
              (method url-fetch)
              (uri (string-append
                    "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2"))
              (sha256
               (base32
-               "10cw6irdm6d15nxnys2v5akp8yz52qijpcjvw0frwq7nz5d3vki5"))))
+               "03b8i43pw4m767mm0cnbi77x7qhpkzpi9b1f6dpp4cmyszmnsk8l"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("boost" ,boost))) ; inclusion of header files
-- 
2.25.0

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

From: Leo Famulari <leo <at> famulari.name>
To: 39365 <at> debbugs.gnu.org
Subject: [PATCH 3/6] gnu: ixion: Update to 0.15.0.
Date: Thu, 30 Jan 2020 22:06:24 -0500

* gnu/packages/libreoffice.scm (ixion): Update to 0.15.0.
[inputs]: Add spdlog.
---
 gnu/packages/libreoffice.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 93474dbdbf..7f1cb6a993 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -67,6 +67,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages logging)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages openldap)
@@ -85,7 +86,7 @@
 (define-public ixion
   (package
     (name "ixion")
-    (version "0.14.1")
+    (version "0.15.0")
     (source
      (origin
        (method url-fetch)
@@ -93,13 +94,14 @@
                            version ".tar.xz"))
        (sha256
         (base32
-         "14gdd6div4l22vnz3jn2qjxgjly98ck6p8c1v7386c41rx7kilba"))))
+         "1rmrl2zjzi4z0abf2cd54acypkccdhx2065dlyzy6xg83gv0mxmi"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
      `(("mdds" ,mdds)
-       ("python" ,python)))
+       ("python" ,python)
+       ("spdlog" ,spdlog)))
     (home-page "https://gitlab.com/ixion/ixion")
     (synopsis "General purpose formula parser and interpreter")
     (description "Ixion is a library for calculating the results of formula
-- 
2.25.0

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

From: Leo Famulari <leo <at> famulari.name>
To: 39365 <at> debbugs.gnu.org
Subject: [PATCH 5/6] gnu: libetonyek: Update MDDS requirement.
Date: Thu, 30 Jan 2020 22:06:26 -0500

* gnu/packages/libreoffice.scm (libetonyek): Put '--with-mdds-1.5'
in #:configure-flags.
---
 gnu/packages/libreoffice.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index cc1eaaebeb..968044f680 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -403,7 +403,7 @@ CorelDRAW documents of all versions.")
                "0jhsbdimiyijdqriy0zzkjjgc4wi6fjimhdg4mdybrlwg7l7f5p6"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--with-mdds=1.4")))
+     `(#:configure-flags '("--with-mdds=1.5")))
     (native-inputs
      `(("cppunit" ,cppunit)
        ("doxygen" ,doxygen)
-- 
2.25.0

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

From: Leo Famulari <leo <at> famulari.name>
To: 39365 <at> debbugs.gnu.org
Subject: [PATCH 4/6] gnu: orcus: Update to 0.15.3.
Date: Thu, 30 Jan 2020 22:06:25 -0500

* gnu/packages/libreoffice.scm (orcus): Update to 0.15.3.
---
 gnu/packages/libreoffice.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 7f1cb6a993..cc1eaaebeb 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -113,7 +113,7 @@ their dependencies automatically upon calculation.")
 (define-public orcus
   (package
     (name "orcus")
-    (version "0.14.1")
+    (version "0.15.3")
     (source
      (origin
        (method url-fetch)
@@ -121,7 +121,7 @@ their dependencies automatically upon calculation.")
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1ays13a1x15j81dsrq0d3697v1bbqd3bfz3ajn6kb9d61y2drlgj"))))
+         "14gbnqsv5n2fm4sxa17014f440clrzls6p2w2ixk9wipg4950v9s"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
2.25.0

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

From: Leo Famulari <leo <at> famulari.name>
To: 39365 <at> debbugs.gnu.org
Subject: [PATCH 1/6] gnu: Add qrcodegen-cpp.
Date: Thu, 30 Jan 2020 22:06:22 -0500

* gnu/packages/aidc.scm (qrcodegen-cpp): New variable.
---
 gnu/packages/aidc.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 77db0ac9fc..b68f2137be 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2017 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv <at> posteo.net>
+;;; Copyright © 2020 Leo Famulari <leo <at> famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -154,3 +155,41 @@ For application developers, language bindings are included for C, C++ and
 Python as well as GUI widgets for GTK and Qt.")
     (home-page "https://github.com/mchehab/zbar")
     (license license:lgpl2.1+)))
+
+(define-public qrcodegen-cpp
+  ;; Currently this project's installation mechanism only exists as a GitHub
+  ;; pull request, so we build from a recent commit that the proposed patch
+  ;; applies to.
+  (let ((commit "6ea933f1596d818bd21e9a6b8d2e851fb8b4bcf1")
+        (revision "0"))
+    (package
+      (name "qrcodegen-cpp")
+      (version (git-version "1.5.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://github.com/nayuki/QR-Code-generator.git")
+                       (commit commit)))
+                (file-name (git-file-name name version))
+                (patches (search-patches "qrcodegen-cpp-make-install.patch"))
+                (sha256
+                 (base32
+                  "19fcwqmfk2n9p2n01dv2j4x2y2mqip0j1wbmfbxjp34rqkjwcwxm"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ; no test suite
+         #:make-flags
+         (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'configure) ; No ./configure script
+           ;; Only build the C++ variant.
+           (add-after 'unpack 'chdir
+             (lambda _
+               (chdir "cpp")
+               #t)))))
+      (synopsis "QR Code generator library")
+      (description "qrcodegen-cpp is a QR code generator library in C++.  The
+project also offers Java, Javascript, Python, C, and Rust implementations.")
+      (home-page "https://www.nayuki.io/page/qr-code-generator-library")
+      (license license:expat))))
-- 
2.25.0

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

From: Leo Famulari <leo <at> famulari.name>
To: 39365 <at> debbugs.gnu.org
Subject: [PATCH 6/6] gnu: LibreOffice: Update to 6.4.0.3.
Date: Thu, 30 Jan 2020 22:06:27 -0500

* gnu/packages/libreoffice.scm (libreoffice): Update to 6.4.0.3.
[inputs]: Add qrcodegen-cpp.
[source]: Remove obsolete patches and substitutions.
* gnu/packages/patches/libreoffice-glm.patch,
gnu/packages/patches/libreoffice-icu.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
---
 gnu/local.mk                               |   2 -
 gnu/packages/libreoffice.scm               |  16 +--
 gnu/packages/patches/libreoffice-glm.patch |  58 ----------
 gnu/packages/patches/libreoffice-icu.patch | 126 ---------------------
 4 files changed, 4 insertions(+), 198 deletions(-)
 delete mode 100644 gnu/packages/patches/libreoffice-glm.patch
 delete mode 100644 gnu/packages/patches/libreoffice-icu.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index aa8e6e0d0d..f606dcbc89 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1106,8 +1106,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/libmpeg2-global-symbol-test.patch	\
   %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch		\
   %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch	\
-  %D%/packages/patches/libreoffice-icu.patch			\
-  %D%/packages/patches/libreoffice-glm.patch			\
   %D%/packages/patches/libseccomp-open-aarch64.patch		\
   %D%/packages/patches/libsndfile-armhf-type-checks.patch	\
   %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch	\
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 968044f680..5eec29a9d6 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -41,6 +41,7 @@
   #:use-module (guix utils)
   #:use-module (ice-9 match)
   #:use-module (gnu packages)
+  #:use-module (gnu packages aidc)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
@@ -930,7 +931,7 @@ converting QuarkXPress file format.  It supports versions 3.1 to 4.1.")
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "6.3.4.2")
+    (version "6.4.0.3")
     (source
      (origin
        (method url-fetch)
@@ -940,17 +941,7 @@ converting QuarkXPress file format.  It supports versions 3.1 to 4.1.")
          (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
        (sha256
         (base32
-         "1774vmf3lr5x24ikpn1z5vqcdwrhiwfkjy7sx09jqkvpm6d5awnb"))
-       (patches (search-patches "libreoffice-icu.patch"
-                                "libreoffice-glm.patch"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (for-each (lambda (file)
-                       ;; Adjust to renamed function in Poppler 0.72.
-                       (substitute* file (("getCString") "c_str")))
-                     (find-files "sdext/source/pdfimport/xpdfwrapper"))
-           #t))))
+         "09ra8a3ylb08xhy8wy233fs0f87klkpsbi9n3zss0c688afxjcf5"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("bison" ,bison)
@@ -1023,6 +1014,7 @@ converting QuarkXPress file format.  It supports versions 3.1 to 4.1.")
        ("postgresql" ,postgresql)
        ("python" ,python)
        ("python-lxml" ,python-lxml)
+       ("qrcodegen-cpp" ,qrcodegen-cpp)
        ("redland" ,redland)
        ("sane-backends" ,sane-backends)
        ("unixodbc" ,unixodbc)
diff --git a/gnu/packages/patches/libreoffice-glm.patch b/gnu/packages/patches/libreoffice-glm.patch
deleted file mode 100644
index 9e76cf1389..0000000000
--- a/gnu/packages/patches/libreoffice-glm.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Fix build with GLM 0.9.9.
-
-This patch is an amalgamation of these upstream commits:
-
-https://github.com/LibreOffice/core/commit/953c4add8fd76d88f49a81ae4c21a1fdcc007e57
-https://github.com/LibreOffice/core/commit/5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa
-
-diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
-index 28bc87b89057..69d4c0552636 100644
---- a/chart2/Library_chartcore.mk
-+++ b/chart2/Library_chartcore.mk
-@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\
-     -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
- ))
- 
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Library_add_defs,chartcore,\
-+        -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-+
- $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
- 
- $(eval $(call gb_Library_use_externals,chartcore,\
-diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
-index c1f3cc5324e7..0b684c6185a9 100644
---- a/vcl/Library_vcl.mk
-+++ b/vcl/Library_vcl.mk
-@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
- 	-DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
- ))
- 
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Library_add_defs,vcl,\
-+        -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-+
- $(eval $(call gb_Library_use_sdk_api,vcl))
- 
- $(eval $(call gb_Library_use_custom_headers,vcl,\
-diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
-index ce163303f8a4..8c917b71cd0e 100644
---- a/vcl/Executable_icontest.mk
-+++ b/vcl/Executable_icontest.mk
-@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
- ))
- endif
- 
-+ifeq ($(SYSTEM_GLM),TRUE)
-+$(eval $(call gb_Executable_add_defs,icontest,\
-+    -DGLM_ENABLE_EXPERIMENTAL \
-+))
-+endif
-+
- $(eval $(call gb_Executable_use_api,icontest,\
-     offapi \
-     udkapi \
diff --git a/gnu/packages/patches/libreoffice-icu.patch b/gnu/packages/patches/libreoffice-icu.patch
deleted file mode 100644
index 2985d564aa..0000000000
--- a/gnu/packages/patches/libreoffice-icu.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-This patch fixes the build of Libreoffice 6.0.5 with icu 61.1.
-It was downloaded from https://bugs.gentoo.org/651702.
-
---- a/forms/source/xforms/datatypes.hxx	
-+++ a/forms/source/xforms/datatypes.hxx	
-@@ -36,6 +36,8 @@ 
- 
- #include <memory>
- 
-+using icu::RegexMatcher;
-+
- 
- namespace xforms
- {
---- a/i18npool/inc/collator_unicode.hxx	
-+++ a/i18npool/inc/collator_unicode.hxx	
-@@ -26,6 +26,8 @@ 
- 
- #include <unicode/tblcoll.h>
- 
-+using icu::RuleBasedCollator;
-+
- //      ----------------------------------------------------
- //      class Collator_Unicode
- //      ----------------------------------------------------
---- a/i18npool/source/breakiterator/breakiterator_unicode.cxx	
-+++ a/i18npool/source/breakiterator/breakiterator_unicode.cxx	
-@@ -30,6 +30,9 @@ 
- #include <rtl/ustring.hxx>
- #include <string.h>
- 
-+using icu::BreakIterator;
-+using icu::RuleBasedBreakIterator;
-+
- U_CDECL_BEGIN
- extern const char OpenOffice_dat[];
- U_CDECL_END
---- a/i18npool/source/collator/collator_unicode.cxx	
-+++ a/i18npool/source/collator/collator_unicode.cxx	
-@@ -29,6 +29,8 @@ 
- #include <com/sun/star/i18n/CollatorOptions.hpp>
- #include <cppuhelper/supportsservice.hxx>
- 
-+using icu::Collator;
-+
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::i18n;
- using namespace ::com::sun::star::lang;
---- a/i18npool/source/collator/gencoll_rule.cxx	
-+++ a/i18npool/source/collator/gencoll_rule.cxx	
-@@ -31,6 +31,8 @@ 
- 
- #include <unicode/tblcoll.h>
- 
-+using icu::RuleBasedCollator;
-+
- /* Main Procedure */
- 
- void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len)
---- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx	
-+++ a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx	
-@@ -29,6 +29,8 @@ 
- #include <unicode/normlzr.h>
- #include <memory>
- 
-+using icu::NumberFormat;
-+
- using namespace ::com::sun::star::i18n;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star;
---- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx	
-+++ a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx	
-@@ -12,6 +12,8 @@ 
- #include <unicode/translit.h>
- #include <unicode/uchar.h>
- 
-+using icu::UnicodeString;
-+
- namespace i18npool {
- 
- ignoreDiacritics_CTL::ignoreDiacritics_CTL()
---- a/i18nutil/source/utility/unicode.cxx	
-+++ a/i18nutil/source/utility/unicode.cxx	
-@@ -34,6 +34,9 @@ 
- // which (obviously) breaks UnicodeType::CURRENCY_SYMBOL
- #undef CURRENCY_SYMBOL
- 
-+using icu::NumberFormat;
-+using icu::UnicodeString;
-+
- using namespace ::com::sun::star::i18n;
- 
- template<class L, typename T>
---- a/lotuswordpro/source/filter/localtime.cxx	
-+++ a/lotuswordpro/source/filter/localtime.cxx	
-@@ -57,6 +57,8 @@ 
- #include <limits.h>
- #include <unicode/timezone.h>
- 
-+using icu::TimeZone;
-+
- const long DAY_SEC =24 * 60 * 60;
- const long YEAR_SEC = 365 * DAY_SEC;
- const long FOURYEAR_SEC = 4 * YEAR_SEC + DAY_SEC;
---- a/opencl/source/openclconfig.cxx	
-+++ a/opencl/source/openclconfig.cxx	
-@@ -17,6 +17,8 @@ 
- #include <sal/log.hxx>
- #include <sal/types.h>
- 
-+using icu::RegexMatcher;
-+
- OpenCLConfig::OpenCLConfig() :
-     mbUseOpenCL(true)
- {
---- a/vcl/inc/scrptrun.h	
-+++ a/vcl/inc/scrptrun.h	
-@@ -45,6 +45,8 @@ 
- #include <unicode/uscript.h>
- #include <vector>
- 
-+using icu::UObject;
-+
- namespace vcl {
- 
- struct ParenStackEntry
-- 
2.25.0

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

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Leo Famulari <leo <at> famulari.name>
Cc: 39365 <at> debbugs.gnu.org
Subject: Re: [bug#39365] [PATCH 1/6] gnu: Add qrcodegen-cpp.
Date: Fri, 31 Jan 2020 10:58:51 +0200

[Message part 1 (text/plain, inline)]

On Thu, Jan 30, 2020 at 10:06:22PM -0500, Leo Famulari wrote:
> * gnu/packages/aidc.scm (qrcodegen-cpp): New variable.
> ---
>  gnu/packages/aidc.scm | 39 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)

You're missing the actual patch ;)

> 
> diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
> index 77db0ac9fc..b68f2137be 100644
> --- a/gnu/packages/aidc.scm
> +++ b/gnu/packages/aidc.scm
> @@ -4,6 +4,7 @@
>  ;;; Copyright © 2017 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
>  ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
>  ;;; Copyright © 2019 Guillaume Le Vaillant <glv <at> posteo.net>
> +;;; Copyright © 2020 Leo Famulari <leo <at> famulari.name>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -154,3 +155,41 @@ For application developers, language bindings are included for C, C++ and
>  Python as well as GUI widgets for GTK and Qt.")
>      (home-page "https://github.com/mchehab/zbar")
>      (license license:lgpl2.1+)))
> +
> +(define-public qrcodegen-cpp
> +  ;; Currently this project's installation mechanism only exists as a GitHub
> +  ;; pull request, so we build from a recent commit that the proposed patch
> +  ;; applies to.
> +  (let ((commit "6ea933f1596d818bd21e9a6b8d2e851fb8b4bcf1")
> +        (revision "0"))
> +    (package
> +      (name "qrcodegen-cpp")
> +      (version (git-version "1.5.0" revision commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                       (url "https://github.com/nayuki/QR-Code-generator.git")
> +                       (commit commit)))
> +                (file-name (git-file-name name version))
> +                (patches (search-patches "qrcodegen-cpp-make-install.patch"))
> +                (sha256
> +                 (base32
> +                  "19fcwqmfk2n9p2n01dv2j4x2y2mqip0j1wbmfbxjp34rqkjwcwxm"))))
> +      (build-system gnu-build-system)
> +      (arguments
> +       `(#:tests? #f ; no test suite
> +         #:make-flags
> +         (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
> +         #:phases
> +         (modify-phases %standard-phases
> +           (delete 'configure) ; No ./configure script
> +           ;; Only build the C++ variant.
> +           (add-after 'unpack 'chdir
> +             (lambda _
> +               (chdir "cpp")
> +               #t)))))
> +      (synopsis "QR Code generator library")
> +      (description "qrcodegen-cpp is a QR code generator library in C++.  The
> +project also offers Java, Javascript, Python, C, and Rust implementations.")

You can drop the comma after C if you want.

> +      (home-page "https://www.nayuki.io/page/qr-code-generator-library")
> +      (license license:expat))))
> -- 
> 2.25.0
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

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

From: Leo Famulari <leo <at> famulari.name>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 39365 <at> debbugs.gnu.org
Subject: Re: [bug#39365] [PATCH 1/6] gnu: Add qrcodegen-cpp.
Date: Fri, 31 Jan 2020 13:30:47 -0500

[Message part 1 (text/plain, inline)]

Oops! Attached...

On Fri, Jan 31, 2020 at 10:58:51AM +0200, Efraim Flashner wrote:
> On Thu, Jan 30, 2020 at 10:06:22PM -0500, Leo Famulari wrote:
> > * gnu/packages/aidc.scm (qrcodegen-cpp): New variable.
> > ---
> >  gnu/packages/aidc.scm | 39 +++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 39 insertions(+)
> 
> You're missing the actual patch ;)
> 
> > 
> > diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
> > index 77db0ac9fc..b68f2137be 100644
> > --- a/gnu/packages/aidc.scm
> > +++ b/gnu/packages/aidc.scm
> > @@ -4,6 +4,7 @@
> >  ;;; Copyright © 2017 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
> >  ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
> >  ;;; Copyright © 2019 Guillaume Le Vaillant <glv <at> posteo.net>
> > +;;; Copyright © 2020 Leo Famulari <leo <at> famulari.name>
> >  ;;;
> >  ;;; This file is part of GNU Guix.
> >  ;;;
> > @@ -154,3 +155,41 @@ For application developers, language bindings are included for C, C++ and
> >  Python as well as GUI widgets for GTK and Qt.")
> >      (home-page "https://github.com/mchehab/zbar")
> >      (license license:lgpl2.1+)))
> > +
> > +(define-public qrcodegen-cpp
> > +  ;; Currently this project's installation mechanism only exists as a GitHub
> > +  ;; pull request, so we build from a recent commit that the proposed patch
> > +  ;; applies to.
> > +  (let ((commit "6ea933f1596d818bd21e9a6b8d2e851fb8b4bcf1")
> > +        (revision "0"))
> > +    (package
> > +      (name "qrcodegen-cpp")
> > +      (version (git-version "1.5.0" revision commit))
> > +      (source (origin
> > +                (method git-fetch)
> > +                (uri (git-reference
> > +                       (url "https://github.com/nayuki/QR-Code-generator.git")
> > +                       (commit commit)))
> > +                (file-name (git-file-name name version))
> > +                (patches (search-patches "qrcodegen-cpp-make-install.patch"))
> > +                (sha256
> > +                 (base32
> > +                  "19fcwqmfk2n9p2n01dv2j4x2y2mqip0j1wbmfbxjp34rqkjwcwxm"))))
> > +      (build-system gnu-build-system)
> > +      (arguments
> > +       `(#:tests? #f ; no test suite
> > +         #:make-flags
> > +         (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
> > +         #:phases
> > +         (modify-phases %standard-phases
> > +           (delete 'configure) ; No ./configure script
> > +           ;; Only build the C++ variant.
> > +           (add-after 'unpack 'chdir
> > +             (lambda _
> > +               (chdir "cpp")
> > +               #t)))))
> > +      (synopsis "QR Code generator library")
> > +      (description "qrcodegen-cpp is a QR code generator library in C++.  The
> > +project also offers Java, Javascript, Python, C, and Rust implementations.")
> 
> You can drop the comma after C if you want.
> 
> > +      (home-page "https://www.nayuki.io/page/qr-code-generator-library")
> > +      (license license:expat))))
> > -- 
> > 2.25.0
> > 
> > 
> > 
> > 
> 
> -- 
> Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted

[0001-gnu-Add-qrcodegen-cpp.patch (text/plain, attachment)]

[signature.asc (application/pgp-signature, inline)]

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

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: Leo Famulari <leo <at> famulari.name>, 39365 <at> debbugs.gnu.org
Subject: Re: [bug#39365] [PATCH 1/6] gnu: Add qrcodegen-cpp.
Date: Sat, 01 Feb 2020 00:42:51 +0100

----- Ursprüngliche Mitteilung -----
> * gnu/packages/aidc.scm (qrcodegen-cpp): New variable.
> ---
>   gnu/packages/aidc.scm | 39 +++++++++++++++++++++++++++++++++++++++
>   1 file changed, 39 insertions(+)
> 
> diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
> index 77db0ac9fc..b68f2137be 100644
> --- a/gnu/packages/aidc.scm
> +++ b/gnu/packages/aidc.scm
> @@ -4,6 +4,7 @@
>   ;;; Copyright © 2017 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
>   ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
>   ;;; Copyright © 2019 Guillaume Le Vaillant <glv <at> posteo.net>
> +;;; Copyright © 2020 Leo Famulari <leo <at> famulari.name>
>   ;;;
>   ;;; This file is part of GNU Guix.
>   ;;;
> @@ -154,3 +155,41 @@ For application developers, language bindings are
> included for C, C++ and Python as well as GUI widgets for GTK and Qt.")
>           (home-page "https://github.com/mchehab/zbar")
>           (license license:lgpl2.1+)))
> +
> +(define-public qrcodegen-cpp
> +   ;; Currently this project's installation mechanism only exists as a
> GitHub +   ;; pull request, so we build from a recent commit that the
> proposed patch +   ;; applies to.
> +   (let ((commit "6ea933f1596d818bd21e9a6b8d2e851fb8b4bcf1")
> +               (revision "0"))
> +       (package
> +           (name "qrcodegen-cpp")
> +           (version (git-version "1.5.0" revision commit))
> +           (source (origin
> +                               (method git-fetch)
> +                               (uri (git-reference
> +                                             (url
> "https://github.com/nayuki/QR-Code-generator.git") +                                       
>     (commit commit))) +                               (file-name (git-file-name name
> version)) +                               (patches (search-patches
> "qrcodegen-cpp-make-install.patch")) +                               (sha256
> +                                 (base32
> +                                 

I think you forgot to include the patch and adding it to lokal.mk.

> "19fcwqmfk2n9p2n01dv2j4x2y2mqip0j1wbmfbxjp34rqkjwcwxm")))) +         
> (build-system gnu-build-system) +           (arguments
> +             `(#:tests? #f ; no test suite
> +                 #:make-flags
> +                 (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
> +                 #:phases
> +                 (modify-phases %standard-phases
> +                     (delete 'configure) ; No ./configure script
> +                     ;; Only build the C++ variant.
> +                     (add-after 'unpack 'chdir
> +                         (lambda _
> +                             (chdir "cpp")
> +                             #t)))))
> +           (synopsis "QR Code generator library")
> +           (description "qrcodegen-cpp is a QR code generator library in
> C++.   The +project also offers Java, Javascript, Python, C, and Rust
> implementations.") +           (home-page
> "https://www.nayuki.io/page/qr-code-generator-library") +           (license
> license:expat)))) -- 
> 2.25.0
> 
> 
> 
> 

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 39365 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#39365] [PATCH 1/6] gnu: Add qrcodegen-cpp.
Date: Thu, 13 Feb 2020 23:21:27 +0100

Hi,

Efraim Flashner <efraim <at> flashner.co.il> skribis:

>> +      (description "qrcodegen-cpp is a QR code generator library in C++.  The
>> +project also offers Java, Javascript, Python, C, and Rust implementations.")
>
> You can drop the comma after C if you want.

Actually no, it would have a different meaning, from what I learned
(namely, the last part would mean “implementations in/of C and Rust”,
instead of “implementations in/of Rust”.)

More importantly though: apart from the missing patch and ‘gnu/local.mk’
bit that were reported, the series LGTM.

Thanks, Leo!

Ludo’.

Message #40 received at 39365-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 39365-done <at> debbugs.gnu.org, Efraim Flashner <efraim <at> flashner.co.il>
Subject: Re: [bug#39365] [PATCH 1/6] gnu: Add qrcodegen-cpp.
Date: Thu, 13 Feb 2020 20:13:42 -0500

On Thu, Feb 13, 2020 at 11:21:27PM +0100, Ludovic Courtès wrote:
> Hi,
> 
> Efraim Flashner <efraim <at> flashner.co.il> skribis:
> 
> >> +      (description "qrcodegen-cpp is a QR code generator library in C++.  The
> >> +project also offers Java, Javascript, Python, C, and Rust implementations.")
> >
> > You can drop the comma after C if you want.
> 
> Actually no, it would have a different meaning, from what I learned
> (namely, the last part would mean “implementations in/of C and Rust”,
> instead of “implementations in/of Rust”.)
> 
> More importantly though: apart from the missing patch and ‘gnu/local.mk’
> bit that were reported, the series LGTM.
> 
> Thanks, Leo!

Thanks for the reminder about these patches! Pushed as 1ce2467fd6d5f8da259be1c7609702814c716702

Previous Next

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