Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8547fddb3159780b3bcc060fe8798351f8785f71)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8547fddb3159780b3bcc060fe8798351f8785f71)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8547fddb3159780b3bcc060fe8798351f8785f71)
  • Date: Thu, 20 Dec 2018 03:05:11 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

xorg-xserver/xorg-server/HISTORY | 3 +++
xorg-xserver/xorg-server/PRE_SUB_DEPENDS | 1 +
xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS | 1 +
xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS | 2 ++
xorg-xserver/xorg-server/SUB_DEPENDS | 2 ++
xorg/xserver/HISTORY | 3 +++
xorg/xserver/PRE_SUB_DEPENDS | 5 +++++
xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS | 5 +++++
xorg/xserver/REPAIR^all^SUB_DEPENDS | 6 ++++++
xorg/xserver/SUB_DEPENDS | 6 ++++++
10 files changed, 34 insertions(+)

New commits:
commit 8547fddb3159780b3bcc060fe8798351f8785f71
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xorg/xserver: added XWAYLAND subdependency

commit 73f3198fc9de8ce512d515af347d336a94bd9cd8
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

xorg-xserver/xorg-server: added XWAYLAND subdependency

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 8866cb0..a1858e7 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2018-12-19 Pavel Vinogradov <public AT sourcemage.org>
+ * *SUB_DEPENDS: added XWAYLAND subdependency
+
2018-10-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, fix-CVE-2018-14665.patch: fix CVE-2018-14665
* DETAILS: SECURITY_PATCH++
diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index cc9d460..7fd4fb6 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -8,6 +8,7 @@ case $THIS_SUB_DEPENDS in
XEPHYR) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" &&
list_find "$XORG_SERVER_OPTS" "--enable-xephyr" && return 0 ;;
XVFB) list_find "$XORG_SERVER_OPTS" "--enable-xvfb" && return 0 ;;
+ XWAYLAND) is_depends_enabled $SPELL wayland ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
index 76e6a13..b75a433 100755
--- a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
@@ -8,6 +8,7 @@ case $THIS_SUB_DEPENDS in
XEPHYR) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" &&
list_find "$XORG_SERVER_OPTS" "--enable-xephyr" && return 0 ;;
XVFB) list_find "$XORG_SERVER_OPTS" "--enable-xvfb" && return 0 ;;
+ XWAYLAND) is_depends_enabled $SPELL wayland ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS
b/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS
index 6531834..4acd740 100755
--- a/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS
@@ -17,6 +17,8 @@ case "$THIS_SUB_DEPENDS" in
XEPHYR) message "${MESSAGE_COLOR}Forcing Kdrive and
Xephyr...${DEFAULT_COLOR}" &&
list_remove XORG_SERVER_OPTS "--disable-kdrive
--disable-xephyr" &&
list_add XORG_SERVER_OPTS "--enable-kdrive --enable-xephyr" ;;
+ XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}"
&&
+ depends wayland "--enable-xwayland" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/xorg-xserver/xorg-server/SUB_DEPENDS
b/xorg-xserver/xorg-server/SUB_DEPENDS
index 2e0dcb2..1e08a5b 100755
--- a/xorg-xserver/xorg-server/SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/SUB_DEPENDS
@@ -18,6 +18,8 @@ case "$THIS_SUB_DEPENDS" in
list_remove XORG_SERVER_OPTS "--disable-kdrive
--disable-xephyr" &&
list_add XORG_SERVER_OPTS "--enable-kdrive --enable-xephyr" ;;
XVFB) list_add XORG_SERVER_OPTS "--enable-xvfb" ;;
+ XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}"
&&
+ depends wayland "--enable-xwayland" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index 93a3338..f2489ec 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,6 @@
+2018-12-19 Pavel Vinogradov <public AT sourcemage.org>
+ * *SUB_DEPENDS: added XWAYLAND subdependency
+
2018-12-12 Pavel Vinogradov <public AT sourcemage.org>
* PRE_INSTALL: actually fixed a subtle typo in is_depends_enabled call

diff --git a/xorg/xserver/PRE_SUB_DEPENDS b/xorg/xserver/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..8f2b364
--- /dev/null
+++ b/xorg/xserver/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ XWAYLAND) [[ "${XSERVER_WAYLAND}" == "true" ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS
b/xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..8f2b364
--- /dev/null
+++ b/xorg/xserver/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ XWAYLAND) [[ "${XSERVER_WAYLAND}" == "true" ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/xorg/xserver/REPAIR^all^SUB_DEPENDS
b/xorg/xserver/REPAIR^all^SUB_DEPENDS
new file mode 100755
index 0000000..81101ee
--- /dev/null
+++ b/xorg/xserver/REPAIR^all^SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "$THIS_SUB_DEPENDS" in
+ XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}"
&&
+ XSERVER_WAYLAND="true" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/xorg/xserver/SUB_DEPENDS b/xorg/xserver/SUB_DEPENDS
new file mode 100755
index 0000000..81101ee
--- /dev/null
+++ b/xorg/xserver/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "$THIS_SUB_DEPENDS" in
+ XWAYLAND) message "${MESSAGE_COLOR}Forcing XWayland...${DEFAULT_COLOR}"
&&
+ XSERVER_WAYLAND="true" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac


  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8547fddb3159780b3bcc060fe8798351f8785f71), Pavel Vinogradov, 12/19/2018

Archive powered by MHonArc 2.6.24.

Top of Page