From 2739c66207a8857d874e7e176369c3e21c2502dd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 26 Jun 2018 11:53:02 -0300 Subject: [PATCH] elogind: update to 238.1. --- .../patches/fix-missing-ftw-macros.patch | 34 ------------------- srcpkgs/elogind/template | 6 ++-- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/elogind/patches/fix-missing-ftw-macros.patch diff --git a/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch b/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch deleted file mode 100644 index 3cdfdf061c5..00000000000 --- a/srcpkgs/elogind/patches/fix-missing-ftw-macros.patch +++ /dev/null @@ -1,34 +0,0 @@ -Source: maxice8 -Upstream: https://github.com/elogind/elogind/pull/57 -Reason: add missing FTW_* macros for musl libc based systems - ---- src/shared/musl_missing.h -+++ src/shared/musl_missing.h -@@ -107,6 +107,27 @@ typedef __compar_fn_t comparison_fn_t; - */ - #define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) - -+/* -+ * Missing FTW macros in musl, define them if not defined -+ * taken from -+ * https://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch -+ */ -+#ifndef FTW_ACTIONRETVAL -+#define FTW_ACTIONRETVAL 16 -+#endif -+ -+#ifndef FTW_CONTINUE -+#define FTW_CONTINUE 0 -+#endif -+ -+#ifndef FTW_STOP -+#define FTW_STOP 1 -+#endif -+ -+#ifndef FTW_SKIP_SUBTREE -+#define FTW_SKIP_SUBTREE 2 -+#endif -+ - #endif // !defined(__GLIBC__) - - #endif // ELOGIND_BASIC_MUSL_MISSING_H_INCLUDED diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template index 0a43f62cfdc..1c127002586 100644 --- a/srcpkgs/elogind/template +++ b/srcpkgs/elogind/template @@ -1,6 +1,6 @@ # Template file for 'elogind' pkgname=elogind -version=236.1 +version=238.1 revision=1 build_style=meson configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt @@ -15,8 +15,8 @@ short_desc="Standalone logind fork" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/elogind/elogind" -distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=391fdb66d97983827e30e7e518f822c96eadb29d5e54092c3cd348dfb3a7a3b6 +distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" +checksum=b0416c4194198f6af71f5ffb3b3d5d8f20e446acb80699eb4e8df3f79dd18acf conf_files="/etc/elogind/logind.conf" pre_check() {