autoconf-archive - 2017.09.28 - Update to latest version

automake1.15 - 1.15.1 - Update to latest version doxygen - 1.0.13 - Add segfault patch from Archlinux help2man - 1.47.5 - Update to latest version
2017-10-02 10:29:57 -04:00
parent e6d639a600
commit 12e8f3dfd2
8 changed files with 96 additions and 45 deletions
--- a/autoconf-archive/PKGBUILD
+++ b/autoconf-archive/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>

 pkgname=autoconf-archive
-pkgver=2017.03.21
+pkgver=2017.09.28
 pkgrel=1
 pkgdesc="Autoconf Macro Archive"
 arch=('any')
@@ -11,7 +11,7 @@ conflicts=(gnome-common)
 replaces=(gnome-common)
 provides=(gnome-common)
 source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('386ad455f12bdeb3a7d19280441a5ab77355142349200ff11040a8d9d455d765')
+sha256sums=('5c9fb5845b38b28982a3ef12836f76b35f46799ef4a2e46b48e2bd3c6182fa01')

 prepare() {
  cd ${srcdir}/${pkgname}-${pkgver}
--- a/automake1.15/PKGBUILD
+++ b/automake1.15/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 pkgname=automake1.15
-pkgver=1.15
-pkgrel=2
+pkgver=1.15.1
+pkgrel=1
 pkgdesc="A GNU tool for automatically creating Makefiles"
 arch=('any')
 license=('GPL')
@@ -14,21 +14,43 @@ checkdepends=('dejagnu' 'python2')
 install=automake.install
 source=(https://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig}
        automake1.15-documentation.patch
-        automake-1.15-msys2.patch
-        automake-1.15-perl-escape-curly-bracket.patch)
-sha256sums=('9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636'
+        automake-1.15.1-msys2.patch
+        automake-1.15.1-perl-escape-curly-bracket.patch)
+sha256sums=('af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf'
            'SKIP'
            'e5ca855db96fab8106239cec2dcee48ea3f7d2ab5745b116f7d85dfd962b7553'
-            'f182d3f4ddc81e7e95200f364a5ff96a837726de1b3f9facbb964e0ac51f9204'
-            '34ec3ef555b78e8f19cd87d582102f07a705cd3b98919489274f2dabbd6aade6')
+            '0c2560b6c58446f43552e3cd43f2f9d82f1bbe6ff993d358365a77a4b460ae37'
+            '18073dbcf0939419906cdb9714171f5da0ad899af229304e50321d07a19e0d26')
+validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573'   # Stefano Lattarini
+              'F2A38D7EEB2B66405761070D0ADEE10094604D37')  # Mathieu Lirzin
 replace=('automake')

