r47339 - in /packages/unstable/nautilus-sendto/debian: changelog patches/ patches/git_create-temp-g_mkdtemp.patch patches/git_use-g_mkdir_with_parents.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Mon Feb 15 09:35:44 2016
New Revision: 47339

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47339
Log:
* Add patches from upstream to fix problems building on x32 (Closes: #780171)
  - git_use-g_mkdir_with_parents.patch
  - git_create-temp-g_mkdtemp.patch

Added:
    packages/unstable/nautilus-sendto/debian/patches/
    packages/unstable/nautilus-sendto/debian/patches/git_create-temp-g_mkdtemp.patch
    packages/unstable/nautilus-sendto/debian/patches/git_use-g_mkdir_with_parents.patch
    packages/unstable/nautilus-sendto/debian/patches/series
Modified:
    packages/unstable/nautilus-sendto/debian/changelog

Modified: packages/unstable/nautilus-sendto/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/changelog?rev=47339&op=diff
==============================================================================
--- packages/unstable/nautilus-sendto/debian/changelog	[utf-8] (original)
+++ packages/unstable/nautilus-sendto/debian/changelog	[utf-8] Mon Feb 15 09:35:44 2016
@@ -1,3 +1,11 @@
+nautilus-sendto (3.8.2-2) unstable; urgency=medium
+
+  * Add patches from upstream to fix problems building on x32 (Closes: #780171)
+    - git_use-g_mkdir_with_parents.patch
+    - git_create-temp-g_mkdtemp.patch
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 15 Feb 2016 10:33:40 +0100
+
 nautilus-sendto (3.8.2-1) unstable; urgency=medium
 
   * New upstream release.

Added: packages/unstable/nautilus-sendto/debian/patches/git_create-temp-g_mkdtemp.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/patches/git_create-temp-g_mkdtemp.patch?rev=47339&op=file
==============================================================================
--- packages/unstable/nautilus-sendto/debian/patches/git_create-temp-g_mkdtemp.patch	(added)
+++ packages/unstable/nautilus-sendto/debian/patches/git_create-temp-g_mkdtemp.patch	[utf-8] Mon Feb 15 09:35:44 2016
@@ -0,0 +1,32 @@
+From ed05b67f9e2c050906032b5bcc3cb376d5bb1028 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Tue, 23 Sep 2014 10:33:18 +0200
+Subject: main: Create temp directories using g_mkdtemp()
+
+Rather than creating the temp directory name by hand.
+---
+ src/nautilus-sendto.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/nautilus-sendto.c b/src/nautilus-sendto.c
+index 2c14b09..c0b6fea 100644
+--- a/src/nautilus-sendto.c
++++ b/src/nautilus-sendto.c
+@@ -261,10 +261,10 @@ pack_files (GList *file_list)
+ 
+ 	g_assert (filename != NULL && *filename != '\0');
+ 
+-	tmp_work_dir = g_strdup_printf ("%s/nautilus-sendto-%s/%li",
+-					g_get_tmp_dir (), g_get_user_name (),
+-					time (NULL));
+-	g_mkdir_with_parents (tmp_work_dir, 0700);
++	tmp_work_dir = g_build_filename (g_get_tmp_dir (),
++					 "nautilus-sendto-XXXXXX",
++					 NULL);
++	tmp_work_dir = g_mkdtemp (tmp_work_dir);
+ 
+ 	pack_type = g_strdup (".zip");
+ 
+-- 
+cgit v0.12
+

Added: packages/unstable/nautilus-sendto/debian/patches/git_use-g_mkdir_with_parents.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/patches/git_use-g_mkdir_with_parents.patch?rev=47339&op=file
==============================================================================
--- packages/unstable/nautilus-sendto/debian/patches/git_use-g_mkdir_with_parents.patch	(added)
+++ packages/unstable/nautilus-sendto/debian/patches/git_use-g_mkdir_with_parents.patch	[utf-8] Mon Feb 15 09:35:44 2016
@@ -0,0 +1,41 @@
+From b8ee7f4055d9f9eb0cae227d20e7b02d2dd40587 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Tue, 23 Sep 2014 10:29:10 +0200
+Subject: main: Use g_mkdir_with_parents()
+
+Instead of creating the parent directory by hand.
+---
+ src/nautilus-sendto.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/nautilus-sendto.c b/src/nautilus-sendto.c
+index 586efee..2c14b09 100644
+--- a/src/nautilus-sendto.c
++++ b/src/nautilus-sendto.c
+@@ -254,21 +254,17 @@ pack_files (GList *file_list)
+ 	const char *filename;
+ 	GList *l;
+ 	GString *cmd, *tmp;
+-	char *pack_type, *tmp_dir, *tmp_work_dir, *packed_file;
++	char *pack_type, *tmp_work_dir, *packed_file;
+ 
+ 	file_roller_cmd = g_find_program_in_path ("file-roller");
+ 	filename = pack_filename_from_names (file_list);
+ 
+ 	g_assert (filename != NULL && *filename != '\0');
+ 
+-	tmp_dir = g_strdup_printf ("%s/nautilus-sendto-%s",
+-				   g_get_tmp_dir (), g_get_user_name ());
+-	g_mkdir (tmp_dir, 0700);
+ 	tmp_work_dir = g_strdup_printf ("%s/nautilus-sendto-%s/%li",
+ 					g_get_tmp_dir (), g_get_user_name (),
+ 					time (NULL));
+-	g_mkdir (tmp_work_dir, 0700);
+-	g_free (tmp_dir);
++	g_mkdir_with_parents (tmp_work_dir, 0700);
+ 
+ 	pack_type = g_strdup (".zip");
+ 
+-- 
+cgit v0.12
+

Added: packages/unstable/nautilus-sendto/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/patches/series?rev=47339&op=file
==============================================================================
--- packages/unstable/nautilus-sendto/debian/patches/series	(added)
+++ packages/unstable/nautilus-sendto/debian/patches/series	[utf-8] Mon Feb 15 09:35:44 2016
@@ -0,0 +1,2 @@
+git_use-g_mkdir_with_parents.patch
+git_create-temp-g_mkdtemp.patch