Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=795cc45c58d056a079b7bbca88ae027224de0c3e
commit 795cc45c58d056a079b7bbca88ae027224de0c3e Merge: 64818ef 9c68a63 Author: DeX77 <[email protected]> Date: Fri Jul 24 16:44:08 2015 +0200 Merge ../current Conflicts: source/apps-extra/acpi_call/FrugalBuild source/apps-extra/tp-smapi/FrugalBuild source/apps-extra/virtualbox-modules/FrugalBuild source/apps/gnupg2/FrugalBuild source/base-extra/dracut/FrugalBuild source/base/kernel-initrd/FrugalBuild source/base/kernel/config.i686 source/base/kernel/config.x86_64 source/base/libgpg-error/FrugalBuild source/base/linux-firmware/FrugalBuild source/include/kernel-version.sh source/include/kernel.sh source/kde/kdeutils/FrugalBuild source/lib/npth/FrugalBuild source/xapps-extra/chromium-browser/FrugalBuild source/xapps-extra/qemu/FrugalBuild source/xapps-extra/virtualbox/FrugalBuild diff --cc source/base-extra/dracut/FrugalBuild index 2382d82,2bca345..65e2ddc --- a/source/base-extra/dracut/FrugalBuild +++ b/source/base-extra/dracut/FrugalBuild @@@ -14,12 -14,12 +14,15 @@@ up2date="Flasttar http://www.kernel.org source=(http://kernel.org/pub/linux/utils/boot/dracut/$pkgname-$pkgver.tar.xz \ config.patch \ fix_fakeroot.patch) -#signatures=(${source/.tar.xz/.tar.sign} '' '' '') +signatures=(${source/.tar.xz/.tar.sign} '' '' ) + sha1sums=('9c7c6c61eb7529206fc6595bd014e046e18ef5e0' \ + 'e5d743cc6c0be49f4382289ca420719846bfd8c5' \ + '03f106b541903863e35e677856c824f15574258a') backup=(etc/dracut.conf) -options=('scriptlet' 'force') +options=('scriptlet') +Fconfopts+="--sbindir=/sbin --sysconfdir=/etc --mandir=/usr/share/man" + + subpkgs=("${subpkgs[@]}" 'dracut-network') subdescs=("${subdescs[@]}" 'Dracut modules to build a dracut initramfs with network support') diff --cc source/xapps-extra/chromium-browser/FrugalBuild index f688d45,caec72d..6d84d6e --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@@ -10,11 -10,11 +10,11 @@@ pkgdesc='An open-source browser projec url='http://www.chromium.org/' depends=('nss>=3.15.4' 'alsa-lib' 'hicolor-icon-theme' 'libxslt>=1.1.28' 'ffmpeg>=1.0' \ 'libevent>=2.0.21' 'libxscrnsaver' 'libpng=1.4.8-1' 'gtk+2-libs' 'libxtst' \ - 'gnutls>=3.2.12.1' 'libgcrypt>=1.6.1' 'dejavu-ttf' 'libtasn1>=3.4-1' 'gdk-pixbuf2' \ + 'gnutls>=3.4.2' 'libgcrypt>=1.6.1' 'dejavu-ttf' 'libtasn1>=3.4-1' 'gdk-pixbuf2' \ 'systemd>=208-3' 'libcups' 'openssl' 'libxml2' 'speech-dispatcher' 'libpulse>=6.0' \ 'gconf' 'opus>=1.1-2' 'libmtp>=1.1.6-2' 'nspr>=4.10.4' 'libgnome-keyring>=3.10.1-2' \ - 'libexif') + 'libexif' 'snappy') -makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl' 'cups' 'krb5' 'elfutils' 'subversion' 'gtk+2' 'ninja' 'clang') +makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl' 'cups' 'krb5' 'elfutils' 'subversion' 'gtk+2' 'ninja' 'clang>=3.6') license=('BSD') groups=('xapps-extra') archs=('i686' 'x86_64') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
