Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=685b0043c2b3d717f2adb6d5a4e72524643efdff

commit 685b0043c2b3d717f2adb6d5a4e72524643efdff
Author: DeX77 <[email protected]>
Date:   Wed May 11 10:09:00 2016 +0200

* fix up2date and testsuite complaining

diff --git a/source/include/kf5.sh b/source/include/kf5.sh
index 8806847..475eaa5 100644
--- a/source/include/kf5.sh
+++ b/source/include/kf5.sh
@@ -80,9 +80,7 @@ fi

if [ -z "$_F_kde_mirror" ]; then
# set our preferred mirror
-       #_F_kde_mirror="http://kde-mirror.freenux.org";
-       #_F_kde_mirror="https://kde.cu.be";
-       _F_kde_up2date_mirror="http://download.kde.org/";
+       _F_kde_up2date_mirror="ftp://ftp5.gwdg.de/pub/linux/kde/";
_F_kde_mirror="http://vesta.informatik.rwth-aachen.de/ftp/pub/mirror/kde/";
fi

@@ -149,13 +147,7 @@ fi

if [ "$_F_kde_defaults" -eq 1 ]; then
if [ -z "$up2date" ]; then
-               if [[ "$_F_kde_project" =~ "plasma" ]] || [[ "$_F_kde_project" 
=~ "applications" ]]; then
-                       up2date="Flastverdir 
$_F_kde_up2date_mirror/$_F_kde_folder"
-               else
-                       ## testsuite will hate me
-                       up2date1=$(Flastverdir 
$_F_kde_up2date_mirror/$_F_kde_folder)
-                       up2date="Flasttar 
$_F_kde_up2date_mirror/$_F_kde_folder/$up2date1"
-               fi
+               up2date="ncftpls -x 'R' $_F_kde_up2date_mirror/$_F_kde_folder | 
Flasttar"
fi

if [ ${#source[@]} -eq 0 ]; then
@@ -172,6 +164,9 @@ fi
## X11/mesa changes
makedepends+=('x11-protos')

+## Use ncftp for up2date
+makedepends+=('ncftp')
+
###
# == APPENDED VARIABLES
# makedepends: if kde4 append automoc4 unless building it, if kf5 append some 
other deps.
@@ -460,3 +455,4 @@ build()
KDE_build
}

+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to