diff options
| author | Jason Edson | 2021-04-21 12:48:48 -0700 |
|---|---|---|
| committer | Jason Edson | 2021-04-21 12:48:48 -0700 |
| commit | a1d70dd5f3149956aa605f33ba27643f4328c10e (patch) | |
| tree | 1dd0d8e7571e2e685fab65b9d1edfbcaef6e465c | |
| parent | 70545aa4d4b6bf9b2808add83b7553af53bdbce4 (diff) | |
| download | aur-a1d70dd5f3149956aa605f33ba27643f4328c10e.tar.gz | |
Clean up PKGBUILD and force a rebuild
| -rw-r--r-- | .SRCINFO | 79 | ||||
| -rw-r--r-- | PKGBUILD | 75 |
2 files changed, 86 insertions, 68 deletions
@@ -1,45 +1,44 @@ pkgbase = vte3-notification - pkgdesc = Virtual Terminal Emulator widget for use with GTK3 with Fedora patches - pkgver = 0.62.3 - pkgrel = 1 - url = https://wiki.gnome.org/Apps/Terminal/VTE - arch = i686 - arch = x86_64 - license = LGPL - makedepends = git - makedepends = intltool - makedepends = gobject-introspection - makedepends = gtk-doc - makedepends = meson - makedepends = pango - makedepends = vala - makedepends = gperf - makedepends = glade - depends = gtk3 - depends = pcre2 - depends = gnutls - options = !emptydirs - source = git+https://git.gnome.org/browse/vte#tag=0.62.3 - source = vte291-cntnr-precmd-preexec-scroll.patch-03ce959c3bbba97cd9a0c50fa0d6037d695eaf74::https://src.fedoraproject.org/rpms/vte291/raw/03ce959c3bbba97cd9a0c50fa0d6037d695eaf74/f/vte291-cntnr-precmd-preexec-scroll.patch - source = vte291-gcc11.patch-03ce959c3bbba97cd9a0c50fa0d6037d695eaf74::https://src.fedoraproject.org/rpms/vte291/raw/03ce959c3bbba97cd9a0c50fa0d6037d695eaf74/f/vte291-gcc11.patch - source = 0001-Revert-widget-Limit-select-all-to-the-writable-regio.patch-03ce959c3bbba97cd9a0c50fa0d6037d695eaf74::https://src.fedoraproject.org/rpms/vte291/raw/03ce959c3bbba97cd9a0c50fa0d6037d695eaf74/f/0001-Revert-widget-Limit-select-all-to-the-writable-regio.patch - sha256sums = SKIP - sha256sums = 46cdbbf67dcd41c1a4d3c93c50c08ce2f0f58d0fa10d3247bc18a1015c21c1ea - sha256sums = 7615f23c0fdf723c3ad5545b11c4e532d392c8ff1034468e33e85dd66a1d9fd3 - sha256sums = 25dee260b62c310ca00f8ac94b27c86c3d1bcf9dc697ec47e2515079e7ee1310 + pkgdesc = Virtual Terminal Emulator widget for use with GTK3 with Fedora patches + pkgver = 0.62.3 + pkgrel = 2 + url = https://wiki.gnome.org/Apps/Terminal/VTE + arch = i686 + arch = x86_64 + license = LGPL + depends = fribidi + depends = gnutls + depends = gtk3 + depends = pcre2 + depends = systemd-libs + makedepends = git + makedepends = gobject-introspection + makedepends = gperf + makedepends = gtk-doc + makedepends = intltool + makedepends = meson + makedepends = vala + options = !emptydirs + source = git+https://git.gnome.org/browse/vte#tag=0.62.3 + source = vte291-cntnr-precmd-preexec-scroll.patch-03ce959c3bbba97cd9a0c50fa0d6037d695eaf74::https://src.fedoraproject.org/rpms/vte291/raw/03ce959c3bbba97cd9a0c50fa0d6037d695eaf74/f/vte291-cntnr-precmd-preexec-scroll.patch + source = vte291-gcc11.patch-03ce959c3bbba97cd9a0c50fa0d6037d695eaf74::https://src.fedoraproject.org/rpms/vte291/raw/03ce959c3bbba97cd9a0c50fa0d6037d695eaf74/f/vte291-gcc11.patch + source = 0001-Revert-widget-Limit-select-all-to-the-writable-regio.patch-03ce959c3bbba97cd9a0c50fa0d6037d695eaf74::https://src.fedoraproject.org/rpms/vte291/raw/03ce959c3bbba97cd9a0c50fa0d6037d695eaf74/f/0001-Revert-widget-Limit-select-all-to-the-writable-regio.patch + sha256sums = SKIP + sha256sums = 46cdbbf67dcd41c1a4d3c93c50c08ce2f0f58d0fa10d3247bc18a1015c21c1ea + sha256sums = 7615f23c0fdf723c3ad5545b11c4e532d392c8ff1034468e33e85dd66a1d9fd3 + sha256sums = 25dee260b62c310ca00f8ac94b27c86c3d1bcf9dc697ec47e2515079e7ee1310 pkgname = vte3-notification - depends = gtk3 - depends = pcre2 - depends = gnutls - depends = vte-notification-common - provides = vte3=0.62.3 - conflicts = vte3 + depends = gtk3 + depends = pcre2 + depends = gnutls + depends = vte-notification-common + provides = vte3=0.62.3 + conflicts = vte3 pkgname = vte-notification-common - pkgdesc = Common files used by vte and vte3 - arch = any - depends = sh - provides = vte-common=0.62.3 - conflicts = vte-common - + pkgdesc = Common files used by vte and vte3 + arch = any + depends = sh + provides = vte-common=0.62.3 + conflicts = vte-common @@ -7,13 +7,23 @@ pkgbase='vte3-notification' pkgname=("${pkgbase}" 'vte-notification-common') pkgver=0.62.3 -pkgrel=1 +pkgrel=2 pkgdesc='Virtual Terminal Emulator widget for use with GTK3 with Fedora patches' arch=('i686' 'x86_64') url='https://wiki.gnome.org/Apps/Terminal/VTE' license=('LGPL') -depends=('gtk3' 'pcre2' 'gnutls') -makedepends=('git' 'intltool' 'gobject-introspection' 'gtk-doc' 'meson' 'pango' 'vala' 'gperf' 'glade') +depends=('fribidi' + 'gnutls' + 'gtk3' + 'intltool' + 'pcre2' + 'systemd-libs') +makedepends=('git' + 'gobject-introspection' + 'gtk-doc' + 'meson' + 'vala' + 'gperf') options=('!emptydirs') # Fedora patches: https://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/ @@ -28,10 +38,10 @@ _fcommit='03ce959c3bbba97cd9a0c50fa0d6037d695eaf74' _vtetag=${pkgver} source=( - "git+https://git.gnome.org/browse/vte#tag=$_vtetag" - "${_fpatchfile100}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile100}" - "${_fpatchfile101}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile101}" - "${_fpatchfile000}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile000}" + "git+https://git.gnome.org/browse/vte#tag=$_vtetag" + "${_fpatchfile100}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile100}" + "${_fpatchfile101}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile101}" + "${_fpatchfile000}-${_fcommit}::${_frepourl}/raw/${_fcommit}/f/${_fpatchfile000}" ) sha256sums=('SKIP' '46cdbbf67dcd41c1a4d3c93c50c08ce2f0f58d0fa10d3247bc18a1015c21c1ea' @@ -39,38 +49,47 @@ sha256sums=('SKIP' '25dee260b62c310ca00f8ac94b27c86c3d1bcf9dc697ec47e2515079e7ee1310') prepare () { - cd "vte" + cd "vte" - patch -p1 -i "../${_fpatchfile000}-${_fcommit}" - patch -p1 -i "../${_fpatchfile100}-${_fcommit}" - patch -p1 -i "../${_fpatchfile101}-${_fcommit}" + patch -p1 -i "../${_fpatchfile000}-${_fcommit}" + patch -p1 -i "../${_fpatchfile100}-${_fcommit}" + patch -p1 -i "../${_fpatchfile101}-${_fcommit}" } build() { - arch-meson vte build -Db_lto=false -D docs=true - ninja -C build + arch-meson vte build \ + -D b_lto=false \ + -D docs=true + meson compile -C build +} + +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done } package_vte3-notification(){ - depends+=('vte-notification-common') - provides=("vte3=${pkgver}") - conflicts=('vte3') + depends+=('vte-notification-common') + provides=("vte3=${pkgver}") + conflicts=('vte3') - DESTDIR="${pkgdir}" meson install -C build + DESTDIR="${pkgdir}" meson install -C build - mv "$pkgdir/etc/profile.d/vte.sh" "$srcdir" - mv "$pkgdir/etc/profile.d/vte.csh" "$srcdir" - mv "$pkgdir/usr/lib/vte-urlencode-cwd" "$srcdir" + _pick vte-common "$pkgdir"/etc/profile.d + _pick vte-common "$pkgdir"/usr/lib/{systemd,vte-urlencode-cwd} } package_vte-notification-common() { - depends=('sh') - pkgdesc='Common files used by vte and vte3' - arch=('any') - provides=("vte-common=${pkgver}") - conflicts=('vte-common') + depends=('sh') + pkgdesc='Common files used by vte and vte3' + arch=('any') + provides=("vte-common=${pkgver}") + conflicts=('vte-common') - install -Dt "$pkgdir/etc/profile.d" -m644 vte.sh - install -Dt "$pkgdir/etc/profile.d" -m644 vte.csh - install -Dt "$pkgdir/usr/lib" -m755 vte-urlencode-cwd + mv vte-common/* "$pkgdir" } |