[arch-commits] Commit in libidn/trunk (PKGBUILD gcc7_buildfix.diff)
Date: Tuesday, April 3, 2018 @ 07:12:28
Author: ronald
Revision: 320881
upgpkg: libidn 1.34-1
update to 1.34
Modified:
libidn/trunk/PKGBUILD
Deleted:
libidn/trunk/gcc7_buildfix.diff
+
PKGBUILD | 25 +--
gcc7_buildfix.diff | 327 ---
2 files changed, 11 insertions(+), 341 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-03 06:34:13 UTC (rev 320880)
+++ PKGBUILD2018-04-03 07:12:28 UTC (rev 320881)
@@ -4,26 +4,22 @@
# Contributor: Eric Johnson
pkgname=libidn
-pkgver=1.33
-pkgrel=2
+pkgver=1.34
+pkgrel=1
pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
url="https://www.gnu.org/software/libidn/";
arch=('x86_64')
license=('GPL3' 'LGPL')
depends=('glibc')
-source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
-gcc7_buildfix.diff)
-sha256sums=('44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19'
-'SKIP'
-'1b539ba3916fe8982d596f4de9a65138ae9a35a042e1673328a092a478b7fb33')
-validpgpkeys=('9AA9BDB11BB1B99A21285A330664A76954265E8C') # "Simon Josefsson
"
+source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
+# signed by either of the two keys
+validpgpkeys=('9AA9BDB11BB1B99A21285A330664A76954265E8C'
+ '1CB27DBC98614B2D5841646D08302DB6A2670428')
+# '9AA9BDB11BB1B99A21285A330664A76954265E8C' => "Simon Josefsson
"
+# '1CB27DBC98614B2D5841646D08302DB6A2670428' => "Tim Rühsen
"
+sha256sums=('3719e2975f2fb28605df3479c380af2cf4ab4e919e1506527e4c7670afff6e3c'
+'SKIP')
-prepare() {
- cd ${pkgname}-${pkgver}
- # fix build with gcc7
- patch -Np1 -i ../gcc7_buildfix.diff
-}
-
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr
@@ -34,6 +30,7 @@
cd ${pkgname}-${pkgver}
make check
}
+
package() {
cd ${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
Deleted: gcc7_buildfix.diff
===
--- gcc7_buildfix.diff 2018-04-03 06:34:13 UTC (rev 320880)
+++ gcc7_buildfix.diff 2018-04-03 07:12:28 UTC (rev 320881)
@@ -1,327 +0,0 @@
-From: Tim Rühsen
-Date: Wed, 1 Feb 2017 09:44:36 + (+0100)
-Subject: Update intprops.h for gcc-7 compatibility
-X-Git-Url:
http://git.savannah.gnu.org/gitweb/?p=libidn.git;a=commitdiff_plain;h=230930b3bc3e431b819eb45420cb42475d83ca93
-
-Update intprops.h for gcc-7 compatibility
-
-diff --git a/gl/intprops.h b/gl/intprops.h
-index e1fce5c..eb06b69 100644
a/gl/intprops.h
-+++ b/gl/intprops.h
-@@ -1,18 +1,18 @@
- /* intprops.h -- properties of integer types
-
-- Copyright (C) 2001-2016 Free Software Foundation, Inc.
-+ Copyright (C) 2001-2017 Free Software Foundation, Inc.
-
-This program is free software: you can redistribute it and/or modify it
-- under the terms of the GNU General Public License as published
-- by the Free Software Foundation; either version 3 of the License, or
-+ under the terms of the GNU Lesser General Public License as published
-+ by the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
-+ GNU Lesser General Public License for more details.
-
-- You should have received a copy of the GNU General Public License
-+ You should have received a copy of the GNU Lesser General Public License
-along with this program. If not, see
[arch-commits] Commit in libidn/trunk (PKGBUILD gcc7_buildfix.diff)
Date: Tuesday, August 15, 2017 @ 13:34:53
Author: andyrtr
Revision: 302207
upgpkg: libidn 1.33-2
fix FTBS; FS#55151
Added:
libidn/trunk/gcc7_buildfix.diff
Modified:
libidn/trunk/PKGBUILD
+
PKGBUILD | 25 ++-
gcc7_buildfix.diff | 327 +++
2 files changed, 344 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-08-15 12:58:44 UTC (rev 302206)
+++ PKGBUILD2017-08-15 13:34:53 UTC (rev 302207)
@@ -5,22 +5,28 @@
pkgname=libidn
pkgver=1.33
-pkgrel=1
+pkgrel=2
pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
-url="http://www.gnu.org/software/libidn/";
+url="https://www.gnu.org/software/libidn/";
arch=('i686' 'x86_64')
license=('GPL3' 'LGPL')
depends=('glibc')
-makedepends=('texinfo' 'gtk-doc')
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('57872fdc665dcc585e16f4ac0bb35374b1103f7e'
- 'SKIP')
+source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
+gcc7_buildfix.diff)
+sha256sums=('44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19'
+'SKIP'
+'1b539ba3916fe8982d596f4de9a65138ae9a35a042e1673328a092a478b7fb33')
validpgpkeys=('9AA9BDB11BB1B99A21285A330664A76954265E8C') # "Simon Josefsson
"
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # fix build with gcc7
+ patch -Np1 -i ../gcc7_buildfix.diff
+}
+
build() {
cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
---enable-gtk-doc
+ ./configure --prefix=/usr
make
}
@@ -31,4 +37,7 @@
package() {
cd ${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
+ # doc html installation - gtk-doc isn't supported anymore - FS#55151
+ mkdir -p ${pkgdir}/usr/share/gtk-doc/html/${pkgname}
+ cp -r -v doc/reference/html/* ${pkgdir}/usr/share/gtk-doc/html/${pkgname}
}
Added: gcc7_buildfix.diff
===
--- gcc7_buildfix.diff (rev 0)
+++ gcc7_buildfix.diff 2017-08-15 13:34:53 UTC (rev 302207)
@@ -0,0 +1,327 @@
+From: Tim Rühsen
+Date: Wed, 1 Feb 2017 09:44:36 + (+0100)
+Subject: Update intprops.h for gcc-7 compatibility
+X-Git-Url:
http://git.savannah.gnu.org/gitweb/?p=libidn.git;a=commitdiff_plain;h=230930b3bc3e431b819eb45420cb42475d83ca93
+
+Update intprops.h for gcc-7 compatibility
+---
+
+diff --git a/gl/intprops.h b/gl/intprops.h
+index e1fce5c..eb06b69 100644
+--- a/gl/intprops.h
b/gl/intprops.h
+@@ -1,18 +1,18 @@
+ /* intprops.h -- properties of integer types
+
+- Copyright (C) 2001-2016 Free Software Foundation, Inc.
++ Copyright (C) 2001-2017 Free Software Foundation, Inc.
+
+This program is free software: you can redistribute it and/or modify it
+- under the terms of the GNU General Public License as published
+- by the Free Software Foundation; either version 3 of the License, or
++ under the terms of the GNU Lesser General Public License as published
++ by the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
++ GNU Lesser General Public License for more details.
+
+- You should have received a copy of the GNU General Public License
++ You should have received a copy of the GNU Lesser General Public License
+along with this program. If not, see
