gentoo auto-resync : 03:01:2023 - 14:26:21

3 files changed, 68 insertions, 3 deletions

diff --git a/app-text/crwx-ng/Manifest b/app-text/crwx-ng/Manifest
index 9b93b0857d69..1e7f16a45d9e 100644
--- a/app-text/crwx-ng/Manifest
+++ b/app-text/crwx-ng/Manifest
@@ -1,3 +1,4 @@
+AUX crwx-ng-0.2.0.patch 3504 BLAKE2B 4ba842f9961f57fcd86f6423232fc401f2af07a1b5b77213716519d5e2a29b156d8f304b126249f2336abe60b7ac8ce13921d9f58aff1ce4efa70fdb06537ce0 SHA512 5370b9111efc9db9f493fdead16245b1b03eccd7e178f3ec9df6765893c743879c23f56ee700794e4dbab2dc15186714e598db335fb5a624b5cd096d8814df40
 DIST crwx-ng-0.2.0.tar.bz2 364917 BLAKE2B f8d541fa479fe3102d495ba43ce51d256f55b9724844d26b89db8396f2cbf90680dd312ecc0c816ee50fb498c8b69ba69d0db73f9ee5dcefc9991e8077754171 SHA512 0890a6066fca7178b483749e946659a6e4304f13694601024fe500e9b79351f7170403b136407a831abe7a040f775dd34c02d9411814c136da68ee6b69e00a99
-EBUILD crwx-ng-0.2.0-r1.ebuild 659 BLAKE2B 4f72aaf3febe1eb286053c39009f1f6c4beeaf2ff55a6e7d09e48ec02d90db383e318241156f2ec00b994f00e88d83afecb25126c9f99f73cd07ef7e62b7bb0c SHA512 5156ebf18e2a6671cb2d637c60c6a148aac3df52c8112969b7710c329e349f4b20735ee94036d558ea4de9bad43a6c857b616bca6344118a2a3ba32646793991
+EBUILD crwx-ng-0.2.0-r2.ebuild 700 BLAKE2B 4e80d8ea6377434b6f99a49ed8a95f7cdde613ab5f1793fbe2b330549ba37fecc6d8c8565da32c81f8c4419ec5af56cd37b01bd56a07592ac904d8b569077a8b SHA512 09cc9b248a4a7265270f37232292f6b20835182b86fb651a6117028dfc164acb34665c0b95fc51667f487aecfc67ab8c7f75a6ac31570b89717a35c20c749744
 MISC metadata.xml 1177 BLAKE2B d2d0af2338da64845775c14b66725abb760d84d267ca93a44f2ea679e0125f0cb1815ecd312da919ab1d9050f957c9e763ceeb817df7b48bac024b15ed292e96 SHA512 3bdc42749dff929ae4fdb6b9bd2c84eadbae352de4baacdd4f08572cd20d1f336dcd2d003b41bd79d56b3476026ba4d57d89331fe038592b8adaef60d03f34d7
diff --git a/app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild b/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild
index c3c0174eacf2..c362c9d43f6d 100644
--- a/app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild
+++ b/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
 
 CDEPEND=">=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
-	x11-libs/wxGTK:${WX_GTK_VER}"
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 BDEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
 	virtual/ttf-fonts"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/app-text/crwx-ng/files/crwx-ng-0.2.0.patch b/app-text/crwx-ng/files/crwx-ng-0.2.0.patch
new file mode 100644
index 000000000000..f754ceb88d0b
--- /dev/null
+++ b/app-text/crwx-ng/files/crwx-ng-0.2.0.patch
@@ -0,0 +1,62 @@
+From 146f22a7c56a3402c75b4a51b8b1940144dfd9fd Mon Sep 17 00:00:00 2001
+From: Aleksey Chernov <valexlin@gmail.com>
+Date: Tue, 27 Dec 2022 10:11:16 +0400
+Subject: [PATCH] Compile error/warn fixed.
+
+---
+ src/cr3.cpp | 25 +++++++++++--------------
+ 1 file changed, 11 insertions(+), 14 deletions(-)
+
+diff --git a/src/cr3.cpp b/src/cr3.cpp
+index 19d5c4a..00e733b 100644
+--- a/src/cr3.cpp
++++ b/src/cr3.cpp
+@@ -341,14 +341,17 @@ void testFormatting() {
+         LFormattedText txt;
+         void addLine(const lChar32* str, int flags, LVFontRef font) {
+             lString32 s(str);
+-            txt.AddSourceLine(s.c_str(),       /* pointer to unicode text string */
+-                              s.length(),      /* number of chars in text, 0 for auto(strlen) */
+-                              0x000000,        /* text color */
+-                              0xFFFFFF,        /* background color */
+-                              font.get(),      /* font to draw string */
+-                              NULL, flags, 16, /* interline space, *16 (16=single, 32=double) */
+-                              30,              /* first line margin */
+-                              NULL, 0);
++            txt.AddSourceLine(s.c_str(),  /* pointer to unicode text string */
++                              s.length(), /* number of chars in text, 0 for auto(strlen) */
++                              0x000000,   /* text color */
++                              0xFFFFFF,   /* background color */
++                              font.get(), /* font to draw string */
++                              NULL,       /* pointer to text lang config */
++                              flags,      /* flags */
++                              16,         /* line height in screen pixels; *16 (16=single, 32=double) */
++                              0,          /* drift y from baseline */
++                              30,         /* first line margin */
++                              NULL, 0, 0);
+         }
+         void dump() {
+             formatted_text_fragment_t* buf = txt.GetBuffer();
+@@ -1380,9 +1383,6 @@ void cr3Frame::OnFileOpen(wxCommandEvent& WXUNUSED(event)) {
+             wxT(""), //const wxString& defaultFile = "",
+             wxT("All supported files|*.fb2;*.fbz;*.txt;*.zip;*.rtf;*.epub;*.tcr;*.html;*.htm;*.shtml;*.xhtml|FictionBook files (*.fb2)|*.fb2;*.fbz|RTF files (*.rtf)|*.rtf|Text files (*.txt, *.tcr)|*.txt;*.tcr|HTML files|*.html;*.htm;*.shtml;*.xhtml|EPUB files (*.epub)|*.epub|ZIP archieves (*.zip)|*.zip"), //const wxString& wildcard = "*.*",
+             wxFD_OPEN | wxFD_FILE_MUST_EXIST //long style = wxFD_DEFAULT_STYLE,
+-            //const wxPoint& pos = wxDefaultPosition,
+-            //const wxSize& sz = wxDefaultSize,
+-            //const wxString& name = "filedlg"
+     );
+ 
+     if (dlg.ShowModal() == wxID_OK) {
+@@ -1410,9 +1410,6 @@ void cr3Frame::OnFileSave(wxCommandEvent& WXUNUSED(event)) {
+                      wxT(""),                               //const wxString& defaultFile = "",
+                      wxT("Wolf EBook files (*.wol)|*.wol"), //const wxString& wildcard = "*.*",
+                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT      //long style = wxFD_DEFAULT_STYLE,
+-                     //const wxPoint& pos = wxDefaultPosition,
+-                     //const wxSize& sz = wxDefaultSize,
+-                     //const wxString& name = "filedlg"
+     );
+     WolOptions opts(this);
+     if (dlg.ShowModal() == wxID_OK && opts.ShowModal() == wxID_OK) {
+-- 
+2.38.2
+