Skip to Content.
Sympa Menu

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

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 (b69ed64fd147d18fb3da994eaa42515c06cc3ea5)
  • Date: Tue, 25 Jun 2019 07:30:17 +0000

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

ChangeLog | 3 ++
freedesktop.gpg |binary
xorg-app/weston/DEPENDS | 4 +--
xorg-app/weston/DETAILS | 2 -
xorg-app/weston/HISTORY | 5 ++++
xorg-app/weston/PRE_BUILD | 4 ---
xorg-app/weston/patches/editor-gobject.patch | 31
---------------------------
7 files changed, 11 insertions(+), 38 deletions(-)

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

freedesktop.gpg - add emersion

commit 9e05d4081e5b548e7e85d8461f30a01cde5b86f7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

weston: => 6.0.1

diff --git a/ChangeLog b/ChangeLog
index 2ad3314..56e49a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-06-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * freedesktop.gpg: add emersion <contact AT emersion.fr>
+
2019-06-22 Vlad Glagolev <stealth AT sourcemage.org>
* perl-cpan/time-out: new spell, easily timeout long running
operations
* perl-cpan/perlio-via-timeout: new spell, PerlIO layer that adds read
diff --git a/freedesktop.gpg b/freedesktop.gpg
index 2cbfc83..9be934c 100644
Binary files a/freedesktop.gpg and b/freedesktop.gpg differ
diff --git a/xorg-app/weston/DEPENDS b/xorg-app/weston/DEPENDS
index 1ae8e49..d0e1773 100755
--- a/xorg-app/weston/DEPENDS
+++ b/xorg-app/weston/DEPENDS
@@ -37,8 +37,8 @@ optional_depends wayland "backend-wayland=true" \
optional_depends libdrm "backend-drm=true" "backend-drm=false" \
"Build the DRM compositor" &&
optional_depends linux-pam "weston-launch=true" "weston-launch=false" \
- "Build weston-launch"
-optional_depends pango "" "" "" &&
+ "Build weston-launch" &&
+optional_depends pango "" "demo-clients=false" "build demo client" &&
optional_depends -sub "XWAYLAND" XSERVER \
"xwayland=true" \
"xwayland=false" \
diff --git a/xorg-app/weston/DETAILS b/xorg-app/weston/DETAILS
index 6e6dc3d..ac7f5be 100755
--- a/xorg-app/weston/DETAILS
+++ b/xorg-app/weston/DETAILS
@@ -1,6 +1,6 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=weston
- VERSION=6.0.0
+ VERSION=6.0.1
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://wayland.freedesktop.org
diff --git a/xorg-app/weston/HISTORY b/xorg-app/weston/HISTORY
index 66d2125..a05888b 100644
--- a/xorg-app/weston/HISTORY
+++ b/xorg-app/weston/HISTORY
@@ -1,3 +1,8 @@
+2019-06-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.0.1
+ * PRE_BUILD pathces/*: deleted
+ * DEPENDS: flags for pango
+
2019-03-29 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS, DETAILS: mesonified, updated dependencies
* BUILD: added a workaround flag
diff --git a/xorg-app/weston/PRE_BUILD b/xorg-app/weston/PRE_BUILD
deleted file mode 100755
index 23e683b..0000000
--- a/xorg-app/weston/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-apply_patch_dir patches
diff --git a/xorg-app/weston/patches/editor-gobject.patch
b/xorg-app/weston/patches/editor-gobject.patch
deleted file mode 100644
index 151ffa6..0000000
--- a/xorg-app/weston/patches/editor-gobject.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cbffca980b19fd6a6de14d9f2b4dca6a7711d9e0 Mon Sep 17 00:00:00 2001
-From: Pekka Paalanen <pekka.paalanen AT collabora.com>
-Date: Fri, 22 Mar 2019 13:58:30 +0200
-Subject: [PATCH] meson: link editor with gobject-2.0
-
-editor.c calls g_clear_object(), so it should link to gobject directly
instead
-of relying on pangocairo pulling it in in its pkg-config.
-
-Fixes: https://gitlab.freedesktop.org/wayland/weston/issues/211
-
-Signed-off-by: Pekka Paalanen <pekka.paalanen AT collabora.com>
----
- clients/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clients/meson.build b/clients/meson.build
-index 47e9e8ce..53a94212 100644
---- a/clients/meson.build
-+++ b/clients/meson.build
-@@ -236,7 +236,7 @@ demo_clients = [
- text_input_unstable_v1_client_protocol_h,
- text_input_unstable_v1_protocol_c,
- ],
-- 'deps': [ 'pangocairo' ]
-+ 'deps': [ 'pangocairo', 'gobject-2.0' ]
- },
- { 'basename': 'eventdemo' },
- { 'basename': 'flower' },
---
-2.18.1
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b69ed64fd147d18fb3da994eaa42515c06cc3ea5), Treeve Jelbert, 06/25/2019

Archive powered by MHonArc 2.6.24.

Top of Page