eureka-devel: Update to 2.0.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: eureka-devel: Update to 2.0.1
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Mon, 8 Jul 2024 14:36:53 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Jul 8 16:35:57 2024 +0200
Changeset:	47175dd2bafc110ed7dba038696dddea5f0d3227

Modified Files:
	eureka-devel/DESCR
	eureka-devel/Makefile
	eureka-devel/PLIST
	eureka-devel/TODO
	eureka-devel/distinfo
	eureka-devel/options.mk
	eureka-devel/patches/patch-src_m__files.cc
	eureka-devel/patches/patch-src_main.cc
Added Files:
	eureka-devel/COMMIT_MSG
	eureka-devel/patches/patch-CMakeLists.txt
	eureka-devel/patches/patch-src_CMakeLists.txt
	eureka-devel/patches/patch-src_m__strings.h

Log Message:
eureka-devel: Update to 2.0.1

(Since version 2.0.0)

* Corrected the copyright year for my contributions.

* Fixed a crash happening when selecting neighbor sectors while no-sided
  linedefs are in the map.
* Fixed a regression from 1.27b where selected 1-sided lines in 3D view
  wouldn't change texture unless the side panel texture thumbnail also
  gets selected.

* Fixed some compilation errors on Linux.

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

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

diffstat:
 eureka-devel/COMMIT_MSG                       | 21 ++++++++++++
 eureka-devel/DESCR                            |  4 ++-
 eureka-devel/Makefile                         | 46 +++++++++++----------------
 eureka-devel/PLIST                            |  2 ++
 eureka-devel/TODO                             | 31 ------------------
 eureka-devel/distinfo                         | 13 +++++---
 eureka-devel/options.mk                       | 23 ++++++++------
 eureka-devel/patches/patch-CMakeLists.txt     | 23 ++++++++++++++
 eureka-devel/patches/patch-src_CMakeLists.txt | 17 ++++++++++
 eureka-devel/patches/patch-src_m__files.cc    |  2 +-
 eureka-devel/patches/patch-src_m__strings.h   | 17 ++++++++++
 eureka-devel/patches/patch-src_main.cc        | 27 ++++++++++------
 12 files changed, 142 insertions(+), 84 deletions(-)

diffs:
diff --git a/eureka-devel/COMMIT_MSG b/eureka-devel/COMMIT_MSG
new file mode 100644
index 0000000000..1b867fe5fe
--- /dev/null
+++ b/eureka-devel/COMMIT_MSG
@@ -0,0 +1,21 @@
+games/eureka: Update to 2.0.1
+
+# CHANGES IN Eureka 2.0.1
+
+(Since version 2.0.0)
+
+## View
+
+* Corrected the copyright year for my contributions.
+
+## Bug fixes
+
+* Fixed a crash happening when selecting neighbor sectors while no-sided
+  linedefs are in the map.
+* Fixed a regression from 1.27b where selected 1-sided lines in 3D view
+  wouldn't change texture unless the side panel texture thumbnail also
+  gets selected.
+
+## Development
+
+* Fixed some compilation errors on Linux.
diff --git a/eureka-devel/DESCR b/eureka-devel/DESCR
index 7aa4a28727..e947a583d7 100644
--- a/eureka-devel/DESCR
+++ b/eureka-devel/DESCR
@@ -1,5 +1,7 @@
 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.
+such as Heretic and Hexen. It supports Windows and Unix (including macOS).
 
 There is a 2D mode to create the layout and a 3D mode to check e.g. texture
 alignment.
+
+This package uses FLTK 1.4 (not released yet).
diff --git a/eureka-devel/Makefile b/eureka-devel/Makefile
index 077894f13c..fd7d9aca32 100644
--- a/eureka-devel/Makefile
+++ b/eureka-devel/Makefile
@@ -1,26 +1,21 @@
 # $NetBSD$
 
-GIT_REVISION=		8f033a12dcb8a93919734f98d2a6540ae2d05fa8
-PKGNAME=		eureka-devel-0
-GIT_REPO=		https://git.code.sf.net/p/eureka-editor/git
-#GIT_EXTRACTDIR=	eureka-124-source
-
-#DISTNAME=	eureka-124-source
-#PKGNAME=	${DISTNAME:S/eureka/eureka-devel/:S/-source//:S/-1/-1./}
+DISTNAME=	eureka-2.0.1
 CATEGORIES=	games
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=eureka-editor/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ioan-chera/}
+GITHUB_PROJECT=	eureka-editor
+GITHUB_TAG=	${DISTNAME}
 
 MAINTAINER=	micha%NetBSD.org@localhost
