From 81c9cdab7eae0a0e3894a37aea6dcc492fcea3ca Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Thu, 25 Nov 2021 00:53:56 +0100 Subject: [PATCH] [PKGBUILD] Switch from md5 to sha512 checksum, code cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove comment out line of code Replace tabs with spaces (yes I’m this kind of guy) Fix indentation --- Documents/code/AUR/Wonderdraft/PKGBUILD | 1 - Documents/code/AUR/emacs/PKGBUILD | 114 ++++++++++++------------ Documents/code/AUR/pumopm-git/PKGBUILD | 4 +- Documents/code/AUR/sent/PKGBUILD | 26 +++--- Documents/code/AUR/sxiv/PKGBUILD | 7 +- 5 files changed, 73 insertions(+), 79 deletions(-) diff --git a/Documents/code/AUR/Wonderdraft/PKGBUILD b/Documents/code/AUR/Wonderdraft/PKGBUILD index f2e5cbd..8cd10af 100644 --- a/Documents/code/AUR/Wonderdraft/PKGBUILD +++ b/Documents/code/AUR/Wonderdraft/PKGBUILD @@ -23,7 +23,6 @@ sha512sums=('27b0a56c95efe99c2b3cadb10c4e70186591bef0793d58b1acff99f8dfc789806ae noextract=() package() { - # unzip "${srcdir}/${pkgname}-${pkgver}-Linux64.zip" -d "${srcdir}/${pkgname}/" mkdir -p "${pkgdir}/usr/share/applications/" install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/" mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/Documents/code/AUR/emacs/PKGBUILD b/Documents/code/AUR/emacs/PKGBUILD index d6bd682..1032010 100644 --- a/Documents/code/AUR/emacs/PKGBUILD +++ b/Documents/code/AUR/emacs/PKGBUILD @@ -55,9 +55,9 @@ NOGZ= # Don't compress .el files. ################################################################################ if [[ $CLI == "YES" ]] ; then - pkgname="emacs-nox-phundrak-git" + pkgname="emacs-nox-phundrak-git" else - pkgname="emacs-phundrak-git" + pkgname="emacs-phundrak-git" fi pkgver=28.0.60.150971 pkgrel=1 @@ -75,8 +75,8 @@ replaces=('emacs' 'emacs26-git' 'emacs27-git' 'emacs28-git' 'emacs-seq' 'emacs-n # If Savannah fails for reasons, use Github's mirror source=("emacs-git::git://github.com/emacs-mirror/emacs.git#branch=emacs-28" "https://raw.githubusercontent.com/TheVaffel/emacs/master/emacs_background_transparency.patch") -md5sums=('SKIP' - '4a48652df63bbd4039d164e843323f27') +sha512sums=('SKIP' + 'd45043e6925358a41fbe42457de3233cd346a7e6133704426240a0c987587328ae08719413188b11db498f27794ee55662c20e8c4b58311bb806ad71e4798574') OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug) ################################################################################ @@ -110,11 +110,11 @@ fi if [[ $LTO == "YES" ]]; then if [[ $CLANG != "YES" ]]; then - CFLAGS+=" -flto -fuse-linker-plugin" - CXXFLAGS+=" -flto -fuse-linker-plugin" -else - CFLAGS+=" -flto" - CXXFLAGS+=" -flto" + CFLAGS+=" -flto -fuse-linker-plugin" + CXXFLAGS+=" -flto -fuse-linker-plugin" + else + CFLAGS+=" -flto" + CXXFLAGS+=" -flto" fi fi @@ -177,9 +177,9 @@ pkgver() { cd "$srcdir/emacs-git" printf "%s.%s" \ - "$(grep AC_INIT configure.ac | \ + "$(grep AC_INIT configure.ac | \ sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/')" \ - "$(git rev-list --count HEAD)" + "$(git rev-list --count HEAD)" } # There is no need to run autogen.sh after first checkout. @@ -211,66 +211,66 @@ build() { --with-sound=alsa --with-modules --with-json -# Beware https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25228 -# dconf and gconf break font settings you set in ~/.emacs. -# If you insist you'll need to read that bug report in *full*. -# Good luck! - --without-gconf - --without-gsettings + # Beware https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25228 + # dconf and gconf break font settings you set in ~/.emacs. + # If you insist you'll need to read that bug report in *full*. + # Good luck! + --without-gconf + --without-gsettings ) -################################################################################ + ################################################################################ -################################################################################ + ################################################################################ -if [[ $CLANG == "YES" ]]; then - _conf+=( '--enable-autodepend' ); -fi + if [[ $CLANG == "YES" ]]; then + _conf+=( '--enable-autodepend' ); + fi -if [[ $LTO == "YES" ]]; then - _conf+=( '--enable-link-time-optimization' ); -fi + if [[ $LTO == "YES" ]]; then + _conf+=( '--enable-link-time-optimization' ); + fi -if [[ $JIT == "YES" ]]; then - _conf+=( '--with-native-compilation' ); -fi + if [[ $JIT == "YES" ]]; then + _conf+=( '--with-native-compilation' ); + fi -if [[ $CLI == "YES" ]]; then - _conf+=( '--without-x' '--with-x-toolkit=no' '--without-xft' '--without-lcms2' '--without-rsvg' '--without-jpeg' '--without-gif' '--without-tiff' '--without-png' ); -elif [[ $NOTKIT == "YES" ]]; then - _conf+=( '--with-x-toolkit=no' '--without-toolkit-scroll-bars' '--with-xft' '--without-xaw3d' ); -elif [[ $LUCID == "YES" ]]; then - _conf+=( '--with-x-toolkit=lucid' '--with-xft' '--with-xaw3d' ); -elif [[ $GTK2 == "YES" ]]; then - _conf+=( '--with-x-toolkit=gtk2' '--without-gsettings' '--without-xaw3d' ); -else - _conf+=( '--with-x-toolkit=gtk3' '--without-xaw3d' ); -fi + if [[ $CLI == "YES" ]]; then + _conf+=( '--without-x' '--with-x-toolkit=no' '--without-xft' '--without-lcms2' '--without-rsvg' '--without-jpeg' '--without-gif' '--without-tiff' '--without-png' ); + elif [[ $NOTKIT == "YES" ]]; then + _conf+=( '--with-x-toolkit=no' '--without-toolkit-scroll-bars' '--with-xft' '--without-xaw3d' ); + elif [[ $LUCID == "YES" ]]; then + _conf+=( '--with-x-toolkit=lucid' '--with-xft' '--with-xaw3d' ); + elif [[ $GTK2 == "YES" ]]; then + _conf+=( '--with-x-toolkit=gtk2' '--without-gsettings' '--without-xaw3d' ); + else + _conf+=( '--with-x-toolkit=gtk3' '--without-xaw3d' ); + fi -if [[ $MAGICK == "YES" ]]; then - _conf+=( '--with-imagemagick'); -else - _conf+=(); -fi + if [[ $MAGICK == "YES" ]]; then + _conf+=( '--with-imagemagick'); + else + _conf+=(); + fi -if [[ $NOCAIRO == "YES" || $CLI == "YES" ]]; then - _conf+=( '--without-cairo' ); -fi + if [[ $NOCAIRO == "YES" || $CLI == "YES" ]]; then + _conf+=( '--without-cairo' ); + fi -if [[ $XWIDGETS == "YES" ]]; then - _conf+=( '--with-xwidgets' ); -fi + if [[ $XWIDGETS == "YES" ]]; then + _conf+=( '--with-xwidgets' ); + fi -if [[ $NOGZ == "YES" ]]; then - _conf+=( '--without-compress-install' ); -fi + if [[ $NOGZ == "YES" ]]; then + _conf+=( '--without-compress-install' ); + fi -# ctags/etags may be provided by other packages, e.g, universal-ctags -_conf+=('--program-transform-name=s/\([ec]tags\)/\1.emacs/') + # ctags/etags may be provided by other packages, e.g, universal-ctags + _conf+=('--program-transform-name=s/\([ec]tags\)/\1.emacs/') -################################################################################ + ################################################################################ -################################################################################ + ################################################################################ ./configure "${_conf[@]}" diff --git a/Documents/code/AUR/pumopm-git/PKGBUILD b/Documents/code/AUR/pumopm-git/PKGBUILD index 5332a77..e4f871f 100644 --- a/Documents/code/AUR/pumopm-git/PKGBUILD +++ b/Documents/code/AUR/pumopm-git/PKGBUILD @@ -10,14 +10,14 @@ depends=() makedepends=('rustup' 'git') options=('strip' 'zipman') source=("$pkgname::git+https://labs.phundrak.com/phundrak/pumopm.git#branch=develop") -md5sums=('SKIP') +sha512sums=('SKIP') conflicts=('pumopm' 'pumopm-bin') # If Phundrak’s Gitea takes too long to answer, or if it is down, use the # Github mirror # source=("$pkgname}::git+https://github.com/Phundrak/pumopm.git#branch=develop") pkgver() { - cd "$pkgname" + cd "$pkgname" git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } diff --git a/Documents/code/AUR/sent/PKGBUILD b/Documents/code/AUR/sent/PKGBUILD index 8800723..2f99c78 100644 --- a/Documents/code/AUR/sent/PKGBUILD +++ b/Documents/code/AUR/sent/PKGBUILD @@ -14,29 +14,27 @@ makedepends=('git') conflicts=('sent' 'sent-git') source=("$pkgname::git+https://labs.phundrak.com/phundrak/sent") sha256sums=('SKIP') -# "config.h") -# 'SKIP') pkgver() { - cd "${pkgname}" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd "${pkgname}" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd "${srcdir}/${pkgname}" - if [ -f "${srcdir}/config.h" ]; then - cp "${srcdir}/config.h" . - fi + cd "${srcdir}/${pkgname}" + if [ -f "${srcdir}/config.h" ]; then + cp "${srcdir}/config.h" . + fi } build() { - make -C "${srcdir}/${pkgname}" + make -C "${srcdir}/${pkgname}" } package() { - cd "${srcdir}/${pkgname}" - make PREFIX="/usr" \ - DESTDIR="${pkgdir}" \ - install - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd "${srcdir}/${pkgname}" + make PREFIX="/usr" \ + DESTDIR="${pkgdir}" \ + install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/Documents/code/AUR/sxiv/PKGBUILD b/Documents/code/AUR/sxiv/PKGBUILD index 30e8b38..296da04 100644 --- a/Documents/code/AUR/sxiv/PKGBUILD +++ b/Documents/code/AUR/sxiv/PKGBUILD @@ -16,8 +16,8 @@ makedepends=('git') provides=("${_name}") conflicts=("${_name}" "${_name}-git") source=("${_name}::git+${url}.git" config.h) -md5sums=('SKIP' - '0a944f532b962cac835ee65d616be61b') +sha512sums=('SKIP' + 'f3cd5532977033ffb878e397c76b4576f931b74dc2c158f373d6618d0d4155387bc983b745f0adeffeee85de9ebdc9e9418d823cceef8895b2d8e6ab1d4791ca') pkgver() { @@ -26,10 +26,7 @@ pkgver() { } prepare() { - # echo ===================== - # echo srcdir $srcdir cd "${srcdir}/${_name}" - # use your customisations if present [[ -f $srcdir/config.h ]] && cp $srcdir/config.h . # Allow custom FLAGS