Skip to content

Commit

Permalink
Koder: added patch for BMessageFormat renaming
Browse files Browse the repository at this point in the history
Already fixed in trunk, but next Koder version 0.40 will
take a while longer to be released, according to KapiX.

Also added lib:libscintilla$secondaryArchSuffix to REQUIRES
as haikuporter complains about that.
  • Loading branch information
Humdinger committed Aug 19, 2018
1 parent be01854 commit 05dcd07
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 1 deletion.
4 changes: 3 additions & 1 deletion haiku-apps/koder/koder-0.3.0.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ Scintilla."
HOMEPAGE="https://github.com/KapiX/Koder"
COPYRIGHT="2016-2018 Kacper Kasper"
LICENSE="MIT"
REVISION="2"
REVISION="3"
SOURCE_URI="https://github.com/KapiX/Koder/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="97b5eebac0366d428bef7e69262557775de47a385195358db1d432f3bb78d465"
SOURCE_DIR="Koder-$portVersion"
PATCHES="koder-0.3.0.patchset"

ARCHITECTURES="!x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="x86"
Expand All @@ -25,6 +26,7 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libscintilla$secondaryArchSuffix
lib:libyaml_cpp$secondaryArchSuffix
"

Expand Down
32 changes: 32 additions & 0 deletions haiku-apps/koder/patches/koder-0.3.0.patchset
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 591073e00ab79fad579bb3fb5eedb9aebb53cfe9 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Sun, 19 Aug 2018 17:41:55 +0200
Subject: BMessageFormat -> BStringFormat

Needed after Haiku API change in hrev52220

diff --git a/src/EditorWindow.cpp b/src/EditorWindow.cpp
index 7e1d8bb..b30e824 100644
--- a/src/EditorWindow.cpp
+++ b/src/EditorWindow.cpp
@@ -18,7 +18,7 @@
#include <GroupLayout.h>
#include <LayoutBuilder.h>
#include <MenuBar.h>
-#include <MessageFormat.h>
+#include <StringFormat.h>
#include <MimeType.h>
#include <Node.h>
#include <NodeInfo.h>
@@ -804,7 +804,7 @@ EditorWindow::_FindReplace(BMessage* message)
int occurences = fEditor->ReplaceAll(findText, replaceText,
matchCase, matchWord, inSelection, regex);
BString alertMessage;
- static BMessageFormat format(B_TRANSLATE("Replaced "
+ static BStringFormat format(B_TRANSLATE("Replaced "
"{0, plural, one{# occurence} other{# occurences}}."));
format.Format(alertMessage, occurences);
BAlert* alert = new BAlert(B_TRANSLATE("Replacement finished"),
--
2.16.4

2 comments on commit 05dcd07

@KapiX
Copy link
Member

@KapiX KapiX commented on 05dcd07 Aug 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lib:libscintilla$secondaryArchSuffix

Forgot to mention that... I have changed scintilla 4.x to build shared object instead of static lib, so Koder wouldn't start without this. Nice catch!

@humdingerb
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch!

Well, it was haikuporter catching it actually... but I'll send your praise to the old bugger. :)

Please sign in to comment.