pkgsrc-WIP-changes archive

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

0ad: Add patch for tinygettext



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Wed Dec 15 17:46:20 2021 +0100
Changeset:	b3ec5c9b39757c31971e4ddc40cb6290dc516812

Modified Files:
	0ad/TODO
	0ad/distinfo
Added Files:
	0ad/patches/patch-source_third__party_tinygettext_include_tinygettext_iconv.hpp

Log Message:
0ad: Add patch for tinygettext

Uses iconv from SDL2.

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

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

diffstat:
 0ad/TODO                                             |  2 +-
 0ad/distinfo                                         |  1 +
 ...__party_tinygettext_include_tinygettext_iconv.hpp | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diffs:
diff --git a/0ad/TODO b/0ad/TODO
index e56eedc7fa..1678d7d399 100644
--- a/0ad/TODO
+++ b/0ad/TODO
@@ -1,2 +1,2 @@
-[ ] Fix iconv mismatch
+[X] Fix iconv mismatch
 [ ] Create PLIST
diff --git a/0ad/distinfo b/0ad/distinfo
index fe2e7732c2..b05ca02ece 100644
--- a/0ad/distinfo
+++ b/0ad/distinfo
@@ -19,3 +19,4 @@ SHA1 (patch-source_lib_secure__crt.cpp) = 1e56aa627c8f2343884968ab4ebd4b4eec73b7
 SHA1 (patch-source_network_StunClient.cpp) = 6267d44c3d0345d3e47c19746f105657ba984876
 SHA1 (patch-source_scriptinterface_ScriptTypes.h) = f2351c637ba7ed7a36b4399b6e89a0d8281c9ad4
 SHA1 (patch-source_third__party_mikktspace_weldmesh.cpp) = 35df7dd5d5d2aa784ef03599a47cc69982ebe332
+SHA1 (patch-source_third__party_tinygettext_include_tinygettext_iconv.hpp) = 9778a9729202a95a5b5ec3f66419d31aa9b423b9
diff --git a/0ad/patches/patch-source_third__party_tinygettext_include_tinygettext_iconv.hpp b/0ad/patches/patch-source_third__party_tinygettext_include_tinygettext_iconv.hpp
new file mode 100644
index 0000000000..7f5d1e6a58
--- /dev/null
+++ b/0ad/patches/patch-source_third__party_tinygettext_include_tinygettext_iconv.hpp
@@ -0,0 +1,20 @@
+$NetBSD$
+
+tinygettext fails with NetBSD iconv.
+Use iconv from SDL2 instead.
+
+--- source/third_party/tinygettext/include/tinygettext/iconv.hpp.orig	2021-07-27 21:57:05.000000000 +0000
++++ source/third_party/tinygettext/include/tinygettext/iconv.hpp
+@@ -22,8 +22,11 @@
+ 
+ #include <string>
+ 
++// pkgsrc
++#define TINYGETTEXT_WITH_SDL
++
+ #ifdef TINYGETTEXT_WITH_SDL
+-#  include "SDL.h"
++#  include "SDL2/SDL.h"
+ #else
+ #  include <iconv.h>
+ #endif


Home | Main Index | Thread Index | Old Index