[gentoo-commits] repo/gentoo:master commit in: games-util/dfarc/files/, games-util/dfarc/

[gentoo-commits] repo/gentoo:master commit in: games-util/dfarc/files/, games-util/dfarc/

[Michael Sterrett]

commit:     24f8ed710a1919af52469a02baf97e4534a1880d
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 16:54:09 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 16:54:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f8ed71

games-util/dfarc: avoid trying to use windres (bug #579096)

Package-Manager: portage-2.2.26

 games-util/dfarc/dfarc-3.12.ebuild                |  8 ++++++--
 games-util/dfarc/files/dfarc-3.12-nowindres.patch | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/games-util/dfarc/dfarc-3.12.ebuild b/games-util/dfarc/dfarc-3.12.ebuild
index 492c684..1d401e2 100644
--- a/games-util/dfarc/dfarc-3.12.ebuild
+++ b/games-util/dfarc/dfarc-3.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 WX_GTK_VER="3.0"
-inherit gnome2-utils fdo-mime wxwidgets games
+inherit eutils gnome2-utils fdo-mime wxwidgets games
 
 DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
 HOMEPAGE="http://www.freedink.org/"
@@ -22,6 +22,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	nls? ( >=dev-util/intltool-0.31 )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nowindres.patch
+}
+
 src_configure() {
 	egamesconf \
 		$(use_enable nls) \

diff --git a/games-util/dfarc/files/dfarc-3.12-nowindres.patch b/games-util/dfarc/files/dfarc-3.12-nowindres.patch
new file mode 100644
index 0000000..78b7109
--- /dev/null
+++ b/games-util/dfarc/files/dfarc-3.12-nowindres.patch
@@ -0,0 +1,18 @@
+--- src/Makefile.in.orig	2016-04-05 12:49:17.997412757 -0400
++++ src/Makefile.in	2016-04-05 12:50:42.058496766 -0400
+@@ -100,7 +100,6 @@
+ 	Package.$(OBJEXT) RecursiveDelete.$(OBJEXT) Tar.$(OBJEXT) \
+ 	DFArcFrame_Base.$(OBJEXT) Options_Base.$(OBJEXT) \
+ 	Package_Base.$(OBJEXT) InstallVerifyFrame_Base.$(OBJEXT)
+-@HAVE_WINDRES_TRUE@nodist_dfarc_OBJECTS = woeres.$(OBJEXT)
+ dfarc_OBJECTS = $(am_dfarc_OBJECTS) $(nodist_dfarc_OBJECTS)
+ dfarc_LDADD = $(LDADD)
+ AM_V_P = $(am__v_P_@AM_V@)
+@@ -346,7 +345,6 @@
+ 	InstallVerifyFrame_Base.wxg dink.ico
+ 
+ # How do we handle resources embedded in the executable binary?
+-@HAVE_WINDRES_TRUE@nodist_dfarc_SOURCES = woeres.rc
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 

[gentoo-commits] repo/gentoo:master commit in: games-util/dfarc/files/, games-util/dfarc/

[Pacho Ramos]

commit:     0c2c6b0a8fc4b07454c6fd034b0993da6aa87149
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 13:28:47 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 13:54:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2c6b0a

games-util/dfarc: Port to wxGTK 3.2

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 games-util/dfarc/dfarc-3.14-r1.ebuild            | 43 ++++++++++++++++++++++++
 games-util/dfarc/files/dfarc-3.14-wxString.patch | 12 +++++++
 2 files changed, 55 insertions(+)

diff --git a/games-util/dfarc/dfarc-3.14-r1.ebuild b/games-util/dfarc/dfarc-3.14-r1.ebuild
new file mode 100644
index 000000000000..1f6a12e39977
--- /dev/null
+++ b/games-util/dfarc/dfarc-3.14-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit wxwidgets xdg
+
+DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
+HOMEPAGE="http://www.gnu.org/software/freedink/"
+SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
+
+LICENSE="GPL-3 BZIP2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	app-arch/bzip2
+	x11-misc/xdg-utils
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( dev-util/intltool )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.12-nowindres.patch
+	# From OpenSuSE
+	"${FILESDIR}"/${P}-wxString.patch
+)
+
+src_configure() {
+	setup-wxwidgets
+	econf \
+		$(use_enable nls) \
+		--disable-desktopfiles \
+		--with-wx-config="${WX_CONFIG}"
+}
+
+src_install() {
+	default
+	dodoc TRANSLATIONS.txt
+}

diff --git a/games-util/dfarc/files/dfarc-3.14-wxString.patch b/games-util/dfarc/files/dfarc-3.14-wxString.patch
new file mode 100644
index 000000000000..9eb7bd3ddffe
--- /dev/null
+++ b/games-util/dfarc/files/dfarc-3.14-wxString.patch
@@ -0,0 +1,12 @@
+diff -Nur dfarc-3.14/src/Tar.cpp new/src/Tar.cpp
+--- dfarc-3.14/src/Tar.cpp	2018-06-05 23:18:34.000000000 +0200
++++ new/src/Tar.cpp	2019-02-02 02:41:40.128841786 +0100
+@@ -610,7 +610,7 @@
+             if (lLastCharacter != '\\' && lLastCharacter != '/')
+             {
+                 // Open the file.
+-                std::ostream* lStreamOut = ostream_open_unicode(lCurrentFilePath);
++                std::ostream* lStreamOut = ostream_open_unicode(lCurrentFilePath.mb_str());
+ 		if (!lStreamOut->good())
+                 {
+ 		    wxLogError(_("Error: Improperly archived file '%s'.  Skipping."), lCurrentFilePath);