| 1 |
commit: 7b09219f15e8a105248b7ac1c07d8ab239ada118 |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Tue Jul 30 04:48:14 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 20 20:43:12 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b09219f |
| 7 |
|
| 8 |
x11-base/xorg-server: revbump to 1.20.5 |
| 9 |
|
| 10 |
Signed-off-by: Steffen Kuhn <herrtimson <AT> yahoo.de> |
| 11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-base/xorg-server/Manifest | 2 +- |
| 14 |
x11-base/xorg-server/files/xdm.initd-11 | 2 +- |
| 15 |
.../{xorg-server-1.20.4.ebuild => xorg-server-1.20.5.ebuild} | 8 ++++---- |
| 16 |
3 files changed, 6 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
| 19 |
index 3dd24c9..f978f86 100644 |
| 20 |
--- a/x11-base/xorg-server/Manifest |
| 21 |
+++ b/x11-base/xorg-server/Manifest |
| 22 |
@@ -1 +1 @@ |
| 23 |
-DIST xorg-server-1.20.4.tar.bz2 6123780 BLAKE2B 224dda54f433315f6614cbee5bc54db91d9d9e190c06ac7f26e334b80b9d4a612ff4b2a4f10f50a6f928ecdbea40172d5578289fbf88411f006bcd473253b05d SHA512 f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8 |
| 24 |
+DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 |
| 25 |
|
| 26 |
diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11 |
| 27 |
index 70b81c0..ce76c56 100644 |
| 28 |
--- a/x11-base/xorg-server/files/xdm.initd-11 |
| 29 |
+++ b/x11-base/xorg-server/files/xdm.initd-11 |
| 30 |
@@ -208,7 +208,7 @@ stop() { |
| 31 |
|
| 32 |
ebegin "Stopping ${myservice}" |
| 33 |
|
| 34 |
- if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then |
| 35 |
+ if start-stop-daemon --quiet --test --stop --exec "${myexe}" 2>/dev/null; then |
| 36 |
start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ |
| 37 |
${mypidfile:+--pidfile} ${mypidfile} \ |
| 38 |
${myname:+--name} ${myname} |
| 39 |
|
| 40 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild |
| 41 |
similarity index 95% |
| 42 |
rename from x11-base/xorg-server/xorg-server-1.20.4.ebuild |
| 43 |
rename to x11-base/xorg-server/xorg-server-1.20.5.ebuild |
| 44 |
index ec78441..dfc7110 100644 |
| 45 |
--- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild |
| 46 |
+++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild |
| 47 |
@@ -91,7 +91,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
| 48 |
|
| 49 |
DEPEND="${CDEPEND} |
| 50 |
sys-devel/flex |
| 51 |
- >=x11-base/xorg-proto-2018.3 |
| 52 |
+ >=x11-base/xorg-proto-2018.4 |
| 53 |
dmx? ( |
| 54 |
doc? ( |
| 55 |
|| ( |
| 56 |
@@ -119,9 +119,9 @@ REQUIRED_USE="!minimal? ( |
| 57 |
xephyr? ( kdrive )" |
| 58 |
|
| 59 |
UPSTREAMED_PATCHES=( |
| 60 |
- "${FILESDIR}"/${P}-shm-reindent-shm_tmpfile-to-follow-our-standards.patch |
| 61 |
- "${FILESDIR}"/${P}-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch |
| 62 |
- "${FILESDIR}"/${P}-shm-Use-memfd_create-when-possible.patch |
| 63 |
+ "${FILESDIR}"/${PN}-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch |
| 64 |
+ "${FILESDIR}"/${PN}-1.20.4-shm-Pick-the-shm-dir-at-run-time-not-build-time.patch |
| 65 |
+ "${FILESDIR}"/${PN}-1.20.4-shm-Use-memfd_create-when-possible.patch |
| 66 |
) |
| 67 |
|
| 68 |
PATCHES=( |
Archives