From 210102a379f20ce77aabc9bba0d1709fdc799786 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Sat, 3 Jun 2023 08:13:41 +0300 Subject: [PATCH] upg package-query qt5-base --- package-query/PKGBUILD | 36 +++++++++++++++++++++++------------- package-query/PKGBUILD-aur | 38 +++++++++++++++++++++++--------------- package-query/clean | 2 +- package-query/deps | 3 +++ qt5-base/PKGBUILD | 8 ++++---- qt5-base/PKGBUILD-arch | 4 ++-- 6 files changed, 56 insertions(+), 35 deletions(-) diff --git a/package-query/PKGBUILD b/package-query/PKGBUILD index 582e3c0..b193516 100644 --- a/package-query/PKGBUILD +++ b/package-query/PKGBUILD @@ -5,32 +5,42 @@ # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- +#pkgname=package-query-git pkgname=package-query -pkgver=1.12 +pkgver=1.12.r2.g9160ff6 pkgrel=02 pkgdesc="Query ALPM and AUR" -arch=('x86_64') -groups=( jobbot ) -url="https://github.com/archlinuxfr/package-query/" +url="https://github.com/archlinuxfr/package-query" depends=('pacman>=6.0' 'yajl>=2.0') -source=(https://github.com/archlinuxfr/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz) +makedepends=(git) +conflicts=(package-query-git) +provides=(package-query) +source=('git+https://github.com/archlinuxfr/package-query.git') + +pkgver () { + cd "$pkgname" + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --localstatedir=/var --prefix=/usr --sysconfdir=/etc --with-aur-url=https://aur.archlinux.org + cd "$pkgname" + ./autogen.sh + ./configure --localstatedir=/var --prefix=/usr \ + --sysconfdir=/etc --with-aur-url=https://aur.archlinux.org make } -package () -{ - cd "$srcdir/$pkgname-$pkgver" +package () { + cd "$pkgname" make DESTDIR="$pkgdir" install } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL') -sha256sums=(0b1f08cb8397019b36ac46898d2ec1a106370f4f2895cfa5f69070aa47228301) # package-query-1.12.tar.gz - +sha256sums=(SKIP) +## 57ca46ab3720c9f3ca2a8f59261d222be1b669b9d823ebbaaf345c2d3d2afa41 package-query-1.12.r2.g9160ff6-02-x86_64.pkg.tar.lz diff --git a/package-query/PKGBUILD-aur b/package-query/PKGBUILD-aur index f56ace8..b0cf951 100644 --- a/package-query/PKGBUILD-aur +++ b/package-query/PKGBUILD-aur @@ -1,26 +1,34 @@ -# Contributor: tuxce -# Contributor: Skunnyk -pkgname=package-query -pkgver=1.12 +# Maintainer: tuxce +# Maintainer: Igor +pkgname=package-query-git +pkgver=1.12.r0.g840a000 pkgrel=1 pkgdesc="Query ALPM and AUR" -arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h' 'arm' 'aarch64' 'pentium4') -url="https://github.com/archlinuxfr/package-query/" +arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h' 'arm' 'aarch64') +url="https://github.com/archlinuxfr/package-query" license=('GPL') depends=('pacman>=6.0' 'yajl>=2.0') -source=(https://github.com/archlinuxfr/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz) +makedepends=('git') +conflicts=('package-query') +provides=('package-query=1.12') +source=('git+https://github.com/archlinuxfr/package-query.git') +md5sums=('SKIP') +_gitname=package-query + +pkgver () { + cd "$_gitname" + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --localstatedir=/var --prefix=/usr --sysconfdir=/etc --with-aur-url=https://aur.archlinux.org + cd "$_gitname" + ./autogen.sh + ./configure --localstatedir=/var --prefix=/usr \ + --sysconfdir=/etc --with-aur-url=https://aur.archlinux.org make } -package () -{ - cd "$srcdir/$pkgname-$pkgver" +package () { + cd "$_gitname" make DESTDIR="$pkgdir" install } - -# vim:set ts=2 sw=2 et: -md5sums=('3d91612aa47bb30db5e028251089255b') diff --git a/package-query/clean b/package-query/clean index 43d44e2..48be219 100644 --- a/package-query/clean +++ b/package-query/clean @@ -1 +1 @@ -rm -rf {src,pkg,pac*tar.gz*} +rm -rf {src,pkg,pac*tar.gz*,package-query} diff --git a/package-query/deps b/package-query/deps index 8b13789..970290c 100644 --- a/package-query/deps +++ b/package-query/deps @@ -1 +1,4 @@ +git +automake +autoconf diff --git a/qt5-base/PKGBUILD b/qt5-base/PKGBUILD index 784656c..ca22beb 100644 --- a/qt5-base/PKGBUILD +++ b/qt5-base/PKGBUILD @@ -8,8 +8,8 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) _basever=5.15.9 -pkgver=5.15.9+kde+r154 -_commit=a196623892558623e467f20b67edb78794252a09 +pkgver=5.15.9+kde+r155 +_commit=df809fd0b505b61d718fe1dc7fe19a79f9336cd9 pkgrel=01 url='https://www.qt.io' pkgdesc='A cross-platform application and UI framework' @@ -125,5 +125,5 @@ sha256sums=(SKIP 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch 4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch -## 1ea898ed25f17ddc3dbc62735e2412914b96eec750ca03f1a98be8ae0ee15c81 qt5-base-5.15.9+kde+r154-01-x86_64.pkg.tar.lz -## 85a4bacdf2903be22b2d8a424d8b26294ec70283087d052783ac2b116cde633e qt5-xcb-private-headers-5.15.9+kde+r154-01-x86_64.pkg.tar.lz +## c90e8e43268024f50f8a72228cdb33fa79e837a75e9a618fa67e23af8d7b1873 qt5-base-5.15.9+kde+r155-01-x86_64.pkg.tar.lz +## 005be3aac4673f030927a2eba7d2e4ee93077b0abbd3637af914dd45e3a9bdb7 qt5-xcb-private-headers-5.15.9+kde+r155-01-x86_64.pkg.tar.lz diff --git a/qt5-base/PKGBUILD-arch b/qt5-base/PKGBUILD-arch index fd6c2a7..85079aa 100644 --- a/qt5-base/PKGBUILD-arch +++ b/qt5-base/PKGBUILD-arch @@ -4,9 +4,9 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) _basever=5.15.9 -pkgver=5.15.9+kde+r154 +pkgver=5.15.9+kde+r155 pkgrel=1 -_commit=a196623892558623e467f20b67edb78794252a09 +_commit=df809fd0b505b61d718fe1dc7fe19a79f9336cd9 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom')