[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Tue, 14 Jan 2020 18:19:23 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 3cfe76bec06fbd8bb7e7cb3387866fefbcad674f
Merge: ec836b4 574a71a
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Jan 15 00:09:46 2020 +0100
Merge branch 'master' into core-updates
doc/build.scm | 7 +-
doc/htmlxref.cnf | 45 +-
gnu/installer/newt/final.scm | 8 +-
gnu/installer/newt/page.scm | 78 ++--
gnu/local.mk | 5 +-
gnu/packages/audio.scm | 21 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 13 +
gnu/packages/chez.scm | 13 +-
gnu/packages/cmake.scm | 14 +-
gnu/packages/crates-io.scm | 109 +++--
gnu/packages/crypto.scm | 29 +-
gnu/packages/databases.scm | 12 +-
gnu/packages/disk.scm | 2 +-
gnu/packages/emacs-xyz.scm | 33 +-
gnu/packages/entr.scm | 10 +-
gnu/packages/freedesktop.scm | 29 +-
gnu/packages/games.scm | 40 +-
gnu/packages/geo.scm | 125 +++++-
gnu/packages/gnome.scm | 457 +++++++++++++++++----
gnu/packages/graphviz.scm | 4 +-
gnu/packages/gstreamer.scm | 11 +-
gnu/packages/gtk.scm | 10 +
gnu/packages/guile-xyz.scm | 58 ++-
gnu/packages/guile.scm | 29 +-
gnu/packages/kde.scm | 4 +-
gnu/packages/linux.scm | 30 +-
gnu/packages/lisp-xyz.scm | 45 ++
gnu/packages/maths.scm | 10 +-
gnu/packages/messaging.scm | 7 +-
gnu/packages/mpi.scm | 3 +-
gnu/packages/music.scm | 7 +-
.../audacity-build-with-system-portaudio.patch | 16 +-
.../patches/jsoncpp-fix-inverted-case.patch | 22 +
gnu/packages/patches/spice-fix-test-armhf.patch | 19 +
gnu/packages/patches/wavpack-CVE-2018-6767.patch | 119 ------
gnu/packages/patches/wavpack-CVE-2018-7253.patch | 29 --
gnu/packages/patches/wavpack-CVE-2018-7254.patch | 62 ---
gnu/packages/popt.scm | 9 +-
gnu/packages/python-crypto.scm | 101 ++++-
gnu/packages/python-xyz.scm | 73 ++--
gnu/packages/qt.scm | 4 +-
gnu/packages/rsync.scm | 4 +-
gnu/packages/serialization.scm | 1 +
gnu/packages/spice.scm | 1 +
gnu/packages/version-control.scm | 8 +-
gnu/services/databases.scm | 2 +-
gnu/system.scm | 1 -
guix/build/asdf-build-system.scm | 9 +
guix/deprecation.scm | 8 +-
guix/lint.scm | 1 +
nix/libstore/gc.cc | 18 +-
nix/libutil/util.cc | 10 +-
nix/libutil/util.hh | 6 +-
54 files changed, 1231 insertions(+), 564 deletions(-)
diff --cc gnu/local.mk
index 4677c42,cb46ee7..62ea29c
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1455,11 -1458,7 +1457,8 @@@ dist_patch_DATA =
%D%/packages/patches/vsearch-unbundle-cityhash.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt1.patch \
%D%/packages/patches/vte-CVE-2012-2738-pt2.patch \
- %D%/packages/patches/wavpack-CVE-2018-6767.patch \
- %D%/packages/patches/wavpack-CVE-2018-7253.patch \
- %D%/packages/patches/wavpack-CVE-2018-7254.patch \
%D%/packages/patches/weasyprint-library-paths.patch \
+ %D%/packages/patches/webkitgtk-icu-65.patch \
%D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \
%D%/packages/patches/wicd-bitrate-none-fix.patch \
%D%/packages/patches/wicd-get-selected-profile-fix.patch \
diff --cc gnu/packages/cmake.scm
index 556e98a,2d2827f..e24b6de
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@@ -163,7 -159,7 +164,18 @@@
(native-search-paths
(list (search-path-specification
(variable "CMAKE_PREFIX_PATH")
-- (files '("")))))
++ (files '("")))
++ ;; "cmake-curl-certificates.patch" changes CMake to honor
'SSL_CERT_DIR'
++ ;; and 'SSL_CERT_FILE', hence these search path entries.
++ (search-path-specification
++ (variable "SSL_CERT_DIR")
++ (separator #f) ;single entry
++ (files '("etc/ssl/certs")))
++ (search-path-specification
++ (variable "SSL_CERT_FILE")
++ (file-type 'regular)
++ (separator #f) ;single entry
++ (files '("etc/ssl/certs/ca-certificates.crt")))))
(home-page "https://cmake.org/";)
(synopsis "Cross-platform build system")
(description
diff --cc gnu/packages/geo.scm
index 32cdc2b,d57d9b8..e837cdf
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@@ -1336,3 -1337,125 +1337,125 @@@ MaxMind DB files."
(description "Provides an API for the GeoIP2 web services and databases.
The API also works with MaxMind’s free GeoLite2 databases.")
(license license:asl2.0)))
+
+ (define-public routino
+ (package
+ (name "routino")
+ (version "3.3.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://www.routino.org/download/routino-";
+ version ".tgz"))
+ (sha256
+ (base32
+ "1ccx3s99j8syxc1gqkzsaqkmyf44l7h3adildnc5iq2md7bp8wab"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("perl" ,perl)))
+ (inputs
+ `(("bzip2" ,bzip2)
+ ("xz" ,xz)
+ ("zlib" ,zlib)))
+ (arguments
+ `(#:test-target "test"
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "Makefile.conf"
+ (("prefix=/usr/local")
+ (string-append "prefix=" (assoc-ref outputs "out")))
+ (("LDFLAGS_LDSO=-Wl,-R\\.")
+ "LDFLAGS_LDSO=-Wl,-R$(libdir)")
+ (("#CFLAGS\\+=-DUSE_XZ")
+ "CFLAGS+=-DUSE_XZ")
+ (("#LDFLAGS\\+=-llzma")
+ "LDFLAGS+=-llzma"))
+ #t)))))
+ (synopsis "Routing application for OpenStreetMap data")
+ (description
+ "Routino is an application for finding a route between two points
+ using the dataset of topographical information collected by
+ @url{https://www.OpenStreetMap.org}.";)
+ (home-page "https://www.routino.org/";)
+ (license license:agpl3+)))
+
+ (define-public qmapshack
+ (package
+ (name "qmapshack")
+ (version "1.14.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Maproom/qmapshack.git";)
+ (commit (string-append "V_" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07c2hrq9sn456w7l3gdr599rmjfv2k6mh159zza7p1py8r7ywksa"))))
+ (build-system qt-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("qttools" ,qttools)))
+ (inputs
+ `(("gdal" ,gdal)
+ ("libjpeg-turbo" ,libjpeg-turbo)
+ ("proj" ,proj)
+ ("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtlocation" ,qtlocation)
+ ("qtwebchannel" ,qtwebchannel)
+ ("qtwebengine" ,qtwebengine)
+ ("quazip" ,quazip)
+ ("routino" ,routino)
- ("sqlite" ,sqlite-with-column-metadata) ; See wrap phase
++ ("sqlite" ,sqlite) ; See wrap phase
+ ("zlib" ,zlib)))
+ (arguments
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-cmake-modules
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "CMakeLists.txt"
+ (("find_package\\(Qt5PrintSupport REQUIRED\\)" all)
+ (string-append all "\nfind_package(Qt5Positioning
REQUIRED)")))
+ (substitute* "cmake/Modules/FindROUTINO.cmake"
+ (("/usr/local")
+ (assoc-ref inputs "routino")))
+ ;; The following fixes are included as patches in the sources
+ ;; of QMapShack, but they are not applied by default, for
+ ;; some reason...
+ (invoke "patch" "-p1" "-i" "FindPROJ4.patch")
+ (invoke "patch" "-p1" "-i" "FindQuaZip5.patch")
+ #t))
+ (add-after 'install 'wrap
+ ;; The program fails to run with the error:
+ ;; undefined symbol: sqlite3_column_table_name16
+ ;; Forcing the program to use sqlite-with-column-metadata instead
+ ;; of sqlite using LD_LIBRARY_PATH solves the problem.
+ ;;
+ ;; The program also fails to find the QtWebEngineProcess program,
+ ;; so we set QTWEBENGINEPROCESS_PATH to help it.
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
+ (qtwebengineprocess (string-append
+ (assoc-ref inputs "qtwebengine")
+
"/lib/qt5/libexec/QtWebEngineProcess"))
+ (sqlite-lib (string-append (assoc-ref inputs "sqlite")
+ "/lib")))
+ (for-each (lambda (program)
+ (wrap-program program
+ `("LD_LIBRARY_PATH" ":" prefix (,sqlite-lib))
+ `("QTWEBENGINEPROCESS_PATH" =
+ (,qtwebengineprocess))))
+ (find-files bin ".*")))
+ #t)))))
+ (synopsis "GPS mapping application")
+ (description
+ "QMapShack can be used to plan your next outdoor trip or to visualize and
+ archive all the GPS recordings of your past trips. It is the successor of the
+ QLandkarte GT application.")
+ (home-page "https://github.com/Maproom/qmapshack/wiki";)
+ (license license:gpl3+)))