[SCM] gmusicbrowser/master: Refreshed patches.

unit193-guest at users.alioth.debian.org unit193-guest at users.alioth.debian.org
Tue Sep 9 01:20:39 UTC 2014 

The following commit has been merged in the master branch:
commit bd7daf904a9a3f42f8dc42b9f9855f9be1332c19
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Mon Sep 8 18:55:49 2014 -0400

    Refreshed patches.

diff --git a/debian/patches/shimmer-layouts b/debian/patches/shimmer-layouts
index eb49062..3cf51e6 100644
--- a/debian/patches/shimmer-layouts
+++ b/debian/patches/shimmer-layouts
@@ -14,12 +14,12 @@ Subject: [PATCH] shimmer-layouts update
 
 --- a/gmbrc.default
 +++ b/gmbrc.default
-@@ -10,6 +10,16 @@
+@@ -10,7 +10,16 @@
  PLUGIN_LYRICS: 1
  PLUGIN_FETCHCOVER: 1
  PLUGIN_AUTOSAVE: 1
 +PLUGIN_ARTISTINFO: 1
-+PLUGIN_MPRIS2: 1
+ PLUGIN_MPRIS2: 1
 +
 +UseTray: 0
 +
@@ -33,7 +33,7 @@ Subject: [PATCH] shimmer-layouts update
  #Layout: Small player
 --- a/gmusicbrowser.pl
 +++ b/gmusicbrowser.pl
