Bring [pcr/gmusicbrowser] up-to-date

3 files changed, 28 insertions, 72 deletions

diff --git a/pcr/gmusicbrowser/PKGBUILD b/pcr/gmusicbrowser/PKGBUILD
index 1aaef00f7..ca9f7db14 100644
--- a/pcr/gmusicbrowser/PKGBUILD
+++ b/pcr/gmusicbrowser/PKGBUILD
@@ -1,52 +1,44 @@
-# Maintainer (Arch): Spike29 <leguen.yannick@gmail.com>
-# Contributor (Arch): jsteel <mail at jsteel dot org>
-# Contributor (Arch): Corrado Primier <bardo@aur.archlinux.org>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer: Freemor <freemor@freemor.ca>
+# Contributor (AUR): Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
+# Contributor (AUR): Spike29 <leguen.yannick@gmail.com>
+# Contributor (AUR): jsteel <mail at jsteel dot org>
+# Contributor (AUR): Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=gmusicbrowser
-pkgver=1.1.15
-pkgrel=6
-pkgdesc="A customizable open-source jukebox for large collections"
-arch=('any')
-url="http://gmusicbrowser.org"
-license=('GPL3')
-depends=('gtk2-perl' 'hicolor-icon-theme' 'perl-net-dbus')
+pkgver=1.1.16
+pkgrel=1
+pkgdesc="Open-source jukebox for large collections of mp3/ogg/flac files, written in perl."
+arch=(any)
+url="https://gmusicbrowser.org/"
+license=(GPL3)
+depends=(gtk2-perl perl-net-dbus perl-locale-gettext perl-glib-object-introspection)
+makedepends=(discount)
 optdepends=('alsa-utils: enables the ALSA backend'
             'flac123: flac support for the ALSA backend'
             'mpg321: mp3 support for the ALSA backend'
             'vorbis-tools: vorbis support for the ALSA backend'
             'mplayer: enables the mplayer backend'
             'mpv: enables the mpv backend'
-	    'gstreamer: enables the gstreamer backend'
-            'perl-glib-object-introspection: enables the gstreamer backend'
-            'gst-plugins-base: vorbis support for the gstreamer backend' 
-            'gst-plugins-good: flac support for the gstreamer backend'
-            'gst-plugins-bad: mpc support for the gstreamer backend'
-            'gst-plugins-ugly: mp3 support for the gstreamer backend'
-            'perl-gstreamer: enables the old gstreamer0.10 backend'
-            'gstreamer0.10-base: vorbis support for the gstreamer0.10 backend' 
-            'gstreamer0.10-good-plugins: flac support for the gstreamer0.10 backend'
-            'gstreamer0.10-bad-plugins: mpc support for the gstreamer0.10 backend'
-            'gstreamer0.10-ugly-plugins: mp3 support for the gstreamer0.10 backend'
-            'perl-locale-gettext: localization support'
+            'gst-plugins-base: vorbis support'
+            'gst-plugins-good: flac support'
+            'gst-plugins-ugly: mp3 support'
             'perl-gtk2-trayicon: tray icon support'
             'perl-gtk2-appindicator: app indicator plugin support'
             'perl-gtk2-mozembed: web-based plugins support'
             'perl-gtk2-webkit: alternative web-based plugin support'
-            'perl-gtk2-notify: show notifications using libnotify'
-            'perl-html-parser: support for accented characters in lyrics plugin')
-conflicts=('gmusicbrowser-git' 'gmusicbrowser-shimmer' 'gmusicbrowser-shimmer-git')
-options=('!libtool')
-install=$pkgname.install
-source=("$url/download/$pkgname-$pkgver.tar.gz"
-	"perl524.patch")
-md5sums=('4a16dcbe369d4b3cb78fb1a6967a60b3'
-	'2073c1f657d9226326807cabda6a894c')
+            'perl-gnome2-wnck: titlebar plugin support'
+            'perl-html-parser: support for accented characters in lyrics plugin'
+            'perl-gtk2-notify: support for notify plugin')
+source=("$url/download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('c7f10578ca3008e966e66c33a4887020e4b99b6aa5580c4b4771ee228ff603fe')
 
-package() {
-  cd "$srcdir"
-  patch -p0 < perl524.patch
-  cd $pkgname-$pkgver
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make
+}
 
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/pcr/gmusicbrowser/gmusicbrowser.install b/pcr/gmusicbrowser/gmusicbrowser.install
deleted file mode 100644
index 9bf6a223d..000000000
--- a/pcr/gmusicbrowser/gmusicbrowser.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  cat << _EOF
- 
-==> In order to play your music with gmusicbrowser, you need to install:
-- gstreamer, perl-glib-object-introspection + gstreamer plugins or
-- mpg321/vorbis-tools/flac123/alsa-utils or  
-- mplayer or
-- mpv
-(look at optdepends for details)
-     
-_EOF
-}
diff --git a/pcr/gmusicbrowser/perl524.patch b/pcr/gmusicbrowser/perl524.patch
deleted file mode 100644
index 0bbf388cd..000000000
--- a/pcr/gmusicbrowser/perl524.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN gmusicbrowser-1.1.15.ORIG/gmusicbrowser_list.pm gmusicbrowser-1.1.15/gmusicbrowser_list.pm
---- gmusicbrowser-1.1.15.ORIG/gmusicbrowser_list.pm	2015-08-20 01:47:16.000000000 +0200
-+++ gmusicbrowser-1.1.15/gmusicbrowser_list.pm	2016-06-06 18:31:36.650112015 +0200
-@@ -7998,7 +7998,7 @@
- 			unless ($notnow)
- 			{	#warn "$key ---found in ($code,@deps)\n";
- 				if (ref $code)
--				{	my ($func,my @keys)=@$code; #warn " -> ($func, @keys)\n";
-+				{	my ($func, @keys)=@$code; #warn " -> ($func, @keys)\n";
- 					my $out=join ',',map "'$_'", @keys;
- 					my $in= join ',',map "'$_'", @deps; $in=~s#\?##g;
- 					$out= @keys>1 ? "\@var{$out}" : "\$var{$out}";
-diff -ruN gmusicbrowser-1.1.15.ORIG/gmusicbrowser.pl gmusicbrowser-1.1.15/gmusicbrowser.pl
---- gmusicbrowser-1.1.15.ORIG/gmusicbrowser.pl	2015-08-20 01:47:16.000000000 +0200
-+++ gmusicbrowser-1.1.15/gmusicbrowser.pl	2016-06-06 18:31:16.760550402 +0200
-@@ -8977,7 +8977,7 @@
- 
- 	($cmd,my $pattern)= split /:/,$cmd,2;
- 	$pattern='' unless defined $pattern;
--	my ($basecmd,my $prop)= Songs::filter_properties($field,"$cmd:$pattern");
-+	my ($basecmd, $prop)= Songs::filter_properties($field,"$cmd:$pattern");
- 	if (!$prop)
- 	{	$cmd=  Songs::Field_property($field,'default_filter');
- 		($basecmd,$prop)= Songs::filter_properties($field,$cmd);