[WIP] gnu: Add qgis.

  • Done
  • quality assurance status badge
Details
6 participants
  • Arun Isaac
  • Björn Höfling
  • Danny Milosavljevic
  • Guillaume Le Vaillant
  • Marius Bakke
  • Wiktor ?elazny
Owner
unassigned
Submitted by
Wiktor ?elazny
Severity
normal
W
W
Wiktor ?elazny wrote on 9 Nov 2019 12:27
(address . guix-patches@gnu.org)
20191109112702.14723-1-wz@freeshell.de
From: Wiktor ?elazny <wzelazny@vurv.cz>

* gnu/packages/geo.scm (qgis): new variable.
Does not build due to QtXml/QtXmlmod.sip not found.
---
This is my attempt to define some minimal QGIS package. Unfortunately,
the build crashes with
sip: Unable to find file "QtXml/QtXmlmod.sip"
but:
$ ls -l /gnu/store/8d1ak3bpaaqhw4hnxksan7fnh5ll7i5f-python-pyqt+qscintilla-5.11.3/share/sip/QtXml/QtXmlmod.sip
-r--r--r-- 5 root root 1937 Jan 1 1970 /gnu/store/8d1ak3bpaaqhw4hnxksan7fnh5ll7i5f-python-pyqt+qscintilla-5.11.3/share/sip/QtXml/QtXmlmod.sip
I thought that maybe the QtXml/ directory being a symlink
QtXml -> /gnu/store/mfii8qx5x3kbl1gzg8g8qmblqk6fdmvf-python-pyqt-5.11.3/share/sip/QtXml
was the problem, but including python-pyqt (or python-sip, for that
matter) among the inputs did not solve the issue. Explicitly defining
directories as configure flags does not work, either. Any suggestion how
to progress on this? Thanks!
gnu/packages/geo.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)

Toggle diff (94 lines)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index dfb00c7547..26bbcd2f63 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -42,12 +42,14 @@
#:use-module (guix utils)
#:use-module (gnu packages astronomy)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages flex)
#:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages glib)
@@ -55,7 +57,9 @@
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages icu4c)
+ #:use-module (gnu packages kde)
#:use-module (gnu packages lua)
+ #:use-module (gnu packages maths)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
@@ -1037,3 +1041,62 @@ persisted.
@end itemize
")
(license license:expat)))
+
+(define-public qgis
+ (package
+ (name "qgis")
+ (version "3.8.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://qgis.org/downloads/" name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ ; checked <uri>.md5
+ "1g8pzfm68n28pj7a4z9c1yklnwx5and83svjx6w8q5dwhf23xjiw"))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("flex" ,flex)
+ ("bison" ,bison)
+ ("python" ,python)))
+ (inputs
+ `(("qtbase" ,qtbase)
+ ("qtserialport" ,qtserialport)
+ ("qtsvg" ,qtsvg)
+ ("qtlocation" ,qtlocation)
+ ("qttools" ,qttools)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtwebkit" ,qtwebkit)
+ ("proj.4" ,proj.4)
+ ("geos" ,geos)
+ ("sqlite" ,sqlite)
+ ("libspatialite" ,libspatialite)
+ ("libspatialindex" ,libspatialindex)
+ ("gdal" ,gdal)
+ ("qwt" ,qwt)
+ ("expat" ,expat)
+ ("qscintilla" ,qscintilla)
+ ("qca" ,qca)
+ ("qtkeychain" ,qtkeychain)
+ ("libzip" ,libzip)
+ ("python-pyqt+qscintilla" ,python-pyqt+qscintilla)
+; ("python-sip" ,python-sip)
+ ("exiv2" ,exiv2)
+ ("gsl" ,gsl)))
+ (arguments
+ `(#:configure-flags (list (string-append
+ "-DPYQT5_SIP_DIR="
+ (assoc-ref
+ %build-inputs "python-pyqt+qscintilla")
+ "/share/sip")
+ (string-append
+ "-DQSCI_SIP_DIR="
+ (assoc-ref
+ %build-inputs "python-pyqt+qscintilla")
+ "/share/sip"))))
+ (home-page "https://qgis.org")
+ (synopsis "A free and open source Geographic Information System")
+ (description "QGIS is a professional GIS application that is built on top
+of and proud to be itself @dfn{Free and Open Source Software} (FOSS).")
+ (license license:gpl2+)))
--
2.24.0
A
A
Arun Isaac wrote on 1 Dec 2019 19:13
(name . Wiktor ?elazny)(address . wz@freeshell.de)(address . 38149@debbugs.gnu.org)
cu7eexnlxrg.fsf@systemreboot.net
Sorry this is taking more time than I expected. It looks like the qgis
package I dug up out of my git stash doesn't build anymore. The package
is around a year old and was for an older version of qgis. Hopefully
there is some simple fix that needs to be made for the build to
work. But qgis builds take forever on my slow machine and figuring out
the problem is taking a while. I'll try to get back to you in 48 hours.

Thank you for your patience! :-)
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl3kAtMACgkQLiXui2GA
K7OpFAgAqmUdpSqQa3PKDu2qbMJom1ujHIp5t2E87HK3LxrE/QI8QclSFYSxbygM
VahPPWek90tN8qkq+yzfveWqVCcPWBle3EVBmE2+POI25zp4GNJ2IOI5LrPtLXwR
kQL4vnVcqQ+PH76euzwhAdt4oiOcmFiQ2t7OSAFdKIEZIsgTa4Fb6ioPBVMBzxJJ
E7eqdW6ytJ16H+lYMaY5x9/YyFJq3w4htaKZmrO1GXa/MKbe1FNF3jGrN3aUPEce
cJ0BFVrkx27poc+pZunJdJn+xyX9R8IaJoJ8aQbGvfx3YgMOLGe9KtOhn9H/PHNQ
a9ZOZdZUNpHi2v8Z5eBaMDWlSeorrg==
=SqDf
-----END PGP SIGNATURE-----

W
W
Wiktor ?elazny wrote on 2 Dec 2019 15:31
(address . 38149@debbugs.gnu.org)
20191202143115.kpkfczlqxh22qcko@wz.localdomain
On Sun, Dec 01, 2019 at 11:43:39PM +0530, Arun Isaac wrote:

Toggle quote (5 lines)
> Hopefully there is some simple fix that needs to be made for the build
> to work. But qgis builds take forever on my slow machine and figuring
> out the problem is taking a while. I'll try to get back to you in 48
> hours.

Thank you for your efforts. Take you time. You can always post what
you’ve got, and maybe somebody will come with some idea how to make it
work again.

W?
-----BEGIN PGP SIGNATURE-----

iQKTBAABCgB9FiEEvcl0zdnJun12Glc9xzWoxqtgedUFAl3lIDNfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEJE
Qzk3NENERDlDOUJBN0Q3NjFBNTczREM3MzVBOEM2QUI2MDc5RDUACgkQxzWoxqtg
edU/mg/+Pd1Y298zqFfMykyNmaSKMCGDbXuikuczrx4mKZRrLEIZYeXVhT8hwWb4
mLRHdGur4H6BvXgong5utacMRkrRg8W4OFtKCcvfZ5qEFohmD9iDFqs26vQZmwOU
9pFupXA0ykbRyT7w7CCeJZ/JF73rwoRTXrOCzgDzk3pytyPr5OOeVe7wY4j5MFCL
z6gaBTvyxDMTx5vUXmoEjDjreg9UXd+sgYdra8xsL5QKEUCfR0t6sJoQPXA/eY8P
Mzj0n/W1fuDMrvLyZSxa+Ip8X/UgsxVizBHr5T+d2/dEHVdv55isd67Qflh7cbyn
/CIVrLJELjY/bqF4ZtrSlPdKTT8ZucxJZCqBpX1WPZA8KOzAX1PEYLlOUz9JYPF5
1bY0AeeWrRWiiv7P6KmVdjp27073QlzKky/IegWUCJodefKoSrm0xXb573aBTZ5U
f985aIJgkxXIHSJO0MLV/sR2A6VeMuehnOCnDs7sy2EHH1MOVyVq/Mg6tIzJXlbp
yGFUMytcqwpDId8gkdghgU+Nk+mjRIpFczGsJk0vKTqAPVgB+60O9a2/XVe6tSKU
JFHo6nlCN3RqrBbinoNSXY/x27sx8uOrKQFhyyz1FpZ6KBaJWcc9H34awd8+vsAC
cbT+yw/dIs14JFWwkOZN5qIBzGcxrvWdQxT+LP/gCJ8p4Xahdc0=
=2i+i
-----END PGP SIGNATURE-----


