diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-05 07:17:19 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-05 13:56:22 +0000 |
| commit | 98f5c96a8067b7272f95aab05657a4cd3e375105 (patch) | |
| tree | e6e560eeaa983298d3795ef8cc91ef7ba87baa58 /main/xorg-server | |
| parent | ddf80a96721b25d8d15c33e683fd4bb5f42db0ca (diff) | |
| download | aports-98f5c96a8067b7272f95aab05657a4cd3e375105.tar.bz2 aports-98f5c96a8067b7272f95aab05657a4cd3e375105.tar.xz | |
main/xorg-server: gcc-5 build fix
Diffstat (limited to 'main/xorg-server')
| -rw-r--r-- | main/xorg-server/APKBUILD | 6 | ||||
| -rw-r--r-- | main/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch | 53 |
2 files changed, 58 insertions, 1 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index a0688e1d8d..df1f531160 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server pkgver=1.17.1 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" arch="all" @@ -80,6 +80,7 @@ source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver autoconfig-nvidia.patch autoconfig-sis.patch fix-musl-arm.patch + xorg-server-1.17.1-gcc5_fixes-1.patch 20-modules.conf " @@ -187,14 +188,17 @@ md5sums="5986510d59e394a50126a8e2833e79d3 xorg-server-1.17.1.tar.bz2 ea4852dedbb89550f6bc113ca66348a2 autoconfig-nvidia.patch 825ca99ea9348c66abdf2c479e0af485 autoconfig-sis.patch 043cbe8fc14729ae1e776788ae7593bf fix-musl-arm.patch +3c134fec704645c80eb4e145ee417d83 xorg-server-1.17.1-gcc5_fixes-1.patch 77f2e12e577e9d8b67350b960958b7c4 20-modules.conf" sha256sums="2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab xorg-server-1.17.1.tar.bz2 66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162 autoconfig-nvidia.patch 7d5d36dd152eb0fab277a4aeba0a08ad77049e591a0dea92f565a4b62f0d0a50 autoconfig-sis.patch b210a93b4d6128c0963ade3458925ff293e1c68ac20a15964357fd401f7161e0 fix-musl-arm.patch +c6d1479afdf92e3d1ec26b9e25ea9c9a2b105b5c08ca0904a38ec521d016b9b9 xorg-server-1.17.1-gcc5_fixes-1.patch 65343949384a88dc75142c9309a24c921baa60b43e0fc245052d220e53a4babb 20-modules.conf" sha512sums="195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f xorg-server-1.17.1.tar.bz2 4dcaa60fbfc61636e7220a24a72bba19984a6dc752061cb40b1bd566c0e614d08927b6c223ffaaaa05636765fddacdc3113fde55d25fd09cd0c786ff44f51447 autoconfig-nvidia.patch 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch +cb9be2a57789561134fb429db902328beef517a084da6643e2af803fd7bea1dad9d3c9af4c129ee0363491da068afbea359e015cf35b4f4ceaa9c7b0e19362f3 xorg-server-1.17.1-gcc5_fixes-1.patch 1697e8be032ca777b0ac9aab23cc45baec03cccdf04ec35374bb7dd4d5430fdc7f6786689f3edd8cd2289535966329e9636f7f94a8926d73464d398fa66da61a 20-modules.conf" diff --git a/main/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch b/main/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch new file mode 100644 index 0000000000..6f02897be3 --- /dev/null +++ b/main/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch @@ -0,0 +1,53 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2015-04-18 +Initial Package Version: 1.17.1 +Upstream Status: Applied +Origin: Egbert Eich +Description: fixes compilation with gcc-5 + +From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 +From: Egbert Eich <eich@freedesktop.org> +Date: Tue, 3 Mar 2015 16:27:05 +0100 +Subject: symbols: Fix sdksyms.sh to cope with gcc5 + +Gcc5 adds additional lines stating line numbers before and +after __attribute__() which need to be skipped. + +Signed-off-by: Egbert Eich <eich@freedesktop.org> +Tested-by: Daniel Stone <daniels@collabora.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh +index 2305073..05ac410 100755 +--- a/hw/xfree86/sdksyms.sh ++++ b/hw/xfree86/sdksyms.sh +@@ -350,13 +350,25 @@ BEGIN { + if (sdk) { + n = 3; + ++ # skip line numbers GCC 5 adds before __attribute__ ++ while ($n == "" || $0 ~ /^# [0-9]+ "/) { ++ getline; ++ n = 1; ++ } ++ + # skip attribute, if any + while ($n ~ /^(__attribute__|__global)/ || + # skip modifiers, if any + $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || + # skip pointer +- $n ~ /^[a-zA-Z0-9_]*\*$/) ++ $n ~ /^[a-zA-Z0-9_]*\*$/) { + n++; ++ # skip line numbers GCC 5 adds after __attribute__ ++ while ($n == "" || $0 ~ /^# [0-9]+ "/) { ++ getline; ++ n = 1; ++ } ++ } + + # type specifier may not be set, as in + # extern _X_EXPORT unsigned name(...) +-- +cgit v0.10.2 + |