Package: beidgui Version: 2.6.0-7 Severity: wishlist Tags: patch User: freewx-ma...@lists.alioth.debian.org Usertags: wx2.6
Attached is a patch which attempts to port belpic to wx 2.8. It makes it able to be built, and appears to run. however I'm not sure how to use this application so I can't fully test myself. Please check if it works and upload the ported package. Cheers, Ryan -- _________________________ Ryan Niebur ryanrya...@gmail.com
diff -u belpic-2.6.0/SConstruct belpic-2.6.0/SConstruct
--- belpic-2.6.0/SConstruct
+++ belpic-2.6.0/SConstruct
@@ -90,7 +90,7 @@
Exit(1)
# check for wx libs
- if conf.CheckLib('wx_gtk-2.4') or conf.CheckLib('wx_gtk2u_core-2.6') or conf.CheckLib('wx_gtk2-2.4') or conf.CheckLib('wx_gtk2_core-2.6'):
+ if conf.CheckLib('wx_gtk2u_core-2.8'):
env['WITHEIDGUI']=1
# check for headers
diff -u belpic-2.6.0/debian/changelog belpic-2.6.0/debian/changelog
--- belpic-2.6.0/debian/changelog
+++ belpic-2.6.0/debian/changelog
@@ -1,3 +1,11 @@
+belpic (2.6.0-7.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * build against wxwidgets2.8
+ * apply patch from Stefan Ebner to fix FTBFS (Closes: #546621)
+
+ -- Ryan Niebur <r...@debian.org> Sun, 13 Dec 2009 15:05:17 -0800
+
belpic (2.6.0-7) unstable; urgency=low
* Fix scons usage; Closes: #525593.
diff -u belpic-2.6.0/debian/control belpic-2.6.0/debian/control
--- belpic-2.6.0/debian/control
+++ belpic-2.6.0/debian/control
@@ -1,7 +1,7 @@
Source: belpic
Priority: extra
Maintainer: Wouter Verhelst <wou...@debian.org>
-Build-Depends: debhelper (>= 5.0), libpcsclite-dev, openssl, libssl-dev, libwxgtk2.6-dev, scons, libqt3-mt-dev, flex, default-jdk-builddep
+Build-Depends: debhelper (>= 5.0), libpcsclite-dev, openssl, libssl-dev, libwxgtk2.8-dev, scons, libqt3-mt-dev, flex, default-jdk-builddep
Standards-Version: 3.7.2
Package: libbeidlibopensc2
only in patch2:
unchanged:
--- belpic-2.6.0.orig/src/eidviewer/eidviewerFrame.cpp
+++ belpic-2.6.0/src/eidviewer/eidviewerFrame.cpp
@@ -108,7 +108,6 @@
: wxFrame(NULL, -1, title, wxPoint(x, y), wxSize(width, height), wxDEFAULT_FRAME_STYLE)
{
m_notebook = NULL;
- m_sizerNotebook = NULL;
m_statusGauge = NULL;
m_IDPanel = NULL;
@@ -133,7 +132,6 @@
SetToolBar(m_tbar);
m_notebook = new eidviewerNotebook(this, -1);
- m_sizerNotebook = new wxNotebookSizer( m_notebook );
m_IDPanel = m_notebook->CreatePage(IDD_PAGE_IDENTITY);
m_notebook->CreatePage(IDD_PAGE_CERTIFICATES);
m_notebook->CreatePage(IDD_PAGE_CARDDATA);
@@ -169,11 +167,6 @@
eidviewerFrame::~eidviewerFrame()
{
- if(m_sizerNotebook)
- {
- delete m_sizerNotebook;
- m_sizerNotebook = NULL;
- }
}
void eidviewerFrame::OnQuit (wxCommandEvent & )
only in patch2:
unchanged:
--- belpic-2.6.0.orig/src/eidviewer/eidviewerNotebook.cpp
+++ belpic-2.6.0/src/eidviewer/eidviewerNotebook.cpp
@@ -27,6 +27,7 @@
#include <wx/file.h>
#include <wx/filename.h>
#include <wx/mimetype.h> // mimetype support
+#include <wx/imaglist.h>
/*
#ifndef _WIN32
@@ -2280,7 +2281,7 @@
return hti;
}
- long lCookie = 0;
+ wxTreeItemIdValue lCookie = 0;
hti = pCtrlTreeCerts->GetFirstChild( hti, lCookie );
do
{
@@ -2343,7 +2344,7 @@
{
wxBusyCursor wc;
- wxString strFileTmp = wxFileName::CreateTempFileName(wxT("cert"), NULL);
+ wxString strFileTmp = wxFileName::CreateTempFileName(wxT("cert"), (wxFile *)NULL);
wxFileName oName(strFileTmp);
oName.SetExt(wxT("cer"));
wxString strFile;
only in patch2:
unchanged:
--- belpic-2.6.0.orig/src/eidviewer/eidviewerFrame.h
+++ belpic-2.6.0/src/eidviewer/eidviewerFrame.h
@@ -35,8 +35,6 @@
void OnActivate (wxActivateEvent&);
private:
eidviewerNotebook *m_notebook;
- // Sizer for m_notebook
- wxNotebookSizer *m_sizerNotebook;
wxPanel *m_IDPanel;
bool m_bReading;
only in patch2:
unchanged:
--- belpic-2.6.0.orig/src/eidviewer/eidviewerApp.cpp
+++ belpic-2.6.0/src/eidviewer/eidviewerApp.cpp
@@ -796,7 +796,7 @@
wxString strFileName(idData.nationalNumber, wxConvUTF8);
strFileName += wxT(".eid");
- wxFileDialog oDialog(m_pFrame, _("Save an eID file"), wxT(""), strFileName, wxT("eID files (*.eid)|*.eid"), wxSAVE | wxHIDE_READONLY | wxOVERWRITE_PROMPT);
+ wxFileDialog oDialog(m_pFrame, _("Save an eID file"), wxT(""), strFileName, wxT("eID files (*.eid)|*.eid"), wxSAVE | wxOVERWRITE_PROMPT);
if (oDialog.ShowModal() != wxID_OK)
{
m_pFrame->SetStatusText(wxT(""));
@@ -864,7 +864,7 @@
if(strFile.IsEmpty())
{
- wxFileDialog oDialog(m_pFrame, _("Open an eID file"), wxT(""), wxT(""), wxT("eID files (*.eid)|*.eid"), wxOPEN | wxHIDE_READONLY);
+ wxFileDialog oDialog(m_pFrame, _("Open an eID file"), wxT(""), wxT(""), wxT("eID files (*.eid)|*.eid"), wxOPEN);
if (oDialog.ShowModal() != wxID_OK)
{
m_pFrame->SetStatusText(wxT(""));
only in patch2:
unchanged:
--- belpic-2.6.0.orig/src/beidservicecrl/CRLScheduler.cpp
+++ belpic-2.6.0/src/beidservicecrl/CRLScheduler.cpp
@@ -93,7 +93,7 @@
if(pCRLDistribution != NULL && pszCRLStorePath != NULL)
{
- char *pTemp;
+ const char *pTemp;
const char *pFile = pCRLDistribution;
while(NULL != (pTemp = strstr(pFile, "/")))
{
signature.asc
Description: Digital signature
