apply patch to fix XDG_CONFIG dir permissions

3 files changed, 40 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9fa5c029606c..83c22e7d7cba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Oct 17 23:36:29 UTC 2017
+# Sun Dec  3 16:23:17 UTC 2017
 pkgbase = gnome-mpv
 	pkgdesc = A simple GTK+ frontend for mpv.
 	pkgver = 0.13
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/gnome-mpv/gnome-mpv
 	arch = i686
 	arch = x86_64
@@ -14,8 +14,10 @@ pkgbase = gnome-mpv
 	optdepends = youtube-dl: Video integration to YouTube and other video sites.
 	source = https://github.com/gnome-mpv/gnome-mpv/releases/download/v0.13/gnome-mpv-0.13.tar.xz
 	source = update-appdata-and-add-missing-meson-build-file.patch
+	source = xdg_config_dir_permissions.patch
 	sha256sums = c5a288c7095ccbe520b3ba419856e29981f4a2d204e7cfa264ee69edab2724f1
 	sha256sums = fdd2f358ceb72430fca464665ede6eb18f26be6b1830c4919ce065225f3518eb
+	sha256sums = 32cc698e5eb20198b12fa910a8ea9b1a0a4abc323ccaf9afb931e57c66a282dd
 
 pkgname = gnome-mpv
 
diff --git a/PKGBUILD b/PKGBUILD
index 5a18ef67ea47..1bca749a5cf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gnome-mpv
 pkgver=0.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple GTK+ frontend for mpv."
 arch=('i686' 'x86_64')
 url="https://github.com/gnome-mpv/gnome-mpv"
@@ -11,13 +11,18 @@ depends=('gtk3' 'mpv')
 makedepends=('meson')
 optdepends=('youtube-dl: Video integration to YouTube and other video sites.')
 source=("https://github.com/gnome-mpv/gnome-mpv/releases/download/v${pkgver}/gnome-mpv-${pkgver}.tar.xz"
-        "update-appdata-and-add-missing-meson-build-file.patch")
+        "update-appdata-and-add-missing-meson-build-file.patch"
+        "xdg_config_dir_permissions.patch")
 sha256sums=('c5a288c7095ccbe520b3ba419856e29981f4a2d204e7cfa264ee69edab2724f1'
-            'fdd2f358ceb72430fca464665ede6eb18f26be6b1830c4919ce065225f3518eb')
+            'fdd2f358ceb72430fca464665ede6eb18f26be6b1830c4919ce065225f3518eb'
+            '32cc698e5eb20198b12fa910a8ea9b1a0a4abc323ccaf9afb931e57c66a282dd')
 
 prepare() {
     cd "$srcdir"
+    # $XDG_CONFIG would be created with only 0600. Fixed in git upstream:
+    # https://github.com/gnome-mpv/gnome-mpv/commit/0f3c23f0d752af1eff7dec7ca95143e4b4f1eb97
     patch -d "$pkgname-$pkgver" -p1 < update-appdata-and-add-missing-meson-build-file.patch
+    patch -d "$pkgname-$pkgver" -p1 < xdg_config_dir_permissions.patch
 }
 
 build() {
diff --git a/xdg_config_dir_permissions.patch b/xdg_config_dir_permissions.patch
new file mode 100644
index 000000000000..a4a67656b737
--- /dev/null
+++ b/xdg_config_dir_permissions.patch
@@ -0,0 +1,28 @@
+From 0f3c23f0d752af1eff7dec7ca95143e4b4f1eb97 Mon Sep 17 00:00:00 2001
+From: gnome-mpv <gnome-mpv@nowhere>
+Date: Mon, 23 Oct 2017 09:43:36 -0700
+Subject: [PATCH] application: Change the default permission for config dirs to
+ 755
+
+Fixes #319.
+---
+ src/gmpv_application.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/gmpv_application.c b/src/gmpv_application.c
+index aa90827..d9f425e 100644
+--- a/src/gmpv_application.c
++++ b/src/gmpv_application.c
+@@ -156,9 +156,9 @@ static void create_dirs()
+ 	gchar *scripts_dir = get_scripts_dir_path();
+ 	gchar *watch_dir = get_watch_dir_path();
+ 
+-	g_mkdir_with_parents(config_dir, 0600);
+-	g_mkdir_with_parents(scripts_dir, 0700);
+-	g_mkdir_with_parents(watch_dir, 0600);
++	g_mkdir_with_parents(config_dir, 0755);
++	g_mkdir_with_parents(scripts_dir, 0755);
++	g_mkdir_with_parents(watch_dir, 0755);
+ 
+ 	g_free(config_dir);
+ 	g_free(scripts_dir);