Merge branch 'master' of ssh://git.parabola.nu/~git/abslibre

6 files changed, 33 insertions, 143 deletions

diff --git a/pcr/cunit/PKGBUILD b/pcr/cunit/PKGBUILD
deleted file mode 100644
index f8d788abb..000000000
--- a/pcr/cunit/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributor (Arch): Danibspi danibspi <at> gmail <dot> com
-# Contributor (Arch): Daniel Milde <daniel@milde.cz>
-
-pkgname=cunit
-pkgver=2.1.3
-pkgrel=2
-pkgdesc="Lightweight system for writing, administering, and running unit tests in C"
-arch=(i686 x86_64)
-url="http://cunit.sourceforge.net/"
-license=('LGPL2')
-depends=('glibc')
-options=('!libtool')
-source=(https://downloads.sourceforge.net/project/cunit/CUnit/2.1-3/CUnit-2.1-3.tar.bz2)
-md5sums=('b5f1a9f6093869c070c6e4a9450cc10c')
-
-build() {
-  cd "$srcdir/CUnit-2.1-3"
-  libtoolize --force
-  aclocal
-  autoheader
-  automake --force-missing --add-missing
-  autoconf
-  ./configure --prefix=/usr
-  make || return 1
-}
-
-package() {
-  cd "$srcdir/CUnit-2.1-3"
-  make DESTDIR="$pkgdir" install
-  mv $pkgdir/usr/doc $pkgdir/usr/share/doc
-}
diff --git a/pcr/networkmanager-consolekit/PKGBUILD b/pcr/networkmanager-consolekit/PKGBUILD
index 980ba6d12..f7fadeb4c 100644
--- a/pcr/networkmanager-consolekit/PKGBUILD
+++ b/pcr/networkmanager-consolekit/PKGBUILD
@@ -10,7 +10,7 @@
 _pppver=2.4.7
 
 pkgname=networkmanager-consolekit
-pkgver=1.4.0
+pkgver=1.4.1dev+9+ga3fd485
 pkgrel=1
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'armv7h')
@@ -21,7 +21,7 @@ conflicts=('networkmanager')
 makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc'
 			"ppp=$_pppver" 'modemmanager' 'dbus-glib' 'iproute2' 'nss'
 			 'polkit-consolekit' 'wpa_supplicant' 'libsoup' 'eudev-systemd' 'libgudev' 'libmm-glib'
