summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/automake/PKGBUILD7
-rw-r--r--core/dbus/PKGBUILD8
-rw-r--r--core/gcc/PKGBUILD9
-rw-r--r--core/glibc/PKGBUILD2
-rw-r--r--core/groff/PKGBUILD7
-rw-r--r--core/gzip/PKGBUILD5
-rw-r--r--core/gzip/gnulib.patch189
-rw-r--r--core/libidn2/PKGBUILD8
-rw-r--r--core/libsecret/PKGBUILD7
-rw-r--r--core/links/PKGBUILD8
-rw-r--r--core/linux/PKGBUILD2
-rw-r--r--core/make/0001-glob-Do-not-assume-glibc-glob-internals.patch64
-rw-r--r--core/make/FS55127.patch26
-rw-r--r--core/make/FS58674.patch15
-rw-r--r--core/make/PKGBUILD12
-rw-r--r--core/pinentry/PKGBUILD14
-rw-r--r--core/shadow/PKGBUILD7
-rw-r--r--core/systemd/PKGBUILD22
-rw-r--r--core/systemd/lz4-test-compress-partial.patch31
-rw-r--r--core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch26
20 files changed, 75 insertions, 394 deletions
diff --git a/core/automake/PKGBUILD b/core/automake/PKGBUILD
index af9256a9..e1221ed5 100644
--- a/core/automake/PKGBUILD
+++ b/core/automake/PKGBUILD
@@ -1,5 +1,4 @@
# 486-specific: we have no Vala or Java at the moment
-if [ "${CARCH}" = "i486" ]; then
- checkdepends=(${checkdepends[@]//vala/})
- checkdepends=(${checkdepends[@]//java-environment/})
-fi
+checkdepends=(${checkdepends[@]//vala/})
+checkdepends=(${checkdepends[@]//java-environment/})
+checkdepends_i686+=(vala java-environment)
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 41a96d38..835abb54 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # no graphviz generated graphs in documentation
- makedepends=(${makedepends[@]//graphviz/})
-fi
+# no graphviz generated graphs in documentation on i486
+makedepends=(${makedepends[@]//graphviz/})
+makedepends_i686+=(graphviz)
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index fecb7d16..4e1592fc 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -13,8 +13,9 @@ eval "$(
'
declare -f build | \
sed '
- s/--enable-multilib/--disable-multilib/
- s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/,
+ /configure/ s/--enable-multilib/--disable-multilib/
+ /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/,
+ /configure/ s/;$/ --build=$CARCH-pc-linux-gnu;/
'
declare -f package_gcc-libs | \
sed '
@@ -83,7 +84,7 @@ if [ "${CARCH}" = "i486" ]; then
eval "$(
declare -f build | \
sed '
- /enable-languages/ s/ada//
+ /enable-languages/ s/,ada//
'
)"
@@ -103,7 +104,7 @@ if [ "${CARCH}" = "i486" ]; then
eval "$(
declare -f package_gcc-libs | \
sed '
- s/libgfortran/libquadmath libgfortran/
+ /for lib in / s/libgfortran/libquadmath libgfortran/
'
)"
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 7e0ce35f..02dbf6e4 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -27,7 +27,7 @@ eval "$(
# no gd for memory profiles
makedepends=(${makedepends[@]//gd/})
-makedepends_i686=('gd')
+makedepends_i686+=('gd')
if [ "${CARCH}" = "i486" ]; then
diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD
index f4cc97f0..f06aaa84 100644
--- a/core/groff/PKGBUILD
+++ b/core/groff/PKGBUILD
@@ -1,5 +1,2 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # no optional dependencies
- makedepends=(${makedepends[@]//psutils/})
-fi
+makedepends=(${makedepends[@]//psutils/})
+makedepends_i686+=(psutils)
diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD
deleted file mode 100644
index ef13027a..00000000
--- a/core/gzip/PKGBUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-# see: https://bugs.archlinux.org/task/60202
-# source: https://src.fedoraproject.org/rpms/gzip/raw/master/f/gnulib.patch
-
-source+=('gnulib.patch')
-md5sums+=('SKIP')
diff --git a/core/gzip/gnulib.patch b/core/gzip/gnulib.patch
deleted file mode 100644
index 68e8d518..00000000
--- a/core/gzip/gnulib.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <address@hidden>
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Daniel P. Berrangé in:
-https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-* lib/fbufmode.c (fbufmode):
-* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-(disable_seek_optimization, rpl_fflush):
-* lib/fpending.c (__fpending):
-* lib/fpurge.c (fpurge):
-* lib/freadable.c (freadable):
-* lib/freadahead.c (freadahead):
-* lib/freading.c (freading):
-* lib/freadptr.c (freadptr):
-* lib/freadseek.c (freadptrinc):
-* lib/fseeko.c (fseeko):
-* lib/fseterr.c (fseterr):
-* lib/fwritable.c (fwritable):
-* lib/fwriting.c (fwriting):
-Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-Define if not already defined.
----
- ChangeLog | 23 +++++++++++++++++++++++
- lib/fbufmode.c | 2 +-
- lib/fflush.c | 6 +++---
- lib/fpending.c | 2 +-
- lib/fpurge.c | 2 +-
- lib/freadable.c | 2 +-
- lib/freadahead.c | 2 +-
- lib/freading.c | 2 +-
- lib/freadptr.c | 2 +-
- lib/freadseek.c | 2 +-
- lib/fseeko.c | 4 ++--
- lib/fseterr.c | 2 +-
- lib/fwritable.c | 2 +-
- lib/fwriting.c | 2 +-
- lib/stdio-impl.h | 6 ++++++
- 15 files changed, 45 insertions(+), 16 deletions(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 667f91663..beb835670 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,26 @@
-+2018-03-05 Paul Eggert <address@hidden>
-+
-+ fflush: adjust to glibc 2.28 libio.h removal
-+ Problem reported by Daniel P. Berrangé in:
-+ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-+ * lib/fbufmode.c (fbufmode):
-+ * lib/fflush.c (clear_ungetc_buffer_preserving_position)
-+ (disable_seek_optimization, rpl_fflush):
-+ * lib/fpending.c (__fpending):
-+ * lib/fpurge.c (fpurge):
-+ * lib/freadable.c (freadable):
-+ * lib/freadahead.c (freadahead):
-+ * lib/freading.c (freading):
-+ * lib/freadptr.c (freadptr):
-+ * lib/freadseek.c (freadptrinc):
-+ * lib/fseeko.c (fseeko):
-+ * lib/fseterr.c (fseterr):
-+ * lib/fwritable.c (fwritable):
-+ * lib/fwriting.c (fwriting):
-+ Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-+ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-+ Define if not already defined.
-+
- 2018-01-07 Jim Meyering <meyering@fb.com>
-
- version 1.9
- * NEWS: Record release date.
-diff --git a/lib/fflush.c b/lib/fflush.c
-index 983ade0ff..a6edfa105 100644
---- a/lib/fflush.c
-+++ b/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
-
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
- static void
-@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
-
- #endif
-
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
- if (stream == NULL || ! freading (stream))
- return fflush (stream);
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-
- clear_ungetc_buffer_preserving_position (stream);
-
-diff --git a/lib/fpurge.c b/lib/fpurge.c
-index b1d417c7a..3aedcc373 100644
---- a/lib/fpurge.c
-+++ b/lib/fpurge.c
-@@ -62,7 +62,7 @@ fpurge (FILE *fp)
- /* Most systems provide FILE as a struct and the necessary bitmask in
- <stdio.h>, because they need it for implementing getc() and putc() as
- fast macros. */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- fp->_IO_read_end = fp->_IO_read_ptr;
- fp->_IO_write_ptr = fp->_IO_write_base;
- /* Avoid memory leak when there is an active ungetc buffer. */
-diff --git a/lib/freading.c b/lib/freading.c
-index 73c28acdd..c24d0c88a 100644
---- a/lib/freading.c
-+++ b/lib/freading.c
-@@ -31,7 +31,7 @@ freading (FILE *fp)
- /* Most systems provide FILE as a struct and the necessary bitmask in
- <stdio.h>, because they need it for implementing getc() and putc() as
- fast macros. */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- return ((fp->_flags & _IO_NO_WRITES) != 0
- || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
- && fp->_IO_read_base != NULL));
-diff --git a/lib/fseeko.c b/lib/fseeko.c
-index 0101ab55f..193f4e8ce 100644
---- a/lib/fseeko.c
-+++ b/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
-
- /* These tests are based on fpurge.c. */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- if (fp->_IO_read_end == fp->_IO_read_ptr
- && fp->_IO_write_ptr == fp->_IO_write_base
- && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- return -1;
- }
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- fp->_flags &= ~_IO_EOF_SEEN;
- fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-diff --git a/lib/fseterr.c b/lib/fseterr.c
-index 82649c3ac..adb637256 100644
---- a/lib/fseterr.c
-+++ b/lib/fseterr.c
-@@ -29,7 +29,7 @@ fseterr (FILE *fp)
- /* Most systems provide FILE as a struct and the necessary bitmask in
- <stdio.h>, because they need it for implementing getc() and putc() as
- fast macros. */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- fp->_flags |= _IO_ERR_SEEN;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
-index 78d896e9f..05c5752a2 100644
---- a/lib/stdio-impl.h
-+++ b/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
- the same implementation of stdio extension API, except that some fields
- have different naming conventions, or their access requires some casts. */
-
-+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
-+ problem by defining it ourselves. FIXME: Do not rely on glibc
-+ internals. */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
-
- /* BSD stdio derived implementations. */
-
---
-2.14.3
-
diff --git a/core/libidn2/PKGBUILD b/core/libidn2/PKGBUILD
index 4bd3a316..23ba1170 100644
--- a/core/libidn2/PKGBUILD
+++ b/core/libidn2/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # remove dependency on ruby-ronn
- makedepends=(${makedepends[@]//ruby-ronn/})
-fi
+# remove dependency on ruby-ronn on i486
+makedepends=(${makedepends[@]//ruby-ronn/})
+makedepends_i686+=(ruby-ronn)
diff --git a/core/libsecret/PKGBUILD b/core/libsecret/PKGBUILD
index d2a68fe8..9aab2048 100644
--- a/core/libsecret/PKGBUILD
+++ b/core/libsecret/PKGBUILD
@@ -1,8 +1,9 @@
+# no Vala on i486
+makedepends=(${makedepends[@]//vala/})
+makedepends_i686+=(vala)
+
# i486-specific
if [ "${CARCH}" = "i486" ]; then
- # no Vala
- makedepends=(${makedepends[@]//vala/})
-
# no Gnome (gjs), no dbus-glib
unset check
fi
diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD
index bbe7457e..b30ed33e 100644
--- a/core/links/PKGBUILD
+++ b/core/links/PKGBUILD
@@ -1,5 +1,3 @@
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # no librsvg, has a cycle with half of gtk
- makedepends=(${makedepends[@]//librsvg/})
-fi
+# no librsvg on i486, requires rust - yuck
+makedepends=(${makedepends[@]//librsvg/})
+makedepends_i686+=(librsvg)
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 5f021765..8ca51dd2 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -11,7 +11,7 @@ for ((i=0; i<${#sha256sums[@]}; i++)); do
done
makedepends=(${makedepends[@]/graphviz/})
-makedepends_i686=(graphviz)
+makedepends_i686+=(graphviz)
eval "$(
declare -f prepare | \
diff --git a/core/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/core/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
deleted file mode 100644
index b88ebcaf..00000000
--- a/core/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sun, 24 Sep 2017 09:12:58 -0400
-Subject: [PATCH 01/26] glob: Do not assume glibc glob internals.
-
-It has been proposed that glibc glob start using gl_lstat,
-which the API allows it to do. GNU 'make' should not get in
-the way of this. See:
-https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
-
-* dir.c (local_lstat): New function, like local_stat.
-(dir_setup_glob): Use it to initialize gl_lstat too, as the API
-requires.
-
-diff --git a/dir.c b/dir.c
-index adbb8a9..c343e4c 100644
---- a/dir.c
-+++ b/dir.c
-@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
- }
- #endif
-
-+/* Similarly for lstat. */
-+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
-+# ifndef VMS
-+# ifndef HAVE_SYS_STAT_H
-+int lstat (const char *path, struct stat *sbuf);
-+# endif
-+# else
-+ /* We are done with the fake lstat. Go back to the real lstat */
-+# ifdef lstat
-+# undef lstat
-+# endif
-+# endif
-+# define local_lstat lstat
-+#elif defined(WINDOWS32)
-+/* Windows doesn't support lstat(). */
-+# define local_lstat local_stat
-+#else
-+static int
-+local_lstat (const char *path, struct stat *buf)
-+{
-+ int e;
-+ EINTRLOOP (e, lstat (path, buf));
-+ return e;
-+}
-+#endif
-+
- void
- dir_setup_glob (glob_t *gl)
- {
- gl->gl_opendir = open_dirstream;
- gl->gl_readdir = read_dirstream;
- gl->gl_closedir = free;
-+ gl->gl_lstat = local_lstat;
- gl->gl_stat = local_stat;
-- /* We don't bother setting gl_lstat, since glob never calls it.
-- The slot is only there for compatibility with 4.4 BSD. */
- }
-
- void
---
-2.18.0
-
diff --git a/core/make/FS55127.patch b/core/make/FS55127.patch
deleted file mode 100644
index 9b5291cc..00000000
--- a/core/make/FS55127.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9d4e06084a4c7da480bd49a3487aadf6ba77b54 Mon Sep 17 00:00:00 2001
-From: Enrique Olaizola <enrique_olaizola16@hotmail.com>
-Date: Sat, 27 May 2017 14:24:33 -0400
-Subject: * tests/run_make_tests.pl: [SV 50902] Find Perl modules
-
----
- tests/run_make_tests.pl | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl
-index a74417a..a844094 100644
---- a/tests/run_make_tests.pl
-+++ b/tests/run_make_tests.pl
-@@ -64,6 +64,9 @@ if ($^O eq 'VMS')
- $CMD_rmfile = 'delete_file -no_ask';
- }
-
-+use FindBin;
-+use lib "$FindBin::Bin";
-+
- require "test_driver.pl";
- require "config-flags.pm";
-
---
-cgit v1.0-41-gc330
-
diff --git a/core/make/FS58674.patch b/core/make/FS58674.patch
deleted file mode 100644
index 82f42ea5..00000000
--- a/core/make/FS58674.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -rauN make-4.2.1/configure.ac make-4.2.1-alloca-patch/configure.ac
---- make-4.2.1/configure.ac 2016-06-06 12:27:31.000000000 +0000
-+++ make-4.2.1-alloca-patch/configure.ac 2018-07-19 06:17:41.011662796 +0000
-@@ -399,10 +399,9 @@
- #include <glob.h>
- #include <fnmatch.h>
-
--#define GLOB_INTERFACE_VERSION 1
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
- # include <gnu-versions.h>
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
-+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
- gnu glob
- # endif
- #endif],
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
deleted file mode 100644
index 45ca70ce..00000000
--- a/core/make/PKGBUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-source+=('FS55127.patch' 'FS58674.patch' '0001-glob-Do-not-assume-glibc-glob-internals.patch')
-md5sums+=('8efba0d7ff90f5394edda0f83259af05' '95fcc032a728e134f620a402e6922389' 'a68d9cdcde0287bd2cc253a7722a2893')
-
-eval "$(
- declare -f prepare | \
- sed '
- /^\s*cd\s/a patch -p1 -i ${srcdir}/FS55127.patch
- /^\s*cd\s/a patch -p1 -i ${srcdir}/FS58674.patch
- /^\s*cd\s/a patch -p1 -i ${srcdir}/0001-glob-Do-not-assume-glibc-glob-internals.patch
- '
-)"
-
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD
index 9c1f0644..a36a140d 100644
--- a/core/pinentry/PKGBUILD
+++ b/core/pinentry/PKGBUILD
@@ -1,8 +1,15 @@
+# no GUI stuff on i486
+makedepends=(${makedepends[@]//gtk2/})
+makedepends=(${makedepends[@]//qt5-base/})
+makedepends_i686+=(gtk2 qt5-base)
+
+# no gcr on i486
+makedepends=(${makedepends[@]//gcr/})
+makedepends_i686+=(gcr)
+
# i486-specific
if [ "${CARCH}" = "i486" ]; then
# no GUI stuff
- makedepends=(${makedepends[@]//gtk2/})
- makedepends=(${makedepends[@]//qt5-base/})
eval "$(
declare -f build | \
sed '
@@ -11,7 +18,4 @@ if [ "${CARCH}" = "i486" ]; then
s/--enable-pinentry-qt/--disable-pinentry-qt/
'
)"
-
- # no gcr
- makedepends=(${makedepends[@]//gcr/})
fi
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index ef3f908c..b625f595 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,9 +1,12 @@
+# remove dependency on Gnome's xml2po on i486 (needed for building the
+# man pages, draws in far too many dependencies)
+makedepends=(${makedepends[@]//gnome-doc-utils/})
+makedepends_i686+=(gnome-doc-utils)
+
# i486-specific
if [ "${CARCH}" = "i486" ]; then
# remove dependency on Gnome's xml2po (needed for building the man pages,
# draws in far too many dependencies)
- makedepends=(${makedepends[@]//gnome-doc-utils/})
-
eval "$(
declare -f prepare | \
sed '
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index baf567fc..be057de8 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -1,23 +1,11 @@
-source+=('meson-rename-Ddebug-to-Ddebug-extra.patch')
-sha512sums+=('d310e7ea099bd371eb12fb4f474f1518ddc1013612d6a53c3f5777e6a3509eb58c4b5989d31bb04784be70db5d8ca39bff47414456c3fe322194cd7b341ae70c')
+# LZ4 test fails, see upstream FS#60239
+
+source+=(lz4-test-compress-partial.patch)
+sha512sums+=('afc199c8d091c1b87fa0719b82bb29ff32595d51034127d1a8c7f83f539f52d0d8a4fa90cf22e286bf3e9104603ecfc9275c3527b9adc2d05d9bcb9234e3c208')
eval "$(
declare -f prepare | \
sed '
- /patch.*0001.*/a patch -Np1 -i ../meson-rename-Ddebug-to-Ddebug-extra.patch
+ /patch.*/a patch -Np1 -i ../lz4-test-compress-partial.patch
'
)"
-
-# i486-specific
-if [ "${CARCH}" = "i486" ]; then
- # temporary, as there is no systemd-journal user for some reason!?
- eval "$(
- declare -f package_systemd | \
- sed '
- /install.*systemd-journal/d
- '
- )"
-
- # tempoary failure, known upstream, see FS#60239
- unset check
-fi
diff --git a/core/systemd/lz4-test-compress-partial.patch b/core/systemd/lz4-test-compress-partial.patch
new file mode 100644
index 00000000..421e186f
--- /dev/null
+++ b/core/systemd/lz4-test-compress-partial.patch
@@ -0,0 +1,31 @@
+diff --git a/meson.build b/meson.build
+index 554e67e5dd..3636a0ff8c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1084,6 +1084,7 @@ conf.set10('HAVE_XZ', have)
+ want_lz4 = get_option('lz4')
+ if want_lz4 != 'false' and not fuzzer_build
+ liblz4 = dependency('liblz4',
++ version : '>= 1.8.3',
+ required : want_lz4 == 'true')
+ have = liblz4.found()
+ else
+diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c
+index 7addf318d6..fb0db190b2 100644
+--- a/src/journal/test-compress.c
++++ b/src/journal/test-compress.c
+@@ -227,13 +227,10 @@ static void test_lz4_decompress_partial(void) {
+ assert_se(r >= 0);
+ log_info("Decompressed partial %i/%i → %i", 12, HUGE_SIZE, r);
+
+- /* We expect this to fail, because that's how current lz4 works. If this
+- * call succeeds, then lz4 has been fixed, and we need to change our code.
+- */
+ r = LZ4_decompress_safe_partial(buf, huge,
+ compressed,
+ 12, HUGE_SIZE-1);
+- assert_se(r < 0);
++ assert_se(r >= 0);
+ log_info("Decompressed partial %i/%i → %i", 12, HUGE_SIZE-1, r);
+ }
+ #endif
diff --git a/core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch b/core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch
deleted file mode 100644
index 12607f2a..00000000
--- a/core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 88a470a..1d864e3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -765,7 +765,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
-
- enable_debug_hashmap = false
- enable_debug_mmap_cache = false
--foreach name : get_option('debug')
-+foreach name : get_option('debug-extra')
- if name == 'hashmap'
- enable_debug_hashmap = true
- elif name == 'mmap-cache'
-diff --git a/meson_options.txt b/meson_options.txt
-index 16c1f2b..dc7951b 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -46,7 +46,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
- description : 'path to debug shell binary')
- option('debug-tty', type : 'string', value : '/dev/tty9',
- description : 'specify the tty device for debug shell')
--option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
-+option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
- description : 'enable extra debugging')
- option('memory-accounting-default', type : 'boolean',
- description : 'enable MemoryAccounting= by default')
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-01 00:15:03 +0000