From 81a3d935e7a33268735884d8fb7223dd37cee71e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 15 Jul 2017 12:42:28 +0200 Subject: [PATCH] bookmarkconverter: fix gcc5 build. --- .../bookmarkconverter-0.4.3.recipe | 1 + .../patches/bookmarkconverter-0.4.3.patchset | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe index d3f9bdeb5..71a4590c2 100644 --- a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe +++ b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe @@ -10,6 +10,7 @@ gitRevision="d1a4f53b4ccb33d9fd0f9818c8fe05b5689c6251" SOURCE_URI="https://github.com/HaikuArchives/BookmarkConverter/archive/$gitRevision.zip" SOURCE_DIR="BookmarkConverter-$gitRevision" CHECKSUM_SHA256="44c26bff324d00fe19a51824cfd2e797ebc0d0c5f27a886e5c69851508ebb3ea" +PATCHES="bookmarkconverter-$portVersion.patchset" ARCHITECTURES="x86_gcc2 ?x86 x86_64" diff --git a/haiku-apps/bookmarkconverter/patches/bookmarkconverter-0.4.3.patchset b/haiku-apps/bookmarkconverter/patches/bookmarkconverter-0.4.3.patchset index aed68d95e..1704c9b35 100644 --- a/haiku-apps/bookmarkconverter/patches/bookmarkconverter-0.4.3.patchset +++ b/haiku-apps/bookmarkconverter/patches/bookmarkconverter-0.4.3.patchset @@ -1,11 +1,11 @@ -From 57663e3684c59ceab22b60c63ef51fcb536d9b78 Mon Sep 17 00:00:00 2001 +From 88200a3a91fc41a76db58728448706e0b22a3de4 Mon Sep 17 00:00:00 2001 From: Jerome Duval -Date: Wed, 12 Apr 2017 21:10:09 +0200 -Subject: fix build on gcc5 +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..ecbd0c5 100644 +index b670c7a..3d7f761 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -92,8 +92,10 @@ int main(int argc, char* argv[]) @@ -15,12 +15,12 @@ index b670c7a..ecbd0c5 100644 - input = (test.InitCheck() == B_OK) ? - new BeInput() : new QupZillaInput(); + if (test.InitCheck() == B_OK) -+ input = new BeInput(); -+ else -+ input = new QupZillaInput(); ++ input = new BeInput(); ++ else ++ input = new QupZillaInput(); } if (output == NULL) -- -2.11.0 +2.12.2