-@@ -500,9 +500,9 @@ our @cMenuAA=
+@@ -569,9 +569,9 @@ our @cMenuAA=
  (	{ label => _"Lock",	code => sub { ToggleLock($_[0]{lockfield}); }, check => sub { $::TogLock && $::TogLock eq $_[0]{lockfield}}, mode => 'P',
  	  test	=> sub { $_[0]{field} eq $_[0]{lockfield} || $_[0]{gid} == Songs::Get_gid($::SongID,$_[0]{lockfield}); },
  	},
@@ -55,8 +55,8 @@ Subject: [PATCH] shimmer-layouts update
 +use utf8;
  
  package Layout;
- use Gtk2;
-@@ -245,6 +246,7 @@ our %Widgets=
+ 
+@@ -256,6 +257,7 @@ our %Widgets=
  	{	class	=> 'Layout::Label',
  		group	=> 'Play',
  		minsize	=> 20,
@@ -64,7 +64,7 @@ Subject: [PATCH] shimmer-layouts update
  		markup	=> '<b><big>%S</big></b>%V',
  		markup_empty => '<b><big><'._("Playlist Empty").'></big></b>',
  		click1	=> \&PopupSongsFromAlbum,
-@@ -268,6 +270,10 @@ our %Widgets=
+@@ -279,6 +281,10 @@ our %Widgets=
  		dragsrc => [::DRAG_ARTIST,\&DragCurrentArtist],
  		cursor	=> 'hand2',
  	},
@@ -75,7 +75,7 @@ Subject: [PATCH] shimmer-layouts update
  	Album =>
  	{	class	=> 'Layout::Label',
  		group	=> 'Play',
-@@ -278,6 +284,10 @@ our %Widgets=
+@@ -289,6 +295,10 @@ our %Widgets=
  		dragsrc => [::DRAG_ALBUM,\&DragCurrentAlbum],
  		cursor	=> 'hand2',
  	},
@@ -86,18 +86,15 @@ Subject: [PATCH] shimmer-layouts update
  	Year =>
  	{	class	=> 'Layout::Label',
  		group	=> 'Play',
-@@ -372,8 +382,10 @@ our %Widgets=
+@@ -383,6 +393,7 @@ our %Widgets=
  		group	=> 'Play',
  		aa	=> 'album',
  		oldopt1 => 'maxsize',
-+		options => 'showcover',
++		options	=> 'showcover',
  		schange	=> sub { my $key=(defined $_[1])? Songs::Get_gid($_[1],'album') : undef ; $_[0]->set($key); },
  		click1	=> \&PopupSongsFromAlbum,
-+		click3	=> sub { my $ID=::GetSelID($_[0]); ::PopupAAContextMenu({self =>$_[0], field=>'album', ID=>$ID, gid=>Songs::Get_gid($ID,'album'), mode => 'P'}) if defined $ID; },
- 		event	=> 'Picture_album',
- 		update	=> \&Layout::AAPicture::Changed,
- 		noinit	=> 1,
-@@ -387,6 +399,7 @@ our %Widgets=
+ 		click3	=> sub { my $ID=::GetSelID($_[0]); ::PopupAAContextMenu({self =>$_[0], field=>'album', ID=>$ID, gid=>Songs::Get_gid($ID,'album'), mode => 'P'}) if defined $ID; },
+@@ -399,6 +410,7 @@ our %Widgets=
  		oldopt1 => 'maxsize',
  		schange	=> sub { my $key=(defined $_[1])? Songs::Get_gid($_[1],'artists') : undef ;$_[0]->set($key); },
  		click1	=> sub { ::PopupAA('artist'); },
@@ -105,7 +102,7 @@ Subject: [PATCH] shimmer-layouts update
  		event	=> 'Picture_artist',
  		update	=> \&Layout::AAPicture::Changed,
  		noinit	=> 1,
-@@ -1594,7 +1607,7 @@ use base 'Gtk2::Window';
+@@ -1649,7 +1661,7 @@ use base 'Gtk2::Window';
  sub new
  {	my ($class,$layout,%options)=@_;
  	my @original_args=@_;
@@ -116,7 +113,7 @@ Subject: [PATCH] shimmer-layouts update
  	{	($layout,$opt0)= $layout=~m/^([^(]+)\((.*)\)$/; #separate layout id and options
 --- a/gmusicbrowser_list.pm
 +++ b/gmusicbrowser_list.pm
-@@ -198,8 +198,8 @@ sub Update
+@@ -195,8 +195,8 @@ sub Update
  	if (!$array)	{ $tip=$text=_"error"; }
  	else		{ $text.= ::CalcListLength($array,$self->{format}); }
  	my $format= $self->{size} ? '<span size="'.$self->{size}.'">%s</span>' : '%s';
@@ -127,7 +124,7 @@ Subject: [PATCH] shimmer-layouts update
  	$self->{needupdate}=0;
  }
  
-@@ -226,7 +226,7 @@ sub filter_Update
+@@ -223,7 +223,7 @@ sub filter_Update
  {	my $self=shift;
  	my $filter=::GetFilter($self);
  	my $array=$filter->filter;
@@ -136,7 +133,7 @@ Subject: [PATCH] shimmer-layouts update
  }
  
  ### list functions
-@@ -245,7 +245,7 @@ sub list_SongArray_changed
+@@ -242,7 +242,7 @@ sub list_SongArray_changed
  sub list_Update
  {	my $self=shift;
  	my $array=::GetSongArray($self) || return;
@@ -145,7 +142,7 @@ Subject: [PATCH] shimmer-layouts update
  }
  
  ### selected functions
-@@ -1593,6 +1593,7 @@ our %Pages=
+@@ -1584,6 +1584,7 @@ our %Pages=
  our @MenuMarkupOptions=
  (	"%a",
  	"<b>%a</b>%Y\n<small>%s <small>%l</small></small>",
@@ -153,7 +150,7 @@ Subject: [PATCH] shimmer-layouts update
  	"<b>%a</b>%Y\n<small>%b</small>",
  	"<b>%a</b>%Y\n<small>%b</small>\n<small>%s <small>%l</small></small>",
  	"<b>%y %a</b>",
-@@ -1609,6 +1610,7 @@ my @mpicsize_menu=
+@@ -1600,6 +1601,7 @@ my @mpicsize_menu=
  	_("medium size")	=> 64,
  	_("big size")		=> 96,
  	_("huge size")		=> 128,
@@ -161,7 +158,7 @@ Subject: [PATCH] shimmer-layouts update
  );
  my @cloudstats_menu=
  (	_("number of songs")	=> 'count',
-@@ -3312,7 +3314,7 @@ sub new
+@@ -3346,7 +3348,7 @@ sub new
  		my $BAlblist=::NewIconButton('gmb-playlist',undef,undef,'none');
  		$BAlblist->signal_connect(button_press_event => \&AlbumListButton_press_cb);
  		$BAlblist->set_tooltip_text(_"Choose Album From this Artist");
@@ -170,7 +167,7 @@ Subject: [PATCH] shimmer-layouts update
  	}
  
  	my $drgsrc=$aa eq 'album' ? ::DRAG_ALBUM : ::DRAG_ARTIST;
-@@ -4598,6 +4600,16 @@ sub button_press_cb
+@@ -4628,6 +4630,16 @@ sub button_press_cb
  		else	{ $self->{pressed}=1; }
  		return 0;
  	}
@@ -187,7 +184,7 @@ Subject: [PATCH] shimmer-layouts update
  	if ($but==3)
  	{	my ($i,$j,$key)=$self->coord_to_index($event->get_coords);
  		if (defined $key && !exists $self->{selected}{$key})
-@@ -5522,7 +5534,7 @@ sub new
+@@ -5551,7 +5563,7 @@ sub new
  	my $default= $::Options{"DefaultOptions_$name"} || {};
  
  	%$opt=( @DefaultOptions, %$default, %$opt );
@@ -196,7 +193,7 @@ Subject: [PATCH] shimmer-layouts update
  
  	#create widgets used to draw the songtree as a treeview, would be nice to do without but it's not possible currently
  	$self->{stylewidget}=Gtk2::TreeView->new;
-@@ -5588,6 +5600,16 @@ sub new
+@@ -5614,6 +5626,16 @@ sub new
  	$self->AddColumn($_) for split / +/,$opt->{cols};
  	unless ($self->{cells}) { $self->AddColumn('title'); } #to ensure there is at least 1 column
  

-- 
gmusicbrowser packaging

More information about the pkg-multimedia-commits mailing list