diff options
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 50 |
2 files changed, 30 insertions, 25 deletions
@@ -1,10 +1,10 @@ pkgbase = meld-git pkgdesc = Visual diff and merge tool - pkgver = 3.21.0.125.ga96e5cc0 + pkgver = 3.21.0.216.g6e00779e pkgrel = 1 url = http://meldmerge.org/ - arch = any license = GPL + arch = any makedepends = git makedepends = intltool makedepends = meson @@ -24,4 +24,3 @@ pkgbase = meld-git sha256sums = SKIP pkgname = meld-git - @@ -2,47 +2,53 @@ _pkgname=meld pkgname=$_pkgname-git -pkgver=3.21.0.125.ga96e5cc0 +pkgver=3.21.0.216.g6e00779e pkgrel=1 -_realver=3.21.0 pkgdesc='Visual diff and merge tool' -arch=('any') url='http://meldmerge.org/' -license=('GPL') -depends=('dconf' - 'glib2' - 'gsettings-desktop-schemas' - 'gtk3' - 'gtksourceview4' - 'python-cairo' - 'python-gobject') -makedepends=('git' - 'intltool' - 'meson' - 'yelp-tools') +license=(GPL) +arch=(any) +depends=(dconf + glib2 + gsettings-desktop-schemas + gtk3 + gtksourceview4 + python-cairo + python-gobject) +makedepends=(git + intltool + meson + yelp-tools) optdepends=('python-dbus: open a new tab in an already running instance') provides=('meld') conflicts=('meld' 'meld-dev') options=('!emptydirs') source=("git+https://gitlab.gnome.org/GNOME/meld.git") +_merge_requests_to_use=('76') sha256sums=('SKIP') pkgver() { - cd "$srcdir/$_pkgname" + cd $_pkgname git describe --always | sed 's|-|.|g' } prepare() { - cd "$srcdir/$_pkgname" + cd $_pkgname + + # Apply merge request 76 to fix launching Meld. + # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/76 + echo "Downloading and applying merge request 76..." + curl -O "https://gitlab.gnome.org/GNOME/meld/-/merge_requests/76.diff" + git apply 76.diff } build() { - cd "$srcdir/$_pkgname" - arch-meson build -D byte-compile=false - ninja -C build + cd $srcdir + arch-meson build $_pkgname -D byte-compile=false + meson compile -C build } package() { - cd "$srcdir/$_pkgname" - DESTDIR="${pkgdir}" meson install -C build + cd $srcdir + meson install -C build --destdir "$pkgdir" } |