Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8cf9262fc0343a5db43470bcbb8482cf5671abbd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8cf9262fc0343a5db43470bcbb8482cf5671abbd)
  • Date: Fri, 23 Sep 2022 09:18:38 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

xorg-app/weston/DEPENDS | 2
xorg-app/weston/DETAILS | 2
xorg-app/weston/HISTORY | 6
xorg-app/weston/PRE_BUILD | 4
xorg-app/weston/patches/0001-support-elogind-instead-of-systemd.patch | 61
----------
5 files changed, 10 insertions(+), 65 deletions(-)

New commits:
commit 8cf9262fc0343a5db43470bcbb8482cf5671abbd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

weston - delete obsolete patch

commit 1a8e2fa4a409a3fb75d6b9d78b207979312a3a8d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

weston: => 11.0.0

diff --git a/xorg-app/weston/DEPENDS b/xorg-app/weston/DEPENDS
index 716027a..a408851 100755
--- a/xorg-app/weston/DEPENDS
+++ b/xorg-app/weston/DEPENDS
@@ -11,7 +11,7 @@ depends libevdev &&
depends libxkbcommon &&
depends pixman &&
depends wayland-protocols &&
-optional_depends elogind launcher-logind=true '' 'login support' &&
+optional_depends systemd launcher-logind=true '' 'login support' &&
optional_depends seatd launcher-libseat=true '' 'seat support' &&

optional_depends libdrm backend-drm=true '' 'Build the DRM compositor'
&&
diff --git a/xorg-app/weston/DETAILS b/xorg-app/weston/DETAILS
index 3997a66..5e65ff1 100755
--- a/xorg-app/weston/DETAILS
+++ b/xorg-app/weston/DETAILS
@@ -1,6 +1,6 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=weston
- VERSION=10.0.2
+ VERSION=11.0.0
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/xorg-app/weston/HISTORY b/xorg-app/weston/HISTORY
index 5a32dd6..47c7f98 100644
--- a/xorg-app/weston/HISTORY
+++ b/xorg-app/weston/HISTORY
@@ -1,3 +1,9 @@
+2022-09-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 11.0.0
+ * DEPENDS: allow systemd
+ * PRE_BUILD: adjust
+ * patches/0001-support-elogind-instead-of-systemd.patch: deleted
+
2022-07-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 10.0.2

diff --git a/xorg-app/weston/PRE_BUILD b/xorg-app/weston/PRE_BUILD
index 1c9f3ce..4b94d10 100755
--- a/xorg-app/weston/PRE_BUILD
+++ b/xorg-app/weston/PRE_BUILD
@@ -3,5 +3,5 @@ cd $SOURCE_DIRECTORY &&
# set all options to false; simplifies build, depends scripts
sed -i '/value/s/true/false/' meson_options.txt &&
# disable failing tests
-sed -i '/tests/D' meson.build &&
-apply_patch_dir patches
+sed -i '/tests/D' meson.build
+#apply_patch_dir patches
diff --git
a/xorg-app/weston/patches/0001-support-elogind-instead-of-systemd.patch
b/xorg-app/weston/patches/0001-support-elogind-instead-of-systemd.patch
deleted file mode 100644
index d085fc9..0000000
--- a/xorg-app/weston/patches/0001-support-elogind-instead-of-systemd.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From fbf7caad32998ebaf1b84fb33ebe5c4a34fa7a5e Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Sat, 26 Jun 2021 14:41:59 +0200
-Subject: [PATCH 1/2] support elogind instead of systemd
-
----
- libweston/launcher-logind.c | 2 +-
- libweston/meson.build | 6 +++---
- libweston/weston-launch.c | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/libweston/launcher-logind.c b/libweston/launcher-logind.c
-index 3fca1dff..c930adbe 100644
---- a/libweston/launcher-logind.c
-+++ b/libweston/launcher-logind.c
-@@ -35,7 +35,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
--#include <systemd/sd-login.h>
-+#include <elogind/sd-login.h>
- #include <unistd.h>
-
- #include <libweston/libweston.h>
-diff --git a/libweston/meson.build b/libweston/meson.build
-index 257d6950..029ada45 100644
---- a/libweston/meson.build
-+++ b/libweston/meson.build
-@@ -156,13 +156,13 @@ endif
-
- systemd_dep = dependency('', required: false)
- if get_option('launcher-logind')
-- systemd_dep = dependency('libsystemd', version: '>= 209', required:
false)
-+ systemd_dep = dependency('libelogind', version: '>= 209', required:
false)
- if systemd_dep.found()
- config_h.set('HAVE_SYSTEMD_LOGIN_209', '1')
- else
-- systemd_dep = dependency('libsystemd-login', version: '>=
198', required: false)
-+# systemd_dep = dependency('libsystemd-login', version: '>=
198', required: false)
- if not systemd_dep.found()
-- error('logind support requires libsystemd or
libsystemd-login but neither was found. Or, you can use
\'-Dlauncher-logind=false\'')
-+ error('logind support requires elogind but it was
found. Or, you can use \'-Dlauncher-logind=false\'')
- endif
- endif
-
-diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index c43ed7b2..db389318 100644
---- a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
-@@ -54,7 +54,7 @@
- #include <security/pam_appl.h>
-
- #ifdef HAVE_SYSTEMD_LOGIN
--#include <systemd/sd-login.h>
-+#include <elogind/sd-login.h>
- #endif
-
- #include "weston-launch.h"
---
-2.35.1
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8cf9262fc0343a5db43470bcbb8482cf5671abbd), Treeve Jelbert, 09/23/2022

Archive powered by MHonArc 2.6.24.

Top of Page