r46712 - in /packages/wxAstroCapture/trunk/debian/patches: series wx3.0.patch
moeller at users.alioth.debian.org
moeller at users.alioth.debian.org
Wed Jun 18 00:28:12 UTC 2014
Author: moeller
Date: Wed Jun 18 00:28:12 2014
New Revision: 46712
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46712
Log:
Series of changes for wx3.0
Not completely ready, yet. See fixme lines in patch.
Added:
packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch
Modified:
packages/wxAstroCapture/trunk/debian/patches/series
Modified: packages/wxAstroCapture/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/patches/series?rev=46712&op=diff
==============================================================================
--- packages/wxAstroCapture/trunk/debian/patches/series (original)
+++ packages/wxAstroCapture/trunk/debian/patches/series Wed Jun 18 00:28:12 2014
@@ -1,2 +1,3 @@
avoidUpx.patch
no_minus_s_to_gcc.patch
+wx3.0.patch
Added: packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch?rev=46712&op=file
==============================================================================
--- packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch (added)
+++ packages/wxAstroCapture/trunk/debian/patches/wx3.0.patch Wed Jun 18 00:28:12 2014
@@ -0,0 +1,209 @@
+Index: wxastrocapture-1.8.1+git20140303+dfsg/wxWebcamDB.cbp
+===================================================================
+--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxWebcamDB.cbp
++++ wxastrocapture-1.8.1+git20140303+dfsg/wxWebcamDB.cbp
+@@ -180,15 +180,16 @@
+ <Compiler>
+ <Add option="-Wall" />
+ <Add option="-g" />
+- <Add option="`wx-config --version=2.8 --toolkit=gtk2 --debug --cxxflags`" />
++ <Add option="`wx-config --version=3.0 --toolkit=gtk2 --debug --cxxflags`" />
+ <Add option="-Wno-ignored-qualifiers" />
+ <Add option="-DNOPCH" />
+ <Add option="-D__WXDEBUG__" />
+- <Add option="-D_DEBUG" />
++ <Add option="-DNDEBUG" />
++ <!-- Add option="-D_DEBUG" /> -->
+ <Add option="-D__WX__" />
+ </Compiler>
+ <Linker>
+- <Add option="`wx-config --version=2.8 --toolkit=gtk2 --debug --libs`" />
++ <Add option="`wx-config --version=3.0 --toolkit=gtk2 --debug --libs`" />
+ <Add library="usb" />
+ </Linker>
+ </Target>
+@@ -201,14 +202,15 @@
+ <Add option="-Os" />
+ <Add option="-O2" />
+ <Add option="-W" />
+- <Add option="`wx-config --version=2.8 --toolkit=gtk2 --cxxflags`" />
++ <Add option="`wx-config --version=3.0 --toolkit=gtk2 --cxxflags`" />
+ <Add option="-Wno-ignored-qualifiers" />
+ <Add option="-DNOPCH" />
++ <Add option="-DNDEBUG" />
+ <Add option="-D__WX__" />
+ </Compiler>
+ <Linker>
+ <!-- <Add option="-s" /> not nice for -dbg package -->
+- <Add option="`wx-config --version=2.8 --toolkit=gtk2 --libs`" />
++ <Add option="`wx-config --version=3.0 --toolkit=gtk2 --libs`" />
+ <Add library="usb" />
+ </Linker>
+ <!--
+Index: wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/v4l2capfilter.cpp
+===================================================================
+--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxWebcam/v4l2capfilter.cpp
++++ wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/v4l2capfilter.cpp
+@@ -142,7 +142,7 @@
+ close(device);
+ continue;
+ }
+- _V_ ::fprintf(stderr, "CV4LcapFilter::EnumerateCapFilter: Probing %ls\n", m_actualDevPath.c_str());
++ //fixme: _V_ ::fprintf(stderr, "CV4LcapFilter::EnumerateCapFilter: Probing %ls\n", m_actualDevPath.c_str());
+ EnumPixFormat(device);
+
+ close(device);
+@@ -191,7 +191,7 @@
+ }
+ }
+ if (!found) {
+- ::fprintf(stderr, "CV4LcapFilter::AddSupport: %ls\n", item->FName().c_str());
++ //fixme ::fprintf(stderr, "CV4LcapFilter::AddSupport: %ls\n", item->FName().c_str());
+ m_pFilters[m_numFilter] = item;
+ // add an index to the filter
+ m_pFilters[m_numFilter]->put_FIndex(m_numFilter);
+Index: wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/ArtDrvSim.cpp
+===================================================================
+--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxWebcam/ArtDrvSim.cpp
++++ wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/ArtDrvSim.cpp
+@@ -535,41 +535,40 @@
+ // Return the directory for the user-dependent application data files:
+ // Unix: ~/.appname
+ // Windows: C:\Documents and Settings\username\Application Data\appname
+- wxStandardPaths px;
+ // if we did not found a file we check the current dir for compatibility reasons
+ switch (Device) {
+ case ACT_Art429:
+- simName.Assign(px.GetUserDataDir(), wxT(ART429_FILE), wxT("raw"));
++ simName.Assign(wxStandardPaths::Get().GetUserDataDir(), wxT(ART429_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ simName.Assign(wxT("."), wxT(ART429_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ break;
+ case ACT_Art285:
+- simName.Assign(px.GetUserDataDir(), wxT(ART285_FILE), wxT("raw"));
++ simName.Assign(wxStandardPaths::Get().GetUserDataDir(), wxT(ART285_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ simName.Assign(wxT("."), wxT(ART285_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ break;
+ case ACT_Art424:
+- simName.Assign(px.GetUserDataDir(), wxT(ART424_FILE), wxT("raw"));
++ simName.Assign(wxStandardPaths::Get().GetUserDataDir(), wxT(ART424_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ simName.Assign(wxT("."), wxT(ART424_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ break;
+ case ACT_Art415:
+- simName.Assign(px.GetUserDataDir(), wxT(ART415_FILE), wxT("raw"));
++ simName.Assign(wxStandardPaths::Get().GetUserDataDir(), wxT(ART415_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ simName.Assign(wxT("."), wxT(ART415_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ break;
+ case ACT_Art4021:
+- simName.Assign(px.GetUserDataDir(), wxT(ART4021_FILE), wxT("raw"));
++ simName.Assign(wxStandardPaths::Get().GetUserDataDir(), wxT(ART4021_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ simName.Assign(wxT("."), wxT(ART4021_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ break;
+ case ACT_Art11002:
+- simName.Assign(px.GetUserDataDir(), wxT(ART11002_FILE), wxT("raw"));
++ simName.Assign(wxStandardPaths::Get().GetUserDataDir(), wxT(ART11002_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+ simName.Assign(wxT("."), wxT(ART11002_FILE), wxT("raw"));
+ if (simName.IsOk()) if (simName.FileExists()) return true;
+Index: wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/uxcapture.cpp
+===================================================================
+--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxWebcam/uxcapture.cpp
++++ wxastrocapture-1.8.1+git20140303+dfsg/wxWebcam/uxcapture.cpp
+@@ -108,7 +108,7 @@
+ m_pDsCapFilterItem = new CV4LcapFilterItem( cFilter.GetCapFilter(cfIndex));
+
+ // open the device to control
+- _V_ ::fprintf(stderr, "CUXcapture::ControlDevice() - trying to open(v4l2dev) %S\n", m_pDsCapFilterItem->DevPath().c_str());
++ // fixme: _V_ ::fprintf(stderr, "CUXcapture::ControlDevice() - trying to open(v4l2dev) %S\n", m_pDsCapFilterItem->DevPath().c_str());
+ m_device = ::open(m_pDsCapFilterItem->DevPath().fn_str(),O_RDWR /*required*/ | O_NONBLOCK,0);
+
+ if(-1 == m_device) {
+Index: wxastrocapture-1.8.1+git20140303+dfsg/wxcustom/wxStatusBarEx.cpp
+===================================================================
+--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxcustom/wxStatusBarEx.cpp
++++ wxastrocapture-1.8.1+git20140303+dfsg/wxcustom/wxStatusBarEx.cpp
+@@ -34,8 +34,10 @@
+ /// when using red theme
+ dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+
++ /* Fixme: m_nFields is gone
+ for (int i = 0; i < m_nFields; i ++)
+ DrawField(dc, i);
++ */
+ }
+
+ #endif
+Index: wxastrocapture-1.8.1+git20140303+dfsg/wxthings/spinctld.cpp
+===================================================================
+--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxthings/spinctld.cpp
++++ wxastrocapture-1.8.1+git20140303+dfsg/wxthings/spinctld.cpp
+@@ -353,14 +353,16 @@
+ DoSendEvent();
+ break;
+ }
+- case WXK_PRIOR : // pg-up
++ //fixme: no longer available case WXK_PRIOR : // pg-up
++ case WXK_PAGEUP : // pg-up
+ {
+ if (m_textCtrl && m_textCtrl->IsModified()) SyncSpinToText(false);
+ SetValue( m_value + m_increment * 10.0 * modifier );
+ DoSendEvent();
+ break;
+ }
+- case WXK_NEXT : // pg-down
++ //fixme: no longer available case WXK_NEXT : // pg-down
++ case WXK_PAGEDOWN : // pg-down
+ {
+ if (m_textCtrl && m_textCtrl->IsModified()) SyncSpinToText(false);
+ SetValue( m_value - m_increment * 10.0 * modifier );
+Index: wxastrocapture-1.8.1+git20140303+dfsg/wxFactory.cpp
+===================================================================
+--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxFactory.cpp
++++ wxastrocapture-1.8.1+git20140303+dfsg/wxFactory.cpp
+@@ -69,8 +69,7 @@
+ // C:\Documents and Settings\username\Application Data\appname
+ // We cannot rely on the OS or wx to create this directory
+
+- wxStandardPaths std_paths;
+- wxString userDataDir = std_paths.GetUserDataDir();
++ wxString userDataDir = wxStandardPaths::Get().GetUserDataDir();
+ wxString appname = m_config.GetAppName();
+ userDataDir.Replace(wxT("wxastrocapture"),appname);
+ if(!::wxDirExists(userDataDir)) {
+Index: wxastrocapture-1.8.1+git20140303+dfsg/wxGuidingConfig.cpp
+===================================================================
+--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxGuidingConfig.cpp
++++ wxastrocapture-1.8.1+git20140303+dfsg/wxGuidingConfig.cpp
+@@ -67,7 +67,7 @@
+ wxConfigPath path(config,wxT("Guiding"));
+ config->Write(_T("ReverseRA"),reverseRA);
+ config->Write(_T("ReverseDEC"),reverseDEC);
+- config->Write(_T("DECguiding"),dec);
++ //fixme: config->Write(_T("DECguiding"),dec);
+
+ m_cached_reverseRA = reverseRA;
+ m_cached_reverseDEC = reverseDEC;
+Index: wxastrocapture-1.8.1+git20140303+dfsg/wxIO/wxGuiderPort.cpp
+===================================================================
+--- wxastrocapture-1.8.1+git20140303+dfsg.orig/wxIO/wxGuiderPort.cpp
++++ wxastrocapture-1.8.1+git20140303+dfsg/wxIO/wxGuiderPort.cpp
+@@ -347,8 +347,8 @@
+ config->Write(_T("GXRA_neg"),this->GXRA_neg());
+ config->Write(_T("GXDEC_neg"),this->GXDEC_neg());
+ config->Write(_T("GXinvertedLogic"), this->InvertedLogic());
+- config->Write(_T("GXhandshake"), this->SerialHandshake());
+- config->Write(_T("GXbaudrate"), this->SerialBaudrate());
++ //fixme: config->Write(_T("GXhandshake"), this->SerialHandshake());
++ //fixme: config->Write(_T("GXbaudrate"), this->SerialBaudrate());
+
+ return true;
+ }
More information about the debian-science-commits
mailing list