-HOMEPAGE=	https://sourceforge.net/projects/eureka-editor/
+HOMEPAGE=	https://eureka-editor.sourceforge.net/
 COMMENT=	Doom/Heretic/Hexen map editor
 LICENSE=	gnu-gpl-v2
 
-# Makefile declares "-std=c++03"
-USE_LANGUAGES=	c++03
-USE_TOOLS+=	gmake
+USE_LANGUAGES=		c c++
+USE_CC_FEATURES+=	c11
+USE_CXX_FEATURES+=	c++17
 
-#WRKSRC=	${WRKDIR}/eureka-1.24-source
-WRKSRC=		${WRKDIR}/git
+CMAKE_ARGS+=		-DENABLE_UNIT_TESTS=off
 
 # DOOMWADDIR is intentionally shared with other Doom packages
 DOOMWADDIR=		share/doom
@@ -44,18 +39,13 @@ SUBST_SED.dwd=		-e 's,PKGSRC_DOOMWADDIR,${PREFIX}/${DOOMWADDIR},'
 
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
-# FLTK version 1.4 is supported too
-#.include "../../wip/fltk13/buildlink3.mk"
-.include "../../wip/fltk14-devel/buildlink3.mk"
-
-.if empty(PKG_OPTIONS.fltk14:Mopengl) || empty(PKG_OPTIONS:Mopengl)
-SUBST_CLASSES+=		opengl
-SUBST_STAGE.opengl=	do-configure
-SUBST_MESSAGE.opengl=	Preparing Makefile ...
-SUBST_FILES.opengl=	Makefile
-SUBST_SED.opengl=	-e 's,\# CXXFLAGS += -DNO_OPENGL,CXXFLAGS += -DNO_OPENGL,'
-SUBST_SED.opengl+=	-e 's, --use-gl,,'
-.endif
-
-.include "../../wip/mk/git-package.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+
+.include "../../devel/cmake/build.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/eureka-devel/PLIST b/eureka-devel/PLIST
index dc3d955eb0..d60c21b542 100644
--- a/eureka-devel/PLIST
+++ b/eureka-devel/PLIST
@@ -1,5 +1,6 @@
 @comment $NetBSD$
 bin/eureka
+share/applications/eureka.desktop
 share/eureka/about_logo.png
 share/eureka/bindings.cfg
 share/eureka/common/doom_colors.ugh
@@ -37,3 +38,4 @@ share/eureka/ports/odamex.ugh
 share/eureka/ports/vanilla.ugh
 share/eureka/ports/xdoom.ugh
 share/eureka/ports/zdoom.ugh
+share/icons/hicolor/32x32/apps/eureka.xpm
diff --git a/eureka-devel/TODO b/eureka-devel/TODO
index b6fbe9ac0e..8797f92f4a 100644
--- a/eureka-devel/TODO
+++ b/eureka-devel/TODO
@@ -1,32 +1 @@
-[X] Patch make install to work with nonpriviledged user
-[X] Patch internal search path for program files to include ${PREFIX}/share
-[X] Patch internal search path for IWADs to include ${PREFIX}/${DOOMWADDIR}
-[X] Menu entry "Help->Online Docs" doesn't work
-    => pkgsrc patch added
-[X] Test with FLTK 1.3.5
-    => Good
-[X] Test with FLTK 1.4 development snapshot
-    => pkgsrc patch added (otherwise only 1.3.x is accepted)
-    => Good
-[X] Sent pkgsrc patches to upstream
-    => Tickets #34 (Online Docs) and #35 (FLTK 1.4)
-    => Patches merged by upstream
-[X] Test Git revision 25b14606cd896f30c19a6793b51732f60ba7bd92
-    => pkgsrc patches removed/updated
-    => PLIST updated
-[X] Import patch for reproducible builds from Debian
-    => This patch was rejected by upstream
-[X] Make xdg-utils an option (Default=on)
-    => 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
-    => Patch merged by upstream
-[X] Update to Git commit 19c0d7e5dd1bb8e5bf7c6840868e9f6eecd14a9a
-    => Remove patch for Ticket #37
-    => Remove patch for install with nonpriviledged user
-[ ] 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 651282845f..0cd42e937f 100644
--- a/eureka-devel/distinfo
+++ b/eureka-devel/distinfo
@@ -1,7 +1,10 @@
 $NetBSD$
 
