From 70343a78db5e26d07c3d04d9c75770c1b7f04bf2 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 17 Jul 2017 20:27:12 +0200 Subject: [PATCH] filwip: upstream patchset. --- haiku-apps/filwip/filwip-1.0.0.recipe | 7 +- .../filwip/patches/filwip-1.0.0.patchset | 357 ------------------ 2 files changed, 3 insertions(+), 361 deletions(-) delete mode 100644 haiku-apps/filwip/patches/filwip-1.0.0.patchset diff --git a/haiku-apps/filwip/filwip-1.0.0.recipe b/haiku-apps/filwip/filwip-1.0.0.recipe index fa3976fee..5f47bc0d8 100644 --- a/haiku-apps/filwip/filwip-1.0.0.recipe +++ b/haiku-apps/filwip/filwip-1.0.0.recipe @@ -6,14 +6,13 @@ about where the files to delete are." HOMEPAGE="https://sites.google.com/site/appfilwip/home" COPYRIGHT="2002 Ramshankar" LICENSE="SPL" -REVISION="7" -commit="e5e8bc31c3f356b603041be8883ce5c7df46ce97" +REVISION="8" +commit="4f2c234ccdc7a4c59d301f7f5e690aa44903194b" SOURCE_URI="https://github.com/HaikuArchives/filwip/archive/$commit.tar.gz" -CHECKSUM_SHA256="20c5476d1117d6ecff102186e74cfa730e9b989a98073b6f373f42562e019411" +CHECKSUM_SHA256="937525f11f96ca08a1a151e7a35860779956a59e9d1402784fe11836b08102c5" SOURCE_FILENAME="filwip-$commit.tar.gz" SOURCE_DIR="FilWip-$commit" ADDITIONAL_FILES="install_plugins.sh" -PATCHES="filwip-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/filwip/patches/filwip-1.0.0.patchset b/haiku-apps/filwip/patches/filwip-1.0.0.patchset deleted file mode 100644 index 9fa5505f5..000000000 --- a/haiku-apps/filwip/patches/filwip-1.0.0.patchset +++ /dev/null @@ -1,357 +0,0 @@ -From 109496146bb83404fea5ae937246da2ed1946250 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 18 May 2017 22:40:48 +0200 -Subject: gcc5 patch - - -diff --git a/Source/AboutWindow.cpp b/Source/AboutWindow.cpp -index f828be7..f11f8b2 100644 ---- a/Source/AboutWindow.cpp -+++ b/Source/AboutWindow.cpp -@@ -43,7 +43,7 @@ - /*============================================================================================================*/ - - MarqueeView::MarqueeView (BRect frame, const char *name, BRect textRect, -- uint32 resizeMask, uint32 flags = B_WILL_DRAW) -+ uint32 resizeMask, uint32 flags) - : BTextView (frame, name, textRect, resizeMask, flags) - { - curPos = Bounds().top; -@@ -278,8 +278,9 @@ AboutWindow::AboutWindow () - { - if ((strt = temp.FindFirst (mainHeadings[i].String())) != B_ERROR) - { -+ rgb_color mainHeadingColor = {0, 0, 200}; - textView->SetFontAndColor (strt, strt + strlen(mainHeadings[i].String()), -- be_plain_font, B_FONT_ALL, &(rgb_color){0, 0, 200}); -+ be_plain_font, B_FONT_ALL, &mainHeadingColor); - } - } - -diff --git a/Source/EraserLooper.cpp b/Source/EraserLooper.cpp -index c299387..4fedc01 100644 ---- a/Source/EraserLooper.cpp -+++ b/Source/EraserLooper.cpp -@@ -181,7 +181,8 @@ void EraserLooper::EraseList (bool guiMode) - B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_INFO_ALERT); - BTextView *vw = report->TextView(); - vw->SetStylable (true); -- vw->SetFontAndColor (0, 6, &font, B_FONT_ALL, &(rgb_color){0, 0, 198}); -+ rgb_color alertColor = {0, 0, 198}; -+ vw->SetFontAndColor (0, 6, &font, B_FONT_ALL, &alertColor); - - report->SetShortcut (0L, B_ESCAPE); - report->Go(NULL); -diff --git a/Source/FileLooper.cpp b/Source/FileLooper.cpp -index ef22b7a..2639a16 100644 ---- a/Source/FileLooper.cpp -+++ b/Source/FileLooper.cpp -@@ -278,7 +278,7 @@ FileLooper::FileLooper (EraserLooper *eraser, const char *processPath, const cha - BAlert *debugAlert = new BAlert ("OK", debugStr.String(), "OK"); - debugAlert->Go(); - -- cout << processPath << endl; cout.flush(); -+ std::cout << processPath << std::endl; std::cout.flush(); - } - } - -diff --git a/Source/InfoStrView.cpp b/Source/InfoStrView.cpp -index 3422bd6..9772153 100644 ---- a/Source/InfoStrView.cpp -+++ b/Source/InfoStrView.cpp -@@ -34,13 +34,14 @@ - #include - - #include -+#include - - #include "InfoStrView.h" - - /*============================================================================================================*/ - - InfoStrView::InfoStrView (BRect bounds, const char *name, const char *text, -- uint32 resizeFlags = B_FOLLOW_LEFT, uint32 flags = B_WILL_DRAW) -+ uint32 resizeFlags, uint32 flags) - : BStringView (bounds, name, text, resizeFlags, flags), - itemPath (NULL), - trackerSignature ("application/x-vnd.Be-TRAK") -diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp -index 9071f49..f951676 100644 ---- a/Source/MainWindow.cpp -+++ b/Source/MainWindow.cpp -@@ -1796,7 +1796,8 @@ bool MainWindow::ConfirmCleanUp () const - - BFont font (be_plain_font); - font.SetFace (B_BOLD_FACE); -- vw->SetFontAndColor (0, 7, &font, B_FONT_ALL, &(rgb_color){198, 0, 0, 255}); -+ rgb_color alertColor = {198, 0, 0, 255}; -+ vw->SetFontAndColor (0, 7, &font, B_FONT_ALL, &alertColor); - - /* Popup a scary warning :) */ - buttonIndex = confirm->Go (); -diff --git a/Source/MainWindow.h b/Source/MainWindow.h -index 37b03d7..62b07a7 100644 ---- a/Source/MainWindow.h -+++ b/Source/MainWindow.h -@@ -35,6 +35,7 @@ - #include - - class BBox; -+class BFilePanel; - class BMenuField; - class BPopUpMenu; - class BStatusBar; -diff --git a/Source/NodeLimit.cpp b/Source/NodeLimit.cpp -index 06832d1..117178c 100644 ---- a/Source/NodeLimit.cpp -+++ b/Source/NodeLimit.cpp -@@ -16,6 +16,10 @@ - - #include "NodeLimit.h" - -+#include -+#include -+#include -+ - /* Set nodeCount to the current limit and bumpValue additional monitors for each 4096 limit */ - int nodeCount = 4096; - const int32 bumpValue = 512; -@@ -32,7 +36,14 @@ status_t NeedMoreNodeMonitors () - nodeCount += bumpValue; - codeLocker.Unlock(); - -- return _kset_mon_limit_ (nodeCount); -+ struct rlimit rl; -+ if (nodeCount < 1) -+ return EINVAL; -+ rl.rlim_cur = nodeCount; -+ rl.rlim_max = RLIM_SAVED_MAX; -+ if (setrlimit(RLIMIT_NOVMON, &rl) < 0) -+ return errno; -+ return B_OK; - } - - /*============================================================================================================*/ -diff --git a/Source/NodeLimit.h b/Source/NodeLimit.h -index f5c1fc6..3840d29 100644 ---- a/Source/NodeLimit.h -+++ b/Source/NodeLimit.h -@@ -27,16 +27,6 @@ - #include - #include - --#ifndef _IMPEXP_ROOT --#define _IMPEXP_ROOT --#endif -- --/* We need this internal call in order to break the node limit */ --#ifdef __cplusplus -- extern "C" _IMPEXP_ROOT int _kset_mon_limit_ (int num); --#else -- _IMPEXP_ROOT int _kset_mon_limit_ (int num); --#endif - - /* Prototypes */ - status_t NeedMoreNodeMonitors (); -diff --git a/Source/PluginParser.h b/Source/PluginParser.h -index 995766f..19bd42c 100644 ---- a/Source/PluginParser.h -+++ b/Source/PluginParser.h -@@ -104,7 +104,7 @@ class PluginParser - /* Private variables */ - BEntry pluginEntry; - bool fileExists; -- fstream pluginStream; -+ std::fstream pluginStream; - BList itemList; - }; - -diff --git a/Source/PrefsListItem.cpp b/Source/PrefsListItem.cpp -index f62e6d3..8d84943 100644 ---- a/Source/PrefsListItem.cpp -+++ b/Source/PrefsListItem.cpp -@@ -34,6 +34,7 @@ - - #include - #include -+#include - - #include "PrefsListItem.h" - #include "Constants.h" -diff --git a/Source/PrefsView.cpp b/Source/PrefsView.cpp -index ca0f599..bf1faf0 100644 ---- a/Source/PrefsView.cpp -+++ b/Source/PrefsView.cpp -@@ -28,6 +28,8 @@ - #include "PrefsView.h" - #include "Constants.h" - -+#include -+ - /*============================================================================================================*/ - - PrefsView::PrefsView (BRect frame, const char *description) -diff --git a/Source/PrefsWindow.cpp b/Source/PrefsWindow.cpp -index cef3f29..8e03678 100644 ---- a/Source/PrefsWindow.cpp -+++ b/Source/PrefsWindow.cpp -@@ -521,10 +521,10 @@ void PrefsWindow::SaveViewLoopers () - prefs.SetBool ("lo_monitor", IsChecked (lo_monitorChk)); - - prefs.SetInt8 ("lo_priority", -- (int8)lo_priorityList.ItemAt(lo_priorityPopup->IndexOf(lo_priorityPopup->FindMarked()))); -+ (int8)(addr_t)lo_priorityList.ItemAt(lo_priorityPopup->IndexOf(lo_priorityPopup->FindMarked()))); - - prefs.SetInt16 ("lo_capacity", -- (int16)lo_capacityList.ItemAt(lo_capacityPopup->IndexOf(lo_capacityPopup->FindMarked()))); -+ (int16)(addr_t)lo_capacityList.ItemAt(lo_capacityPopup->IndexOf(lo_capacityPopup->FindMarked()))); - } - - /*============================================================================================================*/ -@@ -542,7 +542,7 @@ void PrefsWindow::LoadViewLoopers () - if (prefs.FindInt8 ("lo_priority", &p) == B_OK) - { - for (int32 x = 0; x < lo_priorityList.CountItems(); x++) -- if ((int8)lo_priorityList.ItemAt(x) == p) -+ if ((int8)(addr_t)lo_priorityList.ItemAt(x) == p) - { - (lo_priorityPopup->ItemAt(x))->SetMarked (true); - break; -@@ -558,7 +558,7 @@ void PrefsWindow::LoadViewLoopers () - if (prefs.FindInt16 ("lo_capacity", &c) == B_OK) - { - for (int32 x = 0; x < lo_capacityList.CountItems(); x++) -- if ((int16)lo_capacityList.ItemAtFast(x) == c) -+ if ((int16)(addr_t)lo_capacityList.ItemAtFast(x) == c) - { - (lo_capacityPopup->ItemAt(x))->SetMarked (true); - break; --- -2.12.2 - - -From 225ee633de3b62689fa3d3b6e3117a6ecab7a3b0 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 14 Jul 2017 23:11:27 +0200 -Subject: fix x86_64 build. - - -diff --git a/Source/BubbleHelp/BubbleHelper.cpp b/Source/BubbleHelp/BubbleHelper.cpp -index cfab103..2494756 100644 ---- a/Source/BubbleHelp/BubbleHelper.cpp -+++ b/Source/BubbleHelp/BubbleHelper.cpp -@@ -33,7 +33,7 @@ - - #include "BubbleHelper.h" - --long BubbleHelper::runcount = 0; -+int32 BubbleHelper::runcount = 0; - - /*============================================================================================================*/ - -@@ -159,7 +159,7 @@ char *BubbleHelper::GetHelp (BView *view) - - /*============================================================================================================*/ - --long BubbleHelper::_helper (void *arg) -+int32 BubbleHelper::_helper (void *arg) - { - ((BubbleHelper*)arg)->Helper(); - return 0; -@@ -205,7 +205,7 @@ void BubbleHelper::Helper() - while (be_app_messenger.IsValid()) - { - BPoint where; -- ulong buttons; -+ uint32 buttons; - if (enabled) - { - if (textwin->Lock()) -diff --git a/Source/BubbleHelp/BubbleHelper.h b/Source/BubbleHelp/BubbleHelper.h -index 8c00711..80b5571 100644 ---- a/Source/BubbleHelp/BubbleHelper.h -+++ b/Source/BubbleHelp/BubbleHelper.h -@@ -44,7 +44,7 @@ class BubbleHelper - BView *FindView (BPoint where); - - /* Thread function */ -- static long _helper (void *arg); -+ static int32 _helper (void *arg); - - /* Misc. private variables */ - bigtime_t delayTime; -@@ -54,7 +54,7 @@ class BubbleHelper - BTextView *textview; - bool enabled; - -- static long runcount; -+ static int32 runcount; - }; - - #endif /* _BUBBLEHELPER_H */ -diff --git a/Source/EraserLooper.cpp b/Source/EraserLooper.cpp -index 4fedc01..e9e59ab 100644 ---- a/Source/EraserLooper.cpp -+++ b/Source/EraserLooper.cpp -@@ -99,7 +99,7 @@ void EraserLooper::EraseList (bool guiMode) - - for (;;) - { -- const char *path = (const char*)entryList.RemoveItem (0L); -+ const char *path = (const char*)entryList.RemoveItem ((int32)0); - - if (!path) - break; -diff --git a/Source/InfoStrView.cpp b/Source/InfoStrView.cpp -index 9772153..6e62562 100644 ---- a/Source/InfoStrView.cpp -+++ b/Source/InfoStrView.cpp -@@ -33,6 +33,7 @@ - #include - #include - -+#include - #include - #include - -diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp -index f951676..064e877 100644 ---- a/Source/MainWindow.cpp -+++ b/Source/MainWindow.cpp -@@ -355,7 +355,7 @@ MainWindow::~MainWindow () - PluginContainerItem *cItem (NULL); - do - { -- cItem = (PluginContainerItem*)containerItems.RemoveItem (0L); -+ cItem = (PluginContainerItem*)containerItems.RemoveItem ((int32)0); - if (cItem != NULL) - delete cItem; - } while (cItem != NULL); -diff --git a/Source/PluginParser.cpp b/Source/PluginParser.cpp -index bfce2a1..362a9ca 100644 ---- a/Source/PluginParser.cpp -+++ b/Source/PluginParser.cpp -@@ -58,7 +58,7 @@ PluginContainerItem::~PluginContainerItem () - PluginItem *sItem (NULL); - for (;;) - { -- sItem = (PluginItem*)subItems.RemoveItem (0L); -+ sItem = (PluginItem*)subItems.RemoveItem ((int32)0); - if (sItem == NULL) - break; - -diff --git a/Source/PrefsView.cpp b/Source/PrefsView.cpp -index bf1faf0..f1d593f 100644 ---- a/Source/PrefsView.cpp -+++ b/Source/PrefsView.cpp -@@ -28,6 +28,7 @@ - #include "PrefsView.h" - #include "Constants.h" - -+#include - #include - - /*============================================================================================================*/ --- -2.12.2 -