Merge branch 'master' of https://github.com/Alexpux/MSYS2-packages

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

.gitignore

@@ -5,5 +5,8 @@
 *.zip
 *.rar
 *.sig
+*.asc
+*.log
+*.log.[0-9]*
 */src/
-*/pkg/
+*/pkg/

autoconf-archive/PKGBUILD

@@ -0,0 +1,32 @@
+# Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>
+
+pkgname=autoconf-archive
+pkgver=2016.03.20
+pkgrel=1
+pkgdesc="Autoconf Macro Archive"
+arch=('any')
+license=('GPL3')
+url="https://www.gnu.org/software/autoconf-archive"
+conflicts=(gnome-common)
+replaces=(gnome-common)
+provides=(gnome-common)
+source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('88fb2efff640eddd28a52ae550ff5561bca3bd2bba09e1d7b0580e719875e437')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/${pkgname}-${pkgver}/COPYING
+  install -Dm644 COPYING.EXCEPTION $pkgdir/usr/share/licenses/${pkgname}-${pkgver}/COPYING.EXCEPTION
+}

bash-completion/PKGBUILD

@@ -1,24 +1,21 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=bash-completion
-pkgver=2.1
-pkgrel=6
+pkgver=2.3
+pkgrel=1
 pkgdesc="Programmable completion for the bash shell"
 arch=('any')
 url="https://bash-completion.alioth.debian.org/"
 license=('GPL')
 groups=('base')
 depends=('bash')
 options=('!emptydirs' '!makeflags')
