diff -Nru 3depict-0.0.23/debian/changelog 3depict-0.0.23/debian/changelog --- 3depict-0.0.23/debian/changelog 2022-01-17 20:18:27.000000000 +0000 +++ 3depict-0.0.23/debian/changelog 2022-12-30 20:14:32.000000000 +0000 @@ -1,20 +1,9 @@ -3depict (0.0.23-1build3) jammy; urgency=medium +3depict (0.0.23-2) unstable; urgency=medium - * No-change rebuild against libmgl8 + * Team upload. + * Transition to wxWidgets 3.2 (Closes: #1019824) - -- Steve Langasek Mon, 17 Jan 2022 20:18:27 +0000 - -3depict (0.0.23-1build2) jammy; urgency=medium - - * No-change rebuild against libmgl7.6.0 - - -- Steve Langasek Thu, 13 Jan 2022 22:41:21 +0000 - -3depict (0.0.23-1build1) jammy; urgency=medium - - * No-change rebuild against libgsl27 - - -- Steve Langasek Tue, 07 Dec 2021 17:21:55 +0000 + -- Scott Talbert Fri, 30 Dec 2022 15:14:32 -0500 3depict (0.0.23-1) unstable; urgency=medium diff -Nru 3depict-0.0.23/debian/control 3depict-0.0.23/debian/control --- 3depict-0.0.23/debian/control 2021-12-07 17:21:55.000000000 +0000 +++ 3depict-0.0.23/debian/control 2022-12-30 19:57:56.000000000 +0000 @@ -1,6 +1,5 @@ Source: 3depict -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Science Maintainers +Maintainer: Debian Science Maintainers Uploaders: D Haley Section: science Priority: optional @@ -8,7 +7,7 @@ libgl1-mesa-dev | libgl-dev, libpng-dev, libqhull-dev, - libwxgtk3.0-gtk3-dev, + libwxgtk3.2-dev, libgsl-dev, libftgl-dev, libxml2-dev, diff -Nru 3depict-0.0.23/debian/patches/3Depict-0.0.22-wx3.2.patch 3depict-0.0.23/debian/patches/3Depict-0.0.22-wx3.2.patch --- 3depict-0.0.23/debian/patches/3Depict-0.0.22-wx3.2.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3depict-0.0.23/debian/patches/3Depict-0.0.22-wx3.2.patch 2022-12-30 19:58:50.000000000 +0000 @@ -0,0 +1,115 @@ +diff -up 3Depict-0.0.22/src/gui/cropPanel.cpp.wx32 3Depict-0.0.22/src/gui/cropPanel.cpp +--- 3Depict-0.0.22/src/gui/cropPanel.cpp.wx32 2019-01-05 19:47:51.000000000 -0500 ++++ 3Depict-0.0.22/src/gui/cropPanel.cpp 2022-08-04 18:48:53.245358493 -0400 +@@ -720,7 +720,7 @@ void CropPanel::makeCropValuesValid() + void CropPanel::onResize(wxSizeEvent &evt) + { + #ifndef __WXMAC__ +- wxPaintEvent paintEvt; +- wxPostEvent(this,paintEvt); ++ Refresh(); ++ Update(); + #endif + } +diff -up 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp.wx32 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp +--- 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp.wx32 2018-08-05 09:48:45.000000000 -0400 ++++ 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp 2022-08-04 18:49:54.126843451 -0400 +@@ -79,8 +79,8 @@ END_EVENT_TABLE(); + + void ResolutionDialog::updateImage() + { +- wxPaintEvent paintEvt; +- wxPostEvent(this,paintEvt); ++ Refresh(); ++ Update(); + } + + void ResolutionDialog::setRes(unsigned int w, unsigned int h, bool asReset) +diff -up 3Depict-0.0.22/src/gui/glPane.cpp.wx32 3Depict-0.0.22/src/gui/glPane.cpp +--- 3Depict-0.0.22/src/gui/glPane.cpp.wx32 2019-01-05 19:47:51.000000000 -0500 ++++ 3Depict-0.0.22/src/gui/glPane.cpp 2022-08-04 19:34:27.351248848 -0400 +@@ -214,8 +214,8 @@ unsigned int BasicGLPane::hoverTest(con + void BasicGLPane::forceRedraw() + { + //Force a paint update for the scene +- wxPaintEvent ptEvent; +- wxPostEvent(this,ptEvent); ++ Refresh(); ++ Update(); + + #ifdef WIN32 + //Hack for windows. Does not redraw otherwise. +@@ -1108,8 +1108,8 @@ bool BasicGLPane::saveImage(unsigned int + delete image; + + if (needPostPaint) { +- wxPaintEvent event; +- wxPostEvent(this,event); ++ Refresh(); ++ Update(); + } + + return isOK; +@@ -1182,8 +1182,8 @@ bool BasicGLPane::saveImageSequence(unsi + currentScene->discardTempCam(); + wxD->Destroy(); + +- wxPaintEvent event; +- wxPostEvent(this,event); ++ Refresh(); ++ Update(); + return true; + + } +diff -up 3Depict-0.0.22/src/gui/mainFrame.cpp.wx32 3Depict-0.0.22/src/gui/mainFrame.cpp +--- 3Depict-0.0.22/src/gui/mainFrame.cpp.wx32 2022-08-04 16:54:09.801980447 -0400 ++++ 3Depict-0.0.22/src/gui/mainFrame.cpp 2022-08-04 18:47:41.785789266 -0400 +@@ -1814,8 +1814,8 @@ void MainWindowFrame::OnFileExportVideo( + + + //Force a paint update for the scene, to ensure aspect ratio information is preserved +- wxPaintEvent ptEvent; +- wxPostEvent(panelTop,ptEvent); ++ panelTop->Refresh(); ++ panelTop->Update(); + } + + +diff -up 3Depict-0.0.22/src/wx/propertyGridUpdater.h.wx32 3Depict-0.0.22/src/wx/propertyGridUpdater.h +--- 3Depict-0.0.22/src/wx/propertyGridUpdater.h.wx32 2018-06-05 18:52:57.000000000 -0400 ++++ 3Depict-0.0.22/src/wx/propertyGridUpdater.h 2022-08-04 17:51:35.619683708 -0400 +@@ -19,7 +19,9 @@ + #ifndef PROPERTYGRIDUPDATER_H + #define PROPERTYGRIDUPDATER_H + ++#include + #include ++#include + #include + #include "backend/filter.h" + #include "gui/dialogs/transferFuncDialog.h" +diff -up 3Depict-0.0.22/src/wx/wxcomponents.h.wx32 3Depict-0.0.22/src/wx/wxcomponents.h +--- 3Depict-0.0.22/src/wx/wxcomponents.h.wx32 2018-06-05 18:52:57.000000000 -0400 ++++ 3Depict-0.0.22/src/wx/wxcomponents.h 2022-08-04 17:57:47.144135600 -0400 +@@ -39,10 +39,10 @@ + + //!3D combo grid renderer, from + //http://nomadsync.cvs.sourceforge.net/nomadsync/nomadsync/src/EzGrid.cpp?view=markup (GPL) +-class wxGridCellChoiceRenderer : public wxGridCellStringRenderer ++class wxGridCellChoiceRenderer_ : public wxGridCellStringRenderer + { + public: +- wxGridCellChoiceRenderer(wxLayoutAlignment border = wxLAYOUT_NONE) : ++ wxGridCellChoiceRenderer_(wxLayoutAlignment border = wxLAYOUT_NONE) : + m_border(border) {} + virtual void Draw(wxGrid& grid, + wxGridCellAttr& attr, +@@ -52,7 +52,7 @@ public: + bool isSelected); + virtual wxGridCellRenderer *Clone() const + { +- return new wxGridCellChoiceRenderer; ++ return new wxGridCellChoiceRenderer_; + } + private: + wxLayoutAlignment m_border; diff -Nru 3depict-0.0.23/debian/patches/series 3depict-0.0.23/debian/patches/series --- 3depict-0.0.23/debian/patches/series 2021-11-04 12:39:35.000000000 +0000 +++ 3depict-0.0.23/debian/patches/series 2022-12-30 19:59:32.000000000 +0000 @@ -7,3 +7,4 @@ patch_gsl_spmatrix_size_t debash.patch fix-ftgl-detection.patch +3Depict-0.0.22-wx3.2.patch