[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: vym: FTBFS[!linux]: error: expected type-specifier before 'AdaptorVym'



forwarded 707726 vym@insilmaril.de
tag 707726 + patch
thanks

Hi,

Alle venerdì 10 maggio 2013, Christoph Egger ha scritto:
> Your package failed to build on the kfreebsd-* buildds:

It actually won't compile on any Unix system different than Linux or Mac 
(so also on Hurd, in Debian context).

Earlier today I fixed it on Hurd, and emailed the author with fixed. 
Pasting from the email I wrote him:

* fix-build.diff
checks for VYM_DBUS instead of Q_OS_LINUX, as that's the right define 
for D-Bus support

* non-linux-settings.diff
when reading the handlers for URLs and PDFs, instead of doing:
  if linux
  else if mac
  else /* is windows */
or similar, just simplifies the handling to be
  if windows
  else if mac
  else /* linux or other unices */
which suits Linux and other unices better (of course, any Unix system 
which needs an ad-hoc executable can just be added as custom elif case).

Thanks,
-- 
Pino Toscano
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef Q_OS_LINUX
+#if defined(VYM_DBUS)
 #include "adaptorvym.h"
 #endif
 
--- a/vymmodel.h
+++ b/vymmodel.h
@@ -6,7 +6,7 @@
 #include <QPointF>
 #include <QTextCursor>
 
-#if defined(Q_OS_LINUX)
+#if defined(VYM_DBUS)
 #include "adaptormodel.h"
 #endif
 
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -245,35 +245,26 @@ Main::Main(QWidget* parent, Qt::WFlags f
 
 	// application to open URLs
 	p="/mainwindow/readerURL";
-	#if defined(Q_OS_LINUX)
-	    s=settings.value (p,"xdg-open").toString();
+	#if defined(Q_OS_WIN)
+	    // Assume that system has been set up so that
+	    // Explorer automagically opens up the URL
+	    // in the user's preferred browser.
+	    s=settings.value (p,"explorer").toString();
+	#elif defined(Q_OS_MACX)
+	    s=settings.value (p,"/usr/bin/open").toString();
 	#else
-	    #if defined(Q_OS_MACX)
-		s=settings.value (p,"/usr/bin/open").toString();
-
-	    #else
-		#if defined(Q_OS_WIN32)
-		    // Assume that system has been set up so that
-		    // Explorer automagically opens up the URL
-		    // in the user's preferred browser.
-		    s=settings.value (p,"explorer").toString();
-		#else
-		    s=settings.value (p,"mozilla").toString();
-		#endif
-	    #endif
+	    s=settings.value (p,"xdg-open").toString();
 	#endif
 	settings.setValue( p,s);
 
 	// application to open PDFs
 	p="/mainwindow/readerPDF";
-	#if defined(Q_OS_LINUX)
-	    s=settings.value (p,"xdg-open").toString();
+	#if defined(Q_OS_WIN)
+	    s=settings.value (p,"explorer").toString();
+	#elif defined(Q_OS_MACX)
+	    s=settings.value (p,"/usr/bin/open").toString();
 	#else
-	    #if defined(Q_OS_MACX)
-		s=settings.value (p,"/usr/bin/open").toString();
-	    #else
-		s=settings.value (p,"explorer").toString();
-	    #endif
+	    s=settings.value (p,"xdg-open").toString();
 	#endif
 	settings.setValue( p,s);
 

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: