[renpy] 06/30: Rebase translations-tmpdir.patch

[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 b8423609fd0a342cb8dcbf277b8ae0d10c8bddbd
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 2 21:25:07 2017 +0100

    Rebase translations-tmpdir.patch
---
 debian/changelog                         |  1 +
 debian/patches/01_abspath.patch          |  2 +-
 debian/patches/02_traceback.patch        |  4 ++--
 debian/patches/03_checkdir.patch         |  2 +-
 debian/patches/series                    |  1 +
 debian/patches/translations-tmpdir.patch | 28 ++++++++++++++++++++++++++++
 6 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ffc756..557f724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ renpy (6.99.13+dfsg-1) unstable; urgency=medium
   * Team upload.
   * New upstream version 6.99.13+dfsg.
   * Declare compliance with Debian Policy 4.1.2.
+  * Rebase translations-tmpdir.patch.
 
  -- Markus Koschany <apo at debian.org>  Sat, 02 Dec 2017 21:15:55 +0100
 
diff --git a/debian/patches/01_abspath.patch b/debian/patches/01_abspath.patch
index bfcdc3d..79bf847 100644
--- a/debian/patches/01_abspath.patch
+++ b/debian/patches/01_abspath.patch
@@ -7,7 +7,7 @@ Subject: _abspath
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/renpy.py b/renpy.py
-index f081778..b80c21f 100755
+index 571fb66..93ae633 100755
 --- a/renpy.py
 +++ b/renpy.py
 @@ -80,6 +80,13 @@ def path_to_saves(gamedir, save_directory=None):
diff --git a/debian/patches/02_traceback.patch b/debian/patches/02_traceback.patch
index 573c2ed..bbcf26e 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 c96641f..d89c1b3 100644
+index decf1d0..47c9857 100644
 --- a/renpy/error.py
 +++ b/renpy/error.py
-@@ -218,10 +218,24 @@ def report_exception(e, editor=True):
+@@ -222,10 +222,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 bd8f7eb..76b18a2 100644
--- a/debian/patches/03_checkdir.patch
+++ b/debian/patches/03_checkdir.patch
@@ -7,7 +7,7 @@ Subject: _checkdir
  1 file changed, 4 insertions(+)
 
 diff --git a/renpy/main.py b/renpy/main.py
-index 13e727c..af94325 100644
+index cc5e36e..5118984 100644
 --- a/renpy/main.py
 +++ b/renpy/main.py
 @@ -262,6 +262,10 @@ def main():
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..9b54cc2
--- /dev/null
+++ b/debian/patches/translations-tmpdir.patch
@@ -0,0 +1,28 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 2 Dec 2017 21:24:38 +0100
+Subject: translations tmpdir
+
+Use a writable location for temporary files.
+
+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 091630e..b692325 100644
+--- a/launcher/game/translations.rpy
++++ b/launcher/game/translations.rpy
+@@ -50,10 +50,10 @@ init python:
+             return strings_json
+ 
+         try:
+-            tempdir = os.path.join(config.basedir, "tmp")
++            tempdir = os.path.expanduser("~/.renpy/tmp")
+ 
+             try:
+-                os.makedirs(os.path.join(config.basedir, "tmp"))
++                os.makedirs(os.path.expanduser("~/.renpy/tmp"))
+             except:
+                 pass
+ 

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