Date: Monday, February 6, 2023 @ 10:59:24 Author: dvzrv Revision: 468287
upgpkg: sane 1.2.1-1: Upgrade to 1.2.1. Remove unnecessary quotes and curly braces. Consolidate dependencies. Use arrays with entries per line to track dependencies and configure options. Modified: sane/trunk/PKGBUILD ----------+ PKGBUILD | 134 +++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 82 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-06 10:21:58 UTC (rev 468286) +++ PKGBUILD 2023-02-06 10:59:24 UTC (rev 468287) @@ -6,31 +6,51 @@ _name=backends pkgname=sane -pkgver=1.1.1 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="Scanner Access Now Easy" arch=(x86_64) url="http://www.sane-project.org/"; license=(GPL2) -# NOTE: libgphoto2 can be moved to makedepends once the package also provides -# libgphoto2_port.so -depends=(bash cairo gcc-libs glibc libgphoto2 libnl libpng libxml2 libieee1284 -net-snmp openssl v4l-utils) -makedepends=(autoconf-archive avahi curl glib2 libjpeg-turbo libtiff libusb -poppler-glib python systemd texlive-latexextra) +depends=( + bash + cairo + gcc-libs + glibc + libpng + libieee1284 + net-snmp + v4l-utils +) +makedepends=( + autoconf-archive + avahi + curl + glib2 + libgphoto2 + libjpeg-turbo + libtiff + libusb + libxml2 + poppler-glib + python + systemd + texlive-latexextra +) provides=(libsane.so) -source=("https://gitlab.com/sane-project/${_name}/-/archive/${pkgver}/${_name}-${pkgver}.tar.gz"; - "66-${pkgname}d.rules" - "${pkgname}.sysusers" - "${pkgname}d.service" - "${pkgname}d.socket" +source=( + https://gitlab.com/sane-project/$_name/-/archive/$pkgver/$_name-$pkgver.tar.gz + 66-${pkgname}d.rules + $pkgname.sysusers + ${pkgname}d.service + ${pkgname}d.socket ) -sha512sums=('3713f452956fe94cc7f2d15fee764411c1e289d5ff94a095d4a4ee43fae0479e7dbd1b97d85cd9a70ad9cd5458e5c38bcdbd170bcd6ac244083c987094fb36bd' +sha512sums=('b3b803162066b563d9bafaedb7a6c8c1e9be736bb787f2e412f3f71402a42721123bc32882ae9dc39cbf12bc2c423f8841ed06f525f325857f4273186b7f3a16' 'd0d1b6bd6fbb04d610e7186e26d04c2233a620cc7c731ca3acd7fb860dd033fbe99d8974ffa1dd59c8affcc4aa2664d76ab3dfd6f7b2a734b31d7e3832359c41' 'd8cd194b57eff2249df2b8d540a892e518aa3e3bba6387211ed21230dc235e98c49b71f262f0b1007e8c859c59776410840376244e0aec1f06363881b2c81fd8' 'baf2cf2fdff689f776973ac4f69ea02b131f2a1a754a8d52a8e8ad33b0e559ba286649a891723a7ad94b2bcb01ec88155d43c36eaeb35e47fbc8ea80c49c5d47' 'a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093') -b2sums=('341f007ee36e660092dffb4c27ade08dd4fd23fb9986b9ddb0a84348f9ed50fd053ad0ced1a24eb670fe1adcdb9ebbde5178dc559d57ceb01f40d2d79d565ed4' +b2sums=('b12a629bab6e79d9027d9e90cfa5851ee172a7a1eb6303666c294e2a3d881e2afbef9a3cf3d3156063885a28ec64294216d0dec83c25d212af257f83bbc33721' 'c9c6ba224b9b27f4ecc6b1ded6621a8abb52b1ded2d9078e4cad31177290b788e286fad74545a5cb09e1f6726515adc22003988eb646dc986e87f1a8061a0e27' '2a4ddc9849562e3a0adcaec1859391e3f37a63f25c27dbc140cabd697bd65b89a0fc812c4516cbdfb36d1f30844df34934b3c1c59650101f54fc1ac0acb3f5d9' '272b4860dbd3f2b69eedfed4532cf8a388629c003c9a0e0ee98defbc2023e07edc26275a17f56ea9fd4d90e9b3b6532c5b10d1e2b91e6ab4df242ac44101d802' @@ -37,31 +57,35 @@ '5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9') prepare() { - cd "${_name}-${pkgver}" + cd $_name-$pkgver # create version files, so that autotools macros can use them: # https://gitlab.com/sane-project/backends/-/issues/440 - echo "${pkgver}" > .tarball-version - echo "${pkgver}" > .version + printf "%s\n" "$pkgver" > .tarball-version + printf "%s\n" "$pkgver" > .version autoreconf -fiv } build() { - cd "${_name}-${pkgver}" + local configure_options=( + --prefix=/usr + --disable-locking + --disable-rpath + --docdir="/usr/share/doc/$pkgname" + --enable-pthread + --localstatedir=/var + --sbindir=/usr/bin + --sysconfdir=/etc + --with-avahi + --with-libcurl + --with-pic + --with-poppler-glib + --with-systemd + --with-usb + ) - ./configure --prefix=/usr \ - --disable-locking \ - --disable-rpath \ - --docdir="/usr/share/doc/${pkgname}" \ - --enable-pthread \ - --localstatedir=/var \ - --sbindir=/usr/bin \ - --sysconfdir=/etc \ - --with-avahi \ - --with-libcurl \ - --with-pic \ - --with-poppler-glib \ - --with-systemd \ - --with-usb + cd $_name-$pkgver + ./configure "${configure_options[@]}" + # circumvent overlinking in libraries sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' -i libtool make @@ -68,38 +92,44 @@ } package() { - depends+=(libavahi-client.so libavahi-common.so libcurl.so libgphoto2.so - libgobject-2.0.so libpoppler-glib.so libsystemd.so libtiff.so libusb-1.0.so) + depends+=( + avahi libavahi-client.so libavahi-common.so + curl libcurl.so + gphoto2 libgphoto2.so libgphoto2_port.so + glib2 libgobject-2.0.so + libtiff libtiff.so + libusb libusb-1.0.so + libxml2 libxml2.so + poppler-glib libpoppler-glib.so + systemd-libs libsystemd.so + ) - cd "${_name}-${pkgver}" + cd $_name-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install # generate udev udev+hwdb - install -vdm 755 "${pkgdir}/usr/lib/udev/rules.d/" - tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${pkgdir}/usr/lib/udev/rules.d/65-${pkgname}.rules" - tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${pkgdir}/usr/lib/udev/rules.d/65-${pkgname}.rules" + install -vdm 755 "$pkgdir/usr/lib/udev/rules.d/" + tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "$pkgdir/usr/lib/udev/rules.d/65-$pkgname.rules" + tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "$pkgdir/usr/lib/udev/rules.d/65-$pkgname.rules" # generate udev hwdb - install -vdm 755 "${pkgdir}/usr/lib/udev/hwdb.d/" - tools/sane-desc -m hwdb -s doc/descriptions/ > "${pkgdir}/usr/lib/udev/hwdb.d/20-${pkgname}.hwdb" + install -vdm 755 "$pkgdir/usr/lib/udev/hwdb.d/" + tools/sane-desc -m hwdb -s doc/descriptions/ > "$pkgdir/usr/lib/udev/hwdb.d/20-$pkgname.hwdb" # NOTE: an empty new line is required between the two .desc collections - printf "\n" >> "${pkgdir}/usr/lib/udev/hwdb.d/20-${pkgname}.hwdb" - tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${pkgdir}/usr/lib/udev/hwdb.d/20-${pkgname}.hwdb" + printf "\n" >> "$pkgdir/usr/lib/udev/hwdb.d/20-$pkgname.hwdb" + tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "$pkgdir/usr/lib/udev/hwdb.d/20-$pkgname.hwdb" # systemd integration - install -vDm 644 "../${pkgname}d.socket" \ - -t "${pkgdir}/usr/lib/systemd/system/" - install -vDm 644 "../${pkgname}d.service" \ - "${pkgdir}/usr/lib/systemd/system/${pkgname}[email protected]" - install -vDm 644 "../66-${pkgname}d.rules" "${pkgdir}/usr/lib/udev/rules.d/" + install -vDm 644 ../${pkgname}d.{service,socket} -t "$pkgdir/usr/lib/systemd/system/" + install -vDm 644 ../66-${pkgname}d.rules "$pkgdir/usr/lib/udev/rules.d/" # sysusers.d - install -vDm 644 "../${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + install -vDm 644 ../$pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" # remove old ChangeLogs - rm -rvf "${pkgdir}/usr/share/doc/${pkgname}/ChangeLogs/" + rm -rvf "$pkgdir/usr/share/doc/$pkgname/ChangeLogs/" # add files below /etc/sane.d to backup array - cd "${pkgdir}" + cd "$pkgdir" # trick extract_function_variable() in makepkg into not detecting the # backup array modification and adding remaining configuration files [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f) )
