From e0e6ee82f9f7a1d914eab22ed254941b0502b35b92172da25b8173cbfe044bb0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 2 Oct 2007 22:56:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=4 --- hugin-jpe.patch | 2 +- hugin-optim_file.patch | 34 ++++++++++++++++++++++++++++++++++ hugin-string-compare.patch | 2 +- hugin.changes | 6 ++++++ hugin.spec | 13 ++++++++----- 5 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 hugin-optim_file.patch diff --git a/hugin-jpe.patch b/hugin-jpe.patch index 730f517..6aaede0 100644 --- a/hugin-jpe.patch +++ b/hugin-jpe.patch @@ -61,7 +61,7 @@ This patch adds support for JPEG files named "*.jpe". wxConfigBase* config = wxConfigBase::Get(); - wxString wildcard (_("All Image files|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG|All files (*)|*")); -+ wxString wildcard (_("All Image files|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg,*.jpeg)|*.jpg;*.JPG;*.jpeg;*.JPEG;*.jpe;*.JPE|All files (*)|*")); ++ wxString wildcard (_("All Image files|*.jpg;*.JPG;*.jpeg;*.JPEG;*.jpe;*.JPE;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff;*.hdr|JPEG files (*.jpg,*.jpeg,*.jpe)|*.jpg;*.JPG;*.jpeg;*.JPEG;*.jpe;*.JPE|All files (*)|*")); wxString path = config->Read(wxT("actualPath"), wxT("")); wxFileDialog dlg(this,_("Add images"), diff --git a/hugin-optim_file.patch b/hugin-optim_file.patch new file mode 100644 index 0000000..8e45ae2 --- /dev/null +++ b/hugin-optim_file.patch @@ -0,0 +1,34 @@ +--- src/Panorama/PTOptimise.cpp ++++ src/Panorama/PTOptimise.cpp +@@ -28,6 +28,9 @@ + #include + #include + ++#include ++#include ++ + #include "common/stl_utils.h" + #include "PT/PTOptimise.h" + #include "PT/ImageGraph.h" +@@ -37,7 +40,7 @@ + #include + + #define DEBUG_WRITE_OPTIM_OUTPUT +-#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt" ++#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results_%d_%d.txt" + + using namespace std; + using namespace PT; +@@ -134,7 +137,11 @@ + // get results from align info. + #ifdef DEBUG_WRITE_OPTIM_OUTPUT + fullPath path; +- StringtoFullPath(&path, DEBUG_WRITE_OPTIM_OUTPUT_FILE ); ++ ++ char tmpfilename[256]; ++ snprintf(tmpfilename, 256, DEBUG_WRITE_OPTIM_OUTPUT_FILE, time(NULL), getpid() ); ++ ++ StringtoFullPath(&path, tmpfilename ); + + ainf.data = opt.message; + WriteResults( script, &path, &ainf, distSquared, 0); diff --git a/hugin-string-compare.patch b/hugin-string-compare.patch index f41f97d..cb7fd7d 100644 --- a/hugin-string-compare.patch +++ b/hugin-string-compare.patch @@ -7,7 +7,7 @@ autooptimiser.cpp:136: warning: comparison with string literal results in unspec Panorama pano; PanoramaMemento newPano; - if (scriptFile == "-") { -+ if (scriptFile[0] == '-') { ++ if (strcmp(scriptFile,"-") == 0) { if (newPano.loadPTScript(cin)) { pano.setMemento(newPano); } else { diff --git a/hugin.changes b/hugin.changes index 4fac427..f9bc11c 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 27 14:28:38 CEST 2007 - prusnak@suse.cz + +- fixed creation of fixed-name file in /tmp [#307684] + (optim_file.patch) + ------------------------------------------------------------------- Mon Jul 16 18:48:54 CEST 2007 - sbrabec@suse.cz diff --git a/hugin.spec b/hugin.spec index e462ef6..5edf340 100644 --- a/hugin.spec +++ b/hugin.spec @@ -12,11 +12,11 @@ Name: hugin BuildRequires: SDL-devel boost-devel fdupes fftw-devel gcc-c++ libpano-devel libxml2 licenses python-wxGTK update-desktop-files vigra wxGTK-devel zip -License: GPL v2 or later, The VIGRA Artistic License +License: GPL v2 or later Group: Productivity/Graphics/Bitmap Editors Summary: Front-End for Panorama Tools Version: 0.6.99.4 -Release: 1 +Release: 36 %define _version 0.7_beta4 Source: %{name}-%{_version}.tar.bz2 Patch2: hugin-fftw.patch @@ -24,7 +24,8 @@ Patch4: hugin-jpe.patch Patch64: hugin-lib64.patch Patch11: hugin-0.5-autoconf.diff Patch12: hugin-string-compare.patch -URL: http://hugin.sourceforge.net/ +Patch13: hugin-optim_file.patch +Url: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: licenses @@ -55,6 +56,7 @@ Authors: %endif %patch11 %patch12 +%patch13 # Rename Spanish Catalan to Catalan. mv src/hugin/po/ca_ES.po src/hugin/po/ca.po # Rename Czech Czech Republic to Czech. @@ -79,7 +81,6 @@ make %{?jobs:-j%jobs} %{find_lang} nona_gui %{name}.lang # Use better place for MIME icons. mv $RPM_BUILD_ROOT%{_datadir}/icons/gnome $RPM_BUILD_ROOT%{_datadir}/icons/hicolor - %fdupes $RPM_BUILD_ROOT%{_datadir} for FILE in COPYING LICENCE LICENCE_JHEAD LICENCE_VIGRA ; do MD5SUM=$(md5sum $FILE | sed 's/ .*//') @@ -111,8 +112,10 @@ fi %{_datadir}/mime/packages/*.xml %{_datadir}/pixmaps/*.png %doc %{_mandir}/man?/* - %changelog +* Thu Sep 27 2007 - prusnak@suse.cz +- fixed creation of fixed-name file in /tmp [#307684] + (optim_file.patch) * Mon Jul 16 2007 - sbrabec@suse.cz - Updated to version 0.7_beta4. * update panotools to latest version