summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk2
-rw-r--r--gnu/packages/audio.scm43
-rw-r--r--gnu/packages/containers.scm8
-rw-r--r--gnu/packages/emacs-xyz.scm8
-rw-r--r--gnu/packages/engineering.scm21
-rw-r--r--gnu/packages/gnome.scm4
-rw-r--r--gnu/packages/image-processing.scm53
-rw-r--r--gnu/packages/mail.scm3
-rw-r--r--gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch76
-rw-r--r--gnu/packages/patches/procmail-gcc-14.patch268
-rw-r--r--gnu/packages/python-xyz.scm8
11 files changed, 455 insertions, 39 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 0d68693656..140c2415a1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1055,6 +1055,7 @@ dist_patch_DATA = \
%D%/packages/patches/bdb-4-5-configure.patch \
%D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \
%D%/packages/patches/biboumi-cmake-ignore-git.patch \
+ %D%/packages/patches/brasero-fix-gcc-14-build-failure.patch \
%D%/packages/patches/brightnessctl-elogind-support.patch \
%D%/packages/patches/bsd-games-2.17-64bit.patch \
%D%/packages/patches/bsd-games-add-configure-config.patch \
@@ -2130,6 +2131,7 @@ dist_patch_DATA = \
%D%/packages/patches/procmail-ambiguous-getline-debian.patch \
%D%/packages/patches/procmail-CVE-2014-3618.patch \
%D%/packages/patches/procmail-CVE-2017-16844.patch \
+ %D%/packages/patches/procmail-gcc-14.patch \
%D%/packages/patches/proj-7-initialize-memory.patch \
%D%/packages/patches/proot-add-clone3.patch \
%D%/packages/patches/proot-add-missing-include.patch \
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 35cffb3693..db3cc55be7 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4904,15 +4904,18 @@ surround and reverb.")
(define-public libxmp
(package
(name "libxmp")
- (version "4.4.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/xmp/libxmp/" version "/"
- name "-" version ".tar.gz"))
- (sha256
- (base32
- "1kycz4jsyvmf7ny9227b497wc7y5ligydi6fvvldmkf8hk63ad9m"))))
+ (version "4.6.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libxmp/libxmp")
+ (commit (string-append "libxmp-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0mb54n2cqr8wvq02x9v8vdanvn01bhy0j1pyq2n3iykfnpjx4f2m"))))
(build-system gnu-build-system)
+ (native-inputs (list autoconf))
(home-page "https://xmp.sourceforge.net/")
(synopsis "Module player library")
(description
@@ -4924,19 +4927,19 @@ Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).")
(define-public xmp
(package
(name "xmp")
- (version "4.1.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/xmp/xmp/" version "/"
- name "-" version ".tar.gz"))
- (sha256
- (base32
- "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"))))
+ (version "4.2.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libxmp/xmp-cli")
+ (commit (string-append "xmp-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0c015v8r91g5nspfn6lldkw76dg3xjyg3x6s2sbiw6b3n7bf8znk"))))
(build-system gnu-build-system)
- (native-inputs
- (list pkg-config))
- (inputs
- (list libxmp pulseaudio))
+ (native-inputs (list autoconf automake pkg-config))
+ (inputs (list libxmp pulseaudio))
(home-page "https://xmp.sourceforge.net/")
(synopsis "Extended module player")
(description
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index d90948f059..1a2aa6b75d 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -73,7 +73,7 @@
(define-public crun
(package
(name "crun")
- (version "1.22")
+ (version "1.23.1")
(source
(origin
(method url-fetch)
@@ -83,7 +83,7 @@
"/crun-" version ".tar.gz"))
(sha256
(base32
- "1cggwb5libxjx4x96hd2v1pd4rm7m7bll37j888khsc5s486q32z"))))
+ "1y23fz82d7zaa2svyzjhfhahl6l0a3yrasfbcfacplhkwk7bflnp"))))
(build-system gnu-build-system)
(arguments
(list
@@ -684,7 +684,7 @@ being rootless and not requiring any daemon to be running.")
(define-public buildah
(package
(name "buildah")
- (version "1.40.1")
+ (version "1.41.0")
(source
(origin
(method git-fetch)
@@ -692,7 +692,7 @@ being rootless and not requiring any daemon to be running.")
(url "https://github.com/containers/buildah")
(commit (string-append "v" version))))
(sha256
- (base32 "109xvnx65gbajxipq2h0669bzzxyc6hfmdcijgngijxj5kwx5cgq"))
+ (base32 "12vl3g5h9m9pw0zpi88j7sjx0db8ardigh2x8h3a3qa9m5hlnqnb"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 514692336f..9669967ba4 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -25924,16 +25924,16 @@ highlighting and indentation support.")
(define-public emacs-terraform-mode
(package
(name "emacs-terraform-mode")
- (version "1.0.1")
+ (version "1.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/syohex/emacs-terraform-mode")
+ (url "https://github.com/hcl-emacs/terraform-mode")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "10wndnlsv7f2yn83n1wamnhiwyhxkdlmwld9yk0m2kkxx4pwfgfj"))))
+ (base32 "15xgjyl864crx3vpalds68x0vn1qzibkqdcjlbp87xiq88dx2q1x"))))
(build-system emacs-build-system)
(arguments
(list #:test-command #~(list "emacs" "--batch"
@@ -25944,7 +25944,7 @@ highlighting and indentation support.")
"-f" "ert-run-tests-batch-and-exit")))
(propagated-inputs
(list emacs-dash emacs-hcl-mode))
- (home-page "https://github.com/syohex/emacs-terraform-mode")
+ (home-page "https://github.com/hcl-emacs/terraform-mode")
(synopsis "Major mode for Terraform")
(description
"@code{emacs-terraform-mode} provides a major mode for working with
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index fb7f0f7d06..c6905d3308 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -451,11 +451,14 @@ utilities.")
;; and then in .gmo files. To avoid that, simply make sure 'msgmerge'
;; never runs. See <https://bugs.debian.org/792687>.
"ac_cv_path_MSGMERGE=true"
- ;; FIXME: pcb package is broken at this point; it might be replaced
- ;; by pcb-rnd or use pcb again when fixed.
- ;; (string-append "--with-pcb-datadir=" pcb "/share")
- ;; (string-append "--with-pcb-lib-path=" pcb
- ;; "/share/pcb/pcblib-newlib:" pcb "/share/pcb/newlib")
+ (string-append "--with-pcb-datadir="
+ #$(this-package-input "pcb")
+ "/share")
+ (string-append "--with-pcb-lib-path="
+ #$(this-package-input "pcb")
+ "/share/pcb/pcblib-newlib:"
+ #$(this-package-input "pcb")
+ "/share/pcb/newlib")
"--with-gtk3"
"CFLAGS=-fcommon"
"--enable-guild"
@@ -558,6 +561,7 @@ utilities.")
gtksheet
guile-3.0
guile-readline
+ pcb
shared-mime-info))
(home-page "https://lepton-eda.github.io/")
(synopsis "GPL Electronic Design Automation")
@@ -587,6 +591,13 @@ features.")
(list
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'convert-encoding
+ (lambda _
+ (for-each
+ (lambda (name)
+ (invoke "iconv" "-f" "LATIN1" "-t" "UTF-8" name "-o" name))
+ '("src/pcb-menu.res.in"
+ "src/pcb-menu.res.h"))))
(add-before 'check 'pre-check
(lambda _
(system "Xvfb :1 &")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bf2bc90fbe..4d178e5a88 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -321,7 +321,9 @@
"brasero-" version ".tar.xz"))
(sha256
(base32
- "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47"))))
+ "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47"))
+ (patches
+ (search-patches "brasero-fix-gcc-14-build-failure.patch"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags (list
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 3b43038b05..6e42be1140 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -50,6 +50,7 @@
#:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system qt)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
@@ -171,6 +172,58 @@ The tools in this software implement various reconstruction algorithms for
Magnetic Resonance Imaging.")
(license license:bsd-3)))
+(define-public cimg
+ (package
+ (name "cimg")
+ (version "3.5.5")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/GreycLab/CImg")
+ (commit (string-append "v." version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "01myf3bjbc46f977r7lvr9g1hcnpfygcv2xnqvhrl2nj7955sm5x"))))
+ (build-system copy-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "examples"
+ ;; This is from upstream CI but parallelized.
+ (invoke "make" "-j"
+ (number->string (parallel-job-count)) "mlinux")
+ (invoke "./image2ascii")
+ (invoke "./generate_loop_macros")
+ ;; Build an example that requires an external library.
+ ;; Running it requires a display.
+ (invoke "make" "use_jpeg_buffer"
+ (string-append "CONF_CFLAGS="
+ (string-join '("-Dcimg_display=0"
+ "-O3"
+ "-mtune=generic"
+ "-Dcimg_use_jpeg")
+ " "))
+ "CONF_LIBS=-ljpeg"))))))
+ #:install-plan
+ #~'(("CImg.h" "include/")
+ ("plugins" "include/CImg/plugins"))))
+ (native-inputs (list libjpeg-turbo)) ;for 'check
+ (home-page "https://cimg.eu")
+ (synopsis "Small C++ image processing library")
+ (description
+ "The @acronym{CImg, Cool Image} Library is a small C++ toolkit for
+image processing. It is made of a single header file @code{CImg.h}
+that can be compiled using a minimal set of standard C++ and system
+libraries. It includes a plugin mechanism to extend its functionality
+with external tools and libraries.")
+ ;; Dual-licensed, either license applies.
+ (license (list license:cecill-c license:cecill))))
+
(define-public dcmtk
(package
(name "dcmtk")
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 68611d32f2..f13dbc3010 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2808,7 +2808,8 @@ separation to safely deliver mail in multi-user setups.")
;; patch 24.
(patches (search-patches "procmail-ambiguous-getline-debian.patch"
"procmail-CVE-2014-3618.patch"
- "procmail-CVE-2017-16844.patch"))))
+ "procmail-CVE-2017-16844.patch"
+ "procmail-gcc-14.patch"))))
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'configure
diff --git a/gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch b/gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch
new file mode 100644
index 0000000000..7a4b63d93e
--- /dev/null
+++ b/gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch
@@ -0,0 +1,76 @@
+From 5cdefa8c76ddb797bce8b67a3f5767678bd36a5a Mon Sep 17 00:00:00 2001
+From: sid <sidtosh4@gmail.com>
+Date: Mon, 3 Jun 2024 18:51:08 +0100
+Subject: [PATCH] Fix gcc 14.x build failure (due to
+ -Wincompatible-pointer-types)
+
+The changes for 'brasero-drive-properties.c' are kept inline with
+'brasero-burn-options.c' (public API) for the sake of consistency.
+
+Fixes: https://gitlab.gnome.org/GNOME/brasero/-/issues/370
+---
+ libbrasero-burn/brasero-drive-properties.c | 10 +++-------
+ libbrasero-utils/brasero-metadata.c | 2 +-
+ libbrasero-utils/brasero-pk.c | 2 +-
+ 3 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/libbrasero-burn/brasero-drive-properties.c b/libbrasero-burn/brasero-drive-properties.c
+index cfb2db147..22593cc16 100644
+--- a/libbrasero-burn/brasero-drive-properties.c
++++ b/libbrasero-burn/brasero-drive-properties.c
+@@ -835,23 +835,19 @@ brasero_drive_properties_set_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ BraseroDrivePropertiesPrivate *priv;
+- BraseroBurnSession *session;
+
+ priv = BRASERO_DRIVE_PROPERTIES_PRIVATE (object);
+
+ switch (property_id) {
+ case PROP_SESSION: /* Readable and only writable at creation time */
+- /* NOTE: no need to unref a potential previous session since
+- * it's only set at construct time */
+- session = g_value_get_object (value);
+- priv->session = g_object_ref (session);
++ priv->session = g_object_ref (g_value_get_object (value));
+
+ brasero_drive_properties_update (BRASERO_DRIVE_PROPERTIES (object));
+- priv->valid_sig = g_signal_connect (session,
++ priv->valid_sig = g_signal_connect (priv->session,
+ "is-valid",
+ G_CALLBACK (brasero_drive_properties_is_valid_cb),
+ object);
+- priv->output_sig = g_signal_connect (session,
++ priv->output_sig = g_signal_connect (priv->session,
+ "output-changed",
+ G_CALLBACK (brasero_drive_properties_output_changed_cb),
+ object);
+diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
+index 194336899..ddfce8e7b 100644
+--- a/libbrasero-utils/brasero-metadata.c
++++ b/libbrasero-utils/brasero-metadata.c
+@@ -665,7 +665,7 @@ brasero_metadata_install_missing_plugins (BraseroMetadata *self)
+
+ context = gst_install_plugins_context_new ();
+ gst_install_plugins_context_set_xid (context, brasero_metadata_get_xid (self));
+- status = gst_install_plugins_async ((gchar **) details->pdata,
++ status = gst_install_plugins_async ((const gchar* const*) details->pdata,
+ context,
+ brasero_metadata_install_plugins_result,
+ downloads);
+diff --git a/libbrasero-utils/brasero-pk.c b/libbrasero-utils/brasero-pk.c
+index aa71901f9..5f5ba21aa 100644
+--- a/libbrasero-utils/brasero-pk.c
++++ b/libbrasero-utils/brasero-pk.c
+@@ -230,7 +230,7 @@ brasero_pk_install_gstreamer_plugin (BraseroPK *package,
+
+ context = gst_install_plugins_context_new ();
+ gst_install_plugins_context_set_xid (context, xid);
+- status = gst_install_plugins_async ((gchar **) gst_plugins->pdata,
++ status = gst_install_plugins_async ((const gchar* const*) gst_plugins->pdata,
+ context,
+ brasero_pk_install_gst_plugin_result,
+ package);
+--
+GitLab
+
diff --git a/gnu/packages/patches/procmail-gcc-14.patch b/gnu/packages/patches/procmail-gcc-14.patch
new file mode 100644
index 0000000000..b819bf4ad1
--- /dev/null
+++ b/gnu/packages/patches/procmail-gcc-14.patch
@@ -0,0 +1,268 @@
+See https://github.com/BuGlessRB/procmail/pull/7
+
+diff --git a/initmake b/initmake
+index 82d718d..e44ee67 100755
+--- a/initmake
++++ b/initmake
+@@ -124,7 +124,7 @@ else
+ fi
+
+ cat >_autotst.c <<HERE
+-main()
++int main()
+ { return 0;
+ }
+ HERE
+@@ -200,7 +200,7 @@ cat >_autotst.c <<HERE
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
+-main()
++int main()
+ { struct stat buf;return!&buf;
+ }
+ HERE
+diff --git a/src/autoconf b/src/autoconf
+index 1cb4c42..995d8bb 100755
+--- a/src/autoconf
++++ b/src/autoconf
+@@ -363,6 +363,7 @@ cat >_autotst.c <<HERE
+ #include <unistd.h> /* getpid() getppid() */
+ #endif
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <time.h>
+ #include <fcntl.h>
+ #include <signal.h> /* SIGKILL */
+@@ -416,6 +417,16 @@ cat >_autotst.c <<HERE
+ int dolock,child[NR_of_forks],timeout,fdcollect;
+ char dirlocktest[]="_locktest";
+
++int killchildren()
++{ int i;
++ i=NR_of_forks;
++ do
++ if(child[--i]>0)
++ kill(child[i],SIGTERM),child[i]=0;
++ while(i);
++ return 0;
++}
++
+ void stimeout()
+ { timeout=1;close(fdcollect);killchildren();
+ }
+@@ -437,7 +448,79 @@ unsigned sfork()
+ return pid;
+ }
+
+-int main(argc,argv)char*argv[];
++static int oldfdlock;
++#ifdef F_SETLKW
++static struct flock flck; /* why can't it be a local variable? */
++#endif
++#ifdef F_LOCK
++static off_t oldlockoffset;
++#endif
++
++int fdlock(int fd)
++{ int i;unsigned gobble[GOBBLE>>2];
++ for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
++ oldfdlock=fd;fd=0;
++ if(MSK_fcntl&dolock)
++#ifdef F_SETLKW
++ { static unsigned extra;
++ flck.l_type=F_WRLCK;flck.l_whence=SEEK_SET;flck.l_start=tell(oldfdlock);
++ if(!extra--)
++ extra=MIN_locks/4,flck.l_len=2,i|=fcntl(oldfdlock,F_SETLK,&flck);
++ flck.l_len=0;fd|=fcntl(oldfdlock,F_SETLKW,&flck);
++ }
++#else
++ fd=1;
++#endif
++ if(MSK_lockf&dolock)
++#ifdef F_LOCK
++ oldlockoffset=tell(oldfdlock),fd|=lockf(oldfdlock,F_LOCK,(off_t)0);
++#else
++ fd=1;
++#endif
++ if(MSK_flock&dolock)
++#ifdef LOCK_EX
++ fd|=flock(oldfdlock,LOCK_EX);
++#else
++ fd=1;
++#endif
++ return fd;
++}
++
++int sfdlock(int fd)
++{ int i;unsigned gobble[GOBBLE>>2];
++ for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
++ return fdlock(fd);
++}
++
++int fdunlock()
++{ int i;unsigned gobble[GOBBLE];
++ for(i=GOBBLE;i;gobble[--i]=~(unsigned)0); /* some SunOS libs mess this up */
++ if(MSK_flock&dolock)
++#ifdef LOCK_EX
++ i|=flock(oldfdlock,LOCK_UN);
++#else
++ i=1;
++#endif
++ if(MSK_lockf&dolock)
++#ifdef F_LOCK
++ { lseek(oldfdlock,oldlockoffset,SEEK_SET);
++ i|=lockf(oldfdlock,F_LOCK,(off_t)2);i|=lockf(oldfdlock,F_ULOCK,(off_t)0);
++ }
++#else
++ i=1;
++#endif
++ if(MSK_fcntl&dolock)
++#ifdef F_SETLKW
++ flck.l_type=F_UNLCK,flck.l_len=0,i|=fcntl(oldfdlock,F_SETLK,&flck);
++#else
++ i=1;
++#endif
++ if(!i)
++ for(i=GOBBLE;i&&gobble[--i]==~(unsigned)0;);
++ return i;
++}
++
++int main(argc,argv)int argc;char*argv[];
+ { int goodlock,testlock,i,pip[2],pipw[2];time_t otimet;unsigned dtimet;
+ static char filename[]="_locktst.l0";
+ close(0);goodlock=0;testlock=FIRST_lock;signal(SIGPIPE,SIG_DFL);
+@@ -576,88 +659,6 @@ skip_tests:
+ puts("Kernel-locking tests completed.");fprintf(stderr,"\n");
+ return EXIT_SUCCESS;
+ }
+-
+-int killchildren()
+-{ int i;
+- i=NR_of_forks;
+- do
+- if(child[--i]>0)
+- kill(child[i],SIGTERM),child[i]=0;
+- while(i);
+- return 0;
+-}
+-
+-int sfdlock(fd)
+-{ int i;unsigned gobble[GOBBLE>>2];
+- for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
+- return fdlock(fd);
+-}
+-
+-static oldfdlock;
+-#ifdef F_SETLKW
+-static struct flock flck; /* why can't it be a local variable? */
+-#endif
+-#ifdef F_LOCK
+-static off_t oldlockoffset;
+-#endif
+-
+-int fdlock(fd)
+-{ int i;unsigned gobble[GOBBLE>>2];
+- for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
+- oldfdlock=fd;fd=0;
+- if(MSK_fcntl&dolock)
+-#ifdef F_SETLKW
+- { static unsigned extra;
+- flck.l_type=F_WRLCK;flck.l_whence=SEEK_SET;flck.l_start=tell(oldfdlock);
+- if(!extra--)
+- extra=MIN_locks/4,flck.l_len=2,i|=fcntl(oldfdlock,F_SETLK,&flck);
+- flck.l_len=0;fd|=fcntl(oldfdlock,F_SETLKW,&flck);
+- }
+-#else
+- fd=1;
+-#endif
+- if(MSK_lockf&dolock)
+-#ifdef F_LOCK
+- oldlockoffset=tell(oldfdlock),fd|=lockf(oldfdlock,F_LOCK,(off_t)0);
+-#else
+- fd=1;
+-#endif
+- if(MSK_flock&dolock)
+-#ifdef LOCK_EX
+- fd|=flock(oldfdlock,LOCK_EX);
+-#else
+- fd=1;
+-#endif
+- return fd;
+-}
+-
+-int fdunlock()
+-{ int i;unsigned gobble[GOBBLE];
+- for(i=GOBBLE;i;gobble[--i]=~(unsigned)0); /* some SunOS libs mess this up */
+- if(MSK_flock&dolock)
+-#ifdef LOCK_EX
+- i|=flock(oldfdlock,LOCK_UN);
+-#else
+- i=1;
+-#endif
+- if(MSK_lockf&dolock)
+-#ifdef F_LOCK
+- { lseek(oldfdlock,oldlockoffset,SEEK_SET);
+- i|=lockf(oldfdlock,F_LOCK,(off_t)2);i|=lockf(oldfdlock,F_ULOCK,(off_t)0);
+- }
+-#else
+- i=1;
+-#endif
+- if(MSK_fcntl&dolock)
+-#ifdef F_SETLKW
+- flck.l_type=F_UNLCK,flck.l_len=0,i|=fcntl(oldfdlock,F_SETLK,&flck);
+-#else
+- i=1;
+-#endif
+- if(!i)
+- for(i=GOBBLE;i&&gobble[--i]==~(unsigned)0;);
+- return i;
+-}
+ HERE
+
+ if $MAKE _autotst >_autotst.rrr 2>&1
+@@ -1033,6 +1034,10 @@ cat >_autotst.c <<HERE
+ #ifndef NO_COMSAT
+ #include "network.h"
+ #endif
++#include <string.h>
++#include <unistd.h>
++int setrgid();
++int setresgid();
+ int main(){char a[2];
+ endpwent();endgrent();memmove(a,"0",1);bcopy("0",a,1);strcspn(a,"0");
+ strtol("0",(char**)0,10);strchr("0",'0');strpbrk(a,"0");rename(a,"0");
+@@ -1059,7 +1064,7 @@ echo 'Testing for memmove, strchr, strpbrk, strcspn, strtol, strstr,'
+ echo ' rename, setrgid, setegid, pow, opendir, mkdir, waitpid, fsync,'
+ echo ' ftruncate, strtod, strncasecmp, strerror, strlcat,'
+ echo ' memset, bzero, and _exit'
+-if $MAKE _autotst.$O >$DEVNULL 2>&1
++if $MAKE _autotst.$O >_autotst.rrr 2>&1
+ then
+ :
+ else
+diff --git a/src/foldinfo.c b/src/foldinfo.c
+index 10fe406..33e7bff 100644
+--- a/src/foldinfo.c
++++ b/src/foldinfo.c
+@@ -18,6 +18,7 @@ static /*const*/char rcsid[]=
+ #include "goodies.h"
+ #include "locking.h"
+ #include "foldinfo.h"
++#include "acommon.h"
+
+ static const char
+ maildirtmp[]=MAILDIRtmp,maildircur[]=MAILDIRcur;
+diff --git a/src/mailfold.c b/src/mailfold.c
+index 917b502..9e3d386 100644
+--- a/src/mailfold.c
++++ b/src/mailfold.c
+@@ -371,7 +371,7 @@ void concon(ch)const int ch; /* flip between concatenated and split fields */
+ }
+ }
+
+-void readmail(rhead,tobesent)const long tobesent;
++void readmail(rhead,tobesent)const long tobesent; int rhead;
+ { char*chp,*pastend;static size_t contlengthoffset;
+ ;{ long dfilled;
+ if(rhead==2) /* already read, just examine what we have */
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9b9abeeea5..03f2828cfc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17701,15 +17701,15 @@ printing of sub-tables by specifying a row range.")
(define-public python-rtf-tokenize
(package
(name "python-rtf-tokenize")
- (version "1.0.0")
+ (version "1.0.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "rtf_tokenize" version))
(sha256
(base32
- "026njb9iwznycda83bln3gfivcnzdz6vy8y86xvbsy84s28g6gaw"))))
- (build-system python-build-system)
- (native-inputs (list python-pytest))
+ "1ljs0dcg2p1iad4zrxgn1pbrrcjcrswhjxrbprhdxd822n0al84h"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/benoit-pierre/rtf_tokenize")
(synopsis "Simple RTF tokenizer")
(description "This package is a simple RTF tokenizer.")
generated by cgit v1.2.3 (git 2.50.1) at 2025-08-03 08:25:04 +0000