pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

eureka-devel: Update to Git revision b0bd3ab3e50c96c8974927e703ec0c31690c1274



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Dec 13 12:48:49 2019 +0100
Changeset:	5aad331e620c1a5d0049612111776e96154d943d

Modified Files:
	eureka-devel/Makefile
	eureka-devel/TODO
	eureka-devel/distinfo
	eureka-devel/options.mk
Added Files:
	eureka-devel/patches/patch-src_m__events.cc

Log Message:
eureka-devel: Update to Git revision b0bd3ab3e50c96c8974927e703ec0c31690c1274

Added patch for wrong data type (Parameter for FatalError() function).
Reported upstream (Ticket #37).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5aad331e620c1a5d0049612111776e96154d943d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 eureka-devel/Makefile                       |  2 +-
 eureka-devel/TODO                           |  4 ++++
 eureka-devel/distinfo                       |  1 +
 eureka-devel/options.mk                     |  3 +++
 eureka-devel/patches/patch-src_m__events.cc | 16 ++++++++++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)

diffs:
diff --git a/eureka-devel/Makefile b/eureka-devel/Makefile
index 97079698ae..80f8ee0f06 100644
--- a/eureka-devel/Makefile
+++ b/eureka-devel/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-GIT_REVISION=	5ff8ed31515de647a636c4adf778ee63608f4aed
+GIT_REVISION=	b0bd3ab3e50c96c8974927e703ec0c31690c1274
 PKGNAME=	eureka-devel-0
 GIT_REPO=	https://git.code.sf.net/p/eureka-editor/git
 #GIT_EXTRACTDIR=	eureka-124-source
diff --git a/eureka-devel/TODO b/eureka-devel/TODO
index 0c43829183..8f8b066759 100644
--- a/eureka-devel/TODO
+++ b/eureka-devel/TODO
@@ -20,5 +20,9 @@
     => An option "xdg-utils" already exists in pkgsrc
 [X] Update to Git commit 5ff8ed31515de647a636c4adf778ee63608f4aed
     => Remove patches merged upstream
+[X] Update to Git commit b0bd3ab3e50c96c8974927e703ec0c31690c1274
+    => Add patch for string parameter to FatalError()
+[X] Sent pkgsrc patch to upstream
+    => Ticket #37
 [ ] Import final eureka 1.25 release
 [ ] Switch back to FLTK version from pkgsrc current
diff --git a/eureka-devel/distinfo b/eureka-devel/distinfo
index 7cec2a9607..311d93cb5f 100644
--- a/eureka-devel/distinfo
+++ b/eureka-devel/distinfo
@@ -5,5 +5,6 @@ RMD160 (doomlegacy__common.zip) = 9c1185a5c5e9fc54612808977ee8f548b2258d31
 SHA512 (doomlegacy__common.zip) = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
 Size (doomlegacy__common.zip) = 0 bytes
 SHA1 (patch-Makefile) = c2e83da7c2f67466be3acff3309266a78ef7262f
+SHA1 (patch-src_m__events.cc) = 2ed1b7210ec203a4e87f81e584018ffe3c04bb53
 SHA1 (patch-src_m__files.cc) = a294c303fab3a37183bf33469af7c40d72f4f756
 SHA1 (patch-src_main.cc) = 8e94a98350d91c3eb92242126db08abd4f01849f
diff --git a/eureka-devel/options.mk b/eureka-devel/options.mk
index 73a2cd12c0..5ccf63529b 100644
--- a/eureka-devel/options.mk
+++ b/eureka-devel/options.mk
@@ -11,6 +11,9 @@ PKG_SUGGESTED_OPTIONS=	opengl xdg-utils
 # If FLTK is compiled without opengl option, it is ignored.
 # If FLTK is compiled with opengl option, removing it here allows to force usage
 # of the software renderer (recommended without hardware acceleration).
+.if !empty(PKG_OPTIONS:Mopengl)
+# Handled by Makefile because the FLTK dependency (not included here yet)
+.endif
 
 # xdg-utils: Create dependency for xdg-utils (Portland project)
 # Can be used by FLTK for fl_open_uri() on X11
diff --git a/eureka-devel/patches/patch-src_m__events.cc b/eureka-devel/patches/patch-src_m__events.cc
new file mode 100644
index 0000000000..69bee8b6de
--- /dev/null
+++ b/eureka-devel/patches/patch-src_m__events.cc
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Parameter for FatalError() must be of type char*, not std::string.
+Upstream Ticket #37.
+
+--- src/m_events.cc.orig	2019-12-13 10:47:22.000000000 +0000
++++ src/m_events.cc
+@@ -868,7 +868,7 @@ static void M_AddOperationMenu(std::stri
+ {
+ 	if (menu->size() < 2)
+ 	{
+-		FatalError("operations.cfg: no %s items.\n", context);
++		FatalError("operations.cfg: no %s items.\n", context.c_str());
+ 		return;
+ 	}
+ 


Home | Main Index | Thread Index | Old Index