diff options
| author |   layman <layman@localhost> | 2016-01-01 21:32:35 +0000 |
|---|---|---|
| committer | layman <layman@localhost> | 2016-01-01 21:48:08 +0000 |
| commit | 9255699342bdad1b1474f450d77706bcaa4813d9 (patch) | |
| tree | d16f4b28c3c6cf49f75136e6a8d66cdcbb84f5bc /dev-libs | |
| parent | Tell weston-1.9.0-r99 ebuild to apply weston-1.9.0-make-error-portable.patch (diff) | |
| download | ennui-9255699342bdad1b1474f450d77706bcaa4813d9.tar.gz ennui-9255699342bdad1b1474f450d77706bcaa4813d9.tar.bz2 ennui-9255699342bdad1b1474f450d77706bcaa4813d9.zip | |
Update weston-1.9.0-make-error-portable.patch
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/weston/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/weston/files/weston-1.9.0-make-error-portable.patch | 40 |
2 files changed, 19 insertions, 23 deletions
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index 1bb95be..7bf67ee 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -1,5 +1,5 @@ AUX README.gentoo 383 SHA256 ded85eb05b14162aceb7ba67e49be207bbe15591fa519743478618def88cee85 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786 WHIRLPOOL 8bc2485d91a399eb9d283ec3363546852be9a1a3e69214b3c7cc9a6427c4e10355dc8732de0d8b688f9df8a4bc03df25c3ce7b33c19773b7a47616c93f82bd81 -AUX weston-1.9.0-make-error-portable.patch 1599 SHA256 c9d556d8d30417662a835bc81a1dcd2a62a9334c1cf7956d24ceac0f9f5c5df9 SHA512 6aaf8f99461d8467d82d7ab9cd92d99e6320b2982310f1f06334b4093efbc070306958f863a0a6f670f420f23148c8c4e4739575e5fd12ee8dcbc3beca76aab3 WHIRLPOOL f10d8c7899e1eb1bec17cb61b3d077f4fec017d37dcc55565b7840d6da5828ff8a901f807ccb1de8626d390e9bd74cef7591080d59e276044c4d78936f9b6270 +AUX weston-1.9.0-make-error-portable.patch 1846 SHA256 7260f4c22e3af7b55bb314e68d99c5bed9c20c5f28c9528a8d76816a3bf379f6 SHA512 9116bdf0f93886cfdef97597a8260f7e724a7695c379ddcb81ec1f3c10f8570394a10de830ed2295080b153518e6d4c8d1ddc4ed60d470b2115336155c9e88ff WHIRLPOOL 94791922d22246868ed64b5f5b494c42fb38d441ab14020313d3072a3454140aea08e30fd0cc2a6d12b928d21ab81c10ac4afdcf39c94b00f5f98a130c6090b8 DIST weston-1.9.0.tar.xz 1238240 SHA256 9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf SHA512 9bcbb5971b8a55d9e10aacf0aae868ff03750a98daee5233dcbff5698ed84e41c4b147fa1fdb1e2be916e3b1e13f259e0eec62354517d6e2a7e1d301a8522f66 WHIRLPOOL 3329a1783da2c7509fb93a64343b6b70f6d45de614a15e17d3a2a2439b440298e25c3dd4504042de38e501877cf47d909849fd6263b081c6ccc0bf8e1362287b EBUILD weston-1.9.0-r99.ebuild 3212 SHA256 5b66887d89190e6574ff1b04ef08342799fcb3dc14663ff8f0514535630d8f70 SHA512 131f4da73a4b1dfaa559a52d549883c734eda56228bf89e0fd2b168eaa1dcd118643cf74cf695062f2042dc1aa48d9627537dbb692c6883649a1a61684e15d98 WHIRLPOOL 19a3052521ed31762cc1ad8e4e9855115a079a603dd68d9cfd1d8d592a3e1c0d09ebb0606bb36e26b3a042c22f1a411ade25d1a8b1d8a9d8879fe1cf18f770c1 MISC metadata.xml 1257 SHA256 30a5608ab189260222d32fa240fd3791b3e17a471e29e7a2e4a04466b21dfb29 SHA512 b95bd15b66265e1cbe25eee8c70a405dd5df9cc789d60968c9cae3ead3dc35a1a542a432ccf7e8be8c37ac23aa677a5383704e0822c77151f0fcaa101b3a57b3 WHIRLPOOL e53b1747e2e014af1e179c8fa6b8f77aa1dd2db43aec27e433561faa5c93700e57247c4bc06c74baa75f454672410dbf3b0e7d0375b9e7c620d6990ed5e42055 diff --git a/dev-libs/weston/files/weston-1.9.0-make-error-portable.patch b/dev-libs/weston/files/weston-1.9.0-make-error-portable.patch index b1d2932..508ddbd 100644 --- a/dev-libs/weston/files/weston-1.9.0-make-error-portable.patch +++ b/dev-libs/weston/files/weston-1.9.0-make-error-portable.patch @@ -1,11 +1,10 @@ # Eliminate calls to error()/error.h, which are GNU extensions, not POSIX in order to compile with musl # See https://patchwork.freedesktop.org/patch/50793/ -diff --git a/configure.ac b/configure.ac -index 263fc22..f52cd62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], +diff -Naur weston-1.9.0.orig/configure.ac weston-1.9.0/configure.ac +--- weston-1.9.0.orig/configure.ac 2015-09-22 01:11:26.000000000 +0000 ++++ weston-1.9.0/configure.ac 2016-01-01 21:20:54.097472570 +0000 +@@ -57,6 +57,8 @@ [[#include <time.h>]]) AC_CHECK_HEADERS([execinfo.h]) @@ -13,17 +12,15 @@ index 263fc22..f52cd62 100644 + AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2" -diff --git a/src/weston-error.h b/src/weston-error.h -new file mode 100644 -index 0000000..2089d02 ---- /dev/null -+++ b/src/weston-error.h + COMPOSITOR_MODULES="wayland-server >= 1.9.0 pixman-1 >= 0.25.2" +diff -Naur weston-1.9.0.orig/src/weston-error.h weston-1.9.0/src/weston-error.h +--- weston-1.9.0.orig/src/weston-error.h 1970-01-01 00:00:00.000000000 +0000 ++++ weston-1.9.0/src/weston-error.h 2016-01-01 21:20:54.097472570 +0000 @@ -0,0 +1,24 @@ -/* TODO - If S is zero error() will not exit so this macro should call warnx() in those cases - or just add a plain replacement function for error() to weston-launch.c */ - ++/* TODO ++ If S is zero error() will not exit so this macro should call warnx() in those cases ++ or just add a plain replacement function for error() to weston-launch.c */ ++ +#ifndef WESTON_ERROR_H +#define WESTON_ERROR_H + @@ -34,7 +31,7 @@ index 0000000..2089d02 +#include <string.h> +#define weston_error(s, e, f, ...) do { \ + if (e) \ -+ errx((s), (f) ": %s", ##__VA_ARGS__, strerror(e)); \ ++ errx((s), (f), ##__VA_ARGS__, strerror(e)); \ + else \ + errx((s), (f), ##__VA_ARGS__); \ +} while(0) @@ -44,11 +41,10 @@ index 0000000..2089d02 + +#endif + -diff --git a/src/weston-launch.c b/src/weston-launch.c -index 10c66de..3e6d30a 100644 ---- a/src/weston-launch.c -+++ b/src/weston-launch.c -@@ -30,7 +30,6 @@ +diff -Naur weston-1.9.0.orig/src/weston-launch.c weston-1.9.0/src/weston-launch.c +--- weston-1.9.0.orig/src/weston-launch.c 2015-08-10 22:28:46.000000000 +0000 ++++ weston-1.9.0/src/weston-launch.c 2016-01-01 21:20:54.098472589 +0000 +@@ -33,7 +33,6 @@ #include <poll.h> #include <errno.h> @@ -56,7 +52,7 @@ index 10c66de..3e6d30a 100644 #include <getopt.h> #include <sys/types.h> -@@ -56,6 +55,7 @@ +@@ -59,6 +58,7 @@ #endif #include "weston-launch.h" |