Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1440418e4c3f1697ac014c6ed9ade70b9044a0c0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1440418e4c3f1697ac014c6ed9ade70b9044a0c0)
  • Date: Wed, 14 Dec 2022 00:19:10 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog
| 3
libs/basu/CONFIGURE
| 1
libs/basu/DEPENDS
| 8 +
libs/basu/DETAILS
| 19 +++
libs/basu/HISTORY
| 5 +
libs/basu/PRE_BUILD
| 6 +
libs/basu/patches/0001-Do-not-check-nobody-user-at-build.patch
| 49 ++++++++++
libs/basu/patches/0001-Work-around-Wpedantic-flag-added-by-meson-muon.patch
| 27 +++++
8 files changed, 118 insertions(+)

New commits:
commit 1440418e4c3f1697ac014c6ed9ade70b9044a0c0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

basu: new spell, The sd-bus library (extracted from systemd)

diff --git a/ChangeLog b/ChangeLog
index 6a36e69..20c0b4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * libs/basu: new spell, The sd-bus library, extracted from systemd
+
2022-12-12 Ismael Luceno <ismael AT sourcemage.org>
* wm-addons/swaylock: new spell, Screen locker for Wayland

diff --git a/libs/basu/CONFIGURE b/libs/basu/CONFIGURE
new file mode 100755
index 0000000..d1cc655
--- /dev/null
+++ b/libs/basu/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE"/MESON_CONFIGURE
diff --git a/libs/basu/DEPENDS b/libs/basu/DEPENDS
new file mode 100755
index 0000000..73f619c
--- /dev/null
+++ b/libs/basu/DEPENDS
@@ -0,0 +1,8 @@
+. "$GRIMOIRE"/MESON_DEPENDS &&
+optional_depends audit \
+ audit={true,false} \
+ "for libaudit support"
+# TODO for upcoming version:
+#optional_depends libcap \
+# libcap={true,false} \
+# "for libcap support"
diff --git a/libs/basu/DETAILS b/libs/basu/DETAILS
new file mode 100755
index 0000000..abe5af4
--- /dev/null
+++ b/libs/basu/DETAILS
@@ -0,0 +1,19 @@
+. "$GRIMOIRE"/MESON_FUNCTIONS
+ SPELL=basu
+ VERSION=0.2.0
+ SOURCE="$SPELL-$VERSION.tar.gz"
+
SOURCE_URL[0]=https://git.sr.ht/~emersion/$SPELL/refs/download/v$VERSION/$SOURCE
+
SOURCE_HASH=sha512:dbc2f72b6e1a880fa41fe6067a38a301f456e4305dae6eb4d465089d7d9c2f629677ba23752b3e1a1fd476cb440db01ef3a218c1c976f38d0058eed584c80165
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="https://sr.ht/~emersion/basu/";
+ LICENSE[0]="LGPL-2.1-or-later"
+ ENTERED=20221213
+ KEYWORDS=""
+ SHORT="The sd-bus library, extracted from systemd"
+cat << EOF
+The sd-bus library, extracted from systemd.
+
+Some projects rely on the sd-bus library for DBus support. However not all
+systems have systemd or elogind installed. This library provides just sd-bus
+(and the busctl utility).
+EOF
diff --git a/libs/basu/HISTORY b/libs/basu/HISTORY
new file mode 100644
index 0000000..92f4bce
--- /dev/null
+++ b/libs/basu/HISTORY
@@ -0,0 +1,5 @@
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFIGURE, DEPENDS, DETAILS, PRE_BUILD,
+ patches/0001-Do-not-check-nobody-user-at-build.patch,
+ patches/0001-Work-around-Wpedantic-flag-added-by-meson-muon.patch:
+ spell created
diff --git a/libs/basu/PRE_BUILD b/libs/basu/PRE_BUILD
new file mode 100755
index 0000000..e925f79
--- /dev/null
+++ b/libs/basu/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+# fix interpreter path
+sed -s -i '1s@^#!/usr/bin/env@#!/bin/env@' \
+ src/basic/generate-gperfs.py
diff --git a/libs/basu/patches/0001-Do-not-check-nobody-user-at-build.patch
b/libs/basu/patches/0001-Do-not-check-nobody-user-at-build.patch
new file mode 100644
index 0000000..ad4efa7
--- /dev/null
+++ b/libs/basu/patches/0001-Do-not-check-nobody-user-at-build.patch
@@ -0,0 +1,49 @@
+From cefb30b6be12876e2b554dbb7e22c4f1f1018f36 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Tue, 13 Dec 2022 23:18:54 +0100
+Subject: [PATCH] Do not check nobody user at build
+
+Unimportant for source-based distributions, and currently the musl port of
+Source Mage doesn't provide an implementation of getent.
+
+Upstream-Status: Inappropriate
+Origin: Source Mage
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ meson.build | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 1f29690c30a9..c942fd311b64 100644
+--- a/meson.build
++++ b/meson.build
+@@ -188,26 +188,6 @@ conf.set('GPERF_LEN_TYPE', gperf_len_type,
+
+ nobody_user = get_option('nobody-user')
+
+-if not meson.is_cross_build()
+- getent_result = run_command('getent', 'passwd', '65534')
+- if getent_result.returncode() == 0
+- name = getent_result.stdout().split(':')[0]
+- if name != nobody_user
+- warning('\n' +
+- 'The local user with the UID 65534 does not
match the configured user name "@0@" of the nobody user (its name is
@1@).\n'.format(nobody_user, name) +
+- 'Your build will result in an user table
setup that is incompatible with the local system.')
+- endif
+- endif
+- id_result = run_command('id', '-u', nobody_user)
+- if id_result.returncode() == 0
+- id = id_result.stdout().to_int()
+- if id != 65534
+- warning('\n' +
+- 'The local user with the configured user
name "@0@" of the nobody user does not have UID 65534 (it has
@1@).\n'.format(nobody_user, id) +
+- 'Your build will result in an user table
setup that is incompatible with the local system.')
+- endif
+- endif
+-endif
+ conf.set_quoted('NOBODY_USER_NAME', nobody_user)
+
+ system_bus_address = get_option('system-bus-address')
+--
+2.38.1
+
diff --git
a/libs/basu/patches/0001-Work-around-Wpedantic-flag-added-by-meson-muon.patch
b/libs/basu/patches/0001-Work-around-Wpedantic-flag-added-by-meson-muon.patch
new file mode 100644
index 0000000..5d6b560
--- /dev/null
+++
b/libs/basu/patches/0001-Work-around-Wpedantic-flag-added-by-meson-muon.patch
@@ -0,0 +1,27 @@
+From bf31e0c5f34e25a6ab9f642c6b843f8cb4872306 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Wed, 14 Dec 2022 01:14:38 +0100
+Subject: [PATCH] Work-around -Wpedantic flag added by meson/muon
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ meson.build | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index c942fd311b64..876a48acbe9b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -61,6 +61,9 @@ possible_cc_flags = [
+ # work-around for gcc 7.1 turning this on on its own.
+ '-Wno-error=nonnull',
+
++ # work-around -Wpedantic added by meson/muon
++ '-Wno-pedantic',
++
+ # Disable -Wmaybe-uninitialized, since it's noisy on gcc 8 with
+ # optimizations enabled, producing essentially false positives.
+ '-Wno-maybe-uninitialized',
+--
+2.38.1
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (1440418e4c3f1697ac014c6ed9ade70b9044a0c0), Ismael Luceno, 12/13/2022

Archive powered by MHonArc 2.6.24.

Top of Page