From 584ebda8f701836071ac1e01668f73d6576aac29 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Wed, 1 May 2024 11:09:43 +0200 Subject: [PATCH] rehex: fix build I had patches in generated files, patch the generator instead. Also provide the same flags at build and install time (it seems to help with locating the plugins) --- .../rehex/patches/rehex-0.61.1.patchset | 28 +++++++++++++++++-- app-editors/rehex/rehex-0.61.1.recipe | 7 ++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/app-editors/rehex/patches/rehex-0.61.1.patchset b/app-editors/rehex/patches/rehex-0.61.1.patchset index a8dd97986..2113e2997 100644 --- a/app-editors/rehex/patches/rehex-0.61.1.patchset +++ b/app-editors/rehex/patches/rehex-0.61.1.patchset @@ -1,4 +1,4 @@ -From 48a62d0ff83371b9ab049ef2f0facd8901c1d4b0 Mon Sep 17 00:00:00 2001 +From a7be8a7507ba6484ed288a9131c082cf2b8bf07e Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Wed, 1 May 2024 10:07:56 +0200 Subject: Add endianness conversion for Haiku @@ -38,7 +38,7 @@ index c878794..e3d471f 100644 2.43.2 -From a060113669455dd766c802898a225bdfffd6b652 Mon Sep 17 00:00:00 2001 +From a806cb40ee06d120c0047fc96143a2a476e6d1ac Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Wed, 1 May 2024 10:41:41 +0200 Subject: Link with libiconv on Haiku @@ -62,7 +62,7 @@ index 3656da1..0e12968 100644 2.43.2 -From 098d494f9d596479cc3a49076a33fbc98f919937 Mon Sep 17 00:00:00 2001 +From 3cc07310e58f5481495efb9f6f0f83745a09e821 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Wed, 1 May 2024 10:41:56 +0200 Subject: disable tests using Busted @@ -103,3 +103,25 @@ index fe13880..7403eee 100644 -- 2.43.2 + +From 86893bac29feb4ecea661f79541fdb87161a8e1e Mon Sep 17 00:00:00 2001 +From: PulkoMandy +Date: Wed, 1 May 2024 11:04:38 +0200 +Subject: Add missing include in generated files + + +diff --git a/wxLua/bindings/genwxbind.lua b/wxLua/bindings/genwxbind.lua +index e9db1c3..ce519b4 100644 +--- a/wxLua/bindings/genwxbind.lua ++++ b/wxLua/bindings/genwxbind.lua +@@ -4883,6 +4883,7 @@ function GenerateHookCppFileHeader(fileData, fileName, add_includes) + table.insert(fileData, hook_cpp_binding_includes or "") + table.insert(fileData, "\n") + table.insert(fileData, "#include \"wx/wxprec.h\"\n") ++ table.insert(fileData, "#include \"wx/evtloop.h\"\n") + table.insert(fileData, "\n") + table.insert(fileData, "#ifdef __BORLANDC__\n") + table.insert(fileData, " #pragma hdrstop\n") +-- +2.43.2 + diff --git a/app-editors/rehex/rehex-0.61.1.recipe b/app-editors/rehex/rehex-0.61.1.recipe index f0002a737..0715289fc 100644 --- a/app-editors/rehex/rehex-0.61.1.recipe +++ b/app-editors/rehex/rehex-0.61.1.recipe @@ -78,10 +78,15 @@ BUILD_PREREQUIRES=" BUILD() { - make $jobArgs BOTAN_CFLAGS=-I/system/develop/headers/botan-2/ BUILD_HELP=0 + make $jobArgs BOTAN_CFLAGS=-I/system/develop/headers/botan-2/ BUILD_HELP=0 prefix=$prefix datarootdir=$dataRootDir } INSTALL() { make install BUILD_HELP=0 prefix=$prefix datarootdir=$dataRootDir + + # Remove .desktop and png icons + rm -rf $dataRootDir + + addAppDeskbarSymlink $binDir/rehex Rehex }