+# Helper macros to help make tasks easier #
+apply_patch_with_msg() {
+  for _fname in "$@"
+  do
+    msg2 "Applying ${_fname}"
+    patch -Nbp1 -i "${srcdir}"/${_fname}
+  done
+}
+
+del_file_exists() {
+  for _fname in "$@"
+  do
+    if [ -f $_fname ] || [ -d $_fname ]; then
+      rm -rf $_fname
+    fi
+  done
+}
+# =========================================== #
+
+
 prepare() {
  cd ${srcdir}/automake-${pkgver}

-  patch -p1 -i ${srcdir}/automake1.15-documentation.patch
-  patch -p1 -i ${srcdir}/automake-1.15-msys2.patch
-  patch -p1 -i ${srcdir}/automake-1.15-perl-escape-curly-bracket.patch
+  apply_patch_with_msg  automake1.15-documentation.patch \
+    automake-1.15.1-msys2.patch \
+    automake-1.15.1-perl-escape-curly-bracket.patch
 }

 build() {
--- a/automake1.15/automake-1.15-perl-escape-curly-bracket.patch
+++ b/automake1.15/automake-1.15-perl-escape-curly-bracket.patch
@@ -1,21 +0,0 @@
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Tue, 7 Jul 2015 10:54:24 +0200
-Subject: [PATCH 2/2] bin/automake: escape '{' in regexp pattern
-
-Resolves: rhbz#1239379
-Upstream report:
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
-
-diff --git a/bin/automake.in b/bin/automake.in
-index eedc8bc..a679d16 100644
--- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker
- sub substitute_ac_subst_variables
- {
-   my ($text) = @_;
-  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-+  $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-   return $text;
- }
- 
--- a/automake1.15/automake-1.15.1-msys2.patch
+++ b/automake1.15/automake-1.15.1-msys2.patch
@@ -40,10 +40,10 @@ diff -Naur automake-1.15-orig/lib/compile automake-1.15/lib/compile
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
-diff -Naur automake-1.15-orig/lib/config.guess automake-1.15/lib/config.guess
--- automake-1.15-orig/lib/config.guess	2014-12-27 20:23:54.000000000 +0300
-+++ automake-1.15/lib/config.guess	2015-01-07 10:47:31.019800000 +0300
-@@ -867,6 +867,9 @@
+diff -aurp automake-1.15.1/lib/config.guess,orig automake-1.15.1/lib/config.guess
+--- automake-1.15.1/lib/config.guess.orig	2017-06-17 22:37:14.000000000 -0400
+++ automake-1.15.1/lib/config.guess	2017-10-02 09:10:36.875102700 -0400
+@@ -892,6 +892,9 @@ EOF
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
--- a/automake1.15/automake-1.15.1-perl-escape-curly-bracket.patch
+++ b/automake1.15/automake-1.15.1-perl-escape-curly-bracket.patch
@@ -0,0 +1,11 @@
+--- automake-1.15.1/bin/automake.in.orig	2017-10-01 16:51:34.179938300 -0400
+++ automake-1.15.1/bin/automake.in	2017-10-01 18:13:47.444365300 -0400
+@@ -3879,7 +3879,7 @@ sub substitute_ac_subst_variables_worker
+ sub substitute_ac_subst_variables
+ {
+   my ($text) = @_;
+-  $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+  $text =~ s/\$[\{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+   return $text;
+ }
+ 
--- a/doxygen/PKGBUILD
+++ b/doxygen/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>

 pkgname=doxygen
-pkgver=1.8.11
-pkgrel=1
+pkgver=1.8.13
+pkgrel=2
 pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
 arch=('i686' 'x86_64')
 url="http://www.doxygen.org/"
@@ -11,8 +11,10 @@ options=('strip' 'staticlibs')
 license=('GPL')
 depends=("gcc-libs" "libsqlite" "libiconv")
 makedepends=("cmake" "gcc" "flex" "python2" "libsqlite-devel" "libiconv-devel")
-source=("https://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz")
-sha256sums=('65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049')
+source=("http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz"
+        "doxygen-segfault.patch")
+sha256sums=('af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b'
+            '220f5446dd2712cb043ced03cb2927596ed25a5e60150499be9213acba5b5c25')

 prepare() {
  cd ${srcdir}
@@ -24,7 +26,7 @@ build() {
    extra_config=Debug
  fi

-  mkdir build-${CHOST} && cd build-${CHOST}
+  mkdir -p build-${CHOST} && cd build-${CHOST}
  cmake \
    -DCMAKE_INSTALL_PREFIX=/usr \
    -DCMAKE_BUILD_TYPE=${extra_config} \
--- a/doxygen/doxygen-segfault.patch
+++ b/doxygen/doxygen-segfault.patch
@@ -0,0 +1,12 @@
+diff -Naur doxygen-1.8.13.orig/src/xmlgen.cpp doxygen-1.8.13/src/xmlgen.cpp
+--- doxygen-1.8.13.orig/src/xmlgen.cpp	2017-03-07 21:59:57.687388659 +0100
+++ doxygen-1.8.13/src/xmlgen.cpp	2017-03-07 22:00:43.043413181 +0100
+@@ -620,7 +620,7 @@
+     if (md->isInline()) t << "yes"; else t << "no";
+     t << "\"";
+ 
+-    if (al->refQualifier!=RefQualifierNone)
+    if (al!=0 && al->refQualifier!=RefQualifierNone)
+     {
+       t << " refqual=\"";
+       if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
--- a/help2man/PKGBUILD
+++ b/help2man/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>

 pkgname=help2man
-pkgver=1.47.3
+pkgver=1.47.5
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64')
@@ -12,13 +12,38 @@ depends=('perl-Locale-Gettext' 'libintl')
 install=help2man.install
 source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
        1.40.4-cygwin-nls.patch)
-sha256sums=('c232af6475ef65bee02770862a362f4c4c2e6c9967d39e987eb94cadcfc13856'
+noextrat=("${pkgname}-${pkgver}.tar.xz")
+sha256sums=('7ca60b2519fdbe97f463fe2df66a6188d18b514bfd44127d985f0234ee2461b1'
            'SKIP'
            '6cf5541d6233b6c0ce0248ecb6376682646ee56f795b19906f0acc63d83de482')
+validpgpkeys=("F0DC8E00B28C5995" "87EA44D150D89615E39A3FEEF0DC8E00B28C5995")
+
+# Helper macros to help make tasks easier #
+apply_patch_with_msg_p2() {
+  for _fname in "$@"
+  do
+    msg2 "Applying ${_fname}"
+    patch -Nbp2 -i "${srcdir}"/${_fname}
+  done
+}
+
+del_file_exists() {
+  for _fname in "$@"
+  do
+    if [ -f $_fname ] || [ -d $_fname ]; then
+      rm -rf $_fname
+    fi
+  done
+}
+# =========================================== #

 prepare() {
+  cd $srcdir
+  tar -xf ${pkgname}-${pkgver}.tar.xz || true
  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p2 -i ${srcdir}/1.40.4-cygwin-nls.patch
+  del_file_exists Changelog
+  ln -s debian/changelog ChangeLog
+  apply_patch_with_msg_p2 1.40.4-cygwin-nls.patch
  autoreconf -ivf
 }