diff options
| author | Pavel Vinogradov | 2018-12-19 21:25:14 -0500 |
|---|---|---|
| committer | Pavel Vinogradov | 2018-12-19 21:26:04 -0500 |
| commit | 73f3198fc9de8ce512d515af347d336a94bd9cd8 (patch) | |
| tree | b6a0138fa8bcf11567c03963e0cfb1494386fd25 /xorg-xserver/xorg-server | |
| parent | deb412375c4ff2f66fe90e7d2e0ae7ff05ff702d (diff) | |
xorg-xserver/xorg-server: added XWAYLAND subdependency
Diffstat (limited to 'xorg-xserver/xorg-server')
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 3 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/PRE_SUB_DEPENDS | 1 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS | 1 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS | 2 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/SUB_DEPENDS | 2 |
5 files changed, 9 insertions, 0 deletions
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index 8866cb002c..a1858e7904 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,6 @@ +2018-12-19 Pavel Vinogradov <public@sourcemage.org> + * *SUB_DEPENDS: added XWAYLAND subdependency + 2018-10-28 Florian Franzmann <siflfran@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 cc9d460846..7fd4fb6af4 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 76e6a138b8..b75a433555 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 6531834dff..4acd740d2a 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 2e0dcb2ddb..1e08a5b58c 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 |