[bug#66037] [PATCH 0/3] Update libosmium and dependents

[bug#66037] [PATCH 0/3] Update libosmium and dependents

[Hendursaga via Guix-patches via]

Hello Guixers!

This is my first patch series in a few years, so I hope I got everything right!

I updated libosmium to the latest stable release, but then osm2pgsql broke, due
to API changes, so I updated it, and then I went ahead and updated osmium-tool
for good measure, even though it did not break.

Hendursaga (3):
  gnu: libosmium: Update to 2.19.0.
  gnu: osm2pgsql: Update to 1.9.2.
  gnu: osmium-tool: Update to 1.15.0.

 gnu/packages/geo.scm | 155 +++++++++++++++++++++----------------------
 1 file changed, 76 insertions(+), 79 deletions(-)


base-commit: 0dc83ce53b8bad8473c80689ba212d9f9bb712b3
-- 
2.41.0

[bug#66037] [PATCH 1/3] gnu: libosmium: Update to 2.19.0.

[Hendursaga via Guix-patches via]

* gnu/packages/geo.scm (libosmium): Update to 2.19.0.
[inputs]: Replace proj with proj.4.
[native-inputs]: Add graphviz, to build documentation.
---
 gnu/packages/geo.scm | 48 +++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index d702046865..3364fe6583 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -89,6 +89,7 @@ (define-module (gnu packages geo)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gps)
   #:use-module (gnu packages graphics)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages haskell-apps)
   #:use-module (gnu packages haskell-xyz)
@@ -1535,34 +1536,31 @@ (define-public python-metpy
 (define-public libosmium
   (package
     (name "libosmium")
-    (version "2.18.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/osmcode/libosmium")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0fh57mpii1ksacwfx5rz213j896aklib53jbybld2i517q2mmxr0"))))
+    (version "2.19.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/osmcode/libosmium")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0d69xzd29hk846g049y2g668mr8kaf05f6a26s3qn6az062hxfa7"))))
     (build-system cmake-build-system)
-    (propagated-inputs
-     (list boost
-           bzip2
-           expat
-           gdal
-           geos
-           lz4
-           proj
-           protozero
-           sparsehash
-           utfcpp
-           zlib))
-    (native-inputs
-     (list doxygen))
+    (propagated-inputs (list boost
+                             bzip2
+                             expat
+                             gdal
+                             geos
+                             lz4
+                             proj.4
+                             protozero
+                             zlib))
+    (native-inputs (list doxygen graphviz))
     (home-page "https://osmcode.org/libosmium/")
     (synopsis "C++ library for working with OpenStreetMap data")
-    (description "Libosmium is a fast and flexible C++ library for working with
+    (description
+     "Libosmium is a fast and flexible C++ library for working with
 OpenStreetMap data.")
     (license license:boost1.0)))
 
-- 
2.41.0

[bug#66037] [PATCH 1/3] gnu: libosmium: Update to 2.19.0.

[Bruno Victal]

Hi Hendursaga,

On 2023-09-16 22:21, Hendursaga via Guix-patches via wrote:
> +    (native-inputs (list doxygen graphviz))

Perhaps you could use graphviz-minimal instead?


-- 
Furthermore, I consider that nonfree software must be eradicated.

Cheers,
Bruno.

[bug#66037] [PATCH v2 0/3] Update libosmium and dependents

[Hendursaga via Guix-patches via]

I don't believe I ever sent a revised patch series, so I hope I did everything
just right!

In addition to replacing graphviz with graphviz-minimal, as suggested, I
realized that the package `proj-7` was more up-to-date than `proj.4`, but still
retained the PROJ API version 4, so I used that for libosmium and osm2pgsql, so
that they both had the same API version. I figure mixing API versions 4 and 6
might cause some subtle bugs. Finally, I also realized that `potrace` was not
being used for osm2pgsql, as apparently one would need both it and `CImg` for
that optional feature to be enabled, and `CImg` has not been packaged yet, nor
do I care to do so, here.

Hendursaga (3):
  gnu: libosmium: Update to 2.19.0.
  gnu: osm2pgsql: Update to 1.9.2.
  gnu: osmium-tool: Update to 1.15.0.

 gnu/packages/geo.scm | 154 +++++++++++++++++++++----------------------
 1 file changed, 75 insertions(+), 79 deletions(-)


base-commit: fc3a53525ab3dcaf7c22eec8d62294017f9760fe
-- 
2.41.0

[bug#66037] [PATCH v2 1/3] gnu: libosmium: Update to 2.19.0.

[Hendursaga via Guix-patches via]

* gnu/packages/geo.scm (libosmium): Update to 2.19.0.
[inputs]: Replace proj with proj-7, the last version with PROJ API
version 4 compatibility.
[native-inputs]: Add graphviz-minimal, to build documentation.
---
 gnu/packages/geo.scm | 48 +++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index d702046865..f41ef826fd 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -89,6 +89,7 @@ (define-module (gnu packages geo)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gps)
   #:use-module (gnu packages graphics)
+  #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages haskell-apps)
   #:use-module (gnu packages haskell-xyz)
@@ -1535,34 +1536,31 @@ (define-public python-metpy
 (define-public libosmium
   (package
     (name "libosmium")
-    (version "2.18.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/osmcode/libosmium")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0fh57mpii1ksacwfx5rz213j896aklib53jbybld2i517q2mmxr0"))))
+    (version "2.19.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/osmcode/libosmium")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0d69xzd29hk846g049y2g668mr8kaf05f6a26s3qn6az062hxfa7"))))
     (build-system cmake-build-system)
-    (propagated-inputs
-     (list boost
-           bzip2
-           expat
-           gdal
-           geos
-           lz4
-           proj
-           protozero
-           sparsehash
-           utfcpp
-           zlib))
-    (native-inputs
-     (list doxygen))
+    (propagated-inputs (list boost
+                             bzip2
+                             expat
+                             gdal
+                             geos
+                             lz4
+                             proj-7
+                             protozero
+                             zlib))
+    (native-inputs (list doxygen graphviz-minimal))
     (home-page "https://osmcode.org/libosmium/")
     (synopsis "C++ library for working with OpenStreetMap data")
-    (description "Libosmium is a fast and flexible C++ library for working with
+    (description
+     "Libosmium is a fast and flexible C++ library for working with
 OpenStreetMap data.")
     (license license:boost1.0)))
 
-- 
2.41.0

[bug#66037] [PATCH v2 2/3] gnu: osm2pgsql: Update to 1.9.2.

[Hendursaga via Guix-patches via]

* gnu/packages/geo.scm (osm2pgsql): Update to 1.9.2.
[arguments]: Use G-expressions.
<#:configure-flags>: Ensure compilation with LuaJIT, PROJ API version 4.
[inputs]: Replace lua with luajit. Add nlohmann-json.
[native-inputs]: Add pandoc, python-argparse-manpage, for building
documentation. Remove python-psycopg2, as it is only used for tests, and
testing has been disabled.
[home-page]: Update URL.
---
 gnu/packages/geo.scm | 71 ++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index f41ef826fd..c7ee877a1e 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1596,43 +1596,44 @@ (define-public osmium-tool
 (define-public osm2pgsql
   (package
     (name "osm2pgsql")
-    (version "1.8.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/openstreetmap/osm2pgsql")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0ssz7ny4wx8dzl3027p37xc5h7m1aj6bzxzdc6g8fbp7q57ykvxz"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Remove bundled libraries.
-        '(delete-file-recursively "contrib"))))
+    (version "1.9.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/openstreetmap/osm2pgsql")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "198qcgl42pb8lk1bn41ncp8hc9gcg9k2p0ny42vak019w5l6jcj7"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Remove bundled libraries.
+               '(delete-file-recursively "contrib"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f; tests fail because we need to setup a database
-       #:configure-flags
-       (list "-DEXTERNAL_LIBOSMIUM=ON"
-             "-DEXTERNAL_PROTOZERO=ON"
-             "-DEXTERNAL_FMT=ON")))
-    (inputs
-     (list boost
-           bzip2
-           expat
-           fmt-8
-           libosmium
-           lua
-           postgresql
-           proj
-           protozero
-           zlib))
-    (native-inputs
-     (list python python-psycopg2))
-    (home-page "https://github.com/openstreetmap/osm2pgsql")
-    (synopsis "OSM data importer to postgresql")
-    (description "Osm2pgsql is a tool for loading OpenStreetMap data into a
+     (list #:tests? #f ;tests fail because we need to setup a database
+           #:configure-flags #~(list "-DUSE_PROJ_LIB=4" ;use API version 4
+                                     "-DWITH_LUAJIT=ON"
+                                     "-DEXTERNAL_LIBOSMIUM=ON"
+                                     "-DEXTERNAL_PROTOZERO=ON"
+                                     "-DEXTERNAL_FMT=ON")))
+    (inputs (list boost
+                  bzip2
+                  expat
+                  fmt-8
+                  libosmium
+                  luajit
+                  nlohmann-json
+                  postgresql
+                  proj-7
+                  protozero
+                  zlib))
+    (native-inputs (list pandoc python python-argparse-manpage))
+    (home-page "https://osm2pgsql.org/")
+    (synopsis "OSM data importer to PostgreSQL")
+    (description
+     "Osm2pgsql is a tool for loading OpenStreetMap data into a
 PostgreSQL / PostGIS database suitable for applications like rendering into a
 map, geocoding with Nominatim, or general analysis.")
     (license license:gpl2+)))
-- 
2.41.0

[bug#66037] [PATCH v2 3/3] gnu: osmium-tool: Update to 1.15.0.

[Hendursaga via Guix-patches via]

gnu/packages/geo.scm (osmium-tool): Update to 1.15.0.
---
 gnu/packages/geo.scm | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index c7ee877a1e..8ee3b1a7ec 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1567,26 +1567,23 @@ (define-public libosmium
 (define-public osmium-tool
   (package
     (name "osmium-tool")
-    (version "1.14.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/osmcode/osmium-tool")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0zgyqyrs89vch0qnkh9m5xq079sr2wmydy5zz4l8xbysbjf6xry5"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Remove bundled libraries.
-        '(delete-file-recursively "include/rapidjson"))))
+    (version "1.15.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/osmcode/osmium-tool")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0d90vz316xdl3c416nicgdw7ybw17l2125wgxglbzl7jaqngapy5"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Remove bundled libraries.
+               '(delete-file-recursively "include/rapidjson"))))
     (build-system cmake-build-system)
-    (inputs
-     (list libosmium
-           rapidjson))
-    (native-inputs
-     (list pandoc))
+    (inputs (list libosmium rapidjson))
+    (native-inputs (list pandoc))
     (home-page "https://osmcode.org/osmium-tool/")
     (synopsis "Osmium command-line tool")
     (description "Command line tool for working with OpenStreetMap data
-- 
2.41.0

bug#66037: [PATCH v2 0/3] Update libosmium and dependents

[Guillaume Le Vaillant]

[-- Attachment #1: Type: text/plain, Size: 83 bytes --]

Patches applied as 84442d04235a615984667363c0f9b6b91d1ed0bf and
following.
Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

[bug#66037] [PATCH 2/3] gnu: osm2pgsql: Update to 1.9.2.

[Hendursaga via Guix-patches via]

* gnu/packages/geo.scm (osm2pgsql): Update to 1.9.2.
[arguments]: Use G-expressions.
<#:configure-flags>: Ensure compilation with LuaJIT, PROJ API version 6.
[inputs]: Replace lua with luajit. Add potrace, nlohmann-json.
[native-inputs]: Add pandoc, python-argparse-manpage, for building
documentation. Remove python-psycopg2, as it is only used for tests, and
testing has been disabled.
[home-page]: Update URL.
---
 gnu/packages/geo.scm | 72 +++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 3364fe6583..45d8f8945e 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1596,43 +1596,45 @@ (define-public osmium-tool
 (define-public osm2pgsql
   (package
     (name "osm2pgsql")
-    (version "1.8.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/openstreetmap/osm2pgsql")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0ssz7ny4wx8dzl3027p37xc5h7m1aj6bzxzdc6g8fbp7q57ykvxz"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Remove bundled libraries.
-        '(delete-file-recursively "contrib"))))
+    (version "1.9.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/openstreetmap/osm2pgsql")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "198qcgl42pb8lk1bn41ncp8hc9gcg9k2p0ny42vak019w5l6jcj7"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Remove bundled libraries.
+               '(delete-file-recursively "contrib"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f; tests fail because we need to setup a database
-       #:configure-flags
-       (list "-DEXTERNAL_LIBOSMIUM=ON"
-             "-DEXTERNAL_PROTOZERO=ON"
-             "-DEXTERNAL_FMT=ON")))
-    (inputs
-     (list boost
-           bzip2
-           expat
-           fmt-8
-           libosmium
-           lua
-           postgresql
-           proj
-           protozero
-           zlib))
-    (native-inputs
-     (list python python-psycopg2))
-    (home-page "https://github.com/openstreetmap/osm2pgsql")
-    (synopsis "OSM data importer to postgresql")
-    (description "Osm2pgsql is a tool for loading OpenStreetMap data into a
+     (list #:tests? #f ;tests fail because we need to setup a database
+           #:configure-flags #~(list "-DUSE_PROJ_LIB=6" ;use API version 6
+                                     "-DWITH_LUAJIT=ON"
+                                     "-DEXTERNAL_LIBOSMIUM=ON"
+                                     "-DEXTERNAL_PROTOZERO=ON"
+                                     "-DEXTERNAL_FMT=ON")))
+    (inputs (list boost
+                  bzip2
+                  expat
+                  fmt-8
+                  libosmium
+                  luajit
+                  nlohmann-json
+                  postgresql
+                  potrace
+                  proj
+                  protozero
+                  zlib))
+    (native-inputs (list pandoc python python-argparse-manpage))
+    (home-page "https://osm2pgsql.org/")
+    (synopsis "OSM data importer to PostgreSQL")
+    (description
+     "Osm2pgsql is a tool for loading OpenStreetMap data into a
 PostgreSQL / PostGIS database suitable for applications like rendering into a
 map, geocoding with Nominatim, or general analysis.")
     (license license:gpl2+)))
-- 
2.41.0

[bug#66037] [PATCH 3/3] gnu: osmium-tool: Update to 1.15.0.

[Hendursaga via Guix-patches via]

gnu/packages/geo.scm (osmium-tool): Update to 1.15.0.
---
 gnu/packages/geo.scm | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 45d8f8945e..0f7a49ef5a 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1567,26 +1567,23 @@ (define-public libosmium
 (define-public osmium-tool
   (package
     (name "osmium-tool")
-    (version "1.14.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/osmcode/osmium-tool")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0zgyqyrs89vch0qnkh9m5xq079sr2wmydy5zz4l8xbysbjf6xry5"))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Remove bundled libraries.
-        '(delete-file-recursively "include/rapidjson"))))
+    (version "1.15.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/osmcode/osmium-tool")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0d90vz316xdl3c416nicgdw7ybw17l2125wgxglbzl7jaqngapy5"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Remove bundled libraries.
+               '(delete-file-recursively "include/rapidjson"))))
     (build-system cmake-build-system)
-    (inputs
-     (list libosmium
-           rapidjson))
-    (native-inputs
-     (list pandoc))
+    (inputs (list libosmium rapidjson))
+    (native-inputs (list pandoc))
     (home-page "https://osmcode.org/osmium-tool/")
     (synopsis "Osmium command-line tool")
     (description "Command line tool for working with OpenStreetMap data
-- 
2.41.0