gnu: Add parallel-hashmap.

* gnu/packages/datastructures.scm (parallel-hashmap): New variable.

Change-Id: I1db5abe82a10041a08a2c116c07ccaf7b318e2e0
Signed-off-by: Andreas Enge <andreas@enge.fr>

gnu/packages/admin.scm

@@ -79,6 +79,7 @@
 ;;; Copyright © 2025 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2025 Luca Kredel <luca.kredel@web.de>
 ;;; Copyright © 2025 ROCKTAKEY <rocktakey@gmail.com>
+;;; Copyright © 2026 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5847,6 +5848,11 @@ This program allows you to view and manipulate this EEPROM list.")
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
              (setenv "CONFIG_SHELL" (which "bash"))
+             (setenv "CFLAGS"
+               (string-append "-g -O2 "
+                              "-Wno-error=implicit-int "
+                              "-Wno-error=implicit-function-declaration "
+                              "-Wno-error=incompatible-pointer-types"))
              (invoke "./configure"
               (string-append "--prefix="
                              (assoc-ref outputs "out"))))))))

gnu/packages/apparmor.scm

@@ -41,7 +41,7 @@
 (define-public libapparmor
   (package
     (name "libapparmor")
-    (version "3.1.2")
+    (version "4.1.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -50,7 +50,7 @@
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1h77a7ww0rxfv5nsi1iy4fffklxdr2vq6r7kdsqm15yysglhbjyi"))))
+                "0p3vq0awvn4ar6sblmhcs0i9m7zc9kbwm3f3zcggx4lqgmy8s18b"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
@@ -84,6 +84,7 @@
                    (chdir "libraries/libapparmor"))))))
     (native-inputs
      (list autoconf
+           autoconf-archive
            automake
            bison
            dejagnu

gnu/packages/data-language.scm

@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
 ;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system cmake)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
@@ -66,7 +68,6 @@
            glpk
            graphicsmagick
            gsl
-           hdf4-alt
            hdf5
            libgeotiff
            libjpeg-turbo
@@ -83,6 +84,9 @@
            udunits
            wxwidgets
            zlib))
