[arch-commits] Commit in glade/trunk (PKGBUILD python-dep.diff)

[Jan Steffens]

    Date: Monday, November 9, 2020 @ 17:32:44
  Author: heftig
Revision: 399867

try to fix build with python3

Added:
  glade/trunk/python-dep.diff
Modified:
  glade/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    9 +++++++--
 python-dep.diff |   13 +++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-09 17:23:51 UTC (rev 399866)
+++ PKGBUILD	2020-11-09 17:32:44 UTC (rev 399867)
@@ -16,8 +16,10 @@
 groups=(gnome-extra)
 provides=(libgladeui-2.so)
 _commit=9b3f55387f03920e1bf1cea9b7e9c911421cbb3e  # tags/GLADE_3_38_1^0
-source=("git+https://gitlab.gnome.org/GNOME/glade.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/glade.git#commit=$_commit"
+        python-dep.diff)
+sha256sums=('SKIP'
+            'dc1ed48403d473fcacef37fc6dd693e0442e7fed31bb852b20957c71595e2124')
 
 pkgver() {
   cd $pkgname
@@ -26,6 +28,9 @@
 
 prepare() {
   cd $pkgname
+
+  # Fix build with Python 3.9
+  git apply -3 ../python-dep.diff
 }
 
 build() {

Added: python-dep.diff
===================================================================
--- python-dep.diff	                        (rev 0)
+++ python-dep.diff	2020-11-09 17:32:44 UTC (rev 399867)
@@ -0,0 +1,13 @@
+diff --git i/meson.build w/meson.build
+index fc4c4492..0c4b412f 100644
+--- i/meson.build
++++ w/meson.build
+@@ -153,7 +153,7 @@ pygobject_version = '3.8.0'
+ pygobject_dep = dependency('pygobject-3.0', version: '>= ' + pygobject_version, required: get_option('python'))
+ have_python = pygobject_dep.found()
+ if have_python
+-  python_dep = dependency('python-3.8-embed', version: '>= 3.8')
++  python_dep = import('python').find_installation().dependency(embed: true)
+ 
+   version_array = pygobject_version.split('.')
+   config_h.set('PYGOBJECT_REQUIRED_MAJOR', version_array[0].to_int())