eureka-devel: Update to Git commit 19c0d7e5dd1bb8e5bf7c6840868e9f6eecd14a9a
Removed some pkgsrc patches that were merged upstream
This commit is contained in:
Michael Baeuerle
parent
a5ef13a8aa
commit
36c16234f0
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD$
|
||||
|
||||
GIT_REVISION= b0bd3ab3e50c96c8974927e703ec0c31690c1274
|
||||
GIT_REVISION= 19c0d7e5dd1bb8e5bf7c6840868e9f6eecd14a9a
|
||||
PKGNAME= eureka-devel-0
|
||||
GIT_REPO= https://git.code.sf.net/p/eureka-editor/git
|
||||
#GIT_EXTRACTDIR= eureka-124-source
|
||||
|
|
@ -23,7 +23,8 @@ USE_TOOLS+= gmake
|
|||
WRKSRC= ${WRKDIR}/git
|
||||
|
||||
# DOOMWADDIR is intentionally shared with other Doom packages
|
||||
DOOMWADDIR= share/doom
|
||||
DOOMWADDIR= share/doom
|
||||
INSTALLATION_DIRS= bin
|
||||
|
||||
# Modify internal search path to check ${PREFIX}/share hierarchy first
|
||||
SUBST_CLASSES+= prefix
|
||||
|
|
|
|||
|
|
@ -24,5 +24,9 @@
|
|||
=> 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
|
||||
|
|
|
|||
|
|
@ -4,7 +4,5 @@ SHA1 (doomlegacy__common.zip) = da39a3ee5e6b4b0d3255bfef95601890afd80709
|
|||
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
|
||||
SHA1 (patch-src_m__files.cc) = 5bdfaefa324408632a8e649c8994479e7ec00ae1
|
||||
SHA1 (patch-src_main.cc) = a49b6b07903f2bae9060ffdc2e8796da67d93630
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
Create ${PREFIX}/bin for installation.
|
||||
Do not force user root, to allow installation with non-root account.
|
||||
|
||||
--- Makefile.orig 2019-09-27 11:13:24.000000000 +0000
|
||||
+++ Makefile
|
||||
@@ -141,18 +141,19 @@ stripped: all
|
||||
INSTALL_DIR=$(DESTDIR)$(PREFIX)/share/eureka
|
||||
|
||||
install: all
|
||||
- install -o root -m 755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/
|
||||
+ install -d $(DESTDIR)$(PREFIX)/bin
|
||||
+ install -m 755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
|
||||
install -d $(INSTALL_DIR)/games
|
||||
install -d $(INSTALL_DIR)/common
|
||||
install -d $(INSTALL_DIR)/ports
|
||||
rm -f $(INSTALL_DIR)/games/freedoom.ugh
|
||||
- install -o root -m 644 bindings.cfg $(INSTALL_DIR)/bindings.cfg
|
||||
- install -o root -m 644 defaults.cfg $(INSTALL_DIR)/defaults.cfg
|
||||
- install -o root -m 644 operations.cfg $(INSTALL_DIR)/operations.cfg
|
||||
- install -o root -m 644 misc/about_logo.png $(INSTALL_DIR)/about_logo.png
|
||||
- install -o root -m 644 games/*.* $(INSTALL_DIR)/games
|
||||
- install -o root -m 644 common/*.* $(INSTALL_DIR)/common
|
||||
- install -o root -m 644 ports/*.* $(INSTALL_DIR)/ports
|
||||
+ install -m 644 bindings.cfg $(INSTALL_DIR)/bindings.cfg
|
||||
+ install -m 644 defaults.cfg $(INSTALL_DIR)/defaults.cfg
|
||||
+ install -m 644 operations.cfg $(INSTALL_DIR)/operations.cfg
|
||||
+ install -m 644 misc/about_logo.png $(INSTALL_DIR)/about_logo.png
|
||||
+ install -m 644 games/*.* $(INSTALL_DIR)/games
|
||||
+ install -m 644 common/*.* $(INSTALL_DIR)/common
|
||||
+ install -m 644 ports/*.* $(INSTALL_DIR)/ports
|
||||
|
||||
full-install: install
|
||||
xdg-desktop-menu install --novendor misc/eureka.desktop
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
$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;
|
||||
}
|
||||
|
||||
|
|
@ -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
|
||||
@@ -721,6 +721,7 @@ static const char * SearchForIWAD(const
|
||||
@@ -723,6 +723,7 @@ static const char * SearchForIWAD(const
|
||||
"c:/doom2",
|
||||
"c:/doom95",
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ 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
|
||||
@@ -301,6 +301,7 @@ static void Determine_InstallPath(const
|
||||
@@ -316,6 +316,7 @@ static void Determine_InstallPath(const
|
||||
#else
|
||||
static const char *prefixes[] =
|
||||
{
|
||||
|
|
@ -13,7 +13,7 @@ Remove date to make builds reproducible (based on Debian patch).
|
|||
"/usr/local",
|
||||
"/usr",
|
||||
"/opt",
|
||||
@@ -947,7 +948,7 @@ static void ShowHelp()
|
||||
@@ -964,7 +965,7 @@ static void ShowHelp()
|
||||
|
||||
static void ShowVersion()
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue