Click here to go back to the commit logs for ueberzug-git.

Commit:

---

Hash: bfc4fb48d34e0db9ad549f46db0b533cf6974b0c

Message: meson and conflicts with ueberzugpp

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index e48560a..6fc4a73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,11 +2,12 @@ generated-by = makedeb
 pkgname = ueberzug-git
 pkgbase = ueberzug-git
 pkgdesc = ueberzug is an python script which aims to replace w3mimgdisplay
-pkgrel = 2
-pkgver = 18.2.1.r0.g637d7fc
+pkgrel = 1
+pkgver = 18.3.0.r0.gfcc7cd9
 url = https://github.com/ueber-devel/ueberzug
 arch = amd64
 conflicts = ueberzug
+conflicts = ueberzugpp
 depends = libxext6
 depends = libxres1
 depends = python3-pil
@@ -15,15 +16,15 @@ depends = python3-docopt
 depends = python3-attr
 license = GPL3
 makedepends = git
-makedepends = python3-setuptools
+makedepends = python3-mesonpy
 makedepends = python3-dev
 makedepends = libxext-dev
 makedepends = libxres-dev
-provides = ueberzug=18.2.1.r0.g637d7fc
+provides = ueberzug=18.3.0.r0.gfcc7cd9
 source = git+https://github.com/ueber-devel/ueberzug
 b2sums = SKIP
 makedepends = git
-makedepends = python3-setuptools
+makedepends = python3-mesonpy
 makedepends = python3-dev
 makedepends = libxext-dev
 makedepends = libxres-dev
diff --git a/PKGBUILD b/PKGBUILD
index f47a54f..fafb8be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: exponential <echo ZXhwb25lbnRpYWxtYXRyaXhAcHJvdG9ubWFpbC5jb20K | base64 -d>
-# Contributor: mehalter <micah at mehalter.com>
+# Contributor: mehalter (AUR) <micah at mehalter.com>
 _pkgname=ueberzug
 pkgname=${_pkgname}-git
-pkgver=18.2.1.r0.g637d7fc
-pkgrel=2
+pkgver=18.3.0.r0.gfcc7cd9
+pkgrel=1
 pkgdesc="ueberzug is an python script which aims to replace w3mimgdisplay"
 arch=('amd64')
 url="https://github.com/ueber-devel/${_pkgname}"
 license=('GPL3')
 depends=("libxext6" "libxres1" "python3-pil" "python3" "python3-docopt" "python3-attr")
-makedepends=("git" "python3-setuptools" "python3-dev" "libxext-dev" "libxres-dev")
+makedepends=("git" "python3-mesonpy" "python3-dev" "libxext-dev" "libxres-dev")
 source=("git+${url}")
 b2sums=('SKIP')
-conflicts=("${_pkgname}")
+conflicts=("${_pkgname}" "ueberzugpp")
 provides=("${_pkgname}=${pkgver}")
 
 pkgver() {
@@ -22,14 +22,18 @@ pkgver() {
 
 build() {
   cd "$srcdir/$_pkgname"
-  python3 setup.py build
+  python3 -m build --no-isolation --wheel
 }
 
 package() {
   cd "$srcdir/$_pkgname"
-  python3 setup.py install --prefix=/usr --root "${pkgdir}" --optimize=1 --skip-build --install-layout deb
+  python3 -m installer --destdir="$pkgdir" dist/*.whl #--optimize=1 --skip-build
+  # Manual remove local
+  mv "$pkgdir/usr/local/"* "$pkgdir/usr/"
+  rmdir "$pkgdir/usr/local"
   # bug, remove sources
   rm -Rf "$pkgdir/usr/lib/python3/dist-packages/ueberzug/X"
-  install -Dm644 "LICENSE" "$pkgdir/usr/share/doc/$_pkgname/license"
+  # doc
   install -Dm644 "README.md" "$pkgdir/usr/share/doc/$_pkgname/readme"
+  ln -s /usr/share/common-licenses/GPL-3 "$pkgdir/usr/share/doc/$_pkgname/"
 }