From 14b870382a7a08e46c9da500603dad8c6eedb1bd Mon Sep 17 00:00:00 2001 From: xdavidwu Date: Tue, 6 Jun 2023 17:15:05 +0800 Subject: [PATCH] elogind: drop maybe we should just make systemd-dev statifies elogind-dev --- elogind/APKBUILD | 98 --------------------- elogind/fix-mips-detection.patch | 13 --- elogind/fix-version.patch | 13 --- elogind/remove-polkit-gobject-1-check.patch | 54 ------------ 4 files changed, 178 deletions(-) delete mode 100644 elogind/APKBUILD delete mode 100644 elogind/fix-mips-detection.patch delete mode 100644 elogind/fix-version.patch delete mode 100644 elogind/remove-polkit-gobject-1-check.patch diff --git a/elogind/APKBUILD b/elogind/APKBUILD deleted file mode 100644 index 0389663..0000000 --- a/elogind/APKBUILD +++ /dev/null @@ -1,98 +0,0 @@ -# Contributor: Leo -# Maintainer: xdavidwu -pkgname=elogind -pkgver=246.10 -pkgrel=5 -pkgdesc="Standalone fork of systemd's elogind" -url="https://github.com/elogind/elogind" -arch="all" -license="GPL-2.0-or-later LGPL-2.1-or-later" -depends="dbus shadow" -options="!check" # Tests fail on builders -makedepends=" - meson - coreutils - docbook-xsl - gettext-dev - git - gperf - intltool - libxslt-dev - glib-dev - acl-dev - eudev-dev - libcap-dev - libseccomp-dev - linux-pam-dev - m4 - dbus-dev - pcre2-dev - " -subpackages=" - $pkgname-dev - $pkgname-doc - $pkgname-lang - lib$pkgname:libs - $pkgname-zsh-completion:zshcomp:noarch - $pkgname-bash-completion:bashcomp:noarch - " -source="https://github.com/elogind/elogind/archive/v$pkgver/elogind-v$pkgver.tar.gz - fix-mips-detection.patch - fix-version.patch - remove-polkit-gobject-1-check.patch - " - -build() { - case "$CARCH" in - # polkit is not available on these arches - s390x|mips|mips64|riscv64) _polkit=false; export CFLAGS="$CFLAGS -D__IGNORE_pkey_mprotect -DSO_PEERSEC=31" ;; - *) _polkit=true ;; - esac - export LDFLAGS="$LDFLAGS -lintl" - abuild-meson \ - -Dcgroup-controller=elogind \ - -Dhalt-path=/sbin/halt \ - -Drootlibexecdir=/usr/libexec/elogind \ - -Dreboot-path=/sbin/reboot \ - -Ddefault-hierarchy=hybrid \ - -Ddefault-kill-user-processes=false \ - -Dpolkit=$_polkit \ - -Dman=true \ - build - meson compile ${JOBS:+-j ${JOBS}} -C build -} - -check() { - meson test --no-rebuild -v -C build -} - -package() { - DESTDIR="$pkgdir" meson install --no-rebuild -C build - - # Install headers from elogind - install -Dm644 src/systemd/sd-id128.h usr/include/sd-id128.h - install -Dm644 src/systemd/_sd-common.h usr/include/_sd-common.h -} - -zshcomp() { - pkgdesc="Zsh completion for $pkgname" - install_if="$pkgname=$pkgver-r$pkgrel zsh" - - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share/ -} - -bashcomp() { - pkgdesc="Bash completion for $pkgname" - install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share -} - -sha512sums=" -9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b elogind-v246.10.tar.gz -0fda4318afc6db9c9d00121ed4f8267286e692cca04acf4c1006fab99267cdd6228e1d176293f99db043384ae6fa192fc8109a365bf221dda7f2c4177d104820 fix-mips-detection.patch -178c33608f0d69fde8558c521aea9981e0a0bd4a6666d2e1b4f0714dbb7038955ceb86cf323ea741ee67f89218a2e7d332aa05507c2a06eb01fd0785dd81716b fix-version.patch -5cf63f50e8623a4a6e403924860ba76b5dcd19220514c382175afb6f07dbbccc97a27f858ae0c7bc6869f7558255fffc3174e3ac468e5d47333d9cf1db9a5ac1 remove-polkit-gobject-1-check.patch -" diff --git a/elogind/fix-mips-detection.patch b/elogind/fix-mips-detection.patch deleted file mode 100644 index 3706947..0000000 --- a/elogind/fix-mips-detection.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index ccfa657..20ddb08 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -11,7 +11,7 @@ - #include - #include - --#ifdef ARCH_MIPS -+#ifdef _MIPS_SIM - #include - #endif - diff --git a/elogind/fix-version.patch b/elogind/fix-version.patch deleted file mode 100644 index c684182..0000000 --- a/elogind/fix-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index a795b99..212f70b 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,7 +1,7 @@ - # SPDX-License-Identifier: LGPL-2.1+ - - project('elogind', 'c', -- version : '246.10', -+ version : '246', - license : 'LGPLv2+', - default_options: [ - 'c_std=gnu99', diff --git a/elogind/remove-polkit-gobject-1-check.patch b/elogind/remove-polkit-gobject-1-check.patch deleted file mode 100644 index f58f08b..0000000 --- a/elogind/remove-polkit-gobject-1-check.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Jakub Jirutka -Date: Wed, 20 Oct 2021 00:18:47 +0200 -Subject: [PATCH] Remove build-time check for polkit-gobject-1 - -polkit-gobject-1 is actually not needed for building elogind with PolKit -support; elogind binaries are not dynamically linked against polkit -libraries, there's only runtime dependency. - -I've verified that building without polkit-dev installed won't change the -resulting binaries. - -We need to remove polkit-dev dependency from elogind to avoid circular -dependency between polkit and elogind. - -See: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13095 - ---- a/meson.build -+++ b/meson.build -@@ -1148,21 +1148,21 @@ - install_polkit_pkla = false - if want_polkit != 'false' and not skip_deps - install_polkit = true -- -- libpolkit = dependency('polkit-gobject-1', -- required : false) -- if libpolkit.found() and libpolkit.version().version_compare('< 0.106') -- message('Old polkit detected, will install pkla files') -- install_polkit_pkla = true -- endif -+# XXX-Patched: libpolkit is actually not needed for building with polkit support -+# libpolkit = dependency('polkit-gobject-1', -+# required : false) -+# if libpolkit.found() and libpolkit.version().version_compare('< 0.106') -+# message('Old polkit detected, will install pkla files') -+# install_polkit_pkla = true -+# endif - #if 1 /// Disable polkit completely if libpolkit is not there. See elogind issue #167 -- if not libpolkit.found() -- if want_polkit != 'auto' -- error('Polkit requested but libpolkit was not found.') -- endif -- install_polkit = false -- want_polkit = false -- endif -+# if not libpolkit.found() -+# if want_polkit != 'auto' -+# error('Polkit requested but libpolkit was not found.') -+# endif -+# install_polkit = false -+# want_polkit = false -+# endif - #endif // 1 - endif - conf.set10('ENABLE_POLKIT', install_polkit) -- 2.45.2