[arch-commits] Commit in jack_mixer/trunk (PKGBUILD jack_mixer-12-remove_gconf.patch)

[David Runge]

    Date: Tuesday, June 23, 2020 @ 14:40:43
  Author: dvzrv
Revision: 651369

upgpkg: jack_mixer 12-2: Rebuilding to extend the gconf removal (settings crash otherwise).

Modified:
  jack_mixer/trunk/PKGBUILD
  jack_mixer/trunk/jack_mixer-12-remove_gconf.patch

----------------------------------+
 PKGBUILD                         |    6 +++---
 jack_mixer-12-remove_gconf.patch |   17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-23 14:35:13 UTC (rev 651368)
+++ PKGBUILD	2020-06-23 14:40:43 UTC (rev 651369)
@@ -2,7 +2,7 @@
 
 pkgname=jack_mixer
 pkgver=12
-pkgrel=1
+pkgrel=2
 pkgdesc="Jack desktop mixer application"
 arch=('x86_64')
 url="https://github.com/jack-mixer/jack_mixer"
@@ -14,9 +14,9 @@
 source=("$pkgname-$pkgver.tar.gz::https://github.com/jack-mixer/${pkgname}/archive/release-${pkgver}.tar.gz"
         "${pkgname}-12-remove_gconf.patch")
 sha512sums=('e49a5fa901de38230911c73e2ea60ea8e9e400c5ae1ca5220181e25d5eda5506f61f8dfdaf99839e73b4c9af62d035acf2ef471c304dc1743e1f61f0444bf1f8'
-            '9a7d1ff5255110dfc07f9e9fdf06a155f305e1b9b917242b56daa46ea369cb19355e2c77a5c2fd4f839de847857169afdab3d332f75413bbdfab60e15a889727')
+            '3187b3f6d6d94259e9e291021f0bba10106379beaba902638b5de6f0ce70ace6695c9e04dd0659e3fd25e7615b4a4587b6b1a7548d4059248c3d3e3a99edfd30')
 b2sums=('1d83452ba02286b069441ebb14008950bbbe1668582d6372a9ff5de4be333f0f63b4e3fea5cb5509a41f05df13a6f03e5ee5ca41688ba82b18970b569362a619'
-        '70d0bd15d9d08593b16247844082febb802d01e2dbcd392adf6f1483ef2d823dc07e441108fa416c3b7f21fe8ab7baf6f83f4bdc25718ceeacd19be465ca14de')
+        '1b4f68f5e5b5a3369aea778f8e10428febc702093a571429b0c8c845d68c8f3ca770a2813e18eec59ec4c4224e023969fee800e6c6c8b63e1552a400d8b73957')
 
 prepare() {
   mv -v "$pkgname-release-$pkgver" "$pkgname-$pkgver"

Modified: jack_mixer-12-remove_gconf.patch
===================================================================
--- jack_mixer-12-remove_gconf.patch	2020-06-23 14:35:13 UTC (rev 651368)
+++ jack_mixer-12-remove_gconf.patch	2020-06-23 14:40:43 UTC (rev 651369)
@@ -1,6 +1,6 @@
 diff -ruN a/Makefile.am b/Makefile.am
 --- a/Makefile.am	2020-06-22 14:51:45.000000000 +0200
-+++ b/Makefile.am	2020-06-22 18:57:58.556361735 +0200
++++ b/Makefile.am	2020-06-23 11:45:50.918537263 +0200
 @@ -59,21 +59,9 @@
  test: _jack_mixer_c.so
  	@./test.py
@@ -23,3 +23,18 @@
  pacoinstall:
  	test `whoami` == root # test for root
  	-paco -rvB jack_mixer
+diff -ruN a/gui.py b/gui.py
+--- a/gui.py	2020-06-22 14:51:45.000000000 +0200
++++ b/gui.py	2020-06-23 11:51:38.699062969 +0200
+@@ -16,10 +16,10 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ import gi
+-gi.require_version('GConf', '2.0')
+ from gi.repository import GObject
+ 
+ try:
++    gi.require_version('GConf', '2.0')
+     from gi.repository import GConf
+ except:
+     print("Cannot load Python bindings for GConf, your preferences will not be preserved across jack_mixer invocations")