Date: Wednesday, February 21, 2018 @ 20:51:43 Author: heftig Revision: 317355
0.44.1-1 Modified: meson/trunk/PKGBUILD Deleted: meson/trunk/0002-d-Detect-recent-DMD-compilers.patch ------------------------------------------+ 0002-d-Detect-recent-DMD-compilers.patch | 33 ----------------------------- PKGBUILD | 11 ++------- 2 files changed, 3 insertions(+), 41 deletions(-) Deleted: 0002-d-Detect-recent-DMD-compilers.patch =================================================================== --- 0002-d-Detect-recent-DMD-compilers.patch 2018-02-21 20:29:49 UTC (rev 317354) +++ 0002-d-Detect-recent-DMD-compilers.patch 2018-02-21 20:51:43 UTC (rev 317355) @@ -1,33 +0,0 @@ -From 67d5488753911b06b80afd57066e36b4eddec892 Mon Sep 17 00:00:00 2001 -Message-Id: <67d5488753911b06b80afd57066e36b4eddec892.1517146929.git.jan.steff...@gmail.com> -In-Reply-To: <89d4decc9cdda01590c2a734c0f58924bcf30777.1517146929.git.jan.steff...@gmail.com> -References: <89d4decc9cdda01590c2a734c0f58924bcf30777.1517146929.git.jan.steff...@gmail.com> -From: Matthias Klumpp <[email protected]> -Date: Sun, 7 Jan 2018 17:57:43 +0100 -Subject: [PATCH 2/2] d: Detect recent DMD compilers - -They now are published by the D Language Foundation, and not Digital -Mars. Therefore, their signature has changed slightly. -(We can not check for 'DMD', because that string appears in every -compiler version output to denote the frontend version used by the -compiler). ---- - mesonbuild/environment.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 0cb1450e..7fa4732a 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -725,7 +725,7 @@ class Environment: - return compilers.LLVMDCompiler(exelist, version, is_cross) - elif 'gdc' in out: - return compilers.GnuDCompiler(exelist, version, is_cross) -- elif 'Digital Mars' in out: -+ elif 'The D Language Foundation' in out or 'Digital Mars' in out: - return compilers.DmdDCompiler(exelist, version, is_cross) - raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"') - --- -2.16.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-21 20:29:49 UTC (rev 317354) +++ PKGBUILD 2018-02-21 20:51:43 UTC (rev 317355) @@ -3,8 +3,8 @@ # Contributor: Anatol Pomozov <anatol dot pomozov at gmail> pkgname=meson -pkgver=0.44.0 -pkgrel=2 +pkgver=0.44.1 +pkgrel=1 pkgdesc='High productivity build system' url='http://mesonbuild.com/' arch=('any') @@ -18,12 +18,10 @@ 'qt5-tools' 'libwmf' 'dmd' 'valgrind') source=(https://github.com/mesonbuild/meson/releases/download/${pkgver}/meson-${pkgver}.tar.gz{,.asc} 0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch - 0002-d-Detect-recent-DMD-compilers.patch arch-meson) -sha512sums=('9aefa52d92d7750528e9a9236f19131c8e58bfc21212595c311f4e2787ad40bb53d6085f52283cad13923ddf12da1a59067d48424c72ace47fc127978d1af2ff' +sha512sums=('1ecccccfa24ec2c5c144f8c13fd95d250b59cb22b79676a2a1a6f9ed30a7b08adb71d5882b2d4421d07689ad6dd6d6aef139ac33f628e55a1d428cbc40b4d93e' 'SKIP' '04a0f113ba5f1ae57591fad3f5ecf812ef88b8809b4ffe063e82f6548e728a1a7bd51c171a948873884c2631fc10a9cd141f56de22cd7cf766cdb74996840eec' - 'b38af817966e60db19c1efcc5e8e4f1b822925bf823b0a68c33eb0bfd0aa4ccff1439e352d8df032d0a189cd0ff37fb7dcefe0ed7a272e45f963f7e3d0b63f0f' 'e901f87f3ee1baa7b9aedb79bd5c9e50898a5695ac938f7f8420d8e81f526a09f07ceedadb65975437efa5a68fcf581110a040f579f2530437d1e6eb5addea76') validpgpkeys=('95181F4EED14FDF4E41B518D3BF4693BFEEB9428') # Jussi Pakkanen <[email protected]> @@ -32,9 +30,6 @@ # Skip gnustep tests patch -Np1 -i ../0001-tests-skip-objc-nsstring-test-if-gnustep-is-not-inst.patch - - # Fix for recent DMD - patch -Np1 -i ../0002-d-Detect-recent-DMD-compilers.patch } build() {
