origin merged patch

3 files changed, 4 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af08db55a638..a90831d3b05e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cataclysm-dda-tiles
 	pkgdesc = A post-apocalyptic roguelike,tiles only
 	pkgver = 0.C.2017.07.14
-	pkgrel = 2
+	pkgrel = 3
 	url = http://en.cataclysmdda.com/
 	arch = x86_64
 	license = CCPL:by-sa
@@ -23,7 +23,7 @@ pkgbase = cataclysm-dda-tiles
 	source = https://github.com/CleverRaven/Cataclysm-DDA/archive/master.zip
 	source = fix_locale_and_build_error.patch
 	md5sums = SKIP
-	md5sums = b27d839e4a9918eca019e3cd9a4d910b
+	md5sums = 20797e08fd4a35e6688f70e1bfbe86e7
 
 pkgname = cataclysm-dda-tiles
 
diff --git a/PKGBUILD b/PKGBUILD
index 5940c22d1046..9aa44bbe0b11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=cataclysm-dda-tiles
 pkgver=0.C.2017.07.14
 _pkgver=0.C
-pkgrel=2
+pkgrel=3
 pkgdesc="A post-apocalyptic roguelike,tiles only"
 url="http://en.cataclysmdda.com/"
 arch=('x86_64')
@@ -23,7 +23,7 @@ conflicts=('cataclysm-dda', 'cataclysm-dda-ncurses' 'cataclysm-dda-sdl-git')
 source=('https://github.com/CleverRaven/Cataclysm-DDA/archive/master.zip'
 	'fix_locale_and_build_error.patch')
 md5sums=('SKIP'
-         'b27d839e4a9918eca019e3cd9a4d910b')
+         '20797e08fd4a35e6688f70e1bfbe86e7')
 
 pkgver() {
   cd "Cataclysm-DDA-master"
diff --git a/fix_locale_and_build_error.patch b/fix_locale_and_build_error.patch
index e2a53c7bb39e..b9c0aaaa5fef 100644
--- a/fix_locale_and_build_error.patch
+++ b/fix_locale_and_build_error.patch
@@ -19,29 +19,3 @@ diff -Naur Cataclysm-DDA-master.orig/Makefile Cataclysm-DDA-master/Makefile
    # We have a git repository, use git version
    DEFINES += -DGIT_VERSION
  endif
-diff -Naur Cataclysm-DDA-master.orig/src/translations.cpp Cataclysm-DDA-master/src/translations.cpp
---- Cataclysm-DDA-master.orig/src/translations.cpp	2017-07-13 13:39:52.000000000 +0800
-+++ Cataclysm-DDA-master/src/translations.cpp	2017-07-14 15:24:39.930856915 +0800
-@@ -79,10 +79,10 @@
- #endif
- 
-     // Step 2. Bind to gettext domain.
--    const char *locale_dir;
-+    std::string locale_dir;
- #if (defined __linux__ || (defined MACOSX && !defined TILES))
-     if( !FILENAMES["base_path"].empty() ) {
--        locale_dir = std::string( FILENAMES["base_path"] + "share/locale" ).c_str();
-+        locale_dir = FILENAMES["base_path"] + "share/locale";
-     } else {
-         locale_dir = "lang/mo";
-     }
-@@ -90,7 +90,8 @@
-     locale_dir = "lang/mo";
- #endif // __linux__
- 
--    bindtextdomain( "cataclysm-dda", locale_dir );
-+    const char *locale_dir_char = locale_dir.c_str();
-+    bindtextdomain( "cataclysm-dda", locale_dir_char );
-     bind_textdomain_codeset( "cataclysm-dda", "UTF-8" );
-     textdomain( "cataclysm-dda" );
-