pkgsrc-WIP-changes archive

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

minetest: Fix patch comment/references to directories on my computer



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Fri Jun 28 14:01:12 2019 +0100
Changeset:	bb602d101cc859550e52e8f95355e260fd791842

Modified Files:
	minetest/distinfo
	minetest/patches/patch-CMakeLists.txt
	minetest/patches/patch-src_util_string.cpp

Log Message:
minetest: Fix patch comment/references to directories on my computer

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

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

diffstat:
 minetest/distinfo                          | 4 ++--
 minetest/patches/patch-CMakeLists.txt      | 9 ---------
 minetest/patches/patch-src_util_string.cpp | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diffs:
diff --git a/minetest/distinfo b/minetest/distinfo
index a071d2175c..78fc551bdf 100644
--- a/minetest/distinfo
+++ b/minetest/distinfo
@@ -8,7 +8,7 @@ SHA1 (minetest-5.0.1/minetest.tar.gz) = bec37dc480932e870052a2f65d2f07f34178e24d
 RMD160 (minetest-5.0.1/minetest.tar.gz) = 25cdaa4b7829cbf330a9d1b8013e33fb315eb236
 SHA512 (minetest-5.0.1/minetest.tar.gz) = 00f0c77c19eb9619387285e5dad690c8aa9969ff11c4de0bdae99ee6e9a4508a8c2f977837fc2e01aebc5d4c1a5191d4f56acb131182d73c8f50da1458695607
 Size (minetest-5.0.1/minetest.tar.gz) = 8761122 bytes
-SHA1 (patch-CMakeLists.txt) = 7890614c25fe201be2a5ab7371565c616f9cc9c9
+SHA1 (patch-CMakeLists.txt) = 50ceef7b158a92900c8d5b6b178d1ab0570e16b1
 SHA1 (patch-src_noise.h) = 54e72bf65fb642542985b1eb5dcd45fb3da4a57f
 SHA1 (patch-src_threading_thread.cpp) = c5334a9fd1e5a65cfa0828b47ebd8e50ba1ed7d7
-SHA1 (patch-src_util_string.cpp) = 2e6bff8146d8b2175860f7712afc1d14ff96e2be
+SHA1 (patch-src_util_string.cpp) = 152488b322764a788b1fa8858cc7034887741534
diff --git a/minetest/patches/patch-CMakeLists.txt b/minetest/patches/patch-CMakeLists.txt
index a94627a516..46a57ca50e 100644
--- a/minetest/patches/patch-CMakeLists.txt
+++ b/minetest/patches/patch-CMakeLists.txt
@@ -4,15 +4,6 @@ Use CMAKE_INSTALL_MANDIR.
 
 --- CMakeLists.txt.orig	2019-03-31 20:57:45.000000000 +0000
 +++ CMakeLists.txt
-@@ -59,7 +59,7 @@ if(NOT CMAKE_BUILD_TYPE)
- endif()
- 
- # Included stuff
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-+set (CMAKE_MODULE_PATH "/home/nia/pkgsrc/wip/minetest/work/.buildlink/cmake-Modules" ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
- 
- 
- # This is done here so that relative search paths are more reasonable
 @@ -97,7 +97,7 @@ elseif(UNIX) # Linux, BSD etc
  		set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
  		set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
diff --git a/minetest/patches/patch-src_util_string.cpp b/minetest/patches/patch-src_util_string.cpp
index 45369fa05f..764ca44abc 100644
--- a/minetest/patches/patch-src_util_string.cpp
+++ b/minetest/patches/patch-src_util_string.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Work around iconv("WCHAR_T", "UTF-8") failing on NetBSD.
+Work around iconv("UTF-8", "WCHAR_T") failing on NetBSD.
 
 --- src/util/string.cpp.orig	2019-03-31 20:57:45.000000000 +0000
 +++ src/util/string.cpp


Home | Main Index | Thread Index | Old Index