-source=(https://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2
-        words_bad_array_subscript.patch
+source=(https://github.com/scop/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz
         quote_readline_by_ref_fixes.patch)
-sha256sums=('2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f'
-            '1c48279c796fb82a4e1ec9d52548418e455e96f079a123118dd3d6dcd9ff2964'
+sha256sums=('b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9'
             'f1b95da22e56909681ac05e08bfcc497cecfdad1060902ca415d54d2d0b265a3')
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/words_bad_array_subscript.patch
   patch -p1 -i ${srcdir}/quote_readline_by_ref_fixes.patch
 
   autoreconf --install
@@ -34,10 +31,5 @@ package() {
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
-  mkdir -p ${pkgdir}/usr/lib
-  mv -f ${pkgdir}/usr/share/pkgconfig ${pkgdir}/usr/lib/
-  # bash-completion is sourced in /etc/bash.bashrc so that non-bash shell don't source it
-  #  rm "${pkgdir}/etc/profile.d/bash_completion.sh"
-
-  rm "${pkgdir}"/usr/share/bash-completion/completions/{cal,makepkg,hexdump,look,renice}
+  rm "${pkgdir}"/usr/share/bash-completion/completions/makepkg
 }

bash-completion/words_bad_array_subscript.patch

@@ -7,8 +7,8 @@ pkgdesc="An arbitrary precision calculator language"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/bc"
 license=('GPL')
-depends=('gcc' 'libreadline' 'ncurses')
-builddepends=('libreadline-devel' 'ncurses-devel')
+depends=('libreadline' 'ncurses')
+builddepends=('gcc' 'libreadline-devel' 'ncurses-devel')
 source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
         0001-Fix-readline-prototype.patch)
 sha256sums=('4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33'

bc/PKGBUILD

@@ -1,10 +1,11 @@
---- bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py.orig	2014-12-14 01:00:15.240200000 +0300
-+++ bzr-2.6.0/bzrlib/transport/http/_urllib2_wrappers.py	2014-12-14 01:02:20.621800000 +0300
-@@ -79,6 +79,7 @@
+diff -aurN 0001/bzrlib/transport/http/_urllib2_wrappers.py 0002/bzrlib/transport/http/_urllib2_wrappers.py
+--- 0001/bzrlib/transport/http/_urllib2_wrappers.py	2016-04-15 17:08:16.998146000 -0300
++++ 0002/bzrlib/transport/http/_urllib2_wrappers.py	2016-04-15 17:12:58.067000000 -0300
+@@ -88,6 +88,7 @@
  # Note for packagers: if there is no package providing certs for your platform,
  # the curl project produces http://curl.haxx.se/ca/cacert.pem weekly.
  _ssl_ca_certs_known_locations = [
 +    u'/usr/ssl/certs/ca-bundle.crt', # MSYS2
-     u'/etc/ssl/certs/ca-certificates.crt', # Ubuntu/debian/gentoo
-     u'/etc/pki/tls/certs/ca-bundle.crt', # Fedora/CentOS/RH
-     u'/etc/ssl/ca-bundle.pem', # OpenSuse
+     u'/etc/ssl/certs/ca-certificates.crt',  # Ubuntu/debian/gentoo
+     u'/etc/pki/tls/certs/ca-bundle.crt',  # Fedora/CentOS/RH
+     u'/etc/ssl/ca-bundle.pem',  # OpenSuse

bzr/0002-add-msys2-certs-location.patch

@@ -1,8 +1,8 @@
 # Maintainer: Martell Malone <martellmalone@gmail.com>
 
 pkgname=bzr
-pkgver=2.6.0
-pkgrel=3
+pkgver=2.7.0
+pkgrel=1
 pkgdesc="Bazaar is a version control system that helps you track project history over time and to collaborate easily with others."
 arch=('i686' 'x86_64')
 url="http://bazaar.canonical.com/en/"
@@ -13,10 +13,10 @@ depends=('python2')
 source=("https://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}
         0001-setup.py-man-install.patch
         0002-add-msys2-certs-location.patch)
-sha256sums=('0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0'
+sha256sums=('0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3'
             'SKIP'
             'f8b22c317e0b47b4cae024533b00ee3c682275963041b3cc7d8067ee6ca0cda3'
-            'c4e5ea569825e8fa4acd59cce372b95f616f16656e9826b830f071133f7a9a8a')
+            '9fa03bd856a290b3d90eb83e6f5238aed3da475aec263e83a2da54197aa09f53')
 
 prepare(){
   cd "${srcdir}/${pkgname}-${pkgver}"

bzr/PKGBUILD

@@ -0,0 +1,36 @@
+diff -urN ccache-3.2.4.orig/ccache.h ccache-3.2.4/ccache.h
+--- ccache-3.2.4.orig/ccache.h	2015-10-08 21:14:23.000000000 +0200
++++ ccache-3.2.4/ccache.h	2016-04-17 19:42:45.063373100 +0200
+@@ -248,8 +248,9 @@
+ #endif
+ 
+ /* mkstemp() on some versions of cygwin don't handle binary files, so
+-   override */
+-#ifdef __CYGWIN__
++   override,
++   however MSYS2 is fine */
++#if defined(__CYGWIN__) && !defined(__MSYS__)
+ #undef HAVE_MKSTEMP
+ #endif
+ 
+diff -urN ccache-3.2.4.orig/lockfile.c ccache-3.2.4/lockfile.c
+--- ccache-3.2.4.orig/lockfile.c	2015-10-08 21:14:23.000000000 +0200
++++ ccache-3.2.4/lockfile.c	2016-04-17 19:38:29.151513300 +0200
+@@ -36,7 +36,7 @@
+ 	char *my_content = NULL, *content = NULL, *initial_content = NULL;
+ 	const char *hostname = get_hostname();
+ 	bool acquired = false;
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__MSYS__)
+ 	const size_t bufsize = 1024;
+ 	int fd, len;
+ #else
+@@ -48,7 +48,7 @@
+ 		free(my_content);
+ 		my_content = format("%s:%d:%d", hostname, (int)getpid(), (int)time(NULL));
+ 
+-#ifdef _WIN32
++#if defined(_WIN32) || defined(__MSYS__)
+ 		fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL|O_BINARY, 0666);
+ 		if (fd == -1) {
+ 			saved_errno = errno;

ccache/MSYS2-dont-use-symlinks.patch

@@ -0,0 +1,48 @@
+# Maintainer: Mateusz Mikuła <mati865@gmail.com>
+
+pkgname=ccache
+pkgver=3.2.4
+pkgrel=1
+pkgdesc="A compiler cache (mingw-w64)"
+arch=('i686' 'x86_64')
+url="https://ccache.samba.org/"
+license=("GPL3")
+replaces=("${pkgname}-git")
+makedepends=("gcc" "pkg-config")
+depends=("gcc-libs" "zlib")
+options=('staticlibs' 'strip')
+source=(https://samba.org/ftp/ccache/${pkgname}-${pkgver}.tar.bz2{,.asc}
+        "MSYS2-dont-use-symlinks.patch")
+sha256sums=('ffeb967edb549e67da0bd5f44f729a2022de9fdde65dfd80d2a7204d7f75332e'
+            'SKIP'
+            'a0d2ea2ef1c9e59d4e5fdd659d291a4c7f4afc48ad50b1bc00f77349337d3167')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  #./autogen.sh
+
+  patch -p1 -i ${srcdir}/MSYS2-dont-use-symlinks.patch
+}
+
+build() {
+  [[ -d build-${CHOST} ]] && rm -rf build-${CHOST}
+  mkdir -p build-${CHOST}  && cd build-${CHOST}
+  ../${pkgname}-${pkgver}/configure \
+      --prefix=/usr \
+      --build=${CHOST} \
+      --host=${CHOST} \
+      --target=${CHOST}
+  make
+}
+
+package() {
+  cd "${srcdir}/build-${CHOST}"
+  make DESTDIR="${pkgdir}" install
+
+  install -d ${pkgdir}/usr/lib/ccache/bin
+  cd ${pkgdir}/usr/lib/ccache/bin
+  scripts=(c++ cc cpp gcc g++ ${CARCH}-pc-msys-g++ ${CARCH}-pc-msys-c++ ${CARCH}-pc-msys-gcc)
+  for fn in ${scripts[*]}; do
+    echo -e '#!/bin/bash\n\nccache /usr/bin/'$fn' "$@"' > $fn
+  done
+}

ccache/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgbase=curl
 pkgname=('curl' 'libcurl' 'libcurl-devel')
-pkgver=7.47.1
-pkgrel=2
+pkgver=7.48.0
+pkgrel=1
 pkgdesc="Multi-protocol file transfer utility"
 arch=('i686' 'x86_64')
 url="https://curl.haxx.se"
@@ -13,7 +13,7 @@ makedepends=('heimdal-devel' 'libmetalink-devel' 'libcrypt-devel' 'libidn-devel'
 options=('!libtool' 'strip' '!debug')
 source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2"{,.asc}
         curl-7.32.0-msys2.patch)
-sha256sums=('ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f'
+sha256sums=('864e7819210b586d42c674a1fdd577ce75a78b3dda64c63565abe5aefd72c753'
             'SKIP'
             '703963690bfa95b92e8281b7d9070a12c18bada044c3a7c9995fe9ae5adc5a8f')
 validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg