gmusicbrowser-1.1.15-6: rebuild

3 files changed, 34 insertions, 19 deletions

diff --git a/pcr/gmusicbrowser/PKGBUILD b/pcr/gmusicbrowser/PKGBUILD
index b55bfea61..1aaef00f7 100644
--- a/pcr/gmusicbrowser/PKGBUILD
+++ b/pcr/gmusicbrowser/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgname=gmusicbrowser
 pkgver=1.1.15
-pkgrel=2
+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')
+depends=('gtk2-perl' 'hicolor-icon-theme' 'perl-net-dbus')
 optdepends=('alsa-utils: enables the ALSA backend'
             'flac123: flac support for the ALSA backend'
             'mpg321: mp3 support for the ALSA backend'
@@ -33,17 +33,20 @@ optdepends=('alsa-utils: enables the ALSA backend'
             'perl-gtk2-appindicator: app indicator plugin support'
             'perl-gtk2-mozembed: web-based plugins support'
             'perl-gtk2-webkit: alternative web-based plugin support'
-            'perl-net-dbus: control gmusicbrowser through dbus and gnome hotkeys'
             'perl-gtk2-notify: show notifications using libnotify'
             'perl-html-parser: support for accented characters in lyrics plugin')
-conflicts=('gmusicbrowser-devel' 'gmusicbrowser-development' 'gmusicbrowser-git' 'gmusicbrowser-shimmer' 'gmusicbrowser-shimmer-git')
+conflicts=('gmusicbrowser-git' 'gmusicbrowser-shimmer' 'gmusicbrowser-shimmer-git')
 options=('!libtool')
 install=$pkgname.install
-source=($url/download/$pkgname-$pkgver.tar.gz)
-md5sums=('4a16dcbe369d4b3cb78fb1a6967a60b3')
+source=("$url/download/$pkgname-$pkgver.tar.gz"
+	"perl524.patch")
+md5sums=('4a16dcbe369d4b3cb78fb1a6967a60b3'
+	'2073c1f657d9226326807cabda6a894c')
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "$srcdir"
+  patch -p0 < perl524.patch
+  cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir/" install
 }
diff --git a/pcr/gmusicbrowser/gmusicbrowser.install b/pcr/gmusicbrowser/gmusicbrowser.install
index 049ea6f0a..9bf6a223d 100644
--- a/pcr/gmusicbrowser/gmusicbrowser.install
+++ b/pcr/gmusicbrowser/gmusicbrowser.install
@@ -9,16 +9,4 @@ post_install() {
 (look at optdepends for details)
      
 _EOF
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
 }
diff --git a/pcr/gmusicbrowser/perl524.patch b/pcr/gmusicbrowser/perl524.patch
new file mode 100644
index 000000000..0bbf388cd
--- /dev/null
+++ b/pcr/gmusicbrowser/perl524.patch
@@ -0,0 +1,24 @@
+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);