From 9fbb5ae4d84dd63af4183549214fb766cea23dae Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 31 Jan 2017 19:42:24 +0100 Subject: [PATCH] rename: fix build on x86_64. --- .../rename/patches/rename-3.9.0.patchset | 53 +++++++++++++++++++ haiku-apps/rename/rename-3.9.0.recipe | 7 +-- 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 haiku-apps/rename/patches/rename-3.9.0.patchset diff --git a/haiku-apps/rename/patches/rename-3.9.0.patchset b/haiku-apps/rename/patches/rename-3.9.0.patchset new file mode 100644 index 000000000..6247d4dc7 --- /dev/null +++ b/haiku-apps/rename/patches/rename-3.9.0.patchset @@ -0,0 +1,53 @@ +From 04bd0c6900f6ef7e50f4e8bc9cabcbe05b7cf5ab Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 31 Jan 2017 19:38:14 +0100 +Subject: gcc5 build fix + + +diff --git a/source/DragDropView.cpp b/source/DragDropView.cpp +index f4dd7ee..2bf5088 100644 +--- a/source/DragDropView.cpp ++++ b/source/DragDropView.cpp +@@ -19,9 +19,9 @@ DragDropView::DragDropView(BRect frame) : BView(frame,"DragDropView", + + SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); + +- BRect frame = Bounds(); +- frame.InsetBy(10,10); +- dragDropBox = new BBox(frame,"dragDropBox",B_FOLLOW_ALL); ++ BRect bounds = Bounds(); ++ bounds.InsetBy(10,10); ++ dragDropBox = new BBox(bounds,"dragDropBox",B_FOLLOW_ALL); + dragDropBox->SetLabel(LABEL); + AddChild(dragDropBox); + } +diff --git a/source/driver.cpp b/source/driver.cpp +index ecfd4d6..d7f38ff 100644 +--- a/source/driver.cpp ++++ b/source/driver.cpp +@@ -10,7 +10,7 @@ + * + */ + +-#include ++#include + #include + #include + #include +@@ -59,11 +59,12 @@ process_refs(entry_ref dir_ref, BMessage* msg, void* reserved) + wait_for_thread(thread, &win_status); + } + +-void ++int + main() + { + PRINT(("main()\n")); + new Application(); + be_app->Run(); + delete be_app; ++ return 0; + } +-- +2.10.2 + diff --git a/haiku-apps/rename/rename-3.9.0.recipe b/haiku-apps/rename/rename-3.9.0.recipe index c9e20aa7a..18cccf762 100644 --- a/haiku-apps/rename/rename-3.9.0.recipe +++ b/haiku-apps/rename/rename-3.9.0.recipe @@ -8,12 +8,13 @@ names!" HOMEPAGE="https://github.com/bbjimmy/ReName_for_HAIKU" COPYRIGHT="2000 FlipSide Software" LICENSE="Public Domain" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/bbjimmy/ReName_for_HAIKU/archive/1.0.tar.gz" -CHECKSUM_SHA512="f13f3a022dab3305c35af0a149711e9e304b00082835115aea3ca8eafa7026cf15613e8f932466e16050dc8282fdcdc16ea3b0d4dc257db09442e16a69c939ae" +CHECKSUM_SHA256="5534bacdf5b53ee9dcb156b9bec20da00a637d63511d964d5eee2de68ad8a952" SOURCE_DIR="ReName_for_HAIKU-1.0" +PATCHES="rename-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" rename= $portVersion