[renpy] 12/12: Add translations-tmpdir.patch and use the user's HOME directory for storing

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository renpy.

commit 72199d9d3022181314c25a6681cdd1fc086dd4ac
Author: Markus Koschany <apo at debian.org>
Date:   Wed Dec 21 15:15:07 2016 +0100

    Add translations-tmpdir.patch and use the user's HOME directory for storing
    
    the temporary translations file.
---
 debian/changelog                         |  2 ++
 debian/patches/01_abspath.patch          |  6 +++---
 debian/patches/02_traceback.patch        |  4 ++--
 debian/patches/03_checkdir.patch         |  4 ++--
 debian/patches/series                    |  1 +
 debian/patches/translations-tmpdir.patch | 31 +++++++++++++++++++++++++++++++
 6 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 889e48c..4720a72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ renpy (6.99.12+dfsg-1) unstable; urgency=medium
   * Update Files-Excluded paragraph.
   * Fix symlinks to font files.
   * Install gui directory into renpy package.
+  * Add translations-tmpdir.patch and use the user's HOME directory for storing
+    the temporary translations file.
 
  -- Markus Koschany <apo at debian.org>  Wed, 21 Dec 2016 12:31:54 +0100
 
diff --git a/debian/patches/01_abspath.patch b/debian/patches/01_abspath.patch
index 5117c3a..bfcdc3d 100644
--- a/debian/patches/01_abspath.patch
+++ b/debian/patches/01_abspath.patch
@@ -7,10 +7,10 @@ Subject: _abspath
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/renpy.py b/renpy.py
-index 6d3f8b0..cb0ee21 100644
+index f081778..b80c21f 100755
 --- a/renpy.py
 +++ b/renpy.py
-@@ -73,6 +73,13 @@ def path_to_saves(gamedir, save_directory=None):
+@@ -80,6 +80,13 @@ def path_to_saves(gamedir, save_directory=None):
  
          return rv
  
@@ -24,7 +24,7 @@ index 6d3f8b0..cb0ee21 100644
      if renpy.ios:
          from pyobjus import autoclass
          from pyobjus.objc_py_types import enum
-@@ -133,7 +140,7 @@ def path_to_saves(gamedir, save_directory=None):
+@@ -140,7 +147,7 @@ def path_to_saves(gamedir, save_directory=None):
  # Returns the path to the Ren'Py base directory (containing common and
  # the launcher, usually.)
  def path_to_renpy_base():
diff --git a/debian/patches/02_traceback.patch b/debian/patches/02_traceback.patch
index 5083589..573c2ed 100644
--- a/debian/patches/02_traceback.patch
+++ b/debian/patches/02_traceback.patch
@@ -8,10 +8,10 @@ Subject: _traceback
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/renpy/error.py b/renpy/error.py
-index 0710a78..388c380 100644
+index c96641f..d89c1b3 100644
 --- a/renpy/error.py
 +++ b/renpy/error.py
-@@ -216,10 +216,24 @@ def report_exception(e, editor=True):
+@@ -218,10 +218,24 @@ def report_exception(e, editor=True):
      simple = simple.getvalue()
      full = full.getvalue()
  
diff --git a/debian/patches/03_checkdir.patch b/debian/patches/03_checkdir.patch
index e57928a..bd8f7eb 100644
--- a/debian/patches/03_checkdir.patch
+++ b/debian/patches/03_checkdir.patch
@@ -7,10 +7,10 @@ Subject: _checkdir
  1 file changed, 4 insertions(+)
 
 diff --git a/renpy/main.py b/renpy/main.py
-index 7121ecb..f5d06de 100644
+index 13e727c..af94325 100644
 --- a/renpy/main.py
 +++ b/renpy/main.py
-@@ -256,6 +256,10 @@ def main():
+@@ -262,6 +262,10 @@ def main():
  
      log_clock("Early init")
  
diff --git a/debian/patches/series b/debian/patches/series
index 0a30345..a5e10ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_abspath.patch
 02_traceback.patch
 03_checkdir.patch
+translations-tmpdir.patch
diff --git a/debian/patches/translations-tmpdir.patch b/debian/patches/translations-tmpdir.patch
new file mode 100644
index 0000000..2ef1699
--- /dev/null
+++ b/debian/patches/translations-tmpdir.patch
@@ -0,0 +1,31 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 21 Dec 2016 15:13:15 +0100
+Subject: translations tmpdir
+
+Use the user's HOME directory instead of /usr/share/games/renpy which is not
+writable.
+
+Forwarded: not-needed
+---
+ launcher/game/translations.rpy | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/launcher/game/translations.rpy b/launcher/game/translations.rpy
+index 5184ecf..e65c74c 100644
+--- a/launcher/game/translations.rpy
++++ b/launcher/game/translations.rpy
+@@ -39,12 +39,12 @@ init python:
+         return SensitiveIf(re.match(r'^\w+$', persistent.translate_language))
+ 
+     try:
+-        os.makedirs(os.path.join(config.basedir, "tmp"))
++        os.makedirs("~/.renpy/tmp")
+     except:
+         pass
+ 
+ 
+-    STRINGS_JSON = os.path.join(config.basedir, "tmp", "strings.json")
++    STRINGS_JSON = os.path.join("~/.renpy/tmp/", "strings.json")
+ 
+ 
+ screen translate:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/renpy.git