David Runge pushed to branch main at Arch Linux / Packaging / Packages / 
lib32-zlib


Commits:
59eefc15 by David Runge at 2023-08-20T17:58:33+02:00
Replace tabs with spaces

- - - - -
44395db7 by David Runge at 2023-08-20T18:06:09+02:00
Remove unnecessary quotes and curly braces

- - - - -
6ff244ef by David Runge at 2023-08-20T18:06:35+02:00
Remove unnecessary use of srcdir

- - - - -
69e51d2e by David Runge at 2023-08-20T18:12:30+02:00
Reuse name of project in variable to be more DRY

- - - - -
250fe9e2 by David Runge at 2023-08-20T18:14:30+02:00
Use bash arrays with one entry per line for better handling

- - - - -
f5c37a3d by David Runge at 2023-08-20T18:15:52+02:00
Apply lib32 packaging guidelines by manipulating environment correctly.

- - - - -
3c98a11d by David Runge at 2023-08-20T18:17:21+02:00
Do not break long lines.

- - - - -
24120906 by David Runge at 2023-08-20T18:18:02+02:00
Install license file instead of relying on non lib32 package

- - - - -
6199d1e1 by David Runge at 2023-08-20T18:18:21+02:00
Use correct license identifier (Zlib) for package.

- - - - -
82204967 by David Runge at 2023-08-20T18:20:55+02:00
Switch to upstream's github releases, as older tarballs are apparently YOLO 
deleted from the website

- - - - -
7653559c by David Runge at 2023-08-20T18:22:41+02:00
Add maintainer information.

- - - - -
7449f0a6 by David Runge at 2023-08-20T18:31:35+02:00
Simplify calls to make

- - - - -
b1a0afd1 by David Runge at 2023-08-20T18:36:12+02:00
Be more strict with the dependency on zlib

- - - - -
4ded64b4 by David Runge at 2023-08-20T18:37:59+02:00
upgpkg: 1.3-1

- - - - -


1 changed file:

- PKGBUILD


Changes:

=====================================
PKGBUILD
=====================================
@@ -1,43 +1,45 @@
+# Maintainer: David Runge <[email protected]>
 # Contributor: Ionut Biru <[email protected]>
 # Contributor: Pierre Schmitz <[email protected]>
 
-_pkgbasename=zlib
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.13
-pkgrel=2
+_name=zlib
+pkgname=lib32-$_name
+pkgver=1.3
+pkgrel=1
 pkgdesc='Compression library implementing the deflate compression method found 
in gzip and PKZIP (32-bit)'
-arch=('x86_64')
-license=('custom')
+arch=(x86_64)
+license=(Zlib)
 url="https://www.zlib.net/";
-depends=('lib32-glibc' "$_pkgbasename")
-provides=('libz.so')
-source=("https://zlib.net/zlib-${pkgver}.tar.gz"{,.asc})
-sha256sums=('b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30'
+depends=(
+  lib32-glibc
+  $_name=1:$pkgver
+)
+provides=(libz.so)
+source=(https://github.com/madler/zlib/releases/download/v$pkgver/$_name-$pkgver.tar.xz{,.asc})
+sha512sums=('3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2'
             'SKIP')
+b2sums=('5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a'
+        'SKIP')
 validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') # Mark Adler 
<[email protected]>
 
 build() {
-       export CC="gcc -m32"
-       export CXX="g++ -m32"
-       export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+  export CFLAGS+=" -m32"
+  export CXXFLAGS+=" -m32"
+  export LDFLAGS+=" -m32"
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-       cd "${srcdir}"/zlib-$pkgver
-       ./configure \
-               --prefix=/usr \
-               --libdir=/usr/lib32
-       make
+  cd $_name-$pkgver
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make
 }
 
 check() {
-       cd zlib-$pkgver
-       make test
+  make test -C $_name-$pkgver
 }
 
 package() {
-       cd zlib-$pkgver
-       make install DESTDIR="${pkgdir}"
+  make install DESTDIR="$pkgdir" -C $_name-$pkgver
 
-       rm -rf "${pkgdir}"/usr/{include,share,bin}
-       mkdir -p "$pkgdir/usr/share/licenses"
-       ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+  rm -rf "$pkgdir"/usr/{include,share,bin}
+  install -vDm 644 $_name-$pkgver/LICENSE -t 
"$pkgdir/usr/share/licenses/$pkgname/"
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-zlib/-/compare/0fb90f6fe10786c20b9d8444315922af8aadf2bf...4ded64b4c37f3df49434be47e5718cf751f31862

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-zlib/-/compare/0fb90f6fe10786c20b9d8444315922af8aadf2bf...4ded64b4c37f3df49434be47e5718cf751f31862
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to