A
A
Arun Isaac wrote on 3 Dec 2019 18:45
cu7k17dfgkw.fsf@systemreboot.net
Toggle quote (7 lines)
> * gnu/packages/geo.scm (qgis): new variable.
> Does not build due to QtXml/QtXmlmod.sip not found.
> ---
> This is my attempt to define some minimal QGIS package. Unfortunately,
> the build crashes with
> sip: Unable to find file "QtXml/QtXmlmod.sip"

I fixed this problem with the following custom phase.

#:phases
(modify-phases %standard-phases
;; Configure correct path to PyQt5 SIP directory
(add-after 'unpack 'configure-pyqt5-sip-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "cmake/FindPyQt5.cmake"
(("\"\\\\\\\\1\" PYQT5_SIP_DIR")
(string-append "\"" (assoc-ref inputs "python-pyqt+qscintilla")
"/share/sip\" PYQT5_SIP_DIR")))
#t))

I'm slowly but steadily making progress and will soon post a complete
patch. Progress is slow since each build attempt takes around 6 hours on
my rather slow machine.

Toggle quote (2 lines)
> + (license license:gpl2+)))

Also, the license of qgis is extremely complicated. Looking at other
guix packages, I'm assuming we have to exhaustively document every
license. Very tedious! :-( I got this far, but I still need to double
check all the licenses again.

(license
(list license:gpl2+
;; qgis.dtd
;; src/core/pal/rtree.hpp
;; src/plugins/grass/qtermwidget/konsole_wcwidth.*
;; cmake/PythonCompile.py
;; resources/cpt-city-qgis-min/dg/*
;; resources/cpt-city-qgis-min/gery/*
;; resources/cpt-city-qgis-min/jjg/dem/*
;; resources/cpt-city-qgis-min/jjg/misc/*
;; resources/cpt-city-qgis-min/jjg/physics/*
;; tests/testdata/cpt-city/jjg/misc/*
;; resources/cpt-city-qgis-min/km/*
;; resources/cpt-city-qgis-min/pd/*
;; resources/cpt-city-qgis-min/wkp/encyclopedia/*
;; resources/cpt-city-qgis-min/wkp/template/*
;; resources/cpt-city-qgis-min/ocal/*
;; resources/cpt-city-qgis-min/rf/*
;; resources/cpt-city-qgis-min/tp/*
license:public-domain
;; python/plugins/processing/modeler/ModelerArrowItem.py
;; src/app/qgssettingstree.cpp
;; src/app/qgssettingstree.h
;; src/app/qgsvariantdelegate.cpp
;; src/app/qgsvariantdelegate.h
;; src/app/qtmain_android.cpp
;; cmake/Bison.cmake
;; cmake/FindExpat.cmake
;; cmake/FindGRASS.cmake
;; cmake/FindPostgres.cmake
;; cmake/FindProj.cmake
;; cmake/FindSqlite3.cmake
;; cmake/Flex.cmake
;; cmake/FindFcgi.cmake
;; cmake/FindGDAL.cmake
;; cmake/FindGEOS.cmake
;; cmake/FindGSL.cmake
;; cmake/FindIconv.cmake
;; cmake/FindOSGEARTH.cmake
;; cmake/FindLibPython.py
;; cmake/FindPyQt4.cmake
;; cmake/FindPyQt4.py
;; cmake/FindPyQt5.cmake
;; cmake/FindPyQt5.py
;; cmake/FindPythonLibrary.cmake
;; cmake/FindSIP.cmake
;; cmake/FindSIP.py
;; cmake/PythonMacros.cmake
;; cmake/SIPMacros.cmake
;; cmake/FindQCA.cmake
;; cmake/FindQextserialport.cmake
;; cmake/FindQGIS.cmake
;; cmake/FindQsci.cmake
;; cmake/FindQsci.py
;; cmake/FindQScintilla.cmake
;; cmake/FindQwt.cmake
;; cmake/FindSpatiaLite.cmake
;; cmake/MacBundleMacros.cmake
;; cmake/MacPlistMacros.cmake
;; cmake/PyQtMacros.cmake
;; cmake/QCAMacros.cmake
;; cmake/UsePythonTest.cmake
license:bsd-3
;; external//qwtpolar-1.1.1/*
;; src/gui/raster/qwt5_histogram_item.h
license:qwt1.0
;; external/astyle/*
license:lgpl2.1+
;; external/nmea/config.h
;; external/nmea/context.c
;; external/nmea/context.h
;; external/nmea/gmath.c
;; external/nmea/gmath.h
;; external/nmea/info.c
;; external/nmea/info.h
;; external/nmea/nmeatime.h
;; external/nmea/parse.c
;; external/nmea/parse.h
;; external/nmea/parser.h
;; external/nmea/sentence.c
;; external/nmea/sentence.h
;; external/nmea/time.c
;; external/nmea/tok.c
;; external/nmea/tok.h
;; external/nmea/units.h
;; src/plugins/evis/*
;; src/plugins/grass/qtermwidget/kprocess.cpp
;; src/plugins/grass/qtermwidget/kprocess.h
;; src/plugins/grass/qtermwidget/kptydevice.cpp
;; src/plugins/grass/qtermwidget/kptydevice.h
;; src/plugins/grass/qtermwidget/kptyprocess.cpp
;; src/plugins/grass/qtermwidget/kptyprocess.h
;; src/plugins/grass/qtermwidget/kpty.cpp
;; src/plugins/grass/qtermwidget/kpty.h
;; src/plugins/grass/qtermwidget/kpty_p.h
;; src/plugins/grass/qtermwidget/qtermwidget.cpp
;; src/plugins/grass/qtermwidget/qtermwidget.h
;; src/plugins/grass/qtermwidget/TerminalCharacterDecoder.cpp
;; src/plugins/grass/qtermwidget/TerminalCharacterDecoder.h
license:lgpl2.0+
;; src/core/pal/*
;; resources/cpt-city-qgis-min/ds9/*
;; resources/cpt-city-qgis-min/grass/*
license:gpl3+
;; src/core/symbology/qgscolorbrewerpalette.cpp
license:asl2.0
;; images/themes/default/*
;; resources/cpt-city-qgis-min/gps/*
;; resources/cpt-city-qgis-min/nd/*
;; resources/cpt-city-qgis-min/wkp/country/*
;; resources/cpt-city-qgis-min/wkp/jarke/*
;; resources/cpt-city-qgis-min/wkp/jarke/*
;; resources/cpt-city-qgis-min/wkp/knutux/*
;; resources/cpt-city-qgis-min/wkp/lilleskut/*
;; resources/cpt-city-qgis-min/wkp/plumbago/*
;; resources/cpt-city-qgis-min/wkp/precip/*
;; resources/cpt-city-qgis-min/wkp/schwarzwald/*
;; resources/cpt-city-qgis-min/wkp/shadowxfox/*
;; resources/cpt-city-qgis-min/wkp/tubs/*
license:cc-by-sa3.0
;; resources/cpt-city-qgis-min/cb/*
;; resources/cpt-city-qgis-min/jjg/cbac/*
;; resources/cpt-city-qgis-min/jjg/cbcont/*
;; resources/cpt-city-qgis-min/jjg/polarity/*
license:asl1.1
;; resources/cpt-city-qgis-min/ds/*
(license:fsf-free
;; resources/cpt-city-qgis-min/es/*
(license:fsdg-compatible
;; resources/cpt-city-qgis-min/gist/*
(license:non-copyleft "file://debian/copyright"
"BSD-like-gist")
;; resources/cpt-city-qgis-min/go2/webtwo/*
(license:fsf-free "file://debian/copyright"
"Go Squared")
;; resources/cpt-city-qgis-min/h5/*
license:expat
;; resources/cpt-city-qgis-min/jm/*
(license:non-copyleft "file://debian/copyright"
"Jim Mossman Attribution")
;; resources/cpt-city-qgis-min/ncl/*
(license:non-copyleft
"NCL Source Code License")
;; resources/cpt-city-qgis-min/os/*
;; resources/cpt-city-qgis-min/ukmo/*
license:ogl-psi1.0
;; resources/cpt-city-qgis-min/wkp/ice/*
license:gfdl1.2+-without-invariant-sections
;; src/gui/symbology/characterwidget.cpp
;; src/gui/symbology/characterwidget.h
;; src/providers/oracle/ocispatial/main.cpp
;; src/providers/oracle/ocispatial/qsql_ocispatial.cpp
;; src/providers/oracle/ocispatial/qsql_ocispatial.h
;; src/providers/oracle/ocispatial/qsqlcachedresult_p.h
;; src/providers/spatialite/qspatialite/qsql_spatialite.cpp
;; src/providers/spatialite/qspatialite/qsql_spatialite.h
;; src/providers/spatialite/qspatialite/qsqlcachedresult_p.h
;; src/providers/spatialite/qspatialite/smain.cpp
;; tests/qt_modeltest/modeltest.cpp
;; tests/qt_modeltest/modeltest.h
;; tests/qt_modeltest/tst_modeltest.cpp
;; tests/qt_modeltest/dynamictreemodel.cpp
;; tests/qt_modeltest/dynamictreemodel.h
(license:fsf-free
"file://debian/copyright"
"QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3")))
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl3mn1AACgkQLiXui2GA
K7MW3AgAmY0RXTnEa2J1P56P7gGPAWsI5VCIMKv4Q3pLr9Qpd9GVIO38YB0HhuEh
eMrFeCO63jsr3eXhiUrA9dN3GVBfaP7wWSGZnBOomZ3qvg4fLQyijwEw6Yhp0l2g
HfYuvU8cLMS1MIxQwiLpt6/N2bjpryLxX1ioIQT9Ovdcz9qVqyF42jb/XqaVuTjZ
OQcK9YUqKQD/ysfO0FOOdkYsM2MekM0INJBIUYn1EdVDolWqXK/Jg6wG/4hmpNtu
7mPC1snFqXiKOnAjA6UAkRWicGHNjPbpoYsOqpoCiSRhmElwCXb9oWFApBptVbYw
x0fW1us9obRKRNRjab71iQYgIDTQQw==
=VgJm
-----END PGP SIGNATURE-----

A
A
Arun Isaac wrote on 5 Dec 2019 12:19
cu7k17bc94l.fsf@systemreboot.net
Please find attached my WIP patchset. With this patchset, qgis builds
and runs successfully. Pending work includes

- get libgeotiff tests working
- get qgis tests working
- double check qgis license field
From 702d874896c88e0c330fa0c04ab0acfd1cef0723 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Wed, 4 Dec 2019 19:55:17 +0530
Subject: [PATCH 1/9] gnu: geos: Update to 3.8.0.

* gnu/packages/geo.scm (geos): Update to 3.8.0.
---
gnu/packages/geo.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 477e9a460a..a6186ed2f0 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2017, 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018, 2019 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
@@ -75,7 +75,7 @@
(define-public geos
(package
(name "geos")
- (version "3.7.1")
+ (version "3.8.0")
(source (origin
(method url-fetch)
(uri (string-append "http://download.osgeo.org/geos/geos-"
@@ -83,7 +83,7 @@
".tar.bz2"))
(sha256
(base32
- "1312m02xk4sp6f1xdpb9w0ic0zbxg90p5y66qnwidl5fksscf1h0"))))
+ "1mb2v9fy1gnbjhcgv0xny11ggfb17vkzsajdyibigwsxr4ylq4cr"))))
(build-system gnu-build-system)
(arguments `(#:phases
(modify-phases %standard-phases
--
2.23.0
From 07056365b692b896419f108ec072291ab2bba7e1 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Thu, 5 Dec 2019 01:43:42 +0530
Subject: [PATCH 2/9] gnu: Add proj.

* gnu/packages/geo.scm (proj): New variable.
---
gnu/packages/geo.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)

Toggle diff (48 lines)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index a6186ed2f0..f5ff753390 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -319,6 +319,41 @@ fully fledged Spatial SQL capabilities.")
license:mpl1.1
license:public-domain))))
+(define-public proj
+ (package
+ (name "proj")
+ (version "6.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://download.osgeo.org/proj/proj-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0l1as8f4zfg74fms6h5p5psziw0lpznja1xnirzsscpnfbwc005k"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("sqlite" ,sqlite)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (home-page "https://proj.org/")
+ (synopsis "Coordinate transformation software")
+ (description
+ "Proj is a generic coordinate transformation software that transforms
+geospatial coordinates from one coordinate reference system (CRS) to another.
+This includes cartographic projections as well as geodetic transformations.
+PROJ includes command line applications for easy conversion of coordinates
+from text files or directly from user input. In addition, proj also exposes
+an application programming interface that lets developers use the
+functionality of proj in their own software.")
+ (license (list license:expat
+ ;; src/projections/patterson.cpp
+ license:asl2.0
+ ;; src/geodesic.*, src/tests/geodtest.cpp
+ license:x11
+ ;; cmake/*
+ license:boost1.0))))
+
(define-public proj.4
(package
(name "proj.4")
--
2.23.0
From 68db9af6291a223254eff5e9803372f0fef18e78 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Thu, 5 Dec 2019 01:45:30 +0530
Subject: [PATCH 3/9] gnu: gdal: Update to 3.0.2.

* gnu/packages/geo.scm (gdal): Update to 3.0.2.
[inputs]: Add proj.
---
gnu/packages/geo.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (32 lines)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index f5ff753390..ea78b69089 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -567,7 +567,7 @@ development.")
(define-public gdal
(package
(name "gdal")
- (version "2.2.4")
+ (version "3.0.2")
(source (origin
(method url-fetch)
(uri (string-append
@@ -575,7 +575,7 @@ development.")
version ".tar.gz"))
(sha256
(base32
- "1951f7b69x3d1vic0rmq92q8f4bj3hbxnxmj5jl0cc3zg0isgmdr"))
+ "0f80izh9wshrsw55kg9abpip74hk6frk3hgqrkqbyn3f6i8g2z3q"))
(modules '((guix build utils)))
(snippet
`(begin
@@ -627,6 +627,7 @@ development.")
("libtiff" ,libtiff)
("libwebp" ,libwebp)
("pcre" ,pcre)
+ ("proj" ,proj)
("zlib" ,zlib)))
(home-page "http://www.gdal.org/")
(synopsis "Raster and vector geospatial data format library")
--
2.23.0
From eb19fd3b25484f58abcf0db7174064bc1158bb7e Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Thu, 5 Dec 2019 01:46:28 +0530
Subject: [PATCH 4/9] gnu: libspatialindex: Update to 1.9.3.

* gnu/packages/geo.scm (libspatialindex): Update to 1.9.3.
[build-system]: Switch to cmake-build-system.
---
gnu/packages/geo.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index ea78b69089..ad138d6578 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1046,16 +1046,16 @@ volunteers.")
(define-public libspatialindex
(package
(name "libspatialindex")
- (version "1.8.5")
+ (version "1.9.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.osgeo.org/libspatialindex/"
- "spatialindex-src-" version ".tar.gz"))
+ "spatialindex-src-" version ".tar.bz2"))
(sha256
(base32
- "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"))))
- (build-system gnu-build-system)
+ "02n5vjcyk04w0djidyp21hfbxfpbbara8ifd9nml6158rwqr8lja"))))
+ (build-system cmake-build-system)
(home-page "https://libspatialindex.org")
(synopsis "Spatial indexing library")
(description "The purpose of this library is to provide:
--
2.23.0
From ba3bff132eba8eeaf032e69cade548910bb8c3fd Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Thu, 5 Dec 2019 01:47:47 +0530
Subject: [PATCH 5/9] gnu: libgeotiff: Update to 1.5.1.

* gnu/packages/geo.scm (libgeotiff): Update to 1.5.1.
[inputs]: Replace proj.4 with proj.
---
gnu/packages/geo.scm | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)

Toggle diff (47 lines)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index ad138d6578..8fe48367b9 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -225,35 +225,30 @@ and driving.")
(define-public libgeotiff
(package
(name "libgeotiff")
- (version "1.4.3")
+ (version "1.5.1")
(source
(origin
(method url-fetch)
(uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-"
version ".tar.gz"))
(sha256
- (base32 "0rbjqixi4c8yz19larlzq6jda0px2gpmpp9c52cyhplbjsdhsldq"))
+ (base32 "0b31mlzcv5b1y7jdvb7p0pa3xradrg3x5g32ym911lbhq4rrgsgr"))
(modules '((guix build utils)))
(snippet
'(begin
;; Remove .csv files, distributed from EPSG under a restricted
;; license. See LICENSE for full license text.
(for-each delete-file (find-files "." "\\.csv$"))
- ;; Now that we have removed the csv files, we need to modify the Makefile.
- (substitute* "Makefile.in"
- (("^all-am: .*$")
- "all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h\n")
- (("^install-data-am: .*$")
- "install-data-am: install-includeHEADERS"))
#t))))
(build-system gnu-build-system)
(inputs
`(("libjpeg-turbo" ,libjpeg-turbo)
("libtiff" ,libtiff)
- ("proj.4" ,proj.4)
+ ("proj" ,proj)
("zlib" ,zlib)))
(arguments
- `(#:configure-flags
+ `(#:tests? #f
+ #:configure-flags
(list (string-append "--with-zlib")
(string-append "--with-jpeg")
(string-append "--with-libtiff=" (assoc-ref %build-inputs "libtiff")))))
--
2.23.0
From f4a36d098a9b51ff22b9f2e1c6b414f8648010ed Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Thu, 5 Dec 2019 16:28:38 +0530
Subject: [PATCH 6/9] licenses: Add GNU Free Documentation licenses.

* guix/licenses.scm (gfdl1.2+, gfdl1.2+-without-invariant-sections): New
variables.
---
guix/licenses.scm | 11 +++++++++++
1 file changed, 11 insertions(+)

Toggle diff (31 lines)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 41d4fefad2..24e69ac1c5 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -54,6 +54,7 @@
freetype
freebsd-doc
giftware
+ gfdl1.2+ gfdl1.2+-without-invariant-sections
gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+
gfl1.0
fdl1.1+ fdl1.2+ fdl1.3+
@@ -284,6 +285,16 @@ at URI, which may be a file:// URI pointing the package's tree."
"http://directory.fsf.org/wiki/License:Freetype"
"https://www.gnu.org/licenses/license-list.html#freetype"))
+(define gfdl1.2+
+ (license "GFDL 1.2+"
+ "https://www.gnu.org/licenses/old-licenses/fdl-1.2.en.html"
+ "https://www.gnu.org/licenses/license-list.html#FDL"))
+
+(define gfdl1.2+-without-invariant-sections
+ (license "GFDL 1.2+ without invariant sections"
+ "https://www.gnu.org/licenses/old-licenses/fdl-1.2.en.html"
+ "https://www.gnu.org/licenses/license-list.html#FDL"))
+
(define giftware
(license "Giftware"
"http://liballeg.org/license.html"
--
2.23.0
From 34f79e3835550d89e94e5b61b9d0bfe1c9254ce1 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Thu, 5 Dec 2019 16:30:09 +0530
Subject: [PATCH 7/9] licenses: Add Open Government Licence for Public Sector
Information.

* guix/licenses.scm (ogl-psi1.0): New variable.
---
guix/licenses.scm | 6 ++++++
1 file changed, 6 insertions(+)

Toggle diff (26 lines)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 24e69ac1c5..3b79e7c1c3 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -76,6 +76,7 @@
ms-pl
ncsa
nmap
+ ogl-psi1.0
openldap2.8 openssl
perl-license
psfl public-domain
@@ -527,6 +528,11 @@ at URI, which may be a file:// URI pointing the package's tree."
"https://svn.nmap.org/nmap/COPYING"
"https://fedoraproject.org/wiki/Licensing/Nmap"))
+(define ogl-psi1.0
+ (license "Open Government Licence for Public Sector Information"
+ "https://www.nationalarchives.gov.uk/doc/open-government-licence/version/1/"
+ #f))
+
(define openssl
(license "OpenSSL"
"http://directory.fsf.org/wiki/License:OpenSSL"
--
2.23.0
From 692ebddcddbf26e92274455044fe8c082f7526a1 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Thu, 5 Dec 2019 16:31:50 +0530
Subject: [PATCH 8/9] licenses: Add QWT 1.0 license.

* guix/licenses.scm (qwt1.0): New variable.
---
guix/licenses.scm | 6 ++++++
1 file changed, 6 insertions(+)

Toggle diff (26 lines)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 3b79e7c1c3..80655b7ab4 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -81,6 +81,7 @@
perl-license
psfl public-domain
qpl
+ qwt1.0
repoze
ruby
sgifreeb2.0
@@ -565,6 +566,11 @@ at URI, which may be a file:// URI pointing the package's tree."
"http://directory.fsf.org/wiki/License:QPLv1.0"
"http://www.gnu.org/licenses/license-list.html#QPL"))
+(define qwt1.0
+ (license "QWT 1.0"
+ "http://qwt.sourceforge.net/qwtlicense.html"
+ "GNU Lesser General Public License with exceptions"))
+
(define repoze
(license "Repoze"
"http://repoze.org/LICENSE.txt"
--
2.23.0
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl3o58sACgkQLiXui2GA
K7Ox/gf/XH1TPnbydAWUMWeqTxk92d9/y69AKCLc3af2RnujauWwtzJ2S00zgYet
TlGZOie89d/Nnk+5DHnHehkgQi8X7x/CHMZ7C0sg4gpLru0tedRU443qqapH7yGv
GBu0bjfiInK46kzaICZveSP7KrAxz1HOjw/jV9kcoHvIuy6FMNTEI1RL/466xUew
1rOysy19l5QprnSKDkF+rceQjLdzI4wFxgto9BIthD6xSGuNII65KxsEZlm9oBLN
yxwHgtE3sWZduiM68C9tw574YY/S1YB+TmRqy0xLdvoqar4zQ2m4It3NgHzMXTO0
Ossd2Rn58ecbhJtlOBgjRB/cgxHhCg==
=cuNr
-----END PGP SIGNATURE-----

W
W
Wiktor ?elazny wrote on 7 Dec 2019 11:51
(address . 38149@debbugs.gnu.org)
20191207105142.hspozy6juvp3czki@wz.localdomain
On Thu, Dec 05, 2019 at 04:49:38PM +0530, Arun Isaac wrote:

Toggle quote (2 lines)
> Please find attached my WIP patchset.

Impressive. Unfortunately, I could not test it because of busyness and
the savannah issue.

Thank you for your work,

W?
-----BEGIN PGP SIGNATURE-----

iQKTBAABCgB9FiEEvcl0zdnJun12Glc9xzWoxqtgedUFAl3rhD1fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEJE
Qzk3NENERDlDOUJBN0Q3NjFBNTczREM3MzVBOEM2QUI2MDc5RDUACgkQxzWoxqtg
edU+Zg//R3sONBfAbe/PG87zf0vU45kUzNvWKVOn3y8MF+ZqfWllZlO1NQK/Z3Lh
u5tGsckN4wgWvk02Jzk9ZhsohdXYmI5sERuWjAsyXovk719B3ozERjLBLKH5fsBV
b89aztVJSirU8XRNfjVlmpcetu5bZ345OfGV3wTq+3KaFa8WhUrhNEHf9SRpvgGZ
b8Ff47ZNlkMVJ02/5pRpBK7WVihOu39wYvhi685DQNrKCrDRlbF4ElOq5h4zbilE
7G5JaKoqqnZPKVS6ZwlfTBl38Rrf+579VxWcg7SvG5RCelv8S9orC0T69wi46q54
YZPO5+P85Lqlo2oqJ48MR61plcUHmP+r+qHqBBiACp+zTmXRf3MMxCcRIdiOePzC
IjRsIZ9tgI/4HemV+xy781/cqG9Dk/gQsje/ddkFSBvhFV/yIOrvHEKGsXtqacbO
V5BNxvCCNJH4sJ1k5ajrDGeZtokEjGvp/hX0GUyOqSyWL+nYwVd9wP1fIDE18IzN
JfJKNTKHFKgg4RuTYvgOHuY2a1MAqUqeu1upb3go3reX5aH5+ChhStLqWhop7Weq
xPSJ7ss33uFYE4R/CPEUive8kfaOYH1m/fJeKOq8QmiKqEo7+u2M0AJDN2lj3nWM
6i/Lon0eq4RpKEJ3F+MkovSjJTDVZo+rLY7QKaojlpo4RkBEjAg=
=dTK7
-----END PGP SIGNATURE-----


A
A
Arun Isaac wrote on 10 Dec 2019 18:08
cu7pngwaz1j.fsf@systemreboot.net
Toggle quote (3 lines)
> Impressive. Unfortunately, I could not test it because of busyness and
> the savannah issue.

No problem! Take your time. I am working on the tests now. That will
likely take another eternity, but I'm making steady progress.

Also, I just read this email. Please CC me in the future. That will help
me take note sooner.

Cheers! :-)
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl3v0RkACgkQLiXui2GA
K7MTKQf6AoTfq8xRbM58B5yM6l4M4WvFje5g/vEkppQTtwmQ0/KUtpS93NBdD6ig
anPsavzhWgXY+aZtICZIoqlEdPLXWHXgDXYtfrTDbrkuU+IKMVvmQ8fiB0zH7iVP
NgIsQEVRd+2iL3JYYiNnP5v8sjOBdQrjvGZLMMk7hGjN4/75zMtGY343kjGGjQw2
Syfu9RRPxLxNl4ZGMWBYrzaopO9FlqYm5vS76FQO6gALWdmLSlxneA8OXF/wib6d
EvSWJ92jFCw4vDzupkNJ6B1FcP3qy3yjtL6oRqw08/ZsuOTAj07ld369VjXDF0qt
gh+MJSGj/deR7YNTf/iNn38eM9A1HA==
=HmsC
-----END PGP SIGNATURE-----

B
B
Björn Höfling wrote on 18 Dec 2019 07:21
(name . Arun Isaac)(address . arunisaac@systemreboot.net)
20191218072118.1e218e9d@alma-ubu
Hi Arun,

On Thu, 05 Dec 2019 16:49:38 +0530
Arun Isaac <arunisaac@systemreboot.net> wrote:

Toggle quote (3 lines)
> Please find attached my WIP patchset. With this patchset, qgis builds
> and runs successfully. Pending work includes

The last patch (0009 for QGIS itself) does not apply. Do you have an
updated patch?

Thanks,

Björn
-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXfnFXgAKCRC/KGy2WT5f
/WB6AJ4352xJFbkw4POB9ZizxLAAhAFtVQCdHxJty2y0bupwzKEpnBtwws9gFi0=
=PKdu
-----END PGP SIGNATURE-----


B
B
Björn Höfling wrote on 18 Dec 2019 09:59
(name . Arun Isaac)(address . arunisaac@systemreboot.net)
20191218095951.16d4d4fa@alma-ubu
Hi Arun,

On Thu, 05 Dec 2019 16:49:38 +0530
Arun Isaac <arunisaac@systemreboot.net> wrote:

Toggle quote (7 lines)
> From 07056365b692b896419f108ec072291ab2bba7e1 Mon Sep 17 00:00:00 2001
> From: Arun Isaac <arunisaac@systemreboot.net>
> Date: Thu, 5 Dec 2019 01:43:42 +0530
> Subject: [PATCH 2/9] gnu: Add proj.
>
> * gnu/packages/geo.scm (proj): New variable.

We should clean up proj/proj.4 a bit more. I have to admit that I have
neglected this topic a bit, because it is tedious :-)

Proj/Proj.4 have different dependencies now (glib vs sqlite). This could
be OK due to the big change they made, but it could also hint a
packaging problem. I haven't looked yet into these details.

Reverse-dependencies:

At least now we have some packages depending on both proj and proj4,
for example:

* proj4-->postgis, proj->gdal->postgis

I will attach the full graph of:

$ guix graph -t reverse-package proj proj.4

Maybe we can totally eliminate proj.4, if all its dependencies are happy
with the 5+ (breaking) changes. If we cannot remove proj.4, at least
the graph should be separated. The "connecting package" is gdal (and
geotiff).

I know this is a bit out-of-scope of the QGIS-patch, but I think we
should clean this up before.

Björn
Attachment: both.dot
Attachment: both.svg
-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXfnqhwAKCRC/KGy2WT5f
/YLbAJ9rdUq29F/0a1Tpu8VhuPb3PQm73ACff9PjNitATXQn7Jpz/7JsbJTGsDY=
=p3cH
-----END PGP SIGNATURE-----


B
B
Björn Höfling wrote on 18 Dec 2019 10:07
(name . Arun Isaac)(address . arunisaac@systemreboot.net)
20191218100751.6edc13ce@alma-ubu
On Thu, 05 Dec 2019 16:49:38 +0530
Arun Isaac <arunisaac@systemreboot.net> wrote:

Toggle quote (2 lines)
> Subject: [PATCH 4/9] gnu: libspatialindex: Update to 1.9.3.

[..]

Toggle quote (10 lines)
> - (version "1.8.5")
> + (version "1.9.3")
> (source
> (origin
> (method url-fetch)
> (uri (string-append
> "https://download.osgeo.org/libspatialindex/"
> - "spatialindex-src-" version ".tar.gz"))
> + "spatialindex-src-" version ".tar.bz2"))

I cannot find libspatialindex 1.9.3 here:


How could you build it (Probably answer: You guix downloaded it in
your store and it was found by the right checksum)?

I found a download link here:


Or we better take the git sources? Could you please update the patch?

Thanks,

Björn
-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXfnsZwAKCRC/KGy2WT5f
/fjNAJ4xt5D8pDMWPBsGw1lJmQQwrKQDTACcD/dQjxMM6R+Zi+AZEgFGuUh2Lhs=
=FuwC
-----END PGP SIGNATURE-----


A
A
Arun Isaac wrote on 20 Dec 2019 17:52
(name . Björn Höfling)(address . bjoern.hoefling@bjoernhoefling.de)
cu78sn7ym5i.fsf@systemreboot.net
Toggle quote (4 lines)
> I cannot find libspatialindex 1.9.3 here:
>
> https://download.osgeo.org/libspatialindex/

I have fixed this now.

Toggle quote (3 lines)
> How could you build it (Probably answer: You guix downloaded it in
> your store and it was found by the right checksum)?

That's probably what happened, I guess.

Toggle quote (6 lines)
> I found a download link here:
>
> https://libspatialindex.org/#download
>
> Or we better take the git sources? Could you please update the patch?

Let's use the source tarball for now. I think it's stable enough and the
link won't break again.

Yes, we should use proj instead of proj.4 wherever possible. But, if I
remember correctly, some packages work only with proj.4 for now. Also,
we should push some of the simpler patches (say, the simple update
patches) to master right away. That will help to declutter this bug
report a little bit. WDYT?

Please find attached a new patchset. Around 56 tests are still failing
in the qgis build. I brought it down from around a 100 or so.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl38/FkACgkQLiXui2GA
K7PKOAf/dhvF9955Ja1iAAuLrrXSXV60hU1Y3isQ5/6FPq1t/0iAokQURhcwouVf
AFW34FQSDI9iD/Z1M5JdL29J6tWry2tPDeteq5hSde/3z8o75mcAccWpqx1r4Ljt
ValUlka/TeU/Omw169+g+7IuyFcinAIwtl0VMgXnWZVTlH/TmbADfAZSwapafzAe
Rp6jDSmpbfu0riHj+GWokVxSjGswGxZ2R4EItbppc1QK5/vDyd1zwrxi2g0kEKla
IGv4w/kM6s5tfl02Dcl60DJNQNg4+dTN3cZRl36RoTVojDvn0A9SEx3VlbLyI+3f
pByGY3pEgULr54/RZfIbWmc3WniCCw==
=Cfy0
-----END PGP SIGNATURE-----

D
D
Danny Milosavljevic wrote on 23 Dec 2019 07:55
(name . Arun Isaac)(address . arunisaac@systemreboot.net)
20191223075502.3d9cd692@scratchpost.org
Hi Arun,

On Fri, 20 Dec 2019 22:22:41 +0530
Arun Isaac <arunisaac@systemreboot.net> wrote:

Toggle quote (6 lines)
> Yes, we should use proj instead of proj.4 wherever possible. But, if I
> remember correctly, some packages work only with proj.4 for now. Also,
> we should push some of the simpler patches (say, the simple update
> patches) to master right away. That will help to declutter this bug
> report a little bit. WDYT?

Sure.

Also, I think the licenses can be added right now.

Likewise the package updates, but probably not the python 2.7
modification, especially if python 3 also inherits it.
The latter should go to some other branch.

What's up with libgeotiff's disabled tests?

Also, I think we usually don't list the license of non-installed files
(like the cmake includes).
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl4AZMYACgkQ5xo1VCww
uqVfkAf/Qbbd3/nlIT0meqDwwz83ITbbhNCExQJOiUWiE5Aw7AFWWjTSLplVbdJw
p8Ju5cLyLjfZrXdRj9Bm+9Oz+sGJoALwBpW1zBEc7ebmzZlKFD7gflcMQHqhAByc
I9YI8/FEToBQu1t3GiqYtupaikRgEAn4ZlKtsvy00AXLK4giH9f56xzkZYyBXzbb
LV7sPm4M6D/kFnmrILR1gjbYPY72aIUuSR026QnObB+LsfObh1ohSQAx1uW5YNdL
Q7AYt1avpLytibEw3k0T5uFMTT14d9Ey46zBbco07QrkFV5OU9o2xH30Yy3hjCXw
xInm3emTe738GOMx15pjSFRDxWfjeQ==
=yWaa
-----END PGP SIGNATURE-----


A
A
Arun Isaac wrote on 26 Dec 2019 14:39
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)
cu7y2uzi4u8.fsf@systemreboot.net
Toggle quote (6 lines)
>> Also, we should push some of the simpler patches (say, the simple
>> update patches) to master right away. That will help to declutter
>> this bug report a little bit. WDYT?
>
> Sure.

I have pushed the patches regarding geos, proj, libgeotiff, gdal,
postgis and libspatialindex.

Toggle quote (2 lines)
> Also, I think the licenses can be added right now.

I am not sure of the licenses of qgis. They need to be double
checked. So, I think we should wait until then to push those license
patches.

Toggle quote (4 lines)
> Likewise the package updates, but probably not the python 2.7
> modification, especially if python 3 also inherits it.
> The latter should go to some other branch.

That's right. The python modification would trigger too many
rebuilds. Do you know which branch I should push it to?

Toggle quote (2 lines)
> What's up with libgeotiff's disabled tests?

That was a WIP patch where the tests were failing. In the patch I
pushed, I fixed the tests and enabled them.

Toggle quote (3 lines)
> Also, I think we usually don't list the license of non-installed files
> (like the cmake includes).

Ok, I made this modification before pushing the patches.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl4Et/8ACgkQLiXui2GA
K7P/Nwf+J9O3uuDQlSVYQgRHEcNPLR2GYiF7ONsnjULtYnL5lRwsDcNIHkbHH98C
yj2WKcSBbEEE9xk0Mf15Hzf1ddQSW2T5gYEJZPKxmIH+BL4QCLEUpcZhVZaX02HB
kY+AM3oTqunm4P257BLMTtwFJGQAEhQeWLbe3ZcW6dfULirAHkN6twXEXa7FMHZf
wo4LnIWUmjU6/iUeifdbjV/PDGmCB7FBC0haogiFoofUpxafmIRGhWiILGmS2RgF
OWLImXZS6zh79YbyOTstsZBWV6Zio9gthRFHtNhyO6+7BW2hfS27vb8jXccX48sD
44Q254kVxbE+DTwOO4SbiHx5cCOsnQ==
=to9t
-----END PGP SIGNATURE-----

M
M
Marius Bakke wrote on 26 Dec 2019 15:53
87r20rjfz1.fsf@devup.no
Arun Isaac <arunisaac@systemreboot.net> writes:

Toggle quote (3 lines)
> That's right. The python modification would trigger too many
> rebuilds. Do you know which branch I should push it to?

Python 2 has 6682 dependent packages, so this change should go to the
'core-updates' branch according to the "Submitting Patches" section of
the manual.

Please make sure Python 3 also works with this change, as the configure
flag is indeed inherited as Danny pointed out.

Thank you!
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl4EyWIACgkQoqBt8qM6
VPpLewf/UDCRGcQJUM0JLF6seFodt2jLPgdScRHHSclWwkWITg5vzy40X4EuPj7r
b4F5gq4X1kgXxpxsDycbTreljGQdzlvT/i0hsvzSeOUYfDI1Pn1JHLDLIgsk2J28
Ihq9bin1DcZJNfUBlRPfuClayuBM0rWdlLRo1kRRHOTXh3Ae8oUjoF2FRNwRZa30
KLJiuGwHY3l+5o6CObBMlteaJYWZ6mEhprPNu6ca7EIzeH2+KOnK0yxEqaqgpyxF
QsQUajs/hOOciqWLsfoYGXM8HfGlVGPvCE2SCXdTTIHQD/sDpcCg9ZcEPHX3e2nU
t+hHOZCCLDY4lMsdquhg9BJaceiOnA==
=UXlP
-----END PGP SIGNATURE-----

A
A
Arun Isaac wrote on 27 Dec 2019 03:06
(name . Marius Bakke)(address . mbakke@fastmail.com)
cu7pngaikse.fsf@systemreboot.net
Toggle quote (4 lines)
> Python 2 has 6682 dependent packages, so this change should go to the
> 'core-updates' branch according to the "Submitting Patches" section of
> the manual.

Ok, makes sense.

Toggle quote (3 lines)
> Please make sure Python 3 also works with this change, as the configure
> flag is indeed inherited as Danny pointed out.

I only need the python modification for Python 3. And, as far as I can
tell, everything builds and works fine. Should I make the modification
only to Python 3, instead of inheriting it through Python 2 as it is
now?
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl4FZ0EACgkQLiXui2GA
K7MlZwf9GHxZZWpF5qBD/ev2S+vfjHVZlee68d17r+sGLhqQ/7P/CXR1MjdLiNGc
PX7A2zCRdgIu/OY7KwvXtAcaddY02OcvQc0zdM2yBED6nhT20Ii6oP+VoDLO4yrj
c90RsxeXxEOSdeTpH/xzgbdOHlmRDArx6hjzgCB/IhEfk5MUI/tmKClF+fiZ1oox
sHyD3d/J3BesdDP3O2IrZjmoyeCi4L1+NxIWzqZ7wgVw/y5Zmo3f3XonIaYHJ9/i
zZdpM06VllQGKDcUOYV3eB5e7JU06Sqr0j64Hv30sru7c1mkseNyA8ORg7lFU7EP
BMFJhIQSRKaYsP4aWDAhghAIlnjnZQ==
=tpm6
-----END PGP SIGNATURE-----

W
W
Wiktor ?elazny wrote on 30 Dec 2019 16:40
(address . 38149@debbugs.gnu.org)(name . Arun Isaac)(address . arunisaac@systemreboot.net)
20191230154025.xpbaiqmbjvf4nd33@wz.localdomain
On Tue, Dec 10, 2019 at 10:38:40PM +0530, Arun Isaac wrote:

Toggle quote (6 lines)
> > Impressive. Unfortunately, I could not test it because of busyness
> > and the savannah issue.
>
> No problem! Take your time. I am working on the tests now. That will
> likely take another eternity, but I'm making steady progress.

Hi,

I built it today. It builds! It works! Good luck with the tests.
Crossing fingers so that your definition gets merged as some point.

Thanks for saving the day,

W?
-----BEGIN PGP SIGNATURE-----

iQKTBAABCgB9FiEEvcl0zdnJun12Glc9xzWoxqtgedUFAl4KGmhfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEJE
Qzk3NENERDlDOUJBN0Q3NjFBNTczREM3MzVBOEM2QUI2MDc5RDUACgkQxzWoxqtg
edXA0hAAgEgTs3nhKZxKkw04NTEtfuIiaQ46AGgb8UgKHMwSue2KIPWINyRJUlgG
qC3frzO1ixFKyF6j3qLN+uBOBWwvHsKohKl+ZIGEtSUsVDxt+DqbJ8fKlDRTsZXD
7w57fxXpCUiVkwOSFjECBL6j/YQNm39TGaGH5XPvTzqBpwTweY37eEnZFHYKax8q
JgyJKGSn2nRTwMFCsjlKdgYysTrdkTi3WMmVKzhRAcPDWvqJGXzky/mGDBBXxrV2
lKObeGa+o5eD64u6KcCVYuujuCK4Q1xSZN70tHUrXc0mOxYDMLeh+MhldOXOc60L
r6woyg3nDfUWTmarAY0Aq/1/yYE4BxBdXKPA7SKCve3fdN5Wi6iTSzo/MwOSvKZE
lUOE35oS3kJHtWbf9of64i9MUGd5Vk2JNQU7JA2X4/9qHw6QPwEkK4Dvx90paCyY
kMFazCnX6lEf2pxLqzg6AAxLw5MGr+pZgxCimcazml/+IHeXZAwogp1uRxeRxgtq
qA6EwymS4oSbheJitwgmhPRIHODxBGvj8lcti50hBbu1ebQN+mhwUM7dEkqPf5l/
LgLzEyCBIuOnnE9xbsVEeJ2IoVATr2ICI9UinFKEty7gkfcAUwFocJRvLAwEG0bN
P6MoKHD4mF9lnAG9GW57H4YsbKUi05AUYMW998x7FfKc1NxFgVI=
=HeXL
-----END PGP SIGNATURE-----


M
M
Marius Bakke wrote on 27 Jan 2020 23:48
(name . Arun Isaac)(address . arunisaac@systemreboot.net)
877e1csege.fsf@devup.no
Arun Isaac <arunisaac@systemreboot.net> writes:

Toggle quote (8 lines)
>> Please make sure Python 3 also works with this change, as the configure
>> flag is indeed inherited as Danny pointed out.
>
> I only need the python modification for Python 3. And, as far as I can
> tell, everything builds and works fine. Should I make the modification
> only to Python 3, instead of inheriting it through Python 2 as it is
> now?

I don't really have an opinion on this, as it seems both approaches have
drawbacks and benefits... So do whatever you think is best.

Now is a good time to push if you want the Python patch in Guix! :-)
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl4vaNEACgkQoqBt8qM6
VPrbCAf/SaONJ4SKoRDZ0cWifLi2SltSXzUvTYWKhGBMIfhxMj1AYbXvP1F18wUn
dPQtYbw1mzA7cTS6tyzKBv2gAA4yVnYDvzfwOKsJ7E2PJAypNosy7TTM1djAM40v
E2kNR34uGCqdCcqUWL12lOIWwbYjWjvbY7csBBljbKXqDxdXTQkBA5n0Xx8SvY3g
SQTjQFnzhfa4IoazAEFDV0RkBYFwa8mp03P5TqKyPSTIcig7fgwX4lxE+oIgYAiX
olRL7CSmcu9H0sqS/0GOCIC2Ine1LFC/SC0SyikKHSoYnef7D+ifsfbqnjszDMS3
20Stk/1X6GBXqD6IPaSzHSVCFOiSuA==
=EUb1
-----END PGP SIGNATURE-----

A
A
Arun Isaac wrote on 28 Jan 2020 06:05
(name . Marius Bakke)(address . mbakke@fastmail.com)
cu7blqob27p.fsf@systemreboot.net
Toggle quote (2 lines)
> Now is a good time to push if you want the Python patch in Guix! :-)

I'm still struggling with the qgis tests, and I'm not sure the python
modification is necessary to get the tests working correctly. So, I
think I'll pass up this opportunity. :-(
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl4vwQoACgkQLiXui2GA
K7ObsQf/TynaomVrJqYk4Y2IhEuioxVCvp+zYHVn+m2HZIlZ0GBGOXRxIvLUWmfD
02dkEcOQ2+3VkAn9UJhI3DIybKB22CJa0e5rR7cSU5bBl9z3pdcwOlPdW/0FkJWs
DxZ8cMjc+d/Bg0UicGHUcG8LPnALVSUIrY4mxS+Ql+SBi1UhGoUMDalDeiqAzdI5
JyFMq4Hi7Ygb7yRX/lVn5AXjDVrQHMbJucRubfbdp71G4pEfN8DTkhPhAE0YXKjx
Ze9ORRFTumOYxWvIZtFRtp43+ZacQsIMJ2JCgeZzyKIezb4XTd8hLlgr1ckiI9Tr
wEmb1NipVVXQ6iAn7OCNEMeWEPAAXQ==
=kIEC
-----END PGP SIGNATURE-----

G
G
Guillaume Le Vaillant wrote on 22 Mar 2020 16:45
Re: [WIP] gnu: Add qgis.
(address . 38149@debbugs.gnu.org)
87a748ieb1.fsf@yamatai
I took the WIP patch and updated it for QGIS 3.12.1. I also added some
inputs for optional features and some Qt wrapping for the SVG icons to
show up correctly in the GUI.

Things that can still be improved:
- Among the 550 tests, around 60 are failing. I disabled them for now
in the package definition.
- Also, I only put GPL2+ and GPL3+ as license (like in Gentoo and Nix),
and not the complete list for every file (like in Debian).

Do you think this package definition for QGIS is good enough to be
merged in master (and improved later), or are the remaining issues
blocking?

P.S. This is related to issues #38150 and #38178 (patch to add GRASS).
From f94d428f9a867fb841dff02a5d66956d3b478d8b Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sat, 21 Mar 2020 19:58:43 +0100
Subject: [PATCH 1/4] gnu: Add python-owslib.

* gnu/packages/python-xyz.scm (python-owslib): New variable.
---
gnu/packages/python-xyz.scm | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)

Toggle diff (40 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 65bc6df4aa..ea789b7bef 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -59,7 +59,7 @@
;;; Copyright © 2019, 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2019 Sam <smbaines8@gmail.com>
;;; Copyright © 2019 Jack Hill <jackhill@jackhill.us>
-;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com>
@@ -18435,3 +18435,24 @@ sequences.")
prevent debuggers and other applications from inspecting the memory within
your process.")
(license license:expat)))
+
+(define-public python-owslib
+ (package
+ (name "python-owslib")
+ (version "0.19.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "OWSLib" version))
+ (sha256
+ (base32 "0v8vg0naa9rywvd31cpq65ljbdclpsrx09788v4xj7lg10np8nk0"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:tests? #f)) ; TODO: package dependencies required for tests.
+ (synopsis "Interface for Open Geospatial Consortium web service")
+ (description
+ "OWSLib is a Python package for client programming with Open Geospatial
+Consortium (OGC) web service (hence OWS) interface standards, and their related
+content models.")
+ (home-page "https://geopython.github.io/OWSLib/")
+ (license license:bsd-3)))
--
2.25.2
From 4a8b5a89db66f3d97a3491492af282f1f547d27a Mon Sep 17 00:00:00 2001
From: Guillaume Le Vaillant <glv@posteo.net>
Date: Sun, 22 Mar 2020 11:33:00 +0100
Subject: [PATCH 3/4] gnu: Add saga.

* gnu/packages/geo.scm (saga): New variable.
---
gnu/packages/geo.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)

Toggle diff (75 lines)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index b244e49a92..fc5f473418 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -70,11 +70,13 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
+ #:use-module (gnu packages image-processing)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages java)
#:use-module (gnu packages lua)
#:use-module (gnu packages maths)
#:use-module (gnu packages pcre)
+ #:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
@@ -85,6 +87,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages swig)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages textutils)
#:use-module (gnu packages time)
@@ -1751,3 +1754,46 @@ analysis, image processing, graphics and maps production, spatial modeling, and
visualization.")
(home-page "https://grass.osgeo.org/")
(license license:gpl2+))))
+
+(define-public saga
+ (package
+ (name "saga")
+ (version "7.6.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://sourceforge/saga-gis/SAGA%20-%20"
+ (version-major version) "/SAGA%20-%20" version
+ "/saga-" version ".tar.gz"))
+ (sha256
+ (base32 "09j5magmayq2y620kqa490mfd1kpdp3lng2ifcgbrmssc079ybm0"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("swig" ,swig)))
+ (inputs
+ `(("curl" ,curl)
+ ("fftw" ,fftw)
+ ("gdal" ,gdal)
+ ("hdf5" ,hdf5)
+ ("jasper" ,jasper)
+ ("libharu" ,libharu)
+ ("libtiff" ,libtiff)
+ ("opencv" ,opencv)
+ ("postgresql" ,postgresql)
+ ("proj.4" ,proj.4)
+ ("python" ,python)
+ ("qhull" ,qhull)
+ ("unixodbc" ,unixodbc)
+ ("vigra" ,vigra)
+ ("wxwidgets" ,wxwidgets)))
+ (arguments
+ '(#:configure-flags '("--enable-python")))
+ (synopsis "System for Automated Geoscientific Analyses")
+ (description
+ "SAGA (System for Automated Geoscientific Analyses) is a Geographic
+Information System (GIS) software. It has been designed for an easy and
+effective implementation of spatial algorithms and it offers a comprehensive,
+growing set of geoscientific methods.")
+ (home-page "http://www.saga-gis.org")
+ (license (list license:gpl2+ license:lgpl2.1+))))
--
2.25.2
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQQkUwKxurH4Z/3KlryPP4Yfgut6mgUCXneIEgAKCRCPP4Yfgut6
mpHjAP9G9yYaj3B4m6pzxoHnA0Vz6bcxQ34hi5Ngv8HBJT13+AD9HdOXahdobYv8
J9BGod6CRDDZULDtBvJ2+5llzCgv0Q8=
=nUQC
-----END PGP SIGNATURE-----

A
A
Arun Isaac wrote on 23 Mar 2020 22:00
Re: [bug#38149] [WIP] gnu: Add qgis.
cu7pnd2vlap.fsf@systemreboot.net
Hi,

Thank you for continuing the work. I was not making any progress on the
tests and was caught up with other work.

Toggle quote (4 lines)
> Do you think this package definition for QGIS is good enough to be
> merged in master (and improved later), or are the remaining issues
> blocking?

I agree we should merge this now and fix the tests later.

Toggle quote (4 lines)
> I took the WIP patch and updated it for QGIS 3.12.1. I also added some
> inputs for optional features and some Qt wrapping for the SVG icons to
> show up correctly in the GUI.

Ok.

Toggle quote (4 lines)
> Things that can still be improved:
> - Among the 550 tests, around 60 are failing. I disabled them for now
> in the package definition.

Ok, that should be enough for now.

Toggle quote (3 lines)
> - Also, I only put GPL2+ and GPL3+ as license (like in Gentoo and Nix),
> and not the complete list for every file (like in Debian).

Is this a good idea? I always thought we go the Debian way and try to
document every single license. I would love it if we only had to
document the "main license" but I'm not sure that is consistent with how
other Guix packages are written. Thoughts?

Thanks,
Arun.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl55I24ACgkQLiXui2GA
K7PaYggAo6HHLU/AbH7SPvjsA2iU8uWe9XZb/0UKMbuligbR5fTEMjSXHspdwPfu
LxCHy8Aq7m1EblGv14lf8fpDcKa3zBX0LaTO8ZvfcuSkmnpAibBZsgQlFj5PXrIH
ed5Li9VPqiQRjhvVUUX4SJyvHDlp+DV41Z/vrgHTfhY39xHey285DJhc68m4R0qL
7rifATyD7ji3aUwmjHMuC9+mxDauV3EvLrvTJNOYGgF5O9MHG/4AozIJKMfmkP80
2oUvm7uV9iOAAOwnUdFhFSSNqNnvQjALrtx+qxGErLJ1hw2EBC/0UlGY7IqxdwiK
AW1LHX8LXycVE3HQ8ODDlpi1OQz4DA==
=AbDm
-----END PGP SIGNATURE-----

G
G
Guillaume Le Vaillant wrote on 24 Mar 2020 11:52
(name . Arun Isaac)(address . arunisaac@systemreboot.net)(address . 38149@debbugs.gnu.org)
87y2rqja9b.fsf@yamatai
Arun Isaac <arunisaac@systemreboot.net> skribis:

Toggle quote (8 lines)
>> - Also, I only put GPL2+ and GPL3+ as license (like in Gentoo and Nix),
>> and not the complete list for every file (like in Debian).
>
> Is this a good idea? I always thought we go the Debian way and try to
> document every single license. I would love it if we only had to
> document the "main license" but I'm not sure that is consistent with how
> other Guix packages are written. Thoughts?

I added the other licenses to the package definition (I hope I didn't
miss anything).
Pushed as 151f3d416cff16d7e7d57dd24756dc4357384a1f.

Should this issue be closed, or left open for the remaining failing
tests?
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQQkUwKxurH4Z/3KlryPP4Yfgut6mgUCXnnmUAAKCRCPP4Yfgut6
mvJGAP4/iMjvzb3nwVYlVlVZ21C4FhhMq5bkKEfshMTfcjvkuAEAlVJl03V7nwVz
S67CIYiA3fhjdJpKAi14AgZf4riipw8=
=7JV5
-----END PGP SIGNATURE-----

A
A
Arun Isaac wrote on 24 Mar 2020 12:46
(name . Guillaume Le Vaillant)(address . glv@posteo.net)(address . 38149-done@debbugs.gnu.org)
cu7eetiuga9.fsf@systemreboot.net
Toggle quote (3 lines)
> I added the other licenses to the package definition (I hope I didn't
> miss anything).

qgis' various parts are licensed differently in one giant mess. And,
it'll be hard to keep the license field up to date. But, let's hope. :-)

Toggle quote (2 lines)
> Pushed as 151f3d416cff16d7e7d57dd24756dc4357384a1f.

Ok, thanks! :-)

Toggle quote (3 lines)
> Should this issue be closed, or left open for the remaining failing
> tests?

I have closed this issue. Anyone improving the package can open a
separate issue.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAl558w4ACgkQLiXui2GA
K7MvBQf/e5OnFhR9CIr0XCuv1fji0o8EQ5tScm2jTjTUDIHRmFsYpO/J/5KTboZZ
ed5Se769Bz0iJKuTemxNlA49iYl9/VlgqzEiJ2ZlYWw2cMzB5rUbFu2XgMnM7YQq
P2LhRSRVDEvuvIH/u6qPqT8RJF8pvP+Y4YxJtgvpQi1PuOxhaimvetBKnAPj8EwP
JIouybNn/nG/2pwlFAgTlgPYwLCBNLGf2Hfo4mp/QrBkBH6+NbCcSpVifgmTjZ/Q
rAe+esCrqKVFlABbnQBuDXEBjM2XJwTPiQhE4QPkV3LeXal+Bns9Apz6B473zO5K
cIcFaMPp4o4gwhJ48PPCspqo+NUuiA==
=aYx+
-----END PGP SIGNATURE-----

Closed
?