Hello community, here is the log from the commit of package xapps for openSUSE:Factory checked in at 2020-03-07 21:41:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xapps (Old) and /work/SRC/openSUSE:Factory/.xapps.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xapps" Sat Mar 7 21:41:17 2020 rev:10 rq:780690 version:1.6.10 Changes: -------- --- /work/SRC/openSUSE:Factory/xapps/xapps.changes 2020-02-03 11:12:42.449826409 +0100 +++ /work/SRC/openSUSE:Factory/.xapps.new.26092/xapps.changes 2020-03-07 21:41:17.608395914 +0100 @@ -1,0 +2,5 @@ +Sun Mar 1 05:20:54 UTC 2020 - Marguerite Su <i...@marguerite.su> + +- Add xapps-python3.patch, fix issues to build without python2 + +------------------------------------------------------------------- New: ---- xapps-python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xapps.spec ++++++ --- /var/tmp/diff_new_pack.lB5eWY/_old 2020-03-07 21:41:18.208396318 +0100 +++ /var/tmp/diff_new_pack.lB5eWY/_new 2020-03-07 21:41:18.212396321 +0100 @@ -1,7 +1,7 @@ # # spec file for package xapps # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,11 +29,14 @@ Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE xapps-void-return-no-return.patch -- Satisfy rpmlint checks. Patch0: xapps-void-return-no-return.patch +# PATCH-FIX-UPSTREAM xapps-python3.patch -- python2 is gone +Patch1: xapps-python3.patch BuildRequires: fdupes BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme BuildRequires: meson BuildRequires: pkgconfig +BuildRequires: python3-gobject BuildRequires: vala BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.22.0 @@ -115,6 +118,7 @@ %autosetup -p1 %build +python3 -c 'import gi;print(gi._overridesdir)' %meson \ -Ddocs=true %meson_build @@ -148,7 +152,7 @@ %files -n %{typelib} %{_libdir}/girepository-1.0/XApp-1.0.typelib -%{python_sitearch}/gi/overrides/XApp.py +#%{python_sitearch}/gi/overrides/XApp.py %{python3_sitearch}/gi/overrides/XApp.py %files -n %{soname}-devel ++++++ xapps-python3.patch ++++++ Index: xapps-1.6.10/pygobject/meson.build =================================================================== --- xapps-1.6.10.orig/pygobject/meson.build +++ xapps-1.6.10/pygobject/meson.build @@ -3,14 +3,14 @@ pygobject = dependency('pygobject-3.0', required: true, ) -foreach exec : ['python2', 'python3'] - r = run_command(exec, '-c', 'import gi;print(gi._overridesdir)') +r = run_command('python3', '-c', 'import gi;print(gi._overridesdir)') +message('return code: @0@'.format(r.returncode())) - if r.returncode() == 0 - override_dir = r.stdout().strip() - install_data(['XApp.py'], - install_dir: override_dir - ) - endif -endforeach +if r.returncode() == 0 + override_dir = r.stdout().strip() + message('override_dir: @0@'.format(override_dir)) + install_data(['XApp.py'], + install_dir: override_dir + ) +endif
