Control: tags 750914 + patch
Control: tags 750914 + pending
Dear maintainer,
I've uploaded an NMU for freqtweak (versioned as 0.7.2-4.1). A debdiff
for the NMU is attached.
I just noticed (after uploading I'm afraid) that I left a stray line in
debian/rules:
export MAKEFLAGS := -k
This isn't useful, and should be removed when you incorporate the NMU -
I added it so I'd get errors for all files in a single build, though it
seemed not to get through to make for some reason, so it doesn't seem
worth reuploading just to remove it.
Cheers,
Olly
diff -Nru freqtweak-0.7.2/debian/changelog freqtweak-0.7.2/debian/changelog
--- freqtweak-0.7.2/debian/changelog 2014-08-15 15:40:29.000000000 +1200
+++ freqtweak-0.7.2/debian/changelog 2014-08-15 14:43:09.000000000 +1200
@@ -1,3 +1,12 @@
+freqtweak (0.7.2-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Switch from deprecated simple-patchsys.mk to source format "3.0 (quilt)".
+ * Update to use wxWidgets 3.0 (Closes: #750914):
+ + New patch: 06-wx3.0-compat.patch
+
+ -- Olly Betts <o...@survex.com> Fri, 15 Aug 2014 14:42:45 +1200
+
freqtweak (0.7.2-4) unstable; urgency=low
* New Maintainer Closes: #456176
diff -Nru freqtweak-0.7.2/debian/control freqtweak-0.7.2/debian/control
--- freqtweak-0.7.2/debian/control 2014-08-15 15:40:29.000000000 +1200
+++ freqtweak-0.7.2/debian/control 2014-04-09 10:21:47.000000000 +1200
@@ -2,7 +2,7 @@
Section: sound
Priority: optional
Maintainer: Bhavani Shankar <right2bh...@gmail.com>
-Build-Depends: cdbs, debhelper (>= 5), automake1.11, fftw3-dev, libwxgtk2.8-dev, libjack-dev, libxml2-dev, libsigc++-1.2-dev, imagemagick
+Build-Depends: cdbs, debhelper (>= 5), automake1.11, fftw3-dev, libwxgtk3.0-dev, libjack-dev, libxml2-dev, libsigc++-1.2-dev, imagemagick
Standards-Version: 3.8.3
Homepage: http://freqtweak.sourceforge.net/
diff -Nru freqtweak-0.7.2/debian/patches/06-wx3.0-compat.patch freqtweak-0.7.2/debian/patches/06-wx3.0-compat.patch
--- freqtweak-0.7.2/debian/patches/06-wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200
+++ freqtweak-0.7.2/debian/patches/06-wx3.0-compat.patch 2014-08-15 15:30:01.000000000 +1200
@@ -0,0 +1,206 @@
+Description: Fix to work with wxwidgets3.0
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/750914
+Forwarded: no
+Last-Update: 2014-08-15
+
+--- a/src/FTapp.cpp
++++ b/src/FTapp.cpp
+@@ -67,18 +67,18 @@
+
+ static const wxCmdLineEntryDesc cmdLineDesc[] =
+ {
+- { wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("show this help"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+- { wxCMD_LINE_OPTION, wxT("c"), wxT("channels"), wxT("# processing channels (1-4) default is 2"), wxCMD_LINE_VAL_NUMBER },
+- { wxCMD_LINE_OPTION, wxT("i"), wxT("inputs"),
+- wxT("connect inputs from these jack ports (separate each channel with commas).\n")
++ { wxCMD_LINE_SWITCH, wxT_2("h"), wxT_2("help"), wxT_2("show this help"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
++ { wxCMD_LINE_OPTION, wxT_2("c"), wxT_2("channels"), wxT_2("# processing channels (1-4) default is 2"), wxCMD_LINE_VAL_NUMBER },
++ { wxCMD_LINE_OPTION, wxT_2("i"), wxT_2("inputs"),
++ wxT_2("connect inputs from these jack ports (separate each channel with commas).\n")
+ "\t\t\tDefaults to 'alsa_pcm:capture_1,..." },
+- { wxCMD_LINE_OPTION, wxT("o"), wxT("outputs"),
+- wxT("connect outputs to these jack ports (separate each channel with commas).\n")
++ { wxCMD_LINE_OPTION, wxT_2("o"), wxT_2("outputs"),
++ wxT_2("connect outputs to these jack ports (separate each channel with commas).\n")
+ "\t\t\tDefaults to 'alsa_pcm:playback_1,...'" },
+- { wxCMD_LINE_OPTION, wxT("n"), wxT("jack-name"), wxT("jack name. default is freqtweak_1")},
+- { wxCMD_LINE_OPTION, wxT("S"), wxT("jack-server"), wxT("jack server name")},
+- { wxCMD_LINE_OPTION, wxT("p"), wxT("preset"), wxT("load given preset initially")},
+- { wxCMD_LINE_OPTION, wxT("r"), wxT("rc-dir"), wxT("what directory to use for run-control state. default is ~/.freqtweak")},
++ { wxCMD_LINE_OPTION, wxT_2("n"), wxT_2("jack-name"), wxT_2("jack name. default is freqtweak_1")},
++ { wxCMD_LINE_OPTION, wxT_2("S"), wxT_2("jack-server"), wxT_2("jack server name")},
++ { wxCMD_LINE_OPTION, wxT_2("p"), wxT_2("preset"), wxT_2("load given preset initially")},
++ { wxCMD_LINE_OPTION, wxT_2("r"), wxT_2("rc-dir"), wxT_2("what directory to use for run-control state. default is ~/.freqtweak")},
+ { wxCMD_LINE_NONE }
+ };
+
+@@ -221,7 +221,7 @@
+
+ // use stderr as log
+ wxLog *logger=new wxLogStderr();
+- logger->SetTimestamp(NULL);
++ logger->SetTimestamp(wxEmptyString);
+ wxLog::SetActiveTarget(logger);
+
+ wxCmdLineParser parser(argc, argv);
+--- a/src/FTmainwin.cpp
++++ b/src/FTmainwin.cpp
+@@ -524,7 +524,6 @@
+ _inspecPanel = new wxPanel(_inspecSash, -1);
+ _inspecPanel->SetBackgroundColour(*wxBLACK);
+ _inspecPanel->SetThemeEnabled(false);
+- _inspecSash->SetSashBorder(wxSASH_BOTTOM, true);
+ _inspecSash->SetSashVisible(wxSASH_BOTTOM, true);
+ _rowItems.push_back( _inspecSash);
+
+@@ -656,7 +655,6 @@
+ _outspecPanel = new wxPanel(_outspecSash, -1);
+ _outspecPanel->SetBackgroundColour(*wxBLACK);
+ _outspecPanel->SetThemeEnabled(false);
+- _outspecSash->SetSashBorder(wxSASH_BOTTOM, true);
+ _outspecSash->SetSashVisible(wxSASH_BOTTOM, true);
+ _rowItems.push_back (_outspecSash);
+
+@@ -891,7 +889,6 @@
+ rpanel->SetThemeEnabled(false);
+ _rowPanels.push_back (rpanel);
+
+- sash->SetSashBorder(wxSASH_BOTTOM, true);
+ sash->SetSashVisible(wxSASH_BOTTOM, true);
+ // need to insert this as second to last
+ wxWindow * lastrow = _rowItems.back();
+@@ -2713,7 +2710,7 @@
+ evt != _pendingTitleEvents.end() ; ++evt)
+ {
+ (*evt)->ready = true;
+- AddPendingEvent (*(*evt));
++ GetEventHandler ()->AddPendingEvent (*(*evt));
+ delete (*evt);
+ }
+ _pendingTitleEvents.clear();
+@@ -3734,20 +3731,20 @@
+ if (id == ID_TitleRemove)
+ {
+ FTtitleMenuEvent tev (0, FTtitleMenuEvent::RemoveEvt, _parent);
+- _mwin->AddPendingEvent (tev);
++ _mwin->GetEventHandler ()->AddPendingEvent (tev);
+ //_mwin->doRemoveRow(_parent);
+ }
+ else if (id == ID_TitleMinimize)
+ {
+ FTtitleMenuEvent tev (0, FTtitleMenuEvent::MinimizeEvt, _parent);
+- _mwin->AddPendingEvent (tev);
++ _mwin->GetEventHandler ()->AddPendingEvent (tev);
+
+ //_mwin->doMinimizeExpand(_parent);
+ }
+ else if (id == ID_TitleExpand)
+ {
+ FTtitleMenuEvent tev (0, FTtitleMenuEvent::ExpandEvt, _parent);
+- _mwin->AddPendingEvent (tev);
++ _mwin->GetEventHandler ()->AddPendingEvent (tev);
+
+ //_mwin->doMinimizeExpand(_parent);
+ }
+--- a/src/FTactiveBarGraph.cpp
++++ b/src/FTactiveBarGraph.cpp
+@@ -1061,8 +1061,6 @@
+ return;
+ }
+
+- backdc.BeginDrawing();
+-
+ backdc.SetBackground(_bgBrush);
+ backdc.Clear();
+
+@@ -1164,8 +1162,6 @@
+
+ }
+
+- backdc.EndDrawing();
+-
+ // blit to screen
+ dc.Blit(0,0, _width, _height, &backdc, 0,0);
+
+@@ -1175,7 +1171,7 @@
+
+ void FTactiveBarGraph::paintGridlines(wxDC & dc)
+ {
+- int origfunc = dc.GetLogicalFunction();
++ wxRasterOperationMode origfunc = dc.GetLogicalFunction();
+ wxPen origPen = dc.GetPen();
+
+ dc.SetPen(_gridPen);
+--- a/src/FTjackSupport.cpp
++++ b/src/FTjackSupport.cpp
+@@ -289,7 +289,7 @@
+ return ppath;
+ }
+
+- return false;
++ return 0;
+ }
+
+
+--- a/src/FTutils.hpp
++++ b/src/FTutils.hpp
+@@ -23,6 +23,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <cmath>
++#include <stdint.h>
+
+ //#include <wx/string.h>
+
+--- a/src/FTprocOrderDialog.cpp
++++ b/src/FTprocOrderDialog.cpp
+@@ -210,7 +210,7 @@
+ for (; mod != mlist.end(); ++mod)
+ {
+ item.SetText (wxString::FromAscii ((*mod)->getName().c_str()));
+- item.SetData ((unsigned) (*mod));
++ item.SetData ((unsigned long) (*mod));
+ item.SetId(pos++);
+
+ _sourceList->InsertItem(item);
+@@ -230,7 +230,7 @@
+ for (unsigned int n=0; n < procmods.size(); ++n)
+ {
+ item.SetText (wxString::FromAscii (procmods[n]->getName().c_str()));
+- item.SetData ((unsigned) procmods[n]);
++ item.SetData ((unsigned long) procmods[n]);
+ item.SetId (n);
+
+ _targetList->InsertItem(item);
+@@ -441,7 +441,7 @@
+
+ if (proc) {
+ item.SetText (wxString::FromAscii (proc->getName().c_str()));
+- item.SetData ((unsigned)proc);
++ item.SetData ((unsigned long)proc);
+ item.SetId (_targetList->GetItemCount());
+
+ _targetList->InsertItem(item);
+--- a/src/FTmodulatorDialog.cpp
++++ b/src/FTmodulatorDialog.cpp
+@@ -346,7 +346,7 @@
+ {
+ //cerr << "deleting modgui" << endl;
+ FTmodulatorGui * modgui = _modulatorGuis[mod];
+- _channelSizer->Remove (modgui);
++ _channelSizer->Detach (modgui);
+ modgui->Show(false);
+ _channelScroller->SetClientSize(_channelScroller->GetClientSize());
+ _channelScroller->Layout();
+--- a/src/pix_button.cpp
++++ b/src/pix_button.cpp
+@@ -249,7 +249,7 @@
+ pt.x += bounds.x;
+ pt.y += bounds.y;
+
+- if (bounds.Inside(pt)) {
++ if (bounds.Contains(pt)) {
+ clicked (get_mouse_button(ev)); // emit
+
+ if (ev.MiddleUp() && ev.ControlDown()) {
diff -Nru freqtweak-0.7.2/debian/patches/series freqtweak-0.7.2/debian/patches/series
--- freqtweak-0.7.2/debian/patches/series 1970-01-01 12:00:00.000000000 +1200
+++ freqtweak-0.7.2/debian/patches/series 2014-08-15 13:48:10.000000000 +1200
@@ -0,0 +1 @@
+06-wx3.0-compat.patch
diff -Nru freqtweak-0.7.2/debian/rules freqtweak-0.7.2/debian/rules
--- freqtweak-0.7.2/debian/rules 2014-08-15 15:40:29.000000000 +1200
+++ freqtweak-0.7.2/debian/rules 2014-08-15 15:26:31.000000000 +1200
@@ -2,9 +2,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/gnome.mk
+export MAKEFLAGS := -k
+
update-config::
[ -e configure ] || ./autogen.sh
[ -e src/freqtweak_logo32x18.xpm ] || convert -resize 32x18 src/ftlogo.xpm src/freqtweak_logo32x18.xpm
diff -Nru freqtweak-0.7.2/debian/source/format freqtweak-0.7.2/debian/source/format
--- freqtweak-0.7.2/debian/source/format 1970-01-01 12:00:00.000000000 +1200
+++ freqtweak-0.7.2/debian/source/format 2014-08-15 13:48:00.000000000 +1200
@@ -0,0 +1 @@
+3.0 (quilt)
