Date: Wednesday, September 14, 2022 @ 09:00:42 Author: andyrtr Revision: 456093
upgpkg: xdg-utils 1.1.3+21+g1a58bc2-2: switch from non-standard "egrep" to POSIX "grep -E" - FS#75890 Modified: xdg-utils/trunk/PKGBUILD ----------+ PKGBUILD | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-14 07:37:33 UTC (rev 456092) +++ PKGBUILD 2022-09-14 09:00:42 UTC (rev 456093) @@ -1,11 +1,11 @@ # Maintainer: Andreas Radke <[email protected]> -# Maintainer: Jan de Groot <[email protected]> +# Contributor: Jan de Groot <[email protected]> pkgname=xdg-utils # https://gitlab.freedesktop.org/xdg/xdg-utils/commits/master _commit=1a58bc28f6844898532daf9ee1bf6da7764955a9 # master # 2021-08-05 pkgver=1.1.3+21+g1a58bc2 -pkgrel=1 +pkgrel=2 pkgdesc="Command line tools that assist applications with a variety of desktop integration tasks" arch=('any') url="https://www.freedesktop.org/wiki/Software/xdg-utils/"; @@ -22,11 +22,13 @@ #0001_better_pcmanfm_check.patch #drop_obsolete_GNOME_support.patch) #{,.asc} "git+https://gitlab.freedesktop.org/xdg/xdg-utils.git#commit=$_commit"; + egrep_is_obsolete.patch::https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21.patch ) #sha1sums=('98294cf332c341b85e481d98e9ea59357fe1efc7' # 'f5c09cc10d7b88c2033392efd4179da65a1f47b1' # '32d4282c2e6c7345ddf04016c91f0defbf88b356') -sha256sums=('SKIP') +sha256sums=('SKIP' + '550a8db792bb810168583be02e0c9e665a7a6ce245b48424188be235e35d4799') #validpgpkeys=('8B75CA7811367175D05F3B03C43570F80CC295E6') # "Per Olofsson <[email protected]>" pkgver() { @@ -34,7 +36,7 @@ git describe --tags | sed 's/^v//;s/-/+/g' } -#prepare() { +prepare() { # cd $pkgname #-$pkgver # # FS#58707 # patch -Np1 -i ../0001_better_pcmanfm_check.patch @@ -42,8 +44,12 @@ # patch -Np1 -i ../drop_obsolete_GNOME_support.patch # NOCONFIGURE=1 ./autogen.sh -#} + cd $pkgname + # switch from non-standard "egrep" to POSIX "grep -E" + patch -Np1 -i ../egrep_is_obsolete.patch +} + build() { cd $pkgname #-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man
