bookmarkconverter: upstream patchset.

This commit is contained in:
Jerome Duval
2017-07-17 20:28:45 +02:00
parent 70343a78db
commit 701f30d825
2 changed files with 3 additions and 30 deletions

View File

@@ -5,12 +5,11 @@ formats."
HOMEPAGE="http://github.com/HaikuArchives/BookmarkConverter" HOMEPAGE="http://github.com/HaikuArchives/BookmarkConverter"
COPYRIGHT="2015 Markus Himmel" COPYRIGHT="2015 Markus Himmel"
LICENSE="MIT" LICENSE="MIT"
REVISION="3" REVISION="4"
gitRevision="d1a4f53b4ccb33d9fd0f9818c8fe05b5689c6251" gitRevision="47d5d182f1ff1cdab5d0b16f088ab264378d58fd"
SOURCE_URI="https://github.com/HaikuArchives/BookmarkConverter/archive/$gitRevision.zip" SOURCE_URI="https://github.com/HaikuArchives/BookmarkConverter/archive/$gitRevision.zip"
SOURCE_DIR="BookmarkConverter-$gitRevision" SOURCE_DIR="BookmarkConverter-$gitRevision"
CHECKSUM_SHA256="44c26bff324d00fe19a51824cfd2e797ebc0d0c5f27a886e5c69851508ebb3ea" CHECKSUM_SHA256="414317453cf3223f55f17ac643e871edac61d58f84d54b6d6183df309f24ab18"
PATCHES="bookmarkconverter-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 ?x86 x86_64" ARCHITECTURES="x86_gcc2 ?x86 x86_64"

View File

@@ -1,26 +0,0 @@
From 88200a3a91fc41a76db58728448706e0b22a3de4 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 14 Jul 2017 22:53:27 +0200
Subject: fix gcc5 build.
diff --git a/src/main.cpp b/src/main.cpp
index b670c7a..3d7f761 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -92,8 +92,10 @@ int main(int argc, char* argv[])
if (input == NULL) {
BDirectory test(paths[0].String());
- input = (test.InitCheck() == B_OK) ?
- new BeInput() : new QupZillaInput();
+ if (test.InitCheck() == B_OK)
+ input = new BeInput();
+ else
+ input = new QupZillaInput();
}
if (output == NULL)
--
2.12.2