From 640268a336d994e6722e0372d244154b5152897d Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Tue, 25 Oct 2022 21:32:47 +0300 Subject: [PATCH] upg expat glib2 --- expat/PKGBUILD | 14 +++++++------- expat/PKGBUILD-arch | 14 +++++++------- glib2/PKGBUILD | 12 ++++++------ glib2/PKGBUILD-arch | 10 +++------- glib2/deps | 1 + 5 files changed, 24 insertions(+), 27 deletions(-) diff --git a/expat/PKGBUILD b/expat/PKGBUILD index 23faa3e..ec6b0ea 100644 --- a/expat/PKGBUILD +++ b/expat/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=expat -pkgver=2.4.9 +pkgver=2.5.0 pkgrel=01 pkgdesc='An XML parser library' arch=('x86_64') @@ -15,14 +15,14 @@ depends=(glibc filesystem) makedepends=(cmake ) provides=(libexpat.so) # options=(debug) # uncomment if you want developers' debug pkg created -source=("https://github.com/libexpat/libexpat/releases/download/R_${pkgver//./_}/${pkgname}-${pkgver}.tar.bz2"{,.asc}) +source=(https://github.com/libexpat/libexpat/releases/download/R_${pkgver//./_}/$pkgname-$pkgver.tar.bz2{,.asc}) build() { cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=None \ -W no-dev \ -B build \ - -S "$pkgname-$pkgver" + -S $pkgname-$pkgver make VERBOSE=1 -C build } @@ -32,8 +32,8 @@ check() { package() { make VERBOSE=1 DESTDIR="$pkgdir" -C build install - install -vDm 644 "$pkgname-$pkgver/COPYING" -t "${pkgdir}/usr/share/licenses/$pkgname/" - install -vDm 644 "$pkgname-$pkgver/"{AUTHORS,Changes,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}/" + install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" + install -vDm 644 $pkgname-$pkgver/{AUTHORS,Changes,README.md} -t "$pkgdir/usr/share/doc/$pkgname/" } #---- license gpg-key sha256sums ---- @@ -42,6 +42,6 @@ license=(MIT) validpgpkeys=(3176EF7DB2367F1FCA4F306B1F9B0E909AF37285) # Sebastian Pipping -sha256sums=(7f44d1469b110773a94b0d5abeeeffaef79f8bd6406b07e52394bcf48126437a # expat-2.4.9.tar.bz2 - 8e60db9c154950ec2b0e3faae7593f2e0df91fb62e817f4373ae38d59835575d) # expat-2.4.9.tar.bz2.asc +sha256sums=(6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67 # expat-2.5.0.tar.bz2 + 9bd7e10b55a5117cf86195e79b349d001292c2760128ce6fc554e2e77d35e55a) # expat-2.5.0.tar.bz2.asc diff --git a/expat/PKGBUILD-arch b/expat/PKGBUILD-arch index 0ed3a3a..c4dafbc 100644 --- a/expat/PKGBUILD-arch +++ b/expat/PKGBUILD-arch @@ -4,7 +4,7 @@ # Contributor: Judd Vinet pkgname=expat -pkgver=2.4.9 +pkgver=2.5.0 pkgrel=1 pkgdesc="An XML parser library" arch=(x86_64) @@ -14,10 +14,10 @@ depends=(glibc) makedepends=(cmake) provides=(libexpat.so) options=(debug) -source=("https://github.com/libexpat/libexpat/releases/download/R_${pkgver//./_}/${pkgname}-${pkgver}.tar.bz2"{,.asc}) -sha512sums=('fdfdc57dd11541eb307b38bd97ec84f78012c7b48fafc5c879b4b8c768cabfbcd7652ccec11e870bf31fee8f68174b22cf632de12c8c46601277f6750f90c192' +source=(https://github.com/libexpat/libexpat/releases/download/R_${pkgver//./_}/$pkgname-$pkgver.tar.bz2{,.asc}) +sha512sums=('22fd904d75aab7506a85c03519b9cf79e44898c8e1ba6abf6cb7f95de71b8e63a7e2d5cf4395e3627d46035ea29342b3e631a8809fef8aad3f59976dc075ad17' 'SKIP') -b2sums=('d60183f96f3359acc069af638cc8d16ba19f51fbd8a61eddd80c2babddde357dcf0561e87af901f53617bfd9452e146c9dd9f317729cd3648b65832a38388640' +b2sums=('15a5dcd3af17995fb4299301710b38d609c1fe7a8d6a6284581fedd96e89e0c16526d0342fb55773ac9d678cd65dc5cdb1532c764eeb3a20ccdf1e168b96e337' 'SKIP') validpgpkeys=(3176EF7DB2367F1FCA4F306B1F9B0E909AF37285) # Sebastian Pipping @@ -26,7 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=None \ -W no-dev \ -B build \ - -S "$pkgname-$pkgver" + -S $pkgname-$pkgver make VERBOSE=1 -C build } @@ -36,6 +36,6 @@ check() { package() { make VERBOSE=1 DESTDIR="$pkgdir" -C build install - install -vDm 644 "$pkgname-$pkgver/COPYING" -t "${pkgdir}/usr/share/licenses/$pkgname/" - install -vDm 644 "$pkgname-$pkgver/"{AUTHORS,Changes,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}/" + install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/" + install -vDm 644 $pkgname-$pkgver/{AUTHORS,Changes,README.md} -t "$pkgdir/usr/share/doc/$pkgname/" } diff --git a/glib2/PKGBUILD b/glib2/PKGBUILD index 127f168..f10670d 100644 --- a/glib2/PKGBUILD +++ b/glib2/PKGBUILD @@ -8,8 +8,8 @@ #pkgbase=glib2 #pkgname=(glib2 glib2-docs) pkgname=glib2 -pkgver=2.74.0 -pkgrel=02 +pkgver=2.74.1 +pkgrel=01 # this is a waste of resources rebuilding this for the shake of catching up # to arch's late decision to be building debug symbol packages along with the core pkg # like void does with the -devel pkgs. We are not going to build such debug pkgs, if you @@ -23,7 +23,7 @@ makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux checkdepends=(desktop-file-utils glib2) #options=(debug staticlibs) ### uncomment this to have the debug pkg produced options=(staticlibs) -_commit=30bd57ecf8aa051de9848ba5a2b140f4810401ff # tags/2.74.0^0 +_commit=058491cb6f635ff6e0a57fcdd4107a40ca91c62a # tags/2.74.1^0 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit" 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch glib-compile-schemas.hook @@ -43,9 +43,9 @@ prepare() { # Suppress noise from glib-compile-schemas.hook git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch - # https://bugs.archlinux.org/task/75980 - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2921 - git cherry-pick -n 'ea3f17d598d550345e94e4571130e429443e91cb' +# # https://bugs.archlinux.org/task/75980 +# # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2921 +# git cherry-pick -n 'ea3f17d598d550345e94e4571130e429443e91cb' } build() { diff --git a/glib2/PKGBUILD-arch b/glib2/PKGBUILD-arch index fe0f7fc..b704e6d 100644 --- a/glib2/PKGBUILD-arch +++ b/glib2/PKGBUILD-arch @@ -3,8 +3,8 @@ pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.74.0 -pkgrel=2 +pkgver=2.74.1 +pkgrel=1 pkgdesc="Low level core library" url="https://wiki.gnome.org/Projects/GLib" license=(LGPL) @@ -14,7 +14,7 @@ makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux meson dbus) checkdepends=(desktop-file-utils glib2) options=(debug staticlibs) -_commit=30bd57ecf8aa051de9848ba5a2b140f4810401ff # tags/2.74.0^0 +_commit=058491cb6f635ff6e0a57fcdd4107a40ca91c62a # tags/2.74.1^0 source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit" 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch glib-compile-schemas.hook gio-querymodules.{hook,script}) @@ -34,10 +34,6 @@ prepare() { # Suppress noise from glib-compile-schemas.hook git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch - - # https://bugs.archlinux.org/task/75980 - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2921 - git cherry-pick -n 'ea3f17d598d550345e94e4571130e429443e91cb' } build() { diff --git a/glib2/deps b/glib2/deps index 454b46c..bd6e8d9 100644 --- a/glib2/deps +++ b/glib2/deps @@ -7,3 +7,4 @@ desktop-file-utils gtk3 +at-spi2-core