7.2.1+20171224

2 files changed, 16 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2837655d4d0..7f4ab2c4ad93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jan 12 05:38:39 UTC 2018
+# Fri Jan 12 09:50:10 UTC 2018
 pkgbase = mingw-w64-gcc
 	pkgdesc = Cross GCC for the MinGW-w64 cross-compiler
-	pkgver = 7.2.0
+	pkgver = 7.2.1+20171224
 	pkgrel = 1
 	url = http://gcc.gnu.org
 	arch = x86_64
@@ -12,8 +12,7 @@ pkgbase = mingw-w64-gcc
 	license = LGPL
 	license = FDL
 	license = custom
-	makedepends = gcc-ada
-	makedepends = git
+	makedepends = gcc-ada=7.2.1+20171224
 	depends = zlib
 	depends = libmpc
 	depends = mingw-w64-crt
@@ -25,12 +24,12 @@ pkgbase = mingw-w64-gcc
 	options = staticlibs
 	options = !emptydirs
 	options = !buildflags
-	source = git://gcc.gnu.org/git/gcc.git#commit=1bd23ca8c30f4827c4bea23deedf7ca33a86ffb5
+	source = https://sources.archlinux.org/other/gcc/gcc-7.2.1-20171224.tar.xz
+	source = https://sources.archlinux.org/other/gcc/gcc-7.2.1-20171224.tar.xz.sig
 	source = http://isl.gforge.inria.fr/isl-0.18.tar.bz2
-	source = Revert-eeb6872bf.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/Revert-eeb6872bf.patch?h=packages/gcc
+	sha256sums = 394c416a35dc608e5c9ea5ca902c5b08b51fcbc6b3b39ece05b8eea67033b4a8
 	sha256sums = SKIP
 	sha256sums = 6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b
-	sha256sums = c537bce5e9aa2b6fcdec3c1e7f94017633cb5ff5af59beda699262be3c06cca5
 
 pkgname = mingw-w64-gcc
 
diff --git a/PKGBUILD b/PKGBUILD
index e4255b7fbe6d..8a9e2c58c9b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,7 @@
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-gcc
-pkgver=7.2.0
-_commit=1bd23ca8c30f4827c4bea23deedf7ca33a86ffb5
+pkgver=7.2.1+20171224
 _islver=0.18
 pkgrel=1
 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
@@ -17,26 +16,24 @@ groups=('mingw-w64-toolchain' 'mingw-w64')
 depends=('zlib' 'libmpc'
 	 'mingw-w64-crt' 'mingw-w64-binutils' 'mingw-w64-winpthreads'
 	 'mingw-w64-headers')
-makedepends=("gcc-ada" 'git')
+makedepends=("gcc-ada=${pkgver}")
 #checkdepends=('dejagnu') # Windows executables could run on Arch through bin_mft and Wine
 optdepends=()
 provides=('mingw-w64-gcc-base')
 replaces=()
 backup=()
 options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
-source=("git://gcc.gnu.org/git/gcc.git#commit=${_commit}"
-	"http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2"
-	"Revert-eeb6872bf.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/Revert-eeb6872bf.patch?h=packages/gcc")
-sha256sums=('SKIP'
-            '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
-            'c537bce5e9aa2b6fcdec3c1e7f94017633cb5ff5af59beda699262be3c06cca5')
+source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig}
+	"http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2")
+validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9) # bpiotrowski@archlinux.org
+sha256sums=('394c416a35dc608e5c9ea5ca902c5b08b51fcbc6b3b39ece05b8eea67033b4a8'
+            'SKIP'
+            '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b')
 
 prepare() {
   cd "$srcdir"/gcc
   # link isl for in-tree builds
-  ln -s ../isl-${_islver} isl
-
-  git apply ../Revert-eeb6872bf.patch
+  ln -sf ../isl-${_islver} isl
 }
 
 build() {
@@ -61,7 +58,7 @@ package() {
     make DESTDIR="$pkgdir" install
     ${_target}-strip "$pkgdir"/usr/${_target}/lib/*.dll
     strip "$pkgdir"/usr/bin/${_target}-*
-    strip "$pkgdir"/usr/lib/gcc/${_target}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*}
+    strip "$pkgdir"/usr/lib/gcc/${_target}/${pkgver:0:5}/{cc1*,collect2,gnat1,f951,lto*}
     ln -s ${_target}-gcc "$pkgdir"/usr/bin/${_target}-cc
     # mv dlls
     mkdir -p "$pkgdir"/usr/${_target}/bin/