[arch-commits] Commit in mypaint/trunk (PKGBUILD)

[Balló György]

    Date: Friday, October 4, 2019 @ 14:29:38
  Author: bgyorgy
Revision: 512736

upgpkg: mypaint 1.2.1-11

Remove conflicting files with libmypaint (FS#63663)

Modified:
  mypaint/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-04 14:05:15 UTC (rev 512735)
+++ PKGBUILD	2019-10-04 14:29:38 UTC (rev 512736)
@@ -4,15 +4,15 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Fast and easy painting application for digital painters, with brush dynamics"
 arch=('x86_64')
 url="http://mypaint.org/"
 license=('GPL')
-depends=('gtk3' 'python2-cairo' 'python2-gobject' 'python2-numpy')
+depends=('gtk3' 'libmypaint' 'python2-cairo' 'python2-gobject' 'python2-numpy')
 makedepends=('scons' 'swig')
 # requires mypaint 2.0 with libmypaint 2.0 to work dynamically
-conflicts=('libmypaint')
+options=('!emptydirs')
 source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
         fix-wayland.patch
         0001-Fix-AppStream-metadata-validation.patch
@@ -38,6 +38,7 @@
 
   # FS#63288 -> https://github.com/mypaint/mypaint/issues/1030
   patch -p1 -i ../e05fc17118b6dc20adfe0652756df023528a7fc0.patch
+  sed -i 's|ui_dir = os.path.dirname(os.path.abspath(__file__))|ui_dir = "/usr/share/mypaint/gui"|' gui/brusheditor.py
 
   # Don't use legacy path for AppStream metainfo file
   sed -i 's|/share/appdata|/share/metainfo|' SConscript
@@ -60,4 +61,9 @@
     python2 -m compileall -d "${_destdir}" "${_file}"
     python2 -O -m compileall -d "${_destdir}" "${_file}"
   done < <(find "${pkgdir}"/usr/lib/ -name '*.py' -print0)
+
+  # Remove conflicting files with the libmypaint package
+  rm -r "$pkgdir"/usr/include/ "$pkgdir"/usr/lib/pkgconfig/
+  rm "$pkgdir"/usr/lib/libmypaint.a
+  rm -r "$pkgdir"/usr/share/locale/*/LC_MESSAGES/libmypaint.mo
 }