Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=finit.git;a=commitdiff;h=2134f2dd280dbcb00a5b1a18d0ad3335b2a0e5d1
commit 2134f2dd280dbcb00a5b1a18d0ad3335b2a0e5d1 Merge: 26ab843 239531e Author: crazy <[email protected]> Date: Fri May 12 11:16:36 2017 +0200 Fix merge conflicts diff --cc source/base/dhcpcd/FrugalBuild index 9b6adeb,07dc6e9..b398c81 --- a/source/base/dhcpcd/FrugalBuild +++ b/source/base/dhcpcd/FrugalBuild @@@ -4,13 -4,13 +4,13 @@@ pkgname=dhcpcd pkgver=6.11.5 - pkgrel=3 -pkgrel=2 ++pkgrel=4 pkgdesc="A DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd"; groups=('base') archs=('x86_64') -depends=('glibc>=2.25-5' 'libsystemd>=231-13') +depends=('glibc>=2.25-5' 'eudev') - _F_archive_grepv="beta" + _F_archive_grepv="beta\|rc" up2date="Flastarchive $url .tar.xz" source=(http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.xz) sha1sums=('aa0a97682cb7dad3ea0acfe623a67da42614a2d8') diff --cc source/base/kernel-initrd/FrugalBuild index e6ce1d5,c379017..8472a87 --- a/source/base/kernel-initrd/FrugalBuild +++ b/source/base/kernel-initrd/FrugalBuild @@@ -10,7 -10,7 +10,7 @@@ Finclude kernel-versio pkgname=kernel-initrd pkgver=$_F_kernelver_ver - pkgrel=4 -pkgrel=3 ++pkgrel=5 pkgdesc="The initrd for the Frugalware Linux Kernel." url="http://www.frugalware.org"; rodepends=('scriptlet-core') @@@ -29,8 -28,8 +29,8 @@@ options+=('nofakeroot' replaces=('kernel-initrd-modules' 'kernel-initrd-tools') conflicts=("${replaces[@]}") -OMITTED_MODULES="multipath systemd-bootchart" +OMITTED_MODULES="multipath systemd-bootchart systemd systemd-networkd systemd-initrd" - ADDED_MODULES="dmsquash-live" + ADDED_MODULES="dmsquash-live pollcdrom" build() { diff --cc source/base/lvm2/FrugalBuild index b0a6e82,5b11cc2..3dcd5d3 --- a/source/base/lvm2/FrugalBuild +++ b/source/base/lvm2/FrugalBuild @@@ -6,7 -6,7 +6,7 @@@ pkgname=lvm _F_archive_name="LVM2" Fpkgversep="." pkgver=2.02.171 - pkgrel=2 -pkgrel=1 ++pkgrel=3 pkgdesc="Logical Volume Manager 2 utilities" url="http://sources.redhat.com/lvm2/"; rodepends=("$pkgname-libs") diff --cc source/base/networkmanager/FrugalBuild index aae2533,a225bb6..9866dc0 --- a/source/base/networkmanager/FrugalBuild +++ b/source/base/networkmanager/FrugalBuild @@@ -4,14 -4,12 +4,14 @@@ pkgname=networkmanager _F_gnome_name=NetworkManager - pkgver=1.6.2 - pkgrel=3 + pkgver=1.8.0 -pkgrel=1 ++pkgrel=2 pkgdesc="Network Management daemon" -depends=('wireless_tools>=29-5' 'iproute2>=4.7.0-2' 'nss>=3.21-2' 'libgcrypt>=1.7.3-2' \ - 'libnl>=3.2.9-2' 'ppp>=2.4.7-3' 'wpa_supplicant>=2.5-4' 'iptables' 'polkit>=0.113-9' 'ca-certificates' \ - 'modemmanager>=1.6.0-2' 'libarchive>=3.0.3-2' 'dbus-glib>=0.108-2' 'libndp>=1.5-4' 'newt>=0.52.19-2' 'jansson') +depends=('wireless_tools>=29-5' 'iproute2>=4.7.0-2' 'nss>=3.21-2' \ + 'libgcrypt>=1.7.3-2' 'libnl>=3.2.9-2' 'ppp>=2.4.7-3' \ + 'wpa_supplicant>=2.5-4' 'iptables' 'polkit>=0.113-9' 'ca-certificates' \ + 'modemmanager>=1.6.0-2' 'libarchive>=3.0.3-2' 'dbus-glib>=0.108-2' \ + 'libndp>=1.5-4' 'newt>=0.52.19-2' 'jansson' 'eudev' 'elogind' 'libelogind') makedepends=('perl-xml-parser' 'intltool' 'gobject-introspection' 'dhcpcd' 'dhclient>=4.3.3' \ 'ppp>=2.4.7-3' 'bluez' 'dnsmasq' 'pygobject3' 'pygobject3-cairo' 'gtk-doc') rodepends=('mobile-broadband-provider-info') ## some 4G modems won't work without @@@ -21,18 -19,16 +21,19 @@@ _F_gnome_ext=.tar.x _F_gnome_devel="n" Finclude gnome +source+=(elogind-support.patch) options+=('scriptlet') backup=('etc/NetworkManager/NetworkManager.conf') - sha1sums=('fee830aee4b8d719046add91efa13ac08648b017' \ -sha1sums=('ef387c30c8fc0a1aea7c11dc6ef20afbb8c9616c') ++sha1sums=('ef387c30c8fc0a1aea7c11dc6ef20afbb8c9616c' \ + 'f7868d54a0325eb2c2c6f5a84c270531ad321805') ++ _F_cd_path=$_F_gnome_name-$pkgver -_F_systemd_units=(NetworkManager=e) -_F_cross32_simple="true" -_F_cross32_subdepends=('lib32-nss' 'lib32-glib2' 'lib32-libgudev' 'lib32-libnl' 'lib32-libndp' 'lib32-modemmanager' 'lib32-polkit' 'lib32-newt' 'lib32-dbus-glib' 'lib32-jansson') -_F_cross32_delete=('lib/' 'usr/share' 'usr/lib' 'var/') -Finclude systemd cross32 + +#_F_cross32_simple="true" +#_F_cross32_subdepends=('lib32-nss' 'lib32-glib2' 'lib32-libgudev' 'lib32-libnl' 'lib32-libndp' 'lib32-modemmanager' 'lib32-polkit' 'lib32-newt' 'lib32-dbus-glib' 'lib32-jansson') +#_F_cross32_delete=('lib/' 'usr/share' 'usr/lib' 'var/') +#Finclude cross32 replaces=('cnetworkmanager') provides=("${replaces[@]}") @@@ -44,17 -39,16 +45,17 @@@ Fconfopts=" --with-distro=frugalware --with-system-ca-path=/etc/ssl/certs \ --with-dbus-sys-dir=/etc/dbus-1/system.d \ --enable-introspection=yes \ - --with-session-tracking=systemd \ + --with-session-tracking=elogind \ --with-nmtui=yes \ --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \ - --with-modem-manager-1" + --with-modem-manager-1 --disable-concheck" -F32confopts+=" --enable-bluez5-dun=no --enable-introspection=no" +#F32confopts+=" --enable-bluez5-dun=no --enable-introspection=no" build() { - Fbuild_cross32 + + #Fbuild_cross32 + Fbuild Fmkdir etc/NetworkManager/system-connections Fmkdir etc/NetworkManager/dispatcher.d diff --cc source/base/pciutils/FrugalBuild index c23cb7c,96b2ee8..993cfe8 --- a/source/base/pciutils/FrugalBuild +++ b/source/base/pciutils/FrugalBuild @@@ -4,10 -4,10 +4,10 @@@ pkgname=pciutils pkgver=3.5.4 - pkgrel=4 -pkgrel=5 ++pkgrel=6 pkgdesc="PCI utilities" url="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"; -depends=('glibc>=2.25-5' 'libsystemd>=231-12' 'kmod>=24-2') +depends=('glibc>=2.25-5' 'eudev' 'kmod>=24-2') rodepends=('hwdata') groups=('base' 'core') archs=('x86_64') diff --cc source/x11/libwacom/FrugalBuild index 7161699,e93b1ea..af09eba --- a/source/x11/libwacom/FrugalBuild +++ b/source/x11/libwacom/FrugalBuild @@@ -2,24 -2,17 +2,24 @@@ # Maintainer: crazy <[email protected]> pkgname=libwacom - pkgver=0.24 + pkgver=0.25 -pkgrel=1 +pkgrel=2 pkgdesc="Tablet Information Client Library" url="http://linuxwacom.sourceforge.net/"; _F_sourceforge_subdir=$pkgname/ _F_sourceforge_dirname="linuxwacom" _F_sourceforge_ext=".tar.bz2" Finclude sourceforge -depends=('glib2>=2.49.7-2' 'libgudev>=230-7' 'libsystemd>=231-6' 'libffi>=3.2.1-2') +depends=('glib2>=2.49.7-2' 'libgudev>=230-7' 'eudev' 'libffi>=3.2.1-2') groups=('x11') archs=('x86_64') - sha1sums=('74d38e416fc7b91bbf3e163d40fe6ff688e6da51') + sha1sums=('9e935f365c75a75e1eb62d865f50580ac1fa86db') +build() { + + Fbuild + Fmkdir lib/udev/rules.d + Fexec tools/generate-udev-rules >$Fdestdir/lib/udev/rules.d/65-libwacom.rules || Fdie +} + # optimization OK diff --cc source/x11/mesa/FrugalBuild index 2b5f601,dd27052..dc5132c --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@@ -33,8 -33,8 +33,8 @@@ if Fuse WAYLAND_EGL; the fi pkgname=mesa - pkgver=17.0.5 + pkgver=17.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mesa is a 3D graphics library" url="http://mesa3d.sourceforge.net/"; _F_archive_grepv="-rc" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