-RMD160 (doomlegacy__common.zip) = 9c1185a5c5e9fc54612808977ee8f548b2258d31
-SHA512 (doomlegacy__common.zip) = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
-Size (doomlegacy__common.zip) = 0 bytes
-SHA1 (patch-src_m__files.cc) = 5bdfaefa324408632a8e649c8994479e7ec00ae1
-SHA1 (patch-src_main.cc) = a49b6b07903f2bae9060ffdc2e8796da67d93630
+BLAKE2s (eureka-2.0.1.tar.gz) = 7c566115453056d3efe853d88269d95dbdeac57248ee48b111d02b3ae9bd309c
+SHA512 (eureka-2.0.1.tar.gz) = 18f6ffd9e28a9679265670f1677564eb5319c2011a038cc9516f1768456028e58e50c4d5c70b15f0d0f25fdafed8762efde4b589a095418ae1ca3103f869d486
+Size (eureka-2.0.1.tar.gz) = 2387560 bytes
+SHA1 (patch-CMakeLists.txt) = 0eda67e8a101d9299bc933f2f403b4e8b940a689
+SHA1 (patch-src_CMakeLists.txt) = 7291065f665f00e6d9eda2cbdf56769360b40691
+SHA1 (patch-src_m__files.cc) = a547b17d578ada79e20d006f786b1a594ef34700
+SHA1 (patch-src_m__strings.h) = e8b793e0a8943f3371792e07ac552e8e22e2c248
+SHA1 (patch-src_main.cc) = fe5d1f35637010de7e56e7384a29045f64e9667a
diff --git a/eureka-devel/options.mk b/eureka-devel/options.mk
index 5ccf63529b..3a0a2979f8 100644
--- a/eureka-devel/options.mk
+++ b/eureka-devel/options.mk
@@ -1,22 +1,27 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.eureka-devel
+PKG_OPTIONS_VAR=	PKG_OPTIONS.eureka
 PKG_SUPPORTED_OPTIONS=	opengl xdg-utils
 PKG_SUGGESTED_OPTIONS=	opengl xdg-utils
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
-# opengl: Use OpenGL for drawing
-# 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)
+.include "../../wip/fltk14-devel/buildlink3.mk"
+
+# Add missing include path for FLTK (eureka does not use fltk-config)
+.if empty(PKG_OPTIONS.fltk14-devel:Mcairo)
+CXXFLAGS=-I"${PREFIX}/include/cairo"
 .endif
 
+# opengl: Use OpenGL for rendering
+# If FLTK is compiled without opengl option, it is always disabled here too.
+# If FLTK is compiled with opengl option, disabling it here allows to force
+# usage of the software renderer (recommended without hardware acceleration).
+.if empty(PKG_OPTIONS.fltk14-devel:Mopengl) || empty(PKG_OPTIONS:Mopengl)
+CMAKE_ARGS+=	-DENABLE_OPENGL=off
+.endif
 # xdg-utils: Create dependency for xdg-utils (Portland project)
-# Can be used by FLTK for fl_open_uri() on X11
+# Can be used by FLTK for fl_open_uri() on X11.
 .if !empty(PKG_OPTIONS:Mxdg-utils)
 DEPENDS+=	xdg-utils>=1.1:../../misc/xdg-utils
 .endif
