diff options
| author | Jason Edson | 2021-03-26 08:46:34 -0700 |
|---|---|---|
| committer | Jason Edson | 2021-03-26 08:46:47 -0700 |
| commit | 5ccad3bb8211b570f5c127d32139534f1de2bbcd (patch) | |
| tree | 55b8183fff404b63d1ff868c577b0f13ed7461e4 | |
| parent | 3530a7b7df3091a54983a9b08273c38cbec5c137 (diff) | |
| download | aur-5ccad3bb8211b570f5c127d32139534f1de2bbcd.tar.gz | |
3.21.0 - Cleaned up PKGBUILD for meson
Also removed the meld.install file as it's not needed anymore
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | PKGBUILD | 39 | ||||
| -rw-r--r-- | meld.install | 14 |
3 files changed, 30 insertions, 47 deletions
@@ -1,27 +1,25 @@ pkgbase = meld-dev pkgdesc = Visual diff and merge tool - pkgver = 3.19.0 + pkgver = 3.21.0 pkgrel = 1 url = http://meldmerge.org/ - install = meld.install arch = any license = GPL makedepends = intltool - makedepends = gnome-doc-utils - makedepends = itstool - depends = python>=3.3 - depends = gtk3>=3.6 - depends = glib2>=2.36 - depends = python2-gobject>=3.14 - depends = pygobject-devel>=3.14 - depends = python-cairo>=1.10.0-6 - optdepends = python2-dbus: open a new tab in an already running instance + makedepends = meson + makedepends = yelp-tools + depends = dconf + depends = gsettings-desktop-schemas + depends = gtksourceview4 + depends = python-cairo + depends = python-gobject + optdepends = python-dbus: open a new tab in an already running instance provides = meld conflicts = meld meld-git replaces = meld meld-git options = !emptydirs - source = https://download.gnome.org/sources/meld/3.19/meld-3.19.0.tar.xz - sha1sums = 14e425a276e45518a18f63d9668c50c9b928ddf5 + source = https://download.gnome.org/sources/meld/3.21/meld-3.21.0.tar.xz + sha256sums = b680114d5ab793324549fd58f4eb202d8e280c0633a0b765ede6dfb34160a81b pkgname = meld-dev @@ -1,28 +1,28 @@ -# Maintainer: Jason Edson <jason@oceighty.co> +# Maintainer: Jason Edson <jaysonedson@gmail.com> _pkgname=meld pkgname=$_pkgname-dev -pkgver=3.19.0 +pkgver=3.21.0 pkgrel=1 pkgdesc='Visual diff and merge tool' +arch=('any') url='http://meldmerge.org/' -license=(GPL) -arch=(any) +license=('GPL') +depends=('dconf' + 'gsettings-desktop-schemas' + 'gtksourceview4' + 'python-cairo' + 'python-gobject') +makedepends=('git' + 'intltool' + 'meson' + 'yelp-tools') +optdepends=('python-dbus: open a new tab in an already running instance') conflicts=('meld' 'meld-git') -replaces=('meld' 'meld-git') provides=('meld') -makedepends=('intltool' 'gnome-doc-utils' 'itstool') -install=meld.install -depends=('python>=3.3' - 'gtk3>=3.6' - 'glib2>=2.36' - 'python-gobject>=3.14' - 'pygobject-devel>=3.14' - 'gtksourceview3>=3.14' - 'python-cairo>=1.10.0-6') -optdepends=('python2-dbus: open a new tab in an already running instance') +options=('!emptydirs') source=("https://download.gnome.org/sources/$_pkgname/${pkgver%.*}/meld-${pkgver}.tar.xz") -sha1sums=('14e425a276e45518a18f63d9668c50c9b928ddf5') +sha256sums=('b680114d5ab793324549fd58f4eb202d8e280c0633a0b765ede6dfb34160a81b') prepare() { cd $_pkgname-$pkgver @@ -30,12 +30,11 @@ prepare() { build() { cd $_pkgname-$pkgver - python3 setup.py build + arch-meson build -D docs=true -D byte-compile=false + ninja -C build } package() { cd $_pkgname-$pkgver - # using --skip-build breaks install - python3 setup.py --no-update-icon-cache --no-compile-schemas \ - install --prefix=/usr --root="$pkgdir" --optimize=1 + DESTDIR="${pkgdir}" meson install -C build } diff --git a/meld.install b/meld.install deleted file mode 100644 index b8c811c1f859..000000000000 --- a/meld.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - update-mime-database /usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file |