qdirstat: bump version (#1757)

This commit is contained in:
Calvin Hill
2017-10-31 13:10:52 +00:00
committed by waddlesplash
parent 3254a22b0c
commit 9b38fb4f03
3 changed files with 41 additions and 56 deletions

View File

@@ -1,48 +0,0 @@
From 65eade57f3da656b5a8da8af97fdd66624b22683 Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Tue, 28 Feb 2017 11:12:09 +0000
Subject: [PATCH] header fixes for haiku
---
src/DirReadJob.cpp | 5 ++++-
src/Exception.cpp | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/DirReadJob.cpp b/src/DirReadJob.cpp
index 0ee743a..665549e 100644
--- a/src/DirReadJob.cpp
+++ b/src/DirReadJob.cpp
@@ -11,8 +11,11 @@
#include <sys/stat.h>
#include <unistd.h>
#include <stdio.h>
+#if defined(__HAIKU__)
+#include <errno.h>
+#else
#include <sys/errno.h>
-
+#endif
#include <QMutableListIterator>
#include "DirTree.h"
diff --git a/src/Exception.cpp b/src/Exception.cpp
index 26396f8..938edd0 100644
--- a/src/Exception.cpp
+++ b/src/Exception.cpp
@@ -6,8 +6,12 @@
* Author: Stefan Hundhammer <Stefan.Hundhammer@gmx.de>
*/
-
+#if defined(__HAIKU__)
+#include <errno.h>
+#else
#include <sys/errno.h>
+#endif
+
#include <string.h> // strerror()
#include "Exception.h"
--
2.2.2

View File

@@ -0,0 +1,25 @@
From 7f70ed143e54f1fce6ebfed19f0a50cc894abad8 Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Mon, 30 Oct 2017 07:46:59 +0000
Subject: [PATCH] Remove unnecessary errno include.
---
src/Exception.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/Exception.cpp b/src/Exception.cpp
index 760a860..e5a9b01 100644
--- a/src/Exception.cpp
+++ b/src/Exception.cpp
@@ -7,8 +7,6 @@
*/
-#include <sys/errno.h>
-
#include "Exception.h"
--
2.14.2

View File

@@ -17,37 +17,45 @@ COPYRIGHT="2015, 2017 Stefan Hundhammer"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/shundhammer/qdirstat/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="d79734915768ae858c784142c7a07b7599178329b40c73894bf575decaf1a911"
CHECKSUM_SHA256="7f9a0a7304c55ebfad1e50c7747ba762b07068f48304b3d3919bdb65ee037999"
PATCHES="qdirstat-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
PROVIDES="
qdirstat$secondaryArchSuffix = $portVersion
app:QDirStat$secondaryArchSuffix = $portVersion
app:QDirStat = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
qt5$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
qt5${secondaryArchSuffix}_devel
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
devel:libQt5Network$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:qmake$secondaryArchSuffix
cmd:gcc$secondaryArchSuffix
cmd:g++$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:qmake$secondaryArchSuffix >= 5
cmd:make
"
BUILD()
{
qmake .
make $jobArgs
}
INSTALL()
{
mkdir -p $appsDir