[arch-commits] Commit in luxblend25/trunk (PKGBUILD system_config.diff)

[Lukas Jirkovsky]

    Date: Monday, February 16, 2015 @ 10:43:31
  Author: stativ
Revision: 127779

upgpkg: luxblend25 1.4-1

update to 1.4

Added:
  luxblend25/trunk/system_config.diff
Modified:
  luxblend25/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   12 ++++++++++--
 system_config.diff |   12 ++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-16 09:42:03 UTC (rev 127778)
+++ PKGBUILD	2015-02-16 09:43:31 UTC (rev 127779)
@@ -11,10 +11,18 @@
 license=('GPL')
 depends=('blender' 'luxrender')
 source=(https://bitbucket.org/luxrender/luxblend25/get/$_pkgver.tar.bz2 \
-        luxrender.cfg)
+        system_config.diff luxrender.cfg)
 md5sums=('a9ca48c9d091df8dd55ba1b90d377ac2'
+         'f42e7bc5476b144cca60bf3e6363158a'
          'ec6b7028e48f73650d9315d47cd14f1d')
 
+prepare() {
+  cd "$srcdir"/luxrender-luxblend25-$_pkgver
+
+  # enables loading of the configuration from a system-wide config file
+  patch -Np1 < "$srcdir/system_config.diff" || true
+}
+
 package() {
   install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons
   cp -a "$srcdir"/luxrender-luxblend25-$_pkgver/src/luxrender \
@@ -22,7 +30,7 @@
 
   # install luxrender config file so the luxblend find luxrender automatically
   install -D -m644 luxrender.cfg \
-    "$pkgdir"/usr/share/blender/$_blender/config/luxrender.cfg
+    "$pkgdir"/usr/share/blender/$_blender/scripts/luxrender.cfg
 
   # change the search path for pylux* so the pylux* can be found in its new location
   find "$pkgdir/usr/share/blender/$_blender/scripts/addons/luxrender" -name "*.py" \

Added: system_config.diff
===================================================================
--- system_config.diff	                        (rev 0)
+++ system_config.diff	2015-02-16 09:43:31 UTC (rev 127779)
@@ -0,0 +1,12 @@
+diff -rup luxrender-luxblend25-a249c861c2f3/src/luxrender/extensions_framework/util.py luxrender-luxblend25-a249c861c2f3.new/src/luxrender/extensions_framework/util.py
+--- luxrender-luxblend25-a249c861c2f3/src/luxrender/extensions_framework/util.py	2015-01-27 20:48:23.000000000 +0100
++++ luxrender-luxblend25-a249c861c2f3.new/src/luxrender/extensions_framework/util.py	2015-02-16 10:35:51.456810705 +0100
+@@ -99,7 +99,7 @@ def find_config_value(module, section, k
+     fc = []
+ 
+     for p in config_paths:
+-        if os.path.exists(p) and os.path.isdir(p) and os.access(p, os.W_OK):
++        if os.path.exists(p) and os.path.isdir(p):
+             fc.append('/'.join([p, '%s.cfg' % module]))
+ 
+     if len(fc) < 1: