Bug#749978: guayadeque: Much better patch

2014-08-17 Thread Olly Betts 
On Sat, Aug 16, 2014 at 12:36:04PM +1200, Olly Betts wrote:
 We have a go on the wxsqlite3 transition, so I've NMUed wxsqlite3 to
 unstable.  So guayadeque can be uploaded now.
 
 If you'd like me to just NMU with my latest patch + Damyan's changes (probably
 without the ineffective style changes on the two wxSearchCtrl objects), just
 let me know - I'd be happy to do that.

Reviewing the bug log, the last maintainer comment was 2014-06-29, and
this is going to hold up the transition if not uploaded soon, so I'm
going to NMU.  Rebuilding now...

Cheers,
Olly


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#749978: guayadeque: Much better patch

2014-08-15 Thread Olly Betts 
On Thu, Aug 14, 2014 at 11:29:55AM +0300, Damyan Ivanov wrote:
 Below is an additional patch that removes the border from progress 
 controls in the status bar too. It also tries to remove the border 
 around the search input in the media/radio tabs, but for some reason 
 the result is still bordered controls.

Looking at the wxWidgets sources, in src/generic/srchctlg.cpp
wxSearchCtrl::Create() (which the ctor calls) forces a particular border style
upon us:

// force border style for more native appearance
style = ~wxBORDER_MASK;
#ifdef __WXGTK__
style |= wxBORDER_SUNKEN;
#elif defined(__WXMSW__)
// Don't set the style explicitly, let GetDefaultBorder() work it out, unl  
ess
// we will get a sunken border (e.g. on Windows 200) in which case we must
// override with a simple border.
if (GetDefaultBorder() == wxBORDER_SUNKEN)
style |= wxBORDER_SIMPLE;
#else
style |= wxBORDER_SIMPLE;
#endif

We can set the style after construction to avoid this, but the amended style
above is used for the wxSearchTextCtrl inside the wxSearchCtrl, and changing
the style of the wxSearchCtrl after construction isn't passed on to that.  To
me it looks like it is the wxSearchTextCtrl which isn't quite tall enough.

I can reproduce this issue in the widgets sample which comes with wxWidgets,
so I've filed a bug upstream:

http://trac.wxwidgets.org/ticket/16422

I think it isn't worth trying to workaround this in guayadeque - it's
essentially cosmetic, and if we somehow adjusted the size, it would likely to
go wrong the other way when that bug gets fixed.

We have a go on the wxsqlite3 transition, so I've NMUed wxsqlite3 to
unstable.  So guayadeque can be uploaded now.

If you'd like me to just NMU with my latest patch + Damyan's changes (probably
without the ineffective style changes on the two wxSearchCtrl objects), just
let me know - I'd be happy to do that.

I understand upstream is planning to switch to Qt, but perhaps we should try
to push this patch upstream, as it would be useful for them until they have
achieved a switch over, and it would save us carrying it.  Is someone OK to
do that?  I have another ~80 packages to deal with for the wx transitions,
so I'm afraid I don't really have time to be liaising with upstreams.

Cheers,
Olly


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#749978: guayadeque: Much better patch

2014-08-14 Thread Damyan Ivanov 
-=| Olly Betts, 14.08.2014 17:26:48 +1200 |=-
 Thanks for testing the previous patch.

You're welcome!

 This revised patch fixes the crash on pause/stop, turns off the 
 button borders so they appear as they do with wx2.8 and even fixes 
 the splash screen.

Confirmed.

Below is an additional patch that removes the border from progress 
controls in the status bar too. It also tries to remove the border 
around the search input in the media/radio tabs, but for some reason 
the result is still bordered controls.

Cheers and thanks again!
dam


--- a/src/StatusBar.h
+++ b/src/StatusBar.h
@@ -46,7 +46,7 @@ class guGauge : public wxControl
   public :
 guGauge() : wxControl() { m_LastValue = wxNOT_FOUND; m_PaintWidth = 0; };
 guGauge( wxWindow * parent, const wxString label = wxEmptyString, bool 
showporcent = true, wxWindowID id = wxID_ANY, unsigned int max = 100,
-   const wxPoint pos = wxDefaultPosition, const wxSize size = 
wxDefaultSize, long style = wxGA_HORIZONTAL );
+   const wxPoint pos = wxDefaultPosition, const wxSize size = 
wxDefaultSize, long style = wxGA_HORIZONTAL | wxBORDER_NONE );
 ~guGauge( void );
 
 voidSetRange( int range );
--- a/src/MediaViewer.cpp
+++ b/src/MediaViewer.cpp
@@ -235,7 +235,7 @@ void guMediaViewer::CreateControls( void
 m_PlaylistsSelButton-SetToolTip( _( Playlists ) );
TopSizer-Add( m_PlaylistsSelButton, 0, 
wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-   m_SearchTextCtrl = new wxSearchCtrl( this, wxID_ANY, wxEmptyString, 
wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+   m_SearchTextCtrl = new wxSearchCtrl( this, wxID_ANY, wxEmptyString, 
wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER | wxBORDER_NONE );
TopSizer-Add( m_SearchTextCtrl, 1, 
wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 //
--- a/src/RadioPanel.cpp
+++ b/src/RadioPanel.cpp
@@ -560,7 +560,7 @@ guRadioPanel::guRadioPanel( wxWindow * p
 wxPanel * SearchPanel;
SearchPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, 
wxDefaultSize, wxTAB_TRAVERSAL );
 
-m_InputTextCtrl = new wxSearchCtrl( SearchPanel, wxID_ANY, wxEmptyString, 
wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+m_InputTextCtrl = new wxSearchCtrl( SearchPanel, wxID_ANY, wxEmptyString, 
wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER | wxBORDER_NONE );
 SearchSizer-Add( m_InputTextCtrl, 1, wxALIGN_CENTER, 5 );
 
 SearchPanel-SetSizer( SearchSizer );


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#749978: guayadeque: Much better patch

2014-08-13 Thread Olly Betts 
Thanks for testing the previous patch.

This revised patch fixes the crash on pause/stop, turns off the button
borders so they appear as they do with wx2.8 and even fixes the splash
screen.

Cheers,
Olly
diff -Nru guayadeque-0.3.7~ds0/debian/changelog guayadeque-0.3.7~ds0/debian/changelog
--- guayadeque-0.3.7~ds0/debian/changelog	2014-04-30 03:02:15.0 +1200
+++ guayadeque-0.3.7~ds0/debian/changelog	2014-08-14 17:12:56.0 +1200
@@ -1,3 +1,11 @@
+guayadeque (0.3.7~ds0-2.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Update to use wxWidgets 3.0, thanks to Damyan Ivanov for partial patch.
+(Closes: #749978)
+
+ -- Olly Betts o...@survex.com  Thu, 14 Aug 2014 17:12:55 +1200
+
 guayadeque (0.3.7~ds0-2) unstable; urgency=low
 
   * Enable debug builds. (Closes: #746368)
diff -Nru guayadeque-0.3.7~ds0/debian/control guayadeque-0.3.7~ds0/debian/control
--- guayadeque-0.3.7~ds0/debian/control	2014-04-30 03:01:35.0 +1200
+++ guayadeque-0.3.7~ds0/debian/control	2014-08-11 10:50:52.0 +1200
@@ -15,8 +15,8 @@
  libindicate-dev (= 0.6.92),
  libsqlite3-dev,
  libtagc0-dev,
- libwxgtk2.8-dev,
- libwxsqlite3-2.8-dev ( 3.0.0)
+ libwxgtk3.0-dev,
+ libwxsqlite3-3.0-dev
 Standards-Version: 3.9.5
 Homepage: http://sourceforge.net/projects/guayadeque
 Vcs-Git: git://git.debian.org/pkg-multimedia/guayadeque.git
diff -Nru guayadeque-0.3.7~ds0/debian/patches/03-curl_headers_location.patch guayadeque-0.3.7~ds0/debian/patches/03-curl_headers_location.patch
--- guayadeque-0.3.7~ds0/debian/patches/03-curl_headers_location.patch	2014-04-30 01:37:40.0 +1200
+++ guayadeque-0.3.7~ds0/debian/patches/03-curl_headers_location.patch	2014-08-14 16:07:05.0 +1200
@@ -11,8 +11,8 @@
  src/Podcasts.h  |2 +-
  7 files changed, 7 insertions(+), 7 deletions(-)
 
 guayadeque.orig/src/LastFM.cpp
-+++ guayadeque/src/LastFM.cpp
+--- a/src/LastFM.cpp
 b/src/LastFM.cpp
 @@ -24,7 +24,7 @@
  #include DbCache.h
  #include Utils.h
@@ -22,8 +22,8 @@
  
  #include wx/arrimpl.cpp
  #include wx/sstream.h
 guayadeque.orig/src/LastFMPanel.cpp
-+++ guayadeque/src/LastFMPanel.cpp
+--- a/src/LastFMPanel.cpp
 b/src/LastFMPanel.cpp
 @@ -21,7 +21,7 @@
  #include LastFMPanel.h
  
@@ -33,8 +33,8 @@
  #include Images.h
  #include MainApp.h
  #include Settings.h
 guayadeque.orig/src/LyricsPanel.cpp
-+++ guayadeque/src/LyricsPanel.cpp
+--- a/src/LyricsPanel.cpp
 b/src/LyricsPanel.cpp
 @@ -23,7 +23,7 @@
  #include Base64.h
  #include Commands.h
@@ -44,8 +44,8 @@
  #include Preferences.h
  #include Images.h
  #include ListView.h
 guayadeque.orig/src/MainFrame.h
-+++ guayadeque/src/MainFrame.h
+--- a/src/MainFrame.h
 b/src/MainFrame.h
 @@ -26,7 +26,7 @@
  #include Config.h
  #include CoverPanel.h
@@ -55,8 +55,8 @@
  #include dbus/gudbus.h
  #include dbus/mpris.h
  #include dbus/mpris2.h
 guayadeque.orig/src/MusicBrainz.cpp
-+++ guayadeque/src/MusicBrainz.cpp
+--- a/src/MusicBrainz.cpp
 b/src/MusicBrainz.cpp
 @@ -21,7 +21,7 @@
  #include MusicBrainz.h
  
@@ -66,8 +66,8 @@
  
  #include wx/arrimpl.cpp
  #include wx/sstream.h
 guayadeque.orig/src/MusicDns.cpp
-+++ guayadeque/src/MusicDns.cpp
+--- a/src/MusicDns.cpp
 b/src/MusicDns.cpp
 @@ -21,7 +21,7 @@
  #include MusicDns.h
  
@@ -77,8 +77,8 @@
  #include MusicBrainz.h
  #include Utils.h
  #include Version.h
 guayadeque.orig/src/Podcasts.h
-+++ guayadeque/src/Podcasts.h
+--- a/src/Podcasts.h
 b/src/Podcasts.h
 @@ -21,7 +21,7 @@
  #ifndef PODCASTS_H
  #define PODCASTS_H
diff -Nru guayadeque-0.3.7~ds0/debian/patches/05-wx3.0.patch guayadeque-0.3.7~ds0/debian/patches/05-wx3.0.patch
--- guayadeque-0.3.7~ds0/debian/patches/05-wx3.0.patch	1970-01-01 12:00:00.0 +1200
+++ guayadeque-0.3.7~ds0/debian/patches/05-wx3.0.patch	2014-08-14 17:12:53.0 +1200
@@ -0,0 +1,691 @@
+Description: Fix to work with wxwidgets3.0
+ Based on partial patch by dam.
+Author: Olly Betts o...@survex.com
+Bug-Debian: http://bugs.debian.org/749978
+Forwarded: no
+Last-Update: 2014-08-14
+
+--- a/src/ListView.h
 b/src/ListView.h
+@@ -28,6 +28,7 @@
+ #include wx/scrolwin.h
+ #include wx/vlbox.h
+ #include wx/settings.h
++#include wx/listbase.h
+ 
+ class guListViewClient;
+ class guListViewHeader;
+@@ -330,7 +331,7 @@
+ size_t  GetVisibleEnd( void ) const { return m_ListBox-GetVisibleEnd(); }
+ size_t  GetFirstVisibleLine() const { return m_ListBox-GetFirstVisibleLine(); }
+ size_t  GetLastVisibleLine() const { return m_ListBox-GetLastVisibleLine(); }
+-boolScrollLines( int lines ) { return m_ListBox-ScrollLines( lines ); }
++boolScrollLines( int lines ) { return m_ListBox-wxWindow::ScrollLines( lines ); }
+ 
+ boolScrollToLine( size_t line ) { return m_ListBox-ScrollToLine( line ); }
+ 
+--- a/src/FileBrowser.cpp
 b/src/FileBrowser.cpp
+@@ -36,6 +36,7 @@
+ #include wx/arrimpl.cpp
+