mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
Fixes to the QupZilla recipe.
Doesn't build for me yet, I messed up my Qt package somehow (fails looking for qsslcertificate.h...)
This commit is contained in:
@@ -5,11 +5,11 @@ Subject: QupZilla resource file. Provided by Giovanni, converted to .rdef
|
||||
file.
|
||||
|
||||
|
||||
diff --git a/Haiku/QupZilla.rdef b/Haiku/QupZilla.rdef
|
||||
diff --git a/haiku/QupZilla.rdef b/haiku/QupZilla.rdef
|
||||
new file mode 100644
|
||||
index 0000000..e5bc598
|
||||
--- /dev/null
|
||||
+++ b/Haiku/QupZilla.rdef
|
||||
+++ b/haiku/QupZilla.rdef
|
||||
@@ -0,0 +1,161 @@
|
||||
+
|
||||
+resource app_signature "application/x-vnd.QupZilla";
|
||||
@@ -202,77 +202,6 @@ index c21413b..aa6fa11 100644
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 2a263fe6616cb263bfe0dd4911626811fec2ae99 Mon Sep 17 00:00:00 2001
|
||||
From: "Arfonzo J. Coward" <arfonzo@gmail.com>
|
||||
Date: Mon, 24 Mar 2014 23:17:19 +0000
|
||||
Subject: Tweak #ifdefs to include/exclude required headers for Haiku. Modify
|
||||
qupzilla_signal_handler() to avoid saving backtrace on Haiku.
|
||||
|
||||
|
||||
diff --git a/src/main/main.cpp b/src/main/main.cpp
|
||||
index 9527c32..599520e 100644
|
||||
--- a/src/main/main.cpp
|
||||
+++ b/src/main/main.cpp
|
||||
@@ -22,9 +22,11 @@
|
||||
#include <QMessageBox> // For QT_REQUIRE_VERSION
|
||||
#include <iostream>
|
||||
|
||||
-#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__)
|
||||
+#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__)
|
||||
#include <signal.h>
|
||||
+#ifndef __HAIKU__
|
||||
#include <execinfo.h>
|
||||
+#endif
|
||||
|
||||
#include <QDir>
|
||||
#include <QDateTime>
|
||||
@@ -48,6 +50,7 @@ void qupzilla_signal_handler(int s)
|
||||
}
|
||||
sigSegvServed = true;
|
||||
|
||||
+#ifndef __HAIKU__
|
||||
std::cout << "QupZilla: Crashed :( Saving backtrace in " << qPrintable(DataPaths::path(DataPaths::Config)) << "/crashlog ..." << std::endl;
|
||||
|
||||
void* array[100];
|
||||
@@ -97,6 +100,9 @@ void qupzilla_signal_handler(int s)
|
||||
file.close();
|
||||
|
||||
std::cout << "Backtrace successfuly saved in " << qPrintable(dir.absoluteFilePath(file.fileName())) << std::endl;
|
||||
+#else
|
||||
+ std::cout << "QupZilla: Crashed :(" << std::endl;
|
||||
+#endif
|
||||
}
|
||||
#endif // defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__)
|
||||
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 75f5809666b4b3eaf2aa1f53f694c04985ce90fa Mon Sep 17 00:00:00 2001
|
||||
From: "Arfonzo J. Coward" <arfonzo@gmail.com>
|
||||
Date: Mon, 24 Mar 2014 23:19:25 +0000
|
||||
Subject: processinfo.cpp: manually define DT_DIR on Haiku.
|
||||
|
||||
|
||||
diff --git a/src/lib/3rdparty/processinfo.cpp b/src/lib/3rdparty/processinfo.cpp
|
||||
index 6cc179c..17190b8 100644
|
||||
--- a/src/lib/3rdparty/processinfo.cpp
|
||||
+++ b/src/lib/3rdparty/processinfo.cpp
|
||||
@@ -29,6 +29,10 @@
|
||||
#include <cstdarg>
|
||||
#endif
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#define DT_DIR 4
|
||||
+#endif
|
||||
+
|
||||
ProcessInfo::ProcessInfo(const QString &name)
|
||||
: m_name(name)
|
||||
{
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From f2a317930fc3ffb5dc3bc9d71dbfdc160540b630 Mon Sep 17 00:00:00 2001
|
||||
From: "Arfonzo J. Coward" <arfonzo@gmail.com>
|
||||
Date: Tue, 25 Mar 2014 00:17:04 +0000
|
||||
|
||||
@@ -10,7 +10,7 @@ It provides:
|
||||
- Multiplatform support."
|
||||
HOMEPAGE="http://www.qupzilla.com"
|
||||
SRC_URI="git://github.com/QupZilla/qupzilla.git"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="2010-2013 David Rosca"
|
||||
|
||||
@@ -31,6 +31,7 @@ PROVIDES="
|
||||
REQUIRES="
|
||||
haiku${secondaryArchSuffix} >= $haikuVersion
|
||||
libqt4${secondaryArchSuffix} >= 4.8.0
|
||||
lib:libexecinfo${secondaryArchSuffix}
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
@@ -42,15 +43,15 @@ BUILD_PREREQUIRES="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel == $haikuVersion
|
||||
#qtcore${secondaryArchSuffix} >= 4.8.0
|
||||
libqt4${secondaryArchSuffix}_devel >= 4.8.0
|
||||
devel:libssl${secondaryArchSuffix}
|
||||
devel:libssl${secondaryArchSuffix}
|
||||
devel:libexecinfo${secondaryArchSuffix}
|
||||
"
|
||||
|
||||
PATCHES="qupzilla-1.7.x.patchset"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
{
|
||||
qmake QUPZILLA_PREFIX=${appsDir}/QupZilla
|
||||
make $jobArgs
|
||||
}
|
||||
@@ -63,8 +64,8 @@ INSTALL()
|
||||
cd bin/
|
||||
|
||||
# Add Haiku resources.
|
||||
rc -o ../Haiku/QupZilla.rsrc ../Haiku/QupZilla.rdef
|
||||
xres -o qupzilla ../Haiku/QupZilla.rsrc
|
||||
rc -o ../haiku/QupZilla.rsrc ../haiku/QupZilla.rdef
|
||||
xres -o qupzilla ../haiku/QupZilla.rsrc
|
||||
mimeset -f qupzilla
|
||||
|
||||
cp qupzilla ${appsDir}/QupZilla/
|
||||
|
||||
Reference in New Issue
Block a user