[med-svn] r8974 - in trunk/packages/imagevis3d/tags: . 2.0.1-3/debian 2.0.1-3/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Thu Dec 15 08:53:22 UTC 2011
Author: malat-guest
Date: 2011-12-15 08:53:21 +0000 (Thu, 15 Dec 2011)
New Revision: 8974
Added:
trunk/packages/imagevis3d/tags/2.0.1-3/
trunk/packages/imagevis3d/tags/2.0.1-3/debian/changelog
trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/manual.patch
trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/series
Removed:
trunk/packages/imagevis3d/tags/2.0.1-3/debian/changelog
trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/series
Log:
[svn-buildpackage] Tagging imagevis3d 2.0.1-3
Deleted: trunk/packages/imagevis3d/tags/2.0.1-3/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog 2011-12-15 08:17:17 UTC (rev 8969)
+++ trunk/packages/imagevis3d/tags/2.0.1-3/debian/changelog 2011-12-15 08:53:21 UTC (rev 8974)
@@ -1,12 +0,0 @@
-imagevis3d (2.0.1-2) unstable; urgency=low
-
- * Fix compilation errors.
- * Add more patches from upstream to fix warnings.
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 13 Dec 2011 18:53:44 +0100
-
-imagevis3d (2.0.1-1) unstable; urgency=low
-
- * Initial release (Closes: #651470)
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Fri, 09 Dec 2011 12:04:51 +0100
Copied: trunk/packages/imagevis3d/tags/2.0.1-3/debian/changelog (from rev 8972, trunk/packages/imagevis3d/trunk/debian/changelog)
===================================================================
--- trunk/packages/imagevis3d/tags/2.0.1-3/debian/changelog (rev 0)
+++ trunk/packages/imagevis3d/tags/2.0.1-3/debian/changelog 2011-12-15 08:53:21 UTC (rev 8974)
@@ -0,0 +1,18 @@
+imagevis3d (2.0.1-3) unstable; urgency=low
+
+ * Fix compilation errors on kFreeBSD.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Thu, 15 Dec 2011 09:38:21 +0100
+
+imagevis3d (2.0.1-2) unstable; urgency=low
+
+ * Fix compilation errors.
+ * Add more patches from upstream to fix warnings.
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Tue, 13 Dec 2011 18:53:44 +0100
+
+imagevis3d (2.0.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #651470)
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Fri, 09 Dec 2011 12:04:51 +0100
Copied: trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/manual.patch (from rev 8971, trunk/packages/imagevis3d/trunk/debian/patches/manual.patch)
===================================================================
--- trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/manual.patch (rev 0)
+++ trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/manual.patch 2011-12-15 08:53:21 UTC (rev 8974)
@@ -0,0 +1,121 @@
+Index: imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-12 12:16:25.000000000 +0100
++++ imagevis3d-2.0.1/ImageVis3D/UI/ImageVis3D_Help.cpp 2011-12-15 09:36:05.000000000 +0100
+@@ -38,6 +38,7 @@
+ #include "../Tuvok/Basics/StdDefines.h"
+ #include <algorithm>
+ #include <cstdio>
++#include <fstream>
+ #include <string>
+ #ifdef _MSC_VER
+ # include <array>
+@@ -45,21 +46,15 @@
+ # include <tr1/array>
+ #endif
+
+-#ifdef DETECTED_OS_LINUX
+-# include <libgen.h>
+-# include <unistd.h>
+-#endif
+-#include <fstream>
+-
+ #include <QtCore/QUrl>
+ #include <QtCore/QTime>
+ #include <QtCore/QDate>
+ #include <QtCore/QDir>
+-#include <QtCore/QTemporaryFile>
++#include <QtCore/QFile>
+ #include <QtCore/QFileInfo>
++#include <QtCore/QSettings>
+ #include <QtCore/QTemporaryFile>
+ #include <QtCore/QTextStream>
+-#include <QtCore/QSettings>
+ #include <QtGui/QMessageBox>
+ #include <QtGui/QDesktopServices>
+ #include <QtNetwork/QHttp>
+@@ -399,11 +394,9 @@
+ QDesktopServices::openUrl(QString(HELP_URL));
+ }
+
+-#ifdef DETECTED_OS_LINUX
+-static bool readable(const std::string &f) {
+- return (access(f.c_str(), R_OK) == 0);
++static bool readable(const std::string& f) {
++ return QFile(QString(f.c_str())).permissions() & QFile::ReadUser;
+ }
+-#endif
+
+ void MainWindow::OpenManual() {
+ #ifdef DETECTED_OS_WINDOWS
+@@ -417,19 +410,20 @@
+
+ /// Find out where our binary lives. The manual is placed in the same
+ /// directory in the case of the binary tarballs we provide.
+- std::vector<std::string> paths(4);
++ std::vector<std::string> paths; paths.reserve(4);
+ char linkbuf[1024];
+ memset(linkbuf, 0, 1024);
+ if(readlink("/proc/self/exe", linkbuf, 1024) == -1) {
+ T_ERROR("Error reading /proc/self/exe; ignoring binary directory while "
+ "searching for manual.");
+ } else {
+- paths.push_back(std::string(dirname(linkbuf)) + MANUAL_NAME);
++ paths.push_back(QFileInfo(linkbuf).absolutePath().toStdString() +
++ MANUAL_NAME);
+ }
+ paths.push_back(std::string("/usr/share/doc/imagevis3d/") + MANUAL_NAME);
+ paths.push_back(std::string("/usr/local/share/doc/imagevis3d/") +
+ MANUAL_NAME);
+- paths.push_back(std::string("./") + MANUAL_NAME);
++ paths.push_back(MANUAL_NAME);
+ std::vector<std::string>::const_iterator found = find_if(paths.begin(),
+ paths.end(),
+ readable);
+@@ -447,24 +441,28 @@
+ }
+ MESSAGE("Manual found at: %s", found->c_str());
+
+- // Now, figure out how to load the PDF. Ideally, we'd use FD.o's
+- // shared-mime-info to lookup which program the user wants to use for
+- // this. Qt is probably linking to this in some way, so it's likely
+- // we can use it directly, but I'm having trouble verifying that.
+- /// @todo FIXME use shared-mime-info to figure out PDF-reading program
+- // So, for now, just iterate through a hardcoded list and use the first that
+- // works.
+-
+- typedef std::tr1::array<std::string, 3> progvec;
+- progvec viewers = {{ "evince", "xpdf", "acroread" }};
+- // Now iterate through each of those programs until one of them
+- // successfully launches.
+- for(progvec::const_iterator prog = viewers.begin(); prog != viewers.end();
+- ++prog) {
+- char manual[1024];
+- snprintf(manual, 1024, "%s %s", prog->c_str(), found->c_str());
+- if(system(manual) != -1) {
+- break;
++ // Now, figure out how to load the PDF.
++ QUrl uri;
++ {
++ std::ostringstream u;
++ u << *found;
++ QString pth = QFileInfo(u.str().c_str()).absoluteFilePath();
++ uri.setUrl(pth);
++ MESSAGE("uri: %s", pth.toStdString().c_str());
++ }
++ if(!QDesktopServices::openUrl(uri)) {
++ MESSAGE("Manual open failed, relying on manual method.");
++ typedef std::tr1::array<std::string, 3> progvec;
++ progvec viewers = {{ "evince", "xpdf", "acroread" }};
++ // Now iterate through each of those programs until one of them
++ // successfully launches.
++ for(progvec::const_iterator prog = viewers.begin(); prog != viewers.end();
++ ++prog) {
++ char manual[1024];
++ snprintf(manual, 1024, "%s %s", prog->c_str(), found->c_str());
++ if(system(manual) != -1) {
++ break;
++ }
+ }
+ }
+ #endif
Deleted: trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2011-12-15 08:17:17 UTC (rev 8969)
+++ trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/series 2011-12-15 08:53:21 UTC (rev 8974)
@@ -1,17 +0,0 @@
-remove_convenientlibs.patch
-glew.patch
-bzip2.patch
-zlib.patch
-jpeg.patch
-bzip22.patch
-tiff.patch
-jpeg2.patch
-jpeg3.patch
-tiff4.patch
-libs3.patch
-tuvok_details.patch
-maxpath.patch
-warning.patch
-warning1.patch
-warning2.patch
-warning3.patch
Copied: trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/series (from rev 8971, trunk/packages/imagevis3d/trunk/debian/patches/series)
===================================================================
--- trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/series (rev 0)
+++ trunk/packages/imagevis3d/tags/2.0.1-3/debian/patches/series 2011-12-15 08:53:21 UTC (rev 8974)
@@ -0,0 +1,18 @@
+remove_convenientlibs.patch
+glew.patch
+bzip2.patch
+zlib.patch
+jpeg.patch
+bzip22.patch
+tiff.patch
+jpeg2.patch
+jpeg3.patch
+tiff4.patch
+libs3.patch
+tuvok_details.patch
+maxpath.patch
+warning.patch
+warning1.patch
+warning2.patch
+warning3.patch
+manual.patch
More information about the debian-med-commit
mailing list