+    (arguments
+      (list
+        #:configure-flags #~(list "-DHDF=OFF"))) ; keep default "-DHDF5=ON"
     (home-page "https://gnudatalanguage.github.io/")
     (synopsis "Compiler for GDL, an IDL-compatible programming language")
     (description

gnu/packages/datastructures.scm

@@ -27,6 +27,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -169,6 +170,78 @@ and time-efficient for good hash functions.")
     (home-page "https://github.com/sparsehash/sparsehash")
     (license license:bsd-3)))
 
+(define-public parallel-hashmap
+  (package
+    (name "parallel-hashmap")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/greg7mdp/parallel-hashmap")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "167pvbd3bwyn69i1s4vp3badcr97xy10sga63bbj7jqhj09f2816"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "-DPHMAP_BUILD_EXAMPLES=OFF")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'respect-tests?
+            (lambda* (#:key tests? #:allow-other-keys)
+              ;; fix parallel-hashmap's build script not respecting #:tests?
+              (unless tests?
+                (substitute* "CMakeLists.txt"
+                  (("option\\(PHMAP_BUILD_TESTS.+$")
+                   "set(PHMAP_BUILD_TESTS OFF)\n")))))
+          (add-after 'unpack 'disable-gtest-download
+            (lambda _
+              ;; don't download googletest
+              (substitute* "CMakeLists.txt"
+                (("include\\(cmake/DownloadGTest.cmake\\)")
+                 (format #f
+                  "add_subdirectory(~a ./googletest-build EXCLUDE_FROM_ALL)"
+                  #+(package-source (this-package-native-input "googletest"))))))))))
+    ;; FIXME: specify that we depend on the gtest source, not the package itself
+    (native-inputs (list googletest))
+    (home-page "https://greg7mdp.github.io/parallel-hashmap/")
+    (synopsis "C++ implementation of efficient and concurrent hash maps")
+    (description
+     "parallel-hashmap provides a family of header-only, very fast and
+memory-friendly hashmap and btree containers for C++11 and above.
+
+It has the following characteristics:
+
+@itemize
+
+@item Drop-in replacement for std::unordered_map, std::unordered_set, std::map,
+and std::set with better performance.
+
+@item Requires C++11 compiler support and provides C++14 and C++17 APIs,
+including features like try_emplace.
+
+@item Highly efficent and faster than standard unordered containers,
+Boost implementations, or sparsepp alternatives.
+
+@item Memory-friendly: maintains low memory usage with a slight increase compared
+to sparsepp.
+
+@item Heterogeneous lookup support.
+
+@item Dump/load feature: for flat hash maps storing std::trivially_copyable data,
+the entire table can be dumped to disk and restored as a single array efficiently
+without hash computations. This is about 10 times faster than element-wise
+serialization but uses 10% to 60% extra disk space.
+
+@item Automatic support for boost::hash_value() and default hash functions for
+std::pair and std::tuple.
+
+@end itemize")
+    (license license:asl2.0)))
+
 (define-public ssdeep
   (package
     (name "ssdeep")

gnu/packages/emacs-xyz.scm

@@ -21488,28 +21488,31 @@ procedures for emacs-lisp-mode.")
       (license license:gpl3+))))
 
 (define-public emacs-ht
-  (package
-    (name "emacs-ht")
-    (version "2.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/Wilfred/ht.el")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0can9v336lgnq0q2ha3js0565jzp3dlwwqxhcbx5swk5kp148f07"))))
-    (build-system emacs-build-system)
-    (propagated-inputs (list emacs-dash))
-    (native-inputs
-     (list emacs-ert-runner))
-    (home-page "https://github.com/Wilfred/ht.el")
-    (synopsis "Hash table library for Emacs")
-    (description
-     "This package simplifies the use of hash tables in elisp.  It also
+  ;; Last release in 2021.
+  (let ((commit "1c49aad1c820c86f7ee35bf9fff8429502f60fef")
+        (revision "0"))
+    (package
+      (name "emacs-ht")
+      (version (git-version "2.4" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/Wilfred/ht.el")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1vyk81xav1ghdb39fqi99yf6yvzsh6p007v7yhzk1bbqqffkvqdj"))))
+      (build-system emacs-build-system)
+      (propagated-inputs (list emacs-dash))
+      (native-inputs
+       (list emacs-ert-runner))
+      (home-page "https://github.com/Wilfred/ht.el")
+      (synopsis "Hash table library for Emacs")
+      (description
+       "This package simplifies the use of hash tables in elisp.  It also
 provides functions to convert hash tables from and to alists and plists.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-log4e
   (package

gnu/packages/kde-frameworks.scm

@@ -2693,7 +2693,7 @@ covers feedback and persistent events.")
            kwindowsystem-5
            libcanberra
            libdbusmenu-qt
-           phonon
+           phonon-qt5
            qtdeclarative-5
            qtbase-5
            qtspeech-5
@@ -4570,7 +4570,7 @@ the passwords on KDE work spaces.")
            kwidgetsaddons-5
            kwindowsystem-5
            libgcrypt
-           phonon
+           phonon-qt5
            qgpgme
            qca
            qtbase-5))))
@@ -4727,7 +4727,7 @@ descriptions for integrating actions from plugins.")
                   kxmlgui-5
                   ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd,
                   libglvnd
-                  phonon
+                  phonon-qt5
                   qtbase-5
                   qtdeclarative-5
                   qtquickcontrols2-5

gnu/packages/kde-multimedia.scm

@@ -15,6 +15,7 @@
 ;;; Copyright © 2024 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2024, 2025 Sughosha <sughosha@disroot.org>
 ;;; Copyright © 2025 Sergio Pastor Pérez <sergio.pastorperez@gmail.com>
+;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -94,10 +95,29 @@
     (build-system cmake-build-system)
     (native-inputs
      (list appstream extra-cmake-modules pkg-config qttools))
-    (inputs (list qtbase qt5compat glib qtbase-5 pulseaudio))
+    (inputs (list qtbase qt5compat glib pulseaudio))
     (arguments
      (list #:configure-flags
-           #~(list "-DCMAKE_CXX_FLAGS=-fPIC")))
+           #~(list "-DPHONON_BUILD_QT5=OFF"
+                   "-DPHONON_BUILD_QT6=ON"
+                   "-DCMAKE_CXX_FLAGS=-fPIC")))
+    (home-page "https://community.kde.org/Phonon")
+    (synopsis "KDE's multimedia library")
+    (description "KDE's multimedia library.")
+    (license license:lgpl2.1+)))
+
+(define-public phonon-qt5
+  (package
+    (inherit phonon)
+    (name "phonon-qt5")
+    (native-inputs
+     (list appstream extra-cmake-modules pkg-config qttools-5))
+    (inputs (list qtbase-5 glib pulseaudio))
+    (arguments
+     (list #:configure-flags
+           #~(list "-DPHONON_BUILD_QT5=ON"
+                   "-DPHONON_BUILD_QT6=OFF"
+                   "-DCMAKE_CXX_FLAGS=-fPIC")))
     (home-page "https://community.kde.org/Phonon")
     (synopsis "KDE's multimedia library")
     (description "KDE's multimedia library.")

gnu/packages/mp3.scm

@@ -245,7 +245,7 @@ a highly stable and efficient implementation.")
 (define-public taglib
   (package
     (name "taglib")
-    (version "1.12")
+    (version "2.1.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -254,23 +254,12 @@ a highly stable and efficient implementation.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0q7dkn5rh9v6b0scmcp2qmjv3iransafmpn6jvgid0yq75m2nqd2"))))
+                "0m1xyjsg6a8p4prn1xr1g29zsxqr7606cv3cblgjgxkb1dk26fx7"))))
     (build-system cmake-build-system)
     (arguments
-      '(#:tests? #f ; Tests are not ran with BUILD_SHARED_LIBS on.
-        #:configure-flags (list "-DBUILD_SHARED_LIBS=ON")
-        #:phases (modify-phases %standard-phases
-                   (add-before 'configure 'adjust-zlib-ldflags
-                     (lambda* (#:key inputs #:allow-other-keys)
-                       ;; Make sure users of 'taglib-config --libs' get the -L
-                       ;; flag for zlib.
-                       (substitute* "CMakeLists.txt"
-                         (("set\\(ZLIB_LIBRARIES_FLAGS -lz\\)")
-                          (string-append "set(ZLIB_LIBRARIES_FLAGS \"-L"
-                                         (assoc-ref inputs "zlib")
-                                         "/lib -lz\")")))
-                       #t)))))
-    (inputs (list zlib))
+     (list #:configure-flags
+           #~(list "-DBUILD_SHARED_LIBS=ON")))
+    (inputs (list cppunit utfcpp zlib))
     (home-page "https://taglib.org")
     (synopsis "Library to access audio file meta-data")
     (description
@@ -282,6 +271,20 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.")
     ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1.
     (license (list license:lgpl2.1 license:mpl1.1))))
 
+(define-public taglib-1
+  (package/inherit taglib
+    (name (package-name taglib))
+    (version "1.13.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/taglib/taglib")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0phliksg5r1n15prcbp391xk2z1fh2c7zlc7h0nabpwkf6j08za1"))))))
+
 (define-public taglib-next
   (package
     (inherit taglib)

gnu/packages/music.scm

@@ -753,7 +753,7 @@ Winamp/XMMS skins.")
 (define-public strawberry
   (package
     (name "strawberry")
-    (version "1.0.21")
+    (version "1.2.14")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -762,32 +762,21 @@ Winamp/XMMS skins.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ibs7x7i1zz2r13wg238c5bhr1j4x8vl7hvjg01vdl5hfrh2gk1i"))
-              (modules '((guix build utils)
-                         (ice-9 regex)))
+                "0sli0wm1l34ca8y6m3rfa604v1bbzbaiala13kzndcqqwnrsh66f"))
+              (modules '((guix build utils)))
+              ;; Unbundle and disable discord-rpc.
               (snippet
                '(begin
-                  (use-modules ((ice-9 regex)))
-                  (for-each
-                   (lambda (dir)
-                     ;; TODO: The following dependencies are still bundled:
-                     ;; - "singleapplication"
-                     (let ((bundled '("singleapplication")))
-                       (if (not
-                            (string-match
-                             (string-append ".?*(" (string-join bundled "|") ")")
-                             dir))
-                           (delete-file-recursively dir))))
-                   (find-files "3rdparty"
-                               (lambda (file stat)
-                                 (string-match "^3rdparty/[^/]*$" file))
-                               #:directories? #t))))))
+                  (delete-file-recursively "3rdparty")
+                  (substitute* "CMakeLists.txt"
+                    ((".*3rdparty\\/discord-rpc.*") "")
+                    ((".*src/discord.*") "")
+                    ((".*:discord-rpc.*") "")
+                    (("DISCORD_RPC ON") "DISCORD_RPC OFF"))))))
     (build-system qt-build-system)
     (arguments
      (list
       #:qtbase qtbase
-      #:configure-flags
-      #~(list "-DBUILD_WITH_QT6=ON")
       #:modules '((guix build qt-build-system)
                   ((guix build gnu-build-system) #:prefix gnu:)
                   (guix build utils))
@@ -829,13 +818,17 @@ Winamp/XMMS skins.")
            gst-plugins-base
            gst-plugins-good
            icu4c
+           kdsingleapplication
            libcdio
            libebur128
+           libgpod
            libmtp
            protobuf
            pulseaudio
            qtbase
            qtwayland
+           rapidjson
+           sparsehash
            sqlite
            taglib))
     (home-page "https://www.strawberrymusicplayer.org/")
@@ -845,8 +838,6 @@ It is a fork of Clementine aimed at music collectors and audiophiles.")
     (license (list
               ;; strawberry.
               license:gpl3+
-              ;; singleapplication
-              license:expat
               ;; icons.
               license:cc-by-sa3.0))))
 

gnu/packages/prolog.scm

@@ -201,10 +201,6 @@ it.")
         (base32 "0z3zx66v1qx80b97vmb8hhpb52jjbjs9rfz31myw6mf2fsgqb2b7"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
-    (native-inputs
-     (if (supported-package? valgrind/pinned)
-         (list valgrind/pinned)
-         '()))
     (inputs
      (list curl
            gsl
@@ -219,9 +215,7 @@ it.")
       #~(list (string-append "PREFIX=" #$output)
               (string-append "CC=" #$(cc-for-target))
               (string-append "HOST_CC=" #$(cc-for-target)))
-      #:test-target (if (this-package-native-input "valgrind")
-                        "check"
-                        "test")
+      #:test-target "test"
       #:phases
       #~(modify-phases %standard-phases
           ;; Upstream does not use a configure script.

gnu/packages/video.scm

@@ -2565,7 +2565,7 @@ media, 2D/3D graphics and ECMAScript.")
            speex
            speexdsp
            srt
-           taglib
+           taglib-1
            twolame
            unzip
            wayland

gnu/packages/vpn.scm

@@ -59,6 +59,7 @@
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages authentication)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
@@ -66,6 +67,7 @@
   #:use-module (gnu packages dns)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages flex)
@@ -81,10 +83,13 @@
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages hardware)
+  #:use-module (gnu packages kerberos)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages networking)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -761,32 +766,63 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer
     (license license:bsd-3)))
 
 (define-public openconnect
-  (package
-    (name "openconnect")
-    (version "9.12")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/"
-                                  "openconnect-" version ".tar.gz"))
-              (sha256
-               (base32 "0gj1nba1pygvcjasqdakxxnx94dwx3l4hzj0dvipbzjdmbixrgm2"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:configure-flags
-           #~(list (string-append "--with-vpnc-script="
-                                  (search-input-file %build-inputs
-                                                     "etc/vpnc/vpnc-script")))))
-    (native-inputs (list gettext-minimal pkg-config))
-    (inputs (list lz4 vpnc-scripts))
-    (propagated-inputs (list libxml2 gnutls zlib))
-    (synopsis "Client for Cisco VPN")
-    (description
-     "OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is
+  (let ((commit "0dcdff87db65daf692dc323732831391d595d98d")
+        (revision "0"))
+    (package
+      (name "openconnect")
+      (version (git-version "9.12" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://gitlab.com/openconnect/openconnect.git")
+                       (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0m8zwnnjkxik3sy67zm3ia6dkmz77fansja889zg8pp481831yh2"))))
+      (outputs '("out" "doc"))
+      (build-system gnu-build-system)
+      (arguments
+       (list
+        #:configure-flags
+        #~(list
+           (string-append
+            "--with-vpnc-script="
+            (search-input-file %build-inputs "etc/vpnc/vpnc-script")))))
+      (native-inputs
+       (list autoconf
+             automake
+             gettext-minimal
+             libtool
+             pkg-config
+             ;; To build documentation.
+             groff
+             python-minimal
+             ;; For unit tests.
+             socket-wrapper
+             uid-wrapper
+             python-flask))
+      (inputs
+       (list mit-krb5                   ;for gssapi
+             tpm2-tss
+             lz4
+             vpnc-scripts))
+      (propagated-inputs
+       (list gnutls
+             libproxy
+             oath-toolkit               ;for libpskc
+             pcsc-lite
+             stoken
+             libxml2
+             zlib))
+      (synopsis "Client for Cisco VPN")
+      (description
+       "OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is
 supported by the ASA5500 Series, by IOS 12.4(9)T or later on Cisco SR500, 870,
 880, 1800, 2800, 3800, 7200 Series and Cisco 7301 Routers, and probably
 others.")
-    (license license:lgpl2.1)
-    (home-page "https://www.infradead.org/openconnect/")))
+      (license license:lgpl2.1)
+      (home-page "https://www.infradead.org/openconnect/"))))
 
 (define-public openfortivpn
   (package

gnu/packages/xorg.scm

@@ -6657,7 +6657,7 @@ X11 servers, Windows, or macOS.")
   (package
     (inherit xpra)
     (name "xpra")
-    (version "5.1.3")
+    (version "5.1.4")
     (source
      (origin
        (method git-fetch)
@@ -6666,7 +6666,7 @@ X11 servers, Windows, or macOS.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1046dqfh97l586gzbvcd1vb515na35147jm55i50kc9zkssfmygc"))
+        (base32 "1hb6pjixs85laarypkx6dvb8n9qyahy8v251f71h7qll9l2w8ak0"))
        (patches (search-patches "xpra-5.0-systemd-run.patch"
                                 "xpra-5.0-install_libs.patch"))))))