Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 88 insertions, 17 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 5dd14405d..b4ba9f827 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=blender
 pkgname=blender-libre
 pkgver=2.63a
-pkgrel=2.1
+pkgrel=3
 epoch=4
 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,15 +18,19 @@ makedepends=('cmake' 'boost')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
-options=(!strip)
 install=${_pkgname}.install
-source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch)
-md5sums=('31a60b3ce5466d965cb7e2648995e092' '9e5649403e51654615d30b10bc460217')
+source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz
+        ffmpeg-0.11.patch
+        boost-1.50.patch)
+md5sums=('31a60b3ce5466d965cb7e2648995e092'
+         '9e5649403e51654615d30b10bc460217'
+         '0bab80da07d980c47b8ce3cb998edaef')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
   patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
+  patch -Np1 < "${srcdir}"/boost-1.50.patch
   sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h
   sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c
 
@@ -60,10 +64,6 @@ build() {
 
   make $MAKEFLAGS
 
-#  cp -rf "${srcdir}/${_pkgname}-${pkgver}"/release/plugins/* \
-#    "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/
-#  cd "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi
-#  chmod 755 bmake
   make
 }
 
@@ -71,11 +71,4 @@ package() {
   cd "${srcdir}/${_pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
   python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-#  install -d -m755 "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-#  cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/sequence/*.so \
-#    "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-#  cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/texture/*.so \
-#    "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
 }
diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch
new file mode 100644
index 000000000..fa698a3a6
--- /dev/null
+++ b/libre/blender-libre/boost-1.50.patch
@@ -0,0 +1,42 @@
+diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
+--- a/intern/cycles/util/util_cache.cpp	2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_cache.cpp	2012-07-15 14:19:34.893238929 -0300
+@@ -26,8 +26,6 @@
+ #include "util_path.h"
+ #include "util_types.h"
+ 
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include <boost/filesystem.hpp> 
+ #include <boost/algorithm/string.hpp>
+ 
+@@ -117,7 +115,7 @@
+ 		boost::filesystem::directory_iterator it(dir), it_end;
+ 
+ 		for(; it != it_end; it++) {
+-			string filename = it->path().filename();
++			string filename = it->path().filename().string();
+ 
+ 			if(boost::starts_with(filename, name))
+ 				if(except.find(filename) == except.end())
+diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
+--- a/intern/cycles/util/util_path.cpp	2012-05-10 11:44:09.000000000 -0300
++++ b/intern/cycles/util/util_path.cpp	2012-07-15 14:19:14.126293394 -0300
+@@ -26,8 +26,6 @@
+ 
+ #include <stdio.h>
+ 
+-#define BOOST_FILESYSTEM_VERSION 2
+-
+ #include <boost/filesystem.hpp> 
+ #include <boost/algorithm/string.hpp>
+ 
+@@ -60,7 +58,7 @@
+ 
+ string path_filename(const string& path)
+ {
+-	return boost::filesystem::path(path).filename();
++	return boost::filesystem::path(path).filename().string();
+ }
+ 
+ string path_dirname(const string& path)
diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
new file mode 100644
index 000000000..a9b7a2423
--- /dev/null
+++ b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
@@ -0,0 +1,29 @@
+From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Tue, 3 Jul 2012 22:28:05 -0400
+Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
+To: arch-projects@archlinux.org
+
+systemd-186 writes this file when running systemd-tmpfiles, but
+initscripts never removes it. This disallows all non-root logins.
+
+Reported-by: Dan McGee <dan@archlinux.org>
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+---
+ rc.multi | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/rc.multi b/rc.multi
+index daf2372..7d4acaa 100755
+--- a/rc.multi
++++ b/rc.multi
+@@ -31,4 +31,6 @@ run_hook multi_end
+ 
+ bootlogd_stop
+ 
++rm -f /run/nologin
++
+ # vim: set ts=2 sw=2 noet:
+-- 
+1.7.11.1
+
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index aee2585d9..cc509fdd3 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2012.06.28
+pkgver=2012.07.14
 pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('any')
@@ -21,12 +21,19 @@ optdepends=('bridge-utils: Network bridging support'
 makedepends=(asciidoc)
 install=initscripts.install
 source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
+        0001-remove-run-nologin-before-leaving-rc.multi.patch
         'wireless.conf.d')
 
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+#  patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch"
+}
+
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
-md5sums=('21651eaba1fd34542c78f39c755cd171'
+md5sums=('15e2f373be03b25b0033fd4fb4820d30'
+         'ba32b9d723c20b38487669fb3c00d3d5'
          '027576534885b8d5dded9be546057b12')