diff --git a/panoglview.spec b/panoglview.spec index 0d54953..3cf905d 100644 --- a/panoglview.spec +++ b/panoglview.spec @@ -1,16 +1,17 @@ Summary: Immersive viewer for spherical panoramas Name: panoglview Version: 0.2.2 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ URL: http://hugin.sourceforge.net/ Group: Applications/Multimedia Source0: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png +Patch0: wxwidgets3.0.patch BuildRequires: gcc-c++ BuildRequires: libtiff-devel libjpeg-devel libpng-devel -BuildRequires: wxGTK-devel zlib-devel desktop-file-utils +BuildRequires: compat-wxGTK3-gtk2-devel zlib-devel desktop-file-utils %description Use panoglview to explore equirectangular panoramic images. Equirectangular @@ -18,6 +19,7 @@ panoramas are typically JPEG/TIFF/PNG images with a 2:1 aspect ratio. %prep %setup -q +%patch0 -p1 chmod -x src/*.h src/*.cpp %build @@ -44,6 +46,9 @@ update-desktop-database &> /dev/null ||: %{_datadir}/pixmaps/%{name}.png %changelog +* Tue Nov 06 2018 Scott Talbert - 0.2.2-25 +- Rebuild with wxWidgets 3.0 (GTK+ 2 build) + * Fri Jul 13 2018 Fedora Release Engineering - 0.2.2-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/wxwidgets3.0.patch b/wxwidgets3.0.patch new file mode 100644 index 0000000..aa07345 --- /dev/null +++ b/wxwidgets3.0.patch @@ -0,0 +1,30 @@ +diff -up panoglview-0.2.2/src/panoframe.cpp.wx3 panoglview-0.2.2/src/panoframe.cpp +--- panoglview-0.2.2/src/panoframe.cpp.wx3 2008-07-23 17:09:11.000000000 -0400 ++++ panoglview-0.2.2/src/panoframe.cpp 2018-11-05 20:57:16.561033009 -0500 +@@ -136,7 +136,7 @@ PCX files (*.pcx)|*.pcx|\ + PNM files (*.pnm)|*.pnm|\ + TIFF files (*.tif)|*.tif|\ + XPM files (*.xpm)|*.xpm|\ +-All files (*.*)|*.*"),wxOPEN|wxFILE_MUST_EXIST); ++All files (*.*)|*.*"),wxFD_OPEN|wxFD_FILE_MUST_EXIST); + if (imagename !=wxT("")) + openImage(imagename); + } +@@ -153,7 +153,7 @@ void panoFrame::OnFullScreen(wxCommandEv + + void panoFrame::OnOpenProject(wxCommandEvent &event) + { +- wxString filename = wxFileSelector(_("Open Project"),wxEmptyString,wxEmptyString,wxT("paf"),_("Panorama files (*.paf)|*.paf|All files (*.*)|*.*"),wxOPEN|wxFILE_MUST_EXIST); ++ wxString filename = wxFileSelector(_("Open Project"),wxEmptyString,wxEmptyString,wxT("paf"),_("Panorama files (*.paf)|*.paf|All files (*.*)|*.*"),wxFD_OPEN|wxFD_FILE_MUST_EXIST); + if (filename !=wxT("")){ + openProject(filename); + } +@@ -292,7 +292,7 @@ void panoFrame::openArgumentFile(const w + + void panoFrame::OnSaveProject(wxCommandEvent &event) + { +- wxString filename = wxFileSelector(_("Save Project"),wxEmptyString,wxEmptyString,wxT("paf"),_("Panorama files (*.paf)|*.paf|All files (*.*)|*.*"),wxOVERWRITE_PROMPT|wxSAVE); ++ wxString filename = wxFileSelector(_("Save Project"),wxEmptyString,wxEmptyString,wxT("paf"),_("Panorama files (*.paf)|*.paf|All files (*.*)|*.*"),wxFD_OVERWRITE_PROMPT|wxFD_SAVE); + if (filename != wxT("")){ + if (wxFileExists(filename)) + wxRemoveFile(filename);