popt: Update to 1.19

sync patches with cygwin (both have been fixed upstream)
This commit is contained in:
Christoph Reiter 2023-03-14 08:48:55 +01:00
parent 40452681c1
commit 6c96b138ac
3 changed files with 5 additions and 43 deletions

View File

@ -1,11 +0,0 @@
--- popt-1.18.ORIG/src/poptconfig.c 2020-04-16 12:32:54.000000000 +0200
+++ popt-1.18/src/poptconfig.c 2020-12-31 11:33:48.634910900 +0100
@@ -21,7 +21,7 @@
#if defined(HAVE_GLOB_H)
#include <glob.h>
-#if !defined(__GLIBC__)
+#if !defined(__GLIBC__) && !defined(__CYGWIN__)
/* Return nonzero if PATTERN contains any metacharacters.
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
static int

View File

@ -1,20 +0,0 @@
--- popt-1.18.ORIG/tests/testit.sh 2020-03-24 12:01:52.000000000 +0100
+++ popt-1.18/tests/testit.sh 2020-12-31 12:38:00.002702800 +0100
@@ -115,7 +115,7 @@
run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar
run test1 "test1 - 58" "\
-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
+Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
[-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
[-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG]
[-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE]
@@ -124,7 +124,7 @@
[--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
[-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
run test1 "test1 - 59" "\
-Usage: lt-test1 [OPTION...]
+Usage: test1 [OPTION...]
--arg1 First argument with a really long
description. After all, we have to test
argument help wrapping somehow, right?

View File

@ -1,8 +1,8 @@
# Maintainer: Jeremy Drake <github@jdrake.com>
pkgname=('popt' 'popt-devel')
pkgver=1.18
pkgrel=2
pkgver=1.19
pkgrel=1
pkgdesc="A command-line option parser library"
arch=('i686' 'x86_64')
url="http://rpm.org/"
@ -11,19 +11,12 @@ makedepends=('gcc'
'gettext-devel'
'libiconv-devel'
'autotools')
#options=('debug' '!strip')
source=(http://ftp.rpm.org/popt/releases/popt-1.x/${pkgname}-${pkgver}.tar.gz
1.18-cygwin.patch
1.18-testit.patch)
sha256sums=('5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1'
'cbc8c5266dd3d4564fe950ff5ef497d9bc04a2344c845a5e94108067878fd529'
'1d7dd99eac24225bcd1ae1a195692ae1a95ed68409922b2d93c89a975c6f66ee')
source=(http://ftp.rpm.org/popt/releases/popt-1.x/${pkgname}-${pkgver}.tar.gz)
sha256sums=('c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9')
prepare() {
cd ${pkgname}-${pkgver}
# Cygwin patches
patch -Np1 -i "${srcdir}"/1.18-cygwin.patch
patch -Np1 -i "${srcdir}"/1.18-testit.patch
autoreconf -fi
}