diff --git a/eureka-devel/patches/patch-CMakeLists.txt b/eureka-devel/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..6cab09ff49
--- /dev/null
+++ b/eureka-devel/patches/patch-CMakeLists.txt
@@ -0,0 +1,23 @@
+$NetBSD$
+
+Let pkgsrc handle icon and desktop files.
+
+--- CMakeLists.txt.orig	2024-07-07 19:06:38.000000000 +0000
++++ CMakeLists.txt
+@@ -170,10 +170,12 @@ if(UNIX AND NOT APPLE)  # Linux
+             DESTINATION "${eureka_install_dir}"
+     )
+     # The full-install sequence is here
+-    install(CODE "execute_process(
+-        COMMAND xdg-desktop-menu install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.desktop
+-        COMMAND xdg-icon-resource install --novendor --size 32 ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.xpm
+-    )")
++    #install(CODE "execute_process(
++    #    COMMAND xdg-desktop-menu install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.desktop
++    #    COMMAND xdg-icon-resource install --novendor --size 32 ${CMAKE_CURRENT_SOURCE_DIR}/misc/eureka.xpm
++    #)")
++    install(FILES misc/eureka.xpm DESTINATION share/icons/hicolor/32x32/apps)
++    install(FILES misc/eureka.desktop DESTINATION share/applications)
+ 
+     # uninstall target
+     if(NOT TARGET uninstall)
diff --git a/eureka-devel/patches/patch-src_CMakeLists.txt b/eureka-devel/patches/patch-src_CMakeLists.txt
new file mode 100644
index 0000000000..2d113a3479
--- /dev/null
+++ b/eureka-devel/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Remove" -Werror".
+Add "-Wno-cast-function-type".
+Remove duplicated flags (GCC fails because they are inserted with quotes).
+
+--- src/CMakeLists.txt.orig	2024-07-04 06:00:57.000000000 +0000
++++ src/CMakeLists.txt
+@@ -359,7 +359,7 @@ if(MSVC)
+ endif()
+ 
+ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
+-    target_compile_options(eurekasrc PUBLIC "${CMAKE_CXX_FLAGS}" -Wall -Wextra -Werror
++    target_compile_options(eurekasrc PUBLIC -Wall -Wextra -Wno-cast-function-type
+                            -Wno-unused-parameter -Wno-missing-field-initializers -Wunused-variable)
+ endif()
+ if ( MSVC )
diff --git a/eureka-devel/patches/patch-src_m__files.cc b/eureka-devel/patches/patch-src_m__files.cc
index e9669a6c63..c3b41c1e6c 100644
--- a/eureka-devel/patches/patch-src_m__files.cc
+++ b/eureka-devel/patches/patch-src_m__files.cc
@@ -4,7 +4,7 @@ Add placeholder for pkgsrc DOOMWADDIR to beginning of search list.
 
 --- src/m_files.cc.orig	2018-06-23 11:29:07.000000000 +0000
 +++ src/m_files.cc
-@@ -723,6 +723,7 @@ static const char * SearchForIWAD(const 
+@@ -506,6 +506,7 @@ static const char * SearchForIWAD(const 
  		"c:/doom2",
  		"c:/doom95",
  #else
diff --git a/eureka-devel/patches/patch-src_m__strings.h b/eureka-devel/patches/patch-src_m__strings.h
new file mode 100644
index 0000000000..3cd10f63d5
--- /dev/null
+++ b/eureka-devel/patches/patch-src_m__strings.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fix headers.
+
+--- src/m_strings.h.orig	2024-07-04 06:00:57.000000000 +0000
++++ src/m_strings.h
+@@ -23,7 +23,9 @@
+ 
+ #include "PrintfMacros.h"
+ 
+-#include <string.h>
++#include <cstdarg>
++#include <cstdio>
++#include <cstring>
+ 
+ #include <ostream>
+ #include <string>
diff --git a/eureka-devel/patches/patch-src_main.cc b/eureka-devel/patches/patch-src_main.cc
index c30d2fe677..480281117b 100644
--- a/eureka-devel/patches/patch-src_main.cc
+++ b/eureka-devel/patches/patch-src_main.cc
@@ -1,19 +1,28 @@
 $NetBSD$
 
+Include missing header.
 Add placeholder for pkgsrc PREFIX to beginning of search list.
 Remove date to make builds reproducible (based on Debian patch).
 
---- src/main.cc.orig	2019-09-27 11:13:24.000000000 +0000
+--- src/main.cc.orig	2024-07-04 06:00:57.000000000 +0000
 +++ src/main.cc
-@@ -316,6 +316,7 @@ static void Determine_InstallPath(const 
+@@ -30,6 +30,7 @@
+ 
+ #include <time.h>
+ #include <memory>
++#include <signal.h>
+ #include <stdexcept>
+ 
+ #include "im_color.h"
+@@ -324,6 +325,7 @@ static void Determine_InstallPath(const 
  #else
- 	static const char *prefixes[] =
- 	{
-+		"PKGSRC_PREFIX",
- 		"/usr/local",
- 		"/usr",
- 		"/opt",
-@@ -964,7 +965,7 @@ static void ShowHelp()
+ 		static const fs::path prefixes[] =
+ 		{
++			"PKGSRC_PREFIX",
+ 			"/usr/local",
+ 			"/usr",
+ 			"/opt",
+@@ -1058,7 +1060,7 @@ static void ShowHelp()
  
  static void ShowVersion()
  {
Prev by Date: eureka: Remove, used to update games/eureka
Next by Date: py-ruff: remove
Previous by Thread: eureka1: Add last version of 1.x branch
Next by Thread: py-ruff: remove
Indexes:
Home | Main Index | Thread Index | Old Index