From 701f30d82521ed628edb30829278fd337cdef5cf Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 17 Jul 2017 20:28:45 +0200 Subject: [PATCH] bookmarkconverter: upstream patchset. --- .../bookmarkconverter-0.4.3.recipe | 7 +++-- .../patches/bookmarkconverter-0.4.3.patchset | 26 ------------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 haiku-apps/bookmarkconverter/patches/bookmarkconverter-0.4.3.patchset diff --git a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe index 71a4590c2..73a0ddf62 100644 --- a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe +++ b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe @@ -5,12 +5,11 @@ formats." HOMEPAGE="http://github.com/HaikuArchives/BookmarkConverter" COPYRIGHT="2015 Markus Himmel" LICENSE="MIT" -REVISION="3" -gitRevision="d1a4f53b4ccb33d9fd0f9818c8fe05b5689c6251" +REVISION="4" +gitRevision="47d5d182f1ff1cdab5d0b16f088ab264378d58fd" SOURCE_URI="https://github.com/HaikuArchives/BookmarkConverter/archive/$gitRevision.zip" SOURCE_DIR="BookmarkConverter-$gitRevision" -CHECKSUM_SHA256="44c26bff324d00fe19a51824cfd2e797ebc0d0c5f27a886e5c69851508ebb3ea" -PATCHES="bookmarkconverter-$portVersion.patchset" +CHECKSUM_SHA256="414317453cf3223f55f17ac643e871edac61d58f84d54b6d6183df309f24ab18" 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 deleted file mode 100644 index 1704c9b35..000000000 --- a/haiku-apps/bookmarkconverter/patches/bookmarkconverter-0.4.3.patchset +++ /dev/null @@ -1,26 +0,0 @@ -From 88200a3a91fc41a76db58728448706e0b22a3de4 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -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 -