-			 'rp-pppoe' 'libnewt' 'libndp' 'libteam' 'vala' 'perl-yaml' 'python-gobject')
+			 'rp-pppoe' 'libnewt' 'libndp' 'libteam' 'vala' 'perl-yaml' 'python-gobject' 'git')
 checkdepends=('libx11' 'python-dbus' 'eudev-systemd')
 depends=('libnm-glib' 'iproute2' 'polkit-consolekit' 'wpa_supplicant' 'libsoup' 'libmm-glib' 'libnewt' 'libndp' 'libteam' 'consolekit' 'eudev')
 optdepends=('dnsmasq: connection sharing'
@@ -32,17 +32,25 @@ optdepends=('dnsmasq: connection sharing'
 			'dhclient: External DHCP client'
 			'modemmanager: cellular network support')
 backup=('etc/NetworkManager/NetworkManager.conf')
-source=("https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz"
+
+_commit=a3fd48545cf186a7e33aa9df8c3dd2bc016b350d
+# "https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz"
+source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit"
         'NetworkManager.conf'
         '01-org.freedesktop.NetworkManager.settings.modify.system.rules'
         '50-org.freedesktop.NetworkManager.rules')
-sha256sums=('c4d5e075998a291074501602a5068a7e54d9e0f2658aba079d58145d65be531d'
+sha256sums=('SKIP'
             '452e4f77c1de92b1e08f6f58674a6c52a2b2d65b7deb0ba436e9afa91ee15103'
             '4b815f43de58379e68653d890f529485aec4d2f83f11d050b08b31489d2267c2'
             '02d9f7d836d297d6ddf39482d86a8573b3e41735b408aa2cd6df22048ec5f6c4')
 
+pkgver() {
+  cd NetworkManager
+  git describe | sed 's/-dev/dev/;s/-/+/g'
+}
+
 prepare() {
-  cd NetworkManager-$pkgver
+  cd NetworkManager #-$pkgver
 
   2to3 -w libnm src tools
 
@@ -50,7 +58,7 @@ prepare() {
 }
 
 build() {
-	cd NetworkManager-$pkgver
+	cd NetworkManager #-$pkgver
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
@@ -83,12 +91,12 @@ build() {
 }
 
 check() {
-	cd NetworkManager-$pkgver
+	cd NetworkManager #-$pkgver
 	make -k check
 }
 
 package() {
-	cd NetworkManager-$pkgver
+	cd NetworkManager #-$pkgver
 	make DESTDIR="$pkgdir" install
 	make DESTDIR="$pkgdir" -C libnm uninstall
 	make DESTDIR="$pkgdir" -C libnm-glib uninstall
diff --git a/pcr/openrc/PKGBUILD b/pcr/openrc/PKGBUILD
index 3c7eadf0d..43d538c62 100644
--- a/pcr/openrc/PKGBUILD
+++ b/pcr/openrc/PKGBUILD
@@ -5,7 +5,7 @@
 _url="https://github.com/OpenRC/openrc/archive"
 
 pkgname=openrc
-pkgver=0.21.4
+pkgver=0.21.7
 pkgrel=1.parabola1
 pkgdesc="Gentoo's universal init system"
 arch=('i686' 'x86_64' 'armv7h')
@@ -28,12 +28,10 @@ backup=('etc/rc.conf'
 #options=('emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz::${_url}/${pkgver}.tar.gz"
 	"${pkgname}.logrotate"
-	'use-optional-modules-load-d.patch'
 	'openrc-install.hook'
 	'openrc-remove.hook')
-sha256sums=('a9d68762d996caefb64995e6679d58e3df6421d297117a5ae0cd5267df727f29'
+sha256sums=('522409fb65f4c751e7d01faec54a9446501837abc9e6ee1bea868cb88e4bd603'
             '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
-            'b8b750c863199e9c039e874c3c79c72d468f35442750156dfbdf503a27977cf3'
             '1d4d31a7275660e7b23778e6fceb0714cab8ed2793b04aa004b01d8e7bcd43bd'
             'cbb4d00262a55a508114cb31e3903350be2cff748a4fb5e120dc745292e3987e')
 
@@ -51,7 +49,6 @@ prepare(){
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed -e "s|/sbin|/usr/bin|g" -i support/sysvinit/inittab
 	sed -i 's:0444:0644:' mk/sys.mk
-	patch -Np1 -i ${srcdir}/use-optional-modules-load-d.patch
 }
 
 build(){
diff --git a/pcr/openrc/use-optional-modules-load-d.patch b/pcr/openrc/use-optional-modules-load-d.patch
deleted file mode 100644
index 81ef5be3b..000000000
--- a/pcr/openrc/use-optional-modules-load-d.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -aur openrc-0.20.5.orig/conf.d/modules openrc-0.20.5/conf.d/modules
---- openrc-0.20.5.orig/conf.d/modules	2016-04-20 10:54:37.686042847 -0700
-+++ openrc-0.20.5/conf.d/modules	2016-04-20 10:56:27.900232387 -0700
-@@ -1,6 +1,11 @@
- # You can define a list modules for a specific kernel version,
- # a released kernel version, a main kernel version or just a list.
- # The most specific versioned variable will take precedence.
-+
-+# if openrc should make use of /etc/modules-load.d
-+# systemd places stuff there
-+use_modules_load_d=false
-+
- #modules_2_6_23_gentoo_r5="ieee1394 ohci1394"
- #modules_2_6_23="tun ieee1394"
- #modules_2_6="tun"
-diff -aur openrc-0.20.5.orig/init.d/modules.in openrc-0.20.5/init.d/modules.in
---- openrc-0.20.5.orig/init.d/modules.in	2016-04-20 10:54:37.689376105 -0700
-+++ openrc-0.20.5/init.d/modules.in	2016-04-20 10:55:41.671271452 -0700
-@@ -23,6 +23,61 @@
- 	# support compiled in ...
- 	[ ! -f /proc/modules ] && return 0
- 
-+	if yesno "${use_modules_load_d:-false}";then
-+		local conf_s=/etc/modules-load.d
-+		einfo "using ${conf_s}"
-+
-+		local mhwd=
-+		if [ -f "${conf_s}/mwhd-gpu.conf" ];then
-+			for m in $(cat ${conf_s}/mhwd-gpu.conf | sed '/^.*#/d'); do
-+				mhwd="$mhwd $m"
-+			done
-+		fi
-+
-+		if [ -d "${conf_s}" ]; then
-+			local mods= fn= kv= gmods= kv_cache=
-+
-+			for f in $(ls ${conf_s}/*.conf); do
-+				fn="$( expr "$(basename "$f")" : '\(.*\).conf' )"
-+
-+				if [ "$fn" != mhwd-gpu ];then
-+					kv="$(expr "$fn" : 'linux\([0-9]\+\)-')"
-+					echo "$fn || $kv"
-+
-+					if expr "$fn" : "linux${kv}-.*" > /dev/null; then
-+						for m in $(cat $f | sed '/^.*#/d'); do
-+							mods="$mods $m"
-+						done
-+
-+						local kv_major="$(expr "$kv" : "\([0-9]\)" )"
-+						local kv_minor="$(expr "$kv" : "[0-9]\([0-9]\)" )"
-+
-+						local kvr_k="${kv_major}_${kv_minor}"
-+
-+						if expr \( "${kv_cache}" : "${kvr_k}" \) = 0; then
-+							kv_cache="${kv_cache} ${kvr_k}"
-+						fi
-+
-+						eval local "_cache_${kvr_k}=\"\${_cache_${kvr_k}} ${mods}\""
-+						mods=
-+					else
-+						for m in $(cat $f | sed '/^.*#/d'); do
-+							gmods="$gmods $m"
-+						done
-+					fi
-+				fi
-+			done
-+
-+			for kv_key in $(echo "${kv_cache}"|tr ' ' '\n'); do
-+				kv_val="$(eval "echo \"\${_cache_${kv_key}}"\")"
-+				eval "modules_${kv_key}=\"${kv_val} ${mhwd} ${gmods}\""
-+				unset "_cache_${kv_key}"
-+			done
-+
-+			eval "modules=\"${mhwd} ${gmods}\""
-+		fi
-+	fi
-+
- 	local KV x y kv_variant_list
- 	KV=$(uname -r)
- 	# full $KV
diff --git a/pcr/sddm-consolekit/PKGBUILD b/pcr/sddm-consolekit/PKGBUILD
index 56b6923e5..b080532b0 100644
--- a/pcr/sddm-consolekit/PKGBUILD
+++ b/pcr/sddm-consolekit/PKGBUILD
@@ -5,14 +5,14 @@
 _pkgname=sddm
 
 pkgname=sddm-consolekit
-pkgver=0.13.0
-pkgrel=2
+pkgver=0.14.0
+pkgrel=1
 pkgdesc='QML based X11 display manager'
 arch=('i686' 'x86_64' 'armv7h')
 url='http://github.com/sddm/sddm'
 license=('GPL')
-depends=('qt5-declarative')
-makedepends=('cmake' 'python-docutils' 'qt5-tools')
+depends=('qt5-declarative' 'dbus-openrc' 'eudev-systemd' 'consolekit')
+makedepends=('extra-cmake-modules' 'python-docutils' 'qt5-tools')
 install="${_pkgname}.install"
 backup=('usr/share/sddm/scripts/Xsetup'
 	'etc/sddm.conf')
@@ -22,8 +22,8 @@ source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname
         "${_pkgname}-consolekit.patch"
         "${_pkgname}-pam_kwallet.patch"
         'sddm.conf')
-sha256sums=('26dee7e59859b5cbd5ec26b0050ef31c32b43be304e4042119819ab9779c26bd'
-            '4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5'
+sha256sums=('a551551a6ba324e9c384c89bc63e871de65fea3740eadbea2d63df86045f8205'
+            'a998f8a2594cd1e81f402605f01075477a017269b0ac93a22f5faa7d355d18e0'
             'dc46a0132cf0ea722a69cff45ed1ded3c93ade008e22fc90d1b797ca85ed535a'
             'ffcb9885cb41da54a97f62c2538975fbb9dc80c2b58326d479a87ea0f56f02cf')
 
diff --git a/pcr/sddm-consolekit/sddm-consolekit.patch b/pcr/sddm-consolekit/sddm-consolekit.patch
index acdfdc1a4..64ea06482 100644
--- a/pcr/sddm-consolekit/sddm-consolekit.patch
+++ b/pcr/sddm-consolekit/sddm-consolekit.patch
@@ -1,13 +1,9 @@
-diff --git a/data/scripts/Xsession b/data/scripts/Xsession
-index a5d270d..4b48524 100755
---- a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -74,7 +74,7 @@ case $session in
-     exec xterm -geometry 80x24-0-0
-     ;;
-   *)
--    eval exec "$session"
-+    eval exec ck-launch-session "$session"
-     ;;
- esac
- exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
+--- a/data/scripts/Xsession	2016-08-28 14:52:04.910181422 +0200
++++ b/data/scripts/Xsession	2016-08-28 14:53:07.157184480 +0200
+@@ -91,5 +91,5 @@
+ if [ -z "$@" ]; then
+     exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+ else
+-    exec $@
++    exec ck-launch-session $@
+ fi