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

[David Runge]

    Date: Friday, July 17, 2020 @ 10:36:18
  Author: dvzrv
Revision: 664268

upgpkg: jack_mixer 13-1: Upgrading to 13.

Adding new-session-manager to optdepends.
Removing gconf related patch (upstream removed gconf capabilities).
Touching a README to make autotools happy.

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

----------------------------------+
 PKGBUILD                         |   21 ++++++++-----------
 jack_mixer-12-remove_gconf.patch |   40 -------------------------------------
 2 files changed, 9 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-17 10:10:01 UTC (rev 664267)
+++ PKGBUILD	2020-07-17 10:36:18 UTC (rev 664268)
@@ -1,8 +1,8 @@
 # Maintainer: David Runge <dvzrv at archlinux.org>
 
 pkgname=jack_mixer
-pkgver=12
-pkgrel=2
+pkgver=13
+pkgrel=1
 pkgdesc="Jack desktop mixer application"
 arch=('x86_64')
 url="https://github.com/jack-mixer/jack_mixer"
@@ -11,20 +11,17 @@
 depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'python-cairo'
 'python-gobject')
 makedepends=('glib2' 'jack')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/jack-mixer/${pkgname}/archive/release-${pkgver}.tar.gz"
-        "${pkgname}-12-remove_gconf.patch")
-sha512sums=('e49a5fa901de38230911c73e2ea60ea8e9e400c5ae1ca5220181e25d5eda5506f61f8dfdaf99839e73b4c9af62d035acf2ef471c304dc1743e1f61f0444bf1f8'
-            '3187b3f6d6d94259e9e291021f0bba10106379beaba902638b5de6f0ce70ace6695c9e04dd0659e3fd25e7615b4a4587b6b1a7548d4059248c3d3e3a99edfd30')
-b2sums=('1d83452ba02286b069441ebb14008950bbbe1668582d6372a9ff5de4be333f0f63b4e3fea5cb5509a41f05df13a6f03e5ee5ca41688ba82b18970b569362a619'
-        '1b4f68f5e5b5a3369aea778f8e10428febc702093a571429b0c8c845d68c8f3ca770a2813e18eec59ec4c4224e023969fee800e6c6c8b63e1552a400d8b73957')
+optdepends=('new-session-manager: for session management')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/jack-mixer/${pkgname}/archive/release-${pkgver}.tar.gz")
+sha512sums=('bc6cfab074a9a1f4e0a0f587a33509048526de684cd4cdc0fab7a13fe1ed120577d706e65729a046c3a26d3faa2ab0812166a766eaa902ef1a4d71e2205b47c5')
+b2sums=('26a2bd1df73e6563692bb131693f147db563df3e6f9105dad018e390e4d4b070d890b6a5746339dac33484223df332359a5fa9c1922d687249abfe9bd8f8be47')
 
 prepare() {
   mv -v "$pkgname-release-$pkgver" "$pkgname-$pkgver"
   cd "$pkgname-$pkgver"
-  # remove legacy gconf integration
-  # https://github.com/jack-mixer/jack_mixer/issues/2
-  patch -Np1 -i "../${pkgname}-12-remove_gconf.patch"
-  ./autogen.sh
+  # keep autotools happy by creating README
+  touch README
+  autoreconf -vfi
 }
 
 build() {

Deleted: jack_mixer-12-remove_gconf.patch
===================================================================
--- jack_mixer-12-remove_gconf.patch	2020-07-17 10:10:01 UTC (rev 664267)
+++ jack_mixer-12-remove_gconf.patch	2020-07-17 10:36:18 UTC (rev 664268)
@@ -1,40 +0,0 @@
-diff -ruN a/Makefile.am b/Makefile.am
---- a/Makefile.am	2020-06-22 14:51:45.000000000 +0200
-+++ b/Makefile.am	2020-06-23 11:45:50.918537263 +0200
-@@ -59,21 +59,9 @@
- test: _jack_mixer_c.so
- 	@./test.py
- 
--schemadir = @GCONF_SCHEMA_FILE_DIR@
--schema_DATA = jack_mixer.schemas
--
- install-exec-hook:
- 	ln -vfs jack_mixer.py $(DESTDIR)$(bindir)/jack_mixer
- 
--if GCONF_SCHEMAS_INSTALL
--install-data-hook:
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
--
--uninstall-hook:
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
--	rm -vf $(DESTDIR)$(bindir)/jack_mixer
--endif
--
- 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")