1 |
commit: 83b7fa3ee934fc0377c4bbb5343de79fb1a0733a |
2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
3 |
AuthorDate: Wed Jan 3 16:45:43 2018 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Jan 3 16:45:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=83b7fa3e |
7 |
|
8 |
x11-base/xorg-server: revbump |
9 |
|
10 |
x11-base/xorg-server/Manifest | 2 +- |
11 |
.../files/xorg-server-1.18-sysmacros.patch | 59 ---------------------- |
12 |
.../files/xorg-server-1.19.4-sysmacros.patch | 36 +++++++++++++ |
13 |
...ver-1.19.3.ebuild => xorg-server-1.19.5.ebuild} | 4 +- |
14 |
4 files changed, 39 insertions(+), 62 deletions(-) |
15 |
|
16 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
17 |
index 2021b40..9b10279 100644 |
18 |
--- a/x11-base/xorg-server/Manifest |
19 |
+++ b/x11-base/xorg-server/Manifest |
20 |
@@ -1 +1 @@ |
21 |
-DIST xorg-server-1.19.3.tar.bz2 6050221 SHA256 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 SHA512 b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669 WHIRLPOOL acbac6db7ba0aff8d0b906e52a783b38b1ce43a342159becb2fc696e34274c98e546e9712d59cf3360ad745555416e6be89575523285e1ca3954f9e60a5cf079 |
22 |
+DIST xorg-server-1.19.5.tar.bz2 5965044 SHA256 18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c WHIRLPOOL 01039d524a876ba6bd72713993b1d4d6e21f8ba53536ee3189dce9cc7186010e143754fa708d2ccf10905dd272bc68b14c63f4322548e041dfc23cf00e4c364e |
23 |
|
24 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch |
25 |
deleted file mode 100644 |
26 |
index 5a3dea3..0000000 |
27 |
--- a/x11-base/xorg-server/files/xorg-server-1.18-sysmacros.patch |
28 |
+++ /dev/null |
29 |
@@ -1,59 +0,0 @@ |
30 |
-From 1df7e4f5c1090631ff6584176f7d1370d08bc15e Mon Sep 17 00:00:00 2001 |
31 |
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar@×××××.cz> |
32 |
-Date: Sat, 16 Apr 2016 13:04:59 +0200 |
33 |
-Subject: [PATCH] Include sys/sysmacros.h for major(3) |
34 |
-MIME-Version: 1.0 |
35 |
-Content-Type: text/plain; charset=UTF-8 |
36 |
-Content-Transfer-Encoding: 8bit |
37 |
- |
38 |
-GNU major(3) manual page prescribes <sys/types.h>, but that does not work with |
39 |
-sys-libs/glibc-2.23-r1. |
40 |
- |
41 |
-https://bugs.gentoo.org/show_bug.cgi?id=580044 |
42 |
-Signed-off-by: Petr Písař <petr.pisar@×××××.cz> |
43 |
---- |
44 |
- config/udev.c | 1 + |
45 |
- hw/xfree86/common/xf86Xinput.c | 2 ++ |
46 |
- hw/xfree86/os-support/linux/lnx_init.c | 1 + |
47 |
- 3 files changed, 4 insertions(+) |
48 |
- |
49 |
-diff --git a/config/udev.c b/config/udev.c |
50 |
-index 28c2658..62908f4 100644 |
51 |
---- a/config/udev.c |
52 |
-+++ b/config/udev.c |
53 |
-@@ -30,6 +30,7 @@ |
54 |
- #include <libudev.h> |
55 |
- #include <ctype.h> |
56 |
- #include <unistd.h> |
57 |
-+#include <sys/sysmacros.h> |
58 |
- |
59 |
- #include "input.h" |
60 |
- #include "inputstr.h" |
61 |
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c |
62 |
-index c56a2b9..d33c165 100644 |
63 |
---- a/hw/xfree86/common/xf86Xinput.c |
64 |
-+++ b/hw/xfree86/common/xf86Xinput.c |
65 |
-@@ -86,6 +86,8 @@ |
66 |
- #include <unistd.h> |
67 |
- #ifdef HAVE_SYS_MKDEV_H |
68 |
- #include <sys/mkdev.h> /* for major() & minor() on Solaris */ |
69 |
-+#else |
70 |
-+#include <sys/sysmacros.h> |
71 |
- #endif |
72 |
- |
73 |
- #include "mi.h" |
74 |
-diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c |
75 |
-index 1ed213c..6caf531 100644 |
76 |
---- a/hw/xfree86/os-support/linux/lnx_init.c |
77 |
-+++ b/hw/xfree86/os-support/linux/lnx_init.c |
78 |
-@@ -38,6 +38,7 @@ |
79 |
- #include "xf86_OSlib.h" |
80 |
- |
81 |
- #include <sys/stat.h> |
82 |
-+#include <sys/sysmacros.h> |
83 |
- |
84 |
- #ifndef K_OFF |
85 |
- #define K_OFF 0x4 |
86 |
--- |
87 |
-2.8.1 |
88 |
- |
89 |
|
90 |
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch |
91 |
new file mode 100644 |
92 |
index 0000000..8a3cb76 |
93 |
--- /dev/null |
94 |
+++ b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch |
95 |
@@ -0,0 +1,36 @@ |
96 |
+From 7d097c0c38ab82115a1e56489bfe09f9f01b24de Mon Sep 17 00:00:00 2001 |
97 |
+From: Mart Raudsepp <leio@g.o> |
98 |
+Date: Wed, 11 Oct 2017 16:11:49 +0300 |
99 |
+Subject: [PATCH] config/udev: Add sys/sysmacros.h include for major/minor |
100 |
+ functions for new glibc |
101 |
+ |
102 |
+Commits d732c36597fa and 84e3b96b5313 added the include to some files, but |
103 |
+missed config/udev.c, where the major and minor functions are used as well. |
104 |
+This should be Linux-only, so we don't need the sys/mkdev.h case here for |
105 |
+Solaris. |
106 |
+ |
107 |
+Signed-off-by: Mart Raudsepp <leio@g.o> |
108 |
+--- |
109 |
+https://bugs.gentoo.org/633530 |
110 |
+https://patchwork.freedesktop.org/patch/181800/ |
111 |
+ |
112 |
+ config/udev.c | 3 +++ |
113 |
+ 1 file changed, 3 insertions(+) |
114 |
+ |
115 |
+diff --git a/config/udev.c b/config/udev.c |
116 |
+index 932f230..b3b8d0f 100644 |
117 |
+--- a/config/udev.c |
118 |
++++ b/config/udev.c |
119 |
+@@ -30,6 +30,9 @@ |
120 |
+ #include <libudev.h> |
121 |
+ #include <ctype.h> |
122 |
+ #include <unistd.h> |
123 |
++#ifdef HAVE_SYS_SYSMACROS_H |
124 |
++#include <sys/sysmacros.h> |
125 |
++#endif |
126 |
+ |
127 |
+ #include "input.h" |
128 |
+ #include "inputstr.h" |
129 |
+-- |
130 |
+2.10.2 |
131 |
+ |
132 |
|
133 |
diff --git a/x11-base/xorg-server/xorg-server-1.19.3.ebuild b/x11-base/xorg-server/xorg-server-1.19.5.ebuild |
134 |
similarity index 97% |
135 |
rename from x11-base/xorg-server/xorg-server-1.19.3.ebuild |
136 |
rename to x11-base/xorg-server/xorg-server-1.19.5.ebuild |
137 |
index d4af96d..1dc8c49 100644 |
138 |
--- a/x11-base/xorg-server/xorg-server-1.19.3.ebuild |
139 |
+++ b/x11-base/xorg-server/xorg-server-1.19.5.ebuild |
140 |
@@ -12,7 +12,7 @@ SLOT="0/${PV}" |
141 |
KEYWORDS="arm" |
142 |
|
143 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
144 |
-IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" |
145 |
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity" |
146 |
|
147 |
CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
148 |
!libressl? ( dev-libs/openssl:0= ) |
149 |
@@ -144,7 +144,7 @@ PATCHES=( |
150 |
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
151 |
# needed for new eselect-opengl, bug #541232 |
152 |
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
153 |
- "${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044 |
154 |
+ "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530 |
155 |
"${FILESDIR}"/${PN}-1.17.4-arm-musl.patch |
156 |
) |