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

[Eli Schwartz]

    Date: Wednesday, September 11, 2019 @ 23:39:25
  Author: eschwartz
Revision: 509329

upgpkg: mypaint 1.2.1-10

backport upstream patch to build with swig 4 -- changes location of installed .py files
also, compile bytecode

Modified:
  mypaint/trunk/PKGBUILD
Deleted:
  mypaint/trunk/mypaint-swig3.patch

---------------------+
 PKGBUILD            |   20 ++++++++++++++------
 mypaint-swig3.patch |   11 -----------
 2 files changed, 14 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-11 21:23:31 UTC (rev 509328)
+++ PKGBUILD	2019-09-11 23:39:25 UTC (rev 509329)
@@ -4,13 +4,13 @@
 
 pkgname=mypaint
 pkgver=1.2.1
-pkgrel=9
+pkgrel=10
 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')
-makedepends=('scons' 'swig3')
+makedepends=('scons' 'swig')
 # requires mypaint 2.0 with libmypaint 2.0 to work dynamically
 conflicts=('libmypaint')
 source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc}
@@ -17,7 +17,7 @@
         fix-wayland.patch
         0001-Fix-AppStream-metadata-validation.patch
         scons-python3.patch
-        mypaint-swig3.patch)
+        https://github.com/mypaint/mypaint/commit/e05fc17118b6dc20adfe0652756df023528a7fc0.patch)
 validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick
 sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7'
             'SKIP'
@@ -24,7 +24,7 @@
             '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b'
             '5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b'
             'f2f99e7d0db538eb2c9c084077e7c8ceb480911318b3c0fbf23cf9cc37bfc893'
-            '1d76b18aee23257204d78cc6632d3723d2d882527d36ed0db0844307977edaea')
+            'b2743d0d3c6d894385bb154ac1594d370adb83ba3ac9beb135c2a196934dfc3b')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -36,12 +36,13 @@
   # https://github.com/mypaint/mypaint/pull/955
   patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
 
+  # FS#63288 -> https://github.com/mypaint/mypaint/issues/1030
+  patch -p1 -i ../e05fc17118b6dc20adfe0652756df023528a7fc0.patch
+
   # Don't use legacy path for AppStream metainfo file
   sed -i 's|/share/appdata|/share/metainfo|' SConscript
 
   patch -p1 -i ../scons-python3.patch
-
-  patch -p1 -i ../mypaint-swig3.patch # FS#63288
 }
 
 build() {
@@ -52,4 +53,11 @@
 package() {
   cd $pkgname-$pkgver
   scons prefix="$pkgdir"/usr install python_binary=python2 python_config=python2-config
+
+  # This is kind of ugly but removes traces of the build root.
+  while read -rd '' _file; do
+    _destdir="$(dirname "${_file#${pkgdir}}")"
+    python2 -m compileall -d "${_destdir}" "${_file}"
+    python2 -O -m compileall -d "${_destdir}" "${_file}"
+  done < <(find "${pkgdir}"/usr/lib/ -name '*.py' -print0)
 }

Deleted: mypaint-swig3.patch
===================================================================
--- mypaint-swig3.patch	2019-09-11 21:23:31 UTC (rev 509328)
+++ mypaint-swig3.patch	2019-09-11 23:39:25 UTC (rev 509329)
@@ -1,11 +0,0 @@
---- mypaint-1.2.1/SConstruct.orig	2019-09-07 08:59:20.675785294 +0000
-+++ mypaint-1.2.1/SConstruct	2019-09-07 08:59:33.795961507 +0000
-@@ -63,7 +63,7 @@
-     # patch with a suitable options switch.
-     tools.append("mingw")
- 
--env = Environment(ENV=os.environ, options=opts, tools=tools)
-+env = Environment(ENV=os.environ, options=opts, tools=tools, SWIG='swig-3')
- 
- Help(opts.GenerateHelpText(env))
-