pkgsrc-WIP-changes archive

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

eureka: Add Description, Minor modifications



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Tue Sep 3 14:39:18 2019 +0200
Changeset:	ba0b484856b6882fa566758a07580a6c54f2a0ae

Modified Files:
	eureka/DESCR
	eureka/Makefile
	eureka/distinfo
	eureka/patches/patch-src_m__files.cc
Added Files:
	eureka/patches/patch-src_e__commands.cc
	eureka/patches/patch-src_ui__menu.cc

Log Message:
eureka: Add Description, Minor modifications

- Add dependency for xdg-utils
- Add patch to make Online documentation work

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

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

diffstat:
 eureka/DESCR                            |  5 +++++
 eureka/Makefile                         |  5 +++++
 eureka/distinfo                         |  4 +++-
 eureka/patches/patch-src_e__commands.cc | 21 +++++++++++++++++++++
 eureka/patches/patch-src_m__files.cc    |  4 +++-
 eureka/patches/patch-src_ui__menu.cc    | 16 ++++++++++++++++
 6 files changed, 53 insertions(+), 2 deletions(-)

diffs:
diff --git a/eureka/DESCR b/eureka/DESCR
index e69de29bb2..7aa4a28727 100644
--- a/eureka/DESCR
+++ b/eureka/DESCR
@@ -0,0 +1,5 @@
+Eureka is a map editor for the classic DOOM games, and a few related games
+such as Heretic and Hexen. It supports Linux, Windows and OS X.
+
+There is a 2D mode to create the layout and a 3D mode to check e.g. texture
+alignment.
diff --git a/eureka/Makefile b/eureka/Makefile
index 710cb0e286..850aefed1d 100644
--- a/eureka/Makefile
+++ b/eureka/Makefile
@@ -32,7 +32,12 @@ SUBST_MESSAGE.dwd=	Preparing m_files.cc file ...
 SUBST_FILES.dwd=	src/m_files.cc
 SUBST_SED.dwd=		-e 's,PKGSRC_DOOMWADDIR,${PREFIX}/${DOOMWADDIR},'
 
+# Needed by FLTK for fl_open_uri() on X11
+DEPENDS+=			xdg-utils>=1.1:../../misc/xdg-utils
+
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
+# FLTK version 1.4 is supported too
 .include "../../wip/fltk14-devel/buildlink3.mk"
+#.include "../../x11/fltk13/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/eureka/distinfo b/eureka/distinfo
index 384aed7789..aff72fcacb 100644
--- a/eureka/distinfo
+++ b/eureka/distinfo
@@ -5,6 +5,8 @@ RMD160 (eureka-124-source.tar.gz) = 9e6ea0f207d9445c64fca31531112adad6d0299d
 SHA512 (eureka-124-source.tar.gz) = 27f858ac0ea366932777830dca289db456ba68a90bbfa507dcf734f4aa0b0b72fd5654ab8cb0305c9a51793e97fb7b686a5860cc00d37304eab5db1cecbb3c05
 Size (eureka-124-source.tar.gz) = 1111598 bytes
 SHA1 (patch-Makefile) = 0f0930e3fae528b6bb72a7c841ffab6f6da071e7
-SHA1 (patch-src_m__files.cc) = 3a428c0da9c39c3e35a674bf362cf5e4da51d05f
+SHA1 (patch-src_e__commands.cc) = 7b5c9bcd4db15462335ac988acc42609ee3c4c07
+SHA1 (patch-src_m__files.cc) = de29f214c96a26e906ec35c63a692ab00898157d
 SHA1 (patch-src_main.cc) = 7e3a1db40d055f04622ac7cd6ae3997ed77e66ea
+SHA1 (patch-src_ui__menu.cc) = 0ba9a84b25db2543e5ede793ad9a5405e63b4281
 SHA1 (patch-src_ui__window.cc) = c058e793e57b8208d3287c658ec2e2c7457380f9
diff --git a/eureka/patches/patch-src_e__commands.cc b/eureka/patches/patch-src_e__commands.cc
new file mode 100644
index 0000000000..f7577c52cb
--- /dev/null
+++ b/eureka/patches/patch-src_e__commands.cc
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Show error message if function fl_open_uri() fails.
+
+--- src/e_commands.cc.orig	2018-08-03 04:22:13.000000000 +0000
++++ src/e_commands.cc
+@@ -1180,7 +1180,13 @@ void CMD_LogViewer()
+ 
+ void CMD_OnlineDocs()
+ {
+-	fl_open_uri("http://eureka-editor.sourceforge.net/?n=Docs.Index";);
++	int rv;
++
++	rv = fl_open_uri("http://eureka-editor.sourceforge.net/?n=Docs.Index";);
++	if (1 != rv)
++	{
++		Beep("Failed to open WWW browser");
++	}
+ }
+ 
+ 
diff --git a/eureka/patches/patch-src_m__files.cc b/eureka/patches/patch-src_m__files.cc
index 94bc0e76b5..465a670d9f 100644
--- a/eureka/patches/patch-src_m__files.cc
+++ b/eureka/patches/patch-src_m__files.cc
@@ -1,6 +1,8 @@
 $NetBSD$
 
---- src/m_files.cc.orig	2019-08-30 15:58:23.000000000 +0000
+Add placeholder for pkgsrc DOOMEADDIR to beginning of search list.
+
+--- src/m_files.cc.orig	2018-06-23 11:29:07.000000000 +0000
 +++ src/m_files.cc
 @@ -721,6 +721,7 @@ static const char * SearchForIWAD(const 
  		"c:/doom2",
diff --git a/eureka/patches/patch-src_ui__menu.cc b/eureka/patches/patch-src_ui__menu.cc
new file mode 100644
index 0000000000..e7303aa61c
--- /dev/null
+++ b/eureka/patches/patch-src_ui__menu.cc
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix internal name for Online Documentation menu entry.
+
+--- src/ui_menu.cc.orig	2018-08-03 04:23:43.000000000 +0000
++++ src/ui_menu.cc
+@@ -412,7 +412,8 @@ static void tools_do_view_logs(Fl_Widget
+ 
+ static void help_do_online_docs(Fl_Widget *w, void * data)
+ {
+-	ExecuteCommand("Documentation");
++	//ExecuteCommand("Documentation");
++	ExecuteCommand("OnlineDocs");
+ }
+ 
+ static void help_do_about(Fl_Widget *w, void * data)


Home | Main Index | Thread Index | Old Index