mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
Koder: added patch for BMessageFormat renaming
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.
This commit is contained in:
@@ -7,10 +7,11 @@ Scintilla."
|
|||||||
HOMEPAGE="https://github.com/KapiX/Koder"
|
HOMEPAGE="https://github.com/KapiX/Koder"
|
||||||
COPYRIGHT="2016-2018 Kacper Kasper"
|
COPYRIGHT="2016-2018 Kacper Kasper"
|
||||||
LICENSE="MIT"
|
LICENSE="MIT"
|
||||||
REVISION="2"
|
REVISION="3"
|
||||||
SOURCE_URI="https://github.com/KapiX/Koder/archive/$portVersion.tar.gz"
|
SOURCE_URI="https://github.com/KapiX/Koder/archive/$portVersion.tar.gz"
|
||||||
CHECKSUM_SHA256="97b5eebac0366d428bef7e69262557775de47a385195358db1d432f3bb78d465"
|
CHECKSUM_SHA256="97b5eebac0366d428bef7e69262557775de47a385195358db1d432f3bb78d465"
|
||||||
SOURCE_DIR="Koder-$portVersion"
|
SOURCE_DIR="Koder-$portVersion"
|
||||||
|
PATCHES="koder-0.3.0.patchset"
|
||||||
|
|
||||||
ARCHITECTURES="!x86_gcc2 x86_64"
|
ARCHITECTURES="!x86_gcc2 x86_64"
|
||||||
SECONDARY_ARCHITECTURES="x86"
|
SECONDARY_ARCHITECTURES="x86"
|
||||||
@@ -25,6 +26,7 @@ PROVIDES="
|
|||||||
"
|
"
|
||||||
REQUIRES="
|
REQUIRES="
|
||||||
haiku$secondaryArchSuffix
|
haiku$secondaryArchSuffix
|
||||||
|
lib:libscintilla$secondaryArchSuffix
|
||||||
lib:libyaml_cpp$secondaryArchSuffix
|
lib:libyaml_cpp$secondaryArchSuffix
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
32
haiku-apps/koder/patches/koder-0.3.0.patchset
Normal file
32
haiku-apps/koder/patches/koder-0.3.0.patchset
Normal file
@@ -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
|
||||||
|
|
||||||
Reference in New Issue
Block a user