2224 files changed, 550 insertions, 33068 deletions

diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index 39972ad3e..a5b8f33a1 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=aaa_elflibs
 VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-27}
+BUILD=${BUILD:-28}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
index b5967eff3..bf2e2e0ef 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
@@ -10,28 +10,3 @@
 /usr/lib/libmpfr.so.6
 /usr/lib/libgmp.so.10
 /usr/lib/libgmpxx.so.4
-# Need these saved here during the KDE4 -> Plasma 5 transition:
-# exiv2:
-/usr/lib/libexiv2.so.26
-# LibRaw:
-/usr/lib/libraw.so.16
-/usr/lib/libraw_r.so.16
-# poppler:
-/usr/lib/libpoppler-qt4.so.4
-/usr/lib/libpoppler.so.79
-# ilmbase (merged into the new openexr package):
-/usr/lib/libHalf.so.12
-/usr/lib/libIex-2_2.so.12
-/usr/lib/libIexMath-2_2.so.12
-/usr/lib/libIlmThread-2_2.so.12
-/usr/lib/libImath-2_2.so.12
-# openexr:
-/usr/lib/libIlmImf-2_2.so.22
-/usr/lib/libIlmImfUtil-2_2.so.22
-# icu4c:
-/usr/lib/libicudata.so.67
-/usr/lib/libicui18n.so.67
-/usr/lib/libicuio.so.67
-/usr/lib/libicutest.so.67
-/usr/lib/libicutu.so.67
-/usr/lib/libicuuc.so.67
diff --git a/source/a/bash/bash-5.0-patches/bash50-001 b/source/a/bash/bash-5.0-patches/bash50-001
deleted file mode 100644
index 169317ded..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-001
+++ /dev/null
@@ -1,166 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-001
-
-Bug-Reported-by:	axel@freakout.de
-Bug-Reference-ID:	<201901082050.x08KoShS006731@bongo.freakout.de>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2019-01/msg00079.html
-
-Bug-Description:
-
-Under certain circumstances, the glob expansion code did not remove
-backslashes escaping characters in directory names (or portions of a
-pattern preceding a slash).
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0/bashline.c	2018-11-27 13:20:16.000000000 -0500
---- bashline.c	2019-01-16 16:06:03.000000000 -0500
-***************
-*** 232,235 ****
---- 232,236 ----
-  static int bash_possible_command_completions __P((int, int));
-  
-+ static int completion_glob_pattern __P((char *));
-  static char *glob_complete_word __P((const char *, int));
-  static int bash_glob_completion_internal __P((int));
-***************
-*** 1742,1746 ****
-    /* This could be a globbing pattern, so try to expand it using pathname
-       expansion. */
-!   if (!matches && glob_pattern_p (text))
-      {
-        matches = rl_completion_matches (text, glob_complete_word);
---- 1743,1747 ----
-    /* This could be a globbing pattern, so try to expand it using pathname
-       expansion. */
-!   if (!matches && completion_glob_pattern ((char *)text))
-      {
-        matches = rl_completion_matches (text, glob_complete_word);
-***************
-*** 1851,1855 ****
-  	}
-  
-!       globpat = glob_pattern_p (hint_text);
-  
-        /* If this is an absolute program name, do not check it against
---- 1852,1856 ----
-  	}
-  
-!       globpat = completion_glob_pattern ((char *)hint_text);
-  
-        /* If this is an absolute program name, do not check it against
-***************
-*** 3714,3717 ****
---- 3715,3773 ----
-  }
-  
-+ static int
-+ completion_glob_pattern (string)
-+      char *string;
-+ {
-+   register int c;
-+   char *send;
-+   int open;
-+ 
-+   DECLARE_MBSTATE;
-+ 
-+   open = 0;
-+   send = string + strlen (string);
-+ 
-+   while (c = *string++)
-+     {
-+       switch (c)
-+ 	{
-+ 	case '?':
-+ 	case '*':
-+ 	  return (1);
-+ 
-+ 	case '[':
-+ 	  open++;
-+ 	  continue;
-+ 
-+ 	case ']':
-+ 	  if (open)
-+ 	    return (1);
-+ 	  continue;
-+ 
-+ 	case '+':
-+ 	case '@':
-+ 	case '!':
-+ 	  if (*string == '(')	/*)*/
-+ 	    return (1);
-+ 	  continue;
-+ 
-+ 	case '\\':
-+ 	  if (*string == 0)
-+ 	    return (0);	 	  
-+ 	}
-+ 
-+       /* Advance one fewer byte than an entire multibyte character to
-+ 	 account for the auto-increment in the loop above. */
-+ #ifdef HANDLE_MULTIBYTE
-+       string--;
-+       ADVANCE_CHAR_P (string, send - string);
-+       string++;
-+ #else
-+       ADVANCE_CHAR_P (string, send - string);
-+ #endif
-+     }
-+   return (0);
-+ }
-+ 
-  static char *globtext;
-  static char *globorig;
-***************
-*** 3878,3882 ****
-      }      
-  
-!   if (t && glob_pattern_p (t) == 0)
-      rl_explicit_arg = 1;	/* XXX - force glob_complete_word to append `*' */
-    FREE (t);
---- 3934,3938 ----
-      }      
-  
-!   if (t && completion_glob_pattern (t) == 0)
-      rl_explicit_arg = 1;	/* XXX - force glob_complete_word to append `*' */
-    FREE (t);
-*** ../bash-5.0/lib/glob/glob_loop.c	2018-12-31 13:35:15.000000000 -0500
---- lib/glob/glob_loop.c	2019-01-09 09:44:36.000000000 -0500
-***************
-*** 55,59 ****
-  
-        case L('\\'):
-- #if 0
-  	/* Don't let the pattern end in a backslash (GMATCH returns no match
-  	   if the pattern ends in a backslash anyway), but otherwise return 1,
---- 55,58 ----
-***************
-*** 61,69 ****
-  	   and it can be removed. */
-  	return (*p != L('\0'));
-- #else
-- 	/* The pattern may not end with a backslash. */
-- 	if (*p++ == L('\0'))
-- 	  return 0;
-- #endif
-        }
-  
---- 60,63 ----
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 0
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-002 b/source/a/bash/bash-5.0-patches/bash50-002
deleted file mode 100644
index 3fc8272f8..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-002
+++ /dev/null
@@ -1,113 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-002
-
-Bug-Reported-by:	Ante Peric <synthmeat@gmail.com>
-Bug-Reference-ID:	<B7E3B567-2467-4F7B-B6B9-CA4E75A9C93F@gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2019-01/msg00095.html
-
-Bug-Description:
-
-When an alias value ends with an unquoted literal tab (not part of a quoted
-string or comment), alias expansion cannot correctly detect the end of the
-alias value after expanding it.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0/parser.h	2018-12-28 19:11:18.000000000 -0500
---- parser.h	2019-01-11 15:13:03.000000000 -0500
-***************
-*** 48,51 ****
---- 48,52 ----
-  #define PST_REDIRLIST	0x080000	/* parsing a list of redirections preceding a simple command name */
-  #define PST_COMMENT	0x100000	/* parsing a shell comment; used by aliases */
-+ #define PST_ENDALIAS	0x200000	/* just finished expanding and consuming an alias */
-  
-  /* Definition of the delimiter stack.  Needed by parse.y and bashhist.c. */
-*** ../bash-5.0/parse.y	2019-01-02 13:57:34.000000000 -0500
---- parse.y	2019-01-14 08:23:31.000000000 -0500
-***************
-*** 2558,2567 ****
-        pushed_string_list->flags != PSH_DPAREN &&
-        (parser_state & PST_COMMENT) == 0 &&
-        shell_input_line_index > 0 &&
-!       shell_input_line[shell_input_line_index-1] != ' ' &&
-        shell_input_line[shell_input_line_index-1] != '\n' &&
-        shellmeta (shell_input_line[shell_input_line_index-1]) == 0 &&
-        (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"'))
-      {
-        return ' ';	/* END_ALIAS */
-      }
---- 2558,2569 ----
-        pushed_string_list->flags != PSH_DPAREN &&
-        (parser_state & PST_COMMENT) == 0 &&
-+       (parser_state & PST_ENDALIAS) == 0 &&	/* only once */
-        shell_input_line_index > 0 &&
-!       shellblank (shell_input_line[shell_input_line_index-1]) == 0 &&
-        shell_input_line[shell_input_line_index-1] != '\n' &&
-        shellmeta (shell_input_line[shell_input_line_index-1]) == 0 &&
-        (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"'))
-      {
-+       parser_state |= PST_ENDALIAS;
-        return ' ';	/* END_ALIAS */
-      }
-***************
-*** 2572,2575 ****
---- 2574,2578 ----
-    if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE)
-      {
-+       parser_state &= ~PST_ENDALIAS;
-        pop_string ();
-        uc = shell_input_line[shell_input_line_index];
-*** ../bash-5.0/y.tab.c	2019-01-02 13:57:43.000000000 -0500
---- y.tab.c	2019-01-14 08:39:23.000000000 -0500
-***************
-*** 4874,4883 ****
-        pushed_string_list->flags != PSH_DPAREN &&
-        (parser_state & PST_COMMENT) == 0 &&
-        shell_input_line_index > 0 &&
-!       shell_input_line[shell_input_line_index-1] != ' ' &&
-        shell_input_line[shell_input_line_index-1] != '\n' &&
-        shellmeta (shell_input_line[shell_input_line_index-1]) == 0 &&
-        (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"'))
-      {
-        return ' ';	/* END_ALIAS */
-      }
---- 4874,4885 ----
-        pushed_string_list->flags != PSH_DPAREN &&
-        (parser_state & PST_COMMENT) == 0 &&
-+       (parser_state & PST_ENDALIAS) == 0 &&	/* only once */
-        shell_input_line_index > 0 &&
-!       shellblank (shell_input_line[shell_input_line_index-1]) == 0 &&
-        shell_input_line[shell_input_line_index-1] != '\n' &&
-        shellmeta (shell_input_line[shell_input_line_index-1]) == 0 &&
-        (current_delimiter (dstack) != '\'' && current_delimiter (dstack) != '"'))
-      {
-+       parser_state |= PST_ENDALIAS;
-        return ' ';	/* END_ALIAS */
-      }
-***************
-*** 4888,4891 ****
---- 4890,4894 ----
-    if (uc == 0 && pushed_string_list && pushed_string_list->flags != PSH_SOURCE)
-      {
-+       parser_state &= ~PST_ENDALIAS;
-        pop_string ();
-        uc = shell_input_line[shell_input_line_index];
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-003 b/source/a/bash/bash-5.0-patches/bash50-003
deleted file mode 100644
index f7e5677e5..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-003
+++ /dev/null
@@ -1,239 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-003
-
-Bug-Reported-by:	Andrew Church <achurch+bash@achurch.org>
-Bug-Reference-ID:	<5c534aa2.04371@msgid.achurch.org>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2019-01/msg00276.html
-
-Bug-Description:
-
-There are several incompatibilities in how bash-5.0 processes pathname
-expansion (globbing) of filename arguments that have backslashes in the
-directory portion.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/lib/glob/glob_loop.c	2019-01-16 16:13:21.000000000 -0500
---- lib/glob/glob_loop.c	2019-02-01 09:45:11.000000000 -0500
-***************
-*** 27,34 ****
-    register const GCHAR *p;
-    register GCHAR c;
-!   int bopen;
-  
-    p = pattern;
-!   bopen = 0;
-  
-    while ((c = *p++) != L('\0'))
---- 27,34 ----
-    register const GCHAR *p;
-    register GCHAR c;
-!   int bopen, bsquote;
-  
-    p = pattern;
-!   bopen = bsquote = 0;
-  
-    while ((c = *p++) != L('\0'))
-***************
-*** 56,66 ****
-        case L('\\'):
-  	/* Don't let the pattern end in a backslash (GMATCH returns no match
-! 	   if the pattern ends in a backslash anyway), but otherwise return 1,
-! 	   since the matching engine uses backslash as an escape character
-! 	   and it can be removed. */
-! 	return (*p != L('\0'));
-        }
-  
-!   return 0;
-  }
-  
---- 56,75 ----
-        case L('\\'):
-  	/* Don't let the pattern end in a backslash (GMATCH returns no match
-! 	   if the pattern ends in a backslash anyway), but otherwise note that 
-! 	   we have seen this, since the matching engine uses backslash as an
-! 	   escape character and it can be removed. We return 2 later if we
-! 	   have seen only backslash-escaped characters, so interested callers
-! 	   know they can shortcut and just dequote the pathname. */
-! 	if (*p != L('\0'))
-! 	  {
-! 	    p++;
-! 	    bsquote = 1;
-! 	    continue;
-! 	  }
-! 	else 	/* (*p == L('\0')) */
-! 	  return 0;
-        }
-  
-!   return bsquote ? 2 : 0;
-  }
-  
-*** ../bash-5.0-patched/lib/glob/glob.h	2013-10-28 14:46:12.000000000 -0400
---- lib/glob/glob.h	2019-03-07 11:06:47.000000000 -0500
-***************
-*** 31,34 ****
---- 31,35 ----
-  #define GX_ADDCURDIR	0x200	/* internal -- add passed directory name */
-  #define GX_GLOBSTAR	0x400	/* turn on special handling of ** */
-+ #define GX_RECURSE	0x800	/* internal -- glob_filename called recursively */
-  
-  extern int glob_pattern_p __P((const char *));
-*** ../bash-5.0-patched/lib/glob/glob.c	2018-09-20 10:53:23.000000000 -0400
---- lib/glob/glob.c	2019-03-07 14:23:43.000000000 -0500
-***************
-*** 1062,1066 ****
-    unsigned int directory_len;
-    int free_dirname;			/* flag */
-!   int dflags;
-  
-    result = (char **) malloc (sizeof (char *));
---- 1078,1082 ----
-    unsigned int directory_len;
-    int free_dirname;			/* flag */
-!   int dflags, hasglob;
-  
-    result = (char **) malloc (sizeof (char *));
-***************
-*** 1111,1117 ****
-      }
-  
-    /* If directory_name contains globbing characters, then we
-!      have to expand the previous levels.  Just recurse. */
-!   if (directory_len > 0 && glob_pattern_p (directory_name))
-      {
-        char **directories, *d, *p;
---- 1127,1136 ----
-      }
-  
-+   hasglob = 0;
-    /* If directory_name contains globbing characters, then we
-!      have to expand the previous levels.  Just recurse.
-!      If glob_pattern_p returns != [0,1] we have a pattern that has backslash
-!      quotes but no unquoted glob pattern characters. We dequote it below. */
-!   if (directory_len > 0 && (hasglob = glob_pattern_p (directory_name)) == 1)
-      {
-        char **directories, *d, *p;
-***************
-*** 1176,1180 ****
-  	d[directory_len - 1] = '\0';
-  
-!       directories = glob_filename (d, dflags);
-  
-        if (free_dirname)
---- 1195,1199 ----
-  	d[directory_len - 1] = '\0';
-  
-!       directories = glob_filename (d, dflags|GX_RECURSE);
-  
-        if (free_dirname)
-***************
-*** 1333,1336 ****
---- 1352,1369 ----
-  	  return (NULL);
-  	}
-+       /* If we have a directory name with quoted characters, and we are
-+ 	 being called recursively to glob the directory portion of a pathname,
-+ 	 we need to dequote the directory name before returning it so the
-+ 	 caller can read the directory */
-+       if (directory_len > 0 && hasglob == 2 && (flags & GX_RECURSE) != 0)
-+ 	{
-+ 	  dequote_pathname (directory_name);
-+ 	  directory_len = strlen (directory_name);
-+ 	}
-+ 
-+       /* We could check whether or not the dequoted directory_name is a
-+ 	 directory and return it here, returning the original directory_name
-+ 	 if not, but we don't do that yet. I'm not sure it matters. */
-+ 
-        /* Handle GX_MARKDIRS here. */
-        result[0] = (char *) malloc (directory_len + 1);
-*** ../bash-5.0-patched/pathexp.c	2018-04-29 17:44:48.000000000 -0400
---- pathexp.c	2019-01-31 20:19:41.000000000 -0500
-***************
-*** 66,74 ****
-    register int c;
-    char *send;
-!   int open;
-  
-    DECLARE_MBSTATE;
-  
-!   open = 0;
-    send = string + strlen (string);
-  
---- 66,74 ----
-    register int c;
-    char *send;
-!   int open, bsquote;
-  
-    DECLARE_MBSTATE;
-  
-!   open = bsquote = 0;
-    send = string + strlen (string);
-  
-***************
-*** 101,105 ****
-  	   globbing. */
-  	case '\\':
-! 	  return (*string != 0);
-  	 	  
-  	case CTLESC:
---- 101,112 ----
-  	   globbing. */
-  	case '\\':
-! 	  if (*string != '\0' && *string != '/')
-! 	    {
-! 	      bsquote = 1;
-! 	      string++;
-! 	      continue;
-! 	    }
-! 	  else if (*string == 0)
-! 	    return (0);
-  	 	  
-  	case CTLESC:
-***************
-*** 118,122 ****
-  #endif
-      }
-!   return (0);
-  }
-  
---- 125,130 ----
-  #endif
-      }
-! 
-!   return (bsquote ? 2 : 0);
-  }
-  
-*** ../bash-5.0-patched/bashline.c	2019-01-16 16:13:21.000000000 -0500
---- bashline.c	2019-02-22 09:29:08.000000000 -0500
-***************
-*** 3753,3757 ****
-  
-  	case '\\':
-! 	  if (*string == 0)
-  	    return (0);	 	  
-  	}
---- 3766,3770 ----
-  
-  	case '\\':
-! 	  if (*string++ == 0)
-  	    return (0);	 	  
-  	}
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-004 b/source/a/bash/bash-5.0-patches/bash50-004
deleted file mode 100644
index fe3c764bd..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-004
+++ /dev/null
@@ -1,53 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-004
-
-Bug-Reported-by:	Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Bug-Reference-ID:	<87lg0g8aiw.fsf@fifthhorseman.net>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2019-04/msg00076.html
-
-Bug-Description:
-
-In bash-5.0, the `wait' builtin without arguments waits for all children of the
-shell. This includes children it `inherited' at shell invocation time. This
-patch modifies the behavior to not wait for these inherited children, some
-of which might be long-lived.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/jobs.c	2018-12-06 11:44:34.000000000 -0500
---- jobs.c	2019-04-12 15:15:10.000000000 -0400
-***************
-*** 2489,2496 ****
-    wait_procsubs ();
-    reap_procsubs ();
-! #if 1
-    /* We don't want to wait indefinitely if we have stopped children. */
--   /* XXX - should add a loop that goes through the list of process
--      substitutions and waits for each proc in turn before this code. */
-    if (any_stopped == 0)
-      {
---- 2490,2495 ----
-    wait_procsubs ();
-    reap_procsubs ();
-! #if 0
-    /* We don't want to wait indefinitely if we have stopped children. */
-    if (any_stopped == 0)
-      {
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-005 b/source/a/bash/bash-5.0-patches/bash50-005
deleted file mode 100644
index 9b1cd75b0..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-005
+++ /dev/null
@@ -1,110 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-005
-
-Bug-Reported-by:	Brad Spencer <bspencer@blackberry.com>
-Bug-Reference-ID:	<1b993ff2-ce4f-662a-6be4-393457362e47@blackberry.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2019-01/msg00250.html
-
-Bug-Description:
-
-In certain cases, bash optimizes out a fork() call too early and prevents
-traps from running.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/command.h	2018-07-20 21:16:31.000000000 -0400
---- command.h	2019-02-20 11:09:36.000000000 -0500
-***************
-*** 187,190 ****
---- 188,192 ----
-  #define CMD_LASTPIPE	    0x2000
-  #define CMD_STDPATH	    0x4000	/* use standard path for command lookup */
-+ #define CMD_TRY_OPTIMIZING  0x8000	/* try to optimize this simple command */
-  
-  /* What a command looks like. */
-*** ../bash-5.0-patched/builtins/evalstring.c	2018-12-26 11:19:21.000000000 -0500
---- builtins/evalstring.c	2019-01-29 14:15:19.000000000 -0500
-***************
-*** 101,104 ****
---- 101,113 ----
-  }
-  
-+ int
-+ can_optimize_connection (command)
-+      COMMAND *command;
-+ {
-+   return (*bash_input.location.string == '\0' &&
-+ 	  (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
-+ 	  command->value.Connection->second->type == cm_simple);
-+ }
-+ 
-  void
-  optimize_fork (command)
-***************
-*** 106,110 ****
-  {
-    if (command->type == cm_connection &&
-!       (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR) &&
-        should_suppress_fork (command->value.Connection->second))
-      {
---- 115,120 ----
-  {
-    if (command->type == cm_connection &&
-!       (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
-!       (command->value.Connection->second->flags & CMD_TRY_OPTIMIZING) &&
-        should_suppress_fork (command->value.Connection->second))
-      {
-***************
-*** 413,418 ****
-  		  command->value.Simple->flags |= CMD_NO_FORK;
-  		}
-! 	      else if (command->type == cm_connection)
-! 		optimize_fork (command);
-  #endif /* ONESHOT */
-  
---- 423,438 ----
-  		  command->value.Simple->flags |= CMD_NO_FORK;
-  		}
-! 
-! 	      /* Can't optimize forks out here execept for simple commands.
-! 		 This knows that the parser sets up commands as left-side heavy
-! 		 (&& and || are left-associative) and after the single parse,
-! 		 if we are at the end of the command string, the last in a
-! 		 series of connection commands is
-! 		 command->value.Connection->second. */
-! 	      else if (command->type == cm_connection && can_optimize_connection (command))
-! 		{
-! 		  command->value.Connection->second->flags |= CMD_TRY_OPTIMIZING;
-! 		  command->value.Connection->second->value.Simple->flags |= CMD_TRY_OPTIMIZING;
-! 		}
-  #endif /* ONESHOT */
-  
-*** ../bash-5.0-patched/execute_cmd.c	2018-12-05 09:05:14.000000000 -0500
---- execute_cmd.c	2019-01-25 15:59:00.000000000 -0500
-***************
-*** 2768,2771 ****
---- 2768,2773 ----
-  	   (exec_result != EXECUTION_SUCCESS)))
-  	{
-+ 	  optimize_fork (command);
-+ 
-  	  second = command->value.Connection->second;
-  	  if (ignore_return && second)
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-006 b/source/a/bash/bash-5.0-patches/bash50-006
deleted file mode 100644
index 2ad1cd200..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-006
+++ /dev/null
@@ -1,47 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-006
-
-Bug-Reported-by:	Tomas Mozes <hydrapolic@gmail.com>
-Bug-Reference-ID:	<CAG6MAzQumLU2vhnmr1UrYAUQAFW5Yo8hfM_sEibX9RJQWJkRrA@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2019-03/msg00037.html
-
-Bug-Description:
-
-Bash-5.0 did not build successfully if SYSLOG_HISTORY was defined without
-also defining SYSLOG_SHOPT.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/builtins/shopt.def	2018-10-05 14:49:02.000000000 -0400
---- builtins/shopt.def	2019-01-23 09:55:22.000000000 -0500
-***************
-*** 123,127 ****
-  #endif
-  
-! #if defined (SYSLOG_HISTORY) && defined (SYSLOG_SHOPT)
-  extern int syslog_history;
-  #endif
---- 123,127 ----
-  #endif
-  
-! #if defined (SYSLOG_HISTORY)
-  extern int syslog_history;
-  #endif
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-007 b/source/a/bash/bash-5.0-patches/bash50-007
deleted file mode 100644
index b9eb4150a..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-007
+++ /dev/null
@@ -1,62 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-007
-
-Bug-Reported-by:	Grisha Levit <grishalevit@gmail.com>
-Bug-Reference-ID:	<CAMu=BroHapG1AS3xB5SQaCX2XKu=-E2Ob9uW6LNuHvd=YohrDw@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2019-02/msg00067.html
-
-Bug-Description:
-
-Running `exec' when job control was disabled, even temporarily, but after it
-had been initialized, could leave the terminal in the wrong process group for
-the executed process.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/jobs.c	2018-12-06 11:44:34.000000000 -0500
---- jobs.c	2019-04-12 15:15:10.000000000 -0400
-***************
-*** 4838,4850 ****
-  {
-    if (job_control)
-!     {
-!       terminate_stopped_jobs ();
-  
-!       if (original_pgrp >= 0)
-! 	give_terminal_to (original_pgrp, 1);
-!     }
-  
-!   if (original_pgrp >= 0)
-!     setpgid (0, original_pgrp);
-  }
-  
---- 4838,4848 ----
-  {
-    if (job_control)
-!     terminate_stopped_jobs ();
-  
-!   if (original_pgrp >= 0 && terminal_pgrp != original_pgrp)
-!     give_terminal_to (original_pgrp, 1);
-  
-!   if (original_pgrp >= 0 && setpgid (0, original_pgrp) == 0)
-!     shell_pgrp = original_pgrp;
-  }
-  
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-008 b/source/a/bash/bash-5.0-patches/bash50-008
deleted file mode 100644
index b09d6b33a..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-008
+++ /dev/null
@@ -1,68 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-008
-
-Bug-Reported-by:	Michael Albinus <michael.albinus@gmx.de>
-Bug-Reference-ID:	<87bm36k3kz.fsf@gmx.de>
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00111.html
-
-Bug-Description:
-
-When HISTSIZE is set to 0, history expansion can leave the history length
-set to an incorrect value, leading to subsequent attempts to access invalid
-memory.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/bashhist.c	2018-07-05 22:41:14.000000000 -0400
---- bashhist.c	2019-02-20 16:20:04.000000000 -0500
-***************
-*** 561,573 ****
-    if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
-      {
-        /* If we are expanding the second or later line of a multi-line
-  	 command, decrease history_length so references to history expansions
-  	 in these lines refer to the previous history entry and not the
-  	 current command. */
-        if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
-          history_length--;
-        expanded = history_expand (line, &history_value);
-        if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
-!         history_length++;
-  
-        if (expanded)
---- 561,576 ----
-    if (!history_expansion_inhibited && history_expansion && history_expansion_p (line))
-      {
-+       int old_len;
-+ 
-        /* If we are expanding the second or later line of a multi-line
-  	 command, decrease history_length so references to history expansions
-  	 in these lines refer to the previous history entry and not the
-  	 current command. */
-+       old_len = history_length;
-        if (history_length > 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
-          history_length--;
-        expanded = history_expand (line, &history_value);
-        if (history_length >= 0 && command_oriented_history && current_command_first_line_saved && current_command_line_count > 1)
-!         history_length = old_len;
-  
-        if (expanded)
-
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-009 b/source/a/bash/bash-5.0-patches/bash50-009
deleted file mode 100644
index aef4ce7b5..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-009
+++ /dev/null
@@ -1,42 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-009
-
-Bug-Reported-by:	chet.ramey@case.edu
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-The history file reading code doesn't close the file descriptor open to
-the history file when it encounters a zero-length file.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/lib/readline/histfile.c	2018-06-11 09:14:52.000000000 -0400
---- lib/readline/histfile.c	2019-05-16 15:55:57.000000000 -0400
-***************
-*** 306,309 ****
---- 312,316 ----
-      {
-        free (input);
-+       close (file);
-        return 0;	/* don't waste time if we don't have to */
-      }
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 9
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-010 b/source/a/bash/bash-5.0-patches/bash50-010
deleted file mode 100644
index bac7aa925..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-010
+++ /dev/null
@@ -1,172 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-010
-
-Bug-Reported-by:	Thorsten Glaser <tg@mirbsd.de>
-Bug-Reference-ID:	<156622962831.19438.16374961114836556294.reportbug@tglase.lan.tarent.de>
-Bug-Reference-URL:	https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935115
-
-Bug-Description:
-
-Bash-5.0 changed the way assignment statements preceding special builtins
-and shell functions were handled in posix mode. They automatically created
-or modified global variables instead of modifying existing local variables
-as in bash-4.4.
-
-The bash-4.4 posix-mode semantics were buggy, and resulted in creating
-local variables where they were not intended and modifying global variables
-and local variables simultaneously.
-
-The bash-5.0 changes were intended to fix this issue, but did not preserve
-enough backwards compatibility. The posix standard also changed what it
-required in these cases, so bash-5.0 is not bound by the strict conformance
-requirements that existed in previous issues of the standard.
-
-This patch modifies the bash-5.0 posix mode behavior in an effort to restore
-some backwards compatibility and rationalize the behavior in the presence of
-local variables. It
-
-1. Changes the assignment semantics to be more similar to standalone assignment
-   statements: assignments preceding a function call or special builtin while
-   executing in a shell function will modify the value of a local variable
-   with the same name for the duration of the function's execution;
-
-2. Changes assignments preceding shell function calls or special builtins
-   from within a shell function to no longer create or modify global variables
-   in the presence of a local variable with the same name;
-
-3. Assignment statements preceding a shell function call or special builtin
-   at the global scope continue to modify the (global) calling environment,
-   but are unaffected by assignments preceding function calls or special
-   builtins within a function, as described in item 2. This is also similar
-   to the behavior of a standalone assignment statement.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/variables.c	2018-12-18 11:07:21.000000000 -0500
---- variables.c	2019-08-22 10:53:44.000000000 -0400
-***************
-*** 4461,4467 ****
-  
-  /* Take a variable from an assignment statement preceding a posix special
-!    builtin (including `return') and create a global variable from it. This
-!    is called from merge_temporary_env, which is only called when in posix
-!    mode. */
-  static void
-  push_posix_temp_var (data)
---- 4461,4467 ----
-  
-  /* Take a variable from an assignment statement preceding a posix special
-!    builtin (including `return') and create a variable from it as if a
-!    standalone assignment statement had been performed. This is called from
-!    merge_temporary_env, which is only called when in posix mode. */
-  static void
-  push_posix_temp_var (data)
-***************
-*** 4473,4486 ****
-    var = (SHELL_VAR *)data;
-  
-!   binding_table = global_variables->table;
-!   if (binding_table == 0)
-!     binding_table = global_variables->table = hash_create (VARIABLES_HASH_BUCKETS);
-! 
-!   v = bind_variable_internal (var->name, value_cell (var), binding_table, 0, ASS_FORCE|ASS_NOLONGJMP);
-  
-    /* global variables are no longer temporary and don't need propagating. */
-!   var->attributes &= ~(att_tempvar|att_propagate);
-    if (v)
-!     v->attributes |= var->attributes;
-  
-    if (find_special_var (var->name) >= 0)
---- 4473,4497 ----
-    var = (SHELL_VAR *)data;
-  
-!   /* Just like do_assignment_internal(). This makes assignments preceding
-!      special builtins act like standalone assignment statements when in
-!      posix mode, satisfying the posix requirement that this affect the
-!      "current execution environment." */
-!   v = bind_variable (var->name, value_cell (var), ASS_FORCE|ASS_NOLONGJMP);
-! 
-!   /* If this modifies an existing local variable, v->context will be non-zero.
-!      If it comes back with v->context == 0, we bound at the global context.
-!      Set binding_table appropriately. It doesn't matter whether it's correct
-!      if the variable is local, only that it's not global_variables->table */
-!   binding_table = v->context ? shell_variables->table : global_variables->table;
-  
-    /* global variables are no longer temporary and don't need propagating. */
-!   if (binding_table == global_variables->table)
-!     var->attributes &= ~(att_tempvar|att_propagate);
-! 
-    if (v)
-!     {
-!       v->attributes |= var->attributes;
-!       v->attributes &= ~att_tempvar;	/* not a temp var now */
-!     }
-  
-    if (find_special_var (var->name) >= 0)
-***************
-*** 4576,4587 ****
-  {
-    int i;
-  
-    tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1);
-    tempvar_list[tvlist_ind = 0] = 0;
-!     
-!   hash_flush (temporary_env, pushf);
-!   hash_dispose (temporary_env);
-    temporary_env = (HASH_TABLE *)NULL;
-  
-    tempvar_list[tvlist_ind] = 0;
-  
---- 4587,4601 ----
-  {
-    int i;
-+   HASH_TABLE *disposer;
-  
-    tempvar_list = strvec_create (HASH_ENTRIES (temporary_env) + 1);
-    tempvar_list[tvlist_ind = 0] = 0;
-! 
-!   disposer = temporary_env;
-    temporary_env = (HASH_TABLE *)NULL;
-  
-+   hash_flush (disposer, pushf);
-+   hash_dispose (disposer);
-+ 
-    tempvar_list[tvlist_ind] = 0;
-  
-*** ../bash-5.0-patched/tests/varenv.right	2018-12-17 15:39:48.000000000 -0500
---- tests/varenv.right	2019-08-22 16:05:25.000000000 -0400
-***************
-*** 147,153 ****
-  outside: declare -- var="one"
-  inside: declare -x var="value"
-! outside: declare -x var="value"
-! inside: declare -- var="local"
-! outside: declare -x var="global"
-  foo=<unset> environment foo=
-  foo=foo environment foo=foo
---- 147,153 ----
-  outside: declare -- var="one"
-  inside: declare -x var="value"
-! outside: declare -- var="outside"
-! inside: declare -x var="global"
-! outside: declare -- var="outside"
-  foo=<unset> environment foo=
-  foo=foo environment foo=foo
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 9
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 10
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-011 b/source/a/bash/bash-5.0-patches/bash50-011
deleted file mode 100644
index a9ae690e0..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-011
+++ /dev/null
@@ -1,59 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-011
-
-Bug-Reported-by:	Matt Whitlock
-Bug-Reference-ID:	
-Bug-Reference-URL:	https://savannah.gnu.org/support/?109671
-
-Bug-Description:
-
-The conditional command did not perform appropriate quoted null character
-removal on its arguments, causing syntax errors and attempts to stat
-invalid pathnames.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/subst.c	2018-12-22 17:43:37.000000000 -0500
---- subst.c	2019-04-14 13:25:41.000000000 -0400
-***************
-*** 3626,3630 ****
-     SPECIAL is 2, this is an rhs argument for the =~ operator, and should
-     be quoted appropriately for regcomp/regexec.  The caller is responsible
-!    for removing the backslashes if the unquoted word is needed later. */   
-  char *
-  cond_expand_word (w, special)
---- 3642,3648 ----
-     SPECIAL is 2, this is an rhs argument for the =~ operator, and should
-     be quoted appropriately for regcomp/regexec.  The caller is responsible
-!    for removing the backslashes if the unquoted word is needed later. In
-!    any case, since we don't perform word splitting, we need to do quoted
-!    null character removal. */
-  char *
-  cond_expand_word (w, special)
-***************
-*** 3647,3650 ****
---- 3665,3670 ----
-        if (special == 0)			/* LHS */
-  	{
-+ 	  if (l->word)
-+ 	    word_list_remove_quoted_nulls (l);
-  	  dequote_list (l);
-  	  r = string_list (l);
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 10
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 11
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-012 b/source/a/bash/bash-5.0-patches/bash50-012
deleted file mode 100644
index 7470e7665..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-012
+++ /dev/null
@@ -1,64 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-012
-
-Bug-Reported-by:	lessbug@qq.com
-Bug-Reference-ID:	<tencent_6AA531D9A5CC4121D86BD5CDA2E0DA98C605@qq.com>
-Bug-Reference-URL:
-
-Bug-Description:
-
-When using previous-history to go back beyond the beginning of the history list,
-it's possible to move to an incorrect partial line.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/lib/readline/misc.c	2017-07-07 17:30:12.000000000 -0400
---- lib/readline/misc.c	2019-05-16 11:43:46.000000000 -0400
-***************
-*** 577,580 ****
---- 590,594 ----
-  {
-    HIST_ENTRY *old_temp, *temp;
-+   int had_saved_line;
-  
-    if (count < 0)
-***************
-*** 589,592 ****
---- 603,607 ----
-  
-    /* If we don't have a line saved, then save this one. */
-+   had_saved_line = _rl_saved_line_for_history != 0;
-    rl_maybe_save_line ();
-  
-***************
-*** 612,616 ****
-    if (temp == 0)
-      {
-!       rl_maybe_unsave_line ();
-        rl_ding ();
-      }
---- 627,632 ----
-    if (temp == 0)
-      {
-!       if (had_saved_line == 0)
-!         _rl_free_saved_history_line ();
-        rl_ding ();
-      }
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 11
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 12
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-013 b/source/a/bash/bash-5.0-patches/bash50-013
deleted file mode 100644
index e44fdb505..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-013
+++ /dev/null
@@ -1,73 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-013
-
-Bug-Reported-by:	HIROSE Masaaki <hirose31@gmail.com>
-Bug-Reference-ID:	<CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com>
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html
-
-Bug-Description:
-
-Reading history entries with timestamps can result in history entries joined
-by linefeeds.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/lib/readline/histfile.c	2018-06-11 09:14:52.000000000 -0400
---- lib/readline/histfile.c	2019-05-16 15:55:57.000000000 -0400
-***************
-*** 370,376 ****
-  
-    has_timestamps = HIST_TIMESTAMP_START (buffer);
-!   history_multiline_entries += has_timestamps && history_write_timestamps;  
-  
-    /* Skip lines until we are at FROM. */
-    for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
-      if (*line_end == '\n')
---- 370,378 ----
-  
-    has_timestamps = HIST_TIMESTAMP_START (buffer);
-!   history_multiline_entries += has_timestamps && history_write_timestamps;
-  
-    /* Skip lines until we are at FROM. */
-+   if (has_timestamps)
-+     last_ts = buffer;
-    for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
-      if (*line_end == '\n')
-***************
-*** 381,385 ****
---- 383,398 ----
-  	if (HIST_TIMESTAMP_START(p) == 0)
-  	  current_line++;
-+ 	else
-+ 	  last_ts = p;
-  	line_start = p;
-+ 	/* If we are at the last line (current_line == from) but we have
-+ 	   timestamps (has_timestamps), then line_start points to the
-+ 	   text of the last command, and we need to skip to its end. */
-+ 	if (current_line >= from && has_timestamps)
-+ 	  {
-+ 	    for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++)
-+ 	      ;
-+ 	    line_start = (*line_end == '\n') ? line_end + 1 : line_end;
-+ 	  }
-        }
-  
-
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 12
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 13
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-014 b/source/a/bash/bash-5.0-patches/bash50-014
deleted file mode 100644
index 6cb49aae7..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-014
+++ /dev/null
@@ -1,52 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-014
-
-Bug-Reported-by:	Johannes Hielscher <jhielscher@posteo.de>
-Bug-Reference-ID:	<20190208205048.77c25a83@hordevm>
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-02/msg00032.html
-
-Bug-Description:
-
-If the current line is empty, using the emacs C-xC-e binding to enter the
-editor will edit the previous command instead of the current (empty) one.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/bashline.c	2019-01-16 16:13:21.000000000 -0500
---- bashline.c	2019-02-11 11:18:57.000000000 -0500
-***************
-*** 962,970 ****
-  	 finished with the command, so we should not ignore the last command */
-        using_history ();
-!       if (rl_line_buffer[0])
-! 	{
-! 	  current_command_line_count++;	/* for rl_newline above */
-! 	  bash_add_history (rl_line_buffer);
-! 	}
-        current_command_line_count = 0;	/* for dummy history entry */
-        bash_add_history ("");
---- 965,970 ----
-  	 finished with the command, so we should not ignore the last command */
-        using_history ();
-!       current_command_line_count++;	/* for rl_newline above */
-!       bash_add_history (rl_line_buffer);
-        current_command_line_count = 0;	/* for dummy history entry */
-        bash_add_history ("");
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 13
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 14
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-015 b/source/a/bash/bash-5.0-patches/bash50-015
deleted file mode 100644
index ff6e5e69d..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-015
+++ /dev/null
@@ -1,78 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-015
-
-Bug-Reported-by:	Yu Kou <ckyoog@gmail.com>
-Bug-Reference-ID:	<CAAqoF9Ko3nAShJXGzucafs-ByUagzZ4nbQonwEkwC7s9UqfWKw@mail.gmail.com>
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00032.html
-
-Bug-Description:
-
-If alias expansion is enabled when processing the command argument to the
-`-c' option, an alias is defined in that command, and the command ends with
-the invocation of that alias, the shell's command parser can prematurely
-terminate before the entire command is executed.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-20190426/builtins/evalstring.c	2019-01-29 14:15:19.000000000 -0500
---- builtins/evalstring.c	2019-05-15 14:19:36.000000000 -0400
-***************
-*** 92,95 ****
---- 92,96 ----
-  	  running_trap == 0 &&
-  	  *bash_input.location.string == '\0' &&
-+ 	  parser_expanding_alias () == 0 &&
-  	  command->type == cm_simple &&
-  	  signal_is_trapped (EXIT_TRAP) == 0 &&
-***************
-*** 106,109 ****
---- 107,111 ----
-  {
-    return (*bash_input.location.string == '\0' &&
-+ 	  parser_expanding_alias () == 0 &&
-  	  (command->value.Connection->connector == AND_AND || command->value.Connection->connector == OR_OR || command->value.Connection->connector == ';') &&
-  	  command->value.Connection->second->type == cm_simple);
-***************
-*** 291,295 ****
-    with_input_from_string (string, from_file);
-    clear_shell_input_line ();
-!   while (*(bash_input.location.string))
-      {
-        command = (COMMAND *)NULL;
---- 293,297 ----
-    with_input_from_string (string, from_file);
-    clear_shell_input_line ();
-!   while (*(bash_input.location.string) || parser_expanding_alias ())
-      {
-        command = (COMMAND *)NULL;
-***************
-*** 546,550 ****
-  
-    with_input_from_string (string, from_file);
-!   while (*(bash_input.location.string))
-      {
-        command = (COMMAND *)NULL;
---- 548,552 ----
-  
-    with_input_from_string (string, from_file);
-!   while (*(bash_input.location.string))		/* XXX - parser_expanding_alias () ? */
-      {
-        command = (COMMAND *)NULL;
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 14
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 15
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-016 b/source/a/bash/bash-5.0-patches/bash50-016
deleted file mode 100644
index 87f232d7a..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-016
+++ /dev/null
@@ -1,58 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-016
-
-Bug-Reported-by:	sunnycemetery@gmail.com
-Bug-Reference-ID:	<20190316041534.GB22884@midnight>
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-03/msg00070.html
-
-Bug-Description:
-
-Bash waits too long to reap /dev/fd process substitutions used as redirections
-with loops and group commands, which can lead to file descriptor exhaustion.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/execute_cmd.c	2019-04-19 15:46:36.000000000 -0400
---- execute_cmd.c	2019-07-01 16:45:49.000000000 -0400
-***************
-*** 1104,1107 ****
---- 1085,1104 ----
-        discard_unwind_frame ("internal_fifos");
-      }
-+ # if defined (HAVE_DEV_FD)
-+   /* Reap process substitutions at the end of loops */
-+   switch (command->type)
-+     {
-+     case cm_while:
-+     case cm_until:
-+     case cm_for:
-+     case cm_group:
-+ #    if defined (ARITH_FOR_COMMAND)
-+     case cm_arith_for:
-+ #    endif
-+       reap_procsubs ();
-+     default:
-+       break;
-+     }
-+ #  endif /* HAVE_DEV_FD */
-  #endif
-  
-
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 15
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 16
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-017 b/source/a/bash/bash-5.0-patches/bash50-017
deleted file mode 100644
index adfcb6a86..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-017
+++ /dev/null
@@ -1,289 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-017
-
-Bug-Reported-by:	Valentin Lab <valentin.lab@kalysto.org>
-Bug-Reference-ID:	<ab981b9c-60a5-46d0-b7e6-a6d88b80df50@kalysto.org>
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2020-03/msg00062.html
-
-Bug-Description:
-
-There were cases where patch 16 reaped process substitution file descriptors
-(or FIFOs) and processes to early. This is a better fix for the problem that
-bash50-016 attempted to solve.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0-patched/subst.c	2019-08-29 11:16:49.000000000 -0400
---- subst.c	2020-04-02 16:24:19.000000000 -0400
-***************
-*** 5337,5341 ****
-  }
-  
-! char *
-  copy_fifo_list (sizep)
-       int *sizep;
---- 5337,5341 ----
-  }
-  
-! void *
-  copy_fifo_list (sizep)
-       int *sizep;
-***************
-*** 5343,5347 ****
-    if (sizep)
-      *sizep = 0;
-!   return (char *)NULL;
-  }
-  
---- 5343,5347 ----
-    if (sizep)
-      *sizep = 0;
-!   return (void *)NULL;
-  }
-  
-***************
-*** 5409,5414 ****
-  	if (fifo_list[i].file)
-  	  {
-! 	    fifo_list[j].file = fifo_list[i].file;
-! 	    fifo_list[j].proc = fifo_list[i].proc;
-  	    j++;
-  	  }
---- 5409,5419 ----
-  	if (fifo_list[i].file)
-  	  {
-! 	    if (i != j)
-! 	      {
-! 		fifo_list[j].file = fifo_list[i].file;
-! 		fifo_list[j].proc = fifo_list[i].proc;
-! 		fifo_list[i].file = (char *)NULL;
-! 		fifo_list[i].proc = 0;
-! 	      }
-  	    j++;
-  	  }
-***************
-*** 5426,5433 ****
-  void
-  close_new_fifos (list, lsize)
-!      char *list;
-       int lsize;
-  {
-    int i;
-  
-    if (list == 0)
---- 5431,5439 ----
-  void
-  close_new_fifos (list, lsize)
-!      void *list;
-       int lsize;
-  {
-    int i;
-+   char *plist;
-  
-    if (list == 0)
-***************
-*** 5437,5442 ****
-      }
-  
-!   for (i = 0; i < lsize; i++)
-!     if (list[i] == 0 && i < fifo_list_size && fifo_list[i].proc != -1)
-        unlink_fifo (i);
-  
---- 5443,5448 ----
-      }
-  
-!   for (plist = (char *)list, i = 0; i < lsize; i++)
-!     if (plist[i] == 0 && i < fifo_list_size && fifo_list[i].proc != -1)
-        unlink_fifo (i);
-  
-***************
-*** 5560,5568 ****
-  }
-  
-! char *
-  copy_fifo_list (sizep)
-       int *sizep;
-  {
-!   char *ret;
-  
-    if (nfds == 0 || totfds == 0)
---- 5566,5574 ----
-  }
-  
-! void *
-  copy_fifo_list (sizep)
-       int *sizep;
-  {
-!   void *ret;
-  
-    if (nfds == 0 || totfds == 0)
-***************
-*** 5570,5579 ****
-        if (sizep)
-  	*sizep = 0;
-!       return (char *)NULL;
-      }
-  
-    if (sizep)
-      *sizep = totfds;
-!   ret = (char *)xmalloc (totfds * sizeof (pid_t));
-    return (memcpy (ret, dev_fd_list, totfds * sizeof (pid_t)));
-  }
---- 5576,5585 ----
-        if (sizep)
-  	*sizep = 0;
-!       return (void *)NULL;
-      }
-  
-    if (sizep)
-      *sizep = totfds;
-!   ret = xmalloc (totfds * sizeof (pid_t));
-    return (memcpy (ret, dev_fd_list, totfds * sizeof (pid_t)));
-  }
-***************
-*** 5648,5655 ****
-  void
-  close_new_fifos (list, lsize)
-!      char *list;
-       int lsize;
-  {
-    int i;
-  
-    if (list == 0)
---- 5654,5662 ----
-  void
-  close_new_fifos (list, lsize)
-!      void *list;
-       int lsize;
-  {
-    int i;
-+   pid_t *plist;
-  
-    if (list == 0)
-***************
-*** 5659,5664 ****
-      }
-  
-!   for (i = 0; i < lsize; i++)
-!     if (list[i] == 0 && i < totfds && dev_fd_list[i])
-        unlink_fifo (i);
-  
---- 5666,5671 ----
-      }
-  
-!   for (plist = (pid_t *)list, i = 0; i < lsize; i++)
-!     if (plist[i] == 0 && i < totfds && dev_fd_list[i])
-        unlink_fifo (i);
-  
-*** ../bash-5.0-patched/subst.h	2018-10-21 18:46:09.000000000 -0400
---- subst.h	2020-04-02 16:29:28.000000000 -0400
-***************
-*** 274,280 ****
-  extern void unlink_fifo __P((int));
-  
-! extern char *copy_fifo_list __P((int *));
-! extern void unlink_new_fifos __P((char *, int));
-! extern void close_new_fifos __P((char *, int));
-  
-  extern void clear_fifo_list __P((void));
---- 274,279 ----
-  extern void unlink_fifo __P((int));
-  
-! extern void *copy_fifo_list __P((int *));
-! extern void close_new_fifos __P((void *, int));
-  
-  extern void clear_fifo_list __P((void));
-*** ../bash-5.0-patched/execute_cmd.c	2020-02-06 20:16:48.000000000 -0500
---- execute_cmd.c	2020-04-02 17:00:10.000000000 -0400
-***************
-*** 565,569 ****
-  #if defined (PROCESS_SUBSTITUTION)
-    volatile int ofifo, nfifo, osize, saved_fifo;
-!   volatile char *ofifo_list;
-  #endif
-  
---- 565,569 ----
-  #if defined (PROCESS_SUBSTITUTION)
-    volatile int ofifo, nfifo, osize, saved_fifo;
-!   volatile void *ofifo_list;
-  #endif
-  
-***************
-*** 751,760 ****
-  #  endif
-  
-!   if (variable_context != 0)	/* XXX - also if sourcelevel != 0? */
-      {
-        ofifo = num_fifos ();
-        ofifo_list = copy_fifo_list ((int *)&osize);
-        begin_unwind_frame ("internal_fifos");
-!       add_unwind_protect (xfree, ofifo_list);
-        saved_fifo = 1;
-      }
---- 751,762 ----
-  #  endif
-  
-!   /* XXX - also if sourcelevel != 0? */
-!   if (variable_context != 0)
-      {
-        ofifo = num_fifos ();
-        ofifo_list = copy_fifo_list ((int *)&osize);
-        begin_unwind_frame ("internal_fifos");
-!       if (ofifo_list)
-! 	add_unwind_protect (xfree, ofifo_list);
-        saved_fifo = 1;
-      }
-***************
-*** 1100,1123 ****
-        nfifo = num_fifos ();
-        if (nfifo > ofifo)
-! 	close_new_fifos ((char *)ofifo_list, osize);
-        free ((void *)ofifo_list);
-        discard_unwind_frame ("internal_fifos");
-      }
-- # if defined (HAVE_DEV_FD)
--   /* Reap process substitutions at the end of loops */
--   switch (command->type)
--     {
--     case cm_while:
--     case cm_until:
--     case cm_for:
--     case cm_group:
-- #    if defined (ARITH_FOR_COMMAND)
--     case cm_arith_for:
-- #    endif
--       reap_procsubs ();
--     default:
--       break;
--     }
-- #  endif /* HAVE_DEV_FD */
-  #endif
-  
---- 1102,1109 ----
-        nfifo = num_fifos ();
-        if (nfifo > ofifo)
-! 	close_new_fifos ((void *)ofifo_list, osize);
-        free ((void *)ofifo_list);
-        discard_unwind_frame ("internal_fifos");
-      }
-  #endif
-  
-
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 16
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 17
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.0-patches/bash50-018 b/source/a/bash/bash-5.0-patches/bash50-018
deleted file mode 100644
index 6f1b1c7ca..000000000
--- a/source/a/bash/bash-5.0-patches/bash50-018
+++ /dev/null
@@ -1,45 +0,0 @@
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	5.0
-Patch-ID:	bash50-018
-
-Bug-Reported-by:	oguzismailuysal@gmail.com
-Bug-Reference-ID:
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-10/msg00098.html
-
-Bug-Description:
-
-In certain cases, bash does not perform quoted null removal on patterns
-that are used as part of word expansions such as ${parameter##pattern}, so
-empty patterns are treated as non-empty.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-5.0.17/subst.c	2020-04-02 17:14:58.000000000 -0400
---- subst.c	2020-07-09 15:28:19.000000000 -0400
-***************
-*** 5113,5116 ****
---- 5113,5118 ----
-  				      (int *)NULL, (int *)NULL)
-  	     : (WORD_LIST *)0;
-+   if (l)
-+     word_list_remove_quoted_nulls (l);
-    pat = string_list (l);
-    dispose_words (l);
-
-*** ../bash-5.0/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 17
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 18
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/testing/source/vtown/deps/dbus/dbus-enable-elogind.patch b/source/a/dbus/dbus-enable-elogind.patch
index 5cb5d649c..5cb5d649c 100644
--- a/testing/source/vtown/deps/dbus/dbus-enable-elogind.patch
+++ b/source/a/dbus/dbus-enable-elogind.patch
diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild
index b9bc9b789..bb17338b4 100755
--- a/source/a/dbus/dbus.SlackBuild
+++ b/source/a/dbus/dbus.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # Copyright 2007-2010  Robby Workman, Northport, Alabama, USA
-# Copyright 2007-2018  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007-2020  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2020  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dbus
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -78,6 +79,9 @@ find . \
  -exec chmod 644 {} \+
 
 zcat $CWD/dbus-1.12.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/dbus-enable-elogind.patch.gz | patch -p1 --verbose || exit 1
+
+NOCONFIGURE=1 ./autogen.sh || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -86,15 +90,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --runstatedir=/var/run \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --disable-doxygen-docs \
+  --disable-apparmor \
+  --disable-selinux \
   --enable-shared=yes \
   --enable-static=no \
   --enable-inotify \
+  --enable-user-session \
   --enable-x11-autolaunch \
+  --enable-elogind \
+  --disable-systemd \
+  --without-systemdsystemunitdir \
   --with-system-pid-file=/var/run/dbus/dbus.pid \
   --with-system-socket=/var/run/dbus/system_bus_socket \
   --with-console-auth-dir=/var/run/console \
@@ -153,4 +162,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/testing/source/vtown/deps/elogind/doinst.sh b/source/a/elogind/doinst.sh
index dc85465c8..dc85465c8 100644
--- a/testing/source/vtown/deps/elogind/doinst.sh
+++ b/source/a/elogind/doinst.sh
diff --git a/testing/source/vtown/deps/elogind/elogind-polkit.patch b/source/a/elogind/elogind-polkit.patch
index 4d91b9817..4d91b9817 100644
--- a/testing/source/vtown/deps/elogind/elogind-polkit.patch
+++ b/source/a/elogind/elogind-polkit.patch
diff --git a/testing/source/vtown/deps/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild
index abe6fefb6..1e0e0e3bb 100755
--- a/testing/source/vtown/deps/elogind/elogind.SlackBuild
+++ b/source/a/elogind/elogind.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=elogind
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/elogind/elogind.url b/source/a/elogind/elogind.url
index b8940789e..b8940789e 100644
--- a/testing/source/vtown/deps/elogind/elogind.url
+++ b/source/a/elogind/elogind.url
diff --git a/testing/source/vtown/deps/elogind/rc.elogind b/source/a/elogind/rc.elogind
index 62884784a..62884784a 100644
--- a/testing/source/vtown/deps/elogind/rc.elogind
+++ b/source/a/elogind/rc.elogind
diff --git a/testing/source/vtown/deps/elogind/slack-desc b/source/a/elogind/slack-desc
index 507776d5f..507776d5f 100644
--- a/testing/source/vtown/deps/elogind/slack-desc
+++ b/source/a/elogind/slack-desc
diff --git a/source/a/eudev/0004-Pavilion-13-x360-keys.patch b/source/a/eudev/0004-Pavilion-13-x360-keys.patch
new file mode 100644
index 000000000..d901dea3b
--- /dev/null
+++ b/source/a/eudev/0004-Pavilion-13-x360-keys.patch
@@ -0,0 +1,32 @@
+From 9aadd2bfd66333318461c97cc7744ccdb84c24b5 Mon Sep 17 00:00:00 2001
+From: Max Verevkin <me@maxverevkin.tk>
+Date: Thu, 5 Nov 2020 14:16:32 +0200
+Subject: [PATCH 4/4] Pavilion 13 x360 keys
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ hwdb/60-keyboard.hwdb | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
+index 15f0a970b..b8ffac2b8 100644
+--- a/hwdb/60-keyboard.hwdb
++++ b/hwdb/60-keyboard.hwdb
+@@ -508,6 +508,14 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP*Pavilion*dv7*Notebook*PC:
+  KEYBOARD_KEY_c6=break
+  KEYBOARD_KEY_94=reserved
+ 
++
++# Pavilion 13 x360 (Tablet mode and SYSRQ key)
++evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[pP][aA][vV][iI][lL][iI][oO][nN]*13*x360*:pvr*
++ KEYBOARD_KEY_d9=unknown
++ KEYBOARD_KEY_d7=!f22                                   # touchpad on
++ KEYBOARD_KEY_d2=sysrq                                  # Fn+Print = SYSRQ
++
++
+ # Pavilion and Spectre x360 13 (Prevents random airplane mode activation)
+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[sS][pP][eE][cC][tT][rR][eE]*x360*13*:pvr*
+ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pn*[sS][pP][eE][cC][tT][rR][eE]*x360Convertible*:pvr*
+-- 
+2.29.2
+
diff --git a/source/a/eudev/eudev.SlackBuild b/source/a/eudev/eudev.SlackBuild
index a0fca1ce9..926fe34ef 100755
--- a/source/a/eudev/eudev.SlackBuild
+++ b/source/a/eudev/eudev.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=eudev
 VERSION=${VERSION:-$(echo eudev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -68,6 +68,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
+# One patch from post 3.2.9 git
+zcat $CWD/0004-Pavilion-13-x360-keys.patch.gz | patch -p1 --verbose || exit 1
+
 # Patch 60-cdrom_id.rules to create a full set of symlinks:
 zcat $CWD/60-cdrom_id.rules.diff.gz | patch -p1 --verbose || exit 1
 
diff --git a/source/a/procps-ng/procps-ng.SlackBuild b/source/a/procps-ng/procps-ng.SlackBuild
index 32010ad16..91a5dc0e7 100755
--- a/source/a/procps-ng/procps-ng.SlackBuild
+++ b/source/a/procps-ng/procps-ng.SlackBuild
@@ -27,7 +27,7 @@ VERSION=${VERSION:-3.3.16}
 PSMISCVER=${PSMISCVER:-23.3}
 PROCINFONGVER=${PROCINFONGVER:-2.0.304}
 PROCINFOVER=${PROCINFOVER:-18}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -107,6 +107,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-w-from \
   --disable-kill \
   --without-systemd \
+  --with-elogind \
   --disable-modern-top \
   --build=$ARCH-slackware-linux || exit 1
 
diff --git a/source/ap/cgmanager/cgmanager.SlackBuild b/source/ap/cgmanager/cgmanager.SlackBuild
deleted file mode 100755
index 632166164..000000000
--- a/source/ap/cgmanager/cgmanager.SlackBuild
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/bash
-
-# Copyright 2014, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Matteo Bernardini <ponce@slackbuilds.org> (2014)
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=cgmanager
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
-cd $PKGNAM-$VERSION || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-./bootstrap.sh
-
-# Configure:
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --infodir=/usr/info \
-  --enable-static=no \
-  --with-distro=slackware \
-  --with-pamdir=none \
-  --build=$ARCH-slackware-linux || exit 1
-
-# Build and install:
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Install compat symlink
-mkdir -p $PKG/usr/sbin
-ln -s /usr/libexec/cgmanager/cgm-release-agent $PKG/usr/sbin/cgm-release-agent
-
-# Remove .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-# Remove broken init scripts:
-rm -f $PKG/etc/rc.d/rc.*
-
-# Add good init scripts:
-mkdir -p $PKG/etc/rc.d
-cat $CWD/config/rc.cgmanager > $PKG/etc/rc.d/rc.cgmanager.new
-cat $CWD/config/rc.cgproxy > $PKG/etc/rc.d/rc.cgproxy.new 
-
-# Run cgmanager by default:
-chmod 755 $PKG/etc/rc.d/rc.cgmanager.new
-
-# Make this executable by default as well, so that "rc.cgmanager start" will
-# start cgproxy in a container:
-chmod 755 $PKG/etc/rc.d/rc.cgproxy.new
-
-# No need for these in the package:
-rm -rf $PKG/usr/share/cgmanager/tests
-rmdir --parents $PKG/usr/share/cgmanager 2>/dev/null
-
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
-cp -a \
-  AUTHORS CONTRIBUTING COPYING* MAINTAINERS NEWS README* TODO \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
-
-# Compress and if needed symlink the man pages:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/ap/cgmanager/cgmanager.url b/source/ap/cgmanager/cgmanager.url
deleted file mode 100644
index 3bfd1a37d..000000000
--- a/source/ap/cgmanager/cgmanager.url
+++ /dev/null
@@ -1 +0,0 @@
-https://linuxcontainers.org/cgmanager/downloads/
diff --git a/source/ap/cgmanager/config/rc.cgmanager b/source/ap/cgmanager/config/rc.cgmanager
deleted file mode 100644
index 56f355d61..000000000
--- a/source/ap/cgmanager/config/rc.cgmanager
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# /etc/rc.d/rc.cgmanager - start/stop the cgroup manager
-
-if [ -f /etc/default/cgmanager ]; then
-  # get cgmanager options if specified
-  . /etc/default/cgmanager
-fi
-
-start_cgmanager() {
-  # Kill any existing cgproxy
-  /bin/sh /etc/rc.d/rc.cgproxy stop >/dev/null 2>&1 || true
-  # check whether to start cgproxy or cgmanager
-  if /usr/sbin/cgproxy --check-master; then
-    if [ -x /etc/rc.d/rc.cgproxy -a ! -r /run/cgmanager.pid ]; then
-      NESTED=yes /etc/rc.d/rc.cgproxy start || true && { exit 0; }
-    else
-      # If we are here, either cgmanager is already running (in which case
-      # we don't want to run it again), or rc.cgproxy is not executable
-      # (in which case we don't want to run it).
-      echo "Error:  rc.cgproxy is not executable, or attempting to start multiple instances of cgmanager"
-      exit 1
-    fi
-  fi
-  echo "Starting cgmanager:  /usr/sbin/cgmanager --daemon"
-  /usr/sbin/cgmanager --daemon
-}
-
-stop_cgmanager() {
-  # If the cgmanager stops, the proxy must also stop
-  /bin/sh /etc/rc.d/rc.cgproxy stop >/dev/null 2>&1 || true
-  echo "Stopping cgmanager."
-  /bin/kill $(cat /run/cgmanager.pid 2>/dev/null) 2>/dev/null
-  /usr/bin/pkill --exact /usr/sbin/cgmanager 2>/dev/null
-  rm -f /run/cgmanager.pid
-}
-
-restart_cgmanager() {
-  stop_cgmanager
-  sleep 1
-  start_cgmanager
-}
-
-case "$1" in
-'start')
-  start_cgmanager
-  ;;
-'stop')
-  stop_cgmanager
-  ;;
-'restart')
-  restart_cgmanager
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/source/ap/cgmanager/config/rc.cgproxy b/source/ap/cgmanager/config/rc.cgproxy
deleted file mode 100644
index 59a61b78d..000000000
--- a/source/ap/cgmanager/config/rc.cgproxy
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# /etc/rc.d/rc.cgproxy - start/stop the cgroup proxy manager
-
-if [ -f /etc/default/cgproxy ]; then
-  # get cgproxy options if specified
-  . /etc/default/cgproxy
-fi
-
-start_cgproxy() {
-  # cgproxy should only run on container unless on older kernel
-  if [ -e /proc/self/ns/pid ] && [ "$NESTED" != "yes" ]; then
-    echo "Error:  cgproxy should only run inside containers"
-    exit 0
-  fi
-  echo "Starting cgproxy:  /usr/sbin/cgproxy --daemon"
-  /usr/sbin/cgproxy --daemon
-}
-
-stop_cgproxy() {
-  if ps -C cgproxy | grep -q cgproxy 2>/dev/null ; then
-    echo "Stopping cgproxy."
-    if ! /bin/kill $(cat /run/cgproxy.pid 2>/dev/null) 2>/dev/null ; then
-      sleep 1
-      echo "Sending cgproxy the TERM signal."
-      if ! /usr/bin/pkill --exact -TERM /usr/sbin/cgproxy ; then
-        sleep 5
-        echo "Sending cgproxy the KILL signal."
-        /usr/bin/pkill --exact -KILL /usr/sbin/cgproxy
-        sleep 5
-        if ps -C cgproxy | grep -q cgproxy 2>/dev/null ; then
-          echo "Error:  couldn't stop cgproxy."
-        fi
-      fi
-    fi
-    rm -f /run/cgproxy.pid
-  fi
-}
-
-restart_cgproxy() {
-  stop_cgproxy
-  sleep 1
-  start_cgproxy
-}
-
-case "$1" in
-'start')
-  start_cgproxy
-  ;;
-'stop')
-  stop_cgproxy
-  ;;
-'restart')
-  restart_cgproxy
-  ;;
-*)
-  echo "usage $0 start|stop|restart"
-esac
diff --git a/source/ap/cgmanager/doinst.sh b/source/ap/cgmanager/doinst.sh
deleted file mode 100644
index e12ae79e7..000000000
--- a/source/ap/cgmanager/doinst.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/rc.d/rc.cgmanager.new
-preserve_perms etc/rc.d/rc.cgproxy.new
-
diff --git a/source/ap/cgmanager/slack-desc b/source/ap/cgmanager/slack-desc
deleted file mode 100644
index f60cd2fcf..000000000
--- a/source/ap/cgmanager/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-cgmanager: cgmanager (Control Group manager daemons)
-cgmanager:
-cgmanager: CGManager manages all your cgroups for you through a simple DBus API.
-cgmanager: It's designed to work with nested LXC containers as well as accepting
-cgmanager: unprivileged requests including resolving user namespaces UIDs/GIDs.
-cgmanager:
-cgmanager: The package contains two daemons: cgmanager (which runs on the host),
-cgmanager: and cgproxy (which runs in containers).
-cgmanager:
-cgmanager: Homepage: https://linuxcontainers.org/cgmanager/
-cgmanager:
diff --git a/source/ap/pm-utils/49bluetooth-generic b/source/ap/pm-utils/49bluetooth-generic
deleted file mode 100644
index 1c88f198d..000000000
--- a/source/ap/pm-utils/49bluetooth-generic
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-. "${PM_FUNCTIONS}"
-
-case "$1" in
-  hibernate|suspend)
-    if [ -d /sys/devices/virtual/misc/rfkill -a -x /usr/sbin/rfkill -a -x /etc/rc.d/rc.bluetooth ]; then
-      rfkill block bluetooth
-    fi
-   ;;
-  thaw|resume)
-    if [ -d /sys/devices/virtual/misc/rfkill -a -x /usr/sbin/rfkill -a -x /etc/rc.d/rc.bluetooth ]; then
-      rfkill unblock bluetooth
-    fi
-    ;;
-  *)
-    ;;
-esac
-
diff --git a/source/ap/pm-utils/README.SLACKWARE b/source/ap/pm-utils/README.SLACKWARE
deleted file mode 100644
index 1bbfbfe81..000000000
--- a/source/ap/pm-utils/README.SLACKWARE
+++ /dev/null
@@ -1,134 +0,0 @@
-README.SLACKWARE
-20130512 - rworkman@slackware.com
-
-===============================================================================
-PLEASE READ THIS ENTIRE FILE BEFORE REPORTING PROBLEMS OR ASKING FOR HELP!
-===============================================================================
-
-One of these routines should tell you whether any of the operations
-are supported by your current kernel/userspace at all:
-
-  for i in hibernate suspend suspend-hybrid ; do
-    pm-is-supported --$i \
-      && echo "$i is supported" \
-      || echo "$i is not supported" ;
-  done
-
-  *OR*
-
-  cat /sys/power/state
-
-Assuming they are supported, running "pm-suspend" as root should do a suspend
-to ram, and "pm-hibernate" should suspend to disk. Note that you must have a 
-swap partition (or file, but partition is easier) which is large enough 
-(2x ram is good here) and the relevant initrd lines and such for this to work. 
-If you're not familiar with all of that, don't test pm-hibernate.
-I don't have hardware which supports suspend-hybrid, so I have no idea if/how
-it works at all.
-
-Here's the short version of using suspend to disk:
-
-Stanza in /etc/lilo.conf should look something like this:
-  image = /boot/vmlinuz-generic-smp-3.8.13-smp
-    initrd = /boot/initrd.gz
-    append = "resume=/dev/sda2"
-    root = /dev/sda1
-    label = genericsmp.s
-    read-only
-
-/etc/mkinitrd.conf should look something like this:
-  MODULE_LIST="ext4"
-  ROOTDEV="/dev/sda1"
-  ROOTFS="ext4"
-  RESUMEDEV="/dev/sda2"
-
-mkinitrd command invocation would be this:
-  mkinitrd -c -k 3.8.13-smp -F
-
-All of the above assumes at least a cursory understanding of what those
-commands and parameters do. If it's not clear, don't attempt it on a
-system that you can't easily reinstall without concern.
-
-==============================================================================
-
-Once you confirm that a suspend and resume cycle works as expected, you might
-automate the process with some acpi magic, but a better option is to use the 
-power manager daemon included with your choice of desktop environment (both 
-kde and xfce have one).
-
-==============================================================================
-
-/* TODO: these links are now dead.  That's mostly okay, because the vast 
-   majority of the hardware out there these days doesn't require any quirks
-   at all any more.  Hopefully you won't be in the minority :-)
-   Addendum: it's now been about three years since the above text was
-   written, and I've had zero reports of hardware requiring additional
-   quirks.  Just FYI.  :-)
-*/
-
-If it doesn't work by default for you, consider having a look at
-  http://people.freedesktop.org/~hughsient/quirk/quirk-suspend-index.html
-for some debugging hints.  Pay particular attention to this page:
-  http://people.freedesktop.org/~hughsient/quirk/quirk-suspend-try.html
-
-If you are able to get your machine to suspend/resume correctly by passing
-additional quirks on the command line, then I would like to know about it so
-that upstream hal-info can get the correct information to use.  Please email
-the make/model and other relevant information about your machine along with
-the full output of "lshal" and "lspci" attached, and what extra quirks you
-needed to add for successful suspend/resume to rworkman@slackware.com
-
-==============================================================================
-
-If you need the system to do certain operations before going to sleep and
-then undo them (or perhaps do something new) when waking back up, pm-utils
-supports something called "hooks."  The hooks installed by packages (not only
-pm-utils itself) should be in /usr/lib(64)/pm-utils/sleep.d/, while any hooks 
-installed by the local system administrator (e.g. things that are only an
-issue on that one machine) should be in /etc/pm/sleep.d/.
-
-Looking at some of the existing hooks should give you a decent idea of their
-capabilities; as a head start, the functions used in the hooks are declared 
-in /usr/lib(64)/pm-utils/functions, which is inherited elsewhere by 
-/usr/lib(64)/pm-utils/pm-functions.  Note that an error exit code on any hook
-will cause the sleep operation to fail, so if you don't care whether your
-hook executes successfully, be sure to return an exit code of 0 (success) if
-you don't want the suspend operation to fail.  Some other exit codes are 
-also available; none of these will cause the suspend to fail:
-  $NA (not applicable), $NX (hook not executable), and $DX (hook disabled)
-
-==============================================================================
-
-The default powersave hooks are in /usr/lib(64)/pm-utils/power.d/ -- if you
-need to override any parameters set in those, you can do so with same-named
-files in /etc/pm/power.d/  As an example, if you wanted to change the hdparm 
-setting for your hard drive's power management setting, you would copy the 
-entire file at /usr/lib(64)/pm-utils/power.d/harddrive to /etc/pm/power.d/ 
-and edit the copy to reflect your needs, e.g.:
-
-  DRIVE_POWER_MGMT_BAT=128	# edit value as desired
-  DRIVE_POWER_MGMT_AC=128	# edit value as desired
-
-Also note that any files in the /etc/pm/ hierarchy must be executable (use 
-chmod +x) in order to be used by pm-utils; otherwise, they will be ignored.
-
-==============================================================================
-
-KNOWN ISSUES
-
-****  If you encounter either of these, mail rworkman@slackware.com ****
-
-If your alsa drivers don't correctly save and restore state across a sleep /
-resume cycle (due to a buggy driver), then you will need to add the drivers
-to a custom file named /etc/pm/config.d/defaults (create the file if it does
-not exist already) in a variable named "SUSPEND_MODULES" - see the file at
-/usr/lib(64)/pm-utils/defaults for proper format.
-
-The /usr/lib(64)/pm-utils/sleep.d/90clock does not run by default.  It added
-over a second to suspend, and the vast majority of hardware does not need it 
-to keep the clocks in sync.  If you need this hook, you can set the 
-NEED_CLOCK_SYNC environment variable in a custom /etc/pm/config.d/defaults 
-file. 
-
-==============================================================================
-
diff --git a/source/ap/pm-utils/patches/add-in-kernel-suspend-to-both.patch b/source/ap/pm-utils/patches/add-in-kernel-suspend-to-both.patch
deleted file mode 100644
index e09d07669..000000000
--- a/source/ap/pm-utils/patches/add-in-kernel-suspend-to-both.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/pm/pm-functions.in b/pm/pm-functions.in
---- a/pm/pm-functions.in
-+++ b/pm/pm-functions.in
-@@ -316,8 +316,28 @@ if [ -z "$HIBERNATE_MODULE" ] && \
- 	{
- 		[ -n "${HIBERNATE_MODE}" ] && \
- 		grep -qw "${HIBERNATE_MODE}" /sys/power/disk && \
-+		HIBERNATE_MODE_SAVE=$(cat /sys/power/disk) && \
-+		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE##*[}" && \
-+		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE%%]*}" && \
- 		echo -n "${HIBERNATE_MODE}" > /sys/power/disk
- 		echo -n "disk" > /sys/power/state
-+		RET=$?
-+		echo -n "$HIBERNATE_MODE_SAVE" > /sys/power/disk
-+		return "$RET"
-+	}
-+fi
-+
-+# for kernels that support suspend to both (i.e. hybrid suspend)
-+# since kernel 3.6
-+if [ -z "$SUSPEND_HYBRID_MODULE" ] && \
-+	[ -f /sys/power/disk ] && \
-+	grep -q disk /sys/power/state && \
-+	grep -q suspend /sys/power/disk; then
-+	SUSPEND_HYBRID_MODULE="kernel"
-+	do_suspend_hybrid()
-+	{
-+		HIBERNATE_MODE="suspend"
-+		do_hibernate
- 	}
- fi
- 
diff --git a/source/ap/pm-utils/patches/fix-wrong-path-in-intel-audio-powersave.patch b/source/ap/pm-utils/patches/fix-wrong-path-in-intel-audio-powersave.patch
deleted file mode 100644
index 900397106..000000000
--- a/source/ap/pm-utils/patches/fix-wrong-path-in-intel-audio-powersave.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 67abbd2f5109a732ab967c94bef4d6d9b2a11541 Mon Sep 17 00:00:00 2001
-From: Florian Kriener <florian@kriener.org>
-Date: Sat, 25 Sep 2010 11:27:30 +0200
-Subject: [PATCH] wrong path in intel-audio-powersave (and a small bug)
-
-Package: pm-utils
-Version: 1.4.1-2
-Severity: normal
-Tags: patch
----
- pm/power.d/intel-audio-powersave |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave
-index 36675a8..da63e40 100644
---- a/pm/power.d/intel-audio-powersave
-+++ b/pm/power.d/intel-audio-powersave
-@@ -20,9 +20,9 @@ EOF
- 
- audio_powersave() {
-     [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA
--    for dev in /sys/module/snd_*/parameters/power_save; do
-+    for dev in /sys/module/snd_*; do
- 	[ -w "$dev/parameters/power_save" ] || continue
--	printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
-+	printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
- 	echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
-     done
- }
--- 
-1.7.3.4
-
diff --git a/source/ap/pm-utils/patches/hook-exit-code-log.patch b/source/ap/pm-utils/patches/hook-exit-code-log.patch
deleted file mode 100644
index 7eccd83b0..000000000
--- a/source/ap/pm-utils/patches/hook-exit-code-log.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up pm-utils-1.4.1/pm/pm-functions.in.orig pm-utils-1.4.1/pm/pm-functions.in
---- pm-utils-1.4.1/pm/pm-functions.in.orig	2011-08-22 14:52:58.976213050 +0200
-+++ pm-utils-1.4.1/pm/pm-functions.in	2011-08-22 14:57:26.000000000 +0200
-@@ -195,11 +195,13 @@ hook_ok()
- _run_hook() {
- 	# $1 = hook to run
- 	# rest of args passed to hook unchanged.
-+	local hook_status
- 	log "Running hook $*:"
- 	hook_ok "$1" && "$@"
-+	hook_status=$?
- 	log ""
--	log -n "$*: " 
--	hook_exit_status $? && LAST_HOOK="${1##*/}" || inhibit
-+	log -n "$*: "
-+	hook_exit_status $hook_status && LAST_HOOK="${1##*/}" || inhibit
- }
- 
- if profiling; then
diff --git a/source/ap/pm-utils/patches/init-logfile-append.patch b/source/ap/pm-utils/patches/init-logfile-append.patch
deleted file mode 100644
index 079782630..000000000
--- a/source/ap/pm-utils/patches/init-logfile-append.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- pm-utils-1.4.1/pm/pm-functions.in.old	2010-07-04 16:50:13.000000000 +0200
-+++ pm-utils-1.4.1/pm/pm-functions.in	2010-12-07 16:48:39.555074652 +0100
-@@ -271,7 +271,9 @@
- 		return 1
- 	fi
- 	export LOGGING=true
--	exec > "$1" 2>&1
-+	rm -f "$1"
-+	touch "$1"
-+	exec >> "$1" 2>&1
- }
- 
- check_suspend() { [ -n "$SUSPEND_MODULE" ]; }
diff --git a/source/ap/pm-utils/patches/log-line-spacing-fix.patch b/source/ap/pm-utils/patches/log-line-spacing-fix.patch
deleted file mode 100644
index cf4fbe382..000000000
--- a/source/ap/pm-utils/patches/log-line-spacing-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up pm-utils-1.4.1/pm/pm-functions.in.orig pm-utils-1.4.1/pm/pm-functions.in
---- pm-utils-1.4.1/pm/pm-functions.in.orig	2011-11-02 11:43:24.000000000 +0100
-+++ pm-utils-1.4.1/pm/pm-functions.in	2011-11-02 11:43:49.987116603 +0100
-@@ -199,9 +199,9 @@ _run_hook() {
- 	log "Running hook $*:"
- 	hook_ok "$1" && "$@"
- 	hook_status=$?
--	log ""
- 	log -n "$*: "
- 	hook_exit_status $hook_status && LAST_HOOK="${1##*/}" || inhibit
-+	log ""
- }
- 
- if profiling; then
diff --git a/source/ap/pm-utils/patches/use_more_sane_harddrive_defaults.patch b/source/ap/pm-utils/patches/use_more_sane_harddrive_defaults.patch
deleted file mode 100644
index 3dcc81566..000000000
--- a/source/ap/pm-utils/patches/use_more_sane_harddrive_defaults.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur pm-utils-1.4.1.orig//pm/power.d/harddrive pm-utils-1.4.1/pm/power.d/harddrive
---- pm-utils-1.4.1.orig//pm/power.d/harddrive	2010-07-04 09:50:13.000000000 -0500
-+++ pm-utils-1.4.1/pm/power.d/harddrive	2010-12-27 14:23:12.729597017 -0600
-@@ -11,7 +11,7 @@
- # Default values on battery
- DRIVE_SPINDOWN_VALUE_BAT="${DRIVE_SPINDOWN_VALUE_BAT:-6}"
- DRIVE_WRITE_CACHE_BAT="${DRIVE_WRITE_CACHE_BAT:-0}" 
--DRIVE_POWER_MGMT_BAT="${DRIVE_POWER_MGMT_BAT:-1}"
-+DRIVE_POWER_MGMT_BAT="${DRIVE_POWER_MGMT_BAT:-128}"
- DRIVE_ACOUSTIC_MGMT_BAT="${DRIVE_ACOUSTIC_MGMT_BAT:-254}"
- 
- # Default devices to operate on
diff --git a/source/ap/pm-utils/pm-utils.SlackBuild b/source/ap/pm-utils/pm-utils.SlackBuild
deleted file mode 100755
index 367b8b497..000000000
--- a/source/ap/pm-utils/pm-utils.SlackBuild
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for pm-utils
-
-# Copyright 2008, 2009, 2010  Robby Workman, Northport, Alabama, USA 
-# Copyright 2008, 2009, 2010, 2013, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=pm-utils
-VERSION=$(echo ${PKGNAM}-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-6}
-
-QUIRKS=20100619	# Version of the quirks database
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-zcat $CWD/patches/use_more_sane_harddrive_defaults.patch.gz | patch -p1 || exit 1
-zcat $CWD/patches/fix-wrong-path-in-intel-audio-powersave.patch.gz | patch -p1 || exit 1
-
-# Thanks to Fedora for these:
-# Use append instead of write for init_logfile
-zcat $CWD/patches/init-logfile-append.patch.gz | patch -p1 || exit 1
-# Fix hooks exit code logging
-zcat $CWD/patches/hook-exit-code-log.patch.gz | patch -p1 || exit 1
-# Fix line spacing in logs to be easier to read
-zcat $CWD/patches/log-line-spacing-fix.patch.gz | patch -p1 || exit 1
-# Add support for in-kernel (from kernel 3.6) suspend to both
-zcat $CWD/patches/add-in-kernel-suspend-to-both.patch.gz | patch -p1 || exit 1
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Now let's add the video quirks
-PM_UTILS_LIBDIR="/usr/lib${LIBDIRSUFFIX}/pm-utils"
-mkdir -p $PKG/$PM_UTILS_LIBDIR
-tar xf $CWD/pm-quirks-$QUIRKS.tar.gz -C $PKG/$PM_UTILS_LIBDIR
-chown -R root:root $PKG/$PM_UTILS_LIBDIR/video-quirks
-
-# Probably this shouldn't be needed, but some bluetooth hardware isn't
-# properly handled during the sleep/wake process
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d
-  mv 49bluetooth 49bluetooth-ibm
-  cat $CWD/49bluetooth-generic > 49bluetooth-generic
-  chmod 0755 49bluetooth-generic
-)
-
-# Remove the NetworkManager hook - recent NM listens to upower events
-# directly to know when the system is suspending/waking
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/55NetworkManager
-
-# Remove hooks which have shown to not reduce, or even increase power
-# usage (thanks to Debian for this, and to Marin Glibic for the referral)
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/power.d/journal-commit
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/power.d/readahead
-
-# HAL is gone, so this should be too:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/power.d/hal-cd-polling
-
-# Actually, it is a bad thing(tm) for pm-utils to go messing around with all
-# of the user's settings with the hooks in the power.d directory.  Anything
-# that wasn't already taken out back behind the shed should be disabled by
-# default:
-chmod 644 $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/power.d/*
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-find $PKG/usr/man -type f -exec gzip -9 {} \+
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING INSTALL NEWS README* TODO \
-    $PKG/usr/doc/$PKGNAM-$VERSION
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PKGNAM-$VERSION/README.SLACKWARE
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/ap/pm-utils/pm-utils.url b/source/ap/pm-utils/pm-utils.url
deleted file mode 100644
index 976c938fb..000000000
--- a/source/ap/pm-utils/pm-utils.url
+++ /dev/null
@@ -1 +0,0 @@
-http://pm-utils.freedesktop.org
diff --git a/source/ap/pm-utils/slack-desc b/source/ap/pm-utils/slack-desc
deleted file mode 100644
index 61df486c5..000000000
--- a/source/ap/pm-utils/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-        |-----handy-ruler-------------------------------------------------------|
-pm-utils: pm-utils (Power Management Utilities)
-pm-utils:
-pm-utils: The pm-utils package provides simple shell command line tools to
-pm-utils: suspend and hibernate computers that can be used to run vendor or
-pm-utils: distribution supplied scripts on suspend and resume.
-pm-utils:
-pm-utils: Homepage: http://pm-utils.freedesktop.org/
-pm-utils:
-pm-utils:
-pm-utils:
-pm-utils:
diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild
index 86e56c931..366b4f9c5 100755
--- a/source/d/python-setuptools/python-setuptools.SlackBuild
+++ b/source/d/python-setuptools/python-setuptools.SlackBuild
@@ -35,7 +35,7 @@ fi
 
 PKGNAM=python-setuptools
 VERSION=${VERSION:-$(echo setuptools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 SRCNAM=setuptools
 
diff --git a/source/kde/FTBFSlog b/source/kde/FTBFSlog
index 32c5d890e..50cdd0dbe 100644
--- a/source/kde/FTBFSlog
+++ b/source/kde/FTBFSlog
@@ -1,23 +1,2 @@
-Mon Jun 18 02:49:16 UTC 2018
-  kdelibs: patch to build with OpenSSL-1.1.x. Thanks to nobodino.
-  All KDE packages tested and found to build properly.
-+--------------------------+
-Mon Feb 12 13:37:21 UTC 2018
-  All KDE packages tested and found to build properly.
-+--------------------------+
-Tue Jan 30 23:45:21 UTC 2018
-  Fix all packages that fail to build from source:
-  Added -fpermissive and -fno-delete-null-pointer-checks to default flags (GCC5 behavior)
-  pykde4: patch to built against sip-4.19.5+
-  kde-workspace: cmake: -DCMAKE_C_STANDARD=99, -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-cpp"
-  kdesdk-kioslaves: cmake: -DWITH_SVN=OFF (tries to use a private API that does not exist in 1.9+)
-  kgamma: cmake: add include(CheckIncludeFiles) to CMakeLists.txt
-  smokeqt: cmake: Add -std=c++98 to CXXFLAGS
-  smokekde: cmake: Add -std=c++98 to CXXFLAGS
-  krfb: cmake: Add -std=c++98 to CXXFLAGS
-  print-manager: patch to build against cups-2.2+
-  kdeartwork: cmake: add include(CheckIncludeFiles) to CMakeLists.txt
-  rocs: cmake: Add -std=c++98 to CXXFLAGS
-  kuser: cmake: add include(CheckIncludeFiles) to CMakeLists.txt
-  kdevelop-pg-qt: Fix flex args
-  ktorrent: cmake: Add -std=c++98 to CXXFLAGS
+Sat Dec  5 23:01:14 UTC 2020
+  All packages tested and found to compile properly.
diff --git a/source/kde/build/amarok b/source/kde/build/amarok
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/amarok
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/amor b/source/kde/build/amor
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/amor
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/analitza b/source/kde/build/analitza
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/source/kde/build/analitza
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/source/kde/build/ark b/source/kde/build/ark
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ark
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/artikulate b/source/kde/build/artikulate
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/artikulate
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/audiocd-kio b/source/kde/build/audiocd-kio
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/audiocd-kio
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/baloo b/source/kde/build/baloo
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/baloo
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/baloo-widgets b/source/kde/build/baloo-widgets
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/baloo-widgets
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/blinken b/source/kde/build/blinken
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/blinken
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/bluedevil b/source/kde/build/bluedevil
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/bluedevil
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/bomber b/source/kde/build/bomber
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/bomber
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/bovo b/source/kde/build/bovo
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/bovo
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/calligra b/source/kde/build/calligra
deleted file mode 100644
index 81b5c5d06..000000000
--- a/source/kde/build/calligra
+++ /dev/null
@@ -1 +0,0 @@
-37
diff --git a/source/kde/build/cantor b/source/kde/build/cantor
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/cantor
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/cervisia b/source/kde/build/cervisia
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/cervisia
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/dolphin-plugins b/source/kde/build/dolphin-plugins
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/dolphin-plugins
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/dragon b/source/kde/build/dragon
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/dragon
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/filelight b/source/kde/build/filelight
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/filelight
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/granatier b/source/kde/build/granatier
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/granatier
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/gwenview b/source/kde/build/gwenview
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/gwenview
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/juk b/source/kde/build/juk
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/juk
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/k3b b/source/kde/build/k3b
deleted file mode 100644
index 7f8f011eb..000000000
--- a/source/kde/build/k3b
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/source/kde/build/kaccessible b/source/kde/build/kaccessible
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kaccessible
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kactivities b/source/kde/build/kactivities
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kactivities
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kajongg b/source/kde/build/kajongg
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kajongg
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kalgebra b/source/kde/build/kalgebra
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kalgebra
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kalzium b/source/kde/build/kalzium
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kalzium
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kamera b/source/kde/build/kamera
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kamera
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kanagram b/source/kde/build/kanagram
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kanagram
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kapman b/source/kde/build/kapman
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kapman
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kapptemplate b/source/kde/build/kapptemplate
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kapptemplate
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kate b/source/kde/build/kate
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/kate
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/katomic b/source/kde/build/katomic
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/katomic
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kaudiocreator b/source/kde/build/kaudiocreator
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kaudiocreator
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kblackbox b/source/kde/build/kblackbox
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kblackbox
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kblocks b/source/kde/build/kblocks
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kblocks
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kbounce b/source/kde/build/kbounce
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kbounce
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kbreakout b/source/kde/build/kbreakout
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kbreakout
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kbruch b/source/kde/build/kbruch
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kbruch
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kcachegrind b/source/kde/build/kcachegrind
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kcachegrind
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kcalc b/source/kde/build/kcalc
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kcalc
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kcharselect b/source/kde/build/kcharselect
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kcharselect
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kcolorchooser b/source/kde/build/kcolorchooser
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kcolorchooser
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kcron b/source/kde/build/kcron
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kcron
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kde-base-artwork b/source/kde/build/kde-base-artwork
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kde-base-artwork
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kde-baseapps b/source/kde/build/kde-baseapps
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kde-baseapps
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kde-dev-scripts b/source/kde/build/kde-dev-scripts
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kde-dev-scripts
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kde-dev-utils b/source/kde/build/kde-dev-utils
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kde-dev-utils
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kde-runtime b/source/kde/build/kde-runtime
deleted file mode 100644
index 45a4fb75d..000000000
--- a/source/kde/build/kde-runtime
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/source/kde/build/kde-wallpapers b/source/kde/build/kde-wallpapers
deleted file mode 100644
index 0cfbf0888..000000000
--- a/source/kde/build/kde-wallpapers
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/kde/build/kde-workspace b/source/kde/build/kde-workspace
deleted file mode 100644
index ec635144f..000000000
--- a/source/kde/build/kde-workspace
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/source/kde/build/kdeartwork b/source/kde/build/kdeartwork
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdeartwork
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdeconnect-kde b/source/kde/build/kdeconnect-kde
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/kdeconnect-kde
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/kdegraphics-mobipocket b/source/kde/build/kdegraphics-mobipocket
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdegraphics-mobipocket
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdegraphics-strigi-analyzer b/source/kde/build/kdegraphics-strigi-analyzer
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdegraphics-strigi-analyzer
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdegraphics-thumbnailers b/source/kde/build/kdegraphics-thumbnailers
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdegraphics-thumbnailers
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdelibs b/source/kde/build/kdelibs
deleted file mode 100644
index 45a4fb75d..000000000
--- a/source/kde/build/kdelibs
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/source/kde/build/kdenetwork-filesharing b/source/kde/build/kdenetwork-filesharing
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdenetwork-filesharing
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdenetwork-strigi-analyzers b/source/kde/build/kdenetwork-strigi-analyzers
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdenetwork-strigi-analyzers
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdepim b/source/kde/build/kdepim
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/source/kde/build/kdepim
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/source/kde/build/kdepim-runtime b/source/kde/build/kdepim-runtime
deleted file mode 100644
index 0cfbf0888..000000000
--- a/source/kde/build/kdepim-runtime
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/kde/build/kdepimlibs b/source/kde/build/kdepimlibs
deleted file mode 100644
index ec635144f..000000000
--- a/source/kde/build/kdepimlibs
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/source/kde/build/kdeplasma-addons b/source/kde/build/kdeplasma-addons
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdeplasma-addons
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdesdk-kioslaves b/source/kde/build/kdesdk-kioslaves
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdesdk-kioslaves
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdesdk-strigi-analyzers b/source/kde/build/kdesdk-strigi-analyzers
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdesdk-strigi-analyzers
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdesdk-thumbnailers b/source/kde/build/kdesdk-thumbnailers
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdesdk-thumbnailers
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdev-python b/source/kde/build/kdev-python
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdev-python
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdevelop b/source/kde/build/kdevelop
deleted file mode 100644
index 0cfbf0888..000000000
--- a/source/kde/build/kdevelop
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/kde/build/kdevelop-pg-qt b/source/kde/build/kdevelop-pg-qt
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdevelop-pg-qt
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdevelop-php b/source/kde/build/kdevelop-php
deleted file mode 100644
index 0cfbf0888..000000000
--- a/source/kde/build/kdevelop-php
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/kde/build/kdevelop-php-docs b/source/kde/build/kdevelop-php-docs
deleted file mode 100644
index 0cfbf0888..000000000
--- a/source/kde/build/kdevelop-php-docs
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/kde/build/kdevplatform b/source/kde/build/kdevplatform
deleted file mode 100644
index 0cfbf0888..000000000
--- a/source/kde/build/kdevplatform
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/kde/build/kdewebdev b/source/kde/build/kdewebdev
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdewebdev
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdf b/source/kde/build/kdf
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdf
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kdiamond b/source/kde/build/kdiamond
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kdiamond
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kfilemetadata b/source/kde/build/kfilemetadata
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/source/kde/build/kfilemetadata
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/source/kde/build/kfloppy b/source/kde/build/kfloppy
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kfloppy
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kfourinline b/source/kde/build/kfourinline
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kfourinline
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kgamma b/source/kde/build/kgamma
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kgamma
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kgeography b/source/kde/build/kgeography
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kgeography
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kget b/source/kde/build/kget
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/source/kde/build/kget
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/source/kde/build/kgoldrunner b/source/kde/build/kgoldrunner
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kgoldrunner
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kgpg b/source/kde/build/kgpg
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kgpg
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/khangman b/source/kde/build/khangman
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/khangman
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kig b/source/kde/build/kig
deleted file mode 100644
index 45a4fb75d..000000000
--- a/source/kde/build/kig
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/source/kde/build/kigo b/source/kde/build/kigo
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kigo
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/killbots b/source/kde/build/killbots
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/killbots
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kio-mtp b/source/kde/build/kio-mtp
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/kio-mtp
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/kiriki b/source/kde/build/kiriki
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kiriki
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kiten b/source/kde/build/kiten
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kiten
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kjumpingcube b/source/kde/build/kjumpingcube
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kjumpingcube
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/klettres b/source/kde/build/klettres
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/klettres
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/klickety b/source/kde/build/klickety
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/klickety
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/klines b/source/kde/build/klines
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/klines
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kmag b/source/kde/build/kmag
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kmag
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kmahjongg b/source/kde/build/kmahjongg
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kmahjongg
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kmines b/source/kde/build/kmines
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kmines
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kmix b/source/kde/build/kmix
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/kmix
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/kmousetool b/source/kde/build/kmousetool
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kmousetool
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kmouth b/source/kde/build/kmouth
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kmouth
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kmplot b/source/kde/build/kmplot
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kmplot
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/knavalbattle b/source/kde/build/knavalbattle
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/knavalbattle
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/knetwalk b/source/kde/build/knetwalk
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/knetwalk
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kolf b/source/kde/build/kolf
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kolf
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kollision b/source/kde/build/kollision
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kollision
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kolourpaint b/source/kde/build/kolourpaint
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kolourpaint
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kompare b/source/kde/build/kompare
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kompare
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/konquest b/source/kde/build/konquest
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/konquest
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/konsole b/source/kde/build/konsole
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/source/kde/build/konsole
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/source/kde/build/kopete b/source/kde/build/kopete
deleted file mode 100644
index ec635144f..000000000
--- a/source/kde/build/kopete
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/source/kde/build/korundum b/source/kde/build/korundum
deleted file mode 100644
index 45a4fb75d..000000000
--- a/source/kde/build/korundum
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/source/kde/build/kpat b/source/kde/build/kpat
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kpat
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kplayer b/source/kde/build/kplayer
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kplayer
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kppp b/source/kde/build/kppp
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kppp
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kqtquickcharts b/source/kde/build/kqtquickcharts
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kqtquickcharts
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/krdc b/source/kde/build/krdc
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/source/kde/build/krdc
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/source/kde/build/kremotecontrol b/source/kde/build/kremotecontrol
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kremotecontrol
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kreversi b/source/kde/build/kreversi
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kreversi
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/krfb b/source/kde/build/krfb
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/krfb
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kross-interpreters b/source/kde/build/kross-interpreters
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/kross-interpreters
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/kruler b/source/kde/build/kruler
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kruler
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ksaneplugin b/source/kde/build/ksaneplugin
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ksaneplugin
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kscreen b/source/kde/build/kscreen
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kscreen
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kshisen b/source/kde/build/kshisen
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kshisen
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ksirk b/source/kde/build/ksirk
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ksirk
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ksnakeduel b/source/kde/build/ksnakeduel
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ksnakeduel
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ksnapshot b/source/kde/build/ksnapshot
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ksnapshot
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kspaceduel b/source/kde/build/kspaceduel
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kspaceduel
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ksquares b/source/kde/build/ksquares
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ksquares
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kstars b/source/kde/build/kstars
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kstars
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ksudoku b/source/kde/build/ksudoku
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ksudoku
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ksystemlog b/source/kde/build/ksystemlog
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ksystemlog
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kteatime b/source/kde/build/kteatime
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kteatime
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ktimer b/source/kde/build/ktimer
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ktimer
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ktorrent b/source/kde/build/ktorrent
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/ktorrent
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/ktouch b/source/kde/build/ktouch
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/ktouch
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/ktuberling b/source/kde/build/ktuberling
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ktuberling
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kturtle b/source/kde/build/kturtle
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kturtle
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/ktux b/source/kde/build/ktux
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/ktux
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kubrick b/source/kde/build/kubrick
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kubrick
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kuser b/source/kde/build/kuser
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kuser
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kwalletmanager b/source/kde/build/kwalletmanager
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kwalletmanager
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kwebkitpart b/source/kde/build/kwebkitpart
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kwebkitpart
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/kwordquiz b/source/kde/build/kwordquiz
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/kwordquiz
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libkcddb b/source/kde/build/libkcddb
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libkcddb
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libkcompactdisc b/source/kde/build/libkcompactdisc
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libkcompactdisc
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libkdcraw b/source/kde/build/libkdcraw
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/source/kde/build/libkdcraw
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/source/kde/build/libkdeedu b/source/kde/build/libkdeedu
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libkdeedu
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libkdegames b/source/kde/build/libkdegames
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libkdegames
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libkexiv2 b/source/kde/build/libkexiv2
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/libkexiv2
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/libkipi b/source/kde/build/libkipi
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libkipi
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libkmahjongg b/source/kde/build/libkmahjongg
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libkmahjongg
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libkomparediff2 b/source/kde/build/libkomparediff2
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libkomparediff2
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libksane b/source/kde/build/libksane
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libksane
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libkscreen b/source/kde/build/libkscreen
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libkscreen
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libktorrent b/source/kde/build/libktorrent
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/libktorrent
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/libmm-qt b/source/kde/build/libmm-qt
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/libmm-qt
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/libnm-qt b/source/kde/build/libnm-qt
deleted file mode 100644
index d00491fd7..000000000
--- a/source/kde/build/libnm-qt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/source/kde/build/lokalize b/source/kde/build/lokalize
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/lokalize
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/lskat b/source/kde/build/lskat
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/lskat
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/marble b/source/kde/build/marble
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/marble
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/mplayerthumbs b/source/kde/build/mplayerthumbs
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/mplayerthumbs
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/nepomuk-core b/source/kde/build/nepomuk-core
deleted file mode 100644
index 7ed6ff82d..000000000
--- a/source/kde/build/nepomuk-core
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/source/kde/build/nepomuk-widgets b/source/kde/build/nepomuk-widgets
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/nepomuk-widgets
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/okteta b/source/kde/build/okteta
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/okteta
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/okular b/source/kde/build/okular
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/okular
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/oxygen-gtk2 b/source/kde/build/oxygen-gtk2
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/oxygen-gtk2
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/oxygen-icons b/source/kde/build/oxygen-icons
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/oxygen-icons
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/pairs b/source/kde/build/pairs
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/pairs
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/palapeli b/source/kde/build/palapeli
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/palapeli
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/parley b/source/kde/build/parley
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/parley
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/partitionmanager b/source/kde/build/partitionmanager
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/partitionmanager
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/perlkde b/source/kde/build/perlkde
deleted file mode 100644
index f599e28b8..000000000
--- a/source/kde/build/perlkde
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/source/kde/build/perlqt b/source/kde/build/perlqt
deleted file mode 100644
index b4de39476..000000000
--- a/source/kde/build/perlqt
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/source/kde/build/picmi b/source/kde/build/picmi
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/picmi
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/plasma-nm b/source/kde/build/plasma-nm
deleted file mode 100644
index 0cfbf0888..000000000
--- a/source/kde/build/plasma-nm
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/source/kde/build/polkit-kde-agent-1 b/source/kde/build/polkit-kde-agent-1
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/polkit-kde-agent-1
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/polkit-kde-kcmodules-1 b/source/kde/build/polkit-kde-kcmodules-1
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/polkit-kde-kcmodules-1
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/poxml b/source/kde/build/poxml
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/poxml
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/print-manager b/source/kde/build/print-manager
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/print-manager
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/pykde4 b/source/kde/build/pykde4
deleted file mode 100644
index b4de39476..000000000
--- a/source/kde/build/pykde4
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/source/kde/build/qtruby b/source/kde/build/qtruby
deleted file mode 100644
index b4de39476..000000000
--- a/source/kde/build/qtruby
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/source/kde/build/rocs b/source/kde/build/rocs
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/rocs
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/skanlite b/source/kde/build/skanlite
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/skanlite
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/smokegen b/source/kde/build/smokegen
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/smokegen
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/smokekde b/source/kde/build/smokekde
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/smokekde
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/smokeqt b/source/kde/build/smokeqt
deleted file mode 100644
index 1e8b31496..000000000
--- a/source/kde/build/smokeqt
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/source/kde/build/step b/source/kde/build/step
deleted file mode 100644
index 7f8f011eb..000000000
--- a/source/kde/build/step
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/source/kde/build/superkaramba b/source/kde/build/superkaramba
deleted file mode 100644
index b8626c4cf..000000000
--- a/source/kde/build/superkaramba
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/source/kde/build/svgpart b/source/kde/build/svgpart
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/svgpart
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/sweeper b/source/kde/build/sweeper
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/sweeper
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/umbrello b/source/kde/build/umbrello
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/umbrello
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/wicd-kde b/source/kde/build/wicd-kde
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/wicd-kde
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/build/zeroconf-ioslave b/source/kde/build/zeroconf-ioslave
deleted file mode 100644
index 00750edc0..000000000
--- a/source/kde/build/zeroconf-ioslave
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/kde/cmake/amarok b/source/kde/cmake/amarok
deleted file mode 100644
index c6e10fd7b..000000000
--- a/source/kde/cmake/amarok
+++ /dev/null
@@ -1,24 +0,0 @@
-# NOTE: if cmake complains that it can not find qscript-qt when in fact you
-# have it installed, this is likely because you are building inside a chroot.
-# To remedy the error, run the command "dbus-uuidgen --ensure"
-# and then re-start this SlackBuild :
-
-export QTSCRIPTS=/usr/lib${LIBDIRSUFFIX}/qt4/plugins/script
-
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DWITH_NepomukCore=OFF \
-    -DWITH_Soprano=OFF \
-    ..
diff --git a/source/kde/cmake/analitza b/source/kde/cmake/analitza
deleted file mode 100644
index cf539f40b..000000000
--- a/source/kde/cmake/analitza
+++ /dev/null
@@ -1,18 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_EXE_LINKER_FLAGS:STRING="-ltermcap" \
-    -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING="-ltermcap" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/bluedevil b/source/kde/cmake/bluedevil
deleted file mode 100644
index d855f5310..000000000
--- a/source/kde/cmake/bluedevil
+++ /dev/null
@@ -1,13 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DBUILD_tests:BOOL=OFF \
-    ..
-
diff --git a/source/kde/cmake/calligra b/source/kde/cmake/calligra
deleted file mode 100644
index 117df82a6..000000000
--- a/source/kde/cmake/calligra
+++ /dev/null
@@ -1,25 +0,0 @@
-# NOTE: Added -DU_USING_ICU_NAMESPACE=1 to CXXFLAGS, which should be a temporary
-# requirement. See the link below:
-# http://site.icu-project.org/download/61#TOC-Migration-Issues
-
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" \
-    -DCMAKE_INCLUDE_PATH:STRING="/usr/include/openmj2-2.1" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DIHAVEPATCHEDQT:BOOL=ON \
-    -DOPENJPEG_INCLUDE_DIR=/usr/include/openmj2-2.1 \
-    -DOPENJPEG_NAMES=openmj2 \
-    -DBoost_NO_BOOST_CMAKE=ON \
-    ..
-
diff --git a/source/kde/cmake/cmake b/source/kde/cmake/cmake
deleted file mode 100644
index 263c12cac..000000000
--- a/source/kde/cmake/cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/k3b b/source/kde/cmake/k3b
deleted file mode 100644
index 2e012d438..000000000
--- a/source/kde/cmake/k3b
+++ /dev/null
@@ -1,19 +0,0 @@
-sed -i.cmakehack -e "s|^cmake_minimum_required|#cmake_minimum_required|" CMakeLists.txt
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DK3B_ENABLE_HAL_SUPPORT:BOOL=OFF \
-    -DK3B_BUILD_LAME_ENCODER_PLUGIN:BOOL=OFF \
-    -DKDE4_ENABLE_HTMLHANDBOOK:BOOL=ON \
-    ..
-
diff --git a/source/kde/cmake/kajongg b/source/kde/cmake/kajongg
deleted file mode 100644
index 125582b77..000000000
--- a/source/kde/cmake/kajongg
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DINSTALL_KAJONGG=TRUE \
-    ..
-
diff --git a/source/kde/cmake/kde-runtime b/source/kde/cmake/kde-runtime
deleted file mode 100644
index 3d11c5ef1..000000000
--- a/source/kde/cmake/kde-runtime
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c++11" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
-    ..
-
diff --git a/source/kde/cmake/kde-workspace b/source/kde/cmake/kde-workspace
deleted file mode 100644
index 10fef77e7..000000000
--- a/source/kde/cmake/kde-workspace
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_STANDARD=99 \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-cpp" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/kdeaccessibility b/source/kde/cmake/kdeaccessibility
deleted file mode 100644
index 3fc784c81..000000000
--- a/source/kde/cmake/kdeaccessibility
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DBUILD_jovie:BOOL=OFF \
-    -DWITH_Speechd:BOOL=OFF \
-    ..
-
diff --git a/source/kde/cmake/kdeadmin b/source/kde/cmake/kdeadmin
deleted file mode 100644
index 863974d6a..000000000
--- a/source/kde/cmake/kdeadmin
+++ /dev/null
@@ -1,18 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DKU_FIRSTGID=1000 \
-    -DKU_FIRSTUID=1000 \
-    --with-shadow \
-    ..
-
diff --git a/source/kde/cmake/kdeartwork b/source/kde/cmake/kdeartwork
deleted file mode 100644
index 4f394d410..000000000
--- a/source/kde/cmake/kdeartwork
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DKSCREENSAVER_SOUND_SUPPORT=ON \
-    ..
-
diff --git a/source/kde/cmake/kdebase b/source/kde/cmake/kdebase
deleted file mode 100644
index c1835c390..000000000
--- a/source/kde/cmake/kdebase
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DRUN_KAPPFINDER=ON \
-    ..
-
diff --git a/source/kde/cmake/kdebindings b/source/kde/cmake/kdebindings
deleted file mode 100644
index 086f96259..000000000
--- a/source/kde/cmake/kdebindings
+++ /dev/null
@@ -1,31 +0,0 @@
-# Set 'vendorarch' (install location for vendor shipped
-# architecture dependent perl modules):
-eval $(perl '-V:vendorarch')
-
-# Likewise for Ruby (note that our "vendordir" is empty, so we use sitedir):
-ruby_vendorlibdir=$(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
-ruby_vendorarchdir=$(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
-
-mkdir -p build
-cd build
-    #-DCMAKE_BACKWARDS_COMPATIBILITY:STRING="2.2" \
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCUSTOM_PERL_SITE_ARCH_DIR=${vendorarch} \
-    -DRUBY_VENDORARCH_DIR:PATH=${ruby_vendorarchdir} \
-    -DRUBY_VENDORLIB_DIR:PATH=${ruby_vendorlibdir} \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DENABLE_QYOTO:BOOL=OFF \
-    -DENABLE_QSCINTILLA_SHARP:BOOL=OFF \
-    -DENABLE_KIMONO:BOOL=OFF \
-    -DBUILD_csharp:BOOL=OFF \
-    ..
-
diff --git a/source/kde/cmake/kdelibs b/source/kde/cmake/kdelibs
deleted file mode 100644
index 92015a911..000000000
--- a/source/kde/cmake/kdelibs
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DWITH_HAL=OFF \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DKDE_DISTRIBUTION_TEXT="volkerdi@slackware.com" \
-    ..
-
diff --git a/source/kde/cmake/kdenetwork b/source/kde/cmake/kdenetwork
deleted file mode 100644
index eeb620618..000000000
--- a/source/kde/cmake/kdenetwork
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DWITH_irc=ON \
-    ..
-
diff --git a/source/kde/cmake/kdepimlibs b/source/kde/cmake/kdepimlibs
deleted file mode 100644
index 3cdeb3970..000000000
--- a/source/kde/cmake/kdepimlibs
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DBoost_NO_BOOST_CMAKE=ON \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/kdesdk-kioslaves b/source/kde/cmake/kdesdk-kioslaves
deleted file mode 100644
index 1da29c35a..000000000
--- a/source/kde/cmake/kdesdk-kioslaves
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DWITH_SVN=OFF \
-    ..
diff --git a/source/kde/cmake/kdevelop-pg-qt b/source/kde/cmake/kdevelop-pg-qt
deleted file mode 100644
index 5cdbdbcdc..000000000
--- a/source/kde/cmake/kdevelop-pg-qt
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++98" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/kdewebdev b/source/kde/cmake/kdewebdev
deleted file mode 100644
index 1e309b86a..000000000
--- a/source/kde/cmake/kdewebdev
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DLIBTIDY_INCLUDE_DIR=$PKG/usr/include \
-    -DLIBTIDY_LIBRARIES=$PKG/usr/lib${LIBDIRSUFFIX}/libtidy.so \
-    ..
-
diff --git a/source/kde/cmake/kget b/source/kde/cmake/kget
deleted file mode 100644
index 7d77ba24a..000000000
--- a/source/kde/cmake/kget
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c++11" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/kopete b/source/kde/cmake/kopete
deleted file mode 100644
index d44b5ed89..000000000
--- a/source/kde/cmake/kopete
+++ /dev/null
@@ -1,18 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c++11" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DWITH_Libmsn=OFF \
-    -DWITH_wlm=OFF \
-    ..
-
diff --git a/source/kde/cmake/krfb b/source/kde/cmake/krfb
deleted file mode 100644
index 5cdbdbcdc..000000000
--- a/source/kde/cmake/krfb
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++98" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/kross-interpreters b/source/kde/cmake/kross-interpreters
deleted file mode 100644
index b57de3f6e..000000000
--- a/source/kde/cmake/kross-interpreters
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir -p build
-cd build
-    #-DCMAKE_BACKWARDS_COMPATIBILITY:STRING="2.2" \
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DBUILD_ruby:BOOL=OFF \
-    ..
-
diff --git a/source/kde/cmake/ktorrent b/source/kde/cmake/ktorrent
deleted file mode 100644
index 5cdbdbcdc..000000000
--- a/source/kde/cmake/ktorrent
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++98" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/kwebkitpart b/source/kde/cmake/kwebkitpart
deleted file mode 100644
index ca8ac5d24..000000000
--- a/source/kde/cmake/kwebkitpart
+++ /dev/null
@@ -1,11 +0,0 @@
-mkdir -p build
-cd build
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
-  PATH=$QTDIR/bin:$PATH \
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/networkmanagement b/source/kde/cmake/networkmanagement
deleted file mode 100644
index 81964f4f3..000000000
--- a/source/kde/cmake/networkmanagement
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/partitionmanager b/source/kde/cmake/partitionmanager
deleted file mode 100644
index b24718e98..000000000
--- a/source/kde/cmake/partitionmanager
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DENABLE_UDISKS2=ON \
-    ..
-
diff --git a/source/kde/cmake/perlkde b/source/kde/cmake/perlkde
deleted file mode 100644
index 670c028ae..000000000
--- a/source/kde/cmake/perlkde
+++ /dev/null
@@ -1,20 +0,0 @@
-# Set 'vendorarch' (install location for vendor shipped
-# architecture dependent perl modules):
-eval $(perl '-V:vendorarch')
-
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCUSTOM_PERL_SITE_ARCH_DIR=$vendorarch \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/perlqt b/source/kde/cmake/perlqt
deleted file mode 100644
index 9402818a9..000000000
--- a/source/kde/cmake/perlqt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Set 'vendorarch' (install location for vendor shipped
-# architecture dependent perl modules):
-eval $(perl '-V:vendorarch')
-
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DCUSTOM_PERL_SITE_ARCH_DIR=$vendorarch \
-    -DQSCINTILLA_LIBRARY=/usr/lib$LIBDIRSUFFIX/libqscintilla2_qt4.so \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/polkit-kde-agent-1 b/source/kde/cmake/polkit-kde-agent-1
deleted file mode 100644
index 7c98736fa..000000000
--- a/source/kde/cmake/polkit-kde-agent-1
+++ /dev/null
@@ -1,15 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/polkit-kde-kcmodules-1 b/source/kde/cmake/polkit-kde-kcmodules-1
deleted file mode 100644
index 7c98736fa..000000000
--- a/source/kde/cmake/polkit-kde-kcmodules-1
+++ /dev/null
@@ -1,15 +0,0 @@
-mkdir -p build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/pykde4 b/source/kde/cmake/pykde4
deleted file mode 100644
index c0fc2c869..000000000
--- a/source/kde/cmake/pykde4
+++ /dev/null
@@ -1,35 +0,0 @@
-mkdir build-python3
-cd build-python3
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-    -DPYKDEUIC4_ALTINSTALL:BOOL=ON \
-    ..
-cd -
-
-mkdir build-python2
-cd build-python2
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-cd -
diff --git a/source/kde/cmake/qtruby b/source/kde/cmake/qtruby
deleted file mode 100644
index 7a30741a5..000000000
--- a/source/kde/cmake/qtruby
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DQSCINTILLA_LIBRARY=/usr/lib$LIBDIRSUFFIX/libqscintilla2_qt4.so \
-    ..
-
diff --git a/source/kde/cmake/rocs b/source/kde/cmake/rocs
deleted file mode 100644
index 5cdbdbcdc..000000000
--- a/source/kde/cmake/rocs
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++98" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/smokekde b/source/kde/cmake/smokekde
deleted file mode 100644
index 5cdbdbcdc..000000000
--- a/source/kde/cmake/smokekde
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++98" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/cmake/smokeqt b/source/kde/cmake/smokeqt
deleted file mode 100644
index 5db9163f6..000000000
--- a/source/kde/cmake/smokeqt
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++98" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DQSCINTILLA_LIBRARY=/usr/lib$LIBDIRSUFFIX/libqscintilla2_qt4.so \
-    ..
-
diff --git a/source/kde/cmake/step b/source/kde/cmake/step
deleted file mode 100644
index 1299e6b9d..000000000
--- a/source/kde/cmake/step
+++ /dev/null
@@ -1,16 +0,0 @@
-mkdir build
-cd build
-  cmake \
-    $KDE_OPT_ARGS \
-    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11 -fpermissive" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c++11 -fpermissive" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-
diff --git a/source/kde/doinst.sh/amarok b/source/kde/doinst.sh/amarok
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/amarok
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/jovie b/source/kde/doinst.sh/jovie
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/jovie
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kde-applications b/source/kde/doinst.sh/kde-applications
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/kde-applications
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kde-baseapps b/source/kde/doinst.sh/kde-baseapps
deleted file mode 100644
index 85ff4d866..000000000
--- a/source/kde/doinst.sh/kde-baseapps
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
diff --git a/source/kde/doinst.sh/kde-runtime b/source/kde/doinst.sh/kde-runtime
deleted file mode 100644
index 22d4849bc..000000000
--- a/source/kde/doinst.sh/kde-runtime
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kde-workspace b/source/kde/doinst.sh/kde-workspace
deleted file mode 100644
index 91bd6bc69..000000000
--- a/source/kde/doinst.sh/kde-workspace
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/kde/kdm/backgroundrc.new
-config etc/kde/kdm/kdmrc.new
-if [ -r etc/pam.d/kde.new ]; then
-  config etc/pam.d/kde.new
-fi
-if [ -r etc/pam.d/kde-np.new ]; then
-  config etc/pam.d/kde-np.new
-fi
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x usr/bin/update-mime-database ]; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
diff --git a/source/kde/doinst.sh/kdeadmin b/source/kde/doinst.sh/kdeadmin
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/kdeadmin
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kdeartwork b/source/kde/doinst.sh/kdeartwork
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/kdeartwork
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kdebase b/source/kde/doinst.sh/kdebase
deleted file mode 100644
index 85ff4d866..000000000
--- a/source/kde/doinst.sh/kdebase
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
diff --git a/source/kde/doinst.sh/kdegames b/source/kde/doinst.sh/kdegames
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/kdegames
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kdemultimedia b/source/kde/doinst.sh/kdemultimedia
deleted file mode 100644
index 22d4849bc..000000000
--- a/source/kde/doinst.sh/kdemultimedia
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kdetoys b/source/kde/doinst.sh/kdetoys
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/kdetoys
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kdeutils b/source/kde/doinst.sh/kdeutils
deleted file mode 100644
index 22d4849bc..000000000
--- a/source/kde/doinst.sh/kdeutils
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kgamma b/source/kde/doinst.sh/kgamma
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/kgamma
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/koffice b/source/kde/doinst.sh/koffice
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/koffice
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/kopete-cryptography b/source/kde/doinst.sh/kopete-cryptography
deleted file mode 100644
index 22d4849bc..000000000
--- a/source/kde/doinst.sh/kopete-cryptography
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/ksaneplugin b/source/kde/doinst.sh/ksaneplugin
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/ksaneplugin
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/ksnapshot b/source/kde/doinst.sh/ksnapshot
deleted file mode 100644
index e376b59af..000000000
--- a/source/kde/doinst.sh/ksnapshot
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/source/kde/doinst.sh/wicd-kde b/source/kde/doinst.sh/wicd-kde
deleted file mode 100644
index 22d4849bc..000000000
--- a/source/kde/doinst.sh/wicd-kde
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/testing/source/vtown/deps/QtAV/doinst.sh b/source/kde/kcm-fcitx/doinst.sh
index 5fb28930d..5fb28930d 100644
--- a/testing/source/vtown/deps/QtAV/doinst.sh
+++ b/source/kde/kcm-fcitx/doinst.sh
diff --git a/testing/source/vtown/input-methods/kcm-fcitx/kcm-fcitx.SlackBuild b/source/kde/kcm-fcitx/kcm-fcitx.SlackBuild
index 0acc8a026..101a7f4fb 100755
--- a/testing/source/vtown/input-methods/kcm-fcitx/kcm-fcitx.SlackBuild
+++ b/source/kde/kcm-fcitx/kcm-fcitx.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=kcm-fcitx
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | cut -f 2- -d _ | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/kcm-fcitx/kcm-fcitx.url b/source/kde/kcm-fcitx/kcm-fcitx.url
index 31f0ec4ed..31f0ec4ed 100644
--- a/testing/source/vtown/input-methods/kcm-fcitx/kcm-fcitx.url
+++ b/source/kde/kcm-fcitx/kcm-fcitx.url
diff --git a/testing/source/vtown/input-methods/kcm-fcitx/slack-desc b/source/kde/kcm-fcitx/slack-desc
index a9eda5c2d..a9eda5c2d 100644
--- a/testing/source/vtown/input-methods/kcm-fcitx/slack-desc
+++ b/source/kde/kcm-fcitx/slack-desc
diff --git a/source/kde/kde.SlackBuild b/source/kde/kde.SlackBuild
deleted file mode 100755
index 0fa0beea1..000000000
--- a/source/kde/kde.SlackBuild
+++ /dev/null
@@ -1,597 +0,0 @@
-#!/bin/bash
-# Copyright 2011, 2012, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Adapted by Eric Hameleers <alien@slackware.com> from the modular x.org build.
-
-# To build only a single package group, specify it as $1, like:
-#   ./KDE.SlackBuild kdeedu
-# To build only a single package, specify both the group name
-# and the name of the package, like:
-#   ./KDE.SlackBuild kdeedu:marble
-#   ./KDE.SlackBuild kdebindings:perlqt,perlkde
-
-
-CLEANUP=${CLEANUP:-"yes"} # clean up build directory after successful build.
-PRECHECK=${PRECHECK:-"no"} # don't let the script check the available sources.
-CHECKOUT=${CHECKOUT:-"no"} # don't let the script checkout missing sources.
-
-KDEGITURI="git://anongit.kde.org"
-
-pkgbase() {
-  PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
-  case $PKGEXT in
-  'gz' )
-    PKGRETURN=$(basename $1 .tar.gz)
-    ;;
-  'bz2' )
-    PKGRETURN=$(basename $1 .tar.bz2)
-    ;;
-  'lzma' )
-    PKGRETURN=$(basename $1 .tar.lzma)
-    ;;
-  'xz' )
-    PKGRETURN=$(basename $1 .tar.xz)
-    ;;
-  *)
-    PKGRETURN=$(basename $1)
-    ;;
-  esac
-  echo $PKGRETURN
-}
-
-# Set initial variables:
-cd $(dirname $0) ; CWD=$(pwd)
-if [ -z "$TMP" ]; then
-  TMP=/tmp
-  # Old default output directory. If $TMP wasn't predefined, we'll default to
-  # using it unless a different value is provided:
-  SLACK_KDE_BUILD_DIR=${SLACK_KDE_BUILD_DIR:-/tmp/kde_build}
-else
-  # $TMP already set. We'll also use it for the output directory unless
-  # a different value is provided:
-  SLACK_KDE_BUILD_DIR=${SLACK_KDE_BUILD_DIR:-$TMP}
-fi
-mkdir -p $TMP $SLACK_KDE_BUILD_DIR
-
-# Set up a few useful functions:
-
-fix_perms() {
-  target_dir=$1
-  [ -z "$target_dir" ] && target_dir='.'
-
-  chown -R root:root $target_dir
-  find $target_dir \
-   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-   -exec chmod 755 {} \+ -o \
-   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-   -exec chmod 644 {} \+
-}
-
-strip_binaries() {
-  target_dir=$1
-  [ -z "$target_dir" ] && target_dir='.'
-  find $target_dir | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find $target_dir | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find $target_dir | xargs file | grep "current ar archive" | grep ELF | cut -f 1 -d : | xargs strip -g 2> /dev/null
-  # Also strip rpaths:
-  for file in $(find $target_dir | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do
-    if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
-      patchelf --remove-rpath $file
-    fi
-  done
-}
-
-process_man_pages() {
-  # Compress and if needed symlink the man pages:
-  if [ -d usr/man ]; then
-    ( cd usr/man
-      for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.*
-      )
-      done
-    )
-  fi
-}
-
-process_info_pages() {
-  # Compress info pages and purge "dir" file from the package:
-  if [ -d usr/info ]; then
-    ( cd usr/info
-      rm -f dir
-      gzip -9 *
-    )
-  fi
-}
-
-no_usr_share_doc() {
-  # If there are docs, move them:
-  if [ -d usr/share/doc ]; then
-    mkdir -p usr/doc
-    mv usr/share/doc/* usr/doc
-    rmdir usr/share/doc
-  fi
-}
-
-precheck() {
-  # See if the sources we have match the module components we want to build:
-  RETVAL=0
-
-  for SRCFILE in $(find $CWD/src -name "*.tar.?z*") ; do
-    if cat modules/* |grep "^ *#" |grep -wq $(echo $(basename $SRCFILE) | rev | cut -f2- -d- | rev)$ ; then
-      echo "Source file '$(basename $SRCFILE)' is commented out in 'modules' !"
-    elif ! cat modules/* |grep -v "^ *#" |grep -wq $(echo $(basename $SRCFILE) | rev | cut -f2- -d- | rev) ; then
-      echo "Source file '$(basename $SRCFILE)' is not mentioned in 'modules' !"
-      RETVAL=1
-    fi
-  done
-
-  for MODULE in $(cat $CWD/modules/* | grep -v "^#") ; do
-    #if [ -z "$(find $CWD/src -name ${MODULE}-*)" ] ; then
-    if [ -z "$(find $CWD/src -name $MODULE-*.tar.* |grep -E "$MODULE-[^-]+.tar.*$|$MODULE-[0-9].+.tar.*$")" ] ; then
-      echo "Module '$MODULE' does not have a matching source tarball !"
-      if [ "$CHECKOUT" = "yes" -o "$CHECKOUT" = "YES" ]; then
-        echo "Checking out KDE component at branch '$VERSION'."
-        git archive --format=tar --prefix {$MODULE}-${VERSION}/ --remote ${KDEGITURI}/${MODULE}.git v${VERSION} | xz -c > $CWD/src/${MODULE}-${VERSION}.tar.xz
-        RETVAL=$?
-        if [ $RETVAL -ne 0 ]; then
-          echo "Error while checking out '$MODULE' !"
-          mv $CWD/src/${MODULE}-${VERSION}.tar.xz $CWD/src/${MODULE}-${VERSION}.tar.xz.failed
-        fi
-      else
-        RETVAL=1
-      fi
-    fi
-    # A missing slack-desc counts as fatal even if the program may end up
-    # inside the big meta-package.
-    if [ -z "$(find $CWD/slack-desc -name ${MODULE})" ] ; then
-      echo "Module '$MODULE' does not have a slack-desc file !"
-      RETVAL=1
-    fi
-  done
-
-  if [ $RETVAL -eq 0 ]; then
-    echo "Check complete, build starts in 5 seconds"
-    sleep 5
-  else
-    exit 1
-  fi
-}
-
-# Support function builds one complete module (like 'kdelibs'), or
-# exactly one package which is part of a module (like 'okular'):
-build_mod_pkg () {
-  kde_module=$1
-  kde_pkg=$2
-
-  cd $CWD/modules
-
-  # See if $kde_module is a module name like "kdeadmin":
-  if [ ! -z "$kde_module" ]; then
-    if [ ! -f "$kde_module" ]; then
-      return
-    fi
-  fi
-  PKG=${SLACK_KDE_BUILD_DIR}/${kde_module}/package-${kde_module}
-  rm -rf $PKG
-  mkdir -p $PKG
-  ( for PKGNAME in $(cat $kde_module |grep -v "^$" |grep -v "^#") ; do
-      # Find the full source filename - yeah ugly, but I had two goals:
-      # 1- source tarball can be in a random subdirectory of src/
-      # 2- differentiate between e.g. 'kdepim' and 'kdepim-runtime'
-      kde_src=$(basename $(find $CWD/src -name "$PKGNAME-*.tar.?z*" |grep -E "$PKGNAME-[^-]+.tar.*$|$PKGNAME-[0-9].+.tar.*$") 2>/dev/null)
-      if [ "x$kde_src" = "x" ]; then
-        echo "** Did not find '$PKGNAME' in src"
-        continue
-      fi
-      # Reset $PKGARCH to its initial value:
-      PKGARCH=$ARCH
-      # Perhaps $PKGARCH should be something different:
-      if grep -wq "^$PKGNAME" ${CWD}/noarch ; then
-        PKGARCH=noarch
-      fi 
-      if grep -wq "^$PKGNAME" ${CWD}/package-blacklist ; then
-        continue
-      fi
-      cd $SLACK_KDE_BUILD_DIR/${kde_module}
-      # If $kde_pkg is set, we only want to build one package:
-      if [ ! -z "$kde_pkg" ]; then
-        if [ "$kde_pkg" = "$PKGNAME" ]; then
-          # Set $PKG to a private dir for the modular package build:
-          PKG=$SLACK_KDE_BUILD_DIR/${kde_module}/package-$PKGNAME
-          rm -rf $PKG
-          mkdir -p $PKG
-        else
-          continue
-        fi
-      else
-        if [ -z "$PRINT_PACKAGE_NAME" ]; then
-          echo
-          echo "Building from source ${kde_src}"
-          echo
-        fi
-      fi
-      if grep -wq "^$PKGNAME" ${CWD}/modularize ; then
-        # Set $PKG to a private dir for the modular package build:
-        PKG=$SLACK_KDE_BUILD_DIR/${kde_module}/package-$PKGNAME
-        rm -rf $PKG
-        mkdir -p $PKG
-      fi
-
-      # Let's figure out the version number on the modular package:
-      MODULAR_PACKAGE_VERSION=$(echo $kde_src | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-
-      # If this variable is passed to the script, nothing will be built.
-      # Instead, a list of packages to be built will be output.
-      if [ ! -z "$PRINT_PACKAGE_NAME" ]; then
-        if [ -r $CWD/build/${PKGNAME} ]; then
-          MODBUILD=$(cat $CWD/build/${PKGNAME})
-        else
-          MODBUILD=$BUILD
-        fi
-        if [ "$PKGNAME" = "kde-runtime" -o "$PKGNAME" = "kmix" ]; then
-          # If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG:
-          if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then
-            MODBUILD=${MODBUILD}_alsa
-          fi
-        fi
-        echo "${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
-        continue
-      fi
-
-      rm -rf $(pkgbase $kde_src)
-      tar xf $(find $CWD/src -name ${kde_src}) || exit 1
-      cd $(pkgbase $kde_src) || exit 1
-
-      fix_perms
-
-      # If any patches are needed, call this script to apply them:
-      if [ -r $CWD/patch/${PKGNAME}.patch ]; then
-        . $CWD/patch/${PKGNAME}.patch || exit 1
-      fi
-
-      # If there's any pre-install things to do, do them:
-      if [ -r $CWD/pre-install/${PKGNAME}.pre-install ]; then
-        . $CWD/pre-install/${PKGNAME}.pre-install
-      fi
-
-      # Run cmake, using custom cmake script if needed:
-      if [ -r $CWD/cmake/${PKGNAME} ]; then
-        . $CWD/cmake/${PKGNAME}
-      elif [ -r $CWD/cmake/${kde_module} ]; then
-        . $CWD/cmake/${kde_module}
-      else
-        # This is the default configure script:
-        . $CWD/cmake/cmake
-      fi
-
-      # Run make, using custom make script if needed:
-      if [ -r $CWD/make/${PKGNAME} ]; then
-        . $CWD/make/${PKGNAME}
-      elif [ -r $CWD/make/${kde_module} ]; then
-        . $CWD/make/${kde_module}
-      else
-        # This is the default make && make install routine:
-        make $NUMJOBS || make || exit 1
-        make install DESTDIR=$PKG || exit 1
-      fi
-
-      # Back to source toplevel builddir, since cmake may have run in a subdir:
-      cd $SLACK_KDE_BUILD_DIR/${kde_module}/$(pkgbase $kde_src)
-
-      mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
-      # Use specific documentation files if available, else use a default set:
-      if [ -r $CWD/docs/${PKGNAME} ]; then
-        cp -a $(cat $CWD/docs/${PKGNAME}) \
-          $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
-      else
-        cp -a \
-          AUTHORS* CONTRIBUTING* COPYING* HACKING* \
-          INSTALL* MAINTAINERS README* NEWS* TODO* \
-          $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
-          # If there's a ChangeLog, installing at least part of the recent
-          # history is useful, but don't let it get totally out of control:
-          if [ -r ChangeLog ]; then
-            DOCSDIR=$(echo $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION)
-            cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-            touch -r ChangeLog $DOCSDIR/ChangeLog
-          fi
-      fi
-
-      # Get rid of zero-length junk files:
-      find $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION -type f -size 0 -exec rm --verbose "{}" \+
-      rmdir --verbose $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION 2> /dev/null
-
-      # Strip binaries:
-      strip_binaries $PKG
-
-      # If this package requires some doinst.sh material, add it here:
-      if [ -r $CWD/doinst.sh/${PKGNAME} ]; then
-        mkdir -p $PKG/install
-        cat $CWD/doinst.sh/${PKGNAME} \
-          | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
-          >> $PKG/install/doinst.sh
-      fi
-
-      # If there's any special post-install things to do, do them:
-      if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then
-        . $CWD/post-install/${PKGNAME}.post-install
-      fi
-
-      # If this is a modular package, build it here:
-      if [ -d $SLACK_KDE_BUILD_DIR/${kde_module}/package-$PKGNAME ]; then
-        cd $PKG
-        process_man_pages
-        process_info_pages
-        no_usr_share_doc          
-        mkdir -p $PKG/install
-        if [ -r $CWD/slack-desc/${PKGNAME} ]; then
-          cat $CWD/slack-desc/${PKGNAME} > $PKG/install/slack-desc
-        else
-          touch $PKG/install/slack-desc-missing
-        fi
-        if [ -r $CWD/build/${PKGNAME} ]; then
-          MODBUILD=$(cat $CWD/build/${PKGNAME})
-        else
-          MODBUILD=$BUILD
-        fi
-        if [ "$PKGNAME" = "kde-runtime" -o "$PKGNAME" = "kmix" ]; then
-          # If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG:
-          if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then
-            MODBUILD=${MODBUILD}_alsa
-          fi
-        fi
-        if [ -r $CWD/makepkg/${PKGNAME} ]; then
-          BUILD=$MODBUILD . $CWD/makepkg/${PKGNAME}
-        else
-          /sbin/makepkg -l y -c n ${SLACK_KDE_BUILD_DIR}/${kde_module}/${PKGNAME}-$(echo $MODULAR_PACKAGE_VERSION |tr - _)-${PKGARCH}-${MODBUILD}.txz
-        fi
-        # We will continue with the fresh packages installed:
-        upgradepkg --install-new --reinstall ${SLACK_KDE_BUILD_DIR}/${kde_module}/${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz
-        # Keep MIME database current:
-        /usr/bin/update-mime-database /usr/share/mime 1>/dev/null 2>/dev/null &
-      fi
-
-      # Reset $PKG to assume we're building the whole source dir:
-      PKG=${SLACK_KDE_BUILD_DIR}/${kde_module}/package-${kde_module}
-
-    done
-
-    # At this point, we have left the loop to build modular packages.
-    # We might need to build a package for the "<kde_module>", but to
-    # avoid needlessly repacking if there happens to be a package with
-    # the same name as "<kde_module>", we'll do some checks first.
-
-    # If every package listed in modules/"<kde_module>" is also listed
-    # in the modularize file, then there's no need to make a package
-    # for "<kde_module>":
-    if [ -z "$PRINT_PACKAGE_NAME" ]; then
-      echo
-      echo "Searching for packages in ${kde_module} that were not built modular:"
-    fi
-    cat $CWD/modules/${kde_module} | grep -v "^#" | grep -v -w "^" | while read checkpackage ; do
-      if ! grep -wq "^$checkpackage" ${CWD}/modularize ; then
-        # Non-modular package found, so we'll have to build the package below.
-        # It might already have been built once, but in that case it is likely
-        # that more things have been added to the package directory since then.
-        if [ -z "$PRINT_PACKAGE_NAME" ]; then
-          echo "Found non-modular package $checkpackage."
-        fi
-        exit 99
-      fi
-    done
-
-    # Exit if everything in "<kde_module>" was built modular:
-    if [ ! $? = 99 ]; then
-      if [ -z "$PRINT_PACKAGE_NAME" ]; then
-        echo "No non-modular components found in ${kde_module}."
-        echo "Not building catch-all package for ${kde_module}."
-        echo
-      fi
-      return
-    fi
-
-    # If there's no /usr directory in the "<kde_module>" package directory,
-    # then skip it.  There's nothing present worth packing up.
-    if [ ! -d ${SLACK_KDE_BUILD_DIR}/${kde_module}/package-${kde_module}/usr ]; then
-      if [ -z "$PRINT_PACKAGE_NAME" ]; then
-        echo "No /usr directory found in package-${kde_module}."
-        echo "Not building catch-all package for ${kde_module}."
-        echo
-      fi
-      return
-    fi
-
-    # Build a "<kde_module>" package for anything that wasn't built modular:
-    # It's safer to consider these to have binaries in them. ;-)
-
-    # Put up a bit of a black-box warning, in case this was a mistake where
-    # something was meant to be listed in the modularize file and wasn't:
-    if [ -z "$PRINT_PACKAGE_NAME" ]; then
-      echo
-      echo "**************************************************************************"
-      echo "* Building combined package for non-modular parts of ${kde_module}"
-      echo "**************************************************************************"
-      echo
-    fi
-
-    PKGARCH=$ARCH
-    cd $PKG
-
-    process_man_pages
-    process_info_pages
-    no_usr_share_doc
-
-    # If there are post-install things to do for the combined package,
-    # we do them here.  This could be used for things like making a
-    # VERSION number for a combined package.  :-)
-    if [ -r $CWD/post-install/${kde_module}.post-install ]; then
-      . $CWD/post-install/${kde_module}.post-install
-    fi
-    mkdir -p $PKG/install
-    if [ -r $CWD/slack-desc/${kde_module} ]; then
-      cat $CWD/slack-desc/${kde_module} > $PKG/install/slack-desc
-    else
-      touch $PKG/install/slack-desc-missing
-    fi
-    if [ -r $CWD/doinst.sh/${kde_module} ]; then
-      cat $CWD/doinst.sh/${kde_module} \
-        | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
-        >> $PKG/install/doinst.sh
-    fi
-    if [ -r $CWD/build/${kde_module} ]; then
-      SRCDIRBUILD=$(cat $CWD/build/${kde_module})
-    else
-      SRCDIRBUILD=$BUILD
-    fi
-    if [ -r $CWD/makepkg/${kde_module} ]; then
-      BUILD=$SRCDIRBUILD . $CWD/makepkg/${kde_module}
-    else
-      /sbin/makepkg -l y -c n ${SLACK_KDE_BUILD_DIR}/${kde_module}/${kde_module}-$(echo $VERSION |tr - _)-${PKGARCH}-${SRCDIRBUILD}.txz
-    fi
-    # We will continue with the fresh packages installed:
-    upgradepkg --install-new --reinstall ${SLACK_KDE_BUILD_DIR}/${kde_module}/${kde_module}-${VERSION}-${PKGARCH}-${SRCDIRBUILD}.txz
-    # Keep MIME database current:
-    /usr/bin/update-mime-database /usr/share/mime 1>/dev/null 2>/dev/null &
-  )
-}
-
-# Process the module queue. Format is:
-# module[:subpackage[,subpackage]] [module...]
-deterministic_build() {
-  RET=0
-  for ENTRY in $1 ; do
-    KDE_MOD=$(echo "$ENTRY": | cut -f1 -d:)
-    KDE_PKGS=$(echo "$ENTRY": | cut -f2 -d:)
-    if [ -z "$KDE_PKGS" ]; then
-      build_mod_pkg $KDE_MOD
-      let RET=$RET+$?
-    else
-      for KDE_PKG in $(echo $KDE_PKGS |tr ',' ' ') ; do
-        build_mod_pkg $KDE_MOD $KDE_PKG
-        let RET=$RET+$?
-      done
-    fi
-  done
-
-  return $RET
-}
-
-# MAIN PART #
-
-# Import the build configuration options for as far as they are not already set:
-[ -r ./kde.options ] && . ./kde.options
-
-# This avoids compiling a version number into KDE's .la files:
-QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR
-
-# Get the kde environment variables
-[ -d post-install/kdebase ] && eval $(sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" ./post-install/kdebase/profile.d/kde.sh)
-
-# Yes, we know kde-workspace is built twice.  kdebase needs the
-#   plasma bits from it, and then we build it again for good measure...
-# Same goes for kdelibs (at least during KDE 4.8.x) kdeutils:ksecrets needs
-#   kdelibs and then kdelibs needs a rebuild to pick up ksecretservice
-#   (this will no longer be required in KDE 4.9).
-# And kde-baseapps is rebuilt after kdewebdev because it can then pickup
-#   libtidy and enable the Konqueror validators plugin to validate HTML.
-KDEMODS=" \
-  kdelibs \
-  kdebase:nepomuk-core \
-  kdepimlibs \
-  kdebase \
-  kdesdk \
-  extragear:libkscreen \
-  kdegraphics \
-  kdebindings \
-  kdebase:kde-workspace \
-  kdeaccessibility \
-  kdeutils \
-  kdelibs \
-  kdemultimedia \
-  extragear:libktorrent \
-  kdenetwork \
-  oxygen-icons \
-  kdeadmin \
-  kdeartwork \
-  kdegames \
-  kdetoys \
-  kdepim \
-  kdepim-runtime \
-  kdenetwork:kopete \
-  kdeedu \
-  kdewebdev \
-  kdebase:kde-baseapps \
-  kdeplasma-addons \
-  polkit-kde \
-  extragear \
-  "
-
-# Allow for specification of individual packages to be built:
-if [ -z "$1" ]; then
-  MODQUEUE=$KDEMODS
-else
-  MODQUEUE="$*"
-fi
-
-# If requested, check if
-# sources, module definitions and slack-desc are complete and matching:
-if [ "$PRECHECK" = "yes" -o "$PRECHECK" = "YES" ]; then
-  precheck
-fi
-
-# And finally, start working!
-for module in \
-  $MODQUEUE ;
-do
-  if [ -z "$PRINT_PACKAGE_NAME" ]; then
-    echo "SlackBuild processing module '$module'"
-  fi
-  deterministic_build $module
-  if [ $? = 0 ]; then
-    # Move the created packages up into the KDE build directory:
-    mv ${SLACK_KDE_BUILD_DIR}/$(echo $module |cut -f1 -d:)/*.t?z ${SLACK_KDE_BUILD_DIR}/ 2> /dev/null
-    if [ "$CLEANUP" = "yes" -o "$CLEANUP" = "YES" ]; then
-      # Clean out package and build directories:
-      rm -rf ${SLACK_KDE_BUILD_DIR}/$(echo $module |cut -f1 -d:)
-    fi
-  else
-    if [ -z "$PRINT_PACKAGE_NAME" ]; then
-      echo "${module} failed to build."
-      touch "${SLACK_KDE_BUILD_DIR}/${kde_module}.failed"
-    fi
-    # Seems counterproductive to exit upon the first package build failure. Perhaps sending it
-    # through another time would help it, if later packages fix the build environment.
-    # If you still want to exit on first failure, set $EXIT_ON_FAIL to anything.
-    if [ ! -z "$EXIT_ON_FAIL" ]; then
-      exit 1
-    fi
-  fi
-  cd - > /dev/null
-done
-
-exit 0
-
-
diff --git a/source/kde/kde.options b/source/kde/kde.options
deleted file mode 100644
index 873c72307..000000000
--- a/source/kde/kde.options
+++ /dev/null
@@ -1,56 +0,0 @@
-# Set default version/arch/build.  You can override these settings
-# in the SlackBuild scripts for each package (koffice, for example,
-# usually has a different version number), or by setting your own
-# environment variables.
-
-[ -z $VERSION ] && export VERSION=4.14.3
-[ -z $BUILD ] && export BUILD=1
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-[ -z $PKGARCH ] && export PKGARCH=$ARCH
-
-# Use this as CFLAGS and CXXFLAGS:
-if [ -z "$SLKCFLAGS" ]; then
-  if [ "$ARCH" = "i586" ]; then
-    export SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fpermissive -fno-delete-null-pointer-checks"
-    export LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "s390" ]; then
-    export SLKCFLAGS="-O2 -fpermissive -fno-delete-null-pointer-checks"
-    export LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "x86_64" ]; then
-    export SLKCFLAGS="-O2 -fPIC -fpermissive -fno-delete-null-pointer-checks"
-    export LIBDIRSUFFIX="64"
-  elif [ "$ARCH" = "arm" ]; then
-    export SLKCFLAGS="-O2 -march=armv4 -mtune=xscale -fpermissive -fno-delete-null-pointer-checks"
-    export LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "armel" ]; then
-    export SLKCFLAGS="-O2 -march=armv4t -fpermissive -fno-delete-null-pointer-checks"
-    export LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "armv7hl" ]; then
-    export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fpermissive -fno-delete-null-pointer-checks"
-    export LIBDIRSUFFIX=""
-  else
-    export SLKCFLAGS="-O2 -fpermissive -fno-delete-null-pointer-checks"
-    export LIBDIRSUFFIX=""
-  fi
-fi
-
-# Use this to set the number of parallel make jobs:
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Additional cmake flags that are spanned across the KDE modules
-# Do not use "final build" unless we build an actual release.
-#export KDE_OPT_ARGS=" -DKDE4_ENABLE_FINAL=\"ON\"  -DSITE=\"slackware.com\" "
-export KDE_OPT_ARGS=" -DKDE4_BUILD_TESTS=OFF -DSITE=\"slackware.com\" -DKDE_DISTRIBUTION_TEXT=\"volkerdi@slackware.com\" "
-
diff --git a/testing/source/vtown/kde/build/native-build-number/akonadi b/source/kde/kde/build/akonadi
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akonadi
+++ b/source/kde/kde/build/akonadi
diff --git a/testing/source/vtown/kde/build/native-build-number/akonadi-calendar b/source/kde/kde/build/akonadi-calendar
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akonadi-calendar
+++ b/source/kde/kde/build/akonadi-calendar
diff --git a/testing/source/vtown/kde/build/native-build-number/akonadi-calendar-tools b/source/kde/kde/build/akonadi-calendar-tools
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akonadi-calendar-tools
+++ b/source/kde/kde/build/akonadi-calendar-tools
diff --git a/testing/source/vtown/kde/build/native-build-number/akonadi-contacts b/source/kde/kde/build/akonadi-contacts
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akonadi-contacts
+++ b/source/kde/kde/build/akonadi-contacts
diff --git a/testing/source/vtown/kde/build/native-build-number/akonadi-import-wizard b/source/kde/kde/build/akonadi-import-wizard
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akonadi-import-wizard
+++ b/source/kde/kde/build/akonadi-import-wizard
diff --git a/testing/source/vtown/kde/build/native-build-number/akonadi-mime b/source/kde/kde/build/akonadi-mime
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akonadi-mime
+++ b/source/kde/kde/build/akonadi-mime
diff --git a/testing/source/vtown/kde/build/native-build-number/akonadi-notes b/source/kde/kde/build/akonadi-notes
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akonadi-notes
+++ b/source/kde/kde/build/akonadi-notes
diff --git a/testing/source/vtown/kde/build/native-build-number/akonadi-search b/source/kde/kde/build/akonadi-search
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akonadi-search
+++ b/source/kde/kde/build/akonadi-search
diff --git a/testing/source/vtown/kde/build/native-build-number/akonadiconsole b/source/kde/kde/build/akonadiconsole
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akonadiconsole
+++ b/source/kde/kde/build/akonadiconsole
diff --git a/testing/source/vtown/kde/build/native-build-number/akregator b/source/kde/kde/build/akregator
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/akregator
+++ b/source/kde/kde/build/akregator
diff --git a/testing/source/vtown/kde/build/native-build-number/alkimia b/source/kde/kde/build/alkimia
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/alkimia
+++ b/source/kde/kde/build/alkimia
diff --git a/testing/source/vtown/kde/build/native-build-number/analitza b/source/kde/kde/build/analitza
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/analitza
+++ b/source/kde/kde/build/analitza
diff --git a/testing/source/vtown/kde/build/native-build-number/ark b/source/kde/kde/build/ark
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ark
+++ b/source/kde/kde/build/ark
diff --git a/testing/source/vtown/kde/build/native-build-number/artikulate b/source/kde/kde/build/artikulate
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/artikulate
+++ b/source/kde/kde/build/artikulate
diff --git a/testing/source/vtown/kde/build/native-build-number/attica b/source/kde/kde/build/attica
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/attica
+++ b/source/kde/kde/build/attica
diff --git a/testing/source/vtown/kde/build/native-build-number/audiocd-kio b/source/kde/kde/build/audiocd-kio
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/audiocd-kio
+++ b/source/kde/kde/build/audiocd-kio
diff --git a/testing/source/vtown/kde/build/native-build-number/baloo b/source/kde/kde/build/baloo
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/baloo
+++ b/source/kde/kde/build/baloo
diff --git a/testing/source/vtown/kde/build/native-build-number/baloo-widgets b/source/kde/kde/build/baloo-widgets
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/baloo-widgets
+++ b/source/kde/kde/build/baloo-widgets
diff --git a/testing/source/vtown/kde/build/native-build-number/blinken b/source/kde/kde/build/blinken
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/blinken
+++ b/source/kde/kde/build/blinken
diff --git a/testing/source/vtown/kde/build/native-build-number/bluedevil b/source/kde/kde/build/bluedevil
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/bluedevil
+++ b/source/kde/kde/build/bluedevil
diff --git a/testing/source/vtown/kde/build/native-build-number/bluez-qt b/source/kde/kde/build/bluez-qt
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/bluez-qt
+++ b/source/kde/kde/build/bluez-qt
diff --git a/testing/source/vtown/kde/build/native-build-number/bomber b/source/kde/kde/build/bomber
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/bomber
+++ b/source/kde/kde/build/bomber
diff --git a/testing/source/vtown/kde/build/native-build-number/bovo b/source/kde/kde/build/bovo
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/bovo
+++ b/source/kde/kde/build/bovo
diff --git a/testing/source/vtown/kde/build/native-build-number/breeze b/source/kde/kde/build/breeze
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/breeze
+++ b/source/kde/kde/build/breeze
diff --git a/testing/source/vtown/kde/build/native-build-number/breeze-grub b/source/kde/kde/build/breeze-grub
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/breeze-grub
+++ b/source/kde/kde/build/breeze-grub
diff --git a/testing/source/vtown/kde/build/native-build-number/breeze-gtk b/source/kde/kde/build/breeze-gtk
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/breeze-gtk
+++ b/source/kde/kde/build/breeze-gtk
diff --git a/testing/source/vtown/kde/build/native-build-number/breeze-icons b/source/kde/kde/build/breeze-icons
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/breeze-icons
+++ b/source/kde/kde/build/breeze-icons
diff --git a/testing/source/vtown/kde/build/native-build-number/calendarsupport b/source/kde/kde/build/calendarsupport
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/calendarsupport
+++ b/source/kde/kde/build/calendarsupport
diff --git a/testing/source/vtown/kde/build/native-build-number/calligra b/source/kde/kde/build/calligra
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/calligra
+++ b/source/kde/kde/build/calligra
diff --git a/testing/source/vtown/kde/build/native-build-number/calligraplan b/source/kde/kde/build/calligraplan
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/calligraplan
+++ b/source/kde/kde/build/calligraplan
diff --git a/testing/source/vtown/kde/build/native-build-number/cantor b/source/kde/kde/build/cantor
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/cantor
+++ b/source/kde/kde/build/cantor
diff --git a/testing/source/vtown/kde/build/native-build-number/cervisia b/source/kde/kde/build/cervisia
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/cervisia
+++ b/source/kde/kde/build/cervisia
diff --git a/testing/source/vtown/kde/build/native-build-number/digikam b/source/kde/kde/build/digikam
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/digikam
+++ b/source/kde/kde/build/digikam
diff --git a/testing/source/vtown/kde/build/native-build-number/discover b/source/kde/kde/build/discover
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/discover
+++ b/source/kde/kde/build/discover
diff --git a/testing/source/vtown/kde/build/native-build-number/dolphin b/source/kde/kde/build/dolphin
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/dolphin
+++ b/source/kde/kde/build/dolphin
diff --git a/testing/source/vtown/kde/build/native-build-number/dolphin-plugins b/source/kde/kde/build/dolphin-plugins
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/dolphin-plugins
+++ b/source/kde/kde/build/dolphin-plugins
diff --git a/testing/source/vtown/kde/build/native-build-number/dragon b/source/kde/kde/build/dragon
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/dragon
+++ b/source/kde/kde/build/dragon
diff --git a/testing/source/vtown/kde/build/native-build-number/drkonqi b/source/kde/kde/build/drkonqi
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/drkonqi
+++ b/source/kde/kde/build/drkonqi
diff --git a/testing/source/vtown/kde/build/native-build-number/elisa b/source/kde/kde/build/elisa
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/elisa
+++ b/source/kde/kde/build/elisa
diff --git a/testing/source/vtown/kde/build/native-build-number/eventviews b/source/kde/kde/build/eventviews
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/eventviews
+++ b/source/kde/kde/build/eventviews
diff --git a/testing/source/vtown/kde/build/native-build-number/extra-cmake-modules b/source/kde/kde/build/extra-cmake-modules
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/extra-cmake-modules
+++ b/source/kde/kde/build/extra-cmake-modules
diff --git a/testing/source/vtown/kde/build/native-build-number/falkon b/source/kde/kde/build/falkon
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/falkon
+++ b/source/kde/kde/build/falkon
diff --git a/testing/source/vtown/kde/build/native-build-number/ffmpegthumbs b/source/kde/kde/build/ffmpegthumbs
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ffmpegthumbs
+++ b/source/kde/kde/build/ffmpegthumbs
diff --git a/testing/source/vtown/kde/build/native-build-number/filelight b/source/kde/kde/build/filelight
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/filelight
+++ b/source/kde/kde/build/filelight
diff --git a/testing/source/vtown/kde/build/native-build-number/frameworkintegration b/source/kde/kde/build/frameworkintegration
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/frameworkintegration
+++ b/source/kde/kde/build/frameworkintegration
diff --git a/testing/source/vtown/kde/build/native-build-number/granatier b/source/kde/kde/build/granatier
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/granatier
+++ b/source/kde/kde/build/granatier
diff --git a/testing/source/vtown/kde/build/native-build-number/grantlee-editor b/source/kde/kde/build/grantlee-editor
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/grantlee-editor
+++ b/source/kde/kde/build/grantlee-editor
diff --git a/testing/source/vtown/kde/build/native-build-number/grantleetheme b/source/kde/kde/build/grantleetheme
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/grantleetheme
+++ b/source/kde/kde/build/grantleetheme
diff --git a/testing/source/vtown/kde/build/native-build-number/gwenview b/source/kde/kde/build/gwenview
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/gwenview
+++ b/source/kde/kde/build/gwenview
diff --git a/testing/source/vtown/kde/build/native-build-number/incidenceeditor b/source/kde/kde/build/incidenceeditor
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/incidenceeditor
+++ b/source/kde/kde/build/incidenceeditor
diff --git a/source/kde/build/increment.sh b/source/kde/kde/build/increment.sh
index 6de5d0da6..6de5d0da6 100755
--- a/source/kde/build/increment.sh
+++ b/source/kde/kde/build/increment.sh
diff --git a/testing/source/vtown/kde/build/native-build-number/juk b/source/kde/kde/build/juk
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/juk
+++ b/source/kde/kde/build/juk
diff --git a/testing/source/vtown/kde/build/native-build-number/k3b b/source/kde/kde/build/k3b
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/k3b
+++ b/source/kde/kde/build/k3b
diff --git a/testing/source/vtown/kde/build/native-build-number/kaccounts-integration b/source/kde/kde/build/kaccounts-integration
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kaccounts-integration
+++ b/source/kde/kde/build/kaccounts-integration
diff --git a/testing/source/vtown/kde/build/native-build-number/kaccounts-providers b/source/kde/kde/build/kaccounts-providers
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kaccounts-providers
+++ b/source/kde/kde/build/kaccounts-providers
diff --git a/testing/source/vtown/kde/build/native-build-number/kactivities b/source/kde/kde/build/kactivities
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kactivities
+++ b/source/kde/kde/build/kactivities
diff --git a/testing/source/vtown/kde/build/native-build-number/kactivities-stats b/source/kde/kde/build/kactivities-stats
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kactivities-stats
+++ b/source/kde/kde/build/kactivities-stats
diff --git a/testing/source/vtown/kde/build/native-build-number/kactivitymanagerd b/source/kde/kde/build/kactivitymanagerd
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kactivitymanagerd
+++ b/source/kde/kde/build/kactivitymanagerd
diff --git a/testing/source/vtown/kde/build/native-build-number/kaddressbook b/source/kde/kde/build/kaddressbook
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kaddressbook
+++ b/source/kde/kde/build/kaddressbook
diff --git a/testing/source/vtown/kde/build/native-build-number/kajongg b/source/kde/kde/build/kajongg
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kajongg
+++ b/source/kde/kde/build/kajongg
diff --git a/testing/source/vtown/kde/build/native-build-number/kalarm b/source/kde/kde/build/kalarm
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kalarm
+++ b/source/kde/kde/build/kalarm
diff --git a/testing/source/vtown/kde/build/native-build-number/kalarmcal b/source/kde/kde/build/kalarmcal
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kalarmcal
+++ b/source/kde/kde/build/kalarmcal
diff --git a/testing/source/vtown/kde/build/native-build-number/kalgebra b/source/kde/kde/build/kalgebra
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kalgebra
+++ b/source/kde/kde/build/kalgebra
diff --git a/testing/source/vtown/kde/build/native-build-number/kalzium b/source/kde/kde/build/kalzium
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kalzium
+++ b/source/kde/kde/build/kalzium
diff --git a/testing/source/vtown/kde/build/native-build-number/kamera b/source/kde/kde/build/kamera
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kamera
+++ b/source/kde/kde/build/kamera
diff --git a/testing/source/vtown/kde/build/native-build-number/kamoso b/source/kde/kde/build/kamoso
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kamoso
+++ b/source/kde/kde/build/kamoso
diff --git a/testing/source/vtown/kde/build/native-build-number/kanagram b/source/kde/kde/build/kanagram
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kanagram
+++ b/source/kde/kde/build/kanagram
diff --git a/testing/source/vtown/kde/build/native-build-number/kapidox b/source/kde/kde/build/kapidox
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kapidox
+++ b/source/kde/kde/build/kapidox
diff --git a/testing/source/vtown/kde/build/native-build-number/kapman b/source/kde/kde/build/kapman
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kapman
+++ b/source/kde/kde/build/kapman
diff --git a/testing/source/vtown/kde/build/native-build-number/kapptemplate b/source/kde/kde/build/kapptemplate
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kapptemplate
+++ b/source/kde/kde/build/kapptemplate
diff --git a/testing/source/vtown/kde/build/native-build-number/karchive b/source/kde/kde/build/karchive
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/karchive
+++ b/source/kde/kde/build/karchive
diff --git a/testing/source/vtown/kde/build/native-build-number/kate b/source/kde/kde/build/kate
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kate
+++ b/source/kde/kde/build/kate
diff --git a/testing/source/vtown/kde/build/native-build-number/katomic b/source/kde/kde/build/katomic
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/katomic
+++ b/source/kde/kde/build/katomic
diff --git a/testing/source/vtown/kde/build/native-build-number/kaudiocreator b/source/kde/kde/build/kaudiocreator
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kaudiocreator
+++ b/source/kde/kde/build/kaudiocreator
diff --git a/testing/source/vtown/kde/build/native-build-number/kauth b/source/kde/kde/build/kauth
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kauth
+++ b/source/kde/kde/build/kauth
diff --git a/testing/source/vtown/kde/build/native-build-number/kbackup b/source/kde/kde/build/kbackup
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kbackup
+++ b/source/kde/kde/build/kbackup
diff --git a/testing/source/vtown/kde/build/native-build-number/kblackbox b/source/kde/kde/build/kblackbox
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kblackbox
+++ b/source/kde/kde/build/kblackbox
diff --git a/testing/source/vtown/kde/build/native-build-number/kblocks b/source/kde/kde/build/kblocks
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kblocks
+++ b/source/kde/kde/build/kblocks
diff --git a/testing/source/vtown/kde/build/native-build-number/kbookmarks b/source/kde/kde/build/kbookmarks
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kbookmarks
+++ b/source/kde/kde/build/kbookmarks
diff --git a/testing/source/vtown/kde/build/native-build-number/kbounce b/source/kde/kde/build/kbounce
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kbounce
+++ b/source/kde/kde/build/kbounce
diff --git a/testing/source/vtown/kde/build/native-build-number/kbreakout b/source/kde/kde/build/kbreakout
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kbreakout
+++ b/source/kde/kde/build/kbreakout
diff --git a/testing/source/vtown/kde/build/native-build-number/kbruch b/source/kde/kde/build/kbruch
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kbruch
+++ b/source/kde/kde/build/kbruch
diff --git a/testing/source/vtown/kde/build/native-build-number/kcachegrind b/source/kde/kde/build/kcachegrind
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcachegrind
+++ b/source/kde/kde/build/kcachegrind
diff --git a/testing/source/vtown/kde/build/native-build-number/kcalc b/source/kde/kde/build/kcalc
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcalc
+++ b/source/kde/kde/build/kcalc
diff --git a/testing/source/vtown/kde/build/native-build-number/kcalcore b/source/kde/kde/build/kcalcore
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcalcore
+++ b/source/kde/kde/build/kcalcore
diff --git a/testing/source/vtown/kde/build/native-build-number/kcalendarcore b/source/kde/kde/build/kcalendarcore
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcalendarcore
+++ b/source/kde/kde/build/kcalendarcore
diff --git a/testing/source/vtown/kde/build/native-build-number/kcalutils b/source/kde/kde/build/kcalutils
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcalutils
+++ b/source/kde/kde/build/kcalutils
diff --git a/testing/source/vtown/kde/build/native-build-number/kcharselect b/source/kde/kde/build/kcharselect
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcharselect
+++ b/source/kde/kde/build/kcharselect
diff --git a/testing/source/vtown/kde/build/native-build-number/kcmutils b/source/kde/kde/build/kcmutils
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcmutils
+++ b/source/kde/kde/build/kcmutils
diff --git a/testing/source/vtown/kde/build/native-build-number/kcodecs b/source/kde/kde/build/kcodecs
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcodecs
+++ b/source/kde/kde/build/kcodecs
diff --git a/testing/source/vtown/kde/build/native-build-number/kcolorchooser b/source/kde/kde/build/kcolorchooser
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcolorchooser
+++ b/source/kde/kde/build/kcolorchooser
diff --git a/testing/source/vtown/kde/build/native-build-number/kcompletion b/source/kde/kde/build/kcompletion
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcompletion
+++ b/source/kde/kde/build/kcompletion
diff --git a/testing/source/vtown/kde/build/native-build-number/kconfig b/source/kde/kde/build/kconfig
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kconfig
+++ b/source/kde/kde/build/kconfig
diff --git a/testing/source/vtown/kde/build/native-build-number/kconfigwidgets b/source/kde/kde/build/kconfigwidgets
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kconfigwidgets
+++ b/source/kde/kde/build/kconfigwidgets
diff --git a/testing/source/vtown/kde/build/native-build-number/kcontacts b/source/kde/kde/build/kcontacts
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcontacts
+++ b/source/kde/kde/build/kcontacts
diff --git a/testing/source/vtown/kde/build/native-build-number/kcoreaddons b/source/kde/kde/build/kcoreaddons
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcoreaddons
+++ b/source/kde/kde/build/kcoreaddons
diff --git a/testing/source/vtown/kde/build/native-build-number/kcrash b/source/kde/kde/build/kcrash
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcrash
+++ b/source/kde/kde/build/kcrash
diff --git a/testing/source/vtown/kde/build/native-build-number/kcron b/source/kde/kde/build/kcron
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kcron
+++ b/source/kde/kde/build/kcron
diff --git a/testing/source/vtown/kde/build/native-build-number/kdav b/source/kde/kde/build/kdav
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdav
+++ b/source/kde/kde/build/kdav
diff --git a/testing/source/vtown/kde/build/native-build-number/kdbusaddons b/source/kde/kde/build/kdbusaddons
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdbusaddons
+++ b/source/kde/kde/build/kdbusaddons
diff --git a/testing/source/vtown/kde/build/native-build-number/kde-cli-tools b/source/kde/kde/build/kde-cli-tools
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kde-cli-tools
+++ b/source/kde/kde/build/kde-cli-tools
diff --git a/testing/source/vtown/kde/build/native-build-number/kde-dev-scripts b/source/kde/kde/build/kde-dev-scripts
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kde-dev-scripts
+++ b/source/kde/kde/build/kde-dev-scripts
diff --git a/testing/source/vtown/kde/build/native-build-number/kde-dev-utils b/source/kde/kde/build/kde-dev-utils
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kde-dev-utils
+++ b/source/kde/kde/build/kde-dev-utils
diff --git a/testing/source/vtown/kde/build/native-build-number/kde-gtk-config b/source/kde/kde/build/kde-gtk-config
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kde-gtk-config
+++ b/source/kde/kde/build/kde-gtk-config
diff --git a/testing/source/vtown/kde/build/native-build-number/kde-wallpapers b/source/kde/kde/build/kde-wallpapers
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kde-wallpapers
+++ b/source/kde/kde/build/kde-wallpapers
diff --git a/testing/source/vtown/kde/build/native-build-number/kdeaccessibility b/source/kde/kde/build/kdeaccessibility
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdeaccessibility
+++ b/source/kde/kde/build/kdeaccessibility
diff --git a/testing/source/vtown/kde/build/native-build-number/kdebugsettings b/source/kde/kde/build/kdebugsettings
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdebugsettings
+++ b/source/kde/kde/build/kdebugsettings
diff --git a/testing/source/vtown/kde/build/native-build-number/kdeclarative b/source/kde/kde/build/kdeclarative
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdeclarative
+++ b/source/kde/kde/build/kdeclarative
diff --git a/testing/source/vtown/kde/build/native-build-number/kdeconnect-kde b/source/kde/kde/build/kdeconnect-kde
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdeconnect-kde
+++ b/source/kde/kde/build/kdeconnect-kde
diff --git a/testing/source/vtown/kde/build/native-build-number/kdecoration b/source/kde/kde/build/kdecoration
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdecoration
+++ b/source/kde/kde/build/kdecoration
diff --git a/testing/source/vtown/kde/build/native-build-number/kded b/source/kde/kde/build/kded
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kded
+++ b/source/kde/kde/build/kded
diff --git a/testing/source/vtown/kde/build/native-build-number/kdeedu b/source/kde/kde/build/kdeedu
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdeedu
+++ b/source/kde/kde/build/kdeedu
diff --git a/testing/source/vtown/kde/build/native-build-number/kdeedu-data b/source/kde/kde/build/kdeedu-data
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdeedu-data
+++ b/source/kde/kde/build/kdeedu-data
diff --git a/testing/source/vtown/kde/build/native-build-number/kdegraphics b/source/kde/kde/build/kdegraphics
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdegraphics
+++ b/source/kde/kde/build/kdegraphics
diff --git a/testing/source/vtown/kde/build/native-build-number/kdegraphics-mobipocket b/source/kde/kde/build/kdegraphics-mobipocket
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdegraphics-mobipocket
+++ b/source/kde/kde/build/kdegraphics-mobipocket
diff --git a/testing/source/vtown/kde/build/native-build-number/kdegraphics-thumbnailers b/source/kde/kde/build/kdegraphics-thumbnailers
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdegraphics-thumbnailers
+++ b/source/kde/kde/build/kdegraphics-thumbnailers
diff --git a/testing/source/vtown/kde/build/native-build-number/kdelibs b/source/kde/kde/build/kdelibs
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdelibs
+++ b/source/kde/kde/build/kdelibs
diff --git a/testing/source/vtown/kde/build/native-build-number/kdelibs4support b/source/kde/kde/build/kdelibs4support
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdelibs4support
+++ b/source/kde/kde/build/kdelibs4support
diff --git a/testing/source/vtown/kde/build/native-build-number/kdenetwork b/source/kde/kde/build/kdenetwork
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdenetwork
+++ b/source/kde/kde/build/kdenetwork
diff --git a/testing/source/vtown/kde/build/native-build-number/kdenetwork-filesharing b/source/kde/kde/build/kdenetwork-filesharing
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdenetwork-filesharing
+++ b/source/kde/kde/build/kdenetwork-filesharing
diff --git a/testing/source/vtown/kde/build/native-build-number/kdenlive b/source/kde/kde/build/kdenlive
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdenlive
+++ b/source/kde/kde/build/kdenlive
diff --git a/testing/source/vtown/kde/build/native-build-number/kdepim b/source/kde/kde/build/kdepim
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdepim
+++ b/source/kde/kde/build/kdepim
diff --git a/testing/source/vtown/kde/build/native-build-number/kdepim-addons b/source/kde/kde/build/kdepim-addons
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdepim-addons
+++ b/source/kde/kde/build/kdepim-addons
diff --git a/testing/source/vtown/kde/build/native-build-number/kdepim-apps-libs b/source/kde/kde/build/kdepim-apps-libs
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdepim-apps-libs
+++ b/source/kde/kde/build/kdepim-apps-libs
diff --git a/testing/source/vtown/kde/build/native-build-number/kdepim-runtime b/source/kde/kde/build/kdepim-runtime
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdepim-runtime
+++ b/source/kde/kde/build/kdepim-runtime
diff --git a/testing/source/vtown/kde/build/native-build-number/kdeplasma-addons b/source/kde/kde/build/kdeplasma-addons
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdeplasma-addons
+++ b/source/kde/kde/build/kdeplasma-addons
diff --git a/testing/source/vtown/kde/build/native-build-number/kdesdk b/source/kde/kde/build/kdesdk
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdesdk
+++ b/source/kde/kde/build/kdesdk
diff --git a/testing/source/vtown/kde/build/native-build-number/kdesdk-kioslaves b/source/kde/kde/build/kdesdk-kioslaves
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdesdk-kioslaves
+++ b/source/kde/kde/build/kdesdk-kioslaves
diff --git a/testing/source/vtown/kde/build/native-build-number/kdesdk-thumbnailers b/source/kde/kde/build/kdesdk-thumbnailers
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdesdk-thumbnailers
+++ b/source/kde/kde/build/kdesdk-thumbnailers
diff --git a/testing/source/vtown/kde/build/native-build-number/kdesignerplugin b/source/kde/kde/build/kdesignerplugin
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdesignerplugin
+++ b/source/kde/kde/build/kdesignerplugin
diff --git a/testing/source/vtown/kde/build/native-build-number/kdesu b/source/kde/kde/build/kdesu
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdesu
+++ b/source/kde/kde/build/kdesu
diff --git a/testing/source/vtown/kde/build/native-build-number/kdev-php b/source/kde/kde/build/kdev-php
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdev-php
+++ b/source/kde/kde/build/kdev-php
diff --git a/testing/source/vtown/kde/build/native-build-number/kdev-python b/source/kde/kde/build/kdev-python
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdev-python
+++ b/source/kde/kde/build/kdev-python
diff --git a/testing/source/vtown/kde/build/native-build-number/kdevelop b/source/kde/kde/build/kdevelop
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdevelop
+++ b/source/kde/kde/build/kdevelop
diff --git a/testing/source/vtown/kde/build/native-build-number/kdevelop-pg-qt b/source/kde/kde/build/kdevelop-pg-qt
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdevelop-pg-qt
+++ b/source/kde/kde/build/kdevelop-pg-qt
diff --git a/testing/source/vtown/kde/build/native-build-number/kdevplatform b/source/kde/kde/build/kdevplatform
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdevplatform
+++ b/source/kde/kde/build/kdevplatform
diff --git a/testing/source/vtown/kde/build/native-build-number/kdewebdev b/source/kde/kde/build/kdewebdev
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdewebdev
+++ b/source/kde/kde/build/kdewebdev
diff --git a/testing/source/vtown/kde/build/native-build-number/kdewebkit b/source/kde/kde/build/kdewebkit
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdewebkit
+++ b/source/kde/kde/build/kdewebkit
diff --git a/testing/source/vtown/kde/build/native-build-number/kdf b/source/kde/kde/build/kdf
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdf
+++ b/source/kde/kde/build/kdf
diff --git a/testing/source/vtown/kde/build/native-build-number/kdiagram b/source/kde/kde/build/kdiagram
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdiagram
+++ b/source/kde/kde/build/kdiagram
diff --git a/testing/source/vtown/kde/build/native-build-number/kdialog b/source/kde/kde/build/kdialog
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdialog
+++ b/source/kde/kde/build/kdialog
diff --git a/testing/source/vtown/kde/build/native-build-number/kdiamond b/source/kde/kde/build/kdiamond
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdiamond
+++ b/source/kde/kde/build/kdiamond
diff --git a/testing/source/vtown/kde/build/native-build-number/kdnssd b/source/kde/kde/build/kdnssd
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdnssd
+++ b/source/kde/kde/build/kdnssd
diff --git a/testing/source/vtown/kde/build/native-build-number/kdoctools b/source/kde/kde/build/kdoctools
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kdoctools
+++ b/source/kde/kde/build/kdoctools
diff --git a/testing/source/vtown/kde/build/native-build-number/keditbookmarks b/source/kde/kde/build/keditbookmarks
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/keditbookmarks
+++ b/source/kde/kde/build/keditbookmarks
diff --git a/testing/source/vtown/kde/build/native-build-number/kemoticons b/source/kde/kde/build/kemoticons
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kemoticons
+++ b/source/kde/kde/build/kemoticons
diff --git a/testing/source/vtown/kde/build/native-build-number/kfilemetadata b/source/kde/kde/build/kfilemetadata
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
diff --git a/testing/source/vtown/kde/build/native-build-number/kfind b/source/kde/kde/build/kfind
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kfind
+++ b/source/kde/kde/build/kfind
diff --git a/testing/source/vtown/kde/build/native-build-number/kfloppy b/source/kde/kde/build/kfloppy
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kfloppy
+++ b/source/kde/kde/build/kfloppy
diff --git a/testing/source/vtown/kde/build/native-build-number/kfourinline b/source/kde/kde/build/kfourinline
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kfourinline
+++ b/source/kde/kde/build/kfourinline
diff --git a/testing/source/vtown/kde/build/native-build-number/kgamma5 b/source/kde/kde/build/kgamma5
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kgamma5
+++ b/source/kde/kde/build/kgamma5
diff --git a/testing/source/vtown/kde/build/native-build-number/kgeography b/source/kde/kde/build/kgeography
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kgeography
+++ b/source/kde/kde/build/kgeography
diff --git a/testing/source/vtown/kde/build/native-build-number/kget b/source/kde/kde/build/kget
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kget
+++ b/source/kde/kde/build/kget
diff --git a/testing/source/vtown/kde/build/native-build-number/kglobalaccel b/source/kde/kde/build/kglobalaccel
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kglobalaccel
+++ b/source/kde/kde/build/kglobalaccel
diff --git a/testing/source/vtown/kde/build/native-build-number/kgoldrunner b/source/kde/kde/build/kgoldrunner
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kgoldrunner
+++ b/source/kde/kde/build/kgoldrunner
diff --git a/testing/source/vtown/kde/build/native-build-number/kgpg b/source/kde/kde/build/kgpg
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kgpg
+++ b/source/kde/kde/build/kgpg
diff --git a/testing/source/vtown/kde/build/native-build-number/kguiaddons b/source/kde/kde/build/kguiaddons
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kguiaddons
+++ b/source/kde/kde/build/kguiaddons
diff --git a/testing/source/vtown/kde/build/native-build-number/khangman b/source/kde/kde/build/khangman
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/khangman
+++ b/source/kde/kde/build/khangman
diff --git a/testing/source/vtown/kde/build/native-build-number/khelpcenter b/source/kde/kde/build/khelpcenter
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/khelpcenter
+++ b/source/kde/kde/build/khelpcenter
diff --git a/testing/source/vtown/kde/build/native-build-number/kholidays b/source/kde/kde/build/kholidays
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kholidays
+++ b/source/kde/kde/build/kholidays
diff --git a/testing/source/vtown/kde/build/native-build-number/khotkeys b/source/kde/kde/build/khotkeys
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/khotkeys
+++ b/source/kde/kde/build/khotkeys
diff --git a/testing/source/vtown/kde/build/native-build-number/khtml b/source/kde/kde/build/khtml
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/khtml
+++ b/source/kde/kde/build/khtml
diff --git a/testing/source/vtown/kde/build/native-build-number/ki18n b/source/kde/kde/build/ki18n
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ki18n
+++ b/source/kde/kde/build/ki18n
diff --git a/testing/source/vtown/kde/build/native-build-number/kiconthemes b/source/kde/kde/build/kiconthemes
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kiconthemes
+++ b/source/kde/kde/build/kiconthemes
diff --git a/testing/source/vtown/kde/build/native-build-number/kid3 b/source/kde/kde/build/kid3
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kid3
+++ b/source/kde/kde/build/kid3
diff --git a/testing/source/vtown/kde/build/native-build-number/kidentitymanagement b/source/kde/kde/build/kidentitymanagement
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kidentitymanagement
+++ b/source/kde/kde/build/kidentitymanagement
diff --git a/testing/source/vtown/kde/build/native-build-number/kidletime b/source/kde/kde/build/kidletime
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kidletime
+++ b/source/kde/kde/build/kidletime
diff --git a/testing/source/vtown/kde/build/native-build-number/kig b/source/kde/kde/build/kig
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kig
+++ b/source/kde/kde/build/kig
diff --git a/testing/source/vtown/kde/build/native-build-number/kigo b/source/kde/kde/build/kigo
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kigo
+++ b/source/kde/kde/build/kigo
diff --git a/testing/source/vtown/kde/build/native-build-number/kile b/source/kde/kde/build/kile
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kile
+++ b/source/kde/kde/build/kile
diff --git a/testing/source/vtown/kde/build/native-build-number/killbots b/source/kde/kde/build/killbots
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/killbots
+++ b/source/kde/kde/build/killbots
diff --git a/testing/source/vtown/kde/build/native-build-number/kimageformats b/source/kde/kde/build/kimageformats
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kimageformats
+++ b/source/kde/kde/build/kimageformats
diff --git a/testing/source/vtown/kde/build/native-build-number/kimagemapeditor b/source/kde/kde/build/kimagemapeditor
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kimagemapeditor
+++ b/source/kde/kde/build/kimagemapeditor
diff --git a/testing/source/vtown/kde/build/native-build-number/kimap b/source/kde/kde/build/kimap
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kimap
+++ b/source/kde/kde/build/kimap
diff --git a/testing/source/vtown/kde/build/native-build-number/kinfocenter b/source/kde/kde/build/kinfocenter
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kinfocenter
+++ b/source/kde/kde/build/kinfocenter
diff --git a/testing/source/vtown/kde/build/native-build-number/kinit b/source/kde/kde/build/kinit
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kinit
+++ b/source/kde/kde/build/kinit
diff --git a/testing/source/vtown/kde/build/native-build-number/kio b/source/kde/kde/build/kio
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kio
+++ b/source/kde/kde/build/kio
diff --git a/testing/source/vtown/kde/build/native-build-number/kio-extras b/source/kde/kde/build/kio-extras
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kio-extras
+++ b/source/kde/kde/build/kio-extras
diff --git a/testing/source/vtown/kde/build/native-build-number/kio-gdrive b/source/kde/kde/build/kio-gdrive
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kio-gdrive
+++ b/source/kde/kde/build/kio-gdrive
diff --git a/testing/source/vtown/kde/build/native-build-number/kipi-plugins b/source/kde/kde/build/kipi-plugins
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kipi-plugins
+++ b/source/kde/kde/build/kipi-plugins
diff --git a/testing/source/vtown/kde/build/native-build-number/kirigami-gallery b/source/kde/kde/build/kirigami-gallery
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kirigami-gallery
+++ b/source/kde/kde/build/kirigami-gallery
diff --git a/testing/source/vtown/kde/build/native-build-number/kirigami2 b/source/kde/kde/build/kirigami2
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kirigami2
+++ b/source/kde/kde/build/kirigami2
diff --git a/testing/source/vtown/kde/build/native-build-number/kiriki b/source/kde/kde/build/kiriki
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kiriki
+++ b/source/kde/kde/build/kiriki
diff --git a/testing/source/vtown/kde/build/native-build-number/kitemmodels b/source/kde/kde/build/kitemmodels
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kitemmodels
+++ b/source/kde/kde/build/kitemmodels
diff --git a/testing/source/vtown/kde/build/native-build-number/kitemviews b/source/kde/kde/build/kitemviews
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kitemviews
+++ b/source/kde/kde/build/kitemviews
diff --git a/testing/source/vtown/kde/build/native-build-number/kiten b/source/kde/kde/build/kiten
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kiten
+++ b/source/kde/kde/build/kiten
diff --git a/testing/source/vtown/kde/build/native-build-number/kitinerary b/source/kde/kde/build/kitinerary
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kitinerary
+++ b/source/kde/kde/build/kitinerary
diff --git a/testing/source/vtown/kde/build/native-build-number/kjobwidgets b/source/kde/kde/build/kjobwidgets
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kjobwidgets
+++ b/source/kde/kde/build/kjobwidgets
diff --git a/testing/source/vtown/kde/build/native-build-number/kjots b/source/kde/kde/build/kjots
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kjots
+++ b/source/kde/kde/build/kjots
diff --git a/testing/source/vtown/kde/build/native-build-number/kjs b/source/kde/kde/build/kjs
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kjs
+++ b/source/kde/kde/build/kjs
diff --git a/testing/source/vtown/kde/build/native-build-number/kjsembed b/source/kde/kde/build/kjsembed
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kjsembed
+++ b/source/kde/kde/build/kjsembed
diff --git a/testing/source/vtown/kde/build/native-build-number/kjumpingcube b/source/kde/kde/build/kjumpingcube
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kjumpingcube
+++ b/source/kde/kde/build/kjumpingcube
diff --git a/testing/source/vtown/kde/build/native-build-number/kldap b/source/kde/kde/build/kldap
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kldap
+++ b/source/kde/kde/build/kldap
diff --git a/testing/source/vtown/kde/build/native-build-number/kleopatra b/source/kde/kde/build/kleopatra
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kleopatra
+++ b/source/kde/kde/build/kleopatra
diff --git a/testing/source/vtown/kde/build/native-build-number/klettres b/source/kde/kde/build/klettres
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/klettres
+++ b/source/kde/kde/build/klettres
diff --git a/testing/source/vtown/kde/build/native-build-number/klickety b/source/kde/kde/build/klickety
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/klickety
+++ b/source/kde/kde/build/klickety
diff --git a/testing/source/vtown/kde/build/native-build-number/klines b/source/kde/kde/build/klines
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/klines
+++ b/source/kde/kde/build/klines
diff --git a/testing/source/vtown/kde/build/native-build-number/kmag b/source/kde/kde/build/kmag
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmag
+++ b/source/kde/kde/build/kmag
diff --git a/testing/source/vtown/kde/build/native-build-number/kmahjongg b/source/kde/kde/build/kmahjongg
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmahjongg
+++ b/source/kde/kde/build/kmahjongg
diff --git a/testing/source/vtown/kde/build/native-build-number/kmail b/source/kde/kde/build/kmail
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmail
+++ b/source/kde/kde/build/kmail
diff --git a/testing/source/vtown/kde/build/native-build-number/kmail-account-wizard b/source/kde/kde/build/kmail-account-wizard
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmail-account-wizard
+++ b/source/kde/kde/build/kmail-account-wizard
diff --git a/testing/source/vtown/kde/build/native-build-number/kmailtransport b/source/kde/kde/build/kmailtransport
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmailtransport
+++ b/source/kde/kde/build/kmailtransport
diff --git a/testing/source/vtown/kde/build/native-build-number/kmbox b/source/kde/kde/build/kmbox
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmbox
+++ b/source/kde/kde/build/kmbox
diff --git a/testing/source/vtown/kde/build/native-build-number/kmediaplayer b/source/kde/kde/build/kmediaplayer
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmediaplayer
+++ b/source/kde/kde/build/kmediaplayer
diff --git a/testing/source/vtown/kde/build/native-build-number/kmenuedit b/source/kde/kde/build/kmenuedit
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmenuedit
+++ b/source/kde/kde/build/kmenuedit
diff --git a/testing/source/vtown/kde/build/native-build-number/kmime b/source/kde/kde/build/kmime
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmime
+++ b/source/kde/kde/build/kmime
diff --git a/testing/source/vtown/kde/build/native-build-number/kmines b/source/kde/kde/build/kmines
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmines
+++ b/source/kde/kde/build/kmines
diff --git a/testing/source/vtown/kde/build/native-build-number/kmix b/source/kde/kde/build/kmix
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmix
+++ b/source/kde/kde/build/kmix
diff --git a/testing/source/vtown/kde/build/native-build-number/kmousetool b/source/kde/kde/build/kmousetool
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmousetool
+++ b/source/kde/kde/build/kmousetool
diff --git a/testing/source/vtown/kde/build/native-build-number/kmouth b/source/kde/kde/build/kmouth
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmouth
+++ b/source/kde/kde/build/kmouth
diff --git a/testing/source/vtown/kde/build/native-build-number/kmplot b/source/kde/kde/build/kmplot
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmplot
+++ b/source/kde/kde/build/kmplot
diff --git a/testing/source/vtown/kde/build/native-build-number/kmymoney b/source/kde/kde/build/kmymoney
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kmymoney
+++ b/source/kde/kde/build/kmymoney
diff --git a/testing/source/vtown/kde/build/native-build-number/knavalbattle b/source/kde/kde/build/knavalbattle
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/knavalbattle
+++ b/source/kde/kde/build/knavalbattle
diff --git a/testing/source/vtown/kde/build/native-build-number/knetwalk b/source/kde/kde/build/knetwalk
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/knetwalk
+++ b/source/kde/kde/build/knetwalk
diff --git a/testing/source/vtown/kde/build/native-build-number/knewstuff b/source/kde/kde/build/knewstuff
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/knewstuff
+++ b/source/kde/kde/build/knewstuff
diff --git a/testing/source/vtown/kde/build/native-build-number/knights b/source/kde/kde/build/knights
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/knights
+++ b/source/kde/kde/build/knights
diff --git a/testing/source/vtown/kde/build/native-build-number/knotes b/source/kde/kde/build/knotes
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/knotes
+++ b/source/kde/kde/build/knotes
diff --git a/testing/source/vtown/kde/build/native-build-number/knotifications b/source/kde/kde/build/knotifications
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/knotifications
+++ b/source/kde/kde/build/knotifications
diff --git a/testing/source/vtown/kde/build/native-build-number/knotifyconfig b/source/kde/kde/build/knotifyconfig
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/knotifyconfig
+++ b/source/kde/kde/build/knotifyconfig
diff --git a/testing/source/vtown/kde/build/native-build-number/kolf b/source/kde/kde/build/kolf
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kolf
+++ b/source/kde/kde/build/kolf
diff --git a/testing/source/vtown/kde/build/native-build-number/kollision b/source/kde/kde/build/kollision
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kollision
+++ b/source/kde/kde/build/kollision
diff --git a/testing/source/vtown/kde/build/native-build-number/kolourpaint b/source/kde/kde/build/kolourpaint
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kolourpaint
+++ b/source/kde/kde/build/kolourpaint
diff --git a/testing/source/vtown/kde/build/native-build-number/kompare b/source/kde/kde/build/kompare
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kompare
+++ b/source/kde/kde/build/kompare
diff --git a/testing/source/vtown/kde/build/native-build-number/konqueror b/source/kde/kde/build/konqueror
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/konqueror
+++ b/source/kde/kde/build/konqueror
diff --git a/testing/source/vtown/kde/build/native-build-number/konquest b/source/kde/kde/build/konquest
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/konquest
+++ b/source/kde/kde/build/konquest
diff --git a/testing/source/vtown/kde/build/native-build-number/konsole b/source/kde/kde/build/konsole
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/konsole
+++ b/source/kde/kde/build/konsole
diff --git a/testing/source/vtown/kde/build/native-build-number/kontact b/source/kde/kde/build/kontact
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kontact
+++ b/source/kde/kde/build/kontact
diff --git a/testing/source/vtown/kde/build/native-build-number/kontactinterface b/source/kde/kde/build/kontactinterface
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kontactinterface
+++ b/source/kde/kde/build/kontactinterface
diff --git a/testing/source/vtown/kde/build/native-build-number/kopete b/source/kde/kde/build/kopete
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kopete
+++ b/source/kde/kde/build/kopete
diff --git a/testing/source/vtown/kde/build/native-build-number/korganizer b/source/kde/kde/build/korganizer
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/korganizer
+++ b/source/kde/kde/build/korganizer
diff --git a/testing/source/vtown/kde/build/native-build-number/kpackage b/source/kde/kde/build/kpackage
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kpackage
+++ b/source/kde/kde/build/kpackage
diff --git a/testing/source/vtown/kde/build/native-build-number/kparts b/source/kde/kde/build/kparts
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kparts
+++ b/source/kde/kde/build/kparts
diff --git a/testing/source/vtown/kde/build/native-build-number/kpat b/source/kde/kde/build/kpat
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kpat
+++ b/source/kde/kde/build/kpat
diff --git a/testing/source/vtown/kde/build/native-build-number/kpeople b/source/kde/kde/build/kpeople
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kpeople
+++ b/source/kde/kde/build/kpeople
diff --git a/testing/source/vtown/kde/build/native-build-number/kpeoplevcard b/source/kde/kde/build/kpeoplevcard
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kpeoplevcard
+++ b/source/kde/kde/build/kpeoplevcard
diff --git a/testing/source/vtown/kde/build/native-build-number/kpimtextedit b/source/kde/kde/build/kpimtextedit
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kpimtextedit
+++ b/source/kde/kde/build/kpimtextedit
diff --git a/testing/source/vtown/kde/build/native-build-number/kpkpass b/source/kde/kde/build/kpkpass
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kpkpass
+++ b/source/kde/kde/build/kpkpass
diff --git a/testing/source/vtown/kde/build/native-build-number/kplotting b/source/kde/kde/build/kplotting
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kplotting
+++ b/source/kde/kde/build/kplotting
diff --git a/testing/source/vtown/kde/build/native-build-number/kpmcore b/source/kde/kde/build/kpmcore
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kpmcore
+++ b/source/kde/kde/build/kpmcore
diff --git a/testing/source/vtown/kde/build/native-build-number/kpty b/source/kde/kde/build/kpty
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kpty
+++ b/source/kde/kde/build/kpty
diff --git a/testing/source/vtown/kde/build/native-build-number/kqtquickcharts b/source/kde/kde/build/kqtquickcharts
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kqtquickcharts
+++ b/source/kde/kde/build/kqtquickcharts
diff --git a/testing/source/vtown/kde/build/native-build-number/kquickcharts b/source/kde/kde/build/kquickcharts
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kquickcharts
+++ b/source/kde/kde/build/kquickcharts
diff --git a/testing/source/vtown/kde/build/native-build-number/krdc b/source/kde/kde/build/krdc
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/krdc
+++ b/source/kde/kde/build/krdc
diff --git a/testing/source/vtown/kde/build/native-build-number/krename b/source/kde/kde/build/krename
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/krename
+++ b/source/kde/kde/build/krename
diff --git a/testing/source/vtown/kde/build/native-build-number/kreversi b/source/kde/kde/build/kreversi
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kreversi
+++ b/source/kde/kde/build/kreversi
diff --git a/testing/source/vtown/kde/build/native-build-number/krfb b/source/kde/kde/build/krfb
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/krfb
+++ b/source/kde/kde/build/krfb
diff --git a/testing/source/vtown/kde/build/native-build-number/krita b/source/kde/kde/build/krita
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/krita
+++ b/source/kde/kde/build/krita
diff --git a/testing/source/vtown/kde/build/native-build-number/kross b/source/kde/kde/build/kross
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kross
+++ b/source/kde/kde/build/kross
diff --git a/testing/source/vtown/kde/build/native-build-number/kross-interpreters b/source/kde/kde/build/kross-interpreters
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kross-interpreters
+++ b/source/kde/kde/build/kross-interpreters
diff --git a/testing/source/vtown/kde/build/native-build-number/kruler b/source/kde/kde/build/kruler
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kruler
+++ b/source/kde/kde/build/kruler
diff --git a/testing/source/vtown/kde/build/native-build-number/krunner b/source/kde/kde/build/krunner
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/krunner
+++ b/source/kde/kde/build/krunner
diff --git a/testing/source/vtown/kde/build/native-build-number/krusader b/source/kde/kde/build/krusader
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/krusader
+++ b/source/kde/kde/build/krusader
diff --git a/testing/source/vtown/kde/build/native-build-number/kscreen b/source/kde/kde/build/kscreen
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kscreen
+++ b/source/kde/kde/build/kscreen
diff --git a/testing/source/vtown/kde/build/native-build-number/kscreenlocker b/source/kde/kde/build/kscreenlocker
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kscreenlocker
+++ b/source/kde/kde/build/kscreenlocker
diff --git a/testing/source/vtown/kde/build/native-build-number/kservice b/source/kde/kde/build/kservice
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kservice
+++ b/source/kde/kde/build/kservice
diff --git a/testing/source/vtown/kde/build/native-build-number/kshisen b/source/kde/kde/build/kshisen
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kshisen
+++ b/source/kde/kde/build/kshisen
diff --git a/testing/source/vtown/kde/build/native-build-number/ksirk b/source/kde/kde/build/ksirk
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ksirk
+++ b/source/kde/kde/build/ksirk
diff --git a/testing/source/vtown/kde/build/native-build-number/ksmtp b/source/kde/kde/build/ksmtp
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ksmtp
+++ b/source/kde/kde/build/ksmtp
diff --git a/testing/source/vtown/kde/build/native-build-number/ksnakeduel b/source/kde/kde/build/ksnakeduel
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ksnakeduel
+++ b/source/kde/kde/build/ksnakeduel
diff --git a/testing/source/vtown/kde/build/native-build-number/kspaceduel b/source/kde/kde/build/kspaceduel
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kspaceduel
+++ b/source/kde/kde/build/kspaceduel
diff --git a/testing/source/vtown/kde/build/native-build-number/ksquares b/source/kde/kde/build/ksquares
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ksquares
+++ b/source/kde/kde/build/ksquares
diff --git a/testing/source/vtown/kde/build/native-build-number/ksshaskpass b/source/kde/kde/build/ksshaskpass
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ksshaskpass
+++ b/source/kde/kde/build/ksshaskpass
diff --git a/testing/source/vtown/kde/build/native-build-number/kstars b/source/kde/kde/build/kstars
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kstars
+++ b/source/kde/kde/build/kstars
diff --git a/testing/source/vtown/kde/build/native-build-number/ksudoku b/source/kde/kde/build/ksudoku
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ksudoku
+++ b/source/kde/kde/build/ksudoku
diff --git a/testing/source/vtown/kde/build/native-build-number/ksysguard b/source/kde/kde/build/ksysguard
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ksysguard
+++ b/source/kde/kde/build/ksysguard
diff --git a/testing/source/vtown/kde/build/native-build-number/ksystemlog b/source/kde/kde/build/ksystemlog
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ksystemlog
+++ b/source/kde/kde/build/ksystemlog
diff --git a/testing/source/vtown/kde/build/native-build-number/kteatime b/source/kde/kde/build/kteatime
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kteatime
+++ b/source/kde/kde/build/kteatime
diff --git a/testing/source/vtown/kde/build/native-build-number/ktexteditor b/source/kde/kde/build/ktexteditor
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktexteditor
+++ b/source/kde/kde/build/ktexteditor
diff --git a/testing/source/vtown/kde/build/native-build-number/ktextwidgets b/source/kde/kde/build/ktextwidgets
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktextwidgets
+++ b/source/kde/kde/build/ktextwidgets
diff --git a/testing/source/vtown/kde/build/native-build-number/ktimer b/source/kde/kde/build/ktimer
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktimer
+++ b/source/kde/kde/build/ktimer
diff --git a/testing/source/vtown/kde/build/native-build-number/ktimetracker b/source/kde/kde/build/ktimetracker
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktimetracker
+++ b/source/kde/kde/build/ktimetracker
diff --git a/testing/source/vtown/kde/build/native-build-number/ktnef b/source/kde/kde/build/ktnef
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktnef
+++ b/source/kde/kde/build/ktnef
diff --git a/testing/source/vtown/kde/build/native-build-number/ktorrent b/source/kde/kde/build/ktorrent
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktorrent
+++ b/source/kde/kde/build/ktorrent
diff --git a/testing/source/vtown/kde/build/native-build-number/ktouch b/source/kde/kde/build/ktouch
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktouch
+++ b/source/kde/kde/build/ktouch
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-accounts-kcm b/source/kde/kde/build/ktp-accounts-kcm
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-accounts-kcm
+++ b/source/kde/kde/build/ktp-accounts-kcm
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-approver b/source/kde/kde/build/ktp-approver
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-approver
+++ b/source/kde/kde/build/ktp-approver
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-auth-handler b/source/kde/kde/build/ktp-auth-handler
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-auth-handler
+++ b/source/kde/kde/build/ktp-auth-handler
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-call-ui b/source/kde/kde/build/ktp-call-ui
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-call-ui
+++ b/source/kde/kde/build/ktp-call-ui
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-common-internals b/source/kde/kde/build/ktp-common-internals
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-common-internals
+++ b/source/kde/kde/build/ktp-common-internals
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-contact-list b/source/kde/kde/build/ktp-contact-list
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-contact-list
+++ b/source/kde/kde/build/ktp-contact-list
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-contact-runner b/source/kde/kde/build/ktp-contact-runner
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-contact-runner
+++ b/source/kde/kde/build/ktp-contact-runner
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-desktop-applets b/source/kde/kde/build/ktp-desktop-applets
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-desktop-applets
+++ b/source/kde/kde/build/ktp-desktop-applets
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-filetransfer-handler b/source/kde/kde/build/ktp-filetransfer-handler
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-filetransfer-handler
+++ b/source/kde/kde/build/ktp-filetransfer-handler
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-kded-module b/source/kde/kde/build/ktp-kded-module
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-kded-module
+++ b/source/kde/kde/build/ktp-kded-module
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-send-file b/source/kde/kde/build/ktp-send-file
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-send-file
+++ b/source/kde/kde/build/ktp-send-file
diff --git a/testing/source/vtown/kde/build/native-build-number/ktp-text-ui b/source/kde/kde/build/ktp-text-ui
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktp-text-ui
+++ b/source/kde/kde/build/ktp-text-ui
diff --git a/testing/source/vtown/kde/build/native-build-number/ktuberling b/source/kde/kde/build/ktuberling
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/ktuberling
+++ b/source/kde/kde/build/ktuberling
diff --git a/testing/source/vtown/kde/build/native-build-number/kturtle b/source/kde/kde/build/kturtle
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kturtle
+++ b/source/kde/kde/build/kturtle
diff --git a/testing/source/vtown/kde/build/native-build-number/kubrick b/source/kde/kde/build/kubrick
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kubrick
+++ b/source/kde/kde/build/kubrick
diff --git a/testing/source/vtown/kde/build/native-build-number/kunitconversion b/source/kde/kde/build/kunitconversion
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kunitconversion
+++ b/source/kde/kde/build/kunitconversion
diff --git a/testing/source/vtown/kde/build/native-build-number/kuser b/source/kde/kde/build/kuser
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kuser
+++ b/source/kde/kde/build/kuser
diff --git a/testing/source/vtown/kde/build/native-build-number/kwallet b/source/kde/kde/build/kwallet
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwallet
+++ b/source/kde/kde/build/kwallet
diff --git a/testing/source/vtown/kde/build/native-build-number/kwallet-pam b/source/kde/kde/build/kwallet-pam
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwallet-pam
+++ b/source/kde/kde/build/kwallet-pam
diff --git a/testing/source/vtown/kde/build/native-build-number/kwalletmanager b/source/kde/kde/build/kwalletmanager
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwalletmanager
+++ b/source/kde/kde/build/kwalletmanager
diff --git a/testing/source/vtown/kde/build/native-build-number/kwave b/source/kde/kde/build/kwave
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwave
+++ b/source/kde/kde/build/kwave
diff --git a/testing/source/vtown/kde/build/native-build-number/kwayland b/source/kde/kde/build/kwayland
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwayland
+++ b/source/kde/kde/build/kwayland
diff --git a/testing/source/vtown/kde/build/native-build-number/kwayland-integration b/source/kde/kde/build/kwayland-integration
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwayland-integration
+++ b/source/kde/kde/build/kwayland-integration
diff --git a/testing/source/vtown/kde/build/native-build-number/kwayland-server b/source/kde/kde/build/kwayland-server
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwayland-server
+++ b/source/kde/kde/build/kwayland-server
diff --git a/testing/source/vtown/kde/build/native-build-number/kwebkitpart b/source/kde/kde/build/kwebkitpart
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwebkitpart
+++ b/source/kde/kde/build/kwebkitpart
diff --git a/testing/source/vtown/kde/build/native-build-number/kwidgetsaddons b/source/kde/kde/build/kwidgetsaddons
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwidgetsaddons
+++ b/source/kde/kde/build/kwidgetsaddons
diff --git a/testing/source/vtown/kde/build/native-build-number/kwin b/source/kde/kde/build/kwin
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwin
+++ b/source/kde/kde/build/kwin
diff --git a/testing/source/vtown/kde/build/native-build-number/kwindowsystem b/source/kde/kde/build/kwindowsystem
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwindowsystem
+++ b/source/kde/kde/build/kwindowsystem
diff --git a/testing/source/vtown/kde/build/native-build-number/kwordquiz b/source/kde/kde/build/kwordquiz
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwordquiz
+++ b/source/kde/kde/build/kwordquiz
diff --git a/testing/source/vtown/kde/build/native-build-number/kwrited b/source/kde/kde/build/kwrited
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kwrited
+++ b/source/kde/kde/build/kwrited
diff --git a/testing/source/vtown/kde/build/native-build-number/kxmlgui b/source/kde/kde/build/kxmlgui
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kxmlgui
+++ b/source/kde/kde/build/kxmlgui
diff --git a/testing/source/vtown/kde/build/native-build-number/kxmlrpcclient b/source/kde/kde/build/kxmlrpcclient
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/kxmlrpcclient
+++ b/source/kde/kde/build/kxmlrpcclient
diff --git a/testing/source/vtown/kde/build/native-build-number/labplot b/source/kde/kde/build/labplot
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/labplot
+++ b/source/kde/kde/build/labplot
diff --git a/testing/source/vtown/kde/build/native-build-number/latte-dock b/source/kde/kde/build/latte-dock
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/latte-dock
+++ b/source/kde/kde/build/latte-dock
diff --git a/testing/source/vtown/kde/build/native-build-number/libgravatar b/source/kde/kde/build/libgravatar
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libgravatar
+++ b/source/kde/kde/build/libgravatar
diff --git a/testing/source/vtown/kde/build/native-build-number/libkcddb b/source/kde/kde/build/libkcddb
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkcddb
+++ b/source/kde/kde/build/libkcddb
diff --git a/testing/source/vtown/kde/build/native-build-number/libkcompactdisc b/source/kde/kde/build/libkcompactdisc
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkcompactdisc
+++ b/source/kde/kde/build/libkcompactdisc
diff --git a/testing/source/vtown/kde/build/native-build-number/libkdcraw b/source/kde/kde/build/libkdcraw
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkdcraw
+++ b/source/kde/kde/build/libkdcraw
diff --git a/testing/source/vtown/kde/build/native-build-number/libkdegames b/source/kde/kde/build/libkdegames
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkdegames
+++ b/source/kde/kde/build/libkdegames
diff --git a/testing/source/vtown/kde/build/native-build-number/libkdepim b/source/kde/kde/build/libkdepim
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkdepim
+++ b/source/kde/kde/build/libkdepim
diff --git a/testing/source/vtown/kde/build/native-build-number/libkeduvocdocument b/source/kde/kde/build/libkeduvocdocument
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkeduvocdocument
+++ b/source/kde/kde/build/libkeduvocdocument
diff --git a/testing/source/vtown/kde/build/native-build-number/libkexiv2 b/source/kde/kde/build/libkexiv2
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkexiv2
+++ b/source/kde/kde/build/libkexiv2
diff --git a/testing/source/vtown/kde/build/native-build-number/libkgapi b/source/kde/kde/build/libkgapi
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkgapi
+++ b/source/kde/kde/build/libkgapi
diff --git a/testing/source/vtown/kde/build/native-build-number/libkgeomap b/source/kde/kde/build/libkgeomap
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkgeomap
+++ b/source/kde/kde/build/libkgeomap
diff --git a/testing/source/vtown/kde/build/native-build-number/libkipi b/source/kde/kde/build/libkipi
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkipi
+++ b/source/kde/kde/build/libkipi
diff --git a/testing/source/vtown/kde/build/native-build-number/libkleo b/source/kde/kde/build/libkleo
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkleo
+++ b/source/kde/kde/build/libkleo
diff --git a/testing/source/vtown/kde/build/native-build-number/libkmahjongg b/source/kde/kde/build/libkmahjongg
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkmahjongg
+++ b/source/kde/kde/build/libkmahjongg
diff --git a/testing/source/vtown/kde/build/native-build-number/libkomparediff2 b/source/kde/kde/build/libkomparediff2
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkomparediff2
+++ b/source/kde/kde/build/libkomparediff2
diff --git a/testing/source/vtown/kde/build/native-build-number/libksane b/source/kde/kde/build/libksane
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libksane
+++ b/source/kde/kde/build/libksane
diff --git a/testing/source/vtown/kde/build/native-build-number/libkscreen b/source/kde/kde/build/libkscreen
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libkscreen
+++ b/source/kde/kde/build/libkscreen
diff --git a/testing/source/vtown/kde/build/native-build-number/libksieve b/source/kde/kde/build/libksieve
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libksieve
+++ b/source/kde/kde/build/libksieve
diff --git a/testing/source/vtown/kde/build/native-build-number/libksysguard b/source/kde/kde/build/libksysguard
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libksysguard
+++ b/source/kde/kde/build/libksysguard
diff --git a/testing/source/vtown/kde/build/native-build-number/libktorrent b/source/kde/kde/build/libktorrent
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/libktorrent
+++ b/source/kde/kde/build/libktorrent
diff --git a/testing/source/vtown/kde/build/native-build-number/lokalize b/source/kde/kde/build/lokalize
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/lokalize
+++ b/source/kde/kde/build/lokalize
diff --git a/testing/source/vtown/kde/build/native-build-number/lskat b/source/kde/kde/build/lskat
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/lskat
+++ b/source/kde/kde/build/lskat
diff --git a/testing/source/vtown/kde/build/native-build-number/mailcommon b/source/kde/kde/build/mailcommon
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/mailcommon
+++ b/source/kde/kde/build/mailcommon
diff --git a/testing/source/vtown/kde/build/native-build-number/mailimporter b/source/kde/kde/build/mailimporter
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/mailimporter
+++ b/source/kde/kde/build/mailimporter
diff --git a/testing/source/vtown/kde/build/native-build-number/marble b/source/kde/kde/build/marble
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/marble
+++ b/source/kde/kde/build/marble
diff --git a/testing/source/vtown/kde/build/native-build-number/mbox-importer b/source/kde/kde/build/mbox-importer
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/mbox-importer
+++ b/source/kde/kde/build/mbox-importer
diff --git a/testing/source/vtown/kde/build/native-build-number/messagelib b/source/kde/kde/build/messagelib
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/messagelib
+++ b/source/kde/kde/build/messagelib
diff --git a/testing/source/vtown/kde/build/native-build-number/milou b/source/kde/kde/build/milou
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/milou
+++ b/source/kde/kde/build/milou
diff --git a/testing/source/vtown/kde/build/native-build-number/minuet b/source/kde/kde/build/minuet
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/minuet
+++ b/source/kde/kde/build/minuet
diff --git a/testing/source/vtown/kde/build/native-build-number/modemmanager-qt b/source/kde/kde/build/modemmanager-qt
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/modemmanager-qt
+++ b/source/kde/kde/build/modemmanager-qt
diff --git a/testing/source/vtown/kde/build/native-build-number/networkmanager-qt b/source/kde/kde/build/networkmanager-qt
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/networkmanager-qt
+++ b/source/kde/kde/build/networkmanager-qt
diff --git a/testing/source/vtown/kde/build/native-build-number/okteta b/source/kde/kde/build/okteta
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/okteta
+++ b/source/kde/kde/build/okteta
diff --git a/testing/source/vtown/kde/build/native-build-number/okular b/source/kde/kde/build/okular
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/okular
+++ b/source/kde/kde/build/okular
diff --git a/testing/source/vtown/kde/build/native-build-number/oxygen b/source/kde/kde/build/oxygen
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/oxygen
+++ b/source/kde/kde/build/oxygen
diff --git a/testing/source/vtown/kde/build/native-build-number/oxygen-fonts b/source/kde/kde/build/oxygen-fonts
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/oxygen-fonts
+++ b/source/kde/kde/build/oxygen-fonts
diff --git a/testing/source/vtown/kde/build/native-build-number/oxygen-gtk2 b/source/kde/kde/build/oxygen-gtk2
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/oxygen-gtk2
+++ b/source/kde/kde/build/oxygen-gtk2
diff --git a/testing/source/vtown/kde/build/native-build-number/oxygen-icons5 b/source/kde/kde/build/oxygen-icons5
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/oxygen-icons5
+++ b/source/kde/kde/build/oxygen-icons5
diff --git a/testing/source/vtown/kde/build/native-build-number/palapeli b/source/kde/kde/build/palapeli
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/palapeli
+++ b/source/kde/kde/build/palapeli
diff --git a/testing/source/vtown/kde/build/native-build-number/parley b/source/kde/kde/build/parley
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/parley
+++ b/source/kde/kde/build/parley
diff --git a/testing/source/vtown/kde/build/native-build-number/partitionmanager b/source/kde/kde/build/partitionmanager
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/partitionmanager
+++ b/source/kde/kde/build/partitionmanager
diff --git a/testing/source/vtown/kde/build/native-build-number/picmi b/source/kde/kde/build/picmi
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/picmi
+++ b/source/kde/kde/build/picmi
diff --git a/testing/source/vtown/kde/build/native-build-number/pim-data-exporter b/source/kde/kde/build/pim-data-exporter
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/pim-data-exporter
+++ b/source/kde/kde/build/pim-data-exporter
diff --git a/testing/source/vtown/kde/build/native-build-number/pim-sieve-editor b/source/kde/kde/build/pim-sieve-editor
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/pim-sieve-editor
+++ b/source/kde/kde/build/pim-sieve-editor
diff --git a/testing/source/vtown/kde/build/native-build-number/pimcommon b/source/kde/kde/build/pimcommon
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/pimcommon
+++ b/source/kde/kde/build/pimcommon
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-browser-integration b/source/kde/kde/build/plasma-browser-integration
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-browser-integration
+++ b/source/kde/kde/build/plasma-browser-integration
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-desktop b/source/kde/kde/build/plasma-desktop
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-desktop
+++ b/source/kde/kde/build/plasma-desktop
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-disks b/source/kde/kde/build/plasma-disks
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-disks
+++ b/source/kde/kde/build/plasma-disks
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-framework b/source/kde/kde/build/plasma-framework
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-framework
+++ b/source/kde/kde/build/plasma-framework
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-integration b/source/kde/kde/build/plasma-integration
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-integration
+++ b/source/kde/kde/build/plasma-integration
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-nm b/source/kde/kde/build/plasma-nm
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-nm
+++ b/source/kde/kde/build/plasma-nm
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-pa b/source/kde/kde/build/plasma-pa
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-pa
+++ b/source/kde/kde/build/plasma-pa
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-sdk b/source/kde/kde/build/plasma-sdk
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-sdk
+++ b/source/kde/kde/build/plasma-sdk
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-vault b/source/kde/kde/build/plasma-vault
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-vault
+++ b/source/kde/kde/build/plasma-vault
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-wayland-protocols b/source/kde/kde/build/plasma-wayland-protocols
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-wayland-protocols
+++ b/source/kde/kde/build/plasma-wayland-protocols
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-workspace b/source/kde/kde/build/plasma-workspace
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
diff --git a/testing/source/vtown/kde/build/native-build-number/plasma-workspace-wallpapers b/source/kde/kde/build/plasma-workspace-wallpapers
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/plasma-workspace-wallpapers
+++ b/source/kde/kde/build/plasma-workspace-wallpapers
diff --git a/testing/source/vtown/kde/build/native-build-number/polkit-kde-agent-1 b/source/kde/kde/build/polkit-kde-agent-1
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/polkit-kde-agent-1
+++ b/source/kde/kde/build/polkit-kde-agent-1
diff --git a/testing/source/vtown/kde/build/native-build-number/powerdevil b/source/kde/kde/build/powerdevil
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/powerdevil
+++ b/source/kde/kde/build/powerdevil
diff --git a/testing/source/vtown/kde/build/native-build-number/poxml b/source/kde/kde/build/poxml
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/poxml
+++ b/source/kde/kde/build/poxml
diff --git a/testing/source/vtown/kde/build/native-build-number/print-manager b/source/kde/kde/build/print-manager
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/print-manager
+++ b/source/kde/kde/build/print-manager
diff --git a/testing/source/vtown/kde/build/native-build-number/prison b/source/kde/kde/build/prison
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/prison
+++ b/source/kde/kde/build/prison
diff --git a/testing/source/vtown/kde/build/native-build-number/pulseaudio-qt b/source/kde/kde/build/pulseaudio-qt
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/pulseaudio-qt
+++ b/source/kde/kde/build/pulseaudio-qt
diff --git a/testing/source/vtown/kde/build/native-build-number/purpose b/source/kde/kde/build/purpose
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/purpose
+++ b/source/kde/kde/build/purpose
diff --git a/testing/source/vtown/kde/build/native-build-number/qqc2-desktop-style b/source/kde/kde/build/qqc2-desktop-style
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/qqc2-desktop-style
+++ b/source/kde/kde/build/qqc2-desktop-style
diff --git a/testing/source/vtown/kde/build/native-build-number/rocs b/source/kde/kde/build/rocs
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/rocs
+++ b/source/kde/kde/build/rocs
diff --git a/testing/source/vtown/kde/build/native-build-number/sddm b/source/kde/kde/build/sddm
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/sddm
+++ b/source/kde/kde/build/sddm
diff --git a/testing/source/vtown/kde/build/native-build-number/sddm-kcm b/source/kde/kde/build/sddm-kcm
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/sddm-kcm
+++ b/source/kde/kde/build/sddm-kcm
diff --git a/testing/source/vtown/kde/build/native-build-number/signon-kwallet-extension b/source/kde/kde/build/signon-kwallet-extension
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/signon-kwallet-extension
+++ b/source/kde/kde/build/signon-kwallet-extension
diff --git a/testing/source/vtown/kde/build/native-build-number/skanlite b/source/kde/kde/build/skanlite
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/skanlite
+++ b/source/kde/kde/build/skanlite
diff --git a/testing/source/vtown/kde/build/native-build-number/solid b/source/kde/kde/build/solid
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/solid
+++ b/source/kde/kde/build/solid
diff --git a/testing/source/vtown/kde/build/native-build-number/sonnet b/source/kde/kde/build/sonnet
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/sonnet
+++ b/source/kde/kde/build/sonnet
diff --git a/testing/source/vtown/kde/build/native-build-number/spectacle b/source/kde/kde/build/spectacle
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/spectacle
+++ b/source/kde/kde/build/spectacle
diff --git a/testing/source/vtown/kde/build/native-build-number/step b/source/kde/kde/build/step
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/step
+++ b/source/kde/kde/build/step
diff --git a/testing/source/vtown/kde/build/native-build-number/svgpart b/source/kde/kde/build/svgpart
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/svgpart
+++ b/source/kde/kde/build/svgpart
diff --git a/testing/source/vtown/kde/build/native-build-number/sweeper b/source/kde/kde/build/sweeper
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/sweeper
+++ b/source/kde/kde/build/sweeper
diff --git a/testing/source/vtown/kde/build/native-build-number/syndication b/source/kde/kde/build/syndication
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/syndication
+++ b/source/kde/kde/build/syndication
diff --git a/testing/source/vtown/kde/build/native-build-number/syntax-highlighting b/source/kde/kde/build/syntax-highlighting
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/syntax-highlighting
+++ b/source/kde/kde/build/syntax-highlighting
diff --git a/testing/source/vtown/kde/build/native-build-number/systemsettings b/source/kde/kde/build/systemsettings
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/systemsettings
+++ b/source/kde/kde/build/systemsettings
diff --git a/testing/source/vtown/kde/build/native-build-number/threadweaver b/source/kde/kde/build/threadweaver
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/threadweaver
+++ b/source/kde/kde/build/threadweaver
diff --git a/testing/source/vtown/kde/build/native-build-number/umbrello b/source/kde/kde/build/umbrello
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/umbrello
+++ b/source/kde/kde/build/umbrello
diff --git a/testing/source/vtown/kde/build/native-build-number/user-manager b/source/kde/kde/build/user-manager
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/user-manager
+++ b/source/kde/kde/build/user-manager
diff --git a/testing/source/vtown/kde/build/native-build-number/wacomtablet b/source/kde/kde/build/wacomtablet
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/wacomtablet
+++ b/source/kde/kde/build/wacomtablet
diff --git a/testing/source/vtown/kde/build/native-build-number/xdg-desktop-portal-kde b/source/kde/kde/build/xdg-desktop-portal-kde
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/xdg-desktop-portal-kde
+++ b/source/kde/kde/build/xdg-desktop-portal-kde
diff --git a/testing/source/vtown/kde/build/native-build-number/yakuake b/source/kde/kde/build/yakuake
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/yakuake
+++ b/source/kde/kde/build/yakuake
diff --git a/testing/source/vtown/kde/build/native-build-number/zeroconf-ioslave b/source/kde/kde/build/zeroconf-ioslave
index d00491fd7..d00491fd7 100644
--- a/testing/source/vtown/kde/build/native-build-number/zeroconf-ioslave
+++ b/source/kde/kde/build/zeroconf-ioslave
diff --git a/testing/source/vtown/kde/cmake/alkimia b/source/kde/kde/cmake/alkimia
index aa5eaf686..aa5eaf686 100644
--- a/testing/source/vtown/kde/cmake/alkimia
+++ b/source/kde/kde/cmake/alkimia
diff --git a/testing/source/vtown/kde/cmake/analitza b/source/kde/kde/cmake/analitza
index 995170e7c..995170e7c 100644
--- a/testing/source/vtown/kde/cmake/analitza
+++ b/source/kde/kde/cmake/analitza
diff --git a/testing/source/vtown/kde/cmake/applications b/source/kde/kde/cmake/applications
index ea4fc8488..ea4fc8488 100644
--- a/testing/source/vtown/kde/cmake/applications
+++ b/source/kde/kde/cmake/applications
diff --git a/testing/source/vtown/kde/cmake/baloo b/source/kde/kde/cmake/baloo
index 35943a870..35943a870 100644
--- a/testing/source/vtown/kde/cmake/baloo
+++ b/source/kde/kde/cmake/baloo
diff --git a/testing/source/vtown/kde/cmake/calligra b/source/kde/kde/cmake/calligra
index 87a381ca3..87a381ca3 100644
--- a/testing/source/vtown/kde/cmake/calligra
+++ b/source/kde/kde/cmake/calligra
diff --git a/testing/source/vtown/kde/cmake/cmake b/source/kde/kde/cmake/cmake
index d52f2db73..d52f2db73 100644
--- a/testing/source/vtown/kde/cmake/cmake
+++ b/source/kde/kde/cmake/cmake
diff --git a/testing/source/vtown/kde/cmake/digikam b/source/kde/kde/cmake/digikam
index 2a44c815f..2a44c815f 100644
--- a/testing/source/vtown/kde/cmake/digikam
+++ b/source/kde/kde/cmake/digikam
diff --git a/testing/source/vtown/kde/cmake/frameworkintegration b/source/kde/kde/cmake/frameworkintegration
index 10e42ff06..10e42ff06 100644
--- a/testing/source/vtown/kde/cmake/frameworkintegration
+++ b/source/kde/kde/cmake/frameworkintegration
diff --git a/testing/source/vtown/kde/cmake/frameworks b/source/kde/kde/cmake/frameworks
index 5dc9d4ff5..5dc9d4ff5 100644
--- a/testing/source/vtown/kde/cmake/frameworks
+++ b/source/kde/kde/cmake/frameworks
diff --git a/testing/source/vtown/kde/cmake/gwenview b/source/kde/kde/cmake/gwenview
index 372a12c82..372a12c82 100644
--- a/testing/source/vtown/kde/cmake/gwenview
+++ b/source/kde/kde/cmake/gwenview
diff --git a/testing/source/vtown/kde/cmake/k3b b/source/kde/kde/cmake/k3b
index 1db8970c9..1db8970c9 100644
--- a/testing/source/vtown/kde/cmake/k3b
+++ b/source/kde/kde/cmake/k3b
diff --git a/testing/source/vtown/kde/cmake/kajongg b/source/kde/kde/cmake/kajongg
index 907f021f1..907f021f1 100644
--- a/testing/source/vtown/kde/cmake/kajongg
+++ b/source/kde/kde/cmake/kajongg
diff --git a/testing/source/vtown/kde/cmake/kde4 b/source/kde/kde/cmake/kde4
index ad52f43b5..ad52f43b5 100644
--- a/testing/source/vtown/kde/cmake/kde4
+++ b/source/kde/kde/cmake/kde4
diff --git a/testing/source/vtown/kde/cmake/kdelibs b/source/kde/kde/cmake/kdelibs
index 7052faf51..7052faf51 100644
--- a/testing/source/vtown/kde/cmake/kdelibs
+++ b/source/kde/kde/cmake/kdelibs
diff --git a/testing/source/vtown/kde/cmake/kdepim b/source/kde/kde/cmake/kdepim
index 16afbe719..16afbe719 100644
--- a/testing/source/vtown/kde/cmake/kdepim
+++ b/source/kde/kde/cmake/kdepim
diff --git a/testing/source/vtown/kde/cmake/kget b/source/kde/kde/cmake/kget
index f1107b0d6..f1107b0d6 100644
--- a/testing/source/vtown/kde/cmake/kget
+++ b/source/kde/kde/cmake/kget
diff --git a/testing/source/vtown/kde/cmake/kid3 b/source/kde/kde/cmake/kid3
index f893d9113..f893d9113 100644
--- a/testing/source/vtown/kde/cmake/kid3
+++ b/source/kde/kde/cmake/kid3
diff --git a/testing/source/vtown/kde/cmake/kitinerary b/source/kde/kde/cmake/kitinerary
index 26bec90f6..26bec90f6 100644
--- a/testing/source/vtown/kde/cmake/kitinerary
+++ b/source/kde/kde/cmake/kitinerary
diff --git a/testing/source/vtown/kde/cmake/kjots b/source/kde/kde/cmake/kjots
index eb1da8e7e..eb1da8e7e 100644
--- a/testing/source/vtown/kde/cmake/kjots
+++ b/source/kde/kde/cmake/kjots
diff --git a/testing/source/vtown/kde/cmake/kopete b/source/kde/kde/cmake/kopete
index 3b8c6b16a..3b8c6b16a 100644
--- a/testing/source/vtown/kde/cmake/kopete
+++ b/source/kde/kde/cmake/kopete
diff --git a/testing/source/vtown/kde/cmake/kpmcore b/source/kde/kde/cmake/kpmcore
index 86a37f9ae..86a37f9ae 100644
--- a/testing/source/vtown/kde/cmake/kpmcore
+++ b/source/kde/kde/cmake/kpmcore
diff --git a/testing/source/vtown/kde/cmake/krdc b/source/kde/kde/cmake/krdc
index 3f694d163..3f694d163 100644
--- a/testing/source/vtown/kde/cmake/krdc
+++ b/source/kde/kde/cmake/krdc
diff --git a/testing/source/vtown/kde/cmake/krita b/source/kde/kde/cmake/krita
index da7d063f3..da7d063f3 100644
--- a/testing/source/vtown/kde/cmake/krita
+++ b/source/kde/kde/cmake/krita
diff --git a/testing/source/vtown/kde/cmake/kross-interpreters b/source/kde/kde/cmake/kross-interpreters
index 2fac2b13c..2fac2b13c 100644
--- a/testing/source/vtown/kde/cmake/kross-interpreters
+++ b/source/kde/kde/cmake/kross-interpreters
diff --git a/testing/source/vtown/kde/cmake/krusader b/source/kde/kde/cmake/krusader
index 85364ffe5..85364ffe5 100644
--- a/testing/source/vtown/kde/cmake/krusader
+++ b/source/kde/kde/cmake/krusader
diff --git a/testing/source/vtown/kde/cmake/kscreenlocker b/source/kde/kde/cmake/kscreenlocker
index e505309b4..e505309b4 100644
--- a/testing/source/vtown/kde/cmake/kscreenlocker
+++ b/source/kde/kde/cmake/kscreenlocker
diff --git a/testing/source/vtown/kde/cmake/kservice b/source/kde/kde/cmake/kservice
index 414184589..414184589 100644
--- a/testing/source/vtown/kde/cmake/kservice
+++ b/source/kde/kde/cmake/kservice
diff --git a/testing/source/vtown/kde/cmake/kwallet-pam b/source/kde/kde/cmake/kwallet-pam
index 641a4927b..641a4927b 100644
--- a/testing/source/vtown/kde/cmake/kwallet-pam
+++ b/source/kde/kde/cmake/kwallet-pam
diff --git a/testing/source/vtown/kde/cmake/kwave b/source/kde/kde/cmake/kwave
index 037bcd1f9..037bcd1f9 100644
--- a/testing/source/vtown/kde/cmake/kwave
+++ b/source/kde/kde/cmake/kwave
diff --git a/testing/source/vtown/kde/cmake/kwin b/source/kde/kde/cmake/kwin
index 7f5014a3a..7f5014a3a 100644
--- a/testing/source/vtown/kde/cmake/kwin
+++ b/source/kde/kde/cmake/kwin
diff --git a/testing/source/vtown/kde/cmake/marble b/source/kde/kde/cmake/marble
index 8778f2c90..8778f2c90 100644
--- a/testing/source/vtown/kde/cmake/marble
+++ b/source/kde/kde/cmake/marble
diff --git a/testing/source/vtown/kde/cmake/messagelib b/source/kde/kde/cmake/messagelib
index cfb135422..cfb135422 100644
--- a/testing/source/vtown/kde/cmake/messagelib
+++ b/source/kde/kde/cmake/messagelib
diff --git a/testing/source/vtown/kde/cmake/partitionmanager b/source/kde/kde/cmake/partitionmanager
index 86a37f9ae..86a37f9ae 100644
--- a/testing/source/vtown/kde/cmake/partitionmanager
+++ b/source/kde/kde/cmake/partitionmanager
diff --git a/testing/source/vtown/kde/cmake/plasma b/source/kde/kde/cmake/plasma
index 03067eef6..03067eef6 100644
--- a/testing/source/vtown/kde/cmake/plasma
+++ b/source/kde/kde/cmake/plasma
diff --git a/testing/source/vtown/kde/cmake/plasma-browser-integration b/source/kde/kde/cmake/plasma-browser-integration
index 6e8d7d8cf..6e8d7d8cf 100644
--- a/testing/source/vtown/kde/cmake/plasma-browser-integration
+++ b/source/kde/kde/cmake/plasma-browser-integration
diff --git a/testing/source/vtown/kde/cmake/sddm b/source/kde/kde/cmake/sddm
index 8add3a98b..8add3a98b 100644
--- a/testing/source/vtown/kde/cmake/sddm
+++ b/source/kde/kde/cmake/sddm
diff --git a/testing/source/vtown/kde/cmake/sddm-kcm b/source/kde/kde/cmake/sddm-kcm
index 2c7f3ed01..2c7f3ed01 100644
--- a/testing/source/vtown/kde/cmake/sddm-kcm
+++ b/source/kde/kde/cmake/sddm-kcm
diff --git a/testing/source/vtown/kde/cmake/solid b/source/kde/kde/cmake/solid
index 7983cf159..7983cf159 100644
--- a/testing/source/vtown/kde/cmake/solid
+++ b/source/kde/kde/cmake/solid
diff --git a/testing/source/vtown/kde/cmake/xdg-desktop-portal-kde b/source/kde/kde/cmake/xdg-desktop-portal-kde
index 78b9a7cea..78b9a7cea 100644
--- a/testing/source/vtown/kde/cmake/xdg-desktop-portal-kde
+++ b/source/kde/kde/cmake/xdg-desktop-portal-kde
diff --git a/source/kde/docs/k3b b/source/kde/kde/docs/k3b
index b12b94316..b12b94316 100644
--- a/source/kde/docs/k3b
+++ b/source/kde/kde/docs/k3b
diff --git a/source/kde/docs/kdepimlibs b/source/kde/kde/docs/kdepimlibs
index 88e3194a8..88e3194a8 100644
--- a/source/kde/docs/kdepimlibs
+++ b/source/kde/kde/docs/kdepimlibs
diff --git a/source/kde/doinst.sh/blinken b/source/kde/kde/doinst.sh/blinken
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/blinken
+++ b/source/kde/kde/doinst.sh/blinken
diff --git a/source/kde/doinst.sh/bluedevil b/source/kde/kde/doinst.sh/bluedevil
index 85ff4d866..85ff4d866 100644
--- a/source/kde/doinst.sh/bluedevil
+++ b/source/kde/kde/doinst.sh/bluedevil
diff --git a/source/kde/doinst.sh/cantor b/source/kde/kde/doinst.sh/cantor
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/cantor
+++ b/source/kde/kde/doinst.sh/cantor
diff --git a/source/kde/doinst.sh/gwenview b/source/kde/kde/doinst.sh/gwenview
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/gwenview
+++ b/source/kde/kde/doinst.sh/gwenview
diff --git a/source/kde/doinst.sh/k3b b/source/kde/kde/doinst.sh/k3b
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/k3b
+++ b/source/kde/kde/doinst.sh/k3b
diff --git a/source/kde/doinst.sh/kalgebra b/source/kde/kde/doinst.sh/kalgebra
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kalgebra
+++ b/source/kde/kde/doinst.sh/kalgebra
diff --git a/source/kde/doinst.sh/kalzium b/source/kde/kde/doinst.sh/kalzium
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kalzium
+++ b/source/kde/kde/doinst.sh/kalzium
diff --git a/source/kde/doinst.sh/kamera b/source/kde/kde/doinst.sh/kamera
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kamera
+++ b/source/kde/kde/doinst.sh/kamera
diff --git a/source/kde/doinst.sh/kanagram b/source/kde/kde/doinst.sh/kanagram
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kanagram
+++ b/source/kde/kde/doinst.sh/kanagram
diff --git a/source/kde/doinst.sh/kate b/source/kde/kde/doinst.sh/kate
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kate
+++ b/source/kde/kde/doinst.sh/kate
diff --git a/source/kde/doinst.sh/kaudiocreator b/source/kde/kde/doinst.sh/kaudiocreator
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kaudiocreator
+++ b/source/kde/kde/doinst.sh/kaudiocreator
diff --git a/source/kde/doinst.sh/kbruch b/source/kde/kde/doinst.sh/kbruch
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kbruch
+++ b/source/kde/kde/doinst.sh/kbruch
diff --git a/source/kde/doinst.sh/kcalc b/source/kde/kde/doinst.sh/kcalc
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kcalc
+++ b/source/kde/kde/doinst.sh/kcalc
diff --git a/source/kde/doinst.sh/kcolorchooser b/source/kde/kde/doinst.sh/kcolorchooser
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kcolorchooser
+++ b/source/kde/kde/doinst.sh/kcolorchooser
diff --git a/source/kde/doinst.sh/kdeaccessibility b/source/kde/kde/doinst.sh/kdeaccessibility
index 22d4849bc..22d4849bc 100644
--- a/source/kde/doinst.sh/kdeaccessibility
+++ b/source/kde/kde/doinst.sh/kdeaccessibility
diff --git a/source/kde/doinst.sh/kdeedu b/source/kde/kde/doinst.sh/kdeedu
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdeedu
+++ b/source/kde/kde/doinst.sh/kdeedu
diff --git a/source/kde/doinst.sh/kdegraphics b/source/kde/kde/doinst.sh/kdegraphics
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdegraphics
+++ b/source/kde/kde/doinst.sh/kdegraphics
diff --git a/source/kde/doinst.sh/kdelibs b/source/kde/kde/doinst.sh/kdelibs
index d7006c70a..d7006c70a 100644
--- a/source/kde/doinst.sh/kdelibs
+++ b/source/kde/kde/doinst.sh/kdelibs
diff --git a/source/kde/doinst.sh/kdenetwork b/source/kde/kde/doinst.sh/kdenetwork
index 22d4849bc..22d4849bc 100644
--- a/source/kde/doinst.sh/kdenetwork
+++ b/source/kde/kde/doinst.sh/kdenetwork
diff --git a/source/kde/doinst.sh/kdepim b/source/kde/kde/doinst.sh/kdepim
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdepim
+++ b/source/kde/kde/doinst.sh/kdepim
diff --git a/source/kde/doinst.sh/kdepim-runtime b/source/kde/kde/doinst.sh/kdepim-runtime
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdepim-runtime
+++ b/source/kde/kde/doinst.sh/kdepim-runtime
diff --git a/source/kde/doinst.sh/kdeplasma-addons b/source/kde/kde/doinst.sh/kdeplasma-addons
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdeplasma-addons
+++ b/source/kde/kde/doinst.sh/kdeplasma-addons
diff --git a/source/kde/doinst.sh/kdesdk b/source/kde/kde/doinst.sh/kdesdk
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdesdk
+++ b/source/kde/kde/doinst.sh/kdesdk
diff --git a/source/kde/doinst.sh/kdevelop b/source/kde/kde/doinst.sh/kdevelop
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdevelop
+++ b/source/kde/kde/doinst.sh/kdevelop
diff --git a/source/kde/doinst.sh/kdevplatform b/source/kde/kde/doinst.sh/kdevplatform
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdevplatform
+++ b/source/kde/kde/doinst.sh/kdevplatform
diff --git a/source/kde/doinst.sh/kdewebdev b/source/kde/kde/doinst.sh/kdewebdev
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdewebdev
+++ b/source/kde/kde/doinst.sh/kdewebdev
diff --git a/source/kde/doinst.sh/kdf b/source/kde/kde/doinst.sh/kdf
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kdf
+++ b/source/kde/kde/doinst.sh/kdf
diff --git a/source/kde/doinst.sh/kgeography b/source/kde/kde/doinst.sh/kgeography
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kgeography
+++ b/source/kde/kde/doinst.sh/kgeography
diff --git a/source/kde/doinst.sh/khangman b/source/kde/kde/doinst.sh/khangman
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/khangman
+++ b/source/kde/kde/doinst.sh/khangman
diff --git a/source/kde/doinst.sh/kig b/source/kde/kde/doinst.sh/kig
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kig
+++ b/source/kde/kde/doinst.sh/kig
diff --git a/testing/source/vtown/kde/doinst.sh/kinit b/source/kde/kde/doinst.sh/kinit
index 27e18004d..27e18004d 100644
--- a/testing/source/vtown/kde/doinst.sh/kinit
+++ b/source/kde/kde/doinst.sh/kinit
diff --git a/source/kde/doinst.sh/kiten b/source/kde/kde/doinst.sh/kiten
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kiten
+++ b/source/kde/kde/doinst.sh/kiten
diff --git a/source/kde/doinst.sh/klettres b/source/kde/kde/doinst.sh/klettres
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/klettres
+++ b/source/kde/kde/doinst.sh/klettres
diff --git a/source/kde/doinst.sh/kmag b/source/kde/kde/doinst.sh/kmag
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kmag
+++ b/source/kde/kde/doinst.sh/kmag
diff --git a/source/kde/doinst.sh/kmousetool b/source/kde/kde/doinst.sh/kmousetool
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kmousetool
+++ b/source/kde/kde/doinst.sh/kmousetool
diff --git a/source/kde/doinst.sh/kmouth b/source/kde/kde/doinst.sh/kmouth
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kmouth
+++ b/source/kde/kde/doinst.sh/kmouth
diff --git a/source/kde/doinst.sh/kmplot b/source/kde/kde/doinst.sh/kmplot
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kmplot
+++ b/source/kde/kde/doinst.sh/kmplot
diff --git a/source/kde/doinst.sh/kolourpaint b/source/kde/kde/doinst.sh/kolourpaint
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kolourpaint
+++ b/source/kde/kde/doinst.sh/kolourpaint
diff --git a/source/kde/doinst.sh/konsole b/source/kde/kde/doinst.sh/konsole
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/konsole
+++ b/source/kde/kde/doinst.sh/konsole
diff --git a/source/kde/doinst.sh/kruler b/source/kde/kde/doinst.sh/kruler
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kruler
+++ b/source/kde/kde/doinst.sh/kruler
diff --git a/testing/source/vtown/kde/doinst.sh/kscreenlocker b/source/kde/kde/doinst.sh/kscreenlocker
index 77beeaf1f..77beeaf1f 100644
--- a/testing/source/vtown/kde/doinst.sh/kscreenlocker
+++ b/source/kde/kde/doinst.sh/kscreenlocker
diff --git a/source/kde/doinst.sh/kstars b/source/kde/kde/doinst.sh/kstars
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kstars
+++ b/source/kde/kde/doinst.sh/kstars
diff --git a/source/kde/doinst.sh/ktorrent b/source/kde/kde/doinst.sh/ktorrent
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/ktorrent
+++ b/source/kde/kde/doinst.sh/ktorrent
diff --git a/source/kde/doinst.sh/ktouch b/source/kde/kde/doinst.sh/ktouch
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/ktouch
+++ b/source/kde/kde/doinst.sh/ktouch
diff --git a/testing/source/vtown/kde/doinst.sh/ktp-contact-list b/source/kde/kde/doinst.sh/ktp-contact-list
index e376b59af..e376b59af 100644
--- a/testing/source/vtown/kde/doinst.sh/ktp-contact-list
+++ b/source/kde/kde/doinst.sh/ktp-contact-list
diff --git a/testing/source/vtown/kde/doinst.sh/ktp-text-ui b/source/kde/kde/doinst.sh/ktp-text-ui
index e376b59af..e376b59af 100644
--- a/testing/source/vtown/kde/doinst.sh/ktp-text-ui
+++ b/source/kde/kde/doinst.sh/ktp-text-ui
diff --git a/source/kde/doinst.sh/kturtle b/source/kde/kde/doinst.sh/kturtle
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kturtle
+++ b/source/kde/kde/doinst.sh/kturtle
diff --git a/source/kde/doinst.sh/kwordquiz b/source/kde/kde/doinst.sh/kwordquiz
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/kwordquiz
+++ b/source/kde/kde/doinst.sh/kwordquiz
diff --git a/source/kde/doinst.sh/marble b/source/kde/kde/doinst.sh/marble
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/marble
+++ b/source/kde/kde/doinst.sh/marble
diff --git a/source/kde/doinst.sh/okular b/source/kde/kde/doinst.sh/okular
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/okular
+++ b/source/kde/kde/doinst.sh/okular
diff --git a/testing/source/vtown/kde/doinst.sh/oxygen-fonts b/source/kde/kde/doinst.sh/oxygen-fonts
index c4bc3b75d..c4bc3b75d 100644
--- a/testing/source/vtown/kde/doinst.sh/oxygen-fonts
+++ b/source/kde/kde/doinst.sh/oxygen-fonts
diff --git a/source/kde/doinst.sh/parley b/source/kde/kde/doinst.sh/parley
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/parley
+++ b/source/kde/kde/doinst.sh/parley
diff --git a/testing/source/vtown/kde/doinst.sh/powerdevil b/source/kde/kde/doinst.sh/powerdevil
index 8745d6291..8745d6291 100644
--- a/testing/source/vtown/kde/doinst.sh/powerdevil
+++ b/source/kde/kde/doinst.sh/powerdevil
diff --git a/source/kde/doinst.sh/rocs b/source/kde/kde/doinst.sh/rocs
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/rocs
+++ b/source/kde/kde/doinst.sh/rocs
diff --git a/testing/source/vtown/kde/doinst.sh/sddm b/source/kde/kde/doinst.sh/sddm
index 6571d9b4d..6571d9b4d 100644
--- a/testing/source/vtown/kde/doinst.sh/sddm
+++ b/source/kde/kde/doinst.sh/sddm
diff --git a/source/kde/doinst.sh/skanlite b/source/kde/kde/doinst.sh/skanlite
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/skanlite
+++ b/source/kde/kde/doinst.sh/skanlite
diff --git a/source/kde/doinst.sh/step b/source/kde/kde/doinst.sh/step
index e376b59af..e376b59af 100644
--- a/source/kde/doinst.sh/step
+++ b/source/kde/kde/doinst.sh/step
diff --git a/testing/source/vtown/kde/kde.SlackBuild b/source/kde/kde/kde.SlackBuild
index 632eb0bb9..632eb0bb9 100755
--- a/testing/source/vtown/kde/kde.SlackBuild
+++ b/source/kde/kde/kde.SlackBuild
diff --git a/testing/source/vtown/kde/kde.options b/source/kde/kde/kde.options
index 4435ead77..4435ead77 100644
--- a/testing/source/vtown/kde/kde.options
+++ b/source/kde/kde/kde.options
diff --git a/testing/source/vtown/kde/make/katepart4 b/source/kde/kde/make/katepart4
index fff707abd..fff707abd 100644
--- a/testing/source/vtown/kde/make/katepart4
+++ b/source/kde/kde/make/katepart4
diff --git a/testing/source/vtown/kde/make/kdeconnect4 b/source/kde/kde/make/kdeconnect4
index d8e269876..d8e269876 100644
--- a/testing/source/vtown/kde/make/kdeconnect4
+++ b/source/kde/kde/make/kdeconnect4
diff --git a/testing/source/vtown/kde/make/marble b/source/kde/kde/make/marble
index 95ba2b1be..95ba2b1be 100644
--- a/testing/source/vtown/kde/make/marble
+++ b/source/kde/kde/make/marble
diff --git a/testing/source/vtown/kde/modules/applications b/source/kde/kde/modules/applications
index c64509e6f..c64509e6f 100644
--- a/testing/source/vtown/kde/modules/applications
+++ b/source/kde/kde/modules/applications
diff --git a/testing/source/vtown/kde/modules/applications-extra b/source/kde/kde/modules/applications-extra
index 489bc5b74..489bc5b74 100644
--- a/testing/source/vtown/kde/modules/applications-extra
+++ b/source/kde/kde/modules/applications-extra
diff --git a/testing/source/vtown/kde/modules/frameworks b/source/kde/kde/modules/frameworks
index e2abbc3ea..e2abbc3ea 100644
--- a/testing/source/vtown/kde/modules/frameworks
+++ b/source/kde/kde/modules/frameworks
diff --git a/testing/source/vtown/kde/modules/kde4 b/source/kde/kde/modules/kde4
index 473159785..473159785 100644
--- a/testing/source/vtown/kde/modules/kde4
+++ b/source/kde/kde/modules/kde4
diff --git a/testing/source/vtown/kde/modules/kdepim b/source/kde/kde/modules/kdepim
index 71b48da5b..71b48da5b 100644
--- a/testing/source/vtown/kde/modules/kdepim
+++ b/source/kde/kde/modules/kdepim
diff --git a/testing/source/vtown/kde/modules/plasma b/source/kde/kde/modules/plasma
index 0c46a3910..0c46a3910 100644
--- a/testing/source/vtown/kde/modules/plasma
+++ b/source/kde/kde/modules/plasma
diff --git a/testing/source/vtown/kde/modules/plasma-extra b/source/kde/kde/modules/plasma-extra
index e15d1a40b..e15d1a40b 100644
--- a/testing/source/vtown/kde/modules/plasma-extra
+++ b/source/kde/kde/modules/plasma-extra
diff --git a/testing/source/vtown/kde/modules/telepathy b/source/kde/kde/modules/telepathy
index 3b4858b87..3b4858b87 100644
--- a/testing/source/vtown/kde/modules/telepathy
+++ b/source/kde/kde/modules/telepathy
diff --git a/testing/source/vtown/kde/noarch b/source/kde/kde/noarch
index a1dd4c697..a1dd4c697 100644
--- a/testing/source/vtown/kde/noarch
+++ b/source/kde/kde/noarch
diff --git a/testing/source/vtown/kde/nomake b/source/kde/kde/nomake
index 2703fd484..2703fd484 100644
--- a/testing/source/vtown/kde/nomake
+++ b/source/kde/kde/nomake
diff --git a/testing/source/vtown/kde/package-blacklist b/source/kde/kde/package-blacklist
index f6ab382c4..f6ab382c4 100644
--- a/testing/source/vtown/kde/package-blacklist
+++ b/source/kde/kde/package-blacklist
diff --git a/source/kde/patch/README b/source/kde/kde/patch/README
index 2478e45f9..2478e45f9 100644
--- a/source/kde/patch/README
+++ b/source/kde/kde/patch/README
diff --git a/testing/source/vtown/kde/patch/baloo.patch b/source/kde/kde/patch/baloo.patch
index bcca5d5bb..bcca5d5bb 100644
--- a/testing/source/vtown/kde/patch/baloo.patch
+++ b/source/kde/kde/patch/baloo.patch
diff --git a/testing/source/vtown/kde/patch/baloo/baloo_def_indexing_disabled.patch b/source/kde/kde/patch/baloo/baloo_def_indexing_disabled.patch
index 8a12e45f2..8a12e45f2 100644
--- a/testing/source/vtown/kde/patch/baloo/baloo_def_indexing_disabled.patch
+++ b/source/kde/kde/patch/baloo/baloo_def_indexing_disabled.patch
diff --git a/testing/source/vtown/kde/patch/calendarsupport.patch b/source/kde/kde/patch/calendarsupport.patch
index d856e5f53..d856e5f53 100644
--- a/testing/source/vtown/kde/patch/calendarsupport.patch
+++ b/source/kde/kde/patch/calendarsupport.patch
diff --git a/testing/source/vtown/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff b/source/kde/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff
index 7dc0b8689..7dc0b8689 100644
--- a/testing/source/vtown/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff
+++ b/source/kde/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff
diff --git a/testing/source/vtown/kde/patch/calligraplan.patch b/source/kde/kde/patch/calligraplan.patch
index 5895d0cea..5895d0cea 100644
--- a/testing/source/vtown/kde/patch/calligraplan.patch
+++ b/source/kde/kde/patch/calligraplan.patch
diff --git a/testing/source/vtown/kde/patch/calligraplan/calligraplan.qt-5.15.patch b/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch
index c8962a1b5..c8962a1b5 100644
--- a/testing/source/vtown/kde/patch/calligraplan/calligraplan.qt-5.15.patch
+++ b/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch
diff --git a/testing/source/vtown/kde/patch/dolphin.patch b/source/kde/kde/patch/dolphin.patch
index 02a7950c8..02a7950c8 100644
--- a/testing/source/vtown/kde/patch/dolphin.patch
+++ b/source/kde/kde/patch/dolphin.patch
diff --git a/testing/source/vtown/kde/patch/dolphin/dolphin_revert_noroot.patch b/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch
index 423e17074..423e17074 100644
--- a/testing/source/vtown/kde/patch/dolphin/dolphin_revert_noroot.patch
+++ b/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch
diff --git a/testing/source/vtown/kde/patch/falkon.patch b/source/kde/kde/patch/falkon.patch
index 27a466836..27a466836 100644
--- a/testing/source/vtown/kde/patch/falkon.patch
+++ b/source/kde/kde/patch/falkon.patch
diff --git a/testing/source/vtown/kde/patch/falkon/falkon.qt-5.15.diff b/source/kde/kde/patch/falkon/falkon.qt-5.15.diff
index 60f1699e8..60f1699e8 100644
--- a/testing/source/vtown/kde/patch/falkon/falkon.qt-5.15.diff
+++ b/source/kde/kde/patch/falkon/falkon.qt-5.15.diff
diff --git a/testing/source/vtown/kde/patch/kaddressbook.patch b/source/kde/kde/patch/kaddressbook.patch
index f5479069d..f5479069d 100644
--- a/testing/source/vtown/kde/patch/kaddressbook.patch
+++ b/source/kde/kde/patch/kaddressbook.patch
diff --git a/testing/source/vtown/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff b/source/kde/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff
index 6460b30d4..6460b30d4 100644
--- a/testing/source/vtown/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff
+++ b/source/kde/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff
diff --git a/testing/source/vtown/kde/patch/kalgebra.patch b/source/kde/kde/patch/kalgebra.patch
index d17f4822d..d17f4822d 100644
--- a/testing/source/vtown/kde/patch/kalgebra.patch
+++ b/source/kde/kde/patch/kalgebra.patch
diff --git a/testing/source/vtown/kde/patch/kalgebra/kalgebra_ncurses_linking.diff b/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
index 3d78fa30b..3d78fa30b 100644
--- a/testing/source/vtown/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
+++ b/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
diff --git a/testing/source/vtown/kde/patch/kate.patch b/source/kde/kde/patch/kate.patch
index 59df062a0..59df062a0 100644
--- a/testing/source/vtown/kde/patch/kate.patch
+++ b/source/kde/kde/patch/kate.patch
diff --git a/testing/source/vtown/kde/patch/kate/kate_runasroot.patch b/source/kde/kde/patch/kate/kate_runasroot.patch
index f549fc342..f549fc342 100644
--- a/testing/source/vtown/kde/patch/kate/kate_runasroot.patch
+++ b/source/kde/kde/patch/kate/kate_runasroot.patch
diff --git a/testing/source/vtown/kde/patch/kdeconnect-kde.patch b/source/kde/kde/patch/kdeconnect-kde.patch
index 122440d2a..122440d2a 100644
--- a/testing/source/vtown/kde/patch/kdeconnect-kde.patch
+++ b/source/kde/kde/patch/kdeconnect-kde.patch
diff --git a/testing/source/vtown/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff b/source/kde/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
index ff067aa8e..ff067aa8e 100644
--- a/testing/source/vtown/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
+++ b/source/kde/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
diff --git a/testing/source/vtown/kde/patch/kdelibs.patch b/source/kde/kde/patch/kdelibs.patch
index 0cdcc9ca4..0cdcc9ca4 100644
--- a/testing/source/vtown/kde/patch/kdelibs.patch
+++ b/source/kde/kde/patch/kdelibs.patch
diff --git a/source/kde/patch/kdelibs/coding-style-fixes.patch b/source/kde/kde/patch/kdelibs/coding-style-fixes.patch
index 11108f0a4..11108f0a4 100644
--- a/source/kde/patch/kdelibs/coding-style-fixes.patch
+++ b/source/kde/kde/patch/kdelibs/coding-style-fixes.patch
diff --git a/source/kde/patch/kdelibs/kde4libs-4.14.26.diff b/source/kde/kde/patch/kdelibs/kde4libs-4.14.26.diff
index 2bc275ac7..2bc275ac7 100644
--- a/source/kde/patch/kdelibs/kde4libs-4.14.26.diff
+++ b/source/kde/kde/patch/kdelibs/kde4libs-4.14.26.diff
diff --git a/testing/source/vtown/kde/patch/kdelibs/kdelibs-openssl-1.1.patch b/source/kde/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
index 1f6b7fcb0..1f6b7fcb0 100644
--- a/testing/source/vtown/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
+++ b/source/kde/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
diff --git a/source/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch b/source/kde/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch
index 58afcaaed..58afcaaed 100644
--- a/source/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch
+++ b/source/kde/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch
diff --git a/source/kde/patch/kdelibs/kdelibs.docbook.patch b/source/kde/kde/patch/kdelibs/kdelibs.docbook.patch
index 6a20cd279..6a20cd279 100644
--- a/source/kde/patch/kdelibs/kdelibs.docbook.patch
+++ b/source/kde/kde/patch/kdelibs/kdelibs.docbook.patch
diff --git a/testing/source/vtown/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch b/source/kde/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
index fd7375f9f..fd7375f9f 100644
--- a/testing/source/vtown/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
+++ b/source/kde/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
diff --git a/source/kde/patch/kdelibs/kdelibs.upnp_conditional.patch b/source/kde/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
index 3a1944774..3a1944774 100644
--- a/source/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
+++ b/source/kde/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
diff --git a/source/kde/patch/kdelibs/return-application-icons-properly.patch b/source/kde/kde/patch/kdelibs/return-application-icons-properly.patch
index 2bdb53adf..2bdb53adf 100644
--- a/source/kde/patch/kdelibs/return-application-icons-properly.patch
+++ b/source/kde/kde/patch/kdelibs/return-application-icons-properly.patch
diff --git a/source/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch b/source/kde/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch
index b62818ed6..b62818ed6 100644
--- a/source/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch
+++ b/source/kde/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch
diff --git a/testing/source/vtown/kde/patch/kdelibs4support.patch b/source/kde/kde/patch/kdelibs4support.patch
index 7d6626ed1..7d6626ed1 100644
--- a/testing/source/vtown/kde/patch/kdelibs4support.patch
+++ b/source/kde/kde/patch/kdelibs4support.patch
diff --git a/testing/source/vtown/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff b/source/kde/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
index 1b393287a..1b393287a 100644
--- a/testing/source/vtown/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
+++ b/source/kde/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
diff --git a/testing/source/vtown/kde/patch/kgpg.patch b/source/kde/kde/patch/kgpg.patch
index f2248dfb5..f2248dfb5 100644
--- a/testing/source/vtown/kde/patch/kgpg.patch
+++ b/source/kde/kde/patch/kgpg.patch
diff --git a/testing/source/vtown/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff b/source/kde/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff
index 86a732dd1..86a732dd1 100644
--- a/testing/source/vtown/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff
+++ b/source/kde/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff
diff --git a/testing/source/vtown/kde/patch/kinfocenter.patch b/source/kde/kde/patch/kinfocenter.patch
index b57d434fc..b57d434fc 100644
--- a/testing/source/vtown/kde/patch/kinfocenter.patch
+++ b/source/kde/kde/patch/kinfocenter.patch
diff --git a/testing/source/vtown/kde/patch/kinfocenter/kinfocenter_libpci.patch b/source/kde/kde/patch/kinfocenter/kinfocenter_libpci.patch
index a2bc00796..a2bc00796 100644
--- a/testing/source/vtown/kde/patch/kinfocenter/kinfocenter_libpci.patch
+++ b/source/kde/kde/patch/kinfocenter/kinfocenter_libpci.patch
diff --git a/testing/source/vtown/kde/patch/kompare.patch b/source/kde/kde/patch/kompare.patch
index dee6dee1c..dee6dee1c 100644
--- a/testing/source/vtown/kde/patch/kompare.patch
+++ b/source/kde/kde/patch/kompare.patch
diff --git a/testing/source/vtown/kde/patch/kompare/kompare.qt-5.15.2.diff b/source/kde/kde/patch/kompare/kompare.qt-5.15.2.diff
index fae1d772f..fae1d772f 100644
--- a/testing/source/vtown/kde/patch/kompare/kompare.qt-5.15.2.diff
+++ b/source/kde/kde/patch/kompare/kompare.qt-5.15.2.diff
diff --git a/testing/source/vtown/kde/patch/krename.patch b/source/kde/kde/patch/krename.patch
index 6e79ecb66..6e79ecb66 100644
--- a/testing/source/vtown/kde/patch/krename.patch
+++ b/source/kde/kde/patch/krename.patch
diff --git a/testing/source/vtown/kde/patch/krename/krename.taglib.diff b/source/kde/kde/patch/krename/krename.taglib.diff
index a1b8a11db..a1b8a11db 100644
--- a/testing/source/vtown/kde/patch/krename/krename.taglib.diff
+++ b/source/kde/kde/patch/krename/krename.taglib.diff
diff --git a/testing/source/vtown/kde/patch/ktorrent.patch b/source/kde/kde/patch/ktorrent.patch
index 0fdb4aacb..0fdb4aacb 100644
--- a/testing/source/vtown/kde/patch/ktorrent.patch
+++ b/source/kde/kde/patch/ktorrent.patch
diff --git a/source/kde/patch/ktorrent/geoip.dat b/source/kde/kde/patch/ktorrent/geoip.dat
index be8b031f7..be8b031f7 100644
--- a/source/kde/patch/ktorrent/geoip.dat
+++ b/source/kde/kde/patch/ktorrent/geoip.dat
diff --git a/testing/source/vtown/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
index e55e5ceea..e55e5ceea 100644
--- a/testing/source/vtown/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
+++ b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
diff --git a/testing/source/vtown/kde/patch/ktorrent/ktorrent_systray.patch b/source/kde/kde/patch/ktorrent/ktorrent_systray.patch
index 50049afae..50049afae 100644
--- a/testing/source/vtown/kde/patch/ktorrent/ktorrent_systray.patch
+++ b/source/kde/kde/patch/ktorrent/ktorrent_systray.patch
diff --git a/testing/source/vtown/kde/patch/ktorrent/ktorrent_taglib_linking.patch b/source/kde/kde/patch/ktorrent/ktorrent_taglib_linking.patch
index 7f612c8fc..7f612c8fc 100644
--- a/testing/source/vtown/kde/patch/ktorrent/ktorrent_taglib_linking.patch
+++ b/source/kde/kde/patch/ktorrent/ktorrent_taglib_linking.patch
diff --git a/testing/source/vtown/kde/patch/milou.patch b/source/kde/kde/patch/milou.patch
index 2caee005f..2caee005f 100644
--- a/testing/source/vtown/kde/patch/milou.patch
+++ b/source/kde/kde/patch/milou.patch
diff --git a/testing/source/vtown/kde/patch/milou/milou_krunner_include.diff b/source/kde/kde/patch/milou/milou_krunner_include.diff
index ffd075cad..ffd075cad 100644
--- a/testing/source/vtown/kde/patch/milou/milou_krunner_include.diff
+++ b/source/kde/kde/patch/milou/milou_krunner_include.diff
diff --git a/testing/source/vtown/kde/patch/oxygen-gtk2.patch b/source/kde/kde/patch/oxygen-gtk2.patch
index a2dd03e7f..a2dd03e7f 100644
--- a/testing/source/vtown/kde/patch/oxygen-gtk2.patch
+++ b/source/kde/kde/patch/oxygen-gtk2.patch
diff --git a/testing/source/vtown/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch b/source/kde/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
index b6a1e557e..b6a1e557e 100644
--- a/testing/source/vtown/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
+++ b/source/kde/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
diff --git a/testing/source/vtown/kde/patch/plasma-browser-integration.patch b/source/kde/kde/patch/plasma-browser-integration.patch
index 38642df29..38642df29 100644
--- a/testing/source/vtown/kde/patch/plasma-browser-integration.patch
+++ b/source/kde/kde/patch/plasma-browser-integration.patch
diff --git a/testing/source/vtown/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch b/source/kde/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
index c881edf42..c881edf42 100644
--- a/testing/source/vtown/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
+++ b/source/kde/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
diff --git a/testing/source/vtown/kde/patch/plasma-desktop.patch b/source/kde/kde/patch/plasma-desktop.patch
index fddf562e8..fddf562e8 100644
--- a/testing/source/vtown/kde/patch/plasma-desktop.patch
+++ b/source/kde/kde/patch/plasma-desktop.patch
diff --git a/testing/source/vtown/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff b/source/kde/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff
index f3400d2ea..f3400d2ea 100644
--- a/testing/source/vtown/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff
+++ b/source/kde/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff
diff --git a/testing/source/vtown/kde/patch/sddm.patch b/source/kde/kde/patch/sddm.patch
index a77c521f6..a77c521f6 100644
--- a/testing/source/vtown/kde/patch/sddm.patch
+++ b/source/kde/kde/patch/sddm.patch
diff --git a/testing/source/vtown/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch b/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
index bf3bfd255..bf3bfd255 100644
--- a/testing/source/vtown/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
+++ b/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
diff --git a/testing/source/vtown/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch b/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
index 2391c80ce..2391c80ce 100644
--- a/testing/source/vtown/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
+++ b/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
diff --git a/testing/source/vtown/kde/plasma_checkout.sh b/source/kde/kde/plasma_checkout.sh
index edb8bf739..edb8bf739 100644
--- a/testing/source/vtown/kde/plasma_checkout.sh
+++ b/source/kde/kde/plasma_checkout.sh
diff --git a/testing/source/vtown/kde/post-install/akonadi4.post-install b/source/kde/kde/post-install/akonadi4.post-install
index 6115cf392..6115cf392 100644
--- a/testing/source/vtown/kde/post-install/akonadi4.post-install
+++ b/source/kde/kde/post-install/akonadi4.post-install
diff --git a/testing/source/vtown/kde/post-install/audiocd-kio4.post-install b/source/kde/kde/post-install/audiocd-kio4.post-install
index ec32ab188..ec32ab188 100644
--- a/testing/source/vtown/kde/post-install/audiocd-kio4.post-install
+++ b/source/kde/kde/post-install/audiocd-kio4.post-install
diff --git a/testing/source/vtown/kde/post-install/breeze-grub.post-install b/source/kde/kde/post-install/breeze-grub.post-install
index ed723c2cc..ed723c2cc 100644
--- a/testing/source/vtown/kde/post-install/breeze-grub.post-install
+++ b/source/kde/kde/post-install/breeze-grub.post-install
diff --git a/testing/source/vtown/kde/post-install/dolphin.post-install b/source/kde/kde/post-install/dolphin.post-install
index 8b0f9e142..8b0f9e142 100644
--- a/testing/source/vtown/kde/post-install/dolphin.post-install
+++ b/source/kde/kde/post-install/dolphin.post-install
diff --git a/testing/source/vtown/kde/post-install/elisa.post-install b/source/kde/kde/post-install/elisa.post-install
index 93d9424fd..93d9424fd 100644
--- a/testing/source/vtown/kde/post-install/elisa.post-install
+++ b/source/kde/kde/post-install/elisa.post-install
diff --git a/source/kde/post-install/k3b.post-install b/source/kde/kde/post-install/k3b.post-install
index 881011489..881011489 100644
--- a/source/kde/post-install/k3b.post-install
+++ b/source/kde/kde/post-install/k3b.post-install
diff --git a/testing/source/vtown/kde/post-install/kauth.post-install b/source/kde/kde/post-install/kauth.post-install
index 9239a3e5f..9239a3e5f 100644
--- a/testing/source/vtown/kde/post-install/kauth.post-install
+++ b/source/kde/kde/post-install/kauth.post-install
diff --git a/source/kde/post-install/kdelibs.post-install b/source/kde/kde/post-install/kdelibs.post-install
index 9239a3e5f..9239a3e5f 100644
--- a/source/kde/post-install/kdelibs.post-install
+++ b/source/kde/kde/post-install/kdelibs.post-install
diff --git a/testing/source/vtown/kde/post-install/kdelibs4support.post-install b/source/kde/kde/post-install/kdelibs4support.post-install
index c91513e94..c91513e94 100644
--- a/testing/source/vtown/kde/post-install/kdelibs4support.post-install
+++ b/source/kde/kde/post-install/kdelibs4support.post-install
diff --git a/testing/source/vtown/kde/post-install/kdepim.post-install b/source/kde/kde/post-install/kdepim.post-install
index c9cc6ce3c..c9cc6ce3c 100644
--- a/testing/source/vtown/kde/post-install/kdepim.post-install
+++ b/source/kde/kde/post-install/kdepim.post-install
diff --git a/testing/source/vtown/kde/post-install/kdepimlibs4.post-install b/source/kde/kde/post-install/kdepimlibs4.post-install
index 0cd6c30a3..0cd6c30a3 100644
--- a/testing/source/vtown/kde/post-install/kdepimlibs4.post-install
+++ b/source/kde/kde/post-install/kdepimlibs4.post-install
diff --git a/testing/source/vtown/kde/post-install/kdesu.post-install b/source/kde/kde/post-install/kdesu.post-install
index 52402f52c..52402f52c 100644
--- a/testing/source/vtown/kde/post-install/kdesu.post-install
+++ b/source/kde/kde/post-install/kdesu.post-install
diff --git a/testing/source/vtown/kde/post-install/kinfocenter.post-install b/source/kde/kde/post-install/kinfocenter.post-install
index d6befb133..d6befb133 100644
--- a/testing/source/vtown/kde/post-install/kinfocenter.post-install
+++ b/source/kde/kde/post-install/kinfocenter.post-install
diff --git a/testing/source/vtown/kde/post-install/kinfocenter/blueSW-128px.png b/source/kde/kde/post-install/kinfocenter/blueSW-128px.png
index 7eea5a2cd..7eea5a2cd 100644
--- a/testing/source/vtown/kde/post-install/kinfocenter/blueSW-128px.png
+++ b/source/kde/kde/post-install/kinfocenter/blueSW-128px.png
diff --git a/testing/source/vtown/kde/post-install/kinfocenter/kcm-about-distrorc.ex b/source/kde/kde/post-install/kinfocenter/kcm-about-distrorc.ex
index 715ae0ccd..715ae0ccd 100644
--- a/testing/source/vtown/kde/post-install/kinfocenter/kcm-about-distrorc.ex
+++ b/source/kde/kde/post-install/kinfocenter/kcm-about-distrorc.ex
diff --git a/source/kde/post-install/konsole.post-install b/source/kde/kde/post-install/konsole.post-install
index 6104e9f2f..6104e9f2f 100644
--- a/source/kde/post-install/konsole.post-install
+++ b/source/kde/kde/post-install/konsole.post-install
diff --git a/testing/source/vtown/kde/post-install/konsolepart4.post-install b/source/kde/kde/post-install/konsolepart4.post-install
index 8345463ce..8345463ce 100644
--- a/testing/source/vtown/kde/post-install/konsolepart4.post-install
+++ b/source/kde/kde/post-install/konsolepart4.post-install
diff --git a/testing/source/vtown/kde/post-install/kscreenlocker.post-install b/source/kde/kde/post-install/kscreenlocker.post-install
index 203cff041..203cff041 100644
--- a/testing/source/vtown/kde/post-install/kscreenlocker.post-install
+++ b/source/kde/kde/post-install/kscreenlocker.post-install
diff --git a/testing/source/vtown/kde/post-install/kservice.post-install b/source/kde/kde/post-install/kservice.post-install
index a014f3ba3..a014f3ba3 100644
--- a/testing/source/vtown/kde/post-install/kservice.post-install
+++ b/source/kde/kde/post-install/kservice.post-install
diff --git a/testing/source/vtown/kde/post-install/kservice/profile.d/kde.csh b/source/kde/kde/post-install/kservice/profile.d/kde.csh
index b0ce563f7..b0ce563f7 100644
--- a/testing/source/vtown/kde/post-install/kservice/profile.d/kde.csh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.csh
diff --git a/testing/source/vtown/kde/post-install/kservice/profile.d/kde.sh b/source/kde/kde/post-install/kservice/profile.d/kde.sh
index ec317ad1e..ec317ad1e 100644
--- a/testing/source/vtown/kde/post-install/kservice/profile.d/kde.sh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.sh
diff --git a/testing/source/vtown/kde/post-install/ktorrent.post-install b/source/kde/kde/post-install/ktorrent.post-install
index 7e0c13031..7e0c13031 100644
--- a/testing/source/vtown/kde/post-install/ktorrent.post-install
+++ b/source/kde/kde/post-install/ktorrent.post-install
diff --git a/testing/source/vtown/kde/post-install/kwallet.post-install b/source/kde/kde/post-install/kwallet.post-install
index 9239a3e5f..9239a3e5f 100644
--- a/testing/source/vtown/kde/post-install/kwallet.post-install
+++ b/source/kde/kde/post-install/kwallet.post-install
diff --git a/source/kde/post-install/kwalletmanager.post-install b/source/kde/kde/post-install/kwalletmanager.post-install
index 9239a3e5f..9239a3e5f 100644
--- a/source/kde/post-install/kwalletmanager.post-install
+++ b/source/kde/kde/post-install/kwalletmanager.post-install
diff --git a/testing/source/vtown/kde/post-install/libksysguard.post-install b/source/kde/kde/post-install/libksysguard.post-install
index 10b156d72..10b156d72 100644
--- a/testing/source/vtown/kde/post-install/libksysguard.post-install
+++ b/source/kde/kde/post-install/libksysguard.post-install
diff --git a/source/kde/post-install/nepomuk-core.post-install b/source/kde/kde/post-install/nepomuk-core.post-install
index 881011489..881011489 100644
--- a/source/kde/post-install/nepomuk-core.post-install
+++ b/source/kde/kde/post-install/nepomuk-core.post-install
diff --git a/testing/source/vtown/kde/post-install/oktetapart4.post-install b/source/kde/kde/post-install/oktetapart4.post-install
index 262be1a7e..262be1a7e 100644
--- a/testing/source/vtown/kde/post-install/oktetapart4.post-install
+++ b/source/kde/kde/post-install/oktetapart4.post-install
diff --git a/testing/source/vtown/kde/post-install/oxygen-fonts.post-install b/source/kde/kde/post-install/oxygen-fonts.post-install
index 300b6c5a0..300b6c5a0 100755
--- a/testing/source/vtown/kde/post-install/oxygen-fonts.post-install
+++ b/source/kde/kde/post-install/oxygen-fonts.post-install
diff --git a/testing/source/vtown/kde/post-install/plasma-desktop.post-install b/source/kde/kde/post-install/plasma-desktop.post-install
index 10b156d72..10b156d72 100644
--- a/testing/source/vtown/kde/post-install/plasma-desktop.post-install
+++ b/source/kde/kde/post-install/plasma-desktop.post-install
diff --git a/testing/source/vtown/kde/post-install/plasma-workspace.post-install b/source/kde/kde/post-install/plasma-workspace.post-install
index 65d727fcb..65d727fcb 100644
--- a/testing/source/vtown/kde/post-install/plasma-workspace.post-install
+++ b/source/kde/kde/post-install/plasma-workspace.post-install
diff --git a/testing/source/vtown/kde/post-install/plasma-workspace/pam.d/kde b/source/kde/kde/post-install/plasma-workspace/pam.d/kde
index 50e0f53d2..50e0f53d2 100644
--- a/testing/source/vtown/kde/post-install/plasma-workspace/pam.d/kde
+++ b/source/kde/kde/post-install/plasma-workspace/pam.d/kde
diff --git a/testing/source/vtown/kde/post-install/plasma-workspace/scripts/startkwayland b/source/kde/kde/post-install/plasma-workspace/scripts/startkwayland
index 2d8cf55b3..2d8cf55b3 100644
--- a/testing/source/vtown/kde/post-install/plasma-workspace/scripts/startkwayland
+++ b/source/kde/kde/post-install/plasma-workspace/scripts/startkwayland
diff --git a/testing/source/vtown/kde/post-install/plasma-workspace/xinit/xinitrc.kde b/source/kde/kde/post-install/plasma-workspace/xinit/xinitrc.kde
index b0a920f58..b0a920f58 100644
--- a/testing/source/vtown/kde/post-install/plasma-workspace/xinit/xinitrc.kde
+++ b/source/kde/kde/post-install/plasma-workspace/xinit/xinitrc.kde
diff --git a/testing/source/vtown/kde/post-install/plasma-workspace/xsession/plasma-safe.desktop b/source/kde/kde/post-install/plasma-workspace/xsession/plasma-safe.desktop
index e166414fa..e166414fa 100644
--- a/testing/source/vtown/kde/post-install/plasma-workspace/xsession/plasma-safe.desktop
+++ b/source/kde/kde/post-install/plasma-workspace/xsession/plasma-safe.desktop
diff --git a/testing/source/vtown/kde/post-install/polkit-kde-kcmodules-framework.post-install b/source/kde/kde/post-install/polkit-kde-kcmodules-framework.post-install
index 10b156d72..10b156d72 100644
--- a/testing/source/vtown/kde/post-install/polkit-kde-kcmodules-framework.post-install
+++ b/source/kde/kde/post-install/polkit-kde-kcmodules-framework.post-install
diff --git a/testing/source/vtown/kde/post-install/powerdevil.post-install b/source/kde/kde/post-install/powerdevil.post-install
index 4d6b9f836..4d6b9f836 100644
--- a/testing/source/vtown/kde/post-install/powerdevil.post-install
+++ b/source/kde/kde/post-install/powerdevil.post-install
diff --git a/testing/source/vtown/kde/post-install/powerdevil/10-enable-ck2-power.rules b/source/kde/kde/post-install/powerdevil/10-enable-ck2-power.rules
index 2a8a5a70b..2a8a5a70b 100644
--- a/testing/source/vtown/kde/post-install/powerdevil/10-enable-ck2-power.rules
+++ b/source/kde/kde/post-install/powerdevil/10-enable-ck2-power.rules
diff --git a/testing/source/vtown/kde/post-install/powerdevil/10-enable-elogind-power.rules b/source/kde/kde/post-install/powerdevil/10-enable-elogind-power.rules
index db4992062..db4992062 100644
--- a/testing/source/vtown/kde/post-install/powerdevil/10-enable-elogind-power.rules
+++ b/source/kde/kde/post-install/powerdevil/10-enable-elogind-power.rules
diff --git a/testing/source/vtown/kde/post-install/powerdevil/10-enable-powerdevil-discrete-gpu.rules b/source/kde/kde/post-install/powerdevil/10-enable-powerdevil-discrete-gpu.rules
index f001848e4..f001848e4 100644
--- a/testing/source/vtown/kde/post-install/powerdevil/10-enable-powerdevil-discrete-gpu.rules
+++ b/source/kde/kde/post-install/powerdevil/10-enable-powerdevil-discrete-gpu.rules
diff --git a/testing/source/vtown/kde/post-install/powerdevil/10-enable-upower-suspend.rules b/source/kde/kde/post-install/powerdevil/10-enable-upower-suspend.rules
index 4bccfb014..4bccfb014 100644
--- a/testing/source/vtown/kde/post-install/powerdevil/10-enable-upower-suspend.rules
+++ b/source/kde/kde/post-install/powerdevil/10-enable-upower-suspend.rules
diff --git a/testing/source/vtown/kde/post-install/sddm-kcm.post-install b/source/kde/kde/post-install/sddm-kcm.post-install
index 10b156d72..10b156d72 100644
--- a/testing/source/vtown/kde/post-install/sddm-kcm.post-install
+++ b/source/kde/kde/post-install/sddm-kcm.post-install
diff --git a/testing/source/vtown/kde/post-install/sddm.post-install b/source/kde/kde/post-install/sddm.post-install
index 5f52fede3..5f52fede3 100644
--- a/testing/source/vtown/kde/post-install/sddm.post-install
+++ b/source/kde/kde/post-install/sddm.post-install
diff --git a/testing/source/vtown/kde/post-install/sddm/pam.d/sddm b/source/kde/kde/post-install/sddm/pam.d/sddm
index df016a7ec..df016a7ec 100644
--- a/testing/source/vtown/kde/post-install/sddm/pam.d/sddm
+++ b/source/kde/kde/post-install/sddm/pam.d/sddm
diff --git a/testing/source/vtown/kde/post-install/sddm/pam.d/sddm-autologin b/source/kde/kde/post-install/sddm/pam.d/sddm-autologin
index 360239544..360239544 100644
--- a/testing/source/vtown/kde/post-install/sddm/pam.d/sddm-autologin
+++ b/source/kde/kde/post-install/sddm/pam.d/sddm-autologin
diff --git a/testing/source/vtown/kde/post-install/sddm/pam.d/sddm-greeter b/source/kde/kde/post-install/sddm/pam.d/sddm-greeter
index fe30e60c2..fe30e60c2 100644
--- a/testing/source/vtown/kde/post-install/sddm/pam.d/sddm-greeter
+++ b/source/kde/kde/post-install/sddm/pam.d/sddm-greeter
diff --git a/source/kde/post-install/wicd-kde.post-install b/source/kde/kde/post-install/wicd-kde.post-install
index 881011489..881011489 100644
--- a/source/kde/post-install/wicd-kde.post-install
+++ b/source/kde/kde/post-install/wicd-kde.post-install
diff --git a/source/kde/pre-install/README b/source/kde/kde/pre-install/README
index 2478e45f9..2478e45f9 100644
--- a/source/kde/pre-install/README
+++ b/source/kde/kde/pre-install/README
diff --git a/testing/source/vtown/kde/pre-install/alkimia.pre-install b/source/kde/kde/pre-install/alkimia.pre-install
index a9a19c72a..a9a19c72a 100644
--- a/testing/source/vtown/kde/pre-install/alkimia.pre-install
+++ b/source/kde/kde/pre-install/alkimia.pre-install
diff --git a/testing/source/vtown/kde/pre-install/kapidox.pre-install b/source/kde/kde/pre-install/kapidox.pre-install
index d3aa1a903..d3aa1a903 100644
--- a/testing/source/vtown/kde/pre-install/kapidox.pre-install
+++ b/source/kde/kde/pre-install/kapidox.pre-install
diff --git a/source/kde/pre-install/kdeconnect-kde.pre-install b/source/kde/kde/pre-install/kdeconnect-kde.pre-install
index e89e2fc8f..e89e2fc8f 100644
--- a/source/kde/pre-install/kdeconnect-kde.pre-install
+++ b/source/kde/kde/pre-install/kdeconnect-kde.pre-install
diff --git a/testing/source/vtown/kde/pre-install/kdepimlibs4.pre-install b/source/kde/kde/pre-install/kdepimlibs4.pre-install
index d12070196..d12070196 100644
--- a/testing/source/vtown/kde/pre-install/kdepimlibs4.pre-install
+++ b/source/kde/kde/pre-install/kdepimlibs4.pre-install
diff --git a/source/kde/pre-install/kdewebdev.pre-install b/source/kde/kde/pre-install/kdewebdev.pre-install
index 6cd51b1cc..6cd51b1cc 100644
--- a/source/kde/pre-install/kdewebdev.pre-install
+++ b/source/kde/kde/pre-install/kdewebdev.pre-install
diff --git a/testing/source/vtown/kde/pre-install/messagelib.pre-install b/source/kde/kde/pre-install/messagelib.pre-install
index d4883ff11..d4883ff11 100644
--- a/testing/source/vtown/kde/pre-install/messagelib.pre-install
+++ b/source/kde/kde/pre-install/messagelib.pre-install
diff --git a/testing/source/vtown/kde/pre-install/smokekde.pre-install b/source/kde/kde/pre-install/smokekde.pre-install
index a663cc69b..a663cc69b 100644
--- a/testing/source/vtown/kde/pre-install/smokekde.pre-install
+++ b/source/kde/kde/pre-install/smokekde.pre-install
diff --git a/testing/source/vtown/kde/slack-desc/akonadi b/source/kde/kde/slack-desc/akonadi
index 836688d0d..836688d0d 100644
--- a/testing/source/vtown/kde/slack-desc/akonadi
+++ b/source/kde/kde/slack-desc/akonadi
diff --git a/testing/source/vtown/kde/slack-desc/akonadi-calendar b/source/kde/kde/slack-desc/akonadi-calendar
index c4979ce08..c4979ce08 100644
--- a/testing/source/vtown/kde/slack-desc/akonadi-calendar
+++ b/source/kde/kde/slack-desc/akonadi-calendar
diff --git a/testing/source/vtown/kde/slack-desc/akonadi-calendar-tools b/source/kde/kde/slack-desc/akonadi-calendar-tools
index d2a8adb15..d2a8adb15 100644
--- a/testing/source/vtown/kde/slack-desc/akonadi-calendar-tools
+++ b/source/kde/kde/slack-desc/akonadi-calendar-tools
diff --git a/testing/source/vtown/kde/slack-desc/akonadi-contacts b/source/kde/kde/slack-desc/akonadi-contacts
index 79228dcad..79228dcad 100644
--- a/testing/source/vtown/kde/slack-desc/akonadi-contacts
+++ b/source/kde/kde/slack-desc/akonadi-contacts
diff --git a/testing/source/vtown/kde/slack-desc/akonadi-import-wizard b/source/kde/kde/slack-desc/akonadi-import-wizard
index 04917e9a1..04917e9a1 100644
--- a/testing/source/vtown/kde/slack-desc/akonadi-import-wizard
+++ b/source/kde/kde/slack-desc/akonadi-import-wizard
diff --git a/testing/source/vtown/kde/slack-desc/akonadi-mime b/source/kde/kde/slack-desc/akonadi-mime
index c37027760..c37027760 100644
--- a/testing/source/vtown/kde/slack-desc/akonadi-mime
+++ b/source/kde/kde/slack-desc/akonadi-mime
diff --git a/testing/source/vtown/kde/slack-desc/akonadi-notes b/source/kde/kde/slack-desc/akonadi-notes
index 94087684a..94087684a 100644
--- a/testing/source/vtown/kde/slack-desc/akonadi-notes
+++ b/source/kde/kde/slack-desc/akonadi-notes
diff --git a/testing/source/vtown/kde/slack-desc/akonadi-search b/source/kde/kde/slack-desc/akonadi-search
index 73032242d..73032242d 100644
--- a/testing/source/vtown/kde/slack-desc/akonadi-search
+++ b/source/kde/kde/slack-desc/akonadi-search
diff --git a/testing/source/vtown/kde/slack-desc/akonadiconsole b/source/kde/kde/slack-desc/akonadiconsole
index 7a2dbca48..7a2dbca48 100644
--- a/testing/source/vtown/kde/slack-desc/akonadiconsole
+++ b/source/kde/kde/slack-desc/akonadiconsole
diff --git a/testing/source/vtown/kde/slack-desc/akregator b/source/kde/kde/slack-desc/akregator
index 3e69708e9..3e69708e9 100644
--- a/testing/source/vtown/kde/slack-desc/akregator
+++ b/source/kde/kde/slack-desc/akregator
diff --git a/testing/source/vtown/kde/slack-desc/alkimia b/source/kde/kde/slack-desc/alkimia
index f8801b9c9..f8801b9c9 100644
--- a/testing/source/vtown/kde/slack-desc/alkimia
+++ b/source/kde/kde/slack-desc/alkimia
diff --git a/testing/source/vtown/kde/slack-desc/analitza b/source/kde/kde/slack-desc/analitza
index c5c035f5d..c5c035f5d 100644
--- a/testing/source/vtown/kde/slack-desc/analitza
+++ b/source/kde/kde/slack-desc/analitza
diff --git a/testing/source/vtown/kde/slack-desc/ark b/source/kde/kde/slack-desc/ark
index f32d12aaa..f32d12aaa 100644
--- a/testing/source/vtown/kde/slack-desc/ark
+++ b/source/kde/kde/slack-desc/ark
diff --git a/testing/source/vtown/kde/slack-desc/artikulate b/source/kde/kde/slack-desc/artikulate
index f9e15017d..f9e15017d 100644
--- a/testing/source/vtown/kde/slack-desc/artikulate
+++ b/source/kde/kde/slack-desc/artikulate
diff --git a/testing/source/vtown/kde/slack-desc/attica b/source/kde/kde/slack-desc/attica
index ac635d4be..ac635d4be 100644
--- a/testing/source/vtown/kde/slack-desc/attica
+++ b/source/kde/kde/slack-desc/attica
diff --git a/testing/source/vtown/kde/slack-desc/audiocd-kio b/source/kde/kde/slack-desc/audiocd-kio
index c666c9f79..c666c9f79 100644
--- a/testing/source/vtown/kde/slack-desc/audiocd-kio
+++ b/source/kde/kde/slack-desc/audiocd-kio
diff --git a/testing/source/vtown/kde/slack-desc/baloo b/source/kde/kde/slack-desc/baloo
index d3a7a5693..d3a7a5693 100644
--- a/testing/source/vtown/kde/slack-desc/baloo
+++ b/source/kde/kde/slack-desc/baloo
diff --git a/testing/source/vtown/kde/slack-desc/baloo-widgets b/source/kde/kde/slack-desc/baloo-widgets
index 5aa0a223c..5aa0a223c 100644
--- a/testing/source/vtown/kde/slack-desc/baloo-widgets
+++ b/source/kde/kde/slack-desc/baloo-widgets
diff --git a/testing/source/vtown/kde/slack-desc/blinken b/source/kde/kde/slack-desc/blinken
index ac3fa82e1..ac3fa82e1 100644
--- a/testing/source/vtown/kde/slack-desc/blinken
+++ b/source/kde/kde/slack-desc/blinken
diff --git a/testing/source/vtown/kde/slack-desc/bluedevil b/source/kde/kde/slack-desc/bluedevil
index 9ddca55b9..9ddca55b9 100644
--- a/testing/source/vtown/kde/slack-desc/bluedevil
+++ b/source/kde/kde/slack-desc/bluedevil
diff --git a/testing/source/vtown/kde/slack-desc/bluez-qt b/source/kde/kde/slack-desc/bluez-qt
index 296d20bb6..296d20bb6 100644
--- a/testing/source/vtown/kde/slack-desc/bluez-qt
+++ b/source/kde/kde/slack-desc/bluez-qt
diff --git a/testing/source/vtown/kde/slack-desc/bomber b/source/kde/kde/slack-desc/bomber
index ebf44c838..ebf44c838 100644
--- a/testing/source/vtown/kde/slack-desc/bomber
+++ b/source/kde/kde/slack-desc/bomber
diff --git a/testing/source/vtown/kde/slack-desc/bovo b/source/kde/kde/slack-desc/bovo
index 6e6c3c5e3..6e6c3c5e3 100644
--- a/testing/source/vtown/kde/slack-desc/bovo
+++ b/source/kde/kde/slack-desc/bovo
diff --git a/testing/source/vtown/kde/slack-desc/breeze b/source/kde/kde/slack-desc/breeze
index 8213a7366..8213a7366 100644
--- a/testing/source/vtown/kde/slack-desc/breeze
+++ b/source/kde/kde/slack-desc/breeze
diff --git a/testing/source/vtown/kde/slack-desc/breeze-grub b/source/kde/kde/slack-desc/breeze-grub
index 46ede93a7..46ede93a7 100644
--- a/testing/source/vtown/kde/slack-desc/breeze-grub
+++ b/source/kde/kde/slack-desc/breeze-grub
diff --git a/testing/source/vtown/kde/slack-desc/breeze-gtk b/source/kde/kde/slack-desc/breeze-gtk
index ebb67640b..ebb67640b 100644
--- a/testing/source/vtown/kde/slack-desc/breeze-gtk
+++ b/source/kde/kde/slack-desc/breeze-gtk
diff --git a/testing/source/vtown/kde/slack-desc/breeze-icons b/source/kde/kde/slack-desc/breeze-icons
index 99378fd95..99378fd95 100644
--- a/testing/source/vtown/kde/slack-desc/breeze-icons
+++ b/source/kde/kde/slack-desc/breeze-icons
diff --git a/testing/source/vtown/kde/slack-desc/calendarsupport b/source/kde/kde/slack-desc/calendarsupport
index a953816d3..a953816d3 100644
--- a/testing/source/vtown/kde/slack-desc/calendarsupport
+++ b/source/kde/kde/slack-desc/calendarsupport
diff --git a/testing/source/vtown/kde/slack-desc/calligra b/source/kde/kde/slack-desc/calligra
index 303dd412d..303dd412d 100644
--- a/testing/source/vtown/kde/slack-desc/calligra
+++ b/source/kde/kde/slack-desc/calligra
diff --git a/testing/source/vtown/kde/slack-desc/calligraplan b/source/kde/kde/slack-desc/calligraplan
index 5ba9cb112..5ba9cb112 100644
--- a/testing/source/vtown/kde/slack-desc/calligraplan
+++ b/source/kde/kde/slack-desc/calligraplan
diff --git a/testing/source/vtown/kde/slack-desc/cantor b/source/kde/kde/slack-desc/cantor
index 289d87e27..289d87e27 100644
--- a/testing/source/vtown/kde/slack-desc/cantor
+++ b/source/kde/kde/slack-desc/cantor
diff --git a/testing/source/vtown/kde/slack-desc/cervisia b/source/kde/kde/slack-desc/cervisia
index 404e23590..404e23590 100644
--- a/testing/source/vtown/kde/slack-desc/cervisia
+++ b/source/kde/kde/slack-desc/cervisia
diff --git a/testing/source/vtown/kde/slack-desc/digikam b/source/kde/kde/slack-desc/digikam
index 510c98be5..510c98be5 100644
--- a/testing/source/vtown/kde/slack-desc/digikam
+++ b/source/kde/kde/slack-desc/digikam
diff --git a/testing/source/vtown/kde/slack-desc/discover b/source/kde/kde/slack-desc/discover
index 72a9feeb2..72a9feeb2 100644
--- a/testing/source/vtown/kde/slack-desc/discover
+++ b/source/kde/kde/slack-desc/discover
diff --git a/testing/source/vtown/kde/slack-desc/dolphin b/source/kde/kde/slack-desc/dolphin
index f5326e609..f5326e609 100644
--- a/testing/source/vtown/kde/slack-desc/dolphin
+++ b/source/kde/kde/slack-desc/dolphin
diff --git a/testing/source/vtown/kde/slack-desc/dolphin-plugins b/source/kde/kde/slack-desc/dolphin-plugins
index 57450268a..57450268a 100644
--- a/testing/source/vtown/kde/slack-desc/dolphin-plugins
+++ b/source/kde/kde/slack-desc/dolphin-plugins
diff --git a/testing/source/vtown/kde/slack-desc/dragon b/source/kde/kde/slack-desc/dragon
index d4ae2d65e..d4ae2d65e 100644
--- a/testing/source/vtown/kde/slack-desc/dragon
+++ b/source/kde/kde/slack-desc/dragon
diff --git a/testing/source/vtown/kde/slack-desc/drkonqi b/source/kde/kde/slack-desc/drkonqi
index ff94b7c83..ff94b7c83 100644
--- a/testing/source/vtown/kde/slack-desc/drkonqi
+++ b/source/kde/kde/slack-desc/drkonqi
diff --git a/testing/source/vtown/kde/slack-desc/elisa b/source/kde/kde/slack-desc/elisa
index 197f768c4..197f768c4 100644
--- a/testing/source/vtown/kde/slack-desc/elisa
+++ b/source/kde/kde/slack-desc/elisa
diff --git a/testing/source/vtown/kde/slack-desc/eventviews b/source/kde/kde/slack-desc/eventviews
index f3a1a5760..f3a1a5760 100644
--- a/testing/source/vtown/kde/slack-desc/eventviews
+++ b/source/kde/kde/slack-desc/eventviews
diff --git a/testing/source/vtown/kde/slack-desc/extra-cmake-modules b/source/kde/kde/slack-desc/extra-cmake-modules
index c1a0aa68e..c1a0aa68e 100644
--- a/testing/source/vtown/kde/slack-desc/extra-cmake-modules
+++ b/source/kde/kde/slack-desc/extra-cmake-modules
diff --git a/testing/source/vtown/kde/slack-desc/falkon b/source/kde/kde/slack-desc/falkon
index 0e4939d2b..0e4939d2b 100644
--- a/testing/source/vtown/kde/slack-desc/falkon
+++ b/source/kde/kde/slack-desc/falkon
diff --git a/testing/source/vtown/kde/slack-desc/ffmpegthumbs b/source/kde/kde/slack-desc/ffmpegthumbs
index a67769c51..a67769c51 100644
--- a/testing/source/vtown/kde/slack-desc/ffmpegthumbs
+++ b/source/kde/kde/slack-desc/ffmpegthumbs
diff --git a/testing/source/vtown/kde/slack-desc/filelight b/source/kde/kde/slack-desc/filelight
index 467be55d0..467be55d0 100644
--- a/testing/source/vtown/kde/slack-desc/filelight
+++ b/source/kde/kde/slack-desc/filelight
diff --git a/testing/source/vtown/kde/slack-desc/frameworkintegration b/source/kde/kde/slack-desc/frameworkintegration
index efc70275a..efc70275a 100644
--- a/testing/source/vtown/kde/slack-desc/frameworkintegration
+++ b/source/kde/kde/slack-desc/frameworkintegration
diff --git a/testing/source/vtown/kde/slack-desc/granatier b/source/kde/kde/slack-desc/granatier
index 98aa5c9d4..98aa5c9d4 100644
--- a/testing/source/vtown/kde/slack-desc/granatier
+++ b/source/kde/kde/slack-desc/granatier
diff --git a/testing/source/vtown/kde/slack-desc/grantlee-editor b/source/kde/kde/slack-desc/grantlee-editor
index d1aeebaee..d1aeebaee 100644
--- a/testing/source/vtown/kde/slack-desc/grantlee-editor
+++ b/source/kde/kde/slack-desc/grantlee-editor
diff --git a/testing/source/vtown/kde/slack-desc/grantleetheme b/source/kde/kde/slack-desc/grantleetheme
index 8213ac365..8213ac365 100644
--- a/testing/source/vtown/kde/slack-desc/grantleetheme
+++ b/source/kde/kde/slack-desc/grantleetheme
diff --git a/testing/source/vtown/kde/slack-desc/gwenview b/source/kde/kde/slack-desc/gwenview
index 8097c3cdb..8097c3cdb 100644
--- a/testing/source/vtown/kde/slack-desc/gwenview
+++ b/source/kde/kde/slack-desc/gwenview
diff --git a/testing/source/vtown/kde/slack-desc/incidenceeditor b/source/kde/kde/slack-desc/incidenceeditor
index 5499aeae4..5499aeae4 100644
--- a/testing/source/vtown/kde/slack-desc/incidenceeditor
+++ b/source/kde/kde/slack-desc/incidenceeditor
diff --git a/testing/source/vtown/kde/slack-desc/juk b/source/kde/kde/slack-desc/juk
index 156eeb751..156eeb751 100644
--- a/testing/source/vtown/kde/slack-desc/juk
+++ b/source/kde/kde/slack-desc/juk
diff --git a/testing/source/vtown/kde/slack-desc/k3b b/source/kde/kde/slack-desc/k3b
index 717c72ea2..717c72ea2 100644
--- a/testing/source/vtown/kde/slack-desc/k3b
+++ b/source/kde/kde/slack-desc/k3b
diff --git a/testing/source/vtown/kde/slack-desc/kaccounts-integration b/source/kde/kde/slack-desc/kaccounts-integration
index ac06f4385..ac06f4385 100644
--- a/testing/source/vtown/kde/slack-desc/kaccounts-integration
+++ b/source/kde/kde/slack-desc/kaccounts-integration
diff --git a/testing/source/vtown/kde/slack-desc/kaccounts-providers b/source/kde/kde/slack-desc/kaccounts-providers
index 6fac973e9..6fac973e9 100644
--- a/testing/source/vtown/kde/slack-desc/kaccounts-providers
+++ b/source/kde/kde/slack-desc/kaccounts-providers
diff --git a/testing/source/vtown/kde/slack-desc/kactivities b/source/kde/kde/slack-desc/kactivities
index bd5cd41ed..bd5cd41ed 100644
--- a/testing/source/vtown/kde/slack-desc/kactivities
+++ b/source/kde/kde/slack-desc/kactivities
diff --git a/testing/source/vtown/kde/slack-desc/kactivities-stats b/source/kde/kde/slack-desc/kactivities-stats
index bfaaf9de4..bfaaf9de4 100644
--- a/testing/source/vtown/kde/slack-desc/kactivities-stats
+++ b/source/kde/kde/slack-desc/kactivities-stats
diff --git a/testing/source/vtown/kde/slack-desc/kactivitymanagerd b/source/kde/kde/slack-desc/kactivitymanagerd
index c48a35928..c48a35928 100644
--- a/testing/source/vtown/kde/slack-desc/kactivitymanagerd
+++ b/source/kde/kde/slack-desc/kactivitymanagerd
diff --git a/testing/source/vtown/kde/slack-desc/kaddressbook b/source/kde/kde/slack-desc/kaddressbook
index e93aa3e03..e93aa3e03 100644
--- a/testing/source/vtown/kde/slack-desc/kaddressbook
+++ b/source/kde/kde/slack-desc/kaddressbook
diff --git a/testing/source/vtown/kde/slack-desc/kajongg b/source/kde/kde/slack-desc/kajongg
index 4b02ba04e..4b02ba04e 100644
--- a/testing/source/vtown/kde/slack-desc/kajongg
+++ b/source/kde/kde/slack-desc/kajongg
diff --git a/testing/source/vtown/kde/slack-desc/kalarm b/source/kde/kde/slack-desc/kalarm
index fd4ac5ea0..fd4ac5ea0 100644
--- a/testing/source/vtown/kde/slack-desc/kalarm
+++ b/source/kde/kde/slack-desc/kalarm
diff --git a/testing/source/vtown/kde/slack-desc/kalarmcal b/source/kde/kde/slack-desc/kalarmcal
index 9d6e5acc5..9d6e5acc5 100644
--- a/testing/source/vtown/kde/slack-desc/kalarmcal
+++ b/source/kde/kde/slack-desc/kalarmcal
diff --git a/testing/source/vtown/kde/slack-desc/kalgebra b/source/kde/kde/slack-desc/kalgebra
index bfc605ce5..bfc605ce5 100644
--- a/testing/source/vtown/kde/slack-desc/kalgebra
+++ b/source/kde/kde/slack-desc/kalgebra
diff --git a/testing/source/vtown/kde/slack-desc/kalzium b/source/kde/kde/slack-desc/kalzium
index 7da5df40d..7da5df40d 100644
--- a/testing/source/vtown/kde/slack-desc/kalzium
+++ b/source/kde/kde/slack-desc/kalzium
diff --git a/testing/source/vtown/kde/slack-desc/kamera b/source/kde/kde/slack-desc/kamera
index 55a7491d9..55a7491d9 100644
--- a/testing/source/vtown/kde/slack-desc/kamera
+++ b/source/kde/kde/slack-desc/kamera
diff --git a/testing/source/vtown/kde/slack-desc/kamoso b/source/kde/kde/slack-desc/kamoso
index d27941394..d27941394 100644
--- a/testing/source/vtown/kde/slack-desc/kamoso
+++ b/source/kde/kde/slack-desc/kamoso
diff --git a/testing/source/vtown/kde/slack-desc/kanagram b/source/kde/kde/slack-desc/kanagram
index 3a9f370bd..3a9f370bd 100644
--- a/testing/source/vtown/kde/slack-desc/kanagram
+++ b/source/kde/kde/slack-desc/kanagram
diff --git a/testing/source/vtown/kde/slack-desc/kapidox b/source/kde/kde/slack-desc/kapidox
index 89b1d3055..89b1d3055 100644
--- a/testing/source/vtown/kde/slack-desc/kapidox
+++ b/source/kde/kde/slack-desc/kapidox
diff --git a/source/kde/slack-desc/kapman b/source/kde/kde/slack-desc/kapman
index 7a0ac1d0c..7a0ac1d0c 100644
--- a/source/kde/slack-desc/kapman
+++ b/source/kde/kde/slack-desc/kapman
diff --git a/testing/source/vtown/kde/slack-desc/kapptemplate b/source/kde/kde/slack-desc/kapptemplate
index a56f42b44..a56f42b44 100644
--- a/testing/source/vtown/kde/slack-desc/kapptemplate
+++ b/source/kde/kde/slack-desc/kapptemplate
diff --git a/testing/source/vtown/kde/slack-desc/karchive b/source/kde/kde/slack-desc/karchive
index a793f8322..a793f8322 100644
--- a/testing/source/vtown/kde/slack-desc/karchive
+++ b/source/kde/kde/slack-desc/karchive
diff --git a/testing/source/vtown/kde/slack-desc/kate b/source/kde/kde/slack-desc/kate
index c2f087ccc..c2f087ccc 100644
--- a/testing/source/vtown/kde/slack-desc/kate
+++ b/source/kde/kde/slack-desc/kate
diff --git a/testing/source/vtown/kde/slack-desc/katomic b/source/kde/kde/slack-desc/katomic
index 273d8bd20..273d8bd20 100644
--- a/testing/source/vtown/kde/slack-desc/katomic
+++ b/source/kde/kde/slack-desc/katomic
diff --git a/testing/source/vtown/kde/slack-desc/kaudiocreator b/source/kde/kde/slack-desc/kaudiocreator
index 763199f8f..763199f8f 100644
--- a/testing/source/vtown/kde/slack-desc/kaudiocreator
+++ b/source/kde/kde/slack-desc/kaudiocreator
diff --git a/testing/source/vtown/kde/slack-desc/kauth b/source/kde/kde/slack-desc/kauth
index 3097d67b7..3097d67b7 100644
--- a/testing/source/vtown/kde/slack-desc/kauth
+++ b/source/kde/kde/slack-desc/kauth
diff --git a/testing/source/vtown/kde/slack-desc/kbackup b/source/kde/kde/slack-desc/kbackup
index 88f1e93f1..88f1e93f1 100644
--- a/testing/source/vtown/kde/slack-desc/kbackup
+++ b/source/kde/kde/slack-desc/kbackup
diff --git a/testing/source/vtown/kde/slack-desc/kblackbox b/source/kde/kde/slack-desc/kblackbox
index 4d14b906a..4d14b906a 100644
--- a/testing/source/vtown/kde/slack-desc/kblackbox
+++ b/source/kde/kde/slack-desc/kblackbox
diff --git a/testing/source/vtown/kde/slack-desc/kblocks b/source/kde/kde/slack-desc/kblocks
index 48676fefb..48676fefb 100644
--- a/testing/source/vtown/kde/slack-desc/kblocks
+++ b/source/kde/kde/slack-desc/kblocks
diff --git a/testing/source/vtown/kde/slack-desc/kbookmarks b/source/kde/kde/slack-desc/kbookmarks
index 07f7b7d3c..07f7b7d3c 100644
--- a/testing/source/vtown/kde/slack-desc/kbookmarks
+++ b/source/kde/kde/slack-desc/kbookmarks
diff --git a/testing/source/vtown/kde/slack-desc/kbounce b/source/kde/kde/slack-desc/kbounce
index 53fffb9be..53fffb9be 100644
--- a/testing/source/vtown/kde/slack-desc/kbounce
+++ b/source/kde/kde/slack-desc/kbounce
diff --git a/testing/source/vtown/kde/slack-desc/kbreakout b/source/kde/kde/slack-desc/kbreakout
index 972f951e7..972f951e7 100644
--- a/testing/source/vtown/kde/slack-desc/kbreakout
+++ b/source/kde/kde/slack-desc/kbreakout
diff --git a/testing/source/vtown/kde/slack-desc/kbruch b/source/kde/kde/slack-desc/kbruch
index ea9a25004..ea9a25004 100644
--- a/testing/source/vtown/kde/slack-desc/kbruch
+++ b/source/kde/kde/slack-desc/kbruch
diff --git a/testing/source/vtown/kde/slack-desc/kcachegrind b/source/kde/kde/slack-desc/kcachegrind
index 18cdbb112..18cdbb112 100644
--- a/testing/source/vtown/kde/slack-desc/kcachegrind
+++ b/source/kde/kde/slack-desc/kcachegrind
diff --git a/testing/source/vtown/kde/slack-desc/kcalc b/source/kde/kde/slack-desc/kcalc
index f3e1de68e..f3e1de68e 100644
--- a/testing/source/vtown/kde/slack-desc/kcalc
+++ b/source/kde/kde/slack-desc/kcalc
diff --git a/testing/source/vtown/kde/slack-desc/kcalcore b/source/kde/kde/slack-desc/kcalcore
index 89ff89183..89ff89183 100644
--- a/testing/source/vtown/kde/slack-desc/kcalcore
+++ b/source/kde/kde/slack-desc/kcalcore
diff --git a/testing/source/vtown/kde/slack-desc/kcalendarcore b/source/kde/kde/slack-desc/kcalendarcore
index e538303bd..e538303bd 100644
--- a/testing/source/vtown/kde/slack-desc/kcalendarcore
+++ b/source/kde/kde/slack-desc/kcalendarcore
diff --git a/testing/source/vtown/kde/slack-desc/kcalutils b/source/kde/kde/slack-desc/kcalutils
index 7d2731524..7d2731524 100644
--- a/testing/source/vtown/kde/slack-desc/kcalutils
+++ b/source/kde/kde/slack-desc/kcalutils
diff --git a/testing/source/vtown/kde/slack-desc/kcharselect b/source/kde/kde/slack-desc/kcharselect
index 7c45f6203..7c45f6203 100644
--- a/testing/source/vtown/kde/slack-desc/kcharselect
+++ b/source/kde/kde/slack-desc/kcharselect
diff --git a/testing/source/vtown/kde/slack-desc/kcmutils b/source/kde/kde/slack-desc/kcmutils
index 0ef03f81a..0ef03f81a 100644
--- a/testing/source/vtown/kde/slack-desc/kcmutils
+++ b/source/kde/kde/slack-desc/kcmutils
diff --git a/testing/source/vtown/kde/slack-desc/kcodecs b/source/kde/kde/slack-desc/kcodecs
index ceb49d6ef..ceb49d6ef 100644
--- a/testing/source/vtown/kde/slack-desc/kcodecs
+++ b/source/kde/kde/slack-desc/kcodecs
diff --git a/testing/source/vtown/kde/slack-desc/kcolorchooser b/source/kde/kde/slack-desc/kcolorchooser
index 8258cd4f2..8258cd4f2 100644
--- a/testing/source/vtown/kde/slack-desc/kcolorchooser
+++ b/source/kde/kde/slack-desc/kcolorchooser
diff --git a/testing/source/vtown/kde/slack-desc/kcompletion b/source/kde/kde/slack-desc/kcompletion
index a81c51105..a81c51105 100644
--- a/testing/source/vtown/kde/slack-desc/kcompletion
+++ b/source/kde/kde/slack-desc/kcompletion
diff --git a/testing/source/vtown/kde/slack-desc/kconfig b/source/kde/kde/slack-desc/kconfig
index 9d2e0b71d..9d2e0b71d 100644
--- a/testing/source/vtown/kde/slack-desc/kconfig
+++ b/source/kde/kde/slack-desc/kconfig
diff --git a/testing/source/vtown/kde/slack-desc/kconfigwidgets b/source/kde/kde/slack-desc/kconfigwidgets
index 8f55d3bc1..8f55d3bc1 100644
--- a/testing/source/vtown/kde/slack-desc/kconfigwidgets
+++ b/source/kde/kde/slack-desc/kconfigwidgets
diff --git a/testing/source/vtown/kde/slack-desc/kcontacts b/source/kde/kde/slack-desc/kcontacts
index b8c6a6325..b8c6a6325 100644
--- a/testing/source/vtown/kde/slack-desc/kcontacts
+++ b/source/kde/kde/slack-desc/kcontacts
diff --git a/testing/source/vtown/kde/slack-desc/kcoreaddons b/source/kde/kde/slack-desc/kcoreaddons
index 307981ad8..307981ad8 100644
--- a/testing/source/vtown/kde/slack-desc/kcoreaddons
+++ b/source/kde/kde/slack-desc/kcoreaddons
diff --git a/testing/source/vtown/kde/slack-desc/kcrash b/source/kde/kde/slack-desc/kcrash
index 28fec94a6..28fec94a6 100644
--- a/testing/source/vtown/kde/slack-desc/kcrash
+++ b/source/kde/kde/slack-desc/kcrash
diff --git a/testing/source/vtown/kde/slack-desc/kcron b/source/kde/kde/slack-desc/kcron
index f44db080b..f44db080b 100644
--- a/testing/source/vtown/kde/slack-desc/kcron
+++ b/source/kde/kde/slack-desc/kcron
diff --git a/testing/source/vtown/kde/slack-desc/kdav b/source/kde/kde/slack-desc/kdav
index 2504df766..2504df766 100644
--- a/testing/source/vtown/kde/slack-desc/kdav
+++ b/source/kde/kde/slack-desc/kdav
diff --git a/testing/source/vtown/kde/slack-desc/kdbusaddons b/source/kde/kde/slack-desc/kdbusaddons
index 98e4f810f..98e4f810f 100644
--- a/testing/source/vtown/kde/slack-desc/kdbusaddons
+++ b/source/kde/kde/slack-desc/kdbusaddons
diff --git a/testing/source/vtown/kde/slack-desc/kde-cli-tools b/source/kde/kde/slack-desc/kde-cli-tools
index e191d2712..e191d2712 100644
--- a/testing/source/vtown/kde/slack-desc/kde-cli-tools
+++ b/source/kde/kde/slack-desc/kde-cli-tools
diff --git a/testing/source/vtown/kde/slack-desc/kde-dev-scripts b/source/kde/kde/slack-desc/kde-dev-scripts
index b0cbd40d1..b0cbd40d1 100644
--- a/testing/source/vtown/kde/slack-desc/kde-dev-scripts
+++ b/source/kde/kde/slack-desc/kde-dev-scripts
diff --git a/testing/source/vtown/kde/slack-desc/kde-dev-utils b/source/kde/kde/slack-desc/kde-dev-utils
index 457fdc454..457fdc454 100644
--- a/testing/source/vtown/kde/slack-desc/kde-dev-utils
+++ b/source/kde/kde/slack-desc/kde-dev-utils
diff --git a/testing/source/vtown/kde/slack-desc/kde-gtk-config b/source/kde/kde/slack-desc/kde-gtk-config
index 33aa97999..33aa97999 100644
--- a/testing/source/vtown/kde/slack-desc/kde-gtk-config
+++ b/source/kde/kde/slack-desc/kde-gtk-config
diff --git a/testing/source/vtown/kde/slack-desc/kde-wallpapers b/source/kde/kde/slack-desc/kde-wallpapers
index 28e854e3b..28e854e3b 100644
--- a/testing/source/vtown/kde/slack-desc/kde-wallpapers
+++ b/source/kde/kde/slack-desc/kde-wallpapers
diff --git a/testing/source/vtown/kde/slack-desc/kdeaccessibility b/source/kde/kde/slack-desc/kdeaccessibility
index a4a397e0c..a4a397e0c 100644
--- a/testing/source/vtown/kde/slack-desc/kdeaccessibility
+++ b/source/kde/kde/slack-desc/kdeaccessibility
diff --git a/testing/source/vtown/kde/slack-desc/kdebugsettings b/source/kde/kde/slack-desc/kdebugsettings
index 46ca6ceef..46ca6ceef 100644
--- a/testing/source/vtown/kde/slack-desc/kdebugsettings
+++ b/source/kde/kde/slack-desc/kdebugsettings
diff --git a/testing/source/vtown/kde/slack-desc/kdeclarative b/source/kde/kde/slack-desc/kdeclarative
index 82ce75d5f..82ce75d5f 100644
--- a/testing/source/vtown/kde/slack-desc/kdeclarative
+++ b/source/kde/kde/slack-desc/kdeclarative
diff --git a/testing/source/vtown/kde/slack-desc/kdeconnect-kde b/source/kde/kde/slack-desc/kdeconnect-kde
index 3acbeea82..3acbeea82 100644
--- a/testing/source/vtown/kde/slack-desc/kdeconnect-kde
+++ b/source/kde/kde/slack-desc/kdeconnect-kde
diff --git a/testing/source/vtown/kde/slack-desc/kdecoration b/source/kde/kde/slack-desc/kdecoration
index 98d272c22..98d272c22 100644
--- a/testing/source/vtown/kde/slack-desc/kdecoration
+++ b/source/kde/kde/slack-desc/kdecoration
diff --git a/testing/source/vtown/kde/slack-desc/kded b/source/kde/kde/slack-desc/kded
index dbc67d5c0..dbc67d5c0 100644
--- a/testing/source/vtown/kde/slack-desc/kded
+++ b/source/kde/kde/slack-desc/kded
diff --git a/testing/source/vtown/kde/slack-desc/kdeedu b/source/kde/kde/slack-desc/kdeedu
index 3d85c4602..3d85c4602 100644
--- a/testing/source/vtown/kde/slack-desc/kdeedu
+++ b/source/kde/kde/slack-desc/kdeedu
diff --git a/testing/source/vtown/kde/slack-desc/kdeedu-data b/source/kde/kde/slack-desc/kdeedu-data
index ca29cb7d0..ca29cb7d0 100644
--- a/testing/source/vtown/kde/slack-desc/kdeedu-data
+++ b/source/kde/kde/slack-desc/kdeedu-data
diff --git a/testing/source/vtown/kde/slack-desc/kdegraphics b/source/kde/kde/slack-desc/kdegraphics
index 6cbde37e4..6cbde37e4 100644
--- a/testing/source/vtown/kde/slack-desc/kdegraphics
+++ b/source/kde/kde/slack-desc/kdegraphics
diff --git a/testing/source/vtown/kde/slack-desc/kdegraphics-mobipocket b/source/kde/kde/slack-desc/kdegraphics-mobipocket
index 501b32367..501b32367 100644
--- a/testing/source/vtown/kde/slack-desc/kdegraphics-mobipocket
+++ b/source/kde/kde/slack-desc/kdegraphics-mobipocket
diff --git a/testing/source/vtown/kde/slack-desc/kdegraphics-thumbnailers b/source/kde/kde/slack-desc/kdegraphics-thumbnailers
index 98f2d471a..98f2d471a 100644
--- a/testing/source/vtown/kde/slack-desc/kdegraphics-thumbnailers
+++ b/source/kde/kde/slack-desc/kdegraphics-thumbnailers
diff --git a/testing/source/vtown/kde/slack-desc/kdelibs b/source/kde/kde/slack-desc/kdelibs
index a9cf6f682..a9cf6f682 100644
--- a/testing/source/vtown/kde/slack-desc/kdelibs
+++ b/source/kde/kde/slack-desc/kdelibs
diff --git a/testing/source/vtown/kde/slack-desc/kdelibs4support b/source/kde/kde/slack-desc/kdelibs4support
index d4cf9b67b..d4cf9b67b 100644
--- a/testing/source/vtown/kde/slack-desc/kdelibs4support
+++ b/source/kde/kde/slack-desc/kdelibs4support
diff --git a/testing/source/vtown/kde/slack-desc/kdenetwork b/source/kde/kde/slack-desc/kdenetwork
index 3b24aace2..3b24aace2 100644
--- a/testing/source/vtown/kde/slack-desc/kdenetwork
+++ b/source/kde/kde/slack-desc/kdenetwork
diff --git a/testing/source/vtown/kde/slack-desc/kdenetwork-filesharing b/source/kde/kde/slack-desc/kdenetwork-filesharing
index 6c71493fe..6c71493fe 100644
--- a/testing/source/vtown/kde/slack-desc/kdenetwork-filesharing
+++ b/source/kde/kde/slack-desc/kdenetwork-filesharing
diff --git a/testing/source/vtown/kde/slack-desc/kdenlive b/source/kde/kde/slack-desc/kdenlive
index 488700301..488700301 100644
--- a/testing/source/vtown/kde/slack-desc/kdenlive
+++ b/source/kde/kde/slack-desc/kdenlive
diff --git a/testing/source/vtown/kde/slack-desc/kdepim b/source/kde/kde/slack-desc/kdepim
index d87256e6b..d87256e6b 100644
--- a/testing/source/vtown/kde/slack-desc/kdepim
+++ b/source/kde/kde/slack-desc/kdepim
diff --git a/testing/source/vtown/kde/slack-desc/kdepim-addons b/source/kde/kde/slack-desc/kdepim-addons
index 38c2c732b..38c2c732b 100644
--- a/testing/source/vtown/kde/slack-desc/kdepim-addons
+++ b/source/kde/kde/slack-desc/kdepim-addons
diff --git a/testing/source/vtown/kde/slack-desc/kdepim-apps-libs b/source/kde/kde/slack-desc/kdepim-apps-libs
index 2e7de5c5b..2e7de5c5b 100644
--- a/testing/source/vtown/kde/slack-desc/kdepim-apps-libs
+++ b/source/kde/kde/slack-desc/kdepim-apps-libs
diff --git a/testing/source/vtown/kde/slack-desc/kdepim-runtime b/source/kde/kde/slack-desc/kdepim-runtime
index 1fad4a46e..1fad4a46e 100644
--- a/testing/source/vtown/kde/slack-desc/kdepim-runtime
+++ b/source/kde/kde/slack-desc/kdepim-runtime
diff --git a/testing/source/vtown/kde/slack-desc/kdeplasma-addons b/source/kde/kde/slack-desc/kdeplasma-addons
index 5fe7abe18..5fe7abe18 100644
--- a/testing/source/vtown/kde/slack-desc/kdeplasma-addons
+++ b/source/kde/kde/slack-desc/kdeplasma-addons
diff --git a/testing/source/vtown/kde/slack-desc/kdesdk b/source/kde/kde/slack-desc/kdesdk
index d8050240c..d8050240c 100644
--- a/testing/source/vtown/kde/slack-desc/kdesdk
+++ b/source/kde/kde/slack-desc/kdesdk
diff --git a/testing/source/vtown/kde/slack-desc/kdesdk-kioslaves b/source/kde/kde/slack-desc/kdesdk-kioslaves
index 70d7d75d4..70d7d75d4 100644
--- a/testing/source/vtown/kde/slack-desc/kdesdk-kioslaves
+++ b/source/kde/kde/slack-desc/kdesdk-kioslaves
diff --git a/testing/source/vtown/kde/slack-desc/kdesdk-thumbnailers b/source/kde/kde/slack-desc/kdesdk-thumbnailers
index 1d3554c8e..1d3554c8e 100644
--- a/testing/source/vtown/kde/slack-desc/kdesdk-thumbnailers
+++ b/source/kde/kde/slack-desc/kdesdk-thumbnailers
diff --git a/testing/source/vtown/kde/slack-desc/kdesignerplugin b/source/kde/kde/slack-desc/kdesignerplugin
index eb5c44186..eb5c44186 100644
--- a/testing/source/vtown/kde/slack-desc/kdesignerplugin
+++ b/source/kde/kde/slack-desc/kdesignerplugin
diff --git a/testing/source/vtown/kde/slack-desc/kdesu b/source/kde/kde/slack-desc/kdesu
index ae03f1af1..ae03f1af1 100644
--- a/testing/source/vtown/kde/slack-desc/kdesu
+++ b/source/kde/kde/slack-desc/kdesu
diff --git a/testing/source/vtown/kde/slack-desc/kdev-php b/source/kde/kde/slack-desc/kdev-php
index c59f35858..c59f35858 100644
--- a/testing/source/vtown/kde/slack-desc/kdev-php
+++ b/source/kde/kde/slack-desc/kdev-php
diff --git a/testing/source/vtown/kde/slack-desc/kdev-python b/source/kde/kde/slack-desc/kdev-python
index 0b36bf544..0b36bf544 100644
--- a/testing/source/vtown/kde/slack-desc/kdev-python
+++ b/source/kde/kde/slack-desc/kdev-python
diff --git a/testing/source/vtown/kde/slack-desc/kdevelop b/source/kde/kde/slack-desc/kdevelop
index 2398540cf..2398540cf 100644
--- a/testing/source/vtown/kde/slack-desc/kdevelop
+++ b/source/kde/kde/slack-desc/kdevelop
diff --git a/testing/source/vtown/kde/slack-desc/kdevelop-pg-qt b/source/kde/kde/slack-desc/kdevelop-pg-qt
index 4439f12bf..4439f12bf 100644
--- a/testing/source/vtown/kde/slack-desc/kdevelop-pg-qt
+++ b/source/kde/kde/slack-desc/kdevelop-pg-qt
diff --git a/testing/source/vtown/kde/slack-desc/kdevplatform b/source/kde/kde/slack-desc/kdevplatform
index 0573edddf..0573edddf 100644
--- a/testing/source/vtown/kde/slack-desc/kdevplatform
+++ b/source/kde/kde/slack-desc/kdevplatform
diff --git a/testing/source/vtown/kde/slack-desc/kdewebdev b/source/kde/kde/slack-desc/kdewebdev
index 8513dd1d8..8513dd1d8 100644
--- a/testing/source/vtown/kde/slack-desc/kdewebdev
+++ b/source/kde/kde/slack-desc/kdewebdev
diff --git a/testing/source/vtown/kde/slack-desc/kdewebkit b/source/kde/kde/slack-desc/kdewebkit
index d8c85ad12..d8c85ad12 100644
--- a/testing/source/vtown/kde/slack-desc/kdewebkit
+++ b/source/kde/kde/slack-desc/kdewebkit
diff --git a/testing/source/vtown/kde/slack-desc/kdf b/source/kde/kde/slack-desc/kdf
index fb2fb4cb3..fb2fb4cb3 100644
--- a/testing/source/vtown/kde/slack-desc/kdf
+++ b/source/kde/kde/slack-desc/kdf
diff --git a/testing/source/vtown/kde/slack-desc/kdiagram b/source/kde/kde/slack-desc/kdiagram
index b5031ee16..b5031ee16 100644
--- a/testing/source/vtown/kde/slack-desc/kdiagram
+++ b/source/kde/kde/slack-desc/kdiagram
diff --git a/testing/source/vtown/kde/slack-desc/kdialog b/source/kde/kde/slack-desc/kdialog
index cb1d52f57..cb1d52f57 100644
--- a/testing/source/vtown/kde/slack-desc/kdialog
+++ b/source/kde/kde/slack-desc/kdialog
diff --git a/testing/source/vtown/kde/slack-desc/kdiamond b/source/kde/kde/slack-desc/kdiamond
index c25a27120..c25a27120 100644
--- a/testing/source/vtown/kde/slack-desc/kdiamond
+++ b/source/kde/kde/slack-desc/kdiamond
diff --git a/testing/source/vtown/kde/slack-desc/kdnssd b/source/kde/kde/slack-desc/kdnssd
index bb97b243a..bb97b243a 100644
--- a/testing/source/vtown/kde/slack-desc/kdnssd
+++ b/source/kde/kde/slack-desc/kdnssd
diff --git a/testing/source/vtown/kde/slack-desc/kdoctools b/source/kde/kde/slack-desc/kdoctools
index 9945d8b89..9945d8b89 100644
--- a/testing/source/vtown/kde/slack-desc/kdoctools
+++ b/source/kde/kde/slack-desc/kdoctools
diff --git a/testing/source/vtown/kde/slack-desc/keditbookmarks b/source/kde/kde/slack-desc/keditbookmarks
index eb71edd26..eb71edd26 100644
--- a/testing/source/vtown/kde/slack-desc/keditbookmarks
+++ b/source/kde/kde/slack-desc/keditbookmarks
diff --git a/testing/source/vtown/kde/slack-desc/kemoticons b/source/kde/kde/slack-desc/kemoticons
index 81ea009a2..81ea009a2 100644
--- a/testing/source/vtown/kde/slack-desc/kemoticons
+++ b/source/kde/kde/slack-desc/kemoticons
diff --git a/testing/source/vtown/kde/slack-desc/kfilemetadata b/source/kde/kde/slack-desc/kfilemetadata
index 419a16235..419a16235 100644
--- a/testing/source/vtown/kde/slack-desc/kfilemetadata
+++ b/source/kde/kde/slack-desc/kfilemetadata
diff --git a/testing/source/vtown/kde/slack-desc/kfind b/source/kde/kde/slack-desc/kfind
index e08d2900b..e08d2900b 100644
--- a/testing/source/vtown/kde/slack-desc/kfind
+++ b/source/kde/kde/slack-desc/kfind
diff --git a/testing/source/vtown/kde/slack-desc/kfloppy b/source/kde/kde/slack-desc/kfloppy
index 4eb1e3b1c..4eb1e3b1c 100644
--- a/testing/source/vtown/kde/slack-desc/kfloppy
+++ b/source/kde/kde/slack-desc/kfloppy
diff --git a/testing/source/vtown/kde/slack-desc/kfourinline b/source/kde/kde/slack-desc/kfourinline
index f1797bc93..f1797bc93 100644
--- a/testing/source/vtown/kde/slack-desc/kfourinline
+++ b/source/kde/kde/slack-desc/kfourinline
diff --git a/testing/source/vtown/kde/slack-desc/kgamma5 b/source/kde/kde/slack-desc/kgamma5
index 9dc98c897..9dc98c897 100644
--- a/testing/source/vtown/kde/slack-desc/kgamma5
+++ b/source/kde/kde/slack-desc/kgamma5
diff --git a/testing/source/vtown/kde/slack-desc/kgeography b/source/kde/kde/slack-desc/kgeography
index 244bb7938..244bb7938 100644
--- a/testing/source/vtown/kde/slack-desc/kgeography
+++ b/source/kde/kde/slack-desc/kgeography
diff --git a/testing/source/vtown/kde/slack-desc/kget b/source/kde/kde/slack-desc/kget
index 86259cced..86259cced 100644
--- a/testing/source/vtown/kde/slack-desc/kget
+++ b/source/kde/kde/slack-desc/kget
diff --git a/testing/source/vtown/kde/slack-desc/kglobalaccel b/source/kde/kde/slack-desc/kglobalaccel
index bb348ffec..bb348ffec 100644
--- a/testing/source/vtown/kde/slack-desc/kglobalaccel
+++ b/source/kde/kde/slack-desc/kglobalaccel
diff --git a/testing/source/vtown/kde/slack-desc/kgoldrunner b/source/kde/kde/slack-desc/kgoldrunner
index aeec5c919..aeec5c919 100644
--- a/testing/source/vtown/kde/slack-desc/kgoldrunner
+++ b/source/kde/kde/slack-desc/kgoldrunner
diff --git a/testing/source/vtown/kde/slack-desc/kgpg b/source/kde/kde/slack-desc/kgpg
index c9f178554..c9f178554 100644
--- a/testing/source/vtown/kde/slack-desc/kgpg
+++ b/source/kde/kde/slack-desc/kgpg
diff --git a/testing/source/vtown/kde/slack-desc/kguiaddons b/source/kde/kde/slack-desc/kguiaddons
index acae05fd3..acae05fd3 100644
--- a/testing/source/vtown/kde/slack-desc/kguiaddons
+++ b/source/kde/kde/slack-desc/kguiaddons
diff --git a/testing/source/vtown/kde/slack-desc/khangman b/source/kde/kde/slack-desc/khangman
index 3aea54901..3aea54901 100644
--- a/testing/source/vtown/kde/slack-desc/khangman
+++ b/source/kde/kde/slack-desc/khangman
diff --git a/testing/source/vtown/kde/slack-desc/khelpcenter b/source/kde/kde/slack-desc/khelpcenter
index c5f1d4d49..c5f1d4d49 100644
--- a/testing/source/vtown/kde/slack-desc/khelpcenter
+++ b/source/kde/kde/slack-desc/khelpcenter
diff --git a/testing/source/vtown/kde/slack-desc/kholidays b/source/kde/kde/slack-desc/kholidays
index f2f1faa2e..f2f1faa2e 100644
--- a/testing/source/vtown/kde/slack-desc/kholidays
+++ b/source/kde/kde/slack-desc/kholidays
diff --git a/testing/source/vtown/kde/slack-desc/khotkeys b/source/kde/kde/slack-desc/khotkeys
index 1ee232a29..1ee232a29 100644
--- a/testing/source/vtown/kde/slack-desc/khotkeys
+++ b/source/kde/kde/slack-desc/khotkeys
diff --git a/testing/source/vtown/kde/slack-desc/khtml b/source/kde/kde/slack-desc/khtml
index 67094495f..67094495f 100644
--- a/testing/source/vtown/kde/slack-desc/khtml
+++ b/source/kde/kde/slack-desc/khtml
diff --git a/testing/source/vtown/kde/slack-desc/ki18n b/source/kde/kde/slack-desc/ki18n
index fd7df2d38..fd7df2d38 100644
--- a/testing/source/vtown/kde/slack-desc/ki18n
+++ b/source/kde/kde/slack-desc/ki18n
diff --git a/testing/source/vtown/kde/slack-desc/kiconthemes b/source/kde/kde/slack-desc/kiconthemes
index fc57bc80f..fc57bc80f 100644
--- a/testing/source/vtown/kde/slack-desc/kiconthemes
+++ b/source/kde/kde/slack-desc/kiconthemes
diff --git a/testing/source/vtown/kde/slack-desc/kid3 b/source/kde/kde/slack-desc/kid3
index 4f707ee48..4f707ee48 100644
--- a/testing/source/vtown/kde/slack-desc/kid3
+++ b/source/kde/kde/slack-desc/kid3
diff --git a/testing/source/vtown/kde/slack-desc/kidentitymanagement b/source/kde/kde/slack-desc/kidentitymanagement
index 1c4cf74e4..1c4cf74e4 100644
--- a/testing/source/vtown/kde/slack-desc/kidentitymanagement
+++ b/source/kde/kde/slack-desc/kidentitymanagement
diff --git a/testing/source/vtown/kde/slack-desc/kidletime b/source/kde/kde/slack-desc/kidletime
index cb4a6fc45..cb4a6fc45 100644
--- a/testing/source/vtown/kde/slack-desc/kidletime
+++ b/source/kde/kde/slack-desc/kidletime
diff --git a/testing/source/vtown/kde/slack-desc/kig b/source/kde/kde/slack-desc/kig
index 30799c2dd..30799c2dd 100644
--- a/testing/source/vtown/kde/slack-desc/kig
+++ b/source/kde/kde/slack-desc/kig
diff --git a/testing/source/vtown/kde/slack-desc/kigo b/source/kde/kde/slack-desc/kigo
index a55de88a8..a55de88a8 100644
--- a/testing/source/vtown/kde/slack-desc/kigo
+++ b/source/kde/kde/slack-desc/kigo
diff --git a/testing/source/vtown/kde/slack-desc/kile b/source/kde/kde/slack-desc/kile
index 40ba95e3e..40ba95e3e 100644
--- a/testing/source/vtown/kde/slack-desc/kile
+++ b/source/kde/kde/slack-desc/kile
diff --git a/testing/source/vtown/kde/slack-desc/killbots b/source/kde/kde/slack-desc/killbots
index 59b53524b..59b53524b 100644
--- a/testing/source/vtown/kde/slack-desc/killbots
+++ b/source/kde/kde/slack-desc/killbots
diff --git a/testing/source/vtown/kde/slack-desc/kimageformats b/source/kde/kde/slack-desc/kimageformats
index 8ded68aa1..8ded68aa1 100644
--- a/testing/source/vtown/kde/slack-desc/kimageformats
+++ b/source/kde/kde/slack-desc/kimageformats
diff --git a/testing/source/vtown/kde/slack-desc/kimagemapeditor b/source/kde/kde/slack-desc/kimagemapeditor
index 4a8657350..4a8657350 100644
--- a/testing/source/vtown/kde/slack-desc/kimagemapeditor
+++ b/source/kde/kde/slack-desc/kimagemapeditor
diff --git a/testing/source/vtown/kde/slack-desc/kimap b/source/kde/kde/slack-desc/kimap
index 20b361670..20b361670 100644
--- a/testing/source/vtown/kde/slack-desc/kimap
+++ b/source/kde/kde/slack-desc/kimap
diff --git a/testing/source/vtown/kde/slack-desc/kinfocenter b/source/kde/kde/slack-desc/kinfocenter
index 67313cfcf..67313cfcf 100644
--- a/testing/source/vtown/kde/slack-desc/kinfocenter
+++ b/source/kde/kde/slack-desc/kinfocenter
diff --git a/testing/source/vtown/kde/slack-desc/kinit b/source/kde/kde/slack-desc/kinit
index 03d0c7306..03d0c7306 100644
--- a/testing/source/vtown/kde/slack-desc/kinit
+++ b/source/kde/kde/slack-desc/kinit
diff --git a/testing/source/vtown/kde/slack-desc/kio b/source/kde/kde/slack-desc/kio
index 09ab48a4f..09ab48a4f 100644
--- a/testing/source/vtown/kde/slack-desc/kio
+++ b/source/kde/kde/slack-desc/kio
diff --git a/testing/source/vtown/kde/slack-desc/kio-extras b/source/kde/kde/slack-desc/kio-extras
index aa3fce962..aa3fce962 100644
--- a/testing/source/vtown/kde/slack-desc/kio-extras
+++ b/source/kde/kde/slack-desc/kio-extras
diff --git a/testing/source/vtown/kde/slack-desc/kio-gdrive b/source/kde/kde/slack-desc/kio-gdrive
index 69e147f54..69e147f54 100644
--- a/testing/source/vtown/kde/slack-desc/kio-gdrive
+++ b/source/kde/kde/slack-desc/kio-gdrive
diff --git a/testing/source/vtown/kde/slack-desc/kipi-plugins b/source/kde/kde/slack-desc/kipi-plugins
index b93915be5..b93915be5 100644
--- a/testing/source/vtown/kde/slack-desc/kipi-plugins
+++ b/source/kde/kde/slack-desc/kipi-plugins
diff --git a/testing/source/vtown/kde/slack-desc/kirigami-gallery b/source/kde/kde/slack-desc/kirigami-gallery
index dac6e2232..dac6e2232 100644
--- a/testing/source/vtown/kde/slack-desc/kirigami-gallery
+++ b/source/kde/kde/slack-desc/kirigami-gallery
diff --git a/testing/source/vtown/kde/slack-desc/kirigami2 b/source/kde/kde/slack-desc/kirigami2
index 5516ec192..5516ec192 100644
--- a/testing/source/vtown/kde/slack-desc/kirigami2
+++ b/source/kde/kde/slack-desc/kirigami2
diff --git a/testing/source/vtown/kde/slack-desc/kiriki b/source/kde/kde/slack-desc/kiriki
index 84cb958bb..84cb958bb 100644
--- a/testing/source/vtown/kde/slack-desc/kiriki
+++ b/source/kde/kde/slack-desc/kiriki
diff --git a/testing/source/vtown/kde/slack-desc/kitemmodels b/source/kde/kde/slack-desc/kitemmodels
index 3febf9329..3febf9329 100644
--- a/testing/source/vtown/kde/slack-desc/kitemmodels
+++ b/source/kde/kde/slack-desc/kitemmodels
diff --git a/testing/source/vtown/kde/slack-desc/kitemviews b/source/kde/kde/slack-desc/kitemviews
index eb6225773..eb6225773 100644
--- a/testing/source/vtown/kde/slack-desc/kitemviews
+++ b/source/kde/kde/slack-desc/kitemviews
diff --git a/testing/source/vtown/kde/slack-desc/kiten b/source/kde/kde/slack-desc/kiten
index 04cf54488..04cf54488 100644
--- a/testing/source/vtown/kde/slack-desc/kiten
+++ b/source/kde/kde/slack-desc/kiten
diff --git a/testing/source/vtown/kde/slack-desc/kitinerary b/source/kde/kde/slack-desc/kitinerary
index d381509c9..d381509c9 100644
--- a/testing/source/vtown/kde/slack-desc/kitinerary
+++ b/source/kde/kde/slack-desc/kitinerary
diff --git a/testing/source/vtown/kde/slack-desc/kjobwidgets b/source/kde/kde/slack-desc/kjobwidgets
index dd254dd46..dd254dd46 100644
--- a/testing/source/vtown/kde/slack-desc/kjobwidgets
+++ b/source/kde/kde/slack-desc/kjobwidgets
diff --git a/testing/source/vtown/kde/slack-desc/kjots b/source/kde/kde/slack-desc/kjots
index 055f8c188..055f8c188 100644
--- a/testing/source/vtown/kde/slack-desc/kjots
+++ b/source/kde/kde/slack-desc/kjots
diff --git a/testing/source/vtown/kde/slack-desc/kjs b/source/kde/kde/slack-desc/kjs
index 694825773..694825773 100644
--- a/testing/source/vtown/kde/slack-desc/kjs
+++ b/source/kde/kde/slack-desc/kjs
diff --git a/testing/source/vtown/kde/slack-desc/kjsembed b/source/kde/kde/slack-desc/kjsembed
index 9ac83ccee..9ac83ccee 100644
--- a/testing/source/vtown/kde/slack-desc/kjsembed
+++ b/source/kde/kde/slack-desc/kjsembed
diff --git a/testing/source/vtown/kde/slack-desc/kjumpingcube b/source/kde/kde/slack-desc/kjumpingcube
index 37d0f4705..37d0f4705 100644
--- a/testing/source/vtown/kde/slack-desc/kjumpingcube
+++ b/source/kde/kde/slack-desc/kjumpingcube
diff --git a/testing/source/vtown/kde/slack-desc/kldap b/source/kde/kde/slack-desc/kldap
index 6e0298357..6e0298357 100644
--- a/testing/source/vtown/kde/slack-desc/kldap
+++ b/source/kde/kde/slack-desc/kldap
diff --git a/testing/source/vtown/kde/slack-desc/kleopatra b/source/kde/kde/slack-desc/kleopatra
index c2da9436a..c2da9436a 100644
--- a/testing/source/vtown/kde/slack-desc/kleopatra
+++ b/source/kde/kde/slack-desc/kleopatra
diff --git a/testing/source/vtown/kde/slack-desc/klettres b/source/kde/kde/slack-desc/klettres
index 67e28fc5f..67e28fc5f 100644
--- a/testing/source/vtown/kde/slack-desc/klettres
+++ b/source/kde/kde/slack-desc/klettres
diff --git a/testing/source/vtown/kde/slack-desc/klickety b/source/kde/kde/slack-desc/klickety
index 87e64cf23..87e64cf23 100644
--- a/testing/source/vtown/kde/slack-desc/klickety
+++ b/source/kde/kde/slack-desc/klickety
diff --git a/testing/source/vtown/kde/slack-desc/klines b/source/kde/kde/slack-desc/klines
index 470fbc66e..470fbc66e 100644
--- a/testing/source/vtown/kde/slack-desc/klines
+++ b/source/kde/kde/slack-desc/klines
diff --git a/testing/source/vtown/kde/slack-desc/kmag b/source/kde/kde/slack-desc/kmag
index 581da62e1..581da62e1 100644
--- a/testing/source/vtown/kde/slack-desc/kmag
+++ b/source/kde/kde/slack-desc/kmag
diff --git a/testing/source/vtown/kde/slack-desc/kmahjongg b/source/kde/kde/slack-desc/kmahjongg
index dacf5f584..dacf5f584 100644
--- a/testing/source/vtown/kde/slack-desc/kmahjongg
+++ b/source/kde/kde/slack-desc/kmahjongg
diff --git a/testing/source/vtown/kde/slack-desc/kmail b/source/kde/kde/slack-desc/kmail
index af4969007..af4969007 100644
--- a/testing/source/vtown/kde/slack-desc/kmail
+++ b/source/kde/kde/slack-desc/kmail
diff --git a/testing/source/vtown/kde/slack-desc/kmail-account-wizard b/source/kde/kde/slack-desc/kmail-account-wizard
index 029fe114d..029fe114d 100644
--- a/testing/source/vtown/kde/slack-desc/kmail-account-wizard
+++ b/source/kde/kde/slack-desc/kmail-account-wizard
diff --git a/testing/source/vtown/kde/slack-desc/kmailtransport b/source/kde/kde/slack-desc/kmailtransport
index e310fce0b..e310fce0b 100644
--- a/testing/source/vtown/kde/slack-desc/kmailtransport
+++ b/source/kde/kde/slack-desc/kmailtransport
diff --git a/testing/source/vtown/kde/slack-desc/kmbox b/source/kde/kde/slack-desc/kmbox
index 078e76cea..078e76cea 100644
--- a/testing/source/vtown/kde/slack-desc/kmbox
+++ b/source/kde/kde/slack-desc/kmbox
diff --git a/testing/source/vtown/kde/slack-desc/kmediaplayer b/source/kde/kde/slack-desc/kmediaplayer
index ead6fe34f..ead6fe34f 100644
--- a/testing/source/vtown/kde/slack-desc/kmediaplayer
+++ b/source/kde/kde/slack-desc/kmediaplayer
diff --git a/testing/source/vtown/kde/slack-desc/kmenuedit b/source/kde/kde/slack-desc/kmenuedit
index c72389192..c72389192 100644
--- a/testing/source/vtown/kde/slack-desc/kmenuedit
+++ b/source/kde/kde/slack-desc/kmenuedit
diff --git a/testing/source/vtown/kde/slack-desc/kmime b/source/kde/kde/slack-desc/kmime
index a80b5ba7a..a80b5ba7a 100644
--- a/testing/source/vtown/kde/slack-desc/kmime
+++ b/source/kde/kde/slack-desc/kmime
diff --git a/testing/source/vtown/kde/slack-desc/kmines b/source/kde/kde/slack-desc/kmines
index ffe6780f8..ffe6780f8 100644
--- a/testing/source/vtown/kde/slack-desc/kmines
+++ b/source/kde/kde/slack-desc/kmines
diff --git a/testing/source/vtown/kde/slack-desc/kmix b/source/kde/kde/slack-desc/kmix
index 31afd1874..31afd1874 100644
--- a/testing/source/vtown/kde/slack-desc/kmix
+++ b/source/kde/kde/slack-desc/kmix
diff --git a/testing/source/vtown/kde/slack-desc/kmousetool b/source/kde/kde/slack-desc/kmousetool
index 722d26622..722d26622 100644
--- a/testing/source/vtown/kde/slack-desc/kmousetool
+++ b/source/kde/kde/slack-desc/kmousetool
diff --git a/testing/source/vtown/kde/slack-desc/kmouth b/source/kde/kde/slack-desc/kmouth
index ef568259e..ef568259e 100644
--- a/testing/source/vtown/kde/slack-desc/kmouth
+++ b/source/kde/kde/slack-desc/kmouth
diff --git a/testing/source/vtown/kde/slack-desc/kmplot b/source/kde/kde/slack-desc/kmplot
index 513547d93..513547d93 100644
--- a/testing/source/vtown/kde/slack-desc/kmplot
+++ b/source/kde/kde/slack-desc/kmplot
diff --git a/testing/source/vtown/kde/slack-desc/kmymoney b/source/kde/kde/slack-desc/kmymoney
index d1eaff552..d1eaff552 100644
--- a/testing/source/vtown/kde/slack-desc/kmymoney
+++ b/source/kde/kde/slack-desc/kmymoney
diff --git a/testing/source/vtown/kde/slack-desc/knavalbattle b/source/kde/kde/slack-desc/knavalbattle
index b5602a3f4..b5602a3f4 100644
--- a/testing/source/vtown/kde/slack-desc/knavalbattle
+++ b/source/kde/kde/slack-desc/knavalbattle
diff --git a/testing/source/vtown/kde/slack-desc/knetwalk b/source/kde/kde/slack-desc/knetwalk
index 1fed9149e..1fed9149e 100644
--- a/testing/source/vtown/kde/slack-desc/knetwalk
+++ b/source/kde/kde/slack-desc/knetwalk
diff --git a/testing/source/vtown/kde/slack-desc/knewstuff b/source/kde/kde/slack-desc/knewstuff
index fc7d25f29..fc7d25f29 100644
--- a/testing/source/vtown/kde/slack-desc/knewstuff
+++ b/source/kde/kde/slack-desc/knewstuff
diff --git a/testing/source/vtown/kde/slack-desc/knights b/source/kde/kde/slack-desc/knights
index 74c683125..74c683125 100644
--- a/testing/source/vtown/kde/slack-desc/knights
+++ b/source/kde/kde/slack-desc/knights
diff --git a/testing/source/vtown/kde/slack-desc/knotes b/source/kde/kde/slack-desc/knotes
index 5be4c3d5c..5be4c3d5c 100644
--- a/testing/source/vtown/kde/slack-desc/knotes
+++ b/source/kde/kde/slack-desc/knotes
diff --git a/testing/source/vtown/kde/slack-desc/knotifications b/source/kde/kde/slack-desc/knotifications
index 50b2c0287..50b2c0287 100644
--- a/testing/source/vtown/kde/slack-desc/knotifications
+++ b/source/kde/kde/slack-desc/knotifications
diff --git a/testing/source/vtown/kde/slack-desc/knotifyconfig b/source/kde/kde/slack-desc/knotifyconfig
index 12ace8a36..12ace8a36 100644
--- a/testing/source/vtown/kde/slack-desc/knotifyconfig
+++ b/source/kde/kde/slack-desc/knotifyconfig
diff --git a/testing/source/vtown/kde/slack-desc/kolf b/source/kde/kde/slack-desc/kolf
index 140eaf4c9..140eaf4c9 100644
--- a/testing/source/vtown/kde/slack-desc/kolf
+++ b/source/kde/kde/slack-desc/kolf
diff --git a/testing/source/vtown/kde/slack-desc/kollision b/source/kde/kde/slack-desc/kollision
index e03c19d0b..e03c19d0b 100644
--- a/testing/source/vtown/kde/slack-desc/kollision
+++ b/source/kde/kde/slack-desc/kollision
diff --git a/testing/source/vtown/kde/slack-desc/kolourpaint b/source/kde/kde/slack-desc/kolourpaint
index 4f2be3557..4f2be3557 100644
--- a/testing/source/vtown/kde/slack-desc/kolourpaint
+++ b/source/kde/kde/slack-desc/kolourpaint
diff --git a/testing/source/vtown/kde/slack-desc/kompare b/source/kde/kde/slack-desc/kompare
index d15880881..d15880881 100644
--- a/testing/source/vtown/kde/slack-desc/kompare
+++ b/source/kde/kde/slack-desc/kompare
diff --git a/testing/source/vtown/kde/slack-desc/konqueror b/source/kde/kde/slack-desc/konqueror
index 5ee33172f..5ee33172f 100644
--- a/testing/source/vtown/kde/slack-desc/konqueror
+++ b/source/kde/kde/slack-desc/konqueror
diff --git a/testing/source/vtown/kde/slack-desc/konquest b/source/kde/kde/slack-desc/konquest
index cfdfff654..cfdfff654 100644
--- a/testing/source/vtown/kde/slack-desc/konquest
+++ b/source/kde/kde/slack-desc/konquest
diff --git a/testing/source/vtown/kde/slack-desc/konsole b/source/kde/kde/slack-desc/konsole
index 81a8616fe..81a8616fe 100644
--- a/testing/source/vtown/kde/slack-desc/konsole
+++ b/source/kde/kde/slack-desc/konsole
diff --git a/testing/source/vtown/kde/slack-desc/kontact b/source/kde/kde/slack-desc/kontact
index fe96076c9..fe96076c9 100644
--- a/testing/source/vtown/kde/slack-desc/kontact
+++ b/source/kde/kde/slack-desc/kontact
diff --git a/testing/source/vtown/kde/slack-desc/kontactinterface b/source/kde/kde/slack-desc/kontactinterface
index cc58769a7..cc58769a7 100644
--- a/testing/source/vtown/kde/slack-desc/kontactinterface
+++ b/source/kde/kde/slack-desc/kontactinterface
diff --git a/testing/source/vtown/kde/slack-desc/kopete b/source/kde/kde/slack-desc/kopete
index 4971b06fd..4971b06fd 100644
--- a/testing/source/vtown/kde/slack-desc/kopete
+++ b/source/kde/kde/slack-desc/kopete
diff --git a/testing/source/vtown/kde/slack-desc/korganizer b/source/kde/kde/slack-desc/korganizer
index 9621fadcd..9621fadcd 100644
--- a/testing/source/vtown/kde/slack-desc/korganizer
+++ b/source/kde/kde/slack-desc/korganizer
diff --git a/testing/source/vtown/kde/slack-desc/kpackage b/source/kde/kde/slack-desc/kpackage
index 9e632e085..9e632e085 100644
--- a/testing/source/vtown/kde/slack-desc/kpackage
+++ b/source/kde/kde/slack-desc/kpackage
diff --git a/testing/source/vtown/kde/slack-desc/kparts b/source/kde/kde/slack-desc/kparts
index b47395531..b47395531 100644
--- a/testing/source/vtown/kde/slack-desc/kparts
+++ b/source/kde/kde/slack-desc/kparts
diff --git a/testing/source/vtown/kde/slack-desc/kpat b/source/kde/kde/slack-desc/kpat
index 8b077a57c..8b077a57c 100644
--- a/testing/source/vtown/kde/slack-desc/kpat
+++ b/source/kde/kde/slack-desc/kpat
diff --git a/testing/source/vtown/kde/slack-desc/kpeople b/source/kde/kde/slack-desc/kpeople
index 17a7a8874..17a7a8874 100644
--- a/testing/source/vtown/kde/slack-desc/kpeople
+++ b/source/kde/kde/slack-desc/kpeople
diff --git a/testing/source/vtown/kde/slack-desc/kpeoplevcard b/source/kde/kde/slack-desc/kpeoplevcard
index 39dea9538..39dea9538 100644
--- a/testing/source/vtown/kde/slack-desc/kpeoplevcard
+++ b/source/kde/kde/slack-desc/kpeoplevcard
diff --git a/testing/source/vtown/kde/slack-desc/kpimtextedit b/source/kde/kde/slack-desc/kpimtextedit
index 983a1486e..983a1486e 100644
--- a/testing/source/vtown/kde/slack-desc/kpimtextedit
+++ b/source/kde/kde/slack-desc/kpimtextedit
diff --git a/testing/source/vtown/kde/slack-desc/kpkpass b/source/kde/kde/slack-desc/kpkpass
index baa5182d5..baa5182d5 100644
--- a/testing/source/vtown/kde/slack-desc/kpkpass
+++ b/source/kde/kde/slack-desc/kpkpass
diff --git a/testing/source/vtown/kde/slack-desc/kplotting b/source/kde/kde/slack-desc/kplotting
index 953fed42d..953fed42d 100644
--- a/testing/source/vtown/kde/slack-desc/kplotting
+++ b/source/kde/kde/slack-desc/kplotting
diff --git a/testing/source/vtown/kde/slack-desc/kpmcore b/source/kde/kde/slack-desc/kpmcore
index 1f87af1e2..1f87af1e2 100644
--- a/testing/source/vtown/kde/slack-desc/kpmcore
+++ b/source/kde/kde/slack-desc/kpmcore
diff --git a/testing/source/vtown/kde/slack-desc/kpty b/source/kde/kde/slack-desc/kpty
index f02911c68..f02911c68 100644
--- a/testing/source/vtown/kde/slack-desc/kpty
+++ b/source/kde/kde/slack-desc/kpty
diff --git a/testing/source/vtown/kde/slack-desc/kqtquickcharts b/source/kde/kde/slack-desc/kqtquickcharts
index 50ffbd906..50ffbd906 100644
--- a/testing/source/vtown/kde/slack-desc/kqtquickcharts
+++ b/source/kde/kde/slack-desc/kqtquickcharts
diff --git a/testing/source/vtown/kde/slack-desc/kquickcharts b/source/kde/kde/slack-desc/kquickcharts
index acbcfd9ed..acbcfd9ed 100644
--- a/testing/source/vtown/kde/slack-desc/kquickcharts
+++ b/source/kde/kde/slack-desc/kquickcharts
diff --git a/testing/source/vtown/kde/slack-desc/krdc b/source/kde/kde/slack-desc/krdc
index d6f6089d0..d6f6089d0 100644
--- a/testing/source/vtown/kde/slack-desc/krdc
+++ b/source/kde/kde/slack-desc/krdc
diff --git a/testing/source/vtown/kde/slack-desc/krename b/source/kde/kde/slack-desc/krename
index 288d08bd8..288d08bd8 100644
--- a/testing/source/vtown/kde/slack-desc/krename
+++ b/source/kde/kde/slack-desc/krename
diff --git a/testing/source/vtown/kde/slack-desc/kreversi b/source/kde/kde/slack-desc/kreversi
index b0a16c474..b0a16c474 100644
--- a/testing/source/vtown/kde/slack-desc/kreversi
+++ b/source/kde/kde/slack-desc/kreversi
diff --git a/testing/source/vtown/kde/slack-desc/krfb b/source/kde/kde/slack-desc/krfb
index 1263ecdfc..1263ecdfc 100644
--- a/testing/source/vtown/kde/slack-desc/krfb
+++ b/source/kde/kde/slack-desc/krfb
diff --git a/testing/source/vtown/kde/slack-desc/krita b/source/kde/kde/slack-desc/krita
index d39f4fc31..d39f4fc31 100644
--- a/testing/source/vtown/kde/slack-desc/krita
+++ b/source/kde/kde/slack-desc/krita
diff --git a/testing/source/vtown/kde/slack-desc/kross b/source/kde/kde/slack-desc/kross
index 9b88e7167..9b88e7167 100644
--- a/testing/source/vtown/kde/slack-desc/kross
+++ b/source/kde/kde/slack-desc/kross
diff --git a/testing/source/vtown/kde/slack-desc/kross-interpreters b/source/kde/kde/slack-desc/kross-interpreters
index 7b7b5493f..7b7b5493f 100644
--- a/testing/source/vtown/kde/slack-desc/kross-interpreters
+++ b/source/kde/kde/slack-desc/kross-interpreters
diff --git a/testing/source/vtown/kde/slack-desc/kruler b/source/kde/kde/slack-desc/kruler
index 5a6ea8a01..5a6ea8a01 100644
--- a/testing/source/vtown/kde/slack-desc/kruler
+++ b/source/kde/kde/slack-desc/kruler
diff --git a/testing/source/vtown/kde/slack-desc/krunner b/source/kde/kde/slack-desc/krunner
index 03a662853..03a662853 100644
--- a/testing/source/vtown/kde/slack-desc/krunner
+++ b/source/kde/kde/slack-desc/krunner
diff --git a/testing/source/vtown/kde/slack-desc/krusader b/source/kde/kde/slack-desc/krusader
index 9a54488a0..9a54488a0 100644
--- a/testing/source/vtown/kde/slack-desc/krusader
+++ b/source/kde/kde/slack-desc/krusader
diff --git a/testing/source/vtown/kde/slack-desc/kscreen b/source/kde/kde/slack-desc/kscreen
index 55d064159..55d064159 100644
--- a/testing/source/vtown/kde/slack-desc/kscreen
+++ b/source/kde/kde/slack-desc/kscreen
diff --git a/testing/source/vtown/kde/slack-desc/kscreenlocker b/source/kde/kde/slack-desc/kscreenlocker
index ed46864bf..ed46864bf 100644
--- a/testing/source/vtown/kde/slack-desc/kscreenlocker
+++ b/source/kde/kde/slack-desc/kscreenlocker
diff --git a/testing/source/vtown/kde/slack-desc/kservice b/source/kde/kde/slack-desc/kservice
index 94c6ca607..94c6ca607 100644
--- a/testing/source/vtown/kde/slack-desc/kservice
+++ b/source/kde/kde/slack-desc/kservice
diff --git a/testing/source/vtown/kde/slack-desc/kshisen b/source/kde/kde/slack-desc/kshisen
index c922410c0..c922410c0 100644
--- a/testing/source/vtown/kde/slack-desc/kshisen
+++ b/source/kde/kde/slack-desc/kshisen
diff --git a/testing/source/vtown/kde/slack-desc/ksirk b/source/kde/kde/slack-desc/ksirk
index 8befe9d49..8befe9d49 100644
--- a/testing/source/vtown/kde/slack-desc/ksirk
+++ b/source/kde/kde/slack-desc/ksirk
diff --git a/testing/source/vtown/kde/slack-desc/ksmtp b/source/kde/kde/slack-desc/ksmtp
index da3fcf892..da3fcf892 100644
--- a/testing/source/vtown/kde/slack-desc/ksmtp
+++ b/source/kde/kde/slack-desc/ksmtp
diff --git a/testing/source/vtown/kde/slack-desc/ksnakeduel b/source/kde/kde/slack-desc/ksnakeduel
index ba4ff00a5..ba4ff00a5 100644
--- a/testing/source/vtown/kde/slack-desc/ksnakeduel
+++ b/source/kde/kde/slack-desc/ksnakeduel
diff --git a/testing/source/vtown/kde/slack-desc/kspaceduel b/source/kde/kde/slack-desc/kspaceduel
index b792d810d..b792d810d 100644
--- a/testing/source/vtown/kde/slack-desc/kspaceduel
+++ b/source/kde/kde/slack-desc/kspaceduel
diff --git a/testing/source/vtown/kde/slack-desc/ksquares b/source/kde/kde/slack-desc/ksquares
index 46eb34cb9..46eb34cb9 100644
--- a/testing/source/vtown/kde/slack-desc/ksquares
+++ b/source/kde/kde/slack-desc/ksquares
diff --git a/testing/source/vtown/kde/slack-desc/ksshaskpass b/source/kde/kde/slack-desc/ksshaskpass
index a89d94468..a89d94468 100644
--- a/testing/source/vtown/kde/slack-desc/ksshaskpass
+++ b/source/kde/kde/slack-desc/ksshaskpass
diff --git a/testing/source/vtown/kde/slack-desc/kstars b/source/kde/kde/slack-desc/kstars
index e81ae9cdf..e81ae9cdf 100644
--- a/testing/source/vtown/kde/slack-desc/kstars
+++ b/source/kde/kde/slack-desc/kstars
diff --git a/testing/source/vtown/kde/slack-desc/ksudoku b/source/kde/kde/slack-desc/ksudoku
index 958e74297..958e74297 100644
--- a/testing/source/vtown/kde/slack-desc/ksudoku
+++ b/source/kde/kde/slack-desc/ksudoku
diff --git a/testing/source/vtown/kde/slack-desc/ksysguard b/source/kde/kde/slack-desc/ksysguard
index 00d5225de..00d5225de 100644
--- a/testing/source/vtown/kde/slack-desc/ksysguard
+++ b/source/kde/kde/slack-desc/ksysguard
diff --git a/testing/source/vtown/kde/slack-desc/ksystemlog b/source/kde/kde/slack-desc/ksystemlog
index 40178bbb5..40178bbb5 100644
--- a/testing/source/vtown/kde/slack-desc/ksystemlog
+++ b/source/kde/kde/slack-desc/ksystemlog
diff --git a/testing/source/vtown/kde/slack-desc/kteatime b/source/kde/kde/slack-desc/kteatime
index dfff12c37..dfff12c37 100644
--- a/testing/source/vtown/kde/slack-desc/kteatime
+++ b/source/kde/kde/slack-desc/kteatime
diff --git a/testing/source/vtown/kde/slack-desc/ktexteditor b/source/kde/kde/slack-desc/ktexteditor
index 9ec11770f..9ec11770f 100644
--- a/testing/source/vtown/kde/slack-desc/ktexteditor
+++ b/source/kde/kde/slack-desc/ktexteditor
diff --git a/testing/source/vtown/kde/slack-desc/ktextwidgets b/source/kde/kde/slack-desc/ktextwidgets
index c00a6c8ad..c00a6c8ad 100644
--- a/testing/source/vtown/kde/slack-desc/ktextwidgets
+++ b/source/kde/kde/slack-desc/ktextwidgets
diff --git a/testing/source/vtown/kde/slack-desc/ktimer b/source/kde/kde/slack-desc/ktimer
index 1a39458a7..1a39458a7 100644
--- a/testing/source/vtown/kde/slack-desc/ktimer
+++ b/source/kde/kde/slack-desc/ktimer
diff --git a/testing/source/vtown/kde/slack-desc/ktimetracker b/source/kde/kde/slack-desc/ktimetracker
index e1a050a37..e1a050a37 100644
--- a/testing/source/vtown/kde/slack-desc/ktimetracker
+++ b/source/kde/kde/slack-desc/ktimetracker
diff --git a/testing/source/vtown/kde/slack-desc/ktnef b/source/kde/kde/slack-desc/ktnef
index 65f2be268..65f2be268 100644
--- a/testing/source/vtown/kde/slack-desc/ktnef
+++ b/source/kde/kde/slack-desc/ktnef
diff --git a/testing/source/vtown/kde/slack-desc/ktorrent b/source/kde/kde/slack-desc/ktorrent
index a47492842..a47492842 100644
--- a/testing/source/vtown/kde/slack-desc/ktorrent
+++ b/source/kde/kde/slack-desc/ktorrent
diff --git a/testing/source/vtown/kde/slack-desc/ktouch b/source/kde/kde/slack-desc/ktouch
index d10acd355..d10acd355 100644
--- a/testing/source/vtown/kde/slack-desc/ktouch
+++ b/source/kde/kde/slack-desc/ktouch
diff --git a/testing/source/vtown/kde/slack-desc/ktp-accounts-kcm b/source/kde/kde/slack-desc/ktp-accounts-kcm
index 812b095c1..812b095c1 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-accounts-kcm
+++ b/source/kde/kde/slack-desc/ktp-accounts-kcm
diff --git a/testing/source/vtown/kde/slack-desc/ktp-approver b/source/kde/kde/slack-desc/ktp-approver
index 214e62a46..214e62a46 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-approver
+++ b/source/kde/kde/slack-desc/ktp-approver
diff --git a/testing/source/vtown/kde/slack-desc/ktp-auth-handler b/source/kde/kde/slack-desc/ktp-auth-handler
index bbf40025b..bbf40025b 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-auth-handler
+++ b/source/kde/kde/slack-desc/ktp-auth-handler
diff --git a/testing/source/vtown/kde/slack-desc/ktp-call-ui b/source/kde/kde/slack-desc/ktp-call-ui
index cb1717cd2..cb1717cd2 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-call-ui
+++ b/source/kde/kde/slack-desc/ktp-call-ui
diff --git a/testing/source/vtown/kde/slack-desc/ktp-common-internals b/source/kde/kde/slack-desc/ktp-common-internals
index 709026182..709026182 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-common-internals
+++ b/source/kde/kde/slack-desc/ktp-common-internals
diff --git a/testing/source/vtown/kde/slack-desc/ktp-contact-list b/source/kde/kde/slack-desc/ktp-contact-list
index 1d54de3cb..1d54de3cb 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-contact-list
+++ b/source/kde/kde/slack-desc/ktp-contact-list
diff --git a/testing/source/vtown/kde/slack-desc/ktp-contact-runner b/source/kde/kde/slack-desc/ktp-contact-runner
index 42059c0c5..42059c0c5 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-contact-runner
+++ b/source/kde/kde/slack-desc/ktp-contact-runner
diff --git a/testing/source/vtown/kde/slack-desc/ktp-desktop-applets b/source/kde/kde/slack-desc/ktp-desktop-applets
index aea5018e9..aea5018e9 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-desktop-applets
+++ b/source/kde/kde/slack-desc/ktp-desktop-applets
diff --git a/testing/source/vtown/kde/slack-desc/ktp-filetransfer-handler b/source/kde/kde/slack-desc/ktp-filetransfer-handler
index e405111bb..e405111bb 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-filetransfer-handler
+++ b/source/kde/kde/slack-desc/ktp-filetransfer-handler
diff --git a/testing/source/vtown/kde/slack-desc/ktp-kded-module b/source/kde/kde/slack-desc/ktp-kded-module
index 062617a1e..062617a1e 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-kded-module
+++ b/source/kde/kde/slack-desc/ktp-kded-module
diff --git a/testing/source/vtown/kde/slack-desc/ktp-send-file b/source/kde/kde/slack-desc/ktp-send-file
index 1000bd288..1000bd288 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-send-file
+++ b/source/kde/kde/slack-desc/ktp-send-file
diff --git a/testing/source/vtown/kde/slack-desc/ktp-text-ui b/source/kde/kde/slack-desc/ktp-text-ui
index bf25c4650..bf25c4650 100644
--- a/testing/source/vtown/kde/slack-desc/ktp-text-ui
+++ b/source/kde/kde/slack-desc/ktp-text-ui
diff --git a/testing/source/vtown/kde/slack-desc/ktuberling b/source/kde/kde/slack-desc/ktuberling
index d76af46e2..d76af46e2 100644
--- a/testing/source/vtown/kde/slack-desc/ktuberling
+++ b/source/kde/kde/slack-desc/ktuberling
diff --git a/testing/source/vtown/kde/slack-desc/kturtle b/source/kde/kde/slack-desc/kturtle
index 91dde602d..91dde602d 100644
--- a/testing/source/vtown/kde/slack-desc/kturtle
+++ b/source/kde/kde/slack-desc/kturtle
diff --git a/testing/source/vtown/kde/slack-desc/kubrick b/source/kde/kde/slack-desc/kubrick
index b2b9f0271..b2b9f0271 100644
--- a/testing/source/vtown/kde/slack-desc/kubrick
+++ b/source/kde/kde/slack-desc/kubrick
diff --git a/testing/source/vtown/kde/slack-desc/kunitconversion b/source/kde/kde/slack-desc/kunitconversion
index 1f460bc38..1f460bc38 100644
--- a/testing/source/vtown/kde/slack-desc/kunitconversion
+++ b/source/kde/kde/slack-desc/kunitconversion
diff --git a/testing/source/vtown/kde/slack-desc/kuser b/source/kde/kde/slack-desc/kuser
index 7890886ad..7890886ad 100644
--- a/testing/source/vtown/kde/slack-desc/kuser
+++ b/source/kde/kde/slack-desc/kuser
diff --git a/testing/source/vtown/kde/slack-desc/kwallet b/source/kde/kde/slack-desc/kwallet
index 72ca6c3ae..72ca6c3ae 100644
--- a/testing/source/vtown/kde/slack-desc/kwallet
+++ b/source/kde/kde/slack-desc/kwallet
diff --git a/testing/source/vtown/kde/slack-desc/kwallet-pam b/source/kde/kde/slack-desc/kwallet-pam
index 7966b6492..7966b6492 100644
--- a/testing/source/vtown/kde/slack-desc/kwallet-pam
+++ b/source/kde/kde/slack-desc/kwallet-pam
diff --git a/testing/source/vtown/kde/slack-desc/kwalletmanager b/source/kde/kde/slack-desc/kwalletmanager
index 181a8e12b..181a8e12b 100644
--- a/testing/source/vtown/kde/slack-desc/kwalletmanager
+++ b/source/kde/kde/slack-desc/kwalletmanager
diff --git a/testing/source/vtown/kde/slack-desc/kwave b/source/kde/kde/slack-desc/kwave
index 2bf0ac2f9..2bf0ac2f9 100644
--- a/testing/source/vtown/kde/slack-desc/kwave
+++ b/source/kde/kde/slack-desc/kwave
diff --git a/testing/source/vtown/kde/slack-desc/kwayland b/source/kde/kde/slack-desc/kwayland
index ad0eb2652..ad0eb2652 100644
--- a/testing/source/vtown/kde/slack-desc/kwayland
+++ b/source/kde/kde/slack-desc/kwayland
diff --git a/testing/source/vtown/kde/slack-desc/kwayland-integration b/source/kde/kde/slack-desc/kwayland-integration
index 47c6ab3cc..47c6ab3cc 100644
--- a/testing/source/vtown/kde/slack-desc/kwayland-integration
+++ b/source/kde/kde/slack-desc/kwayland-integration
diff --git a/testing/source/vtown/kde/slack-desc/kwayland-server b/source/kde/kde/slack-desc/kwayland-server
index 30f35ef9b..30f35ef9b 100644
--- a/testing/source/vtown/kde/slack-desc/kwayland-server
+++ b/source/kde/kde/slack-desc/kwayland-server
diff --git a/testing/source/vtown/kde/slack-desc/kwebkitpart b/source/kde/kde/slack-desc/kwebkitpart
index ef44c0a60..ef44c0a60 100644
--- a/testing/source/vtown/kde/slack-desc/kwebkitpart
+++ b/source/kde/kde/slack-desc/kwebkitpart
diff --git a/testing/source/vtown/kde/slack-desc/kwidgetsaddons b/source/kde/kde/slack-desc/kwidgetsaddons
index d04ae50fc..d04ae50fc 100644
--- a/testing/source/vtown/kde/slack-desc/kwidgetsaddons
+++ b/source/kde/kde/slack-desc/kwidgetsaddons
diff --git a/testing/source/vtown/kde/slack-desc/kwin b/source/kde/kde/slack-desc/kwin
index 13c282ad0..13c282ad0 100644
--- a/testing/source/vtown/kde/slack-desc/kwin
+++ b/source/kde/kde/slack-desc/kwin
diff --git a/testing/source/vtown/kde/slack-desc/kwindowsystem b/source/kde/kde/slack-desc/kwindowsystem
index 3d3cda8ab..3d3cda8ab 100644
--- a/testing/source/vtown/kde/slack-desc/kwindowsystem
+++ b/source/kde/kde/slack-desc/kwindowsystem
diff --git a/testing/source/vtown/kde/slack-desc/kwordquiz b/source/kde/kde/slack-desc/kwordquiz
index d74cda83a..d74cda83a 100644
--- a/testing/source/vtown/kde/slack-desc/kwordquiz
+++ b/source/kde/kde/slack-desc/kwordquiz
diff --git a/testing/source/vtown/kde/slack-desc/kwrited b/source/kde/kde/slack-desc/kwrited
index 3c50df5fc..3c50df5fc 100644
--- a/testing/source/vtown/kde/slack-desc/kwrited
+++ b/source/kde/kde/slack-desc/kwrited
diff --git a/testing/source/vtown/kde/slack-desc/kxmlgui b/source/kde/kde/slack-desc/kxmlgui
index b3f1340cf..b3f1340cf 100644
--- a/testing/source/vtown/kde/slack-desc/kxmlgui
+++ b/source/kde/kde/slack-desc/kxmlgui
diff --git a/testing/source/vtown/kde/slack-desc/kxmlrpcclient b/source/kde/kde/slack-desc/kxmlrpcclient
index d9697706b..d9697706b 100644
--- a/testing/source/vtown/kde/slack-desc/kxmlrpcclient
+++ b/source/kde/kde/slack-desc/kxmlrpcclient
diff --git a/testing/source/vtown/kde/slack-desc/labplot b/source/kde/kde/slack-desc/labplot
index 2c6aa27be..2c6aa27be 100644
--- a/testing/source/vtown/kde/slack-desc/labplot
+++ b/source/kde/kde/slack-desc/labplot
diff --git a/testing/source/vtown/kde/slack-desc/latte-dock b/source/kde/kde/slack-desc/latte-dock
index 7ab73ac31..7ab73ac31 100644
--- a/testing/source/vtown/kde/slack-desc/latte-dock
+++ b/source/kde/kde/slack-desc/latte-dock
diff --git a/testing/source/vtown/kde/slack-desc/libgravatar b/source/kde/kde/slack-desc/libgravatar
index 6e6a7656e..6e6a7656e 100644
--- a/testing/source/vtown/kde/slack-desc/libgravatar
+++ b/source/kde/kde/slack-desc/libgravatar
diff --git a/testing/source/vtown/kde/slack-desc/libkcddb b/source/kde/kde/slack-desc/libkcddb
index e67f04d6c..e67f04d6c 100644
--- a/testing/source/vtown/kde/slack-desc/libkcddb
+++ b/source/kde/kde/slack-desc/libkcddb
diff --git a/testing/source/vtown/kde/slack-desc/libkcompactdisc b/source/kde/kde/slack-desc/libkcompactdisc
index 3ebfa258c..3ebfa258c 100644
--- a/testing/source/vtown/kde/slack-desc/libkcompactdisc
+++ b/source/kde/kde/slack-desc/libkcompactdisc
diff --git a/testing/source/vtown/kde/slack-desc/libkdcraw b/source/kde/kde/slack-desc/libkdcraw
index dad7b783f..dad7b783f 100644
--- a/testing/source/vtown/kde/slack-desc/libkdcraw
+++ b/source/kde/kde/slack-desc/libkdcraw
diff --git a/testing/source/vtown/kde/slack-desc/libkdegames b/source/kde/kde/slack-desc/libkdegames
index 33cfe9ae3..33cfe9ae3 100644
--- a/testing/source/vtown/kde/slack-desc/libkdegames
+++ b/source/kde/kde/slack-desc/libkdegames
diff --git a/testing/source/vtown/kde/slack-desc/libkdepim b/source/kde/kde/slack-desc/libkdepim
index 90a4c1b92..90a4c1b92 100644
--- a/testing/source/vtown/kde/slack-desc/libkdepim
+++ b/source/kde/kde/slack-desc/libkdepim
diff --git a/testing/source/vtown/kde/slack-desc/libkeduvocdocument b/source/kde/kde/slack-desc/libkeduvocdocument
index 55e527900..55e527900 100644
--- a/testing/source/vtown/kde/slack-desc/libkeduvocdocument
+++ b/source/kde/kde/slack-desc/libkeduvocdocument
diff --git a/testing/source/vtown/kde/slack-desc/libkexiv2 b/source/kde/kde/slack-desc/libkexiv2
index 389c84421..389c84421 100644
--- a/testing/source/vtown/kde/slack-desc/libkexiv2
+++ b/source/kde/kde/slack-desc/libkexiv2
diff --git a/testing/source/vtown/kde/slack-desc/libkgapi b/source/kde/kde/slack-desc/libkgapi
index 205f724ec..205f724ec 100644
--- a/testing/source/vtown/kde/slack-desc/libkgapi
+++ b/source/kde/kde/slack-desc/libkgapi
diff --git a/testing/source/vtown/kde/slack-desc/libkgeomap b/source/kde/kde/slack-desc/libkgeomap
index 9f2121e37..9f2121e37 100644
--- a/testing/source/vtown/kde/slack-desc/libkgeomap
+++ b/source/kde/kde/slack-desc/libkgeomap
diff --git a/testing/source/vtown/kde/slack-desc/libkipi b/source/kde/kde/slack-desc/libkipi
index 652e9886b..652e9886b 100644
--- a/testing/source/vtown/kde/slack-desc/libkipi
+++ b/source/kde/kde/slack-desc/libkipi
diff --git a/testing/source/vtown/kde/slack-desc/libkleo b/source/kde/kde/slack-desc/libkleo
index 2f4e968d0..2f4e968d0 100644
--- a/testing/source/vtown/kde/slack-desc/libkleo
+++ b/source/kde/kde/slack-desc/libkleo
diff --git a/testing/source/vtown/kde/slack-desc/libkmahjongg b/source/kde/kde/slack-desc/libkmahjongg
index 5d194964f..5d194964f 100644
--- a/testing/source/vtown/kde/slack-desc/libkmahjongg
+++ b/source/kde/kde/slack-desc/libkmahjongg
diff --git a/testing/source/vtown/kde/slack-desc/libkomparediff2 b/source/kde/kde/slack-desc/libkomparediff2
index d18a578c2..d18a578c2 100644
--- a/testing/source/vtown/kde/slack-desc/libkomparediff2
+++ b/source/kde/kde/slack-desc/libkomparediff2
diff --git a/testing/source/vtown/kde/slack-desc/libksane b/source/kde/kde/slack-desc/libksane
index da1a96aa6..da1a96aa6 100644
--- a/testing/source/vtown/kde/slack-desc/libksane
+++ b/source/kde/kde/slack-desc/libksane
diff --git a/testing/source/vtown/kde/slack-desc/libkscreen b/source/kde/kde/slack-desc/libkscreen
index e1518e5cb..e1518e5cb 100644
--- a/testing/source/vtown/kde/slack-desc/libkscreen
+++ b/source/kde/kde/slack-desc/libkscreen
diff --git a/testing/source/vtown/kde/slack-desc/libksieve b/source/kde/kde/slack-desc/libksieve
index 31d771f6e..31d771f6e 100644
--- a/testing/source/vtown/kde/slack-desc/libksieve
+++ b/source/kde/kde/slack-desc/libksieve
diff --git a/testing/source/vtown/kde/slack-desc/libksysguard b/source/kde/kde/slack-desc/libksysguard
index fa83fd8d0..fa83fd8d0 100644
--- a/testing/source/vtown/kde/slack-desc/libksysguard
+++ b/source/kde/kde/slack-desc/libksysguard
diff --git a/testing/source/vtown/kde/slack-desc/libktorrent b/source/kde/kde/slack-desc/libktorrent
index c9f0f8ad8..c9f0f8ad8 100644
--- a/testing/source/vtown/kde/slack-desc/libktorrent
+++ b/source/kde/kde/slack-desc/libktorrent
diff --git a/testing/source/vtown/kde/slack-desc/lokalize b/source/kde/kde/slack-desc/lokalize
index 120a19d82..120a19d82 100644
--- a/testing/source/vtown/kde/slack-desc/lokalize
+++ b/source/kde/kde/slack-desc/lokalize
diff --git a/testing/source/vtown/kde/slack-desc/lskat b/source/kde/kde/slack-desc/lskat
index b432dcdae..b432dcdae 100644
--- a/testing/source/vtown/kde/slack-desc/lskat
+++ b/source/kde/kde/slack-desc/lskat
diff --git a/testing/source/vtown/kde/slack-desc/mailcommon b/source/kde/kde/slack-desc/mailcommon
index ec793ec39..ec793ec39 100644
--- a/testing/source/vtown/kde/slack-desc/mailcommon
+++ b/source/kde/kde/slack-desc/mailcommon
diff --git a/testing/source/vtown/kde/slack-desc/mailimporter b/source/kde/kde/slack-desc/mailimporter
index 3cf6f7373..3cf6f7373 100644
--- a/testing/source/vtown/kde/slack-desc/mailimporter
+++ b/source/kde/kde/slack-desc/mailimporter
diff --git a/testing/source/vtown/kde/slack-desc/make_slack-desc.sh b/source/kde/kde/slack-desc/make_slack-desc.sh
index 13148a281..13148a281 100755
--- a/testing/source/vtown/kde/slack-desc/make_slack-desc.sh
+++ b/source/kde/kde/slack-desc/make_slack-desc.sh
diff --git a/testing/source/vtown/kde/slack-desc/marble b/source/kde/kde/slack-desc/marble
index 93d389d14..93d389d14 100644
--- a/testing/source/vtown/kde/slack-desc/marble
+++ b/source/kde/kde/slack-desc/marble
diff --git a/testing/source/vtown/kde/slack-desc/mbox-importer b/source/kde/kde/slack-desc/mbox-importer
index 09568e9cc..09568e9cc 100644
--- a/testing/source/vtown/kde/slack-desc/mbox-importer
+++ b/source/kde/kde/slack-desc/mbox-importer
diff --git a/testing/source/vtown/kde/slack-desc/messagelib b/source/kde/kde/slack-desc/messagelib
index 064bff4e1..064bff4e1 100644
--- a/testing/source/vtown/kde/slack-desc/messagelib
+++ b/source/kde/kde/slack-desc/messagelib
diff --git a/testing/source/vtown/kde/slack-desc/milou b/source/kde/kde/slack-desc/milou
index ee9a7fec6..ee9a7fec6 100644
--- a/testing/source/vtown/kde/slack-desc/milou
+++ b/source/kde/kde/slack-desc/milou
diff --git a/testing/source/vtown/kde/slack-desc/minuet b/source/kde/kde/slack-desc/minuet
index b2b2bdfd1..b2b2bdfd1 100644
--- a/testing/source/vtown/kde/slack-desc/minuet
+++ b/source/kde/kde/slack-desc/minuet
diff --git a/testing/source/vtown/kde/slack-desc/modemmanager-qt b/source/kde/kde/slack-desc/modemmanager-qt
index bcbcce12f..bcbcce12f 100644
--- a/testing/source/vtown/kde/slack-desc/modemmanager-qt
+++ b/source/kde/kde/slack-desc/modemmanager-qt
diff --git a/testing/source/vtown/kde/slack-desc/networkmanager-qt b/source/kde/kde/slack-desc/networkmanager-qt
index ab44d4d84..ab44d4d84 100644
--- a/testing/source/vtown/kde/slack-desc/networkmanager-qt
+++ b/source/kde/kde/slack-desc/networkmanager-qt
diff --git a/testing/source/vtown/kde/slack-desc/okteta b/source/kde/kde/slack-desc/okteta
index 4c67f1ce7..4c67f1ce7 100644
--- a/testing/source/vtown/kde/slack-desc/okteta
+++ b/source/kde/kde/slack-desc/okteta
diff --git a/testing/source/vtown/kde/slack-desc/okular b/source/kde/kde/slack-desc/okular
index 5969cb7a3..5969cb7a3 100644
--- a/testing/source/vtown/kde/slack-desc/okular
+++ b/source/kde/kde/slack-desc/okular
diff --git a/testing/source/vtown/kde/slack-desc/oxygen b/source/kde/kde/slack-desc/oxygen
index cd8709f14..cd8709f14 100644
--- a/testing/source/vtown/kde/slack-desc/oxygen
+++ b/source/kde/kde/slack-desc/oxygen
diff --git a/testing/source/vtown/kde/slack-desc/oxygen-fonts b/source/kde/kde/slack-desc/oxygen-fonts
index 516507eb7..516507eb7 100644
--- a/testing/source/vtown/kde/slack-desc/oxygen-fonts
+++ b/source/kde/kde/slack-desc/oxygen-fonts
diff --git a/testing/source/vtown/kde/slack-desc/oxygen-gtk2 b/source/kde/kde/slack-desc/oxygen-gtk2
index b0679dc90..b0679dc90 100644
--- a/testing/source/vtown/kde/slack-desc/oxygen-gtk2
+++ b/source/kde/kde/slack-desc/oxygen-gtk2
diff --git a/testing/source/vtown/kde/slack-desc/oxygen-icons5 b/source/kde/kde/slack-desc/oxygen-icons5
index 837296f9b..837296f9b 100644
--- a/testing/source/vtown/kde/slack-desc/oxygen-icons5
+++ b/source/kde/kde/slack-desc/oxygen-icons5
diff --git a/testing/source/vtown/kde/slack-desc/palapeli b/source/kde/kde/slack-desc/palapeli
index 0c61e0231..0c61e0231 100644
--- a/testing/source/vtown/kde/slack-desc/palapeli
+++ b/source/kde/kde/slack-desc/palapeli
diff --git a/testing/source/vtown/kde/slack-desc/parley b/source/kde/kde/slack-desc/parley
index 03a32573e..03a32573e 100644
--- a/testing/source/vtown/kde/slack-desc/parley
+++ b/source/kde/kde/slack-desc/parley
diff --git a/testing/source/vtown/kde/slack-desc/partitionmanager b/source/kde/kde/slack-desc/partitionmanager
index d72ac9b3e..d72ac9b3e 100644
--- a/testing/source/vtown/kde/slack-desc/partitionmanager
+++ b/source/kde/kde/slack-desc/partitionmanager
diff --git a/testing/source/vtown/kde/slack-desc/picmi b/source/kde/kde/slack-desc/picmi
index ca0910799..ca0910799 100644
--- a/testing/source/vtown/kde/slack-desc/picmi
+++ b/source/kde/kde/slack-desc/picmi
diff --git a/testing/source/vtown/kde/slack-desc/pim-data-exporter b/source/kde/kde/slack-desc/pim-data-exporter
index 890a42b36..890a42b36 100644
--- a/testing/source/vtown/kde/slack-desc/pim-data-exporter
+++ b/source/kde/kde/slack-desc/pim-data-exporter
diff --git a/testing/source/vtown/kde/slack-desc/pim-sieve-editor b/source/kde/kde/slack-desc/pim-sieve-editor
index 06aef234e..06aef234e 100644
--- a/testing/source/vtown/kde/slack-desc/pim-sieve-editor
+++ b/source/kde/kde/slack-desc/pim-sieve-editor
diff --git a/testing/source/vtown/kde/slack-desc/pimcommon b/source/kde/kde/slack-desc/pimcommon
index 072251ca7..072251ca7 100644
--- a/testing/source/vtown/kde/slack-desc/pimcommon
+++ b/source/kde/kde/slack-desc/pimcommon
diff --git a/testing/source/vtown/kde/slack-desc/plasma-browser-integration b/source/kde/kde/slack-desc/plasma-browser-integration
index 6ac2012d1..6ac2012d1 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-browser-integration
+++ b/source/kde/kde/slack-desc/plasma-browser-integration
diff --git a/testing/source/vtown/kde/slack-desc/plasma-desktop b/source/kde/kde/slack-desc/plasma-desktop
index d2746d902..d2746d902 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-desktop
+++ b/source/kde/kde/slack-desc/plasma-desktop
diff --git a/testing/source/vtown/kde/slack-desc/plasma-disks b/source/kde/kde/slack-desc/plasma-disks
index bcef8e166..bcef8e166 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-disks
+++ b/source/kde/kde/slack-desc/plasma-disks
diff --git a/testing/source/vtown/kde/slack-desc/plasma-framework b/source/kde/kde/slack-desc/plasma-framework
index a73c03c7e..a73c03c7e 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-framework
+++ b/source/kde/kde/slack-desc/plasma-framework
diff --git a/testing/source/vtown/kde/slack-desc/plasma-integration b/source/kde/kde/slack-desc/plasma-integration
index 67f886295..67f886295 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-integration
+++ b/source/kde/kde/slack-desc/plasma-integration
diff --git a/testing/source/vtown/kde/slack-desc/plasma-nm b/source/kde/kde/slack-desc/plasma-nm
index bab1307cf..bab1307cf 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-nm
+++ b/source/kde/kde/slack-desc/plasma-nm
diff --git a/testing/source/vtown/kde/slack-desc/plasma-pa b/source/kde/kde/slack-desc/plasma-pa
index 1e14238ba..1e14238ba 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-pa
+++ b/source/kde/kde/slack-desc/plasma-pa
diff --git a/testing/source/vtown/kde/slack-desc/plasma-sdk b/source/kde/kde/slack-desc/plasma-sdk
index eebb0cbb1..eebb0cbb1 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-sdk
+++ b/source/kde/kde/slack-desc/plasma-sdk
diff --git a/testing/source/vtown/kde/slack-desc/plasma-vault b/source/kde/kde/slack-desc/plasma-vault
index e0bd497de..e0bd497de 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-vault
+++ b/source/kde/kde/slack-desc/plasma-vault
diff --git a/testing/source/vtown/kde/slack-desc/plasma-wayland-protocols b/source/kde/kde/slack-desc/plasma-wayland-protocols
index 6d64c965c..6d64c965c 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-wayland-protocols
+++ b/source/kde/kde/slack-desc/plasma-wayland-protocols
diff --git a/testing/source/vtown/kde/slack-desc/plasma-workspace b/source/kde/kde/slack-desc/plasma-workspace
index 58e4503a3..58e4503a3 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-workspace
+++ b/source/kde/kde/slack-desc/plasma-workspace
diff --git a/testing/source/vtown/kde/slack-desc/plasma-workspace-wallpapers b/source/kde/kde/slack-desc/plasma-workspace-wallpapers
index c44ec306d..c44ec306d 100644
--- a/testing/source/vtown/kde/slack-desc/plasma-workspace-wallpapers
+++ b/source/kde/kde/slack-desc/plasma-workspace-wallpapers
diff --git a/testing/source/vtown/kde/slack-desc/polkit-kde-agent-1 b/source/kde/kde/slack-desc/polkit-kde-agent-1
index 0815eb3ae..0815eb3ae 100644
--- a/testing/source/vtown/kde/slack-desc/polkit-kde-agent-1
+++ b/source/kde/kde/slack-desc/polkit-kde-agent-1
diff --git a/testing/source/vtown/kde/slack-desc/powerdevil b/source/kde/kde/slack-desc/powerdevil
index 8bf8eefa2..8bf8eefa2 100644
--- a/testing/source/vtown/kde/slack-desc/powerdevil
+++ b/source/kde/kde/slack-desc/powerdevil
diff --git a/testing/source/vtown/kde/slack-desc/poxml b/source/kde/kde/slack-desc/poxml
index d3cc1f550..d3cc1f550 100644
--- a/testing/source/vtown/kde/slack-desc/poxml
+++ b/source/kde/kde/slack-desc/poxml
diff --git a/testing/source/vtown/kde/slack-desc/print-manager b/source/kde/kde/slack-desc/print-manager
index 35f044206..35f044206 100644
--- a/testing/source/vtown/kde/slack-desc/print-manager
+++ b/source/kde/kde/slack-desc/print-manager
diff --git a/testing/source/vtown/kde/slack-desc/prison b/source/kde/kde/slack-desc/prison
index 2a8b7722c..2a8b7722c 100644
--- a/testing/source/vtown/kde/slack-desc/prison
+++ b/source/kde/kde/slack-desc/prison
diff --git a/testing/source/vtown/kde/slack-desc/pulseaudio-qt b/source/kde/kde/slack-desc/pulseaudio-qt
index a367730a2..a367730a2 100644
--- a/testing/source/vtown/kde/slack-desc/pulseaudio-qt
+++ b/source/kde/kde/slack-desc/pulseaudio-qt
diff --git a/testing/source/vtown/kde/slack-desc/purpose b/source/kde/kde/slack-desc/purpose
index a285cf75d..a285cf75d 100644
--- a/testing/source/vtown/kde/slack-desc/purpose
+++ b/source/kde/kde/slack-desc/purpose
diff --git a/testing/source/vtown/kde/slack-desc/qqc2-desktop-style b/source/kde/kde/slack-desc/qqc2-desktop-style
index 4826a8996..4826a8996 100644
--- a/testing/source/vtown/kde/slack-desc/qqc2-desktop-style
+++ b/source/kde/kde/slack-desc/qqc2-desktop-style
diff --git a/testing/source/vtown/kde/slack-desc/rocs b/source/kde/kde/slack-desc/rocs
index 1be6d3104..1be6d3104 100644
--- a/testing/source/vtown/kde/slack-desc/rocs
+++ b/source/kde/kde/slack-desc/rocs
diff --git a/testing/source/vtown/kde/slack-desc/sddm b/source/kde/kde/slack-desc/sddm
index 7fa590b2a..7fa590b2a 100644
--- a/testing/source/vtown/kde/slack-desc/sddm
+++ b/source/kde/kde/slack-desc/sddm
diff --git a/testing/source/vtown/kde/slack-desc/sddm-kcm b/source/kde/kde/slack-desc/sddm-kcm
index cbd03d575..cbd03d575 100644
--- a/testing/source/vtown/kde/slack-desc/sddm-kcm
+++ b/source/kde/kde/slack-desc/sddm-kcm
diff --git a/testing/source/vtown/kde/slack-desc/signon-kwallet-extension b/source/kde/kde/slack-desc/signon-kwallet-extension
index 8d9417b91..8d9417b91 100644
--- a/testing/source/vtown/kde/slack-desc/signon-kwallet-extension
+++ b/source/kde/kde/slack-desc/signon-kwallet-extension
diff --git a/testing/source/vtown/kde/slack-desc/skanlite b/source/kde/kde/slack-desc/skanlite
index 8b0c4c132..8b0c4c132 100644
--- a/testing/source/vtown/kde/slack-desc/skanlite
+++ b/source/kde/kde/slack-desc/skanlite
diff --git a/testing/source/vtown/kde/slack-desc/solid b/source/kde/kde/slack-desc/solid
index ad17f337a..ad17f337a 100644
--- a/testing/source/vtown/kde/slack-desc/solid
+++ b/source/kde/kde/slack-desc/solid
diff --git a/testing/source/vtown/kde/slack-desc/sonnet b/source/kde/kde/slack-desc/sonnet
index 96547af37..96547af37 100644
--- a/testing/source/vtown/kde/slack-desc/sonnet
+++ b/source/kde/kde/slack-desc/sonnet
diff --git a/testing/source/vtown/kde/slack-desc/spectacle b/source/kde/kde/slack-desc/spectacle
index 2cd6ef1e7..2cd6ef1e7 100644
--- a/testing/source/vtown/kde/slack-desc/spectacle
+++ b/source/kde/kde/slack-desc/spectacle
diff --git a/testing/source/vtown/kde/slack-desc/step b/source/kde/kde/slack-desc/step
index 76d6c9c16..76d6c9c16 100644
--- a/testing/source/vtown/kde/slack-desc/step
+++ b/source/kde/kde/slack-desc/step
diff --git a/testing/source/vtown/kde/slack-desc/svgpart b/source/kde/kde/slack-desc/svgpart
index 134adc0f9..134adc0f9 100644
--- a/testing/source/vtown/kde/slack-desc/svgpart
+++ b/source/kde/kde/slack-desc/svgpart
diff --git a/testing/source/vtown/kde/slack-desc/sweeper b/source/kde/kde/slack-desc/sweeper
index d2984070d..d2984070d 100644
--- a/testing/source/vtown/kde/slack-desc/sweeper
+++ b/source/kde/kde/slack-desc/sweeper
diff --git a/testing/source/vtown/kde/slack-desc/syndication b/source/kde/kde/slack-desc/syndication
index 278b49b7a..278b49b7a 100644
--- a/testing/source/vtown/kde/slack-desc/syndication
+++ b/source/kde/kde/slack-desc/syndication
diff --git a/testing/source/vtown/kde/slack-desc/syntax-highlighting b/source/kde/kde/slack-desc/syntax-highlighting
index a330c3f3d..a330c3f3d 100644
--- a/testing/source/vtown/kde/slack-desc/syntax-highlighting
+++ b/source/kde/kde/slack-desc/syntax-highlighting
diff --git a/testing/source/vtown/kde/slack-desc/systemsettings b/source/kde/kde/slack-desc/systemsettings
index bfe212fe9..bfe212fe9 100644
--- a/testing/source/vtown/kde/slack-desc/systemsettings
+++ b/source/kde/kde/slack-desc/systemsettings
diff --git a/testing/source/vtown/kde/slack-desc/threadweaver b/source/kde/kde/slack-desc/threadweaver
index a8e9a2231..a8e9a2231 100644
--- a/testing/source/vtown/kde/slack-desc/threadweaver
+++ b/source/kde/kde/slack-desc/threadweaver
diff --git a/testing/source/vtown/kde/slack-desc/umbrello b/source/kde/kde/slack-desc/umbrello
index 94bde3f67..94bde3f67 100644
--- a/testing/source/vtown/kde/slack-desc/umbrello
+++ b/source/kde/kde/slack-desc/umbrello
diff --git a/testing/source/vtown/kde/slack-desc/user-manager b/source/kde/kde/slack-desc/user-manager
index 57a895a1c..57a895a1c 100644
--- a/testing/source/vtown/kde/slack-desc/user-manager
+++ b/source/kde/kde/slack-desc/user-manager
diff --git a/testing/source/vtown/kde/slack-desc/wacomtablet b/source/kde/kde/slack-desc/wacomtablet
index de9b11d5f..de9b11d5f 100644
--- a/testing/source/vtown/kde/slack-desc/wacomtablet
+++ b/source/kde/kde/slack-desc/wacomtablet
diff --git a/testing/source/vtown/kde/slack-desc/xdg-desktop-portal-kde b/source/kde/kde/slack-desc/xdg-desktop-portal-kde
index 8edffed7c..8edffed7c 100644
--- a/testing/source/vtown/kde/slack-desc/xdg-desktop-portal-kde
+++ b/source/kde/kde/slack-desc/xdg-desktop-portal-kde
diff --git a/testing/source/vtown/kde/slack-desc/yakuake b/source/kde/kde/slack-desc/yakuake
index c901c64e8..c901c64e8 100644
--- a/testing/source/vtown/kde/slack-desc/yakuake
+++ b/source/kde/kde/slack-desc/yakuake
diff --git a/testing/source/vtown/kde/slack-desc/zeroconf-ioslave b/source/kde/kde/slack-desc/zeroconf-ioslave
index 0a881c204..0a881c204 100644
--- a/testing/source/vtown/kde/slack-desc/zeroconf-ioslave
+++ b/source/kde/kde/slack-desc/zeroconf-ioslave
diff --git a/testing/source/vtown/kde/src/applications-extra/fetch-kjots.sh b/source/kde/kde/src/applications-extra/fetch-kjots.sh
index 2df1f14cd..2df1f14cd 100755
--- a/testing/source/vtown/kde/src/applications-extra/fetch-kjots.sh
+++ b/source/kde/kde/src/applications-extra/fetch-kjots.sh
diff --git a/testing/source/vtown/kde/src/applications-extra/fetch-krita.sh b/source/kde/kde/src/applications-extra/fetch-krita.sh
index 007205916..007205916 100755
--- a/testing/source/vtown/kde/src/applications-extra/fetch-krita.sh
+++ b/source/kde/kde/src/applications-extra/fetch-krita.sh
diff --git a/testing/source/vtown/kde/src/plasma-extra/fetch-wacomtablet.sh b/source/kde/kde/src/plasma-extra/fetch-wacomtablet.sh
index f75dbc505..f75dbc505 100755
--- a/testing/source/vtown/kde/src/plasma-extra/fetch-wacomtablet.sh
+++ b/source/kde/kde/src/plasma-extra/fetch-wacomtablet.sh
diff --git a/source/kde/make/pykde4 b/source/kde/make/pykde4
deleted file mode 100644
index da6be3feb..000000000
--- a/source/kde/make/pykde4
+++ /dev/null
@@ -1,11 +0,0 @@
-mkdir build-python3
-cd build-python3
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG || exit 1
-cd -
-
-mkdir build-python2
-cd build-python2
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG || exit 1
-cd -
diff --git a/source/kde/modularize b/source/kde/modularize
deleted file mode 100644
index 643d33431..000000000
--- a/source/kde/modularize
+++ /dev/null
@@ -1,268 +0,0 @@
-# If a package is listed here, it will be built apart from the
-# usual "grab bag" package that's made from each source directory.
-#
-# Things to note:
-#
-# Listing a package here will not cause it to be built.  To do that,
-# make sure it is added to one of the files in the modules/ directory
-# that is built by the main KDE.SlackBuild script.
-#
-# If a subpackage name happens to be the same as the "grab bag" package
-# that contains it, you need to be a bit careful.  Unless everything
-# in that collection will be built modular, *do not* list that name
-# here!  If you do, first the module by that name will be built, and
-# then everything that's not modular in that collection will be built
-# into a "grab bag" that will replace that first package.
-#
-# If the goal is to build the most combined packages possible, the
-# easiest way to accomplish that is just to move this file out of the
-# way and replace it with an empty one before building.
-
-# kdeaccessibility
-jovie
-kaccessible
-kmouth
-kmousetool
-kmag
-
-# kdelibs:
-kdelibs
-
-# kdebase:
-baloo
-baloo-widgets
-nepomuk-core
-nepomuk-widgets
-kfilemetadata
-kde-baseapps
-kactivities
-konsole
-kde-wallpapers
-kde-workspace
-kde-runtime
-kde-base-artwork
-
-# kdeedu:
-libkdeedu
-analitza
-artikulate
-blinken
-cantor
-kalgebra
-kalzium
-kanagram
-kbruch
-kgeography
-khangman
-kig
-kiten
-klettres
-kmplot
-kqtquickcharts
-kstars
-ktouch
-kturtle
-kwordquiz
-marble
-parley
-pairs
-rocs
-step
-
-# kdeadmin
-kcron
-ksystemlog
-kuser
-#kdeadmin
-
-# kdeartwork
-kdeartwork
-
-# kdegraphics:
-libkipi
-libkexiv2
-libkdcraw
-libksane
-okular
-kdegraphics-mobipocket
-kdegraphics-strigi-analyzer
-kdegraphics-thumbnailers
-gwenview
-kamera
-kcolorchooser
-kgamma
-kolourpaint
-kruler
-ksaneplugin
-ksnapshot
-svgpart
-
-# kdebindings
-smokegen
-smokeqt
-qtruby
-perlqt
-smokekde
-korundum
-perlkde
-pykde4
-kate
-kross-interpreters
-kimono
-qyoto
-
-# kdemultimedia
-libkcddb
-libkcompactdisc
-audiocd-kio
-dragon
-ffmpegthumbs
-mplayerthumbs
-juk
-kmix
-kscd
-
-# kdenetwork
-kdenetwork-filesharing
-kdenetwork-strigi-analyzers
-#kdnssd
-zeroconf-ioslave
-kget
-kopete
-kppp
-krdc
-krfb
-#kdenetwork
-
-# kdeutils
-ark
-filelight
-kcalc
-kcharselect
-kdf
-kfloppy
-kgpg
-#printer-applet
-print-manager
-kremotecontrol
-ktimer
-kwalletmanager
-superkaramba
-sweeper
-
-# kdegames
-libkdegames
-libkmahjongg
-klickety
-ksudoku
-ksquares
-kpat
-klines
-ksnakeduel
-kollision
-kshisen
-kblocks
-lskat
-kreversi
-bovo
-kajongg
-granatier
-kmines
-kiriki
-kigo
-bomber
-kolf
-kdiamond
-kbounce
-konquest
-kapman
-knavalbattle
-killbots
-kubrick
-kgoldrunner
-knetwalk
-kbreakout
-ksirk
-kfourinline
-picmi
-kblackbox
-palapeli
-katomic
-ktuberling
-kjumpingcube
-kmahjongg
-kspaceduel
-
-# kdewebdev
-kdewebdev
-
-# kdepim
-kdepim
-kdepim-runtime
-
-# kdepimlibs
-kdepimlibs
-
-# kdeplasma-addons
-kdeplasma-addons
-
-# kdesdk
-cervisia
-dolphin-plugins
-kapptemplate
-kcachegrind
-kde-dev-scripts
-kde-dev-utils
-kdesdk-kioslaves
-kdesdk-strigi-analyzers
-kdesdk-thumbnailers
-libkomparediff2
-kompare
-lokalize
-okteta
-poxml
-umbrello
-#kdesdk
-
-# kdetoys
-amor
-kteatime
-ktux
-#kdetoys
-
-# oxygen-icons
-oxygen-icons
-
-# polkit-kde
-polkit-kde-agent-1
-polkit-kde-kcmodules-1
-
-# extragear
-bluedevil
-k3b
-kaudiocreator
-kplayer
-kwebkitpart
-oxygen-gtk2
-kdevplatform
-kdevelop-pg-qt
-kdevelop
-kdev-python
-kdevelop-php
-kdevelop-php-docs
-#quanta
-wicd-kde
-libmm-qt
-libnm-qt
-plasma-nm
-skanlite
-kio-mtp
-libktorrent
-ktorrent
-amarok
-calligra
-libkscreen
-kscreen
-partitionmanager
-kdeconnect-kde
-
diff --git a/source/kde/modules/extragear b/source/kde/modules/extragear
deleted file mode 100644
index 93fc0fb76..000000000
--- a/source/kde/modules/extragear
+++ /dev/null
@@ -1,27 +0,0 @@
-bluedevil
-kaudiocreator
-kplayer
-kwebkitpart
-oxygen-gtk2
-kdevplatform
-kdevelop-pg-qt
-kdevelop
-kdev-python
-kdevelop-php
-kdevelop-php-docs
-wicd-kde
-libmm-qt
-libnm-qt
-plasma-nm
-skanlite
-kio-mtp
-libktorrent
-ktorrent
-amarok
-calligra
-libkscreen
-kscreen
-kdeconnect-kde
-partitionmanager
-k3b
-
diff --git a/source/kde/modules/kdeaccessibility b/source/kde/modules/kdeaccessibility
deleted file mode 100644
index c8cda11c7..000000000
--- a/source/kde/modules/kdeaccessibility
+++ /dev/null
@@ -1,6 +0,0 @@
-#kdeaccessibility
-#jovie
-kaccessible
-kmouth
-kmousetool
-kmag
diff --git a/source/kde/modules/kdeadmin b/source/kde/modules/kdeadmin
deleted file mode 100644
index f5f2bd117..000000000
--- a/source/kde/modules/kdeadmin
+++ /dev/null
@@ -1,4 +0,0 @@
-kcron
-ksystemlog
-kuser
-#kdeadmin
diff --git a/source/kde/modules/kdeartwork b/source/kde/modules/kdeartwork
deleted file mode 100644
index e0f2432c4..000000000
--- a/source/kde/modules/kdeartwork
+++ /dev/null
@@ -1 +0,0 @@
-kdeartwork
diff --git a/source/kde/modules/kdebase b/source/kde/modules/kdebase
deleted file mode 100644
index f8202b943..000000000
--- a/source/kde/modules/kdebase
+++ /dev/null
@@ -1,12 +0,0 @@
-kfilemetadata
-baloo
-baloo-widgets
-nepomuk-core
-nepomuk-widgets
-kde-baseapps
-kactivities
-konsole
-kde-wallpapers
-kde-workspace
-kde-runtime
-kde-base-artwork
diff --git a/source/kde/modules/kdebindings b/source/kde/modules/kdebindings
deleted file mode 100644
index 5508c00e8..000000000
--- a/source/kde/modules/kdebindings
+++ /dev/null
@@ -1,12 +0,0 @@
-smokegen
-smokeqt
-qtruby
-perlqt
-smokekde
-korundum
-perlkde
-pykde4
-kate
-kross-interpreters
-#kimono
-#qyoto
diff --git a/source/kde/modules/kdeedu b/source/kde/modules/kdeedu
deleted file mode 100644
index 62888ad5d..000000000
--- a/source/kde/modules/kdeedu
+++ /dev/null
@@ -1,25 +0,0 @@
-libkdeedu
-analitza
-artikulate
-blinken
-cantor
-kalgebra
-kalzium
-kanagram
-kbruch
-kgeography
-khangman
-kig
-kiten
-klettres
-kmplot
-kstars
-kqtquickcharts
-ktouch
-kturtle
-kwordquiz
-marble
-parley
-pairs
-rocs
-step
diff --git a/source/kde/modules/kdegames b/source/kde/modules/kdegames
deleted file mode 100644
index eb3133b5c..000000000
--- a/source/kde/modules/kdegames
+++ /dev/null
@@ -1,41 +0,0 @@
-libkdegames
-libkmahjongg
-klickety
-ksudoku
-ksquares
-kpat
-klines
-ksnakeduel
-kollision
-kshisen
-kblocks
-lskat
-kreversi
-bovo
-kajongg
-granatier
-kmines
-kiriki
-kigo
-bomber
-kolf
-kdiamond
-kbounce
-konquest
-kapman
-knavalbattle
-killbots
-kubrick
-kgoldrunner
-knetwalk
-kbreakout
-ksirk
-kfourinline
-picmi
-kblackbox
-palapeli
-katomic
-ktuberling
-kjumpingcube
-kmahjongg
-kspaceduel
diff --git a/source/kde/modules/kdegraphics b/source/kde/modules/kdegraphics
deleted file mode 100644
index 88ee13c77..000000000
--- a/source/kde/modules/kdegraphics
+++ /dev/null
@@ -1,17 +0,0 @@
-libkipi
-libkexiv2
-libkdcraw
-libksane
-kdegraphics-mobipocket
-okular
-kdegraphics-strigi-analyzer
-kdegraphics-thumbnailers
-gwenview
-kamera
-kcolorchooser
-kgamma
-kolourpaint
-kruler
-ksaneplugin
-ksnapshot
-svgpart
diff --git a/source/kde/modules/kdelibs b/source/kde/modules/kdelibs
deleted file mode 100644
index 473159785..000000000
--- a/source/kde/modules/kdelibs
+++ /dev/null
@@ -1 +0,0 @@
-kdelibs
diff --git a/source/kde/modules/kdemultimedia b/source/kde/modules/kdemultimedia
deleted file mode 100644
index a78827b15..000000000
--- a/source/kde/modules/kdemultimedia
+++ /dev/null
@@ -1,9 +0,0 @@
-libkcddb
-libkcompactdisc
-audiocd-kio
-dragon
-#ffmpegthumbs
-mplayerthumbs
-juk
-kmix
-#kscd
diff --git a/source/kde/modules/kdenetwork b/source/kde/modules/kdenetwork
deleted file mode 100644
index 0347fa6cc..000000000
--- a/source/kde/modules/kdenetwork
+++ /dev/null
@@ -1,10 +0,0 @@
-kdenetwork-filesharing
-kdenetwork-strigi-analyzers
-#kdnssd
-zeroconf-ioslave
-kget
-kopete
-kppp
-krdc
-krfb
-#kdenetwork
diff --git a/source/kde/modules/kdepim b/source/kde/modules/kdepim
deleted file mode 100644
index 6594afb02..000000000
--- a/source/kde/modules/kdepim
+++ /dev/null
@@ -1,2 +0,0 @@
-kdepim
-kdepim-runtime
diff --git a/source/kde/modules/kdepimlibs b/source/kde/modules/kdepimlibs
deleted file mode 100644
index d3deaebde..000000000
--- a/source/kde/modules/kdepimlibs
+++ /dev/null
@@ -1 +0,0 @@
-kdepimlibs
diff --git a/source/kde/modules/kdeplasma-addons b/source/kde/modules/kdeplasma-addons
deleted file mode 100644
index cf9d5ea23..000000000
--- a/source/kde/modules/kdeplasma-addons
+++ /dev/null
@@ -1 +0,0 @@
-kdeplasma-addons
diff --git a/source/kde/modules/kdesdk b/source/kde/modules/kdesdk
deleted file mode 100644
index 353102da9..000000000
--- a/source/kde/modules/kdesdk
+++ /dev/null
@@ -1,16 +0,0 @@
-cervisia
-dolphin-plugins
-kapptemplate
-kcachegrind
-kde-dev-scripts
-kde-dev-utils
-kdesdk-kioslaves
-kdesdk-strigi-analyzers
-kdesdk-thumbnailers
-libkomparediff2
-kompare
-lokalize
-okteta
-poxml
-umbrello
-#kdesdk
diff --git a/source/kde/modules/kdetoys b/source/kde/modules/kdetoys
deleted file mode 100644
index f06f3e775..000000000
--- a/source/kde/modules/kdetoys
+++ /dev/null
@@ -1,4 +0,0 @@
-amor
-kteatime
-ktux
-#kdetoys
diff --git a/source/kde/modules/kdeutils b/source/kde/modules/kdeutils
deleted file mode 100644
index 9bdf3eb97..000000000
--- a/source/kde/modules/kdeutils
+++ /dev/null
@@ -1,15 +0,0 @@
-#kdeutils
-ark
-filelight
-kcalc
-kcharselect
-kdf
-kfloppy
-kgpg
-#printer-applet
-print-manager
-kremotecontrol
-ktimer
-kwalletmanager
-superkaramba
-sweeper
diff --git a/source/kde/modules/kdewebdev b/source/kde/modules/kdewebdev
deleted file mode 100644
index 2be324dc4..000000000
--- a/source/kde/modules/kdewebdev
+++ /dev/null
@@ -1 +0,0 @@
-kdewebdev
diff --git a/source/kde/modules/oxygen-icons b/source/kde/modules/oxygen-icons
deleted file mode 100644
index 825251928..000000000
--- a/source/kde/modules/oxygen-icons
+++ /dev/null
@@ -1 +0,0 @@
-oxygen-icons
diff --git a/source/kde/modules/polkit-kde b/source/kde/modules/polkit-kde
deleted file mode 100644
index 9c1e64717..000000000
--- a/source/kde/modules/polkit-kde
+++ /dev/null
@@ -1,2 +0,0 @@
-polkit-kde-agent-1
-polkit-kde-kcmodules-1
diff --git a/source/kde/noarch b/source/kde/noarch
deleted file mode 100644
index 0c1318f12..000000000
--- a/source/kde/noarch
+++ /dev/null
@@ -1,5 +0,0 @@
-# List packages with an $ARCH of "noarch" (i.e. packages
-# that contain no binaries) here:
-
-kde-wallpapers
-
diff --git a/source/kde/package-blacklist b/source/kde/package-blacklist
deleted file mode 100644
index 71e99c40c..000000000
--- a/source/kde/package-blacklist
+++ /dev/null
@@ -1,9 +0,0 @@
-# Enter packages to skip (perhaps because they aren't used on
-# this platform) below.  Just the package name -- no version
-# number is needed.
-
-## kdebindings:
-# needs c-sharp:
-kimono
-qyoto
-
diff --git a/source/kde/patch/calligra.patch b/source/kde/patch/calligra.patch
deleted file mode 100644
index e9e6cfd71..000000000
--- a/source/kde/patch/calligra.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Fix build with mariadb 10.2+:
-zcat $CWD/patch/calligra/calligra.mariadb.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Patch for boost 1.65.0+:
-zcat $CWD/patch/calligra/boost-1.65.0.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Fedora patches, mostly backports to fix a Calligra Plan crash:
-zcat $CWD/patch/calligra/0001-adapt-to-libwps-0.4.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/calligra/0065-Backport-Plan-Fix-crash-due-to-accessing-deleted-obj.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/calligra/0066-Backport-Plan-Do-not-crash-if-scheduler-plugins-not-.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/calligra/0067-Backport-Plan-Fix-insert-file.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/calligra/0068-Backport-Plan-Fix-task-module-load-and-save.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/calligra/0069-Backport-Plan-Avoid-crash-in-special-cases.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/calligra/0070-Plan-Guard-against-trying-to-move-a-task-into-the-sa.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/calligra/calligra-2.9.11-gcc6_arm.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/calligra/0001-adapt-to-libwps-0.4.patch b/source/kde/patch/calligra/0001-adapt-to-libwps-0.4.patch
deleted file mode 100644
index b4494b3ea..000000000
--- a/source/kde/patch/calligra/0001-adapt-to-libwps-0.4.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e81fe84405bc635dfa93e54fb8a3c8e6065dbf10 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 6 Jun 2015 18:27:24 +0200
-Subject: [PATCH] adapt to libwps 0.4
-
----
- cmake/modules/FindLibWps.cmake           | 6 +++---
- filters/words/works/import/WPSImport.cpp | 4 +++-
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake
-index f8c8225..58ef2b5 100644
---- a/cmake/modules/FindLibWps.cmake
-+++ b/cmake/modules/FindLibWps.cmake
-@@ -10,16 +10,16 @@
- 
- include(LibFindMacros)
- libfind_package(LIBWPS LibWpd)
--libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
-+libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4)
- 
- find_path(LIBWPS_INCLUDE_DIR
-     NAMES libwps/libwps.h
-     HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libwps-0.3
-+    PATH_SUFFIXES libwps-0.4
- )
- 
- find_library(LIBWPS_LIBRARY
--    NAMES wps wps-0.3
-+    NAMES wps wps-0.4
-     HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
- )
- 
-diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp
-index eea2cc9..94b859d 100644
---- a/filters/words/works/import/WPSImport.cpp
-+++ b/filters/words/works/import/WPSImport.cpp
-@@ -91,7 +91,9 @@ public:
-     bool isSupportedFormat(librevenge::RVNGInputStream &input)
-     {
-         WPSKind kind = WPS_TEXT;
--        WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind);
-+        WPSCreator creator = WPS_MSWORKS;
-+        bool needsEncoding = false;
-+        WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding);
-         if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT)
-             return false;
-         return true;
--- 
-2.4.2
-
diff --git a/source/kde/patch/calligra/0065-Backport-Plan-Fix-crash-due-to-accessing-deleted-obj.patch b/source/kde/patch/calligra/0065-Backport-Plan-Fix-crash-due-to-accessing-deleted-obj.patch
deleted file mode 100644
index b3f38d475..000000000
--- a/source/kde/patch/calligra/0065-Backport-Plan-Fix-crash-due-to-accessing-deleted-obj.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7c64caec3022b28775ea85864eef47bf2ac51066 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Mon, 22 Aug 2016 08:49:13 +0200
-Subject: [PATCH 65/80] Backport: Plan: Fix crash due to accessing deleted
- object
-
-KReportDesigner takes ownership of reportdata, so give it a clone it can delete
----
- plan/libs/ui/reports/reportview.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plan/libs/ui/reports/reportview.cpp b/plan/libs/ui/reports/reportview.cpp
-index 462a31d..8552790 100644
---- a/plan/libs/ui/reports/reportview.cpp
-+++ b/plan/libs/ui/reports/reportview.cpp
-@@ -1250,10 +1250,10 @@ void ReportDesigner::createDockers()
- 
- void ReportDesigner::setReportData( const QString &tag )
- {
--
-+    emit optionsModified();
-     ReportData *rd = Report::findReportData( m_reportdatamodels, tag );
--    if ( rd != m_designer->reportData() ) {
--        emit optionsModified();
-+    if ( rd ) {
-+        rd = rd->clone(); // KReportDesigner takes ownership, so give it a clone it can delete
-     }
-     m_designer->setReportData( rd );
- 
--- 
-2.7.4
-
diff --git a/source/kde/patch/calligra/0066-Backport-Plan-Do-not-crash-if-scheduler-plugins-not-.patch b/source/kde/patch/calligra/0066-Backport-Plan-Do-not-crash-if-scheduler-plugins-not-.patch
deleted file mode 100644
index efbd9ac8f..000000000
--- a/source/kde/patch/calligra/0066-Backport-Plan-Do-not-crash-if-scheduler-plugins-not-.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 4d9762cd151b7d6a208aece8cebcdbe09bd41703 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Mon, 22 Aug 2016 09:15:32 +0200
-Subject: [PATCH 66/80] Backport: Plan: Do not crash if scheduler plugins not
- found
-
-Shouldn't happen atm, but...
----
- plan/libs/models/kptschedulemodel.cpp | 69 ++++++++++++++++++++++-------------
- 1 file changed, 43 insertions(+), 26 deletions(-)
-
-diff --git a/plan/libs/models/kptschedulemodel.cpp b/plan/libs/models/kptschedulemodel.cpp
-index 35b74bc..e3ce298 100644
---- a/plan/libs/models/kptschedulemodel.cpp
-+++ b/plan/libs/models/kptschedulemodel.cpp
-@@ -252,9 +252,16 @@ Qt::ItemFlags ScheduleItemModel::flags( const QModelIndex &index ) const
-     if ( !m_readWrite  ) {
-         return flags &= ~Qt::ItemIsEditable;
-     }
--    flags &= ~Qt::ItemIsEditable;
-     ScheduleManager *sm = manager( index );
--    int capabilities = sm->schedulerPlugin()->capabilities();
-+    if ( sm == 0 ) {
-+        return flags;
-+    }
-+    SchedulerPlugin *pl = sm->schedulerPlugin();
-+    if ( pl == 0 ) {
-+        return flags;
-+    }
-+    int capabilities = pl->capabilities();
-+    flags &= ~Qt::ItemIsEditable;
-     if ( sm && ! sm->isBaselined() ) {
-         switch ( index.column() ) {
-             case ScheduleModel::ScheduleState: break;
-@@ -452,7 +459,11 @@ QVariant ScheduleItemModel::allowOverbooking( const QModelIndex &index, int role
-     if ( sm == 0 ) {
-         return QVariant();
-     }
--    int capabilities = sm->schedulerPlugin()->capabilities();
-+    SchedulerPlugin *pl = sm->schedulerPlugin();
-+    if ( pl == 0 ) {
-+        return QVariant();
-+    }
-+    int capabilities = pl->capabilities();
-     switch ( role ) {
-         case Qt::EditRole:
-             return sm->allowOverbooking();
-@@ -480,11 +491,11 @@ QVariant ScheduleItemModel::allowOverbooking( const QModelIndex &index, int role
-             if ( capabilities & SchedulerPlugin::AllowOverbooking ) {
-                 return sm->allowOverbooking()
-                             ? i18nc( "@info:tooltip", "Allow overbooking of resources" )
--                            : i18nc( "@info:tooltip 1=scheduler name", "%1 always allows overbooking of resources", sm->schedulerPlugin()->name() );
-+                            : i18nc( "@info:tooltip 1=scheduler name", "%1 always allows overbooking of resources", pl->name() );
-             }
-             if ( capabilities & SchedulerPlugin::AvoidOverbooking ) {
-                 return sm->allowOverbooking()
--                            ? i18nc( "@info:tooltip 1=scheduler name", "%1 always avoids overbooking of resources", sm->schedulerPlugin()->name() )
-+                            ? i18nc( "@info:tooltip 1=scheduler name", "%1 always avoids overbooking of resources", pl->name() )
-                             : i18nc( "@info:tooltip", "Avoid overbooking resources" );
-             }
-             break;
-@@ -637,7 +648,11 @@ QVariant ScheduleItemModel::schedulingDirection( const QModelIndex &index, int r
-     if ( sm == 0 ) {
-         return QVariant();
-     }
--    int capabilities = sm->schedulerPlugin()->capabilities();
-+    SchedulerPlugin *pl = sm->schedulerPlugin();
-+    if ( pl == 0 ) {
-+        return QVariant();
-+    }
-+    int capabilities = pl->capabilities();
-     switch ( role ) {
-         case Qt::EditRole:
-             return sm->schedulingDirection();
-@@ -664,13 +679,13 @@ QVariant ScheduleItemModel::schedulingDirection( const QModelIndex &index, int r
-             }
-             if ( capabilities & SchedulerPlugin::ScheduleForward ) {
-                 return sm->schedulingDirection()
--                            ? i18nc( "@info:tooltip 1=scheduler name", "%1 always schedules from target start time", sm->schedulerPlugin()->name() )
-+                            ? i18nc( "@info:tooltip 1=scheduler name", "%1 always schedules from target start time", pl->name() )
-                             : i18nc( "@info:tooltip", "Schedule project from target start time" );
-             }
-             if ( capabilities & SchedulerPlugin::ScheduleBackward ) {
-                 return sm->schedulingDirection()
-                             ? i18nc( "@info:tooltip", "Schedule project from target end time" )
--                            : i18nc( "@info:tooltip 1=scheduler name", "%1 always schedules from target end time", sm->schedulerPlugin()->name() );
-+                            : i18nc( "@info:tooltip 1=scheduler name", "%1 always schedules from target end time", pl->name() );
-             }
-             break;
-         case Role::EnumList:
-@@ -708,24 +723,26 @@ QVariant ScheduleItemModel::scheduler( const QModelIndex &index, int role ) cons
-         return QVariant();
-     }
-     SchedulerPlugin *pl = sm->schedulerPlugin();
--    switch ( role ) {
--        case Qt::EditRole:
--            return sm->schedulerPluginId();
--        case Qt::DisplayRole:
--            return pl ? pl->name() : i18n( "Unknown" );
--        case Qt::ToolTipRole:
--            return pl ? pl->comment() : QString();
--        case Role::EnumList:
--            return sm->schedulerPluginNames();
--        case Role::EnumListValue:
--            return sm->schedulerPluginIndex();
--        case Qt::TextAlignmentRole:
--            return Qt::AlignCenter;
--        case Qt::StatusTipRole:
--            return QVariant();
--        case Qt::WhatsThisRole: {
--            QString s = pl->description();
--            return s.isEmpty() ? QVariant() : QVariant( s );
-+    if ( pl ) {
-+        switch ( role ) {
-+            case Qt::EditRole:
-+                return sm->schedulerPluginId();
-+            case Qt::DisplayRole:
-+                return pl ? pl->name() : i18n( "Unknown" );
-+            case Qt::ToolTipRole:
-+                return pl ? pl->comment() : QString();
-+            case Role::EnumList:
-+                return sm->schedulerPluginNames();
-+            case Role::EnumListValue:
-+                return sm->schedulerPluginIndex();
-+            case Qt::TextAlignmentRole:
-+                return Qt::AlignCenter;
-+            case Qt::StatusTipRole:
-+                return QVariant();
-+            case Qt::WhatsThisRole: {
-+                QString s = pl->description();
-+                return s.isEmpty() ? QVariant() : QVariant( s );
-+            }
-         }
-     }
-     return QVariant();
--- 
-2.7.4
-
diff --git a/source/kde/patch/calligra/0067-Backport-Plan-Fix-insert-file.patch b/source/kde/patch/calligra/0067-Backport-Plan-Fix-insert-file.patch
deleted file mode 100644
index 4db4becc1..000000000
--- a/source/kde/patch/calligra/0067-Backport-Plan-Fix-insert-file.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 5cffbe5ecf1f82369abbad1a06154368459f7845 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Mon, 22 Aug 2016 09:20:32 +0200
-Subject: [PATCH 67/80] Backport: Plan: Fix insert file
-
-Use KUrl instead of QString for filename
-KoDocument::openUrl() opens the url (not KoPart)
----
- plan/kptmaindocument.cpp | 23 ++++++++++-------------
- plan/kptmaindocument.h   |  4 ++--
- plan/kptview.cpp         |  2 +-
- 3 files changed, 13 insertions(+), 16 deletions(-)
-
-diff --git a/plan/kptmaindocument.cpp b/plan/kptmaindocument.cpp
-index 2343471..e418972 100644
---- a/plan/kptmaindocument.cpp
-+++ b/plan/kptmaindocument.cpp
-@@ -947,35 +947,32 @@ bool MainDocument::loadAndParse(KoStore *store, const QString &filename, KoXmlDo
-     return true;
- }
- 
--void MainDocument::insertFile( const QString &filename, Node *parent, Node *after )
-+void MainDocument::insertFile( const KUrl &url, Node *parent, Node *after )
- {
-     Part *part = new Part( this );
-     MainDocument *doc = new MainDocument( part );
-     part->setDocument( doc );
-     doc->disconnect(); // doc shall not handle feedback from openUrl()
-     doc->setAutoSave( 0 ); //disable
--    doc->m_insertFileInfo.url = filename;
-+    doc->m_insertFileInfo.url = url;
-     doc->m_insertFileInfo.parent = parent;
-     doc->m_insertFileInfo.after = after;
-     connect(doc, SIGNAL(completed()), SLOT(insertFileCompleted()));
-     connect(doc, SIGNAL(canceled(QString)), SLOT(insertFileCancelled(QString)));
- 
--    doc->openUrl( KUrl( filename ) );
-+    doc->openUrl( url );
- }
- 
- void MainDocument::insertFileCompleted()
- {
-     kDebug(planDbg())<<sender();
--    Part *part = qobject_cast<Part*>( sender() );
--    if ( part ) {
--        MainDocument *doc = qobject_cast<MainDocument*>( part->document() );
--        if ( doc ) {
--            Project &p = doc->getProject();
--            insertProject( p, doc->m_insertFileInfo.parent, doc->m_insertFileInfo.after );
--        } else {
--            KMessageBox::error( 0, i18n("Internal error, failed to insert file.") );
--        }
--        part->deleteLater(); // also deletes document
-+    MainDocument *doc = qobject_cast<MainDocument*>( sender() );
-+    if ( doc ) {
-+        Project &p = doc->getProject();
-+        insertProject( p, doc->m_insertFileInfo.parent, doc->m_insertFileInfo.after );
-+        doc->documentPart()->deleteLater(); // also deletes document
-+    } else {
-+        KMessageBox::error( 0, i18n("Internal error, failed to insert file.") );
-     }
- }
- 
-diff --git a/plan/kptmaindocument.h b/plan/kptmaindocument.h
-index 5ead4ea..c467e1f 100644
---- a/plan/kptmaindocument.h
-+++ b/plan/kptmaindocument.h
-@@ -117,7 +117,7 @@ public:
-     Package *loadWorkPackageXML( Project& project, QIODevice*, const KoXmlDocument& document, const KUrl& url );
-     QMap<KDateTime, Package*> workPackages() const { return m_workpackages; }
- 
--    void insertFile( const QString &filename, Node *parent, Node *after = 0 );
-+    void insertFile( const KUrl &url, Node *parent, Node *after = 0 );
-     bool insertProject( Project &project, Node *parent, Node *after );
- 
-     KPlatoAboutPage &aboutPage() { return m_aboutPage; }
-@@ -165,7 +165,7 @@ protected:
- 
-     // used by insert file
-     struct InsertFileInfo {
--        QString url;
-+        KUrl url;
-         Node *parent;
-         Node *after;
-     } m_insertFileInfo;
-diff --git a/plan/kptview.cpp b/plan/kptview.cpp
-index 6876c3e..b38d8b6 100644
---- a/plan/kptview.cpp
-+++ b/plan/kptview.cpp
-@@ -1452,7 +1452,7 @@ void View::slotInsertFileFinished( int result )
-         return;
-     }
-     if ( result == QDialog::Accepted ) {
--        getPart()->insertFile( dlg->url().url(), dlg->parentNode(), dlg->afterNode() );
-+        getPart()->insertFile( dlg->url(), dlg->parentNode(), dlg->afterNode() );
-     }
-     dlg->deleteLater();
- }
--- 
-2.7.4
-
diff --git a/source/kde/patch/calligra/0068-Backport-Plan-Fix-task-module-load-and-save.patch b/source/kde/patch/calligra/0068-Backport-Plan-Fix-task-module-load-and-save.patch
deleted file mode 100644
index ca6ae1924..000000000
--- a/source/kde/patch/calligra/0068-Backport-Plan-Fix-task-module-load-and-save.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From fd5b8dca68d0a418aac926fe60814ebe537ee032 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Mon, 22 Aug 2016 10:00:52 +0200
-Subject: [PATCH 68/80] Backport: Plan: Fix task module load and save
-
-Workaround: saveTaskModules destroys project
----
- plan/kptview.cpp                      | 19 ++++++++++++-------
- plan/libs/models/kptnodeitemmodel.cpp |  6 +++++-
- 2 files changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/plan/kptview.cpp b/plan/kptview.cpp
-index b38d8b6..af606f6 100644
---- a/plan/kptview.cpp
-+++ b/plan/kptview.cpp
-@@ -114,6 +114,7 @@
- #include "kptviewlistdocker.h"
- #include "kptviewlist.h"
- #include "kptschedulesdocker.h"
-+#include "kptpart.h"
- #include "kptdebug.h"
- 
- #include "plansettings.h"
-@@ -3033,13 +3034,17 @@ void View::saveTaskModule( const KUrl &url, Project *project )
-     QString dir = Factory::global().dirs()->saveLocation( "plan_taskmodules" );
-     kDebug(planDbg())<<"dir="<<dir;
-     if ( ! dir.isEmpty() ) {
--        MainDocument part(getKoPart());
--        part.insertProject( *project, 0, 0 );
--        part.getProject().setName( project->name() );
--        part.getProject().setLeader( project->leader() );
--        part.getProject().setDescription( project->description() );
--        part.saveNativeFormat( dir + url.fileName() );
--        kDebug(planDbg())<<dir + url.fileName();
-+        Part *part = new Part( this );
-+        MainDocument *doc = new MainDocument( part );
-+        part->setDocument( doc );
-+        doc->disconnect(); // doc shall not handle feedback from openUrl()
-+        doc->setAutoSave( 0 ); //disable
-+        doc->insertProject( *project, 0, 0 );
-+        doc->getProject().setName( project->name() );
-+        doc->getProject().setLeader( project->leader() );
-+        doc->getProject().setDescription( project->description() );
-+        doc->saveNativeFormat( dir + url.fileName() );
-+        part->deleteLater(); // also deletes document
-     } else {
-         kDebug(planDbg())<<"Could not find a location";
-     }
-diff --git a/plan/libs/models/kptnodeitemmodel.cpp b/plan/libs/models/kptnodeitemmodel.cpp
-index 834e45a..45b1650 100644
---- a/plan/libs/models/kptnodeitemmodel.cpp
-+++ b/plan/libs/models/kptnodeitemmodel.cpp
-@@ -4990,7 +4990,11 @@ bool TaskModuleModel::importProject( const KUrl &url, bool emitsignal )
-         stripProject( project );
-         addTaskModule( project );
-         if ( emitsignal ) {
--            emit saveTaskModule( url, project );
-+            // FIXME: save modifies the project, so give it a copy (see kptview.cpp)
-+            Project p;
-+            status.setProject( &p );
-+            p.load( element, status );
-+            emit saveTaskModule( url, &p );
-         }
-     } else {
-         kDebug(planDbg())<<"Failed to load project from:"<<url;
--- 
-2.7.4
-
diff --git a/source/kde/patch/calligra/0069-Backport-Plan-Avoid-crash-in-special-cases.patch b/source/kde/patch/calligra/0069-Backport-Plan-Avoid-crash-in-special-cases.patch
deleted file mode 100644
index 75ec66b50..000000000
--- a/source/kde/patch/calligra/0069-Backport-Plan-Avoid-crash-in-special-cases.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-From b25d46bf9fa6d5b9ff34115edb4719592c191935 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Tue, 23 Aug 2016 08:01:58 +0200
-Subject: [PATCH 69/80] Backport: Plan: Avoid crash in special cases
-
-Sometimes (eg. when New is pressed) the Project can be deleted before models
-and thus cause a crash.
-Added a Project::aboutToBeDeleted signal so models can adjust.
-
-BUG: 346976
-FIXED_IN: 2.9.12
----
- plan/libs/kernel/kptproject.cpp                   |  1 +
- plan/libs/kernel/kptproject.h                     |  2 ++
- plan/libs/models/kptaccountsmodel.cpp             |  2 ++
- plan/libs/models/kptcalendarmodel.cpp             |  4 ++++
- plan/libs/models/kptitemmodelbase.cpp             |  5 +++++
- plan/libs/models/kptitemmodelbase.h               |  1 +
- plan/libs/models/kptnodechartmodel.cpp            |  2 ++
- plan/libs/models/kptnodeitemmodel.cpp             |  4 ++++
- plan/libs/models/kptpertcpmmodel.cpp              |  4 ++++
- plan/libs/models/kptrelationmodel.cpp             |  2 ++
- plan/libs/models/kptresourceallocationmodel.cpp   |  2 ++
- plan/libs/models/kptresourceappointmentsmodel.cpp |  8 ++++++++
- plan/libs/models/kptresourcemodel.cpp             | 12 +++++++-----
- plan/libs/models/kptschedulemodel.cpp             | 13 +++++++++++++
- plan/libs/models/kptschedulemodel.h               |  2 ++
- plan/libs/models/kpttaskstatusmodel.cpp           |  2 ++
- 16 files changed, 61 insertions(+), 5 deletions(-)
-
-diff --git a/plan/libs/kernel/kptproject.cpp b/plan/libs/kernel/kptproject.cpp
-index 158040b..451e897 100644
---- a/plan/libs/kernel/kptproject.cpp
-+++ b/plan/libs/kernel/kptproject.cpp
-@@ -89,6 +89,7 @@ void Project::deref()
-     --m_refCount;
-     Q_ASSERT( m_refCount >= 0 );
-     if ( m_refCount <= 0 ) {
-+        emit aboutToBeDeleted();
-         deleteLater();
-     }
- }
-diff --git a/plan/libs/kernel/kptproject.h b/plan/libs/kernel/kptproject.h
-index 1dbea7d..db18d36 100644
---- a/plan/libs/kernel/kptproject.h
-+++ b/plan/libs/kernel/kptproject.h
-@@ -519,6 +519,8 @@ public Q_SLOTS:
-     void setMaxProgress( int max, ScheduleManager *sm = 0 );
- 
- Q_SIGNALS:
-+    /// Emitted when the project is about to be deleted (The destroyed signal is disabled)
-+    void aboutToBeDeleted();
-     /// Emitted when anything in the project is changed (use with care)
-     void projectChanged();
-     /// Emitted when the WBS code definition has changed. This may change all nodes.
-diff --git a/plan/libs/models/kptaccountsmodel.cpp b/plan/libs/models/kptaccountsmodel.cpp
-index 53f725a..4657979 100644
---- a/plan/libs/models/kptaccountsmodel.cpp
-+++ b/plan/libs/models/kptaccountsmodel.cpp
-@@ -533,6 +533,7 @@ void CostBreakdownItemModel::setProject( Project *project )
-         disconnect( acc, SIGNAL(accountRemoved(const Account*)), this, SLOT(slotAccountRemoved(const Account*)) );
-         disconnect( acc, SIGNAL(accountToBeRemoved(const Account*)), this, SLOT(slotAccountToBeRemoved(const Account*)) );
- 
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project , SIGNAL(nodeChanged(Node*)), this, SLOT(slotDataChanged()) );
-         disconnect( m_project , SIGNAL(nodeAdded(Node*)), this, SLOT(slotDataChanged()) );
-         disconnect( m_project , SIGNAL(nodeRemoved(Node*)), this, SLOT(slotDataChanged()) );
-@@ -553,6 +554,7 @@ void CostBreakdownItemModel::setProject( Project *project )
-         connect( acc, SIGNAL(accountRemoved(const Account*)), this, SLOT(slotAccountRemoved(const Account*)) );
-         connect( acc, SIGNAL(accountToBeRemoved(const Account*)), this, SLOT(slotAccountToBeRemoved(const Account*)) );
- 
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project , SIGNAL(nodeChanged(Node*)), this, SLOT(slotDataChanged()) );
-         connect( m_project , SIGNAL(nodeAdded(Node*)), this, SLOT(slotDataChanged()) );
-         connect( m_project , SIGNAL(nodeRemoved(Node*)), this, SLOT(slotDataChanged()) );
-diff --git a/plan/libs/models/kptcalendarmodel.cpp b/plan/libs/models/kptcalendarmodel.cpp
-index 6c0f017..401379c 100644
---- a/plan/libs/models/kptcalendarmodel.cpp
-+++ b/plan/libs/models/kptcalendarmodel.cpp
-@@ -74,10 +74,12 @@ void CalendarDayItemModelBase::setProject( Project *project )
- {
-     setCalendar( 0 );
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(calendarToBeRemoved(const Calendar*)), this, SLOT(slotCalendarToBeRemoved(const Calendar*)) );
-     }
-     m_project = project;
-     if ( project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(calendarToBeRemoved(const Calendar*)), this, SLOT(slotCalendarToBeRemoved(const Calendar*)) );
-     }
-     reset();
-@@ -136,6 +138,7 @@ void CalendarItemModel::slotCalendarRemoved( const Calendar * )
- void CalendarItemModel::setProject( Project *project )
- {
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project , SIGNAL(calendarChanged(Calendar*)), this, SLOT(slotCalendarChanged(Calendar*)) );
- 
-         disconnect( m_project, SIGNAL(calendarAdded(const Calendar*)), this, SLOT(slotCalendarInserted(const Calendar*)) );
-@@ -146,6 +149,7 @@ void CalendarItemModel::setProject( Project *project )
-     }
-     m_project = project;
-     if ( project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(calendarChanged(Calendar*)), this, SLOT(slotCalendarChanged(Calendar*)) );
- 
-         connect( m_project, SIGNAL(calendarAdded(const Calendar*)), this, SLOT(slotCalendarInserted(const Calendar*)) );
-diff --git a/plan/libs/models/kptitemmodelbase.cpp b/plan/libs/models/kptitemmodelbase.cpp
-index 499fcfe..ff74394 100644
---- a/plan/libs/models/kptitemmodelbase.cpp
-+++ b/plan/libs/models/kptitemmodelbase.cpp
-@@ -731,6 +731,11 @@ bool ItemModelBase::setData( const QModelIndex &index, const QVariant &value, in
-     return false;
- }
- 
-+void ItemModelBase::projectDeleted()
-+{
-+    setProject(0);
-+}
-+
- } //namespace KPlato
- 
- #include "kptitemmodelbase.moc"
-diff --git a/plan/libs/models/kptitemmodelbase.h b/plan/libs/models/kptitemmodelbase.h
-index 578c18e..5d3719d 100644
---- a/plan/libs/models/kptitemmodelbase.h
-+++ b/plan/libs/models/kptitemmodelbase.h
-@@ -309,6 +309,7 @@ protected Q_SLOTS:
-     virtual void slotLayoutToBeChanged();
-     virtual void slotLayoutChanged();
- 
-+    void projectDeleted();
- protected:
-     Project *m_project;
-     ScheduleManager *m_manager;
-diff --git a/plan/libs/models/kptnodechartmodel.cpp b/plan/libs/models/kptnodechartmodel.cpp
-index 025da86..9b8d397 100644
---- a/plan/libs/models/kptnodechartmodel.cpp
-+++ b/plan/libs/models/kptnodechartmodel.cpp
-@@ -294,6 +294,7 @@ void ChartItemModel::setProject( Project *project )
-     m_bcws.clear();
-     m_acwp.clear();
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(projectCalculated(ScheduleManager*)), this, SLOT(setScheduleManager(ScheduleManager*)) );
-         disconnect( m_project, SIGNAL(nodeRemoved(Node*)), this, SLOT(slotNodeRemoved(Node*)) );
-         disconnect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-@@ -302,6 +303,7 @@ void ChartItemModel::setProject( Project *project )
-     }
-     m_project = project;
-     if ( m_project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(projectCalculated(ScheduleManager*)), this, SLOT(setScheduleManager(ScheduleManager*)) );
-         connect( m_project, SIGNAL(nodeRemoved(Node*)), this, SLOT(slotNodeRemoved(Node*)) );
-         connect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-diff --git a/plan/libs/models/kptnodeitemmodel.cpp b/plan/libs/models/kptnodeitemmodel.cpp
-index 45b1650..e66277f 100644
---- a/plan/libs/models/kptnodeitemmodel.cpp
-+++ b/plan/libs/models/kptnodeitemmodel.cpp
-@@ -3122,6 +3122,7 @@ void NodeItemModel::slotWbsDefinitionChanged()
- void NodeItemModel::setProject( Project *project )
- {
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(localeChanged()), this, SLOT(slotLayoutChanged()) );
-         disconnect( m_project, SIGNAL(wbsDefinitionChanged()), this, SLOT(slotWbsDefinitionChanged()) );
-         disconnect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-@@ -3139,6 +3140,7 @@ void NodeItemModel::setProject( Project *project )
-     kDebug(planDbg())<<this<<m_project<<"->"<<project;
-     m_nodemodel.setProject( project );
-     if ( project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(localeChanged()), this, SLOT(slotLayoutChanged()) );
-         connect( m_project, SIGNAL(wbsDefinitionChanged()), this, SLOT(slotWbsDefinitionChanged()) );
-         connect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-@@ -4381,6 +4383,7 @@ void MilestoneItemModel::slotNodeMoved( Node *node )
- void MilestoneItemModel::setProject( Project *project )
- {
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(localeChanged()), this, SLOT(slotLayoutChanged()) );
-         disconnect( m_project, SIGNAL(wbsDefinitionChanged()), this, SLOT(slotWbsDefinitionChanged()) );
-         disconnect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-@@ -4397,6 +4400,7 @@ void MilestoneItemModel::setProject( Project *project )
-     //kDebug(planDbg())<<m_project<<"->"<<project;
-     m_nodemodel.setProject( project );
-     if ( project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(localeChanged()), this, SLOT(slotLayoutChanged()) );
-         connect( m_project, SIGNAL(wbsDefinitionChanged()), this, SLOT(slotWbsDefinitionChanged()) );
-         connect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-diff --git a/plan/libs/models/kptpertcpmmodel.cpp b/plan/libs/models/kptpertcpmmodel.cpp
-index 71745ef..7340c61 100644
---- a/plan/libs/models/kptpertcpmmodel.cpp
-+++ b/plan/libs/models/kptpertcpmmodel.cpp
-@@ -82,6 +82,7 @@ void CriticalPathItemModel::slotNodeRemoved( Node *node )
- void CriticalPathItemModel::setProject( Project *project )
- {
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-         disconnect( m_project, SIGNAL(nodeToBeAdded(Node*,int)), this, SLOT(slotNodeToBeInserted(Node*,int)) );
-         disconnect( m_project, SIGNAL(nodeToBeRemoved(Node*)), this, SLOT(slotNodeToBeRemoved(Node*)) );
-@@ -94,6 +95,7 @@ void CriticalPathItemModel::setProject( Project *project )
-     m_project = project;
-     m_nodemodel.setProject( project );
-     if ( project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-         connect( m_project, SIGNAL(nodeToBeAdded(Node*,int)), this, SLOT(slotNodeToBeInserted(Node*,int)) );
-         connect( m_project, SIGNAL(nodeToBeRemoved(Node*)), this, SLOT(slotNodeToBeRemoved(Node*)) );
-@@ -354,6 +356,7 @@ void PertResultItemModel::setProject( Project *project )
- {
-     clear();
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-         disconnect( m_project, SIGNAL(nodeToBeAdded(Node*,int)), this, SLOT(slotNodeToBeInserted(Node*,int)) );
-         disconnect( m_project, SIGNAL(nodeToBeRemoved(Node*)), this, SLOT(slotNodeToBeRemoved(Node*)) );
-@@ -366,6 +369,7 @@ void PertResultItemModel::setProject( Project *project )
-     m_project = project;
-     m_nodemodel.setProject( project );
-     if ( project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-         connect( m_project, SIGNAL(nodeToBeAdded(Node*,int)), this, SLOT(slotNodeToBeInserted(Node*,int)) );
-         connect( m_project, SIGNAL(nodeToBeRemoved(Node*)), this, SLOT(slotNodeToBeRemoved(Node*)) );
-diff --git a/plan/libs/models/kptrelationmodel.cpp b/plan/libs/models/kptrelationmodel.cpp
-index b2617fb..a5acfb6 100644
---- a/plan/libs/models/kptrelationmodel.cpp
-+++ b/plan/libs/models/kptrelationmodel.cpp
-@@ -241,6 +241,7 @@ void RelationItemModel::slotLayoutChanged()
- void RelationItemModel::setProject( Project *project )
- {
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-         disconnect( m_project, SIGNAL(nodeToBeRemoved(Node*)), this, SLOT(slotNodeToBeRemoved(Node*)) );
- 
-@@ -254,6 +255,7 @@ void RelationItemModel::setProject( Project *project )
-     }
-     m_project = project;
-     if ( project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-         connect( m_project, SIGNAL(nodeToBeRemoved(Node*)), this, SLOT(slotNodeToBeRemoved(Node*)) );
- 
-diff --git a/plan/libs/models/kptresourceallocationmodel.cpp b/plan/libs/models/kptresourceallocationmodel.cpp
-index 11f909e..500a24c 100644
---- a/plan/libs/models/kptresourceallocationmodel.cpp
-+++ b/plan/libs/models/kptresourceallocationmodel.cpp
-@@ -425,6 +425,7 @@ void ResourceAllocationItemModel::slotResourceGroupRemoved( const ResourceGroup
- void ResourceAllocationItemModel::setProject( Project *project )
- {
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(resourceChanged(Resource*)), this, SLOT(slotResourceChanged(Resource*)) );
-         disconnect( m_project, SIGNAL(resourceGroupChanged(ResourceGroup*)), this, SLOT(slotResourceGroupChanged(ResourceGroup*)) );
- 
-@@ -447,6 +448,7 @@ void ResourceAllocationItemModel::setProject( Project *project )
-     }
-     m_project = project;
-     if ( m_project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(resourceChanged(Resource*)), this, SLOT(slotResourceChanged(Resource*)) );
-         connect( m_project, SIGNAL(resourceGroupChanged(ResourceGroup*)), this, SLOT(slotResourceGroupChanged(ResourceGroup*)) );
- 
-diff --git a/plan/libs/models/kptresourceappointmentsmodel.cpp b/plan/libs/models/kptresourceappointmentsmodel.cpp
-index b580dfe..f4700c6 100644
---- a/plan/libs/models/kptresourceappointmentsmodel.cpp
-+++ b/plan/libs/models/kptresourceappointmentsmodel.cpp
-@@ -220,7 +220,10 @@ void ResourceAppointmentsItemModel::setProject( Project *project )
- {
-     kDebug(planDbg());
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-+
-         disconnect( m_project, SIGNAL(resourceChanged(Resource*)), this, SLOT(slotResourceChanged(Resource*)) );
-+
-         disconnect( m_project, SIGNAL(resourceGroupChanged(ResourceGroup*)), this, SLOT(slotResourceGroupChanged(ResourceGroup*)) );
- 
-         disconnect( m_project, SIGNAL(resourceGroupToBeAdded(const ResourceGroup*,int)), this, SLOT(slotResourceGroupToBeInserted(const ResourceGroup*,int)) );
-@@ -255,6 +258,7 @@ void ResourceAppointmentsItemModel::setProject( Project *project )
-     }
-     m_project = project;
-     if ( m_project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(resourceChanged(Resource*)), this, SLOT(slotResourceChanged(Resource*)) );
-         connect( m_project, SIGNAL(resourceGroupChanged(ResourceGroup*)), this, SLOT(slotResourceGroupChanged(ResourceGroup*)) );
- 
-@@ -1351,6 +1355,8 @@ void ResourceAppointmentsRowModel::setProject( Project *project )
- {
-     //kDebug(planDbg())<<project;
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-+
-         disconnect( m_project, SIGNAL(resourceGroupToBeAdded(const ResourceGroup*,int)), this, SLOT(slotResourceGroupToBeInserted(const ResourceGroup*,int)) );
- 
-         disconnect( m_project, SIGNAL(resourceGroupToBeRemoved(const ResourceGroup*)), this, SLOT(slotResourceGroupToBeRemoved(const ResourceGroup*)) );
-@@ -1379,6 +1385,8 @@ void ResourceAppointmentsRowModel::setProject( Project *project )
-     }
-     m_project = project;
-     if ( m_project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-+
-         connect( m_project, SIGNAL(resourceGroupToBeAdded(const ResourceGroup*,int)), this, SLOT(slotResourceGroupToBeInserted(const ResourceGroup*,int)) );
- 
-         connect( m_project, SIGNAL(resourceGroupToBeRemoved(const ResourceGroup*)), this, SLOT(slotResourceGroupToBeRemoved(const ResourceGroup*)) );
-diff --git a/plan/libs/models/kptresourcemodel.cpp b/plan/libs/models/kptresourcemodel.cpp
-index 81f3493..23242df 100644
---- a/plan/libs/models/kptresourcemodel.cpp
-+++ b/plan/libs/models/kptresourcemodel.cpp
-@@ -599,6 +599,7 @@ void ResourceItemModel::slotLayoutChanged()
- void ResourceItemModel::setProject( Project *project )
- {
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(localeChanged()), this, SLOT(slotLayoutChanged()) );
-         disconnect( m_project, SIGNAL(resourceChanged(Resource*)), this, SLOT(slotResourceChanged(Resource*)) );
-         disconnect( m_project, SIGNAL(resourceGroupChanged(ResourceGroup*)), this, SLOT(slotResourceGroupChanged(ResourceGroup*)) );
-@@ -623,6 +624,7 @@ void ResourceItemModel::setProject( Project *project )
-     }
-     m_project = project;
-     if ( m_project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(localeChanged()), this, SLOT(slotLayoutChanged()) );
-         connect( m_project, SIGNAL(resourceChanged(Resource*)), this, SLOT(slotResourceChanged(Resource*)) );
-         connect( m_project, SIGNAL(resourceGroupChanged(ResourceGroup*)), this, SLOT(slotResourceGroupChanged(ResourceGroup*)) );
-@@ -711,7 +713,7 @@ QModelIndex ResourceItemModel::parent( const QModelIndex &index ) const
-     }
-     //kDebug(planDbg())<<index.internalPointer()<<":"<<index.row()<<","<<index.column();
- 
--    Resource *r = qobject_cast<Resource*>( object( index ) );
-+    Resource *r = resource( index );
-     if ( r && r->parentGroup() ) {
-         // only resources have parent
-         int row = m_project->indexOf(  r->parentGroup() );
-@@ -732,8 +734,7 @@ QModelIndex ResourceItemModel::index( int row, int column, const QModelIndex &pa
-         }
-         return QModelIndex();
-     }
--    QObject *p = object( parent );
--    ResourceGroup *g = qobject_cast<ResourceGroup*>( p );
-+    ResourceGroup *g = group( parent );
-     if ( g ) {
-         if ( row < g->numResources() ) {
-             return createIndex( row, column, g->resourceAt( row ) );
-@@ -782,8 +783,7 @@ int ResourceItemModel::rowCount( const QModelIndex &parent ) const
-     if ( ! parent.isValid() ) {
-         return m_project->numResourceGroups();
-     }
--    QObject *p = object( parent );
--    ResourceGroup *g = qobject_cast<ResourceGroup*>( p );
-+    ResourceGroup *g = group( parent );
-     if ( g ) {
-         return g->numResources();
-     }
-@@ -1148,6 +1148,8 @@ QObject *ResourceItemModel::object( const QModelIndex &index ) const
- {
-     QObject *o = 0;
-     if ( index.isValid() ) {
-+        Q_ASSERT( m_project );
-+        Q_ASSERT(m_project->resourceGroups().contains(static_cast<ResourceGroup*>(index.internalPointer())) || m_project->resourceList().contains(static_cast<Resource*>(index.internalPointer())));
-         o = static_cast<QObject*>( index.internalPointer() );
-         Q_ASSERT( o );
-     }
-diff --git a/plan/libs/models/kptschedulemodel.cpp b/plan/libs/models/kptschedulemodel.cpp
-index e3ce298..4d47ee5 100644
---- a/plan/libs/models/kptschedulemodel.cpp
-+++ b/plan/libs/models/kptschedulemodel.cpp
-@@ -171,6 +171,8 @@ void ScheduleItemModel::slotScheduleRemoved( const MainSchedule * )
- void ScheduleItemModel::setProject( Project *project )
- {
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-+
-         disconnect( m_project, SIGNAL(scheduleManagerChanged(ScheduleManager*)), this, SLOT(slotManagerChanged(ScheduleManager*)) );
- 
-         disconnect( m_project, SIGNAL(scheduleManagerToBeAdded(const ScheduleManager*,int)), this, SLOT(slotScheduleManagerToBeInserted(const ScheduleManager*,int)) );
-@@ -197,6 +199,8 @@ void ScheduleItemModel::setProject( Project *project )
-     }
-     m_project = project;
-     if ( m_project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-+
-         connect( m_project, SIGNAL(scheduleManagerChanged(ScheduleManager*)), this, SLOT(slotManagerChanged(ScheduleManager*)) );
- 
-         connect( m_project, SIGNAL(scheduleManagerToBeAdded(const ScheduleManager*,int)), this, SLOT(slotScheduleManagerToBeInserted(const ScheduleManager*,int)) );
-@@ -1074,10 +1078,17 @@ void ScheduleLogItemModel::slotScheduleRemoved( const MainSchedule *sch )
-     kDebug(planDbg())<<m_schedule<<sch;
- }
- 
-+void ScheduleLogItemModel::projectDeleted()
-+{
-+    setProject(0);
-+}
-+
- void ScheduleLogItemModel::setProject( Project *project )
- {
-     kDebug(planDbg())<<m_project<<"->"<<project;
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-+
-         disconnect( m_project, SIGNAL(scheduleManagerChanged(ScheduleManager*)), this, SLOT(slotManagerChanged(ScheduleManager*)) );
- 
-         disconnect( m_project, SIGNAL(scheduleManagerToBeRemoved(const ScheduleManager*)), this, SLOT(slotScheduleManagerToBeRemoved(const ScheduleManager*)) );
-@@ -1096,6 +1107,8 @@ void ScheduleLogItemModel::setProject( Project *project )
-     }
-     m_project = project;
-     if ( m_project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-+
-         connect( m_project, SIGNAL(scheduleManagerChanged(ScheduleManager*)), this, SLOT(slotManagerChanged(ScheduleManager*)) );
- 
-         connect( m_project, SIGNAL(scheduleManagerToBeRemoved(const ScheduleManager*)), this, SLOT(slotScheduleManagerToBeRemoved(const ScheduleManager*)) );
-diff --git a/plan/libs/models/kptschedulemodel.h b/plan/libs/models/kptschedulemodel.h
-index c09d8fb..acc75b4 100644
---- a/plan/libs/models/kptschedulemodel.h
-+++ b/plan/libs/models/kptschedulemodel.h
-@@ -203,6 +203,8 @@ protected Q_SLOTS:
- 
-     void slotLogInserted( MainSchedule*, int firstrow, int lastrow );
- 
-+    void projectDeleted();
-+
- protected:
-     void addLogEntry( const Schedule::Log &log, int row );
- 
-diff --git a/plan/libs/models/kpttaskstatusmodel.cpp b/plan/libs/models/kpttaskstatusmodel.cpp
-index e0693b8..9fb3b37 100644
---- a/plan/libs/models/kpttaskstatusmodel.cpp
-+++ b/plan/libs/models/kpttaskstatusmodel.cpp
-@@ -126,6 +126,7 @@ void TaskStatusItemModel::setProject( Project *project )
- {
-     clear();
-     if ( m_project ) {
-+        disconnect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         disconnect( m_project, SIGNAL(localeChanged()), this, SLOT(slotLayoutChanged()) );
-         disconnect( m_project, SIGNAL(wbsDefinitionChanged()), this, SLOT(slotWbsDefinitionChanged()) );
-         disconnect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
-@@ -140,6 +141,7 @@ void TaskStatusItemModel::setProject( Project *project )
-     m_project = project;
-     m_nodemodel.setProject( project );
-     if ( project ) {
-+        connect(m_project, SIGNAL(aboutToBeDeleted()), this, SLOT(projectDeleted()));
-         connect( m_project, SIGNAL(localeChanged()), this, SLOT(slotLayoutChanged()) );
-         connect( m_project, SIGNAL(wbsDefinitionChanged()), this, SLOT(slotWbsDefinitionChanged()) );
-         connect( m_project, SIGNAL(nodeChanged(Node*)), this, SLOT(slotNodeChanged(Node*)) );
--- 
-2.7.4
-
diff --git a/source/kde/patch/calligra/0070-Plan-Guard-against-trying-to-move-a-task-into-the-sa.patch b/source/kde/patch/calligra/0070-Plan-Guard-against-trying-to-move-a-task-into-the-sa.patch
deleted file mode 100644
index debb62b78..000000000
--- a/source/kde/patch/calligra/0070-Plan-Guard-against-trying-to-move-a-task-into-the-sa.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a9134500e4e599ba316617941bcd04f640ed3999 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Tue, 23 Aug 2016 13:30:13 +0200
-Subject: [PATCH 70/80] Plan: Guard against trying to move a task into the same
- porition
-
-QAbstractItemModel cannot handle this and it causes a crash (later)
----
- plan/libs/kernel/kptproject.cpp       | 4 ++++
- plan/libs/models/kptnodeitemmodel.cpp | 9 +++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git a/plan/libs/kernel/kptproject.cpp b/plan/libs/kernel/kptproject.cpp
-index 451e897..fdf43bc 100644
---- a/plan/libs/kernel/kptproject.cpp
-+++ b/plan/libs/kernel/kptproject.cpp
-@@ -1565,6 +1565,10 @@ bool Project::moveTask( Node* node, Node *newParent, int newPos )
-     Node *oldParent = node->parentNode();
-     int oldPos = oldParent->indexOf( node );
-     int i = newPos < 0 ? newParent->numChildren() : newPos;
-+    if ( oldParent == newParent && i == oldPos ) {
-+        // no need to move to where it already is
-+        return false;
-+    }
-     int newRow = i;
-     if ( oldParent == newParent && newPos > oldPos ) {
-         ++newRow; // itemmodels wants new row *before* node is removed from old position
-diff --git a/plan/libs/models/kptnodeitemmodel.cpp b/plan/libs/models/kptnodeitemmodel.cpp
-index e66277f..5581f8f 100644
---- a/plan/libs/models/kptnodeitemmodel.cpp
-+++ b/plan/libs/models/kptnodeitemmodel.cpp
-@@ -4036,6 +4036,15 @@ bool NodeItemModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
-                 if ( pos >= 0 && n->parentNode() == par && par->indexOf( n ) < pos ) {
-                     --pos;
-                 }
-+                if ( n->parentNode() == par ) {
-+                    // avoid drop into the same position, QAbstractItemModel does not like it
-+                    int crow = par->indexOf( n );
-+                    if ( ( ( pos == -1 ) && ( crow == par->numChildren() - 1 ) ) || ( pos == crow ) ) {
-+                        delete cmd;
-+                        cmd = 0;
-+                        continue;
-+                    }
-+                }
-                 cmd->addCommand( new NodeMoveCmd( m_project, n, par, pos ) );
-                 offset++;
-             }
--- 
-2.7.4
-
diff --git a/source/kde/patch/calligra/boost-1.65.0.patch b/source/kde/patch/calligra/boost-1.65.0.patch
deleted file mode 100644
index 9f6a4066a..000000000
--- a/source/kde/patch/calligra/boost-1.65.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru calligra-2.9.11.orig/gemini/desktopviewproxy.cpp calligra-2.9.11/gemini/desktopviewproxy.cpp
---- calligra-2.9.11.orig/gemini/desktopviewproxy.cpp	2016-02-02 20:53:13.000000000 +0100
-+++ calligra-2.9.11/gemini/desktopviewproxy.cpp	2017-08-27 17:54:48.900376022 +0200
-@@ -31,7 +31,7 @@
- #include <krecentfilesaction.h>
- #include <kactioncollection.h>
- 
--#include <boost/config/posix_features.hpp>
-+#include <boost/config/detail/posix_features.hpp>
- #include <KConfigGroup>
- 
- #include <KoMainWindow.h>
-diff -ru calligra-2.9.11.orig/krita/gemini/desktopviewproxy.cpp calligra-2.9.11/krita/gemini/desktopviewproxy.cpp
---- calligra-2.9.11.orig/krita/gemini/desktopviewproxy.cpp	2016-02-02 20:53:14.000000000 +0100
-+++ calligra-2.9.11/krita/gemini/desktopviewproxy.cpp	2017-08-27 17:53:54.964372389 +0200
-@@ -31,7 +31,7 @@
- #include <krecentfilesaction.h>
- #include <kactioncollection.h>
- 
--#include <boost/config/posix_features.hpp>
-+#include <boost/config/detail/posix_features.hpp>
- 
- #include <KisMainWindow.h>
- #include <KisImportExportManager.h>
diff --git a/source/kde/patch/calligra/calligra-2.9.11-gcc6_arm.patch b/source/kde/patch/calligra/calligra-2.9.11-gcc6_arm.patch
deleted file mode 100644
index 2b1271c07..000000000
--- a/source/kde/patch/calligra/calligra-2.9.11-gcc6_arm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up calligra-2.9.11/libs/flake/KoSnapStrategy.cpp.gcc6_arm calligra-2.9.11/libs/flake/KoSnapStrategy.cpp
---- calligra-2.9.11/libs/flake/KoSnapStrategy.cpp.gcc6_arm	2016-02-02 13:53:15.000000000 -0600
-+++ calligra-2.9.11/libs/flake/KoSnapStrategy.cpp	2016-02-08 09:12:39.452896965 -0600
-@@ -181,7 +181,7 @@ bool ExtensionSnapStrategy::snap(const Q
-     Q_ASSERT(isfinite(maxSnapDistance));
- 
-     const qreal maxDistance = maxSnapDistance * maxSnapDistance;
--    qreal minDistances[2] = { HUGE_VAL, HUGE_VAL };
-+    qreal minDistances[2] = { (qreal)HUGE_VAL, (qreal)HUGE_VAL };
- 
-     QPointF snappedPoints[2] = { mousePosition, mousePosition };
-     QPointF startPoints[2];
diff --git a/source/kde/patch/calligra/calligra.mariadb.diff b/source/kde/patch/calligra/calligra.mariadb.diff
deleted file mode 100644
index 96006998b..000000000
--- a/source/kde/patch/calligra/calligra.mariadb.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./kexi/migration/mysql/mysqlmigrate.cpp.orig	2016-02-02 13:53:13.000000000 -0600
-+++ ./kexi/migration/mysql/mysqlmigrate.cpp	2017-08-30 14:21:01.436709371 -0500
-@@ -42,7 +42,7 @@
- #ifdef Q_WS_WIN
- # undef _WIN32_WINNT // avoid redef.
- #endif
--#include <mysql_version.h>
-+#include <mariadb_version.h>
- #include <mysql.h>
- #define BOOL bool
- 
---- ./kexi/kexidb/drivers/mysql/mysqldriver.cpp.orig	2016-02-02 13:53:13.000000000 -0600
-+++ ./kexi/kexidb/drivers/mysql/mysqldriver.cpp	2017-08-30 14:20:24.858710150 -0500
-@@ -31,7 +31,7 @@
- #include <QVariant>
- #include <QFile>
- 
--#include <mysql_version.h>
-+#include <mariadb_version.h>
- #include <mysql.h>
- #define BOOL bool
- 
---- ./kexi/kexidb/drivers/mysql/mysqlconnection_p.h.orig	2016-02-02 13:53:13.000000000 -0600
-+++ ./kexi/kexidb/drivers/mysql/mysqlconnection_p.h	2017-08-30 14:20:24.861710150 -0500
-@@ -30,7 +30,7 @@
- # endif
- # include <my_global.h>
- #endif
--#include <mysql_version.h>
-+#include <mariadb_version.h>
- #include <mysql.h>
- 
- typedef struct st_mysql MYSQL;
diff --git a/source/kde/patch/k3b.patch b/source/kde/patch/k3b.patch
deleted file mode 100644
index a96caa49c..000000000
--- a/source/kde/patch/k3b.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-# Patch for GCC 6+:
-zcat $CWD/patch/k3b/k3b.narrowing.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Patch for ffmpeg3:
-zcat $CWD/patch/k3b/k3b-ffmpeg3.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Fix error "ISO C++ forbids comparison between pointer and integer [-fpermissive]":
-zcat $CWD/patch/k3b/k3b.pointer.compare.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/k3b/k3b-ffmpeg3.patch b/source/kde/patch/k3b/k3b-ffmpeg3.patch
deleted file mode 100644
index 9c5ac4205..000000000
--- a/source/kde/patch/k3b/k3b-ffmpeg3.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 52d3d64863d2fab4128f524870851f18f5cae1fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@seznam.cz>
-Date: Sat, 14 Feb 2015 15:31:07 +0100
-Subject: [PATCH] Fixed compilation with newer ffmpeg/libav.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
----
- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 60 ++++++++++++++++++++++++-----
- 1 file changed, 50 insertions(+), 10 deletions(-)
-
-diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-index 5451fd3..2f80fd6 100644
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -86,8 +86,12 @@ public:
-     K3b::Msf length;
- 
-     // for decoding. ffmpeg requires 16-byte alignment.
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
-+    ::AVFrame* frame;
-+#else
-     char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15];
-     char* alignedOutputBuffer;
-+#endif
-     char* outputBufferPos;
-     int outputBufferSize;
-     ::AVPacket packet;
-@@ -102,14 +106,29 @@ K3bFFMpegFile::K3bFFMpegFile( const QString& filename )
-     d = new Private;
-     d->formatContext = 0;
-     d->codec = 0;
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
-+#  if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
-+    d->frame = avcodec_alloc_frame();
-+#  else
-+    d->frame = av_frame_alloc();
-+#  endif
-+#else
-     int offset = 0x10 - (reinterpret_cast<intptr_t>(&d->outputBuffer) & 0xf);
-     d->alignedOutputBuffer = &d->outputBuffer[offset];
-+#endif
- }
- 
- 
- K3bFFMpegFile::~K3bFFMpegFile()
- {
-     close();
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
-+#  if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
-+    av_free(d->frame);
-+#  else
-+    av_frame_free(&d->frame);
-+#  endif
-+#endif
-     delete d;
- }
- 
-@@ -326,26 +345,36 @@ int K3bFFMpegFile::fillOutputBuffer()
-             return 0;
-         }
- 
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
-+        int gotFrame = 0;
-+        int len = ::avcodec_decode_audio4(
-+#else
-         d->outputBufferPos = d->alignedOutputBuffer;
-         d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
--
--#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
-+#  ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
-         int len = ::avcodec_decode_audio3(
--#else
--#  ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
--        int len = ::avcodec_decode_audio2(
- #  else
-+#    ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
-+        int len = ::avcodec_decode_audio2(
-+#    else
-         int len = ::avcodec_decode_audio(
-+#    endif
- #  endif
- #endif
- 
-             FFMPEG_CODEC(d->formatContext->streams[0]),
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
-+            d->frame,
-+            &gotFrame,
-+            &d->packet );
-+#else
-             (short*)d->alignedOutputBuffer,
-             &d->outputBufferSize,
--#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
-+#  ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
-             &d->packet );
--#else
-+#  else
-             d->packetData, d->packetSize );
-+#  endif
- #endif
- 
-         if( d->packetSize <= 0 || len < 0 )
-@@ -355,6 +384,17 @@ int K3bFFMpegFile::fillOutputBuffer()
-             return -1;
-         }
- 
-+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
-+        if ( gotFrame ) {
-+            d->outputBufferSize = ::av_samples_get_buffer_size(
-+                NULL,
-+                FFMPEG_CODEC(d->formatContext->streams[0])->channels,
-+                d->frame->nb_samples,
-+                FFMPEG_CODEC(d->formatContext->streams[0])->sample_fmt,
-+                1 );
-+            d->outputBufferPos = reinterpret_cast<char*>( d->frame->data[0] );
-+        }
-+#endif
-         d->packetSize -= len;
-         d->packetData += len;
-     }
-@@ -420,9 +460,9 @@ K3bFFMpegFile* K3bFFMpegWrapper::open( const QString& filename ) const
-         // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do
-         // its thing.
-         //
--        if( file->type() == CODEC_ID_WMAV1 ||
--            file->type() == CODEC_ID_WMAV2 ||
--            file->type() == CODEC_ID_AAC )
-+        if( file->type() == AV_CODEC_ID_WMAV1 ||
-+            file->type() == AV_CODEC_ID_WMAV2 ||
-+            file->type() == AV_CODEC_ID_AAC )
- #endif
-             return file;
-     }
--- 
-2.0.5
-
diff --git a/source/kde/patch/k3b/k3b.narrowing.diff b/source/kde/patch/k3b/k3b.narrowing.diff
deleted file mode 100644
index 7a328394f..000000000
--- a/source/kde/patch/k3b/k3b.narrowing.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- k3b-2.0.3/libk3b/tools/k3bwavefilewriter.cpp.old    2016-05-14 12:33:15.000000000 -0400
-+++ k3b-2.0.3/libk3b/tools/k3bwavefilewriter.cpp        2016-05-14 12:34:35.218389226 -0400
-@@ -111,17 +111,17 @@
- {
-     static const char riffHeader[] =
-         {
--            0x52, 0x49, 0x46, 0x46, // 0  "RIFF"
--            0x00, 0x00, 0x00, 0x00, // 4  wavSize
--            0x57, 0x41, 0x56, 0x45, // 8  "WAVE"
--            0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
--            0x10, 0x00, 0x00, 0x00, // 16
--            0x01, 0x00, 0x02, 0x00, // 20
--            0x44, 0xac, 0x00, 0x00, // 24
--            0x10, 0xb1, 0x02, 0x00, // 28
--            0x04, 0x00, 0x10, 0x00, // 32
--            0x64, 0x61, 0x74, 0x61, // 36 "data"
--            0x00, 0x00, 0x00, 0x00  // 40 byteCount
-+            (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0  "RIFF"
-+            (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4  wavSize
-+            (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8  "WAVE"
-+            (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
-+            (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
-+            (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
-+            (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
-+            (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
-+            (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
-+            (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
-+            (char)0x00, (char)0x00, (char)0x00, (char)0x00  // 40 byteCount
-         };
-
-     m_outputStream.writeRawData( riffHeader, 44 );
---- k3b-2.0.3/libk3b/projects/k3bcdrdaowriter.cpp.old   2014-11-04 13:37:31.000000000 -0500
-+++ k3b-2.0.3/libk3b/projects/k3bcdrdaowriter.cpp       2016-05-14 12:41:13.769135417 -0400
-@@ -908,7 +908,7 @@
-
- void K3b::CdrdaoWriter::parseCdrdaoMessage()
- {
--    static const char msgSync[] = { 0xff, 0x00, 0xff, 0x00 };
-+    static const char msgSync[] = { (char)0xff, (char)0x00, (char)0xff, (char)0x00 };
-     unsigned int avail = m_comSock->bytesAvailable();
-     unsigned int msgs = avail / ( sizeof(msgSync)+d->progressMsgSize );
-     unsigned int count = 0;
---- k3b-2.0.3/plugins/encoder/external/k3bexternalencoder.cpp.old       2014-11-04 13:37:31.000000000 -0500
-+++ k3b-2.0.3/plugins/encoder/external/k3bexternalencoder.cpp   2016-05-14 12:45:57.967902413 -0400
-@@ -39,17 +39,17 @@
-
- static const char s_riffHeader[] =
- {
--    0x52, 0x49, 0x46, 0x46, // 0  "RIFF"
--    0x00, 0x00, 0x00, 0x00, // 4  wavSize
--    0x57, 0x41, 0x56, 0x45, // 8  "WAVE"
--    0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
--    0x10, 0x00, 0x00, 0x00, // 16
--    0x01, 0x00, 0x02, 0x00, // 20
--    0x44, 0xac, 0x00, 0x00, // 24
--    0x10, 0xb1, 0x02, 0x00, // 28
--    0x04, 0x00, 0x10, 0x00, // 32
--    0x64, 0x61, 0x74, 0x61, // 36 "data"
--    0x00, 0x00, 0x00, 0x00  // 40 byteCount
-+    (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0  "RIFF"
-+    (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4  wavSize
-+    (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8  "WAVE"
-+    (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
-+    (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
-+    (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
-+    (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
-+    (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
-+    (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
-+    (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
-+    (char)0x00, (char)0x00, (char)0x00, (char)0x00  // 40 byteCount
- };
diff --git a/source/kde/patch/k3b/k3b.pointer.compare.diff b/source/kde/patch/k3b/k3b.pointer.compare.diff
deleted file mode 100644
index 590fce7ae..000000000
--- a/source/kde/patch/k3b/k3b.pointer.compare.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig	2017-05-06 16:40:46.273796232 -0500
-+++ ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2017-05-06 16:47:19.594787855 -0500
-@@ -261,7 +261,7 @@
-     AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
-     if( ade == NULL )
-         return QString();
--    if( ade->value != '\0' )
-+    if( ade->value )
-         return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
-@@ -274,7 +274,7 @@
-     AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
-     if( ade == NULL )
-         return QString();
--    if( ade->value != '\0' )
-+    if( ade->value )
-         return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
-@@ -287,7 +287,7 @@
-     AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
-     if( ade == NULL )
-         return QString();
--    if( ade->value != '\0' )
-+    if( ade->value )
-         return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
diff --git a/source/kde/patch/kate.patch b/source/kde/patch/kate.patch
deleted file mode 100644
index 4810b315f..000000000
--- a/source/kde/patch/kate.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix build for gcc6+:
-zcat $CWD/patch/kate/kate4-fix_gcc7.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/kate/kate4-fix_gcc7.patch b/source/kde/patch/kate/kate4-fix_gcc7.patch
deleted file mode 100644
index 080a114fb..000000000
--- a/source/kde/patch/kate/kate4-fix_gcc7.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/part/search/kateregexp.cpp
-+++ b/part/search/kateregexp.cpp
-@@ -96,7 +96,7 @@
- 
-         case L'n':
-           stillMultiLine = true;
--          // FALLTROUGH
-+          __attribute__((fallthrough));
- 
-         default:
-           // copy "\?" unmodified
-@@ -164,7 +164,7 @@
- 
-         case L'n':
-           stillMultiLine = true;
--          // FALLTROUGH
-+          __attribute__((fallthrough));
- 
-         default:
-           // copy "\?" unmodified
---- a/part/view/kateview.cpp
-+++ b/part/view/kateview.cpp
-@@ -310,7 +310,7 @@
-   if (factory())
-     factory()->removeClient (this);
- 
--    KTextEditor::ViewBarContainer *viewBarContainer=qobject_cast<KTextEditor::ViewBarContainer*>( KateGlobal::self()->container() );
-+  KTextEditor::ViewBarContainer *viewBarContainer=qobject_cast<KTextEditor::ViewBarContainer*>( KateGlobal::self()->container() );
-     if (viewBarContainer) {
-      viewBarContainer->deleteViewBarForView(this,KTextEditor::ViewBarContainer::BottomBar);
-       m_bottomViewBar=0;
---- a/part/view/kateviewaccessible.h
-+++ b/part/view/kateviewaccessible.h
-@@ -248,7 +248,8 @@
- 
-         virtual int navigate(QAccessible::RelationFlag relation, int entry, QAccessibleInterface **target) const
-         {
--            if ((relation == QAccessible::Child || QAccessible::FocusChild) && entry == KateCursorAccessible::ChildId) {
-+            if ((relation == QAccessible::Child || relation == QAccessible::FocusChild) &&
-+                    entry == KateCursorAccessible::ChildId) {
-                 *target = new KateCursorAccessible(view());
-                 return KateCursorAccessible::ChildId;
-             }
---- a/part/view/kateviewhelpers.cpp
-+++ b/part/view/kateviewhelpers.cpp
-@@ -1703,7 +1703,7 @@
-       if (realLine > -1) {
-         if (m_viewInternal->cache()->viewLine(z).startCol() == 0) {
-           if (m_viRelLineNumbersOn && m_view->viInputMode()) {
--            int diff = abs(realLine - currentLine);
-+            int diff = abs(static_cast<int>(realLine - currentLine));
-             if (diff > 0) {
-               p.drawText( lnX + m_maxCharWidth / 2, y, lnWidth - m_maxCharWidth, h,
-                           Qt::TextDontClip|Qt::AlignRight|Qt::AlignVCenter, QString("%1").arg(diff) );
diff --git a/source/kde/patch/kde-runtime.patch b/source/kde/patch/kde-runtime.patch
deleted file mode 100644
index 3cdd393cf..000000000
--- a/source/kde/patch/kde-runtime.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-zcat $CWD/patch/kde-runtime/kde-runtime-4.14.3.nm.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/kde-runtime/kde-runtime.fix.konqueror.manpage.infopage.display.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/kde-runtime/kde-runtime-4.14.3.nm.diff b/source/kde/patch/kde-runtime/kde-runtime-4.14.3.nm.diff
deleted file mode 100644
index 8bcdb8db9..000000000
--- a/source/kde/patch/kde-runtime/kde-runtime-4.14.3.nm.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./solid-networkstatus/kded/CMakeLists.txt.orig	2014-10-30 18:50:20.000000000 -0500
-+++ ./solid-networkstatus/kded/CMakeLists.txt	2015-10-24 00:10:47.043649546 -0500
-@@ -21,6 +21,7 @@
-         MESSAGE(STATUS "Adding in-process NetworkManager service-wart to kded module")
-         set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} networkmanagerstatus.cpp)
-         include_directories(${NETWORKMANAGER_INCLUDE_DIRS})
-+        include_directories(${NM-UTIL_INCLUDE_DIRS})
-         add_definitions(-DNM_BACKEND_ENABLED)
-     endif(NM_0_7)
- endif(NETWORKMANAGER_FOUND)
diff --git a/source/kde/patch/kde-runtime/kde-runtime.fix.konqueror.manpage.infopage.display.diff b/source/kde/patch/kde-runtime/kde-runtime.fix.konqueror.manpage.infopage.display.diff
deleted file mode 100644
index 0f9ae9a23..000000000
--- a/source/kde/patch/kde-runtime/kde-runtime.fix.konqueror.manpage.infopage.display.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./kioslave/info/kde-info2html.orig	2014-10-31 00:50:20.000000000 +0100
-+++ ./kioslave/info/kde-info2html	2018-11-01 18:30:29.718723253 +0100
-@@ -172,7 +172,7 @@
- 		next if $looking && !/\* Menu/;
- 		$looking = 0;
- 		my @item = &ParseMenuItem($_,'dir');
--		if (!defined(@item)) { next }
-+        if (!@item) { next }
-     		my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @item;
- 		if ($MenuLinkRef eq $FileName) {
- 			&Redirect($MenuLinkFile, $MenuLinkTag);
-@@ -430,7 +430,7 @@
- sub MenuItem2HTML {
-     my ($Line, $BaseInfoFile) = @_;
-     my @parse_results = &ParseMenuItem($Line, $BaseInfoFile);
--    if (!defined (@parse_results)) { return $Line; }
-+    if (!@parse_results) { return $Line; }
-     my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @parse_results;
-     #-- produce a HTML line
-     return "<tr class=\"infomenutr\"><td class=\"infomenutd\" style=\"width:30%\"><ul><li><a href=\"info:/$MenuLinkFile/$MenuLinkTag\">$MenuLinkRef</a></ul></td><td class=\"infomenutd\">$MenuLinkText";
diff --git a/source/kde/patch/kde-workspace.patch b/source/kde/patch/kde-workspace.patch
deleted file mode 100644
index 5c52a3dc1..000000000
--- a/source/kde/patch/kde-workspace.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-# Increase the timeout to accomodate slow-to-initialize video chipset drivers:
-zcat $CWD/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Always show 'remaining time' in the popup of the battery plasmoid:
-zcat $CWD/patch/kde-workspace/kde-workspace.batteryapplet.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Fix issues with default panel.  Offer launchers for Dolphin, Konqueror, Firefox, and Konsole.
-zcat $CWD/patch/kde-workspace/kde-workspace.panel-layout.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff b/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff
deleted file mode 100644
index 795827805..000000000
--- a/source/kde/patch/kde-workspace/kde-workspace.batteryapplet.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml
---- kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml	2012-05-23 01:55:18.000000000 +0200
-+++ kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml	2012-05-26 22:09:44.000000000 +0200
-@@ -10,7 +10,7 @@
-       <default>false</default>
-     </entry>
-     <entry name="showRemainingTime" type="Bool">
--      <default>false</default>
-+      <default>true</default>
-     </entry>
-   </group>
- 
-
diff --git a/source/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff b/source/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff
deleted file mode 100644
index 4dd98484d..000000000
--- a/source/kde/patch/kde-workspace/kde-workspace.kdm.server.timeout.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./kdm/config.def.orig	2010-09-30 16:20:21.000000000 -0500
-+++ ./kdm/config.def	2010-12-01 19:13:02.356002453 -0600
-@@ -1343,9 +1343,9 @@
- 
- Key: ServerTimeout
- Type: int
--Default: 30
-+Default: 45
- User: core
--Instance: #:*/
-+Instance: :*/
- Comment:
-  How long to wait for a local &X-Server; to come up.
- Description:
diff --git a/source/kde/patch/kde-workspace/kde-workspace.panel-layout.diff b/source/kde/patch/kde-workspace/kde-workspace.panel-layout.diff
deleted file mode 100644
index 9efa7d5e9..000000000
--- a/source/kde/patch/kde-workspace/kde-workspace.panel-layout.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js.orig	2015-08-12 02:03:15.000000000 -0500
-+++ ./plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js	2016-06-23 17:28:48.715969102 -0500
-@@ -28,6 +28,10 @@
- panel.height = screenGeometry(panel.screen).height > 1024 ? 35 : 27
- panel.addWidget("launcher")
- panel.addWidget("org.kde.showActivityManager")
-+dolphin = panel.addWidget("quicklaunch")
-+konqbrowser = panel.addWidget("quicklaunch")
-+firefox = panel.addWidget("quicklaunch")
-+konsole = panel.addWidget("quicklaunch")
- pager = panel.addWidget("pager")
- pager.writeConfig("hideWhenSingleDesktop", "true")
- tasks = panel.addWidget("tasks")
-@@ -35,5 +39,7 @@
- panel.addWidget("digital-clock")
- 
- tasks.currentConfigGroup = new Array("Launchers")
--tasks.writeConfig("browser", "preferred://browser, , , ")
--tasks.writeConfig("filemanager", "preferred://filemanager, , , ")
-+dolphin.writeConfig("iconUrls","file:////usr/share/applications/kde4/dolphin.desktop")
-+konqbrowser.writeConfig("iconUrls","file:////usr/share/applications/kde4/konqbrowser.desktop")
-+firefox.writeConfig("iconUrls","file:///usr/share/applications/mozilla-firefox.desktop")
-+konsole.writeConfig("iconUrls","file:///usr/share/applications/kde4/konsole.desktop")
diff --git a/source/kde/patch/kdeartwork.patch b/source/kde/patch/kdeartwork.patch
deleted file mode 100644
index c5ed525d1..000000000
--- a/source/kde/patch/kdeartwork.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix build:
-zcat $CWD/patch/kdeartwork/kdeartwork.cmake.include.checkincludefiles.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/kdeartwork/kdeartwork.cmake.include.checkincludefiles.diff b/source/kde/patch/kdeartwork/kdeartwork.cmake.include.checkincludefiles.diff
deleted file mode 100644
index c265f5f0e..000000000
--- a/source/kde/patch/kdeartwork/kdeartwork.cmake.include.checkincludefiles.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- ./kscreensaver/xsavers/CMakeLists.txt.orig	2010-03-05 12:35:01.000000000 -0600
-+++ ./kscreensaver/xsavers/CMakeLists.txt	2018-01-30 13:59:36.413760135 -0600
-@@ -1,3 +1,4 @@
-+include(CheckIncludeFiles)
- check_include_files(memory.h HAVE_MEMORY_H)
- configure_file (config-xsavers.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xsavers.h )
- 
diff --git a/source/kde/patch/kdeconnect-kde.patch b/source/kde/patch/kdeconnect-kde.patch
deleted file mode 100644
index a08b5aa0e..000000000
--- a/source/kde/patch/kdeconnect-kde.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-zcat $CWD/patch/kdeconnect-kde/kdeconnect-kde.openssh7.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/kdeconnect-kde/kdeconnect-kde.openssh7.diff b/source/kde/patch/kdeconnect-kde/kdeconnect-kde.openssh7.diff
deleted file mode 100644
index 1189c2e58..000000000
--- a/source/kde/patch/kdeconnect-kde/kdeconnect-kde.openssh7.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./plugins/sftp/mounter.cpp.orig	2015-02-03 20:53:33.000000000 -0600
-+++ ./plugins/sftp/mounter.cpp	2015-11-19 17:22:51.795962646 -0600
-@@ -136,7 +136,8 @@
-         << "-f"
-         << "-o" << "IdentityFile=" + m_sftp->device()->privateKeyPath()
-         << "-o" << "StrictHostKeyChecking=no" //Do not ask for confirmation because it is not a known host
--        << "-o" << "UserKnownHostsFile=/dev/null"; //Prevent storing as a known host
-+        << "-o" << "UserKnownHostsFile=/dev/null" //Prevent storing as a known host
-+        << "-o" << "HostKeyAlgorithms=+ssh-dss"; //https://bugs.kde.org/show_bug.cgi?id=351725
-     
-     m_proc->setProgram(program, arguments);
- 
-@@ -146,7 +147,7 @@
- 
-     cleanMountPoint();
-     
--    kDebug(debugArea()) << "Staring process: " << m_proc->program().join(" ");
-+    kDebug(debugArea()) << "Starting process: " << m_proc->program().join(" ");
-     m_proc->start();
- }
- 
diff --git a/source/kde/patch/kdelibs.patch b/source/kde/patch/kdelibs.patch
deleted file mode 100644
index f102b8a3f..000000000
--- a/source/kde/patch/kdelibs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# Slackware ships a different version of XML DTDs:
-zcat $CWD/patch/kdelibs/kdelibs.docbook.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Make uPnP support depend on the environment variable SOLID_UPNP,
-# e.g. by creating an /etc/profile.d/upnp.sh file with the following contents:
-# export SOLID_UPNP=1
-zcat $CWD/patch/kdelibs/kdelibs.upnp_conditional.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Revert 3 patches which (although they probably follow the FDo spec better),
-# cause incorrect icon overrides:
-zcat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/kdelibs/coding-style-fixes.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/kdelibs/return-application-icons-properly.patch.gz | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Support OpenSSL-1.1.x:
-zcat $CWD/patch/kdelibs/0001-Make-kssl-compile-against-OpenSSL-1.1.0.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Security: remove support for $(...) in config keys with [$e] marker. (CVE-2019-14744)
-zcat $CWD/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Support TLS v1.1 and TLS v1.2:
-zcat $CWD/patch/kdelibs/kde4libs-4.14.26.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/kdelibs/0001-Make-kssl-compile-against-OpenSSL-1.1.0.patch b/source/kde/patch/kdelibs/0001-Make-kssl-compile-against-OpenSSL-1.1.0.patch
deleted file mode 100644
index 69474eddb..000000000
--- a/source/kde/patch/kdelibs/0001-Make-kssl-compile-against-OpenSSL-1.1.0.patch
+++ /dev/null
@@ -1,1000 +0,0 @@
-From a015996bb55bbd63d94b227a2c82d0d97cd86ae8 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bauer <wbauer@tmo.at>
-Date: Wed, 25 Oct 2017 07:49:32 +0200
-Subject: [PATCH] Make kssl compile against OpenSSL 1.1.0
-
-OpenSSL 1.1.0 contains some source-incompatible changes, most notably
-making most of the structures opaque and introducing new getter/setter
-functions to modify the structures. This patch adds some of the newly
-introduced functions to the KOpenSSL class and modifies the code to
-call them. The implementation of those newly introduced methods
-contains both OpenSSL < 1.1 compatible code (direct structure member
-access) and calls to real functions resolved from OpenSSL>= 1.1
-library. Which implementation is used is decided at compile time. Some
-of the existing methods were renamed to match the OpenSSL 1.1 naming
-and to avoid conflicts with backward-compatibility names provided by
-OpenSSL 1.1.
-
-KSSLCertificate::toNetscape() returns empty result when built against
-OpenSSL 1.1 since I wasn't able to find a proper equivalent in OpenSSL
-1.1 API (and there does not seem to be any).
-
-(Backport of commit 9a990c69c606126bcd60cd7718462aec2a92460d from
-kdelibs4support)
----
- kio/kssl/kopenssl.cpp        | 250 ++++++++++++++++++++++++++++++++++++++-----
- kio/kssl/kopenssl.h          |  80 ++++++++++++--
- kio/kssl/kssl.cpp            |   4 -
- kio/kssl/ksslcallback.c      |   6 +-
- kio/kssl/ksslcertchain.cpp   |  53 +++------
- kio/kssl/ksslcertificate.cpp |  68 +++++++-----
- 6 files changed, 351 insertions(+), 110 deletions(-)
-
-diff --git a/kio/kssl/kopenssl.cpp b/kio/kssl/kopenssl.cpp
-index e3ca535b25..8f8b921159 100644
---- a/kio/kssl/kopenssl.cpp
-+++ b/kio/kssl/kopenssl.cpp
-@@ -75,18 +75,26 @@ static void (*K_X509_STORE_CTX_free) (X509_STORE_CTX *) = 0L;
- static int (*K_X509_verify_cert) (X509_STORE_CTX *) = 0L;
- static X509_STORE_CTX *(*K_X509_STORE_CTX_new) (void) = 0L;
- static void (*K_X509_STORE_free) (X509_STORE *) = 0L;
-+static void (*K_X509_STORE_set_verify_cb)(X509_STORE *, int (*)(int, X509_STORE_CTX *)) = 0L;
- static X509_STORE *(*K_X509_STORE_new) (void) = 0L;
- static void (*K_X509_free) (X509 *) = 0L;
- static char *(*K_X509_NAME_oneline) (X509_NAME *,char *,int) = 0L;
- static X509_NAME *(*K_X509_get_subject_name) (X509 *) = 0L;
- static X509_NAME *(*K_X509_get_issuer_name) (X509 *) = 0L;
-+static void (*K_X509_get0_signature)(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, const X509 *x) = 0L;
- static X509_LOOKUP *(*K_X509_STORE_add_lookup) (X509_STORE *, X509_LOOKUP_METHOD *) = 0L;
- static X509_LOOKUP_METHOD *(*K_X509_LOOKUP_file)(void) = 0L;
- static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = 0L;
- static int (*K_X509_LOOKUP_ctrl)(X509_LOOKUP *, int, const char *, long, char **) = 0L;
- static void (*K_X509_STORE_CTX_init)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *) = 0L;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- static void (*K_CRYPTO_free)       (void *) = 0L;
-+#else
-+static void (*K_CRYPTO_free)(void *, const char *, int) = 0L;
-+#endif
- static X509* (*K_X509_dup)         (X509 *) = 0L;
-+static ASN1_TIME *(*K_X509_getm_notBefore)(const X509 *) = 0L;
-+static ASN1_TIME *(*K_X509_getm_notAfter)(const X509 *) = 0L;
- static BIO_METHOD *(*K_BIO_s_mem) (void) = 0L;
- static BIO* (*K_BIO_new) (BIO_METHOD *) = 0L;
- static BIO* (*K_BIO_new_fp)   (FILE *, int) = 0L;
-@@ -118,13 +126,16 @@ static int (*K_SSL_get_error) (SSL*, int) = 0L;
- static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = 0L;
- static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = 0L;
- static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = 0L;
--static void (*K_sk_free) (STACK*) = 0L;
--static int (*K_sk_num) (STACK*) = 0L;
--static char* (*K_sk_pop) (STACK*) = 0L;
--static char* (*K_sk_value) (STACK*, int) = 0L;
--static STACK* (*K_sk_new) (int (*)()) = 0L;
--static int (*K_sk_push) (STACK*, char*) = 0L;
--static STACK* (*K_sk_dup) (STACK *) = 0L;
-+static X509 *(*K_X509_STORE_CTX_get_current_cert)(X509_STORE_CTX *) = 0L;
-+static void (*K_X509_STORE_CTX_set_error)(X509_STORE_CTX *, int) = 0L;
-+static int (*K_X509_STORE_CTX_get_error)(X509_STORE_CTX *) = 0L;
-+static void (*K_OPENSSL_sk_free)(STACK *) = 0L;
-+static int (*K_OPENSSL_sk_num)(STACK *) = 0L;
-+static char *(*K_OPENSSL_sk_pop)(STACK *) = 0L;
-+static char *(*K_OPENSSL_sk_value)(STACK *, int) = 0L;
-+static STACK *(*K_OPENSSL_sk_new)(int (*)()) = 0L;
-+static int (*K_OPENSSL_sk_push)(STACK *, char *) = 0L;
-+static STACK *(*K_OPENSSL_sk_dup)(STACK *) = 0L;
- static char * (*K_i2s_ASN1_INTEGER) (X509V3_EXT_METHOD *, ASN1_INTEGER *) =0L;
- static ASN1_INTEGER * (*K_X509_get_serialNumber) (X509 *) = 0L;
- static EVP_PKEY *(*K_X509_get_pubkey)(X509 *) = 0L;
-@@ -164,6 +175,12 @@ static int (*K_X509_PURPOSE_get_id)(X509_PURPOSE *) = 0L;
- static int (*K_X509_check_purpose)(X509*,int,int) = 0L;
- static X509_PURPOSE* (*K_X509_PURPOSE_get0)(int) = 0L;
- static int (*K_EVP_PKEY_assign)(EVP_PKEY*, int, char*) = 0L;
-+static int (*K_EVP_PKEY_base_id)(EVP_PKEY *) = 0L;
-+static RSA *(*K_EVP_PKEY_get0_RSA)(EVP_PKEY *) = 0L;
-+static void (*K_RSA_get0_key)(RSA *, const BIGNUM **, const BIGNUM **, const BIGNUM **) = 0L;
-+static DSA *(*K_EVP_PKEY_get0_DSA)(EVP_PKEY *) = 0L;
-+static void (*K_DSA_get0_pqg)(DSA *, const BIGNUM **, const BIGNUM **, const BIGNUM **) = 0L;
-+static void (*K_DSA_get0_key)(DSA *, const BIGNUM **, const BIGNUM **) = 0L;
- static int (*K_X509_REQ_set_pubkey)(X509_REQ*, EVP_PKEY*) = 0L;
- static RSA *(*K_RSA_generate_key)(int, unsigned long, void (*)(int,int,void *), void *) = 0L;
- static int (*K_i2d_X509_REQ_fp)(FILE*, X509_REQ*) = 0L;
-@@ -410,7 +427,11 @@ KOpenSSLProxy::KOpenSSLProxy()
-       K_RAND_load_file = (int (*)(const char *, long)) d->cryptoLib->resolveFunction("RAND_load_file");
-       K_RAND_file_name = (const char* (*)(char *, size_t)) d->cryptoLib->resolveFunction("RAND_file_name");
-       K_RAND_write_file = (int (*)(const char *)) d->cryptoLib->resolveFunction("RAND_write_file");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-       K_CRYPTO_free = (void (*) (void *)) d->cryptoLib->resolveFunction("CRYPTO_free");
-+#else
-+      K_CRYPTO_free = (void (*)(void *, const char *, int)) d->cryptoLib->resolveFunction("CRYPTO_free");
-+#endif
-       K_d2i_X509 = (X509 * (*)(X509 **,unsigned char **,long)) d->cryptoLib->resolveFunction("d2i_X509");
-       K_i2d_X509 = (int (*)(X509 *,unsigned char **)) d->cryptoLib->resolveFunction("i2d_X509");
-       K_X509_cmp = (int (*)(X509 *, X509 *)) d->cryptoLib->resolveFunction("X509_cmp");
-@@ -419,15 +440,19 @@ KOpenSSLProxy::KOpenSSLProxy()
-       K_X509_verify_cert = (int (*) (X509_STORE_CTX *)) d->cryptoLib->resolveFunction("X509_verify_cert");
-       K_X509_STORE_new = (X509_STORE * (*) (void)) d->cryptoLib->resolveFunction("X509_STORE_new");
-       K_X509_STORE_free = (void (*) (X509_STORE *)) d->cryptoLib->resolveFunction("X509_STORE_free");
-+      K_X509_STORE_set_verify_cb = (void (*)(X509_STORE *, int (*)(int, X509_STORE_CTX *))) d->cryptoLib->resolveFunction("X509_STORE_set_verify_cb");
-       K_X509_NAME_oneline = (char * (*) (X509_NAME *,char *,int)) d->cryptoLib->resolveFunction("X509_NAME_oneline");
-       K_X509_get_subject_name = (X509_NAME * (*) (X509 *)) d->cryptoLib->resolveFunction("X509_get_subject_name");
-       K_X509_get_issuer_name = (X509_NAME * (*) (X509 *)) d->cryptoLib->resolveFunction("X509_get_issuer_name");
-+      K_X509_get0_signature = (void (*)(const ASN1_BIT_STRING **, const X509_ALGOR **, const X509 *)) d->cryptoLib->resolveFunction("X509_get0_signature");
-       K_X509_STORE_add_lookup = (X509_LOOKUP *(*) (X509_STORE *, X509_LOOKUP_METHOD *)) d->cryptoLib->resolveFunction("X509_STORE_add_lookup");
-       K_X509_LOOKUP_file = (X509_LOOKUP_METHOD *(*)(void)) d->cryptoLib->resolveFunction("X509_LOOKUP_file");
-       K_X509_LOOKUP_free = (void (*)(X509_LOOKUP *)) d->cryptoLib->resolveFunction("X509_LOOKUP_free");
-       K_X509_LOOKUP_ctrl = (int (*)(X509_LOOKUP *, int, const char *, long, char **)) d->cryptoLib->resolveFunction("X509_LOOKUP_ctrl");
-       K_X509_STORE_CTX_init = (void (*)(X509_STORE_CTX *, X509_STORE *, X509 *, STACK_OF(X509) *)) d->cryptoLib->resolveFunction("X509_STORE_CTX_init");
-       K_X509_dup = (X509* (*)(X509*)) d->cryptoLib->resolveFunction("X509_dup");
-+      K_X509_getm_notBefore = (ASN1_TIME *(*)(const X509 *)) d->cryptoLib->resolveFunction("X509_getm_notBefore");
-+      K_X509_getm_notAfter = (ASN1_TIME *(*)(const X509 *)) d->cryptoLib->resolveFunction("X509_getm_notAfter");
-       K_BIO_s_mem = (BIO_METHOD *(*) (void)) d->cryptoLib->resolveFunction("BIO_s_mem");
-       K_BIO_new = (BIO* (*)(BIO_METHOD *)) d->cryptoLib->resolveFunction("BIO_new");
-       K_BIO_new_fp = (BIO* (*)(FILE*, int)) d->cryptoLib->resolveFunction("BIO_new_fp");
-@@ -454,13 +479,26 @@ KOpenSSLProxy::KOpenSSLProxy()
-       K_X509_REQ_new = (X509_REQ* (*)()) d->cryptoLib->resolveFunction("X509_REQ_new");
-       K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) d->cryptoLib->resolveFunction("X509_STORE_CTX_set_chain");
-       K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolveFunction("X509_STORE_CTX_set_purpose");
--      K_sk_free = (void (*) (STACK *)) d->cryptoLib->resolveFunction("sk_free");
--      K_sk_num = (int (*) (STACK *)) d->cryptoLib->resolveFunction("sk_num");
--      K_sk_pop = (char* (*) (STACK *)) d->cryptoLib->resolveFunction("sk_pop");
--      K_sk_value = (char* (*) (STACK *, int)) d->cryptoLib->resolveFunction("sk_value");
--      K_sk_new = (STACK* (*) (int (*)())) d->cryptoLib->resolveFunction("sk_new");
--      K_sk_push = (int (*) (STACK*, char*)) d->cryptoLib->resolveFunction("sk_push");
--      K_sk_dup = (STACK* (*) (STACK *)) d->cryptoLib->resolveFunction("sk_dup");
-+      K_X509_STORE_CTX_get_current_cert = (X509 * (*)(X509_STORE_CTX *)) d->cryptoLib->resolveFunction("X509_STORE_CTX_get_current_cert");
-+      K_X509_STORE_CTX_set_error = (void (*)(X509_STORE_CTX *, int)) d->cryptoLib->resolveFunction("X509_STORE_CTX_set_error");
-+      K_X509_STORE_CTX_get_error = (int (*)(X509_STORE_CTX *)) d->cryptoLib->resolveFunction("X509_STORE_CTX_get_error");
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+      K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolveFunction("OPENSSL_sk_free");
-+      K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolveFunction("OPENSSL_sk_num");
-+      K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolveFunction("OPENSSL_sk_pop");
-+      K_OPENSSL_sk_value = (char *(*)(STACK *, int)) d->cryptoLib->resolveFunction("OPENSSL_sk_value");
-+      K_OPENSSL_sk_new = (STACK * (*)(int (*)())) d->cryptoLib->resolveFunction("OPENSSL_sk_new");
-+      K_OPENSSL_sk_push = (int (*)(STACK *, char *)) d->cryptoLib->resolveFunction("OPENSSL_sk_push");
-+      K_OPENSSL_sk_dup = (STACK * (*)(STACK *)) d->cryptoLib->resolveFunction("OPENSSL_sk_dup");
-+#else
-+      K_OPENSSL_sk_free = (void (*)(STACK *)) d->cryptoLib->resolveFunction("sk_free");
-+      K_OPENSSL_sk_num = (int (*)(STACK *)) d->cryptoLib->resolveFunction("sk_num");
-+      K_OPENSSL_sk_pop = (char *(*)(STACK *)) d->cryptoLib->resolveFunction("sk_pop");
-+      K_OPENSSL_sk_value = (char *(*)(STACK *, int)) d->cryptoLib->resolveFunction("sk_value");
-+      K_OPENSSL_sk_new = (STACK * (*)(int (*)())) d->cryptoLib->resolveFunction("sk_new");
-+      K_OPENSSL_sk_push = (int (*)(STACK *, char *)) d->cryptoLib->resolveFunction("sk_push");
-+      K_OPENSSL_sk_dup = (STACK * (*)(STACK *)) d->cryptoLib->resolveFunction("sk_dup");
-+#endif
-       K_i2s_ASN1_INTEGER = (char *(*) (X509V3_EXT_METHOD *, ASN1_INTEGER *)) d->cryptoLib->resolveFunction("i2s_ASN1_INTEGER");
-       K_X509_get_serialNumber = (ASN1_INTEGER * (*) (X509 *)) d->cryptoLib->resolveFunction("X509_get_serialNumber");
-       K_X509_get_pubkey = (EVP_PKEY *(*)(X509 *)) d->cryptoLib->resolveFunction("X509_get_pubkey");
-@@ -504,6 +542,12 @@ KOpenSSLProxy::KOpenSSLProxy()
-       K_X509_check_purpose = (int (*)(X509*,int,int)) d->cryptoLib->resolveFunction("X509_check_purpose");
-       K_X509_PURPOSE_get0 = (X509_PURPOSE *(*)(int)) d->cryptoLib->resolveFunction("X509_PURPOSE_get0");
-       K_EVP_PKEY_assign = (int (*)(EVP_PKEY*, int, char*)) d->cryptoLib->resolveFunction("EVP_PKEY_assign");
-+      K_EVP_PKEY_base_id = (int (*)(EVP_PKEY *)) d->cryptoLib->resolveFunction("EVP_PKEY_base_id");
-+      K_EVP_PKEY_get0_RSA = (RSA *(*)(EVP_PKEY *)) d->cryptoLib->resolveFunction("EVP_PKEY_get0_RSA");
-+      K_RSA_get0_key = (void (*)(RSA *, const BIGNUM **, const BIGNUM **, const BIGNUM **)) d->cryptoLib->resolveFunction("ESA_get0_key");
-+      K_EVP_PKEY_get0_DSA = (DSA *(*)(EVP_PKEY *)) d->cryptoLib->resolveFunction("EVP_PKEY_get0_DSA");
-+      K_DSA_get0_pqg = (void (*)(DSA *, const BIGNUM **, const BIGNUM **, const BIGNUM **)) d->cryptoLib->resolveFunction("DSA_get0_pqg");
-+      K_DSA_get0_key = (void (*)(DSA *, const BIGNUM **, const BIGNUM **)) d->cryptoLib->resolveFunction("DSA_get0_key");
-       K_X509_REQ_set_pubkey = (int (*)(X509_REQ*, EVP_PKEY*)) d->cryptoLib->resolveFunction("X509_REQ_set_pubkey");
-       K_RSA_generate_key = (RSA* (*)(int, unsigned long, void (*)(int,int,void *), void *)) d->cryptoLib->resolveFunction("RSA_generate_key");
-       K_i2d_X509_REQ_fp = (int (*)(FILE *, X509_REQ *)) d->cryptoLib->resolveFunction("i2d_X509_REQ_fp");
-@@ -866,6 +910,16 @@ void KOpenSSLProxy::X509_STORE_free(X509_STORE *v) {
- }
- 
- 
-+void KOpenSSLProxy::X509_STORE_set_verify_cb(X509_STORE *store, int (*verify_cb)(int, X509_STORE_CTX *))
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   X509_STORE_set_verify_cb_func(store, verify_cb);
-+#else
-+   if (K_X509_STORE_set_verify_cb) (K_X509_STORE_set_verify_cb)(store, verify_cb);
-+#endif
-+}
-+
-+
- X509_STORE_CTX *KOpenSSLProxy::X509_STORE_CTX_new(void) {
-    if (K_X509_STORE_CTX_new) return (K_X509_STORE_CTX_new)();
-    return 0L;
-@@ -906,6 +960,17 @@ X509_NAME *KOpenSSLProxy::X509_get_issuer_name(X509 *a) {
- }
- 
- 
-+void KOpenSSLProxy::X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **algor, const X509 *x)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    if (psig) *psig = x->signature;
-+    if (algor) *algor = x->sig_alg;
-+#else
-+    if (K_X509_get0_signature) return (K_X509_get0_signature)(psig, algor, x);
-+#endif
-+}
-+
-+
- X509_LOOKUP *KOpenSSLProxy::X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m) {
-    if (K_X509_STORE_add_lookup) return (K_X509_STORE_add_lookup)(v,m);
-    return 0L;
-@@ -934,9 +999,16 @@ void KOpenSSLProxy::X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
- }
- 
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- void KOpenSSLProxy::CRYPTO_free(void *x) {
-    if (K_CRYPTO_free) (K_CRYPTO_free)(x);
- }
-+#else
-+void KOpenSSLProxy::CRYPTO_free(void *x, const char *file, int line)
-+{
-+   if (K_CRYPTO_free) K_CRYPTO_free(x, file, line);
-+}
-+#endif
- 
- 
- X509 *KOpenSSLProxy::X509_dup(X509 *x509) {
-@@ -945,6 +1017,28 @@ X509 *KOpenSSLProxy::X509_dup(X509 *x509) {
- }
- 
- 
-+ASN1_TIME *KOpenSSLProxy::X509_getm_notBefore(const X509 *x)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   return X509_get_notBefore(x);
-+#else
-+   if (K_X509_getm_notBefore) return (K_X509_getm_notBefore)(x);
-+   else return 0L;
-+#endif
-+}
-+
-+
-+ASN1_TIME *KOpenSSLProxy::X509_getm_notAfter(const X509 *x)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   return X509_get_notAfter(x);
-+#else
-+   if (K_X509_getm_notAfter) return (K_X509_getm_notAfter)(x);
-+   else return 0L;
-+#endif
-+}
-+
-+
- BIO *KOpenSSLProxy::BIO_new(BIO_METHOD *type) {
-     if (K_BIO_new) return (K_BIO_new)(type);
-     else return 0L;
-@@ -1093,25 +1187,25 @@ STACK_OF(X509) *KOpenSSLProxy::SSL_get_peer_cert_chain(SSL *s) {
- }
- 
- 
--void KOpenSSLProxy::sk_free(STACK *s) {
--   if (K_sk_free) (K_sk_free)(s);
-+void KOpenSSLProxy::OPENSSL_sk_free(STACK *s) {
-+   if (K_OPENSSL_sk_free) (K_OPENSSL_sk_free)(s);
- }
- 
- 
--int KOpenSSLProxy::sk_num(STACK *s) {
--   if (K_sk_num) return (K_sk_num)(s);
-+int KOpenSSLProxy::OPENSSL_sk_num(STACK *s) {
-+   if (K_OPENSSL_sk_num) return (K_OPENSSL_sk_num)(s);
-    else return -1;
- }
- 
- 
--char *KOpenSSLProxy::sk_pop(STACK *s) {
--   if (K_sk_pop) return (K_sk_pop)(s);
-+char *KOpenSSLProxy::OPENSSL_sk_pop(STACK *s) {
-+   if (K_OPENSSL_sk_pop) return (K_OPENSSL_sk_pop)(s);
-    else return 0L;
- }
- 
- 
--char *KOpenSSLProxy::sk_value(STACK *s, int n) {
--   if (K_sk_value) return (K_sk_value)(s, n);
-+char *KOpenSSLProxy::OPENSSL_sk_value(STACK *s, int n) {
-+   if (K_OPENSSL_sk_value) return (K_OPENSSL_sk_value)(s, n);
-    else return 0L;
- }
- 
-@@ -1125,20 +1219,52 @@ void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) {
- }
- 
- 
--STACK* KOpenSSLProxy::sk_dup(STACK *s) {
--   if (K_sk_dup) return (K_sk_dup)(s);
-+X509 *KOpenSSLProxy::X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   return v->current_cert;
-+#else
-+   if (K_X509_STORE_CTX_get_current_cert) return (K_X509_STORE_CTX_get_current_cert)(v);
-+   else return 0L;
-+#endif
-+}
-+
-+
-+void KOpenSSLProxy::X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   v->error = error;
-+#else
-+   if (K_X509_STORE_CTX_set_error) (K_X509_STORE_CTX_set_error)(v, error);
-+#endif
-+}
-+
-+
-+int KOpenSSLProxy::X509_STORE_CTX_get_error(X509_STORE_CTX *v)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   return v->error;
-+#else
-+   if (K_X509_STORE_CTX_get_error) return (K_X509_STORE_CTX_get_error)(v);
-+   else return 0;
-+#endif
-+}
-+
-+
-+STACK* KOpenSSLProxy::OPENSSL_sk_dup(STACK *s) {
-+   if (K_OPENSSL_sk_dup) return (K_OPENSSL_sk_dup)(s);
-    else return 0L;
- }
- 
- 
--STACK* KOpenSSLProxy::sk_new(int (*cmp)()) {
--   if (K_sk_new) return (K_sk_new)(cmp);
-+STACK* KOpenSSLProxy::OPENSSL_sk_new(int (*cmp)()) {
-+   if (K_OPENSSL_sk_new) return (K_OPENSSL_sk_new)(cmp);
-    else return 0L;
- }
- 
- 
--int KOpenSSLProxy::sk_push(STACK* s, char* d) {
--   if (K_sk_push) return (K_sk_push)(s,d);
-+int KOpenSSLProxy::OPENSSL_sk_push(STACK* s, char* d) {
-+   if (K_OPENSSL_sk_push) return (K_OPENSSL_sk_push)(s,d);
-    else return -1;
- }
- 
-@@ -1423,6 +1549,74 @@ int KOpenSSLProxy::EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key) {
-    else return -1;
- }
- 
-+ 
-+int KOpenSSLProxy::EVP_PKEY_base_id(EVP_PKEY *pkey)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   return pkey->type;
-+#else
-+   if (K_EVP_PKEY_base_id) return (K_EVP_PKEY_base_id)(pkey);
-+   else return 0;
-+#endif
-+}
-+
-+
-+RSA *KOpenSSLProxy::EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   return pkey->pkey.rsa;
-+#else
-+   if (K_EVP_PKEY_get0_RSA) return (K_EVP_PKEY_get0_RSA)(pkey);
-+   else return 0L;
-+#endif
-+}
-+
-+
-+void KOpenSSLProxy::RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   if (n) *n = rsa->n;
-+   if (e) *e = rsa->e;
-+   if (d) *d = rsa->d;
-+#else
-+   if (K_RSA_get0_key) (K_RSA_get0_key)(rsa, n, e, d);
-+#endif
-+}
-+
-+
-+DSA *KOpenSSLProxy::EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   return pkey->pkey.dsa;
-+#else
-+   if (K_EVP_PKEY_get0_DSA) return (K_EVP_PKEY_get0_DSA)(pkey);
-+   else return 0L;
-+#endif
-+}
-+
-+
-+void KOpenSSLProxy::DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   if (p) *p = dsa->p;
-+   if (q) *q = dsa->q;
-+   if (g) *g = dsa->g;
-+#else
-+   if (K_DSA_get0_pqg) (K_DSA_get0_pqg)(dsa, p, q, g);
-+#endif
-+}
-+
-+
-+void KOpenSSLProxy::DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key)
-+{
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+   if (pub_key) *pub_key = dsa->pub_key;
-+   if (priv_key) *priv_key = dsa->priv_key;
-+#else
-+   if (K_DSA_get0_key) (K_DSA_get0_key)(dsa, pub_key, priv_key);
-+#endif
-+}
-+
- 
- int KOpenSSLProxy::X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey) {
-    if (K_X509_REQ_set_pubkey) return (K_X509_REQ_set_pubkey)(x, pkey);
-diff --git a/kio/kssl/kopenssl.h b/kio/kssl/kopenssl.h
-index ab05486336..ae3398fbef 100644
---- a/kio/kssl/kopenssl.h
-+++ b/kio/kssl/kopenssl.h
-@@ -297,6 +297,18 @@ public:
- 
- 
-    /*
-+    *   X509_getm_notBefore - get validity start
-+    */
-+   ASN1_TIME *X509_getm_notBefore(const X509 *x);
-+
-+
-+   /*
-+    *   X509_getm_notAfter - get validity end
-+    */
-+   ASN1_TIME *X509_getm_notAfter(const X509 *x);
-+
-+
-+   /*
-     *   X509_STORE_CTX_new - create an X509 store context
-     */
-    X509_STORE_CTX *X509_STORE_CTX_new(void);
-@@ -313,11 +325,31 @@ public:
-     */
-    void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x);
- 
-+
-    /*
-     *   X509_STORE_CTX_set_purpose - set the purpose of the certificate
-     */
-    void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
- 
-+
-+   /*
-+    *   X509_STORE_CTX_get_current_cert - get the current certificate
-+    */
-+   X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *v);
-+
-+
-+   /*
-+    *   X509_STORE_CTX_set_error - set certificate error
-+    */
-+   void X509_STORE_CTX_set_error(X509_STORE_CTX *v, int error);
-+
-+
-+   /*
-+    *   X509_STORE_CTX_get_error - get certificate error
-+    */
-+   int X509_STORE_CTX_get_error(X509_STORE_CTX *v);
-+
-+
-    /*
-     *   X509_verify_cert - verify the certificate
-     */
-@@ -337,6 +369,12 @@ public:
- 
- 
-    /*
-+    *   X509_STORE_set_verify_cb - set verify callback
-+    */
-+   void X509_STORE_set_verify_cb(X509_STORE *v, int (*verify_cb)(int, X509_STORE_CTX *));
-+
-+
-+   /*
-     *   X509_free - free up an X509
-     */
-    void X509_free(X509 *v);
-@@ -361,6 +399,12 @@ public:
- 
- 
-    /*
-+    *   X509_get0_signature - return X509 signature and signature algorithm
-+    */
-+   void X509_get0_signature(const ASN1_BIT_STRING **psig, const X509_ALGOR **palg, const X509 *x);
-+
-+
-+   /*
-     *   X509_STORE_add_lookup - add a lookup file/method to an X509 store
-     */
-    X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
-@@ -393,7 +437,11 @@ public:
-    /*
-     *   CRYPTO_free - free up an internally allocated object
-     */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    void CRYPTO_free(void *x);
-+#else
-+   void CRYPTO_free(void *x, const char *file, int line);
-+#endif
- 
-    /*
-     *   BIO_new - create new BIO
-@@ -505,53 +553,53 @@ public:
-    /*
-     *   Pop off the stack
-     */
--   char *sk_pop(STACK *s);
-+   char *OPENSSL_sk_pop(STACK *s);
- 
- 
-    /*
-     *   Free the stack
-     */
--   void sk_free(STACK *s);
-+   void OPENSSL_sk_free(STACK *s);
- 
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
--   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+   void OPENSSL_sk_free(void *s) { return OPENSSL_sk_free(reinterpret_cast<STACK*>(s)); }
- #endif
- 
-    /*
-     *  Number of elements in the stack
-     */
--   int sk_num(STACK *s);
-+   int OPENSSL_sk_num(STACK *s);
- 
- 
-    /*
-     *  Value of element n in the stack
-     */
--   char *sk_value(STACK *s, int n);
-+   char *OPENSSL_sk_value(STACK *s, int n);
- 
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
--   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+   char *OPENSSL_sk_value(void *s, int n) { return OPENSSL_sk_value(reinterpret_cast<STACK*>(s), n); }
- #endif
- 
-    /*
-     *  Create a new stack
-     */
--   STACK *sk_new(int (*cmp)());
-+   STACK *OPENSSL_sk_new(int (*cmp)());
- 
- 
-    /*
-     *  Add an element to the stack
-     */
--   int sk_push(STACK *s, char *d);
-+   int OPENSSL_sk_push(STACK *s, char *d);
- 
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
--   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+   int OPENSSL_sk_push(void *s, void *d) { return OPENSSL_sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
- #endif
- 
- 
-    /*
-     *  Duplicate the stack
-     */
--   STACK *sk_dup(STACK *s);
-+   STACK *OPENSSL_sk_dup(STACK *s);
- 
- 
-    /*
-@@ -800,6 +848,18 @@ public:
- 
- 
-    /*
-+    * Get key type
-+    */
-+   int EVP_PKEY_base_id(EVP_PKEY *pkey);
-+
-+   RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey);
-+   void RSA_get0_key(RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d);
-+   DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey);
-+   void DSA_get0_pqg(DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
-+   void DSA_get0_key(DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key);
-+
-+
-+   /*
-     * Generate a RSA key
-     */
-    RSA *RSA_generate_key(int bits, unsigned long e, void
-diff --git a/kio/kssl/kssl.cpp b/kio/kssl/kssl.cpp
-index c36db55a42..faba1bb5ab 100644
---- a/kio/kssl/kssl.cpp
-+++ b/kio/kssl/kssl.cpp
-@@ -55,8 +55,6 @@
- #warning "kssl.cc needs to be ported to QSslSocket"
- #endif
- 
--#define sk_dup d->kossl->sk_dup
--
- class KSSLPrivate {
- public:
- 	KSSLPrivate() {
-@@ -212,5 +210,3 @@ bool KSSL::doesSSLWork() {
- 	return m_bSSLWorks;
- }
- 
--#undef sk_dup
--
-diff --git a/kio/kssl/ksslcallback.c b/kio/kssl/ksslcallback.c
-index 516b916337..38e94356e8 100644
---- a/kio/kssl/ksslcallback.c
-+++ b/kio/kssl/ksslcallback.c
-@@ -28,7 +28,7 @@ bool KSSL_X509CallBack_ca_found;
- extern "C" {
- static int X509Callback(int ok, X509_STORE_CTX *ctx) {
-  
--  kDebug(7029) << "X509Callback: ok = " << ok << " error = " << ctx->error << " depth = " << ctx->error_depth;
-+  //kDebug(7029) << "X509Callback: ok = " << ok << " error = " << ctx->error << " depth = " << ctx->error_depth;
-   // Here is how this works.  We put "ok = 1;" in any case that we
-   // don't consider to be an error.  In that case, it will return OK
-   // for the certificate check as long as there are no other critical
-@@ -39,14 +39,14 @@ static int X509Callback(int ok, X509_STORE_CTX *ctx) {
- 
-   if (KSSL_X509CallBack_ca)
-   {
--     if (KOSSL::self()->X509_cmp(ctx->current_cert, KSSL_X509CallBack_ca) != 0)
-+     if (KOSSL::self()->X509_cmp(KOSSL::self()->X509_STORE_CTX_get_current_cert(ctx), KSSL_X509CallBack_ca) != 0)
-         return 1; // Ignore errors for this certificate
- 
-      KSSL_X509CallBack_ca_found = true;
-   }
-  
-   if (!ok) {
--    switch (ctx->error) {
-+    switch (KOSSL::self()->X509_STORE_CTX_get_error(ctx)) {
-       case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-       case X509_V_ERR_UNABLE_TO_GET_CRL:
-       case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
-diff --git a/kio/kssl/ksslcertchain.cpp b/kio/kssl/ksslcertchain.cpp
-index 2be7995bf8..cdfab2b5ae 100644
---- a/kio/kssl/ksslcertchain.cpp
-+++ b/kio/kssl/ksslcertchain.cpp
-@@ -44,16 +44,6 @@
- #include <kdebug.h>
- #include <QtCore/QStringList>
- 
--#ifdef KSSL_HAVE_SSL
--#define sk_new d->kossl->sk_new
--#define sk_push d->kossl->sk_push
--#define sk_free d->kossl->sk_free
--#define sk_value d->kossl->sk_value
--#define sk_num d->kossl->sk_num
--#define sk_dup d->kossl->sk_dup
--#define sk_pop d->kossl->sk_pop
--#endif
--
- class KSSLCertChainPrivate {
- public:
-   KSSLCertChainPrivate() {
-@@ -79,11 +69,11 @@ KSSLCertChain::~KSSLCertChain() {
-     STACK_OF(X509) *x = (STACK_OF(X509) *)_chain;
- 
-     for (;;) {
--      X509* x5 = sk_X509_pop(x);
-+      X509 *x5 = reinterpret_cast<X509*>(d->kossl->OPENSSL_sk_pop(reinterpret_cast<STACK *>(x)));
-       if (!x5) break;
-       d->kossl->X509_free(x5);
-     }
--    sk_X509_free(x);
-+    d->kossl->OPENSSL_sk_free(reinterpret_cast<STACK *>(x));
-   }
- #endif
-   delete d;
-@@ -106,7 +96,7 @@ KSSLCertChain *KSSLCertChain::replicate() {
- 
- int KSSLCertChain::depth() {
- #ifdef KSSL_HAVE_SSL
--  return sk_X509_num((STACK_OF(X509)*)_chain);
-+  return d->kossl->OPENSSL_sk_num(static_cast<STACK *>(_chain));
- #endif
- return 0;
- }
-@@ -123,8 +113,8 @@ QList<KSSLCertificate *> KSSLCertChain::getChain() const {
- #ifdef KSSL_HAVE_SSL
-     STACK_OF(X509) *x = (STACK_OF(X509) *)_chain;
- 
--   for (int i = 0; i < sk_X509_num(x); i++) {
--     X509* x5 = sk_X509_value(x, i);
-+   for (int i = 0; i < d->kossl->OPENSSL_sk_num(reinterpret_cast<STACK *>(x)); i++) {
-+     X509 *x5 = reinterpret_cast<X509*>(d->kossl->OPENSSL_sk_value(reinterpret_cast<STACK *>(x), i));
-      if (!x5) continue;
-      KSSLCertificate *nc = new KSSLCertificate;
-      nc->setCert(d->kossl->X509_dup(x5));
-@@ -142,18 +132,18 @@ void KSSLCertChain::setChain(const QList<KSSLCertificate *>& chain) {
-         STACK_OF(X509) *x = (STACK_OF(X509) *)_chain;
- 
-         for (;;) {
--            X509* x5 = sk_X509_pop(x);
-+            X509 *x5 = reinterpret_cast<X509*>(d->kossl->OPENSSL_sk_pop(reinterpret_cast<STACK*>(x)));
-             if (!x5) break;
-             d->kossl->X509_free(x5);
-         }
--        sk_X509_free(x);
--        _chain = NULL;
-+        d->kossl->OPENSSL_sk_free(reinterpret_cast<STACK*>(x));
-+       _chain = NULL;
-     }
- 
-     if (chain.isEmpty()) return;
--    _chain = (void *)sk_new(NULL);
-+    _chain = (void *)d->kossl->OPENSSL_sk_new(NULL);
-     foreach (KSSLCertificate *x, chain) {
--        sk_X509_push((STACK_OF(X509)*)_chain, d->kossl->X509_dup(x->getCert()));
-+        d->kossl->OPENSSL_sk_push(static_cast<STACK*>(_chain), d->kossl->X509_dup(x->getCert()));
-     }
- 
- #endif
-@@ -166,23 +156,23 @@ if (_chain) {
-     STACK_OF(X509) *x = (STACK_OF(X509) *)_chain;
- 
-     for (;;) {
--      X509* x5 = sk_X509_pop(x);
-+      X509 *x5 = reinterpret_cast<X509 *>(d->kossl->OPENSSL_sk_pop(reinterpret_cast<STACK *>(x)));
-       if (!x5) break;
-       d->kossl->X509_free(x5);
-     }
--    sk_X509_free(x);
-+    d->kossl->OPENSSL_sk_free(reinterpret_cast<STACK *>(x));
-     _chain = NULL;
- }
- 
- if (!stack_of_x509) return;
- 
--_chain = (void *)sk_new(NULL);
-+_chain = (void *)d->kossl->OPENSSL_sk_new(NULL);
- STACK_OF(X509) *x = (STACK_OF(X509) *)stack_of_x509;
- 
--   for (int i = 0; i < sk_X509_num(x); i++) {
--     X509* x5 = sk_X509_value(x, i);
-+   for (int i = 0; i < d->kossl->OPENSSL_sk_num(reinterpret_cast<STACK *>(x)); i++) {
-+     X509 *x5 = reinterpret_cast<X509*>(d->kossl->OPENSSL_sk_value(reinterpret_cast<STACK *>(x), i));
-      if (!x5) continue;
--     sk_X509_push((STACK_OF(X509)*)_chain,d->kossl->X509_dup(x5));
-+     d->kossl->OPENSSL_sk_push(reinterpret_cast<STACK *>(_chain), d->kossl->X509_dup(x5));
-    }
- 
- #else
-@@ -202,14 +192,3 @@ void KSSLCertChain::setCertChain(const QStringList& chain) {
-     setChain(cl);
- }
- 
--
--#ifdef KSSL_HAVE_SSL
--#undef sk_new
--#undef sk_push
--#undef sk_free
--#undef sk_value
--#undef sk_num
--#undef sk_dup
--#undef sk_pop
--#endif
--
-diff --git a/kio/kssl/ksslcertificate.cpp b/kio/kssl/ksslcertificate.cpp
-index 0d4fbd9cdc..c93d5c5b22 100644
---- a/kio/kssl/ksslcertificate.cpp
-+++ b/kio/kssl/ksslcertificate.cpp
-@@ -200,14 +200,17 @@ QString KSSLCertificate::getSignatureText() const {
-     char *s;
-     int n, i;
- 
--    i = d->kossl->OBJ_obj2nid(d->m_cert->sig_alg->algorithm);
-+    const X509_ALGOR *algor;
-+    const ASN1_BIT_STRING *sig;
-+    d->kossl->X509_get0_signature(&sig, &algor, d->m_cert);
-+    i = d->kossl->OBJ_obj2nid(algor->algorithm);
-     rc = i18n("Signature Algorithm: ");
-     rc += (i == NID_undef)?i18n("Unknown"):QString(d->kossl->OBJ_nid2ln(i));
- 
-     rc += '\n';
-     rc += i18n("Signature Contents:");
--    n = d->m_cert->signature->length;
--    s = (char *)d->m_cert->signature->data;
-+    n = sig->length;
-+    s = (char *)sig->data;
-     for (i = 0; i < n; ++i) {
-         if (i%20 != 0) {
-             rc += ':';
-@@ -233,9 +236,10 @@ void KSSLCertificate::getEmails(QStringList &to) const {
-     }
- 
-     STACK *s = d->kossl->X509_get1_email(d->m_cert);
-+    const int size = d->kossl->OPENSSL_sk_num(s);
-     if (s) {
--        for(int n=0; n < s->num; n++) {
--            to.append(d->kossl->sk_value(s,n));
-+        for(int n=0; n < size; n++) {
-+            to.append(d->kossl->OPENSSL_sk_value(s,n));
-         }
-         d->kossl->X509_email_free(s);
-     }
-@@ -317,13 +321,13 @@ QString rc = "";
-     EVP_PKEY *pkey = d->kossl->X509_get_pubkey(d->m_cert);
-     if (pkey) {
-         #ifndef NO_RSA
--            if (pkey->type == EVP_PKEY_RSA) {
-+            if (d->kossl->EVP_PKEY_base_id(pkey) == EVP_PKEY_RSA) {
-                 rc = "RSA";
-             }
-             else
-         #endif
-         #ifndef NO_DSA
--            if (pkey->type == EVP_PKEY_DSA) {
-+            if (d->kossl->EVP_PKEY_base_id(pkey) == EVP_PKEY_DSA) {
-                 rc = "DSA";
-             }
-             else
-@@ -347,8 +351,10 @@ char *x = NULL;
-     if (pkey) {
-         rc = i18nc("Unknown", "Unknown key algorithm");
-         #ifndef NO_RSA
--            if (pkey->type == EVP_PKEY_RSA) {
--                x = d->kossl->BN_bn2hex(pkey->pkey.rsa->n);
-+            if (d->kossl->EVP_PKEY_base_id(pkey) == EVP_PKEY_RSA) {
-+                const BIGNUM *n, *e;
-+                d->kossl->RSA_get0_key(d->kossl->EVP_PKEY_get0_RSA(pkey), &n, &e, NULL);
-+                x = d->kossl->BN_bn2hex(n);
-                 rc = i18n("Key type: RSA (%1 bit)", strlen(x)*4) + '\n';
- 
-                 rc += i18n("Modulus: ");
-@@ -364,15 +370,18 @@ char *x = NULL;
-                 rc += '\n';
-                 d->kossl->OPENSSL_free(x);
- 
--                x = d->kossl->BN_bn2hex(pkey->pkey.rsa->e);
-+                x = d->kossl->BN_bn2hex(e);
-                 rc += i18n("Exponent: 0x") + QLatin1String(x) +
-                   QLatin1String("\n");
-                 d->kossl->OPENSSL_free(x);
-             }
-         #endif
-         #ifndef NO_DSA
--            if (pkey->type == EVP_PKEY_DSA) {
--                x = d->kossl->BN_bn2hex(pkey->pkey.dsa->p);
-+            if (d->kossl->EVP_PKEY_base_id(pkey) == EVP_PKEY_DSA) {
-+                DSA *dsa = d->kossl->EVP_PKEY_get0_DSA(pkey);
-+                const BIGNUM *p, *q, *g;
-+                d->kossl->DSA_get0_pqg(dsa, &p, &q, &g);
-+                x = d->kossl->BN_bn2hex(p);
-                 // hack - this may not be always accurate
-                 rc = i18n("Key type: DSA (%1 bit)", strlen(x)*4) + '\n';
- 
-@@ -389,7 +398,7 @@ char *x = NULL;
-                 rc += '\n';
-                 d->kossl->OPENSSL_free(x);
- 
--                x = d->kossl->BN_bn2hex(pkey->pkey.dsa->q);
-+                x = d->kossl->BN_bn2hex(q);
-                 rc += i18n("160 bit prime factor: ");
-                 for (unsigned int i = 0; i < strlen(x); i++) {
-                     if (i%40 != 0 && i%2 == 0) {
-@@ -403,7 +412,7 @@ char *x = NULL;
-                 rc += '\n';
-                 d->kossl->OPENSSL_free(x);
- 
--                x = d->kossl->BN_bn2hex(pkey->pkey.dsa->g);
-+                x = d->kossl->BN_bn2hex(g);
-                 rc += QString("g: ");
-                 for (unsigned int i = 0; i < strlen(x); i++) {
-                     if (i%40 != 0 && i%2 == 0) {
-@@ -417,7 +426,9 @@ char *x = NULL;
-                 rc += '\n';
-                 d->kossl->OPENSSL_free(x);
- 
--                x = d->kossl->BN_bn2hex(pkey->pkey.dsa->pub_key);
-+                const BIGNUM *pub_key;
-+                d->kossl->DSA_get0_key(dsa, &pub_key, NULL);
-+                x = d->kossl->BN_bn2hex(pub_key);
-                 rc += i18n("Public key: ");
-                 for (unsigned int i = 0; i < strlen(x); i++) {
-                     if (i%40 != 0 && i%2 == 0) {
-@@ -682,7 +693,7 @@ KSSLCertificate::KSSLValidationList KSSLCertificate::validateVerbose(KSSLCertifi
-             return errors;
-         }
- 
--        X509_STORE_set_verify_cb_func(certStore, X509Callback);
-+        d->kossl->X509_STORE_set_verify_cb(certStore, X509Callback);
- 
-         certLookup = d->kossl->X509_STORE_add_lookup(certStore, d->kossl->X509_LOOKUP_file());
-         if (!certLookup) {
-@@ -724,9 +735,9 @@ KSSLCertificate::KSSLValidationList KSSLCertificate::validateVerbose(KSSLCertifi
-         KSSL_X509CallBack_ca = ca ? ca->d->m_cert : 0;
-         KSSL_X509CallBack_ca_found = false;
- 
--        certStoreCTX->error = X509_V_OK;
-+        d->kossl->X509_STORE_CTX_set_error(certStoreCTX, X509_V_OK);
-         rc = d->kossl->X509_verify_cert(certStoreCTX);
--        int errcode = certStoreCTX->error;
-+        int errcode = d->kossl->X509_STORE_CTX_get_error(certStoreCTX);
-         if (ca && !KSSL_X509CallBack_ca_found) {
-             ksslv = KSSLCertificate::Irrelevant;
-         } else {
-@@ -739,9 +750,9 @@ KSSLCertificate::KSSLValidationList KSSLCertificate::validateVerbose(KSSLCertifi
-             d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX,
-                                                  X509_PURPOSE_NS_SSL_SERVER);
- 
--            certStoreCTX->error = X509_V_OK;
-+            d->kossl->X509_STORE_CTX_set_error(certStoreCTX, X509_V_OK);
-             rc = d->kossl->X509_verify_cert(certStoreCTX);
--            errcode = certStoreCTX->error;
-+            errcode = d->kossl->X509_STORE_CTX_get_error(certStoreCTX);
-             ksslv = processError(errcode);
-         }
-         d->kossl->X509_STORE_CTX_free(certStoreCTX);
-@@ -978,7 +989,7 @@ KSSLCertificate::KSSLValidation KSSLCertificate::processError(int ec) {
- 
- QString KSSLCertificate::getNotBefore() const {
- #ifdef KSSL_HAVE_SSL
--    return ASN1_UTCTIME_QString(X509_get_notBefore(d->m_cert));
-+    return ASN1_UTCTIME_QString(d->kossl->X509_getm_notBefore(d->m_cert));
- #else
-     return QString();
- #endif
-@@ -987,7 +998,7 @@ QString KSSLCertificate::getNotBefore() const {
- 
- QString KSSLCertificate::getNotAfter() const {
- #ifdef KSSL_HAVE_SSL
--    return ASN1_UTCTIME_QString(X509_get_notAfter(d->m_cert));
-+    return ASN1_UTCTIME_QString(d->kossl->X509_getm_notAfter(d->m_cert));
- #else
-     return QString();
- #endif
-@@ -996,7 +1007,7 @@ QString KSSLCertificate::getNotAfter() const {
- 
- QDateTime KSSLCertificate::getQDTNotBefore() const {
- #ifdef KSSL_HAVE_SSL
--    return ASN1_UTCTIME_QDateTime(X509_get_notBefore(d->m_cert), NULL);
-+    return ASN1_UTCTIME_QDateTime(d->kossl->X509_getm_notBefore(d->m_cert), NULL);
- #else
-     return QDateTime::currentDateTime();
- #endif
-@@ -1005,7 +1016,7 @@ QDateTime KSSLCertificate::getQDTNotBefore() const {
- 
- QDateTime KSSLCertificate::getQDTNotAfter() const {
- #ifdef KSSL_HAVE_SSL
--    return ASN1_UTCTIME_QDateTime(X509_get_notAfter(d->m_cert), NULL);
-+    return ASN1_UTCTIME_QDateTime(d->kossl->X509_getm_notAfter(d->m_cert), NULL);
- #else
-     return QDateTime::currentDateTime();
- #endif
-@@ -1210,7 +1221,8 @@ typedef struct NETSCAPE_X509_st
- // what a piece of crap this is
- QByteArray KSSLCertificate::toNetscape() {
-     QByteArray qba;
--#ifdef KSSL_HAVE_SSL
-+    // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no OpenSSL at all
-+#if KSSL_HAVE_SSL && OPENSSL_VERSION_NUMBER < 0x10100000L
-     NETSCAPE_X509 nx;
-     ASN1_OCTET_STRING hdr;
-     KTemporaryFile ktf;
-@@ -1293,10 +1305,10 @@ QStringList KSSLCertificate::subjAltNames() const {
-         return rc;
-     }
- 
--    int cnt = d->kossl->sk_GENERAL_NAME_num(names);
-+    int cnt = d->kossl->OPENSSL_sk_num((STACK *)names);
- 
-     for (int i = 0; i < cnt; i++) {
--        const GENERAL_NAME *val = (const GENERAL_NAME *)d->kossl->sk_value(names, i);
-+        const GENERAL_NAME *val = (const GENERAL_NAME *)d->kossl->OPENSSL_sk_value(names, i);
-         if (val->type != GEN_DNS) {
-             continue;
-         }
-@@ -1308,7 +1320,7 @@ QStringList KSSLCertificate::subjAltNames() const {
-             rc += s;
-         }
-     }
--    d->kossl->sk_free(names);
-+    d->kossl->OPENSSL_sk_free(names);
- #endif
-     return rc;
- }
--- 
-2.13.6
-
-
diff --git a/source/kde/patch/kdepim.patch b/source/kde/patch/kdepim.patch
deleted file mode 100644
index 48c259610..000000000
--- a/source/kde/patch/kdepim.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-# Install Kleopatra headers, needed by kopete-cryptography:
-# This used to be fixed?
-zcat $CWD/patch/kdepim/kdepim-install_kleopatra_headers.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Support TLS v1.1 and TLS v1.2:
-zcat $CWD/patch/kdepim/libkf5ksieve-16.04.3.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch b/source/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch
deleted file mode 100644
index 8960ab81e..000000000
--- a/source/kde/patch/kdepim/kdepim-install_kleopatra_headers.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt
---- kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt.install_kleopatra_headers	2013-11-14 02:23:52.000000000 -0600
-+++ kdepim-4.11.90/kleopatra/libkleopatraclient/CMakeLists.txt	2013-11-16 13:17:30.289810575 -0600
-@@ -6,3 +6,7 @@ add_subdirectory(gui)
- 
- add_subdirectory(tests)
- 
-+install(
-+  FILES kleopatraclient_export.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient
-+  )
-diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt
---- kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt.install_kleopatra_headers	2013-11-14 02:23:52.000000000 -0600
-+++ kdepim-4.11.90/kleopatra/libkleopatraclient/core/CMakeLists.txt	2013-11-16 13:17:30.290810557 -0600
-@@ -72,3 +72,13 @@ else()
- endif()
- 
- install(TARGETS kleopatraclientcore ${INSTALL_TARGETS_DEFAULT_ARGS})
-+
-+install(
-+  FILES
-+    initialization.h
-+    command.h
-+    selectcertificatecommand.h
-+    signencryptfilescommand.h
-+    decryptverifyfilescommand.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/core
-+  )
-diff -up kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt
---- kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt.install_kleopatra_headers	2013-11-14 02:23:52.000000000 -0600
-+++ kdepim-4.11.90/kleopatra/libkleopatraclient/gui/CMakeLists.txt	2013-11-16 13:17:30.290810557 -0600
-@@ -16,3 +16,9 @@ set_target_properties(kleopatraclientgui
- )
- 
- install(TARGETS kleopatraclientgui ${INSTALL_TARGETS_DEFAULT_ARGS})
-+
-+install(
-+  FILES
-+    certificaterequester.h
-+  DESTINATION ${INCLUDE_INSTALL_DIR}/libkleopatraclient/gui
-+  )
-diff -up kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkleo/CMakeLists.txt
---- kdepim-4.11.90/libkleo/CMakeLists.txt.install_kleopatra_headers	2013-11-14 02:23:52.000000000 -0600
-+++ kdepim-4.11.90/libkleo/CMakeLists.txt	2013-11-16 13:17:30.290810557 -0600
-@@ -121,3 +121,61 @@ install ( FILES libkleopatrarc-win32.des
- else ()
- install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
- endif ()
-+
-+install( FILES
-+    kleo/kleo_export.h
-+    kleo/enum.h
-+    kleo/oidmap.h
-+    kleo/cryptobackend.h
-+    kleo/cryptobackendfactory.h
-+    kleo/cryptoconfig.h
-+    kleo/dn.h
-+    kleo/job.h
-+    kleo/keylistjob.h
-+    kleo/keygenerationjob.h
-+    kleo/abstractimportjob.h
-+    kleo/importjob.h
-+    kleo/importfromkeyserverjob.h
-+    kleo/exportjob.h
-+    kleo/changeexpiryjob.h
-+    kleo/changeownertrustjob.h
-+    kleo/downloadjob.h
-+    kleo/deletejob.h
-+    kleo/encryptjob.h
-+    kleo/decryptjob.h
-+    kleo/signjob.h
-+    kleo/specialjob.h
-+    kleo/verifydetachedjob.h
-+    kleo/verifyopaquejob.h
-+    kleo/decryptverifyjob.h
-+    kleo/signencryptjob.h
-+    kleo/signkeyjob.h
-+    kleo/adduseridjob.h
-+    kleo/refreshkeysjob.h
-+    kleo/multideletejob.h
-+    kleo/hierarchicalkeylistjob.h
-+    kleo/keyfilter.h
-+    kleo/keyfiltermanager.h
-+    kleo/changepasswdjob.h
-+    kleo/checksumdefinition.h
-+    kleo/exception.h
-+    kleo/kconfigbasedkeyfilter.h
-+    kleo/listallkeysjob.h
-+    kleo/stl_util.h
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel)
-+
-+install ( FILES
-+    ui/kdhorizontalline.h
-+    ui/messagebox.h
-+    ui/progressbar.h
-+    ui/progressdialog.h
-+    ui/keylistview.h
-+    ui/keyselectiondialog.h
-+    ui/keyrequester.h
-+    ui/keyapprovaldialog.h
-+    ui/dnattributeorderconfigwidget.h
-+    ui/cryptoconfigmodule.h
-+    ui/cryptoconfigdialog.h
-+    ui/directoryserviceswidget.h
-+    ui/filenamerequester.h
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)
-diff -up kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers kdepim-4.11.90/libkpgp/CMakeLists.txt
---- kdepim-4.11.90/libkpgp/CMakeLists.txt.install_kleopatra_headers	2013-11-16 13:17:30.290810557 -0600
-+++ kdepim-4.11.90/libkpgp/CMakeLists.txt	2013-11-16 13:20:55.258111864 -0600
-@@ -35,3 +35,11 @@ add_subdirectory( tests )
- install(FILES kconf_update/kpgp.upd  DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
- install(PROGRAMS kconf_update/kpgp-3.1-upgrade-address-data.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
- 
-+install(FILES
-+        kpgp.h
-+        kpgpbase.h
-+        kpgpblock.h
-+        kpgpkey.h
-+        kpgpui.h
-+        libkpgp_export.h
-+        DESTINATION ${INCLUDE_INSTALL_DIR}/kpgp COMPONENT Devel )
-
diff --git a/source/kde/patch/kdepim/libkf5ksieve-16.04.3.diff b/source/kde/patch/kdepim/libkf5ksieve-16.04.3.diff
deleted file mode 100644
index ea1f17116..000000000
--- a/source/kde/patch/kdepim/libkf5ksieve-16.04.3.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libksieve/kmanagesieve/session.cpp.orig	2015-06-25 12:47:38.000000000 -0500
-+++ ./libksieve/kmanagesieve/session.cpp	2019-11-08 15:49:06.212790078 -0600
-@@ -368,7 +368,7 @@
-         m_sslCheck->setInterval(60*1000);
-         connect(m_sslCheck, SIGNAL(timeout()), this, SLOT(slotSslTimeout()));
-     }
--    m_socket->setAdvertisedSslVersion( KTcpSocket::TlsV1 );
-+    m_socket->setAdvertisedSslVersion( KTcpSocket::SecureProtocols );
-     m_socket->ignoreSslErrors();
-     connect(m_socket, SIGNAL(encrypted()), SLOT(slotEncryptedDone()));
-     m_sslCheck->start();
diff --git a/source/kde/patch/kdepimlibs.patch b/source/kde/patch/kdepimlibs.patch
deleted file mode 100644
index 0939702f2..000000000
--- a/source/kde/patch/kdepimlibs.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-zcat $CWD/patch/kdepimlibs/kdepimlibs.libical3.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Support TLS v1.1 and TLS v1.2:
-zcat $CWD/patch/kdepimlibs/kimap-16.04.2.diff.gz | patch -p1 -l --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/kdepimlibs/kdepimlibs.libical3.diff b/source/kde/patch/kdepimlibs/kdepimlibs.libical3.diff
deleted file mode 100644
index c3b8caf8e..000000000
--- a/source/kde/patch/kdepimlibs/kdepimlibs.libical3.diff
+++ /dev/null
@@ -1,184 +0,0 @@
---- ./kcalcore/icalformat_p.cpp.orig	2015-06-24 07:43:14.000000000 -0500
-+++ ./kcalcore/icalformat_p.cpp	2017-12-05 23:03:44.742261940 -0600
-@@ -2301,7 +2301,6 @@
-     t.second = 0;
- 
-     t.is_date = 1;
--    t.is_utc = 0;
-     t.zone = 0;
- 
-     return t;
-@@ -2322,8 +2321,7 @@
-         t.minute = datetime.time().minute();
-         t.second = datetime.time().second();
-     }
--    t.zone = 0;   // zone is NOT set
--    t.is_utc = datetime.isUtc() ? 1 : 0;
-+    t.zone = datetime.isUtc() ? icaltimezone_get_utc_timezone() : 0;   // zone is NOT set
- 
-     // _dumpIcaltime( t );
- 
-@@ -2398,7 +2396,7 @@
-     }
- 
-     KTimeZone ktz;
--    if (!t.is_utc) {
-+    if (!icaltime_is_utc( t )) {
-         ktz = dt.timeZone();
-     }
- 
-@@ -2431,7 +2429,7 @@
- //  _dumpIcaltime( t );
- 
-     KDateTime::Spec timeSpec;
--    if (t.is_utc  ||  t.zone == icaltimezone_get_utc_timezone()) {
-+    if (icaltime_is_utc( t )  ||  t.zone == icaltimezone_get_utc_timezone()) {
-         timeSpec = KDateTime::UTC;   // the time zone is UTC
-         utc = false;    // no need to convert to UTC
-     } else {
---- ./kcalcore/icaltimezones.cpp.orig	2015-06-24 07:43:14.000000000 -0500
-+++ ./kcalcore/icaltimezones.cpp	2017-12-05 23:03:55.482262829 -0600
-@@ -54,7 +54,7 @@
- {
-     return QDateTime(QDate(t.year, t.month, t.day),
-                      QTime(t.hour, t.minute, t.second),
--                     (t.is_utc ? Qt::UTC : Qt::LocalTime));
-+                     (icaltime_is_utc( t ) ? Qt::UTC : Qt::LocalTime));
- }
- 
- // Maximum date for time zone data.
-@@ -81,7 +81,6 @@
-     t.second = local.time().second();
-     t.is_date = 0;
-     t.zone = 0;
--    t.is_utc = 0;
-     return t;
- }
- 
-@@ -886,7 +885,7 @@
-         case ICAL_LASTMODIFIED_PROPERTY:
-         {
-             const icaltimetype t = icalproperty_get_lastmodified(p);
--            if (t.is_utc) {
-+            if (icaltime_is_utc( t )) {
-                 data->d->lastModified = toQDateTime(t);
-             } else {
-                 kDebug() << "LAST-MODIFIED not UTC";
-@@ -1259,7 +1258,7 @@
-     // Convert DTSTART to QDateTime, and from local time to UTC
-     const QDateTime localStart = toQDateTime(dtstart);     // local time
-     dtstart.second -= prevOffset;
--    dtstart.is_utc = 1;
-+    dtstart.zone = icaltimezone_get_utc_timezone();
-     const QDateTime utcStart = toQDateTime(icaltime_normalize(dtstart));       // UTC
- 
-     transitions += utcStart;
-@@ -1286,13 +1285,13 @@
-                     t.minute = dtstart.minute;
-                     t.second = dtstart.second;
-                     t.is_date = 0;
--                    t.is_utc = 0;    // dtstart is in local time
-+                    t.zone = 0;    // dtstart is in local time
-                 }
-                 // RFC2445 states that RDATE must be in local time,
-                 // but we support UTC as well to be safe.
--                if (!t.is_utc) {
-+                if (!icaltime_is_utc( t )) {
-                     t.second -= prevOffset;    // convert to UTC
--                    t.is_utc = 1;
-+                    t.zone = icaltimezone_get_utc_timezone();
-                     t = icaltime_normalize(t);
-                 }
-                 transitions += toQDateTime(t);
---- ./kcal/icalformat_p.cpp.orig	2015-06-24 07:43:14.000000000 -0500
-+++ ./kcal/icalformat_p.cpp	2017-12-05 23:04:01.670263342 -0600
-@@ -2087,7 +2087,6 @@
-   t.second = 0;
- 
-   t.is_date = 1;
--  t.is_utc = 0;
-   t.zone = 0;
- 
-   return t;
-@@ -2106,8 +2105,7 @@
-   t.second = datetime.time().second();
- 
-   t.is_date = 0;
--  t.zone = 0;   // zone is NOT set
--  t.is_utc = datetime.isUtc() ? 1 : 0;
-+  t.zone = datetime.isUtc() ? icaltimezone_get_utc_timezone() : 0;
- 
-   // _dumpIcaltime( t );
- 
-@@ -2174,7 +2172,7 @@
-   }
- 
-   KTimeZone ktz;
--  if ( !t.is_utc ) {
-+  if ( !icaltime_is_utc( t ) ) {
-     ktz = dt.timeZone();
-   }
- 
-@@ -2207,7 +2205,7 @@
- //  _dumpIcaltime( t );
- 
-   KDateTime::Spec timeSpec;
--  if ( t.is_utc  ||  t.zone == icaltimezone_get_utc_timezone() ) {
-+  if ( icaltime_is_utc( t )  ||  t.zone == icaltimezone_get_utc_timezone() ) {
-     timeSpec = KDateTime::UTC;   // the time zone is UTC
-     utc = false;    // no need to convert to UTC
-   } else {
---- ./kcal/icaltimezones.cpp.orig	2015-06-24 07:43:14.000000000 -0500
-+++ ./kcal/icaltimezones.cpp	2017-12-05 23:04:07.385263815 -0600
-@@ -50,7 +50,7 @@
- {
-   return QDateTime( QDate( t.year, t.month, t.day ),
-                     QTime( t.hour, t.minute, t.second ),
--                    ( t.is_utc ? Qt::UTC : Qt::LocalTime ) );
-+                    ( icaltime_is_utc( t ) ? Qt::UTC : Qt::LocalTime ) );
- }
- 
- // Maximum date for time zone data.
-@@ -77,7 +77,6 @@
-   t.second = local.time().second();
-   t.is_date = 0;
-   t.zone = 0;
--  t.is_utc = 0;
-   return t;
- }
- 
-@@ -787,7 +786,7 @@
-     case ICAL_LASTMODIFIED_PROPERTY:
-     {
-       icaltimetype t = icalproperty_get_lastmodified(p);
--      if ( t.is_utc ) {
-+      if ( icaltime_is_utc( t ) ) {
-         data->d->lastModified = toQDateTime( t );
-       } else {
-         kDebug() << "LAST-MODIFIED not UTC";
-@@ -972,7 +971,7 @@
-   // Convert DTSTART to QDateTime, and from local time to UTC
-   QDateTime localStart = toQDateTime( dtstart );   // local time
-   dtstart.second -= prevOffset;
--  dtstart.is_utc = 1;
-+  dtstart.zone = icaltimezone_get_utc_timezone();
-   QDateTime utcStart = toQDateTime( icaltime_normalize( dtstart ) );   // UTC
- 
-   transitions += utcStart;
-@@ -999,13 +998,13 @@
-           t.minute = dtstart.minute;
-           t.second = dtstart.second;
-           t.is_date = 0;
--          t.is_utc = 0;    // dtstart is in local time
-+          t.zone = 0;    // dtstart is in local time
-         }
-         // RFC2445 states that RDATE must be in local time,
-         // but we support UTC as well to be safe.
--        if ( !t.is_utc ) {
-+        if ( !icaltime_is_utc( t ) ) {
-           t.second -= prevOffset;    // convert to UTC
--          t.is_utc = 1;
-+          t.zone = icaltimezone_get_utc_timezone();
-           t = icaltime_normalize( t );
-         }
-         transitions += toQDateTime( t );
diff --git a/source/kde/patch/kdepimlibs/kimap-16.04.2.diff b/source/kde/patch/kdepimlibs/kimap-16.04.2.diff
deleted file mode 100644
index dabca4e3c..000000000
--- a/source/kde/patch/kdepimlibs/kimap-16.04.2.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kimap/loginjob.cpp.orig	2015-06-24 07:43:14.000000000 -0500
-+++ ./kimap/loginjob.cpp	2019-11-08 15:44:05.687811741 -0600
-@@ -382,7 +382,7 @@
- 
-       switch ( d->authState ) {
-         case LoginJobPrivate::StartTls:
--          d->sessionInternal()->startSsl( KTcpSocket::TlsV1 );
-+          d->sessionInternal()->startSsl( KTcpSocket::SecureProtocols );
-           break;
- 
-         case LoginJobPrivate::Capability:
diff --git a/source/kde/patch/kdevelop-pg-qt.patch b/source/kde/patch/kdevelop-pg-qt.patch
deleted file mode 100644
index 279fcd4b2..000000000
--- a/source/kde/patch/kdevelop-pg-qt.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-zcat $CWD/patch/kdevelop-pg-qt/0011-fix-some-warnings.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/kdevelop-pg-qt/kdevelop-pg-qt.ftbfs.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/kdevelop-pg-qt/0011-fix-some-warnings.patch b/source/kde/patch/kdevelop-pg-qt/0011-fix-some-warnings.patch
deleted file mode 100644
index 7392fbf33..000000000
--- a/source/kde/patch/kdevelop-pg-qt/0011-fix-some-warnings.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ac587957cd0cabbc668604507e2cfebb6810ed09 Mon Sep 17 00:00:00 2001
-From: Milian Wolff <mail@milianw.de>
-Date: Thu, 29 Nov 2012 15:56:40 +0100
-Subject: [PATCH 11/17] fix some warnings
-
----
- kdev-pg/kdev-pg-code-gen.cpp | 2 +-
- kdev-pg/kdev-pg-lexer.ll     | 2 +-
- kdev-pg/kdev-pg-parser.yy    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp
-index e06c6be..badb461 100644
---- a/kdev-pg/kdev-pg-code-gen.cpp
-+++ b/kdev-pg/kdev-pg-code-gen.cpp
-@@ -51,7 +51,7 @@ namespace KDevPG
- 
-   void generateCondition(const World::NodeSet& s, QTextStream& out)
-   {
--    if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
-+    if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
-     {
-       out << "true /*epsilon*/";
-       return;
-diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll
-index a0864af..9261d71 100644
---- a/kdev-pg/kdev-pg-lexer.ll
-+++ b/kdev-pg/kdev-pg-lexer.ll
-@@ -425,7 +425,7 @@ void appendLineBuffer()
-   strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
-   /* strcpy is faster than strcat */
-   
--  Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
-+  Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
-   
-   lastTextLeng = strlen(yytext);
-   yymoreFlag = false;
-diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy
-index d5a25f5..8f8d604 100644
---- a/kdev-pg/kdev-pg-parser.yy
-+++ b/kdev-pg/kdev-pg-parser.yy
-@@ -309,7 +309,7 @@ opt_lexer_action
-     | T_CONTINUE {
-         r = "\nlxCONTINUE;\n";
-       }
--    | /* empty */ { r = "\nlxSKIP\n" }
-+    | /* empty */ { r = "\nlxSKIP\n"; }
-     ;
- 
- regexp
--- 
-1.9.3
-
diff --git a/source/kde/patch/kdevelop-pg-qt/kdevelop-pg-qt.ftbfs.diff b/source/kde/patch/kdevelop-pg-qt/kdevelop-pg-qt.ftbfs.diff
deleted file mode 100644
index c18d1e4d3..000000000
--- a/source/kde/patch/kdevelop-pg-qt/kdevelop-pg-qt.ftbfs.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kdev-pg/CMakeLists.txt.orig	2018-01-30 16:34:56.192631426 -0600
-+++ ./kdev-pg/CMakeLists.txt	2018-01-30 16:37:04.178643391 -0600
-@@ -79,7 +79,7 @@
-         DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/kdev-pg-lexer.ll"
-                  ${OPTIONAL_PARSER_HEADER_DEPENDENCY}
-         COMMAND ${FLEX_EXECUTABLE}
--        ARGS    --nounistd -o"${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc"
-+        ARGS    --yymore --nounistd -o"${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc"
-                 "${CMAKE_CURRENT_SOURCE_DIR}/kdev-pg-lexer.ll"
-         )
- 
diff --git a/source/kde/patch/kdewebdev.patch b/source/kde/patch/kdewebdev.patch
deleted file mode 100644
index 2abc80be6..000000000
--- a/source/kde/patch/kdewebdev.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-# Make it find tidy:
-zcat $CWD/patch/kdewebdev/include-tidy.patch.gz \
-  | sed -e "s#/tmp/package-kdewebdev#${SLACK_KDE_BUILD_DIR}/${PKGNAME}/package-kdewebdev#" \
-  | patch -p0 --verbose \
-  || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/kdewebdev/include-tidy.patch b/source/kde/patch/kdewebdev/include-tidy.patch
deleted file mode 100644
index fd4de940e..000000000
--- a/source/kde/patch/kdewebdev/include-tidy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- klinkstatus/src/tidy/tidyx.h.orig	2009-09-03 09:55:38.886267704 -0500
-+++ klinkstatus/src/tidy/tidyx.h	2009-09-03 09:57:29.032269520 -0500
-@@ -48,8 +48,8 @@
-   Created 2002-07-11 by Charles Reitzel
- */
- 
--#include <tidy.h>
--#include <buffio.h>
-+#include "/tmp/package-kdewebdev/usr/include/tidy/tidy.h"
-+#include "/tmp/package-kdewebdev/usr/include/tidy/buffio.h"
- 
- #include <config-tidy.h>
-     
diff --git a/source/kde/patch/kgamma.patch b/source/kde/patch/kgamma.patch
deleted file mode 100644
index 1d681a2ce..000000000
--- a/source/kde/patch/kgamma.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix build:
-zcat $CWD/patch/kgamma/kgamma.cmake.include.checkincludefiles.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/kgamma/kgamma.cmake.include.checkincludefiles.diff b/source/kde/patch/kgamma/kgamma.cmake.include.checkincludefiles.diff
deleted file mode 100644
index 1af9c2cb7..000000000
--- a/source/kde/patch/kgamma/kgamma.cmake.include.checkincludefiles.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./CMakeLists.txt.orig	2014-10-09 02:07:16.000000000 -0500
-+++ ./CMakeLists.txt	2018-01-29 22:34:52.281573013 -0600
-@@ -9,6 +9,7 @@
- # X11_xf86vmode discovery is done by FindX11
- macro_log_feature(X11_xf86vmode_FOUND "X11 Video Mode Extension (xf86vm)" "Required to build kgamma." "http://www.x.org" TRUE "" "")
- 
-+include(CheckIncludeFiles)
- check_include_files(strstream HAVE_STRSTREAM_H)
- configure_file(config-kgamma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kgamma.h)
- 
diff --git a/source/kde/patch/konsole.patch b/source/kde/patch/konsole.patch
deleted file mode 100644
index 286c72405..000000000
--- a/source/kde/patch/konsole.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fix scrollUp behavior:
-zcat $CWD/patch/konsole/konsole.scrollup.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-## We're not changing TERM to konsole after all. It's just the path of least
-## resistance to revert the terminfo change that broke it, since it's affecting
-## other systems as well (some of which we cannot patch).
-## Set default TERM=konsole:
-#zcat $CWD/patch/konsole/konsole.term.is.konsole.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/konsole/konsole.scrollup.diff b/source/kde/patch/konsole/konsole.scrollup.diff
deleted file mode 100644
index c80a61ec6..000000000
--- a/source/kde/patch/konsole/konsole.scrollup.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7ff23512fd6c6af1dba87083446f85baf75e9c71 Mon Sep 17 00:00:00 2001
-From: Kurt Hindenburg <kurt.hindenburg@gmail.com>
-Date: Sat, 1 Jul 2017 19:12:39 -0400
-Subject: Correct scrollUp behavior
-
-CSI S escape sequence (SU, scroll up) ignored if number of lines to
-scroll bigger than scrollable lines
-
-REVIEW: 130133
-BUG: 379318
----
- src/Screen.cpp | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/Screen.cpp b/src/Screen.cpp
-index 94841a9..15bd685 100644
---- a/src/Screen.cpp
-+++ b/src/Screen.cpp
-@@ -746,13 +746,18 @@ QRect Screen::lastScrolledRegion() const
- 
- void Screen::scrollUp(int from, int n)
- {
--    if (n <= 0 || from + n > _bottomMargin) return;
-+    if (n <= 0)
-+        return;
-+    if (from > _bottomMargin)
-+        return;
-+    if (from + n > _bottomMargin)
-+        n = _bottomMargin + 1 - from;
- 
-     _scrolledLines -= n;
-     _lastScrolledRegion = QRect(0, _topMargin, _columns - 1, (_bottomMargin - _topMargin));
- 
-     //FIXME: make sure `topMargin', `bottomMargin', `from', `n' is in bounds.
--    moveImage(loc(0, from), loc(0, from + n), loc(_columns - 1, _bottomMargin));
-+    moveImage(loc(0, from), loc(0, from + n), loc(_columns, _bottomMargin));
-     clearImage(loc(0, _bottomMargin - n + 1), loc(_columns - 1, _bottomMargin), ' ');
- }
- 
--- 
-cgit v0.11.2
-
-
diff --git a/source/kde/patch/konsole/konsole.term.is.konsole.diff b/source/kde/patch/konsole/konsole.term.is.konsole.diff
deleted file mode 100644
index edc7a49cc..000000000
--- a/source/kde/patch/konsole/konsole.term.is.konsole.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/Profile.cpp.orig	2014-10-31 23:17:02.000000000 -0500
-+++ ./src/Profile.cpp	2018-04-01 13:08:59.412975556 -0500
-@@ -150,7 +150,7 @@
-     setProperty(Command, qgetenv("SHELL"));
-     setProperty(Arguments, QStringList() << qgetenv("SHELL"));
-     setProperty(Icon, "utilities-terminal");
--    setProperty(Environment, QStringList() << "TERM=xterm");
-+    setProperty(Environment, QStringList() << "TERM=konsole");
-     setProperty(LocalTabTitleFormat, "%d : %n");
-     setProperty(RemoteTabTitleFormat, "(%u) %H");
-     setProperty(ShowTerminalSizeHint, true);
---- ./src/Pty.cpp.orig	2014-10-31 23:17:02.000000000 -0500
-+++ ./src/Pty.cpp	2018-04-01 13:08:52.282975632 -0500
-@@ -218,7 +218,7 @@
- 
-     // extra safeguard to make sure $TERM is always set
-     if (!isTermEnvAdded) {
--        setEnv("TERM", "xterm");
-+        setEnv("TERM", "konsole");
-     }
- }
- 
diff --git a/source/kde/patch/kopete.patch b/source/kde/patch/kopete.patch
deleted file mode 100644
index 8b0e29493..000000000
--- a/source/kde/patch/kopete.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix compiling with gcc 7:
-zcat $CWD/patch/kopete/kopete-gcc6.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/kopete/kopete-gcc6.patch b/source/kde/patch/kopete/kopete-gcc6.patch
deleted file mode 100644
index 7a8971136..000000000
--- a/source/kde/patch/kopete/kopete-gcc6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9f994ba6950117cbbeefc6027fa0a52ce74932e2 Mon Sep 17 00:00:00 2001
-From: Peter Levine <plevine457@gmail.com>
-Date: Tue, 31 May 2016 17:40:42 +0200
-Subject: Fix compilation with GCC 6
-
-REVIEW: 128006
-BUG: 363053
-FIXED-IN: 16.04.2
----
- plugins/history2/history2logger.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/history2/history2logger.h b/plugins/history2/history2logger.h
-index 13f159a..8083526 100644
---- a/plugins/history2/history2logger.h
-+++ b/plugins/history2/history2logger.h
-@@ -94,7 +94,7 @@ public:
- 	 * from Kopete::Contact @param c in the given @param sens
- 	 */
- 	QList<Kopete::Message> readMessages(int lines,
--	                                    int offset=0, const Kopete::MetaContact *c=false, bool reverseOrder=true);
-+	                                    int offset=0, const Kopete::MetaContact *c=NULL, bool reverseOrder=true);
- 
- 	/**
- 	 * Same as the following, but for one date. I did'nt reuse the above function
--- 
-cgit v0.11.2
-
diff --git a/source/kde/patch/krdc.patch b/source/kde/patch/krdc.patch
deleted file mode 100644
index 54e82a097..000000000
--- a/source/kde/patch/krdc.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Allow for the use of xfreerdp >= 1.1.0:
-zcat $CWD/patch/krdc/krdc_freerdp-1.1.0.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/krdc/krdc_freerdp-1.1.0.patch b/source/kde/patch/krdc/krdc_freerdp-1.1.0.patch
deleted file mode 100644
index 75b514688..000000000
--- a/source/kde/patch/krdc/krdc_freerdp-1.1.0.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-Support >=free-rdp-1.1.0.
-
-https://git.reviewboard.kde.org/r/115059/
-
-diff --git a/rdp/rdpview.cpp b/rdp/rdpview.cpp
-index 0d14e04691549e084b58501cd10ca2382ef25c63..9062ba5fa060284a679f0c9bc211ab7dd6972c0a 100644
---- a/rdp/rdpview.cpp
-+++ b/rdp/rdpview.cpp
-@@ -158,71 +158,58 @@ bool RdpView::start()
-         width = this->parentWidget()->size().width();
-         height = this->parentWidget()->size().height();
-     }
--    arguments << "-g" << QString::number(width) + 'x' + QString::number(height);
-+    arguments << "-decorations";  // put this option first so we can detect xfreerdp < 1.1
-+    arguments << "/w:" + QString::number(width);
-+    arguments << "/h:" + QString::number(height);
- 
--    arguments << "-k" << keymapToXfreerdp(m_hostPreferences->keyboardLayout());
-+    arguments << "/kbd:" + keymapToXfreerdp(m_hostPreferences->keyboardLayout());
- 
-     if (!m_url.userName().isEmpty()) {
-         // if username contains a domain, it needs to be set with another parameter
-         if (m_url.userName().contains('\\')) {
-             const QStringList splittedName = m_url.userName().split('\\');
--            arguments << "-d" << splittedName.at(0);
--            arguments << "-u" << splittedName.at(1);
-+            arguments << "/d:" + splittedName.at(0);
-+            arguments << "/u:" + splittedName.at(1);
-         } else {
--            arguments << "-u" << m_url.userName();
-+            arguments << "/u:" + m_url.userName();
-         }
-     } else {
--        arguments << "-u" << "";
-+        arguments << "-u:";
-     }
- 
--    if (!m_url.password().isNull())
--        arguments << "-p" << m_url.password();
--
--    arguments << "-D";  // request the window has no decorations
--    arguments << "-X" << QString::number(m_container->winId());
--    arguments << "-a" << QString::number((m_hostPreferences->colorDepth() + 1) * 8);
--
--    switch (m_hostPreferences->sound()) {
--    case 1:
--        arguments << "-o";
--        break;
--    case 0:
--        arguments << "--plugin" << "rdpsnd";
--        break;
--    case 2:
--    default:
--        break;
--    }
-+    arguments << "/parent-window:" + QString::number(m_container->winId());
-+    arguments << "/bpp:" + QString::number((m_hostPreferences->colorDepth() + 1) * 8);
-+    arguments << "/audio-mode:" + m_hostPreferences->sound();
- 
-     if (!m_hostPreferences->shareMedia().isEmpty()) {
-         QStringList shareMedia;
--        shareMedia << "--plugin" << "rdpdr" << "--data" << "disk:media:" + m_hostPreferences->shareMedia() << "--";
-+        shareMedia << "/drive:media," + m_hostPreferences->shareMedia();
-         arguments += shareMedia;
-     }
- 
-     QString performance;
-     switch (m_hostPreferences->performance()) {
-     case 0:
--        performance = 'm';
-+        performance = "modem";
-         break;
-     case 1:
--        performance = 'b';
-+        performance = "broadband";
-         break;
-     case 2:
--        performance = 'l';
-+        performance = "lan";
-         break;
-     default:
-         break;
-     }
- 
--    arguments << "-x" << performance;
-+    arguments << "/network:" + performance;
- 
-     if (m_hostPreferences->console()) {
--        arguments << "-0";
-+        arguments << "/admin";
-     }
- 
-     if (m_hostPreferences->remoteFX()) {
--        arguments << "--rfx";
-+        arguments << "/rfx";
-     }
- 
-     if (!m_hostPreferences->extraOptions().isEmpty()) {
-@@ -233,16 +220,21 @@ bool RdpView::start()
-     // krdc has no support for certificate management yet; it would not be possbile to connect to any host:
-     // "The host key for example.com has changed" ...
-     // "Add correct host key in ~/.freerdp/known_hosts to get rid of this message."
--    arguments << "--ignore-certificate";
-+    arguments << "/cert-ignore";
- 
-     // clipboard sharing is activated in KRDC; user can disable it at runtime
--    arguments << "--plugin" << "cliprdr";
-+    arguments << "/clipboard";
- 
--    arguments << "-t" << QString::number(m_port);
--    arguments << m_host;
-+    arguments << "/port:" + QString::number(m_port);
-+    arguments << "/v:" + m_host;
- 
-     kDebug(5012) << "Starting xfreerdp with arguments:" << arguments;
- 
-+    //avoid printing the password in debug
-+    if (!m_url.password().isNull()) {
-+        arguments << "/p:" + m_url.password();
-+    }
-+
-     setStatus(Connecting);
- 
-     connect(m_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError)));
-@@ -302,7 +294,7 @@ void RdpView::connectionError()
- 
- void RdpView::processError(QProcess::ProcessError error)
- {
--    kDebug(5012) << "processError:" << error;
-+    kDebug(5012) << error;
-     if (m_quitFlag) // do not try to show error messages while quitting (prevent crashes)
-         return;
- 
-@@ -319,33 +311,13 @@ void RdpView::processError(QProcess::ProcessError error)
- void RdpView::receivedStandardError()
- {
-     const QString output(m_process->readAllStandardError());
--    kDebug(5012) << "receivedStandardError:" << output;
--    QString line;
--    int i = 0;
--    while (!(line = output.section('\n', i, i)).isEmpty()) {
--        
--        // the following error is issued by freerdp because of a bug in freerdp 1.0.1 and below;
--        // see: https://github.com/FreeRDP/FreeRDP/pull/576
--        //"X Error of failed request:  BadWindow (invalid Window parameter)
--        //   Major opcode of failed request:  7 (X_ReparentWindow)
--        //   Resource id in failed request:  0x71303348
--        //   Serial number of failed request:  36
--        //   Current serial number in output stream:  36"
--        if (line.contains(QLatin1String("X_ReparentWindow"))) {
--            KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are using is too old.\n"
--                                       "xfreerdp 1.0.2 or greater is required."),
--                               i18n("RDP Failure"));
--            connectionError();
--            return;
--        }
--        i++;
--    }
-+    kDebug(5012) << output;
- }
- 
- void RdpView::receivedStandardOutput()
- {
-     const QString output(m_process->readAllStandardOutput());
--    kDebug(5012) << "receivedStandardOutput:" << output;
-+    kDebug(5012) << output;
-     QString line;
-     int i = 0;
-     while (!(line = output.section('\n', i, i)).isEmpty()) {
-@@ -373,6 +345,14 @@ void RdpView::receivedStandardOutput()
-             return;
-         }
- 
-+        // we no longer support freerdp < 1.1, we only support versions with the new interface
-+        if (line.contains(QLatin1String("invalid option: -decorations"))) {
-+            KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are using is too old.\n"
-+                                       "xfreerdp 1.1 or greater is required."),
-+                               i18n("RDP Failure"));
-+            connectionError();
-+            return;
-+        }
-         i++;
-     }
- }
diff --git a/source/kde/patch/kscreen.patch b/source/kde/patch/kscreen.patch
deleted file mode 100644
index c369b4d94..000000000
--- a/source/kde/patch/kscreen.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Kludge around a strange failure in setting up the unit tests:
-zcat $CWD/patch/kscreen/kscreen.broken.test.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/kscreen/kscreen.broken.test.diff b/source/kde/patch/kscreen/kscreen.broken.test.diff
deleted file mode 100644
index 5b102d96c..000000000
--- a/source/kde/patch/kscreen/kscreen.broken.test.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./tests/CMakeLists.txt.orig	2013-11-22 04:15:16.000000000 -0600
-+++ ./tests/CMakeLists.txt	2015-10-24 18:51:44.332554749 -0500
-@@ -17,4 +17,3 @@
- 
- target_link_libraries(testgenerator ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kscreen)
- 
--add_test(testgenerator ${CMAKE_CURRENT_BINARY_DIR}/testgenerator)
-\ No newline at end of file
diff --git a/source/kde/patch/ktorrent.patch b/source/kde/patch/ktorrent.patch
deleted file mode 100644
index 0f75eabc0..000000000
--- a/source/kde/patch/ktorrent.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-zcat $CWD/patch/ktorrent/ktorrent.use.package.geoip.database.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff b/source/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
deleted file mode 100644
index 0a9fd8042..000000000
--- a/source/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./plugins/infowidget/geoipmanager.cpp.orig	2013-01-14 11:12:24.000000000 -0600
-+++ ./plugins/infowidget/geoipmanager.cpp	2019-03-17 15:14:38.020018110 -0500
-@@ -39,7 +39,7 @@
- #ifdef USE_SYSTEM_GEOIP
- 		geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD);
- #else
--		geoip_data_file = KStandardDirs::locate("data", "ktorrent/geoip.dat");
-+		geoip_data_file = "/usr/share/apps/ktorrent/GeoIP/geoip.dat";
- 		if (geoip_data_file.isNull())
- 			geoip_data_file = KStandardDirs::locate("data", "ktorrent/GeoIP.dat");
- 		
-@@ -54,12 +54,6 @@
- 			{
- 				QFileInfo fi(geoip_data_file);
- 				QDateTime now = QDateTime::currentDateTime();
--				if (fi.lastModified().daysTo(now) >= 30)
--				{
--					// if the last time the geoip file was modified, was more then
--					// 30 days ago, redownload it
--					downloadDataBase();
--				}
- 			}
- 		}
- #endif
-@@ -104,12 +98,6 @@
- 	
- 	void GeoIPManager::downloadDataBase()
- 	{
--#ifndef USE_SYSTEM_GEOIP
--		Out(SYS_INW|LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url.prettyUrl() << endl;
--		download_destination = kt::DataDir() + geoip_url.fileName();
--		KIO::CopyJob* job = KIO::copy(geoip_url,download_destination,KIO::Overwrite|KIO::HideProgressInfo);
--		connect(job,SIGNAL(result(KJob*)),this,SLOT(databaseDownloadFinished(KJob*)));
--#endif
- 	}
- 	
- 	void GeoIPManager::databaseDownloadFinished(KJob* job)
diff --git a/source/kde/patch/ktouch.patch b/source/kde/patch/ktouch.patch
deleted file mode 100644
index 66b2cdf7a..000000000
--- a/source/kde/patch/ktouch.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-zcat $CWD/patch/ktouch/ktouch.performance.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/ktouch/ktouch.performance.diff b/source/kde/patch/ktouch/ktouch.performance.diff
deleted file mode 100644
index 526294fe2..000000000
--- a/source/kde/patch/ktouch/ktouch.performance.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/declarativeitems/lessonpainter.cpp b/src/declarativeitems/lessonpainter.cpp
-index dc8fc61..2c56c0c 100644
---- a/src/declarativeitems/lessonpainter.cpp
-+++ b/src/declarativeitems/lessonpainter.cpp
-@@ -236,8 +236,7 @@ void LessonPainter::updateTrainingStatus()
-     const QString referenceLine = m_trainingLineCore->referenceLine();
-     const QString actualLine = m_trainingLineCore->actualLine();
-     const QString preeditString = m_trainingLineCore->preeditString();
--    const QTextBlock block = m_doc->findBlockByNumber(m_currentLine + 1);
--    const int blockPosition = block.position();
-+    const int blockPosition = m_doc->findBlockByNumber(m_currentLine + 1).position();
- 
-     for (int linePos = 0; linePos < referenceLine.length(); linePos++)
-     {
-@@ -257,8 +256,14 @@ void LessonPainter::updateTrainingStatus()
- 
-         cursor.setPosition(charPosition, QTextCursor::MoveAnchor);
-         cursor.setPosition(charPosition + 1, QTextCursor::KeepAnchor);
--        cursor.deleteChar();
--        cursor.insertText(QString(displayedChar), charFormat);
-+	
-+        /* QUICKFIX: Using the charFormat to decide whether a char must be repainted or not.
-+         * Not nice but quite efficient ... */
-+        if (cursor.charFormat() != charFormat)
-+        {
-+            cursor.deleteChar();
-+            cursor.insertText(QString(displayedChar), charFormat);
-+        }
-     }
- 
-     invalidateImageCache();
diff --git a/source/kde/patch/kuser.patch b/source/kde/patch/kuser.patch
deleted file mode 100644
index 70edfd204..000000000
--- a/source/kde/patch/kuser.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix build:
-zcat $CWD/patch/kuser/kuser.cmake.include.checkincludefiles.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/kuser/kuser.cmake.include.checkincludefiles.diff b/source/kde/patch/kuser/kuser.cmake.include.checkincludefiles.diff
deleted file mode 100644
index 264810f62..000000000
--- a/source/kde/patch/kuser/kuser.cmake.include.checkincludefiles.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./CMakeLists.txt.orig	2013-08-03 23:22:20.000000000 -0500
-+++ ./CMakeLists.txt	2018-01-30 14:37:52.197974764 -0600
-@@ -35,6 +35,7 @@
- set(KU_FIRSTGID 500 CACHE STRING "First GID of normal users")
- set(KU_USERPRIVATEGROUP true CACHE STRING "User private groups by default")
- 
-+include(CheckIncludeFiles)
- check_include_files(shadow.h HAVE_SHADOW_H)
- check_include_files(crypt.h HAVE_CRYPT_H)
- check_include_files(sys/stat.h HAVE_SYS_STAT_H)
diff --git a/source/kde/patch/libkscreen.patch b/source/kde/patch/libkscreen.patch
deleted file mode 100644
index 1c696f88d..000000000
--- a/source/kde/patch/libkscreen.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Kludge around a strange failure in setting up the unit tests:
-zcat $CWD/patch/libkscreen/libkscreen.broken.test.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/libkscreen/libkscreen.broken.test.diff b/source/kde/patch/libkscreen/libkscreen.broken.test.diff
deleted file mode 100644
index 30e179d52..000000000
--- a/source/kde/patch/libkscreen/libkscreen.broken.test.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./tests/CMakeLists.txt.orig	2014-08-03 16:14:49.000000000 -0500
-+++ ./tests/CMakeLists.txt	2015-10-24 12:55:55.767426554 -0500
-@@ -6,7 +6,6 @@
-         include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${X11_Xrandr_INCLUDE_PATH})
-         kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc)
-         target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kscreen)
--        add_test(${_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_testname})
-     endforeach(_testname)
- endmacro(KSCREEN_TESTS)
- 
diff --git a/source/kde/patch/perlqt.patch b/source/kde/patch/perlqt.patch
deleted file mode 100644
index b1aaf264a..000000000
--- a/source/kde/patch/perlqt.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix build:
-zcat $CWD/patch/perlqt/perlqt.gcc6.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/perlqt/perlqt.gcc6.diff b/source/kde/patch/perlqt/perlqt.gcc6.diff
deleted file mode 100644
index 9a6e42ea0..000000000
--- a/source/kde/patch/perlqt/perlqt.gcc6.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./qtcore/src/util.cpp.orig	2014-11-04 16:59:39.000000000 -0600
-+++ ./qtcore/src/util.cpp	2017-10-04 22:25:36.055839800 -0500
-@@ -2251,7 +2251,7 @@
-                 methcache.insert(mcid, new Smoke::ModuleIndex(mi));
-         }
- 
--        static smokeperl_object nothis = { 0, 0, 0, false };
-+        static smokeperl_object nothis = { 0, 0, 0, NULL };
-         smokeperl_object* call_this = 0;
-         if ( SvOK(sv_this) ) {
-             call_this = sv_obj_info( sv_this );
diff --git a/source/kde/patch/plasma-nm.patch b/source/kde/patch/plasma-nm.patch
deleted file mode 100644
index 9997fe41b..000000000
--- a/source/kde/patch/plasma-nm.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-zcat $CWD/patch/plasma-nm/plasma-nm.nm.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/plasma-nm/plasma-nm.nm.diff b/source/kde/patch/plasma-nm/plasma-nm.nm.diff
deleted file mode 100644
index 91efa8496..000000000
--- a/source/kde/patch/plasma-nm/plasma-nm.nm.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./CMakeLists.txt.orig	2015-04-07 08:20:28.000000000 -0500
-+++ ./CMakeLists.txt	2015-10-24 18:12:52.316604417 -0500
-@@ -49,6 +49,7 @@
-                     ${CMAKE_CURRENT_SOURCE_DIR}/libs
-                     ${CMAKE_CURRENT_SOURCE_DIR}/libs/editor/
-                     ${NETWORKMANAGER_INCLUDE_DIRS}
-+                    ${NM-UTIL_INCLUDE_DIRS}
-                     ${NETWORKMANAGERQT_INCLUDE_DIRS}
-                     ${KDE4_INCLUDES})
- 
diff --git a/source/kde/patch/print-manager.patch b/source/kde/patch/print-manager.patch
deleted file mode 100644
index 46e0f2b94..000000000
--- a/source/kde/patch/print-manager.patch
+++ /dev/null
@@ -1 +0,0 @@
-zcat $CWD/patch/print-manager/print-manager.fix.build.against.cups22.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/print-manager/print-manager.fix.build.against.cups22.diff b/source/kde/patch/print-manager/print-manager.fix.build.against.cups22.diff
deleted file mode 100644
index 53010fba8..000000000
--- a/source/kde/patch/print-manager/print-manager.fix.build.against.cups22.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From=20971e75934bc64627226d61565f68aff3c9b0000b Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Mon, 12 Sep 2016 11:58:12 -0500
-Subject: [PATCH] fix FTBFS against cups-2.2
-
-cupsGetPPD2 moved to cups/ppd.h
-
-BUG: 366483
-FIXED-IN: 16.08.2
----
- libkcups/KCupsRequest.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libkcups/KCupsRequest.cpp b/libkcups/KCupsRequest.cpp
-index 39a5cf5..3625bec 100644
---- a/libkcups/KCupsRequest.cpp
-+++ b/libkcups/KCupsRequest.cpp
-@@ -29,6 +29,7 @@
- #include <QStringBuilder>
-
- #include <cups/adminutil.h>
-+#include <cups/ppd.h>
-
- #define CUPS_DATADIR    "/usr/share/cups"
diff --git a/source/kde/patch/pykde4.patch b/source/kde/patch/pykde4.patch
deleted file mode 100644
index 68be53e81..000000000
--- a/source/kde/patch/pykde4.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-zcat $CWD/patch/pykde4/pykde4.solid.cmake.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/pykde4/0003-Fix-build-with-sip-4.19.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/pykde4/fix_kpythonpluginfactory_build.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/pykde4/Annotate-KAutoMount-as-Abstract.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/pykde4/pykde4-4.14.3-checkstate-sip-4.19.5.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/pykde4/0004-Fix-build-with-sip-4.19.16.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/pykde4/0003-Fix-build-with-sip-4.19.patch b/source/kde/patch/pykde4/0003-Fix-build-with-sip-4.19.patch
deleted file mode 100644
index 61ef78dfc..000000000
--- a/source/kde/patch/pykde4/0003-Fix-build-with-sip-4.19.patch
+++ /dev/null
@@ -1,599 +0,0 @@
-From 2d1eadf5d0148c88cb4393993f0269e196cbe7b1 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Mon, 9 Jan 2017 11:52:12 +0100
-Subject: [PATCH 3/3] Fix build with sip 4.19
-
-REVIEW: 129799
----
- sip/dnssd/remoteservice.sip       | 10 +++++-----
- sip/kdecore/kmimetype.sip         | 10 +++++-----
- sip/kdecore/ksharedconfig.sip     |  4 ++--
- sip/kdecore/ksycocaentry.sip      | 10 +++++-----
- sip/kdecore/typedefs.sip          | 30 +++++++++++++++---------------
- sip/kdeui/kcompletion.sip         | 10 +++++-----
- sip/kdeui/kxmlguibuilder.sip      |  4 ++--
- sip/kio/kservicegroup.sip         | 10 +++++-----
- sip/ktexteditor/markinterface.sip | 10 +++++-----
- sip/phonon/objectdescription.sip  | 10 +++++-----
- sip/soprano/pluginmanager.sip     | 30 +++++++++++++++---------------
- 11 files changed, 69 insertions(+), 69 deletions(-)
-
-diff --git a/sip/dnssd/remoteservice.sip b/sip/dnssd/remoteservice.sip
-index 5c5397a..44db887 100644
---- a/sip/dnssd/remoteservice.sip
-+++ b/sip/dnssd/remoteservice.sip
-@@ -66,7 +66,7 @@ protected:
-         DNSSD::RemoteService::Ptr *t = new DNSSD::RemoteService::Ptr (sipCpp->at(i));
-         PyObject *tobj;
- 
--        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_DNSSD_RemoteService, sipTransferObj)) == NULL)
-+        if ((tobj = sipConvertFromNewType(t->data(), sipType_DNSSD_RemoteService, sipTransferObj)) == NULL)
-         {
-             Py_DECREF(l);
-             delete t;
-@@ -88,7 +88,7 @@ protected:
-             return 0;
- 
-         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -99,11 +99,11 @@ protected:
-     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-     {
-         int state;
--        DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
-+            sipReleaseType(t, sipType_DNSSD_RemoteService, state);
- 
-             delete ql;
-             return 0;
-@@ -113,7 +113,7 @@ protected:
- 
-         ql->append(*tptr);
- 
--        sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
-+        sipReleaseType(t, sipType_DNSSD_RemoteService, state);
-     }
-  
-     *sipCppPtr = ql;
-diff --git a/sip/kdecore/kmimetype.sip b/sip/kdecore/kmimetype.sip
-index b2d21f7..2945210 100644
---- a/sip/kdecore/kmimetype.sip
-+++ b/sip/kdecore/kmimetype.sip
-@@ -100,7 +100,7 @@ public:
-         KMimeType::Ptr *t = new KMimeType::Ptr (sipCpp->at(i));
-         PyObject *tobj;
- 
--        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KMimeType, sipTransferObj)) == NULL)
-+        if ((tobj = sipConvertFromNewType(t->data(), sipType_KMimeType, sipTransferObj)) == NULL)
-         {
-             Py_DECREF(l);
-             delete t;
-@@ -122,7 +122,7 @@ public:
-             return 0;
- 
-         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KMimeType, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KMimeType, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -133,11 +133,11 @@ public:
-     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-     {
-         int state;
--        KMimeType *t = reinterpret_cast<KMimeType *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KMimeType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        KMimeType *t = reinterpret_cast<KMimeType *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KMimeType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(t, sipClass_KMimeType, state);
-+            sipReleaseType(t, sipType_KMimeType, state);
- 
-             delete ql;
-             return 0;
-@@ -147,7 +147,7 @@ public:
- 
-         ql->append(*tptr);
- 
--        sipReleaseInstance(t, sipClass_KMimeType, state);
-+        sipReleaseType(t, sipType_KMimeType, state);
-     }
-  
-     *sipCppPtr = ql;
-diff --git a/sip/kdecore/ksharedconfig.sip b/sip/kdecore/ksharedconfig.sip
-index 54b1599..9442d80 100644
---- a/sip/kdecore/ksharedconfig.sip
-+++ b/sip/kdecore/ksharedconfig.sip
-@@ -65,7 +65,7 @@ typedef KSharedConfig::Ptr KSharedConfigPtr;
-     KSharedConfigPtr kcpp = *sipCpp;
-     KSharedConfig *ksc    = kcpp.data ();
-     ksc->ref.ref();
--    PyObject *pyKsc       = sipConvertFromInstance(ksc, sipClass_KSharedConfig, sipTransferObj);
-+    PyObject *pyKsc       = sipConvertFromType(ksc, sipType_KSharedConfig, sipTransferObj);
-     return pyKsc;
- %End
- 
-@@ -74,7 +74,7 @@ typedef KSharedConfig::Ptr KSharedConfigPtr;
-         return 1;
- 
-     int state;
--    KSharedConfig* ksc = (KSharedConfig *)sipConvertToInstance(sipPy, sipClass_KSharedConfig, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr);
-+    KSharedConfig* ksc = (KSharedConfig *)sipConvertToType(sipPy, sipType_KSharedConfig, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr);
-     *sipCppPtr = new KSharedConfigPtr (ksc);
-     ksc->ref.deref();
-     return sipGetState(sipTransferObj);
-diff --git a/sip/kdecore/ksycocaentry.sip b/sip/kdecore/ksycocaentry.sip
-index 4632e4a..ceb85fa 100644
---- a/sip/kdecore/ksycocaentry.sip
-+++ b/sip/kdecore/ksycocaentry.sip
-@@ -83,7 +83,7 @@ private:
-         KSycocaEntry::Ptr *t = new KSycocaEntry::Ptr (sipCpp->at(i));
-         PyObject *tobj;
- 
--        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KSycocaEntry, sipTransferObj)) == NULL)
-+        if ((tobj = sipConvertFromNewType(t->data(), sipType_KSycocaEntry, sipTransferObj)) == NULL)
-         {
-             Py_DECREF(l);
-             delete t;
-@@ -105,7 +105,7 @@ private:
-             return 0;
- 
-         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KSycocaEntry, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KSycocaEntry, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -116,11 +116,11 @@ private:
-     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-     {
-         int state;
--        KSycocaEntry *t = reinterpret_cast<KSycocaEntry *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KSycocaEntry, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        KSycocaEntry *t = reinterpret_cast<KSycocaEntry *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KSycocaEntry, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(t, sipClass_KSycocaEntry, state);
-+            sipReleaseType(t, sipType_KSycocaEntry, state);
- 
-             delete ql;
-             return 0;
-@@ -130,7 +130,7 @@ private:
- 
-         ql->append(*tptr);
- 
--        sipReleaseInstance(t, sipClass_KSycocaEntry, state);
-+        sipReleaseType(t, sipType_KSycocaEntry, state);
-     }
-  
-     *sipCppPtr = ql;
-diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
-index af53f85..23956b7 100644
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -397,8 +397,8 @@ template <TYPE1,TYPE2>
-         TYPE1 *t1 = new TYPE1(i.key());
-         TYPE2 *t2 = new TYPE2(i.value());
- 
--        PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
--        PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj);
-+        PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj);
-+        PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj);
- 
-         if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
-         {
-@@ -438,10 +438,10 @@ template <TYPE1,TYPE2>
- 
-         while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
-         {
--            if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE))
-                 return 0;
- 
--            if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE))
-                 return 0;
-         } 
- 
-@@ -454,13 +454,13 @@ template <TYPE1,TYPE2>
-     {
-         int state1, state2;
- 
--        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
--        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
-+        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
-+        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(t1, sipClass_TYPE1, state1);
--            sipReleaseInstance(t2, sipClass_TYPE2, state2);
-+            sipReleaseType(t1, sipType_TYPE1, state1);
-+            sipReleaseType(t2, sipType_TYPE2, state2);
- 
-             delete qm;
-             return 0;
-@@ -468,8 +468,8 @@ template <TYPE1,TYPE2>
- 
-         qm->insert(*t1, *t2);
- 
--        sipReleaseInstance(t1, sipClass_TYPE1, state1);
--        sipReleaseInstance(t2, sipClass_TYPE2, state2);
-+        sipReleaseType(t1, sipType_TYPE1, state1);
-+        sipReleaseType(t2, sipType_TYPE2, state2);
-     }
-  
-     *sipCppPtr = qm;
-@@ -669,7 +669,7 @@ template <TYPE*>
-         TYPE *t = (TYPE *)(sipCpp->at(i));
-         PyObject *tobj;
- 
--        if ((tobj = sipConvertFromNewInstance(t, sipClass_TYPE, sipTransferObj)) == NULL)
-+        if ((tobj = sipConvertFromNewType(t, sipType_TYPE, sipTransferObj)) == NULL)
-         {
-             Py_DECREF(l);
-             delete t;
-@@ -691,7 +691,7 @@ template <TYPE*>
-             return 0;
- 
-         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -702,11 +702,11 @@ template <TYPE*>
-     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-     {
-         int state;
--        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(t, sipClass_TYPE, state);
-+            sipReleaseType(t, sipType_TYPE, state);
- 
-             delete qv;
-             return 0;
-@@ -714,7 +714,7 @@ template <TYPE*>
- 
-         qv->append(t);
- 
--        sipReleaseInstance(t, sipClass_TYPE, state);
-+        sipReleaseType(t, sipType_TYPE, state);
-     }
-  
-     *sipCppPtr = qv;
-diff --git a/sip/kdeui/kcompletion.sip b/sip/kdeui/kcompletion.sip
-index f1d327f..938506a 100644
---- a/sip/kdeui/kcompletion.sip
-+++ b/sip/kdeui/kcompletion.sip
-@@ -176,7 +176,7 @@ public:
- #else
-         PyObject *kobj = PyInt_FromLong((int)i.key());
- #endif
--        PyObject *tobj = sipConvertFromNewInstance(t, sipClass_KShortcut, sipTransferObj);
-+        PyObject *tobj = sipConvertFromNewType(t, sipType_KShortcut, sipTransferObj);
- 
-         if (kobj == NULL || tobj == NULL || PyDict_SetItem(d, kobj, tobj) < 0)
-         {
-@@ -213,7 +213,7 @@ public:
-             return 0;
- 
-         while (PyDict_Next(sipPy, &i, &kobj, &tobj))
--            if (!sipCanConvertToInstance(tobj, sipClass_KShortcut, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(tobj, sipType_KShortcut, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -229,11 +229,11 @@ public:
- #else
-         int k = PyInt_AsLong(kobj);
- #endif
--        KShortcut *t = reinterpret_cast<KShortcut *>(sipConvertToInstance(tobj, sipClass_KShortcut, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        KShortcut *t = reinterpret_cast<KShortcut *>(sipConvertToType(tobj, sipType_KShortcut, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(t, sipClass_KShortcut, state);
-+            sipReleaseType(t, sipType_KShortcut, state);
- 
-             delete qm;
-             return 0;
-@@ -241,7 +241,7 @@ public:
- 
-         qm->insert((KCompletionBase::KeyBindingType)k, *t);
- 
--        sipReleaseInstance(t, sipClass_KShortcut, state);
-+        sipReleaseType(t, sipType_KShortcut, state);
-     }
-  
-     *sipCppPtr = qm;
-diff --git a/sip/kdeui/kxmlguibuilder.sip b/sip/kdeui/kxmlguibuilder.sip
-index 41ae2aa..e4cf187 100644
---- a/sip/kdeui/kxmlguibuilder.sip
-+++ b/sip/kdeui/kxmlguibuilder.sip
-@@ -49,10 +49,10 @@ QAction *containerAction;
-     PyObject *pyWidget;
-     PyObject *pyContainerAction;
- 
--    if ((pyWidget = sipConvertFromNewInstance(res, sipClass_QWidget, NULL)) == NULL)
-+    if ((pyWidget = sipConvertFromNewType(res, sipType_QWidget, NULL)) == NULL)
-         return NULL;
- 
--    if ((pyContainerAction = sipConvertFromNewInstance(containerAction, sipClass_QAction, NULL)) == NULL)
-+    if ((pyContainerAction = sipConvertFromNewType(containerAction, sipType_QAction, NULL)) == NULL)
-         return NULL;
- 
-     sipRes = Py_BuildValue ("NN", pyWidget, pyContainerAction);
-diff --git a/sip/kio/kservicegroup.sip b/sip/kio/kservicegroup.sip
-index a1ef981..1ddce37 100644
---- a/sip/kio/kservicegroup.sip
-+++ b/sip/kio/kservicegroup.sip
-@@ -151,7 +151,7 @@ public:
-         KServiceGroup::SPtr *t = new KServiceGroup::SPtr (sipCpp->at(i));
-         PyObject *tobj;
- 
--        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KServiceGroup, sipTransferObj)) == NULL)
-+        if ((tobj = sipConvertFromNewType(t->data(), sipType_KServiceGroup, sipTransferObj)) == NULL)
-         {
-             Py_DECREF(l);
-             delete t;
-@@ -173,7 +173,7 @@ public:
-             return 0;
- 
-         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceGroup, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceGroup, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -184,11 +184,11 @@ public:
-     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-     {
-         int state;
--        KServiceGroup *t = reinterpret_cast<KServiceGroup *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceGroup, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        KServiceGroup *t = reinterpret_cast<KServiceGroup *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceGroup, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(t, sipClass_KServiceGroup, state);
-+            sipReleaseType(t, sipType_KServiceGroup, state);
- 
-             delete ql;
-             return 0;
-@@ -198,7 +198,7 @@ public:
- 
-         ql->append(*tptr);
- 
--        sipReleaseInstance(t, sipClass_KServiceGroup, state);
-+        sipReleaseType(t, sipType_KServiceGroup, state);
-     }
-  
-     *sipCppPtr = ql;
-diff --git a/sip/ktexteditor/markinterface.sip b/sip/ktexteditor/markinterface.sip
-index d9b0ec9..888c506 100644
---- a/sip/ktexteditor/markinterface.sip
-+++ b/sip/ktexteditor/markinterface.sip
-@@ -158,7 +158,7 @@ signals:
- #else
-         PyObject *t1obj = PyInt_FromLong ((long)t1);
- #endif
--        PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_KTextEditor_Mark, sipTransferObj);
-+        PyObject *t2obj = sipConvertFromNewType(t2, sipType_KTextEditor_Mark, sipTransferObj);
- 
-         if (t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
-         {
-@@ -203,7 +203,7 @@ signals:
- #endif
-                 return 0;
- 
--            if (!sipCanConvertToInstance(t2obj, sipClass_KTextEditor_Mark, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(t2obj, sipType_KTextEditor_Mark, SIP_NOT_NONE))
-                 return 0;
-         } 
- 
-@@ -221,11 +221,11 @@ signals:
- #else
-         int t1 = PyInt_AS_LONG (t1obj);
- #endif
--        KTextEditor::Mark *t2 = reinterpret_cast<KTextEditor::Mark *>(sipConvertToInstance(t2obj, sipClass_KTextEditor_Mark, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
-+        KTextEditor::Mark *t2 = reinterpret_cast<KTextEditor::Mark *>(sipConvertToType(t2obj, sipType_KTextEditor_Mark, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(t2, sipClass_KTextEditor_Mark, state2);
-+            sipReleaseType(t2, sipType_KTextEditor_Mark, state2);
- 
-             delete qm;
-             return 0;
-@@ -233,7 +233,7 @@ signals:
- 
-         qm->insert(t1, t2);
- 
--        sipReleaseInstance(t2, sipClass_KTextEditor_Mark, state2);
-+        sipReleaseType(t2, sipType_KTextEditor_Mark, state2);
-     }
-  
-     *sipCppPtr = qm;
-diff --git a/sip/phonon/objectdescription.sip b/sip/phonon/objectdescription.sip
-index 2b86d5e..015b2ef 100644
---- a/sip/phonon/objectdescription.sip
-+++ b/sip/phonon/objectdescription.sip
-@@ -116,7 +116,7 @@ void                    registerMetaTypes ();
-         DNSSD::RemoteService::Ptr *t = new Phonon::ObjectDescription (sipCpp->at(i));
-         PyObject *tobj;
- 
--        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_DNSSD_RemoteService, sipTransferObj)) == NULL)
-+        if ((tobj = sipConvertFromNewType(t->data(), sipType_DNSSD_RemoteService, sipTransferObj)) == NULL)
-         {
-             Py_DECREF(l);
-             delete t;
-@@ -138,7 +138,7 @@ void                    registerMetaTypes ();
-             return 0;
- 
-         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -149,11 +149,11 @@ void                    registerMetaTypes ();
-     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-     {
-         int state;
--        DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
-+            sipReleaseType(t, sipType_DNSSD_RemoteService, state);
- 
-             delete ql;
-             return 0;
-@@ -163,7 +163,7 @@ void                    registerMetaTypes ();
- 
-         ql->append(*tptr);
- 
--        sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
-+        sipReleaseType(t, sipType_DNSSD_RemoteService, state);
-     }
-  
-     *sipCppPtr = ql;
-diff --git a/sip/soprano/pluginmanager.sip b/sip/soprano/pluginmanager.sip
-index c2be1c3..fe990f8 100644
---- a/sip/soprano/pluginmanager.sip
-+++ b/sip/soprano/pluginmanager.sip
-@@ -73,7 +73,7 @@ public:
-         Soprano::Backend* t = const_cast<Soprano::Backend*>(sipCpp->at(i));
-         PyObject *tobj;
- 
--        if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Backend, sipTransferObj)) == NULL)
-+        if ((tobj = sipConvertFromType(t, sipType_Soprano_Backend, sipTransferObj)) == NULL)
-         {
-             Py_DECREF(l);
-             return NULL;
-@@ -93,7 +93,7 @@ public:
-             return 0;
- 
-         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Backend, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Backend, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -104,18 +104,18 @@ public:
-     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-     {
-         int state;
--        const Soprano::Backend*t = reinterpret_cast<const Soprano::Backend*>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Backend, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        const Soprano::Backend*t = reinterpret_cast<const Soprano::Backend*>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Backend, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(const_cast<Soprano::Backend*>(t), sipClass_Soprano_Backend, state);
-+            sipReleaseType(const_cast<Soprano::Backend*>(t), sipType_Soprano_Backend, state);
- 
-             delete ql;
-             return 0;
-         }
-         ql->append(t);
- 
--        sipReleaseInstance(const_cast<Soprano::Backend*>(t), sipClass_Soprano_Backend, state);
-+        sipReleaseType(const_cast<Soprano::Backend*>(t), sipType_Soprano_Backend, state);
-     }
-  
-     *sipCppPtr = ql;
-@@ -144,7 +144,7 @@ public:
-         Soprano::Parser* t = const_cast<Soprano::Parser*>(sipCpp->at(i));
-         PyObject *tobj;
- 
--        if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Parser, sipTransferObj)) == NULL)
-+        if ((tobj = sipConvertFromType(t, sipType_Soprano_Parser, sipTransferObj)) == NULL)
-         {
-             Py_DECREF(l);
-             return NULL;
-@@ -164,7 +164,7 @@ public:
-             return 0;
- 
-         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Parser, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Parser, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -175,18 +175,18 @@ public:
-     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-     {
-         int state;
--        const Soprano::Parser*t = reinterpret_cast<const Soprano::Parser*>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Parser, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        const Soprano::Parser*t = reinterpret_cast<const Soprano::Parser*>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Parser, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(const_cast<Soprano::Parser*>(t), sipClass_Soprano_Parser, state);
-+            sipReleaseType(const_cast<Soprano::Parser*>(t), sipType_Soprano_Parser, state);
- 
-             delete ql;
-             return 0;
-         }
-         ql->append(t);
- 
--        sipReleaseInstance(const_cast<Soprano::Parser*>(t), sipClass_Soprano_Parser, state);
-+        sipReleaseType(const_cast<Soprano::Parser*>(t), sipType_Soprano_Parser, state);
-     }
-  
-     *sipCppPtr = ql;
-@@ -215,7 +215,7 @@ public:
-         Soprano::Serializer* t = const_cast<Soprano::Serializer*>(sipCpp->at(i));
-         PyObject *tobj;
- 
--        if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Serializer, sipTransferObj)) == NULL)
-+        if ((tobj = sipConvertFromType(t, sipType_Soprano_Serializer, sipTransferObj)) == NULL)
-         {
-             Py_DECREF(l);
-             return NULL;
-@@ -235,7 +235,7 @@ public:
-             return 0;
- 
-         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Serializer, SIP_NOT_NONE))
-+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Serializer, SIP_NOT_NONE))
-                 return 0;
- 
-         return 1;
-@@ -246,18 +246,18 @@ public:
-     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-     {
-         int state;
--        const Soprano::Serializer*t = reinterpret_cast<const Soprano::Serializer*>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Serializer, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+        const Soprano::Serializer*t = reinterpret_cast<const Soprano::Serializer*>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Serializer, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-  
-         if (*sipIsErr)
-         {
--            sipReleaseInstance(const_cast<Soprano::Serializer*>(t), sipClass_Soprano_Serializer, state);
-+            sipReleaseType(const_cast<Soprano::Serializer*>(t), sipType_Soprano_Serializer, state);
- 
-             delete ql;
-             return 0;
-         }
-         ql->append(t);
- 
--        sipReleaseInstance(const_cast<Soprano::Serializer*>(t), sipClass_Soprano_Serializer, state);
-+        sipReleaseType(const_cast<Soprano::Serializer*>(t), sipType_Soprano_Serializer, state);
-     }
-  
-     *sipCppPtr = ql;
--- 
-2.9.3
-
diff --git a/source/kde/patch/pykde4/0004-Fix-build-with-sip-4.19.16.patch b/source/kde/patch/pykde4/0004-Fix-build-with-sip-4.19.16.patch
deleted file mode 100644
index a67888c87..000000000
--- a/source/kde/patch/pykde4/0004-Fix-build-with-sip-4.19.16.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./sip/kdecore/typedefs.sip.orig	2014-08-14 15:17:11.000000000 -0500
-+++ ./sip/kdecore/typedefs.sip	2019-07-31 14:22:50.591053652 -0500
-@@ -23,7 +23,7 @@
- 
- typedef long time_t;
- 
--typedef ulong size_t;
-+// typedef ulong size_t;
- 
- typedef int ssize_t;
- 
-@@ -1028,4 +1028,4 @@
-     return sipGetState(sipTransferObj);
- %End
- };
--%End
-\ No newline at end of file
-+%End
diff --git a/source/kde/patch/pykde4/Annotate-KAutoMount-as-Abstract.patch b/source/kde/patch/pykde4/Annotate-KAutoMount-as-Abstract.patch
deleted file mode 100644
index 1cee8e794..000000000
--- a/source/kde/patch/pykde4/Annotate-KAutoMount-as-Abstract.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur pykde4-4.14.3.old/sip/kio/kautomount.sip pykde4-4.14.3/sip/kio/kautomount.sip
---- pykde4-4.14.3.old/sip/kio/kautomount.sip	2014-08-14 22:17:11.000000000 +0200
-+++ pykde4-4.14.3/sip/kio/kautomount.sip	2017-02-25 19:17:16.511589230 +0100
-@@ -20,7 +20,7 @@
- // along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- 
--class KAutoMount : QObject
-+class KAutoMount : QObject /Abstract/
- {
- %TypeHeaderCode
- #include <kautomount.h>
-@@ -42,7 +42,7 @@
- // KAutoMount
- 
- 
--class KAutoUnmount : QObject
-+class KAutoUnmount : QObject /Abstract/
- {
- %TypeHeaderCode
- #include <kautomount.h>
diff --git a/source/kde/patch/pykde4/fix_kpythonpluginfactory_build.diff b/source/kde/patch/pykde4/fix_kpythonpluginfactory_build.diff
deleted file mode 100644
index 71f5928c1..000000000
--- a/source/kde/patch/pykde4/fix_kpythonpluginfactory_build.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Modestas Vainius <modax@debian.org>
-Subject: Include Python.h first as Qt includes steal "slots" keyword
-Forwarded: no
-Origin: vendor
-Last-Update: 2008-12-05
-
-Index: pykde4-4.9.80/kpythonpluginfactory/kpythonpluginfactory.cpp
-===================================================================
---- pykde4-4.9.80.orig/kpythonpluginfactory/kpythonpluginfactory.cpp	2012-11-14 16:14:05.000000000 +0000
-+++ pykde4-4.9.80/kpythonpluginfactory/kpythonpluginfactory.cpp	2012-11-19 17:23:32.497203781 +0000
-@@ -18,6 +18,7 @@
-    Boston, MA 02111-1307, USA.
- */
- 
-+#include <Python.h>
- #include <QtCore/QCoreApplication>
- #include <QFileInfo>
- #include <QDir>
-@@ -25,7 +26,6 @@
- #include <klibloader.h>
- #include <kstandarddirs.h>
- #include <kcmodule.h>
--#include <Python.h>
- #include <kcomponentdata.h>
- #include <kdebug.h>
- 
diff --git a/source/kde/patch/pykde4/pykde4-4.14.3-checkstate-sip-4.19.5.patch b/source/kde/patch/pykde4/pykde4-4.14.3-checkstate-sip-4.19.5.patch
deleted file mode 100644
index ffc5384d6..000000000
--- a/source/kde/patch/pykde4/pykde4-4.14.3-checkstate-sip-4.19.5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up pykde4-4.14.3/sip/kdeui/kfontchooser.sip.me pykde4-4.14.3/sip/kdeui/kfontchooser.sip
---- pykde4-4.14.3/sip/kdeui/kfontchooser.sip.me	2018-01-17 13:16:50.738465947 +0100
-+++ pykde4-4.14.3/sip/kdeui/kfontchooser.sip	2018-01-17 13:28:24.665226258 +0100
-@@ -59,7 +59,7 @@ public:
- 
-     typedef QFlags<KFontChooser::DisplayFlag> DisplayFlags;
- 
--    explicit                KFontChooser (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState* sizeIsRelativeState = 0) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::DisplayFrame, const QStringList& = QStringList(), int = 8, Qt::CheckState* = 0)];
-+    explicit                KFontChooser (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState sizeIsRelativeState = Qt::Unchecked) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::DisplayFrame, const QStringList& = QStringList(), int = 8, Qt::CheckState* = 0)];
- %MethodCode
- Py_BEGIN_ALLOW_THREADS
-     sipCpp = new sipKFontChooser (a0, *a1, *a2, a3, &a4);
-diff -up pykde4-4.14.3/sip/kdeui/kfontdialog.sip.me pykde4-4.14.3/sip/kdeui/kfontdialog.sip
---- pykde4-4.14.3/sip/kdeui/kfontdialog.sip.me	2018-01-17 13:18:31.112670465 +0100
-+++ pykde4-4.14.3/sip/kdeui/kfontdialog.sip	2018-01-17 13:28:00.121154351 +0100
-@@ -28,7 +28,7 @@ class KFontDialog : KDialog
- 
- 
- public:
--    explicit                KFontDialog (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const QStringList& fontlist = QStringList(), Qt::CheckState* sizeIsRelativeState = 0) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::NoDisplayFlags, const QStringList& = QStringList(), Qt::CheckState* = 0)];
-+    explicit                KFontDialog (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const QStringList& fontlist = QStringList(), Qt::CheckState sizeIsRelativeState = Qt::Unchecked) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::NoDisplayFlags, const QStringList& = QStringList(), Qt::CheckState* = 0)];
- %MethodCode
- Py_BEGIN_ALLOW_THREADS
-     sipCpp= new sipKFontDialog (a0, *a1, *a2, &a3);
diff --git a/source/kde/patch/pykde4/pykde4.solid.cmake.diff b/source/kde/patch/pykde4/pykde4.solid.cmake.diff
deleted file mode 100644
index e4f6cdc73..000000000
--- a/source/kde/patch/pykde4/pykde4.solid.cmake.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./CMakeLists.txt.orig	2014-08-14 15:17:11.000000000 -0500
-+++ ./CMakeLists.txt	2016-09-07 14:32:28.115226093 -0500
-@@ -166,7 +166,7 @@
- 
- file(GLOB kio_files_sip sip/kio/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${kio_files_sip})
--add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
-+add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS})
- 
- file(GLOB kutils_files_sip sip/kutils/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${kutils_files_sip})
-@@ -190,7 +190,7 @@
- 
- file(GLOB dnssd_files_sip sip/dnssd/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${dnssd_files_sip})
--add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY})
-+add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY})
- 
- file(GLOB phonon_files_sip sip/phonon/*.sip)
- set(SIP_EXTRA_FILES_DEPEND ${phonon_files_sip})
diff --git a/source/kde/patch/smokeqt.patch b/source/kde/patch/smokeqt.patch
deleted file mode 100644
index a39121d4b..000000000
--- a/source/kde/patch/smokeqt.patch
+++ /dev/null
@@ -1 +0,0 @@
-zcat $CWD/patch/smokeqt/smokeqt.qscintilla2.uintptr_t.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/smokeqt/smokeqt.qscintilla2.uintptr_t.diff b/source/kde/patch/smokeqt/smokeqt.qscintilla2.uintptr_t.diff
deleted file mode 100644
index 6f94fec56..000000000
--- a/source/kde/patch/smokeqt/smokeqt.qscintilla2.uintptr_t.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- ./qsci/qscintilla2_includes.h.orig	2013-11-24 10:25:24.000000000 -0600
-+++ ./qsci/qscintilla2_includes.h	2019-07-31 16:42:20.264301942 -0500
-@@ -1,3 +1,4 @@
-+#include <stdint.h> /* for uintptr_t */
- #include <qsciabstractapis.h>
- #include <qsciapis.h>
- #include <qscicommand.h>
diff --git a/source/kde/patch/strigi-multimedia.patch b/source/kde/patch/strigi-multimedia.patch
deleted file mode 100644
index 8b03abd28..000000000
--- a/source/kde/patch/strigi-multimedia.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-# Fix build:
-zcat $CWD/patch/strigi-multimedia/strigi-multimedia_port.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/source/kde/patch/strigi-multimedia/strigi-multimedia_port.patch b/source/kde/patch/strigi-multimedia/strigi-multimedia_port.patch
deleted file mode 100644
index 21a29a03d..000000000
--- a/source/kde/patch/strigi-multimedia/strigi-multimedia_port.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urB strigi-multimedia/CMakeLists.txt new/CMakeLists.txt
---- strigi-multimedia/CMakeLists.txt	2012-04-08 11:47:03.923386124 +0200
-+++ new/CMakeLists.txt	2012-04-08 12:29:05.807989600 +0200
-@@ -1,3 +1,5 @@
-+Project(strigi-multimedia)
-+
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)
- find_package(Qt4 REQUIRED)
- find_package(KDE4 REQUIRED)
-@@ -5,12 +7,10 @@
- include(MacroLibrary)
- 
- include_directories(${KDE4_INCLUDES} ${QT_INCLUDES})
-+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} )
- 
- include(CheckIncludeFileCXX)
- 
--message (STATUS "port strigi-analyzer !!!")
--if(KFILE_PLUGINS_PORTED) 
--
- macro_optional_find_package(Theora)
- macro_log_feature(THEORA_FOUND "Theora" "A video codec intended for use within the Ogg's project's Ogg multimedia streaming system" "http://www.theora.org" FALSE "" "Required to build the Theora Strigi Analyzer.")
- 
-@@ -35,5 +35,3 @@
- if (OGGVORBIS_FOUND)
- 	add_subdirectory(ogg)
- endif(OGGVORBIS_FOUND)
--
--endif(KFILE_PLUGINS_PORTED)
diff --git a/source/kde/post-install/baloo.post-install b/source/kde/post-install/baloo.post-install
deleted file mode 100644
index 9239a3e5f..000000000
--- a/source/kde/post-install/baloo.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-# Move the polkit dbus configuration files to the proper place:
-mv $PKG/etc/kde/dbus-1 $PKG/etc/
diff --git a/source/kde/post-install/kde-baseapps.post-install b/source/kde/post-install/kde-baseapps.post-install
deleted file mode 100644
index 8dda6366e..000000000
--- a/source/kde/post-install/kde-baseapps.post-install
+++ /dev/null
@@ -1,9 +0,0 @@
-# Add profile scripts
-mkdir -p $PKG/etc/profile.d
-cat $CWD/post-install/kde-baseapps/profile.d/kde.sh \
-  | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \
-  > $PKG/etc/profile.d/kde.sh
-cat $CWD/post-install/kde-baseapps/profile.d/kde.csh \
-  | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \
-  > $PKG/etc/profile.d/kde.csh
-chmod 0755 $PKG/etc/profile.d/*
diff --git a/source/kde/post-install/kde-baseapps/profile.d/kde.csh b/source/kde/post-install/kde-baseapps/profile.d/kde.csh
deleted file mode 100644
index a09579bf1..000000000
--- a/source/kde/post-install/kde-baseapps/profile.d/kde.csh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/csh
-# KDE additions:
-if ( ! $?KDEDIRS ) then
-    setenv KDEDIRS /usr
-endif
-setenv PATH ${PATH}:/usr/lib/kde4/libexec
-
-if ( $?XDG_CONFIG_DIRS ) then
-    setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg
-else
-    setenv XDG_CONFIG_DIRS /etc/xdg:/etc/kde/xdg
-endif
diff --git a/source/kde/post-install/kde-baseapps/profile.d/kde.sh b/source/kde/post-install/kde-baseapps/profile.d/kde.sh
deleted file mode 100644
index 6f0199e2d..000000000
--- a/source/kde/post-install/kde-baseapps/profile.d/kde.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# KDE additions:
-KDEDIRS=/usr
-export KDEDIRS
-PATH="$PATH:/usr/lib/kde4/libexec"
-export PATH
-if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
-  XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg
-else
-  XDG_CONFIG_DIRS=/etc/xdg:/etc/kde/xdg
-fi
-export XDG_CONFIG_DIRS
-
diff --git a/source/kde/post-install/kde-runtime.post-install b/source/kde/post-install/kde-runtime.post-install
deleted file mode 100644
index fbdacfab3..000000000
--- a/source/kde/post-install/kde-runtime.post-install
+++ /dev/null
@@ -1,9 +0,0 @@
-# Create a symlink in /usr/bin to the kdesu binary
-( cd $PKG/usr/bin ; ln -s /usr/lib${LIBDIRSUFFIX}/kde4/libexec/kdesu . )
-
-# Remove the hicolor icon theme index.theme so it doesn't clobber the real one
-rm -f $PKG/usr/share/icons/hicolor/index.theme
-
-# Move the dbus configuration files to the proper place:
-mv $PKG/etc/kde/dbus-1 $PKG/etc/
-
diff --git a/source/kde/post-install/kde-workspace.post-install b/source/kde/post-install/kde-workspace.post-install
deleted file mode 100644
index 915587ee2..000000000
--- a/source/kde/post-install/kde-workspace.post-install
+++ /dev/null
@@ -1,62 +0,0 @@
-
-# Use ck-launch-session in runlevel 3,
-# to start and attach a ConsoleKit session to the X session:
-mkdir -p $PKG/etc/X11/xinit
-cat $CWD/post-install/kde-workspace/xinit/xinitrc.kde > $PKG/etc/X11/xinit/xinitrc.kde
-chmod 0755 $PKG/etc/X11/xinit/xinitrc.kde
-
-# Setup config files for KDM:
-$PKG/usr/bin/genkdmconf --no-old --no-old-scripts --no-backup --in $PKG/usr/share/config/kdm
-
-# Add Slackware's standard xsessions path to kdmrc and remove the redundant
-# xsession files for XFCE (those are installed by the xcfe package):
-if ! grep -q "SessionsDirs=/usr/share/xsessions" $PKG/usr/share/config/kdm/kdmrc ; then
-  sed -i -e "/SessionsDirs=/s#SessionsDirs=\(.*\)\$#SessionsDirs=/usr/share/xsessions,\1#" $PKG/usr/share/config/kdm/kdmrc
-fi
-rm $PKG/usr/share/apps/kdm/sessions/xfce*.desktop
-
-# Similarly, allow other login managers to show KDE Plasma desktop sessions:
-mkdir -p $PKG/usr/share/xsessions
-mv $PKG/usr/share/apps/kdm/sessions/kde-plasma*.desktop \
-   $PKG/usr/share/xsessions/
-
-# Not allowing root to login at the console is just plain silly.  If they 
-# have physical access to the machine, what's the point of trying to stop 
-# this?  Even the kdmrc file says this is supposed to be the default.
-sed -i 's/AllowRootLogin=false/AllowRootLogin=true/' \
-  $PKG/usr/share/config/kdm/kdmrc 
-# We are also not ready to create a separate 'kdm' non-root user:
-sed -i 's/GreeterUID=kdm/#&/' \
-  $PKG/usr/share/config/kdm/kdmrc 
-
-# Add a .new suffix so we don't mangle an existing file:
-mv $PKG/usr/share/config/kdm/kdmrc $PKG/usr/share/config/kdm/kdmrc.new
-
-cp -a $PKG/usr/share/config/kdm/Xsession $PKG/usr/share/config/kdm/Xsession.orig
-cat $CWD/post-install/kde-workspace/config/Xsession | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
-  > $PKG/usr/share/config/kdm/Xsession
-
-# Add a .new suffix so we don't mangle an existing file:
-mv $PKG/usr/share/config/kdm/backgroundrc $PKG/usr/share/config/kdm/backgroundrc.new
-
-# Add config file if PAM is installed:
-if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
-  mkdir -p $PKG/etc/pam.d
-  cp -a $CWD/post-install/kde-workspace/config/kde.pamd $PKG/etc/pam.d/kde.new
-  chown root:root $PKG/etc/pam.d/kde.new
-  chmod 644 $PKG/etc/pam.d/kde.new
-  cp -a $CWD/post-install/kde-workspace/config/kde-np.pamd $PKG/etc/pam.d/kde-np.new
-  chown root:root $PKG/etc/pam.d/kde-np.new
-  chmod 644 $PKG/etc/pam.d/kde-np.new
-fi
-
-# Move the KDM files someplace FHS compliant:
-mkdir -p $PKG/etc/kde
-mv $PKG/usr/share/config/kdm $PKG/etc/kde
-( cd $PKG/usr/share/config ; ln -sf ../../../etc/kde/kdm . )
-
-# Move the polkit dbus configuration files to the proper place:
-mv $PKG/etc/kde/dbus-1 $PKG/etc/
-
-# This is fubar:
-rm -f $PKG/usr/share/icons/hicolor/index.theme
diff --git a/source/kde/post-install/kde-workspace/config/Xsession b/source/kde/post-install/kde-workspace/config/Xsession
deleted file mode 100644
index 736f5d5c2..000000000
--- a/source/kde/post-install/kde-workspace/config/Xsession
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-# Xsession - run as user
- 
-# Merged in parts of the old Xsession to load defaults from
-# Xresources and Xmodmap files, 2006-02-09 volkerdi
-# Merged with the new Xsession (original) from KDE4, 20071220 rworkman
-
- session=$1
- 
-# This section is borrowed from the old X11 Xsession file:
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/usr/lib/X11/xinit/.Xresources
-sysmodmap=/usr/lib/X11/xinit/.Xmodmap
-# merge in defaults and keymaps
-if [ -r $sysresources ]; then
-        /usr/bin/xrdb -merge $sysresources
-fi
-if [ -r $sysmodmap ]; then
-        /usr/bin/xmodmap $sysmodmap
-fi
-if [ -r $userresources ]; then
-        /usr/bin/xrdb -merge $userresources
-fi
-if [ -r $usermodmap ]; then
-        /usr/bin/xmodmap $usermodmap
-fi
-
-# Note that the respective logout scripts are not sourced.
-case $SHELL in
-  */bash)
-    [ -z "$BASH" ] && exec $SHELL $0 "$@"
-    set +o posix
-    [ -f /etc/profile ] && . /etc/profile
-    if [ -f $HOME/.bash_profile ]; then
-      . $HOME/.bash_profile
-    elif [ -f $HOME/.bash_login ]; then
-      . $HOME/.bash_login
-    elif [ -f $HOME/.profile ]; then
-      . $HOME/.profile
-    fi
-    ;;
-  */zsh)
-    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
-    emulate -R zsh
-    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
-    zhome=${ZDOTDIR:-$HOME}
-    # zshenv is always sourced automatically.
-    [ -f $zdir/zprofile ] && . $zdir/zprofile
-    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
-    [ -f $zdir/zlogin ] && . $zdir/zlogin
-    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
-    ;;
-  */csh|*/tcsh)
-    # [t]cshrc is always sourced automatically.
-    # Note that sourcing csh.login after .cshrc is non-standard.
-    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
-    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp"
-    . $xsess_tmp
-    rm -f $xsess_tmp
-    ;;
-  *) # Plain sh, ksh, and anything we do not know.
-    [ -f /etc/profile ] && . /etc/profile
-    [ -f $HOME/.profile ] && . $HOME/.profile
-    ;;
-esac
-
-[ -f /etc/xprofile ] && . /etc/xprofile
-[ -f $HOME/.xprofile ] && . $HOME/.xprofile
-
-case $session in
-  "")
-    exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
-    ;;
-  failsafe)
-    exec xterm -geometry 80x24-0-0
-    ;;
-  custom)
-    exec $HOME/.xsession
-    ;;
-  default)
-    exec /usr/bin/startkde
-    ;;
-  *)
-    eval exec "$session"
-    ;;
-esac
-exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/source/kde/post-install/kde-workspace/config/Xsession.orig b/source/kde/post-install/kde-workspace/config/Xsession.orig
deleted file mode 100644
index 43d78b8d9..000000000
--- a/source/kde/post-install/kde-workspace/config/Xsession.orig
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/sh
-# Xsession - run as user
-
-session=$1
-
-# Note that the respective logout scripts are not sourced.
-case $SHELL in
-  */bash)
-    [ -z "$BASH" ] && exec $SHELL $0 "$@"
-    set +o posix
-    [ -f /etc/profile ] && . /etc/profile
-    if [ -f $HOME/.bash_profile ]; then
-      . $HOME/.bash_profile
-    elif [ -f $HOME/.bash_login ]; then
-      . $HOME/.bash_login
-    elif [ -f $HOME/.profile ]; then
-      . $HOME/.profile
-    fi
-    ;;
-  */zsh)
-    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
-    emulate -R zsh
-    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
-    zhome=${ZDOTDIR:-$HOME}
-    # zshenv is always sourced automatically.
-    [ -f $zdir/zprofile ] && . $zdir/zprofile
-    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
-    [ -f $zdir/zlogin ] && . $zdir/zlogin
-    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
-    ;;
-  */csh|*/tcsh)
-    # [t]cshrc is always sourced automatically.
-    # Note that sourcing csh.login after .cshrc is non-standard.
-    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
-    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp"
-    . $xsess_tmp
-    rm -f $xsess_tmp
-    ;;
-  *) # Plain sh, ksh, and anything we do not know.
-    [ -f /etc/profile ] && . /etc/profile
-    [ -f $HOME/.profile ] && . $HOME/.profile
-    ;;
-esac
-
-[ -f /etc/xprofile ] && . /etc/xprofile
-[ -f $HOME/.xprofile ] && . $HOME/.xprofile
-
-case $session in
-  "")
-    exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
-    ;;
-  failsafe)
-    exec xterm -geometry 80x24-0-0
-    ;;
-  custom)
-    exec $HOME/.xsession
-    ;;
-  default)
-    exec /usr/bin/startkde
-    ;;
-  *)
-    eval exec "$session"
-    ;;
-esac
-exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/source/kde/post-install/kde-workspace/config/kde-np.pamd b/source/kde/post-install/kde-workspace/config/kde-np.pamd
deleted file mode 100644
index 198af45fb..000000000
--- a/source/kde/post-install/kde-workspace/config/kde-np.pamd
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth       requisite    pam_nologin.so
-auth       required     pam_env.so
-
-# Uncomment this line to restrict autologin to users with a UID greater
-# than 999 (in other words, don't allow autologin for root):
-#auth       required     pam_succeed_if.so uid >= 1000 quiet
-auth       required     pam_permit.so
-
-account    include      system-auth
-password   include      system-auth
-session    include      system-auth
diff --git a/source/kde/post-install/kde-workspace/config/kde.pamd b/source/kde/post-install/kde-workspace/config/kde.pamd
deleted file mode 100644
index 7acfd901e..000000000
--- a/source/kde/post-install/kde-workspace/config/kde.pamd
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth       include      system-auth
-auth       include      postlogin
-account    include      system-auth
-password   include      system-auth
-session    include      system-auth
-session    required     pam_loginuid.so
-session    optional     pam_ck_connector.so nox11
-session    include      postlogin
diff --git a/source/kde/post-install/kdepim.post-install b/source/kde/post-install/kdepim.post-install
deleted file mode 100644
index 881011489..000000000
--- a/source/kde/post-install/kdepim.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-# Move the dbus configuration files to the proper place:
-mv $PKG/etc/kde/dbus-1 $PKG/etc/
diff --git a/source/kde/post-install/kdev-python.post-install b/source/kde/post-install/kdev-python.post-install
deleted file mode 100644
index 396f7f50c..000000000
--- a/source/kde/post-install/kdev-python.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-# Make sure shared libraries are executable:
-chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/lib*.so.*
diff --git a/source/kde/post-install/ktorrent.post-install b/source/kde/post-install/ktorrent.post-install
deleted file mode 100644
index a1e191624..000000000
--- a/source/kde/post-install/ktorrent.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir $PKG/usr/share/apps/ktorrent/GeoIP
-zcat $CWD/patch/ktorrent/geoip.dat.gz > $PKG/usr/share/apps/ktorrent/GeoIP/geoip.dat
diff --git a/source/kde/pre-install/amarok.pre-install b/source/kde/pre-install/amarok.pre-install
deleted file mode 100644
index dfb3b0095..000000000
--- a/source/kde/pre-install/amarok.pre-install
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ ! -r /usr/bin/mysql_embedded ]; then
-  cat << EOF
-ERROR:  missing /usr/bin/mysql_embedded
-        please use mysql-embedded.SlackBuild in source/ap/mysql/
-        or build_embedded.package.sh in source/ap/mariadb/ to
-        rebuild your database package, reinstall it, and then try again.
-EOF
-  touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ;
-fi
-
diff --git a/source/kde/pre-install/kdewebdev/tidy/get-tidy-cvs.sh b/source/kde/pre-install/kdewebdev/tidy/get-tidy-cvs.sh
deleted file mode 100644
index e4fb4b20d..000000000
--- a/source/kde/pre-install/kdewebdev/tidy/get-tidy-cvs.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Copyright 2006, 2009  Patrick Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-# Fetch the latest CVS of Tidy.
-# Clean the download location:
-rm -rf tidy
-cvs -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy login
-CVS_VERSION=$(date +%Y%m%dT%R | tr -d :)
-# Doubtful that these will exist, but...
-rm -f tidy-${CVS_VERSION}.tar tidy-${CVS_VERSION}.tar.xz
-cvs -z3 -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy co -P tidy
-# Rid ourselves of cruft:
-( cd tidy ; find . -type d -name CVS -exec rm -rf {} \; 2> /dev/null )
-# Make tarball "release":
-tar cf tidy-${CVS_VERSION}.tar tidy
-xz -9 tidy-${CVS_VERSION}.tar
-# Clean up:
-rm -rf tidy
diff --git a/source/kde/pre-install/kdewebdev/tidy/tidy.SlackBuild b/source/kde/pre-install/kdewebdev/tidy/tidy.SlackBuild
deleted file mode 100644
index 0eb4e47f9..000000000
--- a/source/kde/pre-install/kdewebdev/tidy/tidy.SlackBuild
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# This file is an example, so feel free to fix it if it gets out of date.  :-)
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=tidy
-VERSION=${VERSION:-20100503T2309}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-else
-  SLKCFLAGS="-O2"
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf ${PKGNAM}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z*
-
-cd ${PKGNAM}
-
-# Make sure ownerships and permissions are sane:
-chown -R root:root .
-find . -perm 666 -exec chmod 644 {} \+
-find . -perm 664 -exec chmod 644 {} \+
-find . -perm 600 -exec chmod 644 {} \+
-find . -perm 444 -exec chmod 644 {} \+
-find . -perm 400 -exec chmod 644 {} \+
-find . -perm 440 -exec chmod 644 {} \+
-find . -perm 777 -exec chmod 755 {} \+
-find . -perm 775 -exec chmod 755 {} \+
-find . -perm 511 -exec chmod 755 {} \+
-find . -perm 711 -exec chmod 755 {} \+
-find . -perm 555 -exec chmod 755 {} \+
-
-# Prepare autoconf:
-sh build/gnuauto/setup.sh
-
-# Configure:
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --disable-static \
-  $ARCH-slackware-linux
-
-# Build and install:
-make -j4 || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
-# The Makefile evidently contains the package's license...
-cp -a Makefile htmldoc $PKG/usr/doc/${PKGNAM}-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/kde/pre-install/kdewebdev/tidy/tidy.build b/source/kde/pre-install/kdewebdev/tidy/tidy.build
deleted file mode 100644
index 45f7631f1..000000000
--- a/source/kde/pre-install/kdewebdev/tidy/tidy.build
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Robby Workman <rworkman@slackware.com> 20071221 
-# for new cvs pull and changed include directory for kde4's kdewebdev
-# New cvs version - 20080502
-
-PKGNAM=tidy
-VERSION=20100503T2309
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-
-PKG=$1
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-cd $TMP
-rm -rf ${PKGNAM}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
-cd ${PKGNAM}
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Prepare autoconf:
-sh build/gnuauto/setup.sh
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --includedir=/usr/include/tidy \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make -j4 || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
-cp -a htmldoc/* $PKG/usr/doc/${PKGNAM}-$VERSION
-
diff --git a/source/kde/slack-desc/amarok b/source/kde/slack-desc/amarok
deleted file mode 100644
index 9f249516e..000000000
--- a/source/kde/slack-desc/amarok
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-amarok: amarok (music player)
-amarok:
-amarok: Amarok is a music player for Linux and Unix with an intuitive
-amarok: interface. Amarok makes playing the music you love easier than ever
-amarok: before - and looks good doing it.
-amarok:
-amarok: Amarok's home page is: http://amarok.kde.org
-amarok:
-amarok:
-amarok:
-amarok:
diff --git a/source/kde/slack-desc/amor b/source/kde/slack-desc/amor
deleted file mode 100644
index 6a7affcf5..000000000
--- a/source/kde/slack-desc/amor
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-amor: amor (KDE window animation)
-amor:
-amor: amor an acronym which stands for Amusing Misuse Of Resources.
-amor: It is an animation which sits on top of your active window.
-amor: In its default, amor takes the form of a yellow spot which performs
-amor: many tricks. amor also has many different themes which change the
-amor: appearance and behavior of the animation.
-amor:
-amor: Home: http://techbase.kde.org/Projects/Kdetoys/amor
-amor:
-amor:
diff --git a/source/kde/slack-desc/analitza b/source/kde/slack-desc/analitza
deleted file mode 100644
index e6b8b3418..000000000
--- a/source/kde/slack-desc/analitza
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-analitza: analitza (library to add mathematical features to programs)
-analitza:
-analitza: The analitza library will let you add mathematical features
-analitza: to your program. 
-analitza:
-analitza: For more information, visit:
-analitza:  https://projects.kde.org/projects/kde/kdeedu/analitza
-analitza:
-analitza:
-analitza:
-analitza:
diff --git a/source/kde/slack-desc/ark b/source/kde/slack-desc/ark
deleted file mode 100644
index c1f0e33cb..000000000
--- a/source/kde/slack-desc/ark
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-   |-----handy-ruler------------------------------------------------------|
-ark: ark (KDE archiver tool)
-ark:
-ark: This is KDE's application to work with compressed archives.
-ark:
-ark: Ark's home page is: http://kde.org
-ark:
-ark:
-ark:
-ark:
-ark:
-ark:
diff --git a/source/kde/slack-desc/artikulate b/source/kde/slack-desc/artikulate
deleted file mode 100644
index 4131e7c3a..000000000
--- a/source/kde/slack-desc/artikulate
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-artikulate: artikulate (pronunciation trainer)
-artikulate:
-artikulate: Artikulate is a pronunciation trainer, which helps in improving and
-artikulate: perfecting pronunciation skills. Learners train their pronunciation
-artikulate: by recording their own voices and comparing them to native speaker
-artikulate: recordings.
-artikulate:
-artikulate: Artikulate is part of the KDE Education Project.
-artikulate:
-artikulate:
-artikulate:
diff --git a/source/kde/slack-desc/audiocd-kio b/source/kde/slack-desc/audiocd-kio
deleted file mode 100644
index 56e194470..000000000
--- a/source/kde/slack-desc/audiocd-kio
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-audiocd-kio: audiocd-kio (audiocd kio slave)
-audiocd-kio:
-audiocd-kio: Audiocd kio slave.
-audiocd-kio:
-audiocd-kio:
-audiocd-kio:
-audiocd-kio:
-audiocd-kio:
-audiocd-kio:
-audiocd-kio:
-audiocd-kio:
diff --git a/source/kde/slack-desc/baloo b/source/kde/slack-desc/baloo
deleted file mode 100644
index a8ab1ad23..000000000
--- a/source/kde/slack-desc/baloo
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-baloo: baloo (framework for searching and managing metadata)
-baloo:
-baloo: Baloo is a framework for searching and managing metadata.
-baloo: Baloo focuses on providing a very small memory footprint along with
-baloo: with extremely fast searching. It also supports storing additional
-baloo: file based metadata via extended attributes.
-baloo:
-baloo:
-baloo:
-baloo:
-baloo:
diff --git a/source/kde/slack-desc/baloo-widgets b/source/kde/slack-desc/baloo-widgets
deleted file mode 100644
index 7e7ee2217..000000000
--- a/source/kde/slack-desc/baloo-widgets
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------------|
-baloo-widgets: baloo-widgets (widgets for baloo)
-baloo-widgets:
-baloo-widgets: Baloo is a framework for searching and managing metadata.
-baloo-widgets: Balooo-widgets contains widgets for use with Baloo.
-baloo-widgets:
-baloo-widgets:
-baloo-widgets:
-baloo-widgets:
-baloo-widgets:
-baloo-widgets:
-baloo-widgets:
diff --git a/source/kde/slack-desc/blinken b/source/kde/slack-desc/blinken
deleted file mode 100644
index edcb442e2..000000000
--- a/source/kde/slack-desc/blinken
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-blinken: blinken (a memory enhancement game)
-blinken:
-blinken: Blinken is a memory enhancement game for KDE.
-blinken:
-blinken:
-blinken:
-blinken:
-blinken:
-blinken:
-blinken:
-blinken:
diff --git a/source/kde/slack-desc/bluedevil b/source/kde/slack-desc/bluedevil
deleted file mode 100644
index 60e3dde97..000000000
--- a/source/kde/slack-desc/bluedevil
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also customary
-# to leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-bluedevil: bluedevil (bluetooth stack for KDE)
-bluedevil:
-bluedevil: BlueDevil is the bluetooth stack for KDE.
-bluedevil:
-bluedevil: Homepage: http://www.afiestas.org/
-bluedevil:
-bluedevil:
-bluedevil:
-bluedevil:
-bluedevil:
-bluedevil:
diff --git a/source/kde/slack-desc/bomber b/source/kde/slack-desc/bomber
deleted file mode 100644
index 6400af7af..000000000
--- a/source/kde/slack-desc/bomber
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-bomber: bomber (arcade bombing game for KDE)
-bomber:
-bomber: Bomber is a single player arcade game. The player is invading various
-bomber: cities in a plane that is decreasing in height. The goal of the game
-bomber: is to destroy all the buildings and advance to the next level.
-bomber: Each level gets a bit harder by increasing the speed of the plane
-bomber: and the height of the buildings.
-bomber:
-bomber:
-bomber:
-bomber:
diff --git a/source/kde/slack-desc/bovo b/source/kde/slack-desc/bovo
deleted file mode 100644
index 3bc2ae962..000000000
--- a/source/kde/slack-desc/bovo
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-bovo: bovo (five-in-a-row board game)
-bovo:
-bovo: Bovo is a Gomoku ("five points" in Japanese) like game for two
-bovo: players, where the opponents alternate in placing their respective
-bovo: pictogram on the game board. Also known as: Connect Five,
-bovo: Five in a row, X and O, Naughts and Crosses.
-bovo:
-bovo:
-bovo:
-bovo:
-bovo:
diff --git a/source/kde/slack-desc/calligra b/source/kde/slack-desc/calligra
deleted file mode 100644
index 907a7d95e..000000000
--- a/source/kde/slack-desc/calligra
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-calligra: calligra (KDE office productivity suite)
-calligra:
-calligra: Calligra office productivity applications. Included are a word
-calligra: processor, spreadsheet, presentation program, chart and graph creator,
-calligra: vector graphics tool, database report creator, flowcharting program,
-calligra: integrated data management program, a pixel graphics editor,
-calligra: a mathematical formula editor, and Calligra Workspace
-calligra: (a combination of all of the above).
-calligra:
-calligra: For more information, see: http://calligra-suite.org/
-calligra:
diff --git a/source/kde/slack-desc/cantor b/source/kde/slack-desc/cantor
deleted file mode 100644
index 78ec170a9..000000000
--- a/source/kde/slack-desc/cantor
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-cantor: cantor (front-end to mathematics software)
-cantor:
-cantor: Cantor is a frontend to several existing mathematical software
-cantor: such as R, Sage and Maxima: Cantor.
-cantor: Cantor offers a worksheet as a nice GUI for all those backends
-cantor: and is not targeted to kids but to scientists.
-cantor:
-cantor:
-cantor:
-cantor:
-cantor:
diff --git a/source/kde/slack-desc/cervisia b/source/kde/slack-desc/cervisia
deleted file mode 100644
index 141da3d2a..000000000
--- a/source/kde/slack-desc/cervisia
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-cervisia: cervisia (GUI for CVS)
-cervisia:
-cervisia: cervisia is a graphical frontend for CVS.
-cervisia:
-cervisia:
-cervisia:
-cervisia:
-cervisia:
-cervisia:
-cervisia:
-cervisia:
diff --git a/source/kde/slack-desc/digikam b/source/kde/slack-desc/digikam
deleted file mode 100644
index d632e5446..000000000
--- a/source/kde/slack-desc/digikam
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler-----------------------------------------------------|
-digikam: digiKam (KDE Photo Management Application)
-digikam:
-digikam: digiKam is a simple digital photo management application for KDE,
-digikam: which makes importing and organizing digital photos a "snap". The
-digikam: photos can be organized in albums which can be sorted
-digikam: chronologically, by directory layout, or by custom collections. An
-digikam: easy to use interface enables you to connect to your camera and
-digikam: preview, download, and/or delete your images.
-digikam:
-digikam: Homepage: http://www.digikam.org/
-digikam:
diff --git a/source/kde/slack-desc/dolphin-plugins b/source/kde/slack-desc/dolphin-plugins
deleted file mode 100644
index 5309de8ae..000000000
--- a/source/kde/slack-desc/dolphin-plugins
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-dolphin-plugins: dolphin-plugins (dolphin VCS plugins)
-dolphin-plugins:
-dolphin-plugins: This package contains plugins that offer integration of various
-dolphin-plugins: version control systems in Dolphin.
-dolphin-plugins:
-dolphin-plugins:
-dolphin-plugins:
-dolphin-plugins:
-dolphin-plugins:
-dolphin-plugins:
-dolphin-plugins:
diff --git a/source/kde/slack-desc/dragon b/source/kde/slack-desc/dragon
deleted file mode 100644
index b9b200216..000000000
--- a/source/kde/slack-desc/dragon
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-dragon: dragon (KDE multimedia player)
-dragon:
-dragon: Dragon Player is a multimedia player where the focus is on simplicity,
-dragon: instead of features. Dragon Player does one thing, and only one
-dragon: thing, which is playing multimedia files.
-dragon:
-dragon:
-dragon:
-dragon:
-dragon:
-dragon:
diff --git a/source/kde/slack-desc/ffmpegthumbs b/source/kde/slack-desc/ffmpegthumbs
deleted file mode 100644
index 9bcc22e1a..000000000
--- a/source/kde/slack-desc/ffmpegthumbs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-ffmpegthumbs: ffmpegthumbs (video thumbnail generator using ffmpeg)
-ffmpegthumbs:
-ffmpegthumbs: FFMpegThumbs is a video thumbnail generator for KDE file managers
-ffmpegthumbs: like Dolphin and Konqueror. It enables them to show preview
-ffmpegthumbs: images of video files using FFMpeg. 
-ffmpegthumbs:
-ffmpegthumbs:
-ffmpegthumbs:
-ffmpegthumbs:
-ffmpegthumbs:
-ffmpegthumbs:
diff --git a/source/kde/slack-desc/filelight b/source/kde/slack-desc/filelight
deleted file mode 100644
index 9794e97d5..000000000
--- a/source/kde/slack-desc/filelight
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mfilelights the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-filelight: filelight (file system monitor)
-filelight:
-filelight: Filelight allows you to quickly understand exactly where your
-filelight: diskspace is being used by graphically representing your file system.
-filelight:
-filelight: filelight's home page is: http://utils.kde.org/projects/filelight
-filelight:
-filelight:
-filelight:
-filelight:
-filelight:
diff --git a/source/kde/slack-desc/granatier b/source/kde/slack-desc/granatier
deleted file mode 100644
index 869598a1f..000000000
--- a/source/kde/slack-desc/granatier
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-granatier: granatier (bomberman clone for KDE)
-granatier:
-granatier: Granatier is a clone of the classic Bomberman game, inspired by
-granatier: the work of the Clanbomber clone.
-granatier:
-granatier:
-granatier:
-granatier:
-granatier:
-granatier:
-granatier:
diff --git a/source/kde/slack-desc/gwenview b/source/kde/slack-desc/gwenview
deleted file mode 100644
index 73cc58de4..000000000
--- a/source/kde/slack-desc/gwenview
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-gwenview: gwenview (image viewer for KDE)
-gwenview:
-gwenview: Gwenview is a simple image viewer for KDE. It features a folder tree
-gwenview: window and a file list window, providing easy navigation of your file
-gwenview: hierarchy.
-gwenview:
-gwenview:
-gwenview:
-gwenview:
-gwenview:
-gwenview:
diff --git a/source/kde/slack-desc/jovie b/source/kde/slack-desc/jovie
deleted file mode 100644
index acb2b3c5c..000000000
--- a/source/kde/slack-desc/jovie
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-jovie: jovie (Text-to-speech daemon)
-jovie:
-jovie: Jovie is the KDE Text To Speech Daemon, which can be used from any
-jovie: KDE application that uses the interface from kdelibs.
-jovie:
-jovie:
-jovie:
-jovie:
-jovie:
-jovie:
-jovie:
diff --git a/source/kde/slack-desc/juk b/source/kde/slack-desc/juk
deleted file mode 100644
index 070c0a74c..000000000
--- a/source/kde/slack-desc/juk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-   |-----handy-ruler------------------------------------------------------|
-juk: juk (audio jukebox application)
-juk:
-juk: JuK is an audio jukebox application, supporting collections of MP3,
-juk: Ogg Vorbis, and FLAC audio files. It allows you to edit the "tags"
-juk: of your audio files, and manage your collection and playlists.
-juk: It's main focus, in fact, is on music management.
-juk:
-juk:
-juk:
-juk:
-juk:
diff --git a/source/kde/slack-desc/k3b b/source/kde/slack-desc/k3b
deleted file mode 100644
index d67130e7a..000000000
--- a/source/kde/slack-desc/k3b
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-   |-----handy-ruler------------------------------------------------------|
-k3b: k3b (The CD Creator)
-k3b:
-k3b: K3b makes writing cds under Linux easy. It has an easy to use
-k3b: interface and supports CD burning (including on-the-fly), copying,
-k3b: erasing, ripping, and more.
-k3b:
-k3b: K3b was written by Sebastian Trueg, Thomas Froescher,
-k3b: Christian Kvasny, and Klaus-Dieter Krannich.
-k3b:
-k3b: For more information, visit: http://www.k3b.org
-k3b:
diff --git a/source/kde/slack-desc/kaccessible b/source/kde/slack-desc/kaccessible
deleted file mode 100644
index a1e761c03..000000000
--- a/source/kde/slack-desc/kaccessible
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kaccessible: kaccessible (Accessibility bridge)
-kaccessible:
-kaccessible: Kaccessible implements a QAccessibleBridgePlugin to provide
-kaccessible: accessibility services like focus tracking and a screenreader.
-kaccessible:
-kaccessible:
-kaccessible:
-kaccessible:
-kaccessible:
-kaccessible:
-kaccessible:
diff --git a/source/kde/slack-desc/kactivities b/source/kde/slack-desc/kactivities
deleted file mode 100644
index d4d457fb3..000000000
--- a/source/kde/slack-desc/kactivities
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kactivities: kactivities (API for using and interacting with Activities)
-kactivities:
-kactivities: API for using and interacting with Activities as a consumer,
-kactivities: application adding information to them or as an activity manager.
-kactivities:
-kactivities:
-kactivities:
-kactivities:
-kactivities:
-kactivities:
-kactivities:
diff --git a/source/kde/slack-desc/kajongg b/source/kde/slack-desc/kajongg
deleted file mode 100644
index b0c80e81e..000000000
--- a/source/kde/slack-desc/kajongg
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kajongg: kajongg (Mah Jongg for KDE)
-kajongg:
-kajongg: Kajongg is the ancient Chinese board game for 4 players.
-kajongg: Kajongg can be used in two different ways: Scoring a manual game where
-kajongg: you play as always and use Kajongg for the computation of scores and
-kajongg: for bookkeeping. Or you can use Kajongg to play against any
-kajongg: combination of other human players or computer players.
-kajongg:
-kajongg:
-kajongg:
-kajongg:
diff --git a/source/kde/slack-desc/kalgebra b/source/kde/slack-desc/kalgebra
deleted file mode 100644
index 1de7dacff..000000000
--- a/source/kde/slack-desc/kalgebra
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-kalgebra: kalgebra (a graph calculator)
-kalgebra:
-kalgebra: KAlgebra is a MathML-based graph calculator. It was initially mathml
-kalgebra: oriented, but now it can be used by anyone with a little mathematic
-kalgebra: knowledge.
-kalgebra:
-kalgebra:
-kalgebra:
-kalgebra:
-kalgebra:
-kalgebra:
diff --git a/source/kde/slack-desc/kalzium b/source/kde/slack-desc/kalzium
deleted file mode 100644
index d757f95b9..000000000
--- a/source/kde/slack-desc/kalzium
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kalzium: kalzium (periodic table of the elements)
-kalzium:
-kalzium: Kalzium shows a periodic table of the elements.
-kalzium:
-kalzium:
-kalzium:
-kalzium:
-kalzium:
-kalzium:
-kalzium:
-kalzium:
diff --git a/source/kde/slack-desc/kamera b/source/kde/slack-desc/kamera
deleted file mode 100644
index f213fdf29..000000000
--- a/source/kde/slack-desc/kamera
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-   |-----handy-ruler------------------------------------------------------|
-kamera: kamera (digital camera support for KDE)
-kamera:
-kamera: Digital camera support for KDE.
-kamera:
-kamera:
-kamera:
-kamera:
-kamera:
-kamera:
-kamera:
-kamera:
diff --git a/source/kde/slack-desc/kanagram b/source/kde/slack-desc/kanagram
deleted file mode 100644
index 50e9743b1..000000000
--- a/source/kde/slack-desc/kanagram
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-kanagram: kanagram (letter game)
-kanagram:
-kanagram: Kanagram is a replacement for KMessedWords. Kanagram mixes up the
-kanagram: letters of a word to create an anagram, and you have to guess what
-kanagram: the mixed up word is. Kanagram features several built-in word lists,
-kanagram: hints, and a cheat feature which reveals the original word.
-kanagram: Kanagram also has a vocabulary editor.
-kanagram:
-kanagram:
-kanagram:
-kanagram:
diff --git a/source/kde/slack-desc/kapptemplate b/source/kde/slack-desc/kapptemplate
deleted file mode 100644
index 41711aa1f..000000000
--- a/source/kde/slack-desc/kapptemplate
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kapptemplate: kapptemplate (application template generator)
-kapptemplate:
-kapptemplate: KAppTemplate is a shell script to create the necessary framework
-kapptemplate: to develop KDE applications.
-kapptemplate:
-kapptemplate:
-kapptemplate:
-kapptemplate:
-kapptemplate:
-kapptemplate:
-kapptemplate:
diff --git a/source/kde/slack-desc/kate b/source/kde/slack-desc/kate
deleted file mode 100644
index 700e3c08c..000000000
--- a/source/kde/slack-desc/kate
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-    |-----handy-ruler-----------------------------------------------------|
-kate: kate (an advanced text editor for KDE)
-kate:
-kate: The Kate project develops two main products:
-kate: KatePart, the advanced editor component which is used in numerous KDE
-kate: applications requiring a text editing component, and Kate, a MDI text
-kate: editor application. In addition, we provide KWrite, a simple SDI
-kate: editor shell which allows the user to select his/her favorite editor
-kate: component.
-kate:
-kate: Homepage: http://kate-editor.org
-kate:
diff --git a/source/kde/slack-desc/katomic b/source/kde/slack-desc/katomic
deleted file mode 100644
index e7925fb13..000000000
--- a/source/kde/slack-desc/katomic
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-katomic: katomic (re-assemble molecules from compound atoms)
-katomic:
-katomic: Katomic is both fun and educational game built around molecular
-katomic: geometry. It employs simplistic two-dimensional looks at different
-katomic: chemical elements. You can also play an online demo version
-katomic: of this game. 
-katomic:
-katomic:
-katomic:
-katomic:
-katomic:
diff --git a/source/kde/slack-desc/kaudiocreator b/source/kde/slack-desc/kaudiocreator
deleted file mode 100644
index 3de377236..000000000
--- a/source/kde/slack-desc/kaudiocreator
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-             |-----handy-ruler-----------------------------------------------|
-kaudiocreator: kaudiocreator (CD ripper and audio encoder)
-kaudiocreator:
-kaudiocreator: kaudiocreater is a KDE frontend for ripping and encoding audio
-kaudiocreator: to/from optical media.
-kaudiocreator:
-kaudiocreator:
-kaudiocreator:
-kaudiocreator:
-kaudiocreator:
-kaudiocreator:
-kaudiocreator:
diff --git a/source/kde/slack-desc/kblackbox b/source/kde/slack-desc/kblackbox
deleted file mode 100644
index c784dff59..000000000
--- a/source/kde/slack-desc/kblackbox
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-kblackbox: kblackbox (a game of hide and seek)
-kblackbox:
-kblackbox: KBlackbox is a game of hide and seek played on a grid of boxes
-kblackbox: where the computer has hidden several balls. 
-kblackbox:
-kblackbox:
-kblackbox:
-kblackbox:
-kblackbox:
-kblackbox:
-kblackbox:
diff --git a/source/kde/slack-desc/kblocks b/source/kde/slack-desc/kblocks
deleted file mode 100644
index ed3b82723..000000000
--- a/source/kde/slack-desc/kblocks
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kblocks: kblocks (falling blocks game for KDE)
-kblocks:
-kblocks: KBlocks is the KDE version of the classic falling blocks game.
-kblocks:
-kblocks:
-kblocks:
-kblocks:
-kblocks:
-kblocks:
-kblocks:
-kblocks:
diff --git a/source/kde/slack-desc/kbounce b/source/kde/slack-desc/kbounce
deleted file mode 100644
index f2ab8a211..000000000
--- a/source/kde/slack-desc/kbounce
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kbounce: kbounce (KDE Bounce Ball Game)
-kbounce:
-kbounce: KBounce is a single player arcade game with the elements of puzzle.
-kbounce: It is played on a field, surrounded by wall, with two or more balls
-kbounce: that move about in the field bouncing off of walls.
-kbounce: The player can build new walls, decreasing the size of active field. 
-kbounce:
-kbounce:
-kbounce:
-kbounce:
-kbounce:
diff --git a/source/kde/slack-desc/kbreakout b/source/kde/slack-desc/kbreakout
deleted file mode 100644
index d06080005..000000000
--- a/source/kde/slack-desc/kbreakout
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-kbreakout: kbreakout (breakout-like game for KDE)
-kbreakout:
-kbreakout: KBreakout is the KDE version of a Breakout-like game.
-kbreakout:
-kbreakout:
-kbreakout:
-kbreakout:
-kbreakout:
-kbreakout:
-kbreakout:
-kbreakout:
diff --git a/source/kde/slack-desc/kbruch b/source/kde/slack-desc/kbruch
deleted file mode 100644
index 2b9bdb681..000000000
--- a/source/kde/slack-desc/kbruch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kbruch: kbruch (calculate fractions)
-kbruch:
-kbruch: KBruch is a small program to practice calculating with fractions.
-kbruch:
-kbruch:
-kbruch:
-kbruch:
-kbruch:
-kbruch:
-kbruch:
-kbruch:
diff --git a/source/kde/slack-desc/kcachegrind b/source/kde/slack-desc/kcachegrind
deleted file mode 100644
index a6707b711..000000000
--- a/source/kde/slack-desc/kcachegrind
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kcachegrind: kcachegrind (GUI to profilers such as Valgrind)
-kcachegrind:
-kcachegrind: kcachegrind is a graphical browser for data produced by
-kcachegrind: profiling tools such as Valgrind.
-kcachegrind:
-kcachegrind:
-kcachegrind:
-kcachegrind:
-kcachegrind:
-kcachegrind:
-kcachegrind:
diff --git a/source/kde/slack-desc/kcalc b/source/kde/slack-desc/kcalc
deleted file mode 100644
index fc16f62d6..000000000
--- a/source/kde/slack-desc/kcalc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mkcalcs the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-kcalc: kcalc (KDE calculator)
-kcalc:
-kcalc: KCalc is a calculator which offers many more mathematical functions
-kcalc: than meet the eye on a first glance.
-kcalc:
-kcalc: kcalc's home page is: http://utils.kde.org/projects/kcalc
-kcalc:
-kcalc:
-kcalc:
-kcalc:
-kcalc:
diff --git a/source/kde/slack-desc/kcharselect b/source/kde/slack-desc/kcharselect
deleted file mode 100644
index 85f555f32..000000000
--- a/source/kde/slack-desc/kcharselect
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mkcharselects the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kcharselect: kcharselect (character picker)
-kcharselect:
-kcharselect: KCharSelect is a tool to select special characters from all
-kcharselect: installed fonts and copy them into the clipboard.
-kcharselect:
-kcharselect: kcharselect's home page: http://utils.kde.org/projects/kcharselect
-kcharselect:
-kcharselect:
-kcharselect:
-kcharselect:
-kcharselect:
diff --git a/source/kde/slack-desc/kcolorchooser b/source/kde/slack-desc/kcolorchooser
deleted file mode 100644
index b5219c5fb..000000000
--- a/source/kde/slack-desc/kcolorchooser
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------------|
-kcolorchooser: kcolorchooser (color chooser)
-kcolorchooser:
-kcolorchooser: A color chooser application for KDE.
-kcolorchooser:
-kcolorchooser:
-kcolorchooser:
-kcolorchooser:
-kcolorchooser:
-kcolorchooser:
-kcolorchooser:
-kcolorchooser:
diff --git a/source/kde/slack-desc/kcron b/source/kde/slack-desc/kcron
deleted file mode 100644
index d4be744f2..000000000
--- a/source/kde/slack-desc/kcron
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-kcron: kcron (task scheduler)
-kcron:
-kcron: kcron is a module for scheduling programs to run in the background.
-kcron: It is a graphical user interface to cron, the UNIX system scheduler.
-kcron:
-kcron:
-kcron:
-kcron:
-kcron:
-kcron:
-kcron:
diff --git a/source/kde/slack-desc/kde-base b/source/kde/slack-desc/kde-base
deleted file mode 100644
index d00d2bf68..000000000
--- a/source/kde/slack-desc/kde-base
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-kde-base: kde-base (KDE core applications and files)
-kde-base:
-kde-base: This package provides the core applications and infrastructure files
-kde-base: for the KDE Plasma Desktop.
-kde-base:
-kde-base:
-kde-base:
-kde-base:
-kde-base:
-kde-base:
-kde-base:
diff --git a/source/kde/slack-desc/kde-base-artwork b/source/kde/slack-desc/kde-base-artwork
deleted file mode 100644
index 32389b754..000000000
--- a/source/kde/slack-desc/kde-base-artwork
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-kde-base-artwork: kde-base-artwork (KDE themes artwork)
-kde-base-artwork:
-kde-base-artwork: This package contains KSplash themes and other artwork.
-kde-base-artwork:
-kde-base-artwork:
-kde-base-artwork:
-kde-base-artwork:
-kde-base-artwork:
-kde-base-artwork:
-kde-base-artwork:
-kde-base-artwork:
diff --git a/source/kde/slack-desc/kde-baseapps b/source/kde/slack-desc/kde-baseapps
deleted file mode 100644
index 46230f6c8..000000000
--- a/source/kde/slack-desc/kde-baseapps
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kde-baseapps: kde-baseapps (KDE core applications and files)
-kde-baseapps:
-kde-baseapps: This package provides the core applications and infrastructure files
-kde-baseapps: for the KDE Plasma Desktop.
-kde-baseapps:
-kde-baseapps:
-kde-baseapps:
-kde-baseapps:
-kde-baseapps:
-kde-baseapps:
-kde-baseapps:
diff --git a/source/kde/slack-desc/kde-bindings b/source/kde/slack-desc/kde-bindings
deleted file mode 100644
index 36020536c..000000000
--- a/source/kde/slack-desc/kde-bindings
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kde-bindings: kde-bindings (KDE language bindings)
-kde-bindings:
-kde-bindings: KDE and most KDE applications are implemented using the C++
-kde-bindings: programming language, but that doesn't mean you don't have a choice.
-kde-bindings: This package contains a number of bindings to other languages,
-kde-bindings: including scripting languages and other systems' programming
-kde-bindings: languages, allowing them to be used to create applications for the
-kde-bindings: KDE Platform.
-kde-bindings:
-kde-bindings:
-kde-bindings:
diff --git a/source/kde/slack-desc/kde-dev-scripts b/source/kde/slack-desc/kde-dev-scripts
deleted file mode 100644
index 296127e88..000000000
--- a/source/kde/slack-desc/kde-dev-scripts
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-kde-dev-scripts: kde-dev-scripts (scripts for development of KDE software)
-kde-dev-scripts:
-kde-dev-scripts: Scripts and setting files useful during development of KDE software.
-kde-dev-scripts:
-kde-dev-scripts:
-kde-dev-scripts:
-kde-dev-scripts:
-kde-dev-scripts:
-kde-dev-scripts:
-kde-dev-scripts:
-kde-dev-scripts:
diff --git a/source/kde/slack-desc/kde-dev-utils b/source/kde/slack-desc/kde-dev-utils
deleted file mode 100644
index cc8f350db..000000000
--- a/source/kde/slack-desc/kde-dev-utils
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------------|
-kde-dev-utils: kde-dev-utils (KDE development utilities)
-kde-dev-utils:
-kde-dev-utils: Small utilities for developers using KDE/Qt libs/frameworks such as
-kde-dev-utils: kmtrace, kpartloader, kprofilemethod, kstartperf, kuiviewer.
-kde-dev-utils:
-kde-dev-utils:
-kde-dev-utils:
-kde-dev-utils:
-kde-dev-utils:
-kde-dev-utils:
-kde-dev-utils:
diff --git a/source/kde/slack-desc/kde-educational b/source/kde/slack-desc/kde-educational
deleted file mode 100644
index bccdeb31e..000000000
--- a/source/kde/slack-desc/kde-educational
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-kde-educational: kde-educational (Educational applications)
-kde-educational:
-kde-educational: Educational applications for the KDE Software Compilation.
-kde-educational:
-kde-educational:
-kde-educational:
-kde-educational:
-kde-educational:
-kde-educational:
-kde-educational:
-kde-educational:
diff --git a/source/kde/slack-desc/kde-runtime b/source/kde/slack-desc/kde-runtime
deleted file mode 100644
index 279b2bfdc..000000000
--- a/source/kde/slack-desc/kde-runtime
+++ /dev/null
@@ -1,18 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-           |-----handy-ruler------------------------------------------------------|
-kde-runtime: kde-runtime (KDE runtime core)
-kde-runtime:
-kde-runtime: This package contains core components of the KDE base runtime module.
-kde-runtime:
-kde-runtime:
-kde-runtime:
-kde-runtime:
-kde-runtime:
-kde-runtime:
-kde-runtime:
-kde-runtime:
diff --git a/source/kde/slack-desc/kde-wallpapers b/source/kde/slack-desc/kde-wallpapers
deleted file mode 100644
index e78fbfb46..000000000
--- a/source/kde/slack-desc/kde-wallpapers
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-              |-----handy-ruler-------------------------------------------------|
-kde-wallpapers: kde-wallpapers (Wallpapers for KDE)
-kde-wallpapers:
-kde-wallpapers: Additional wallpapers for KDE.
-kde-wallpapers:
-kde-wallpapers:
-kde-wallpapers:
-kde-wallpapers:
-kde-wallpapers:
-kde-wallpapers:
-kde-wallpapers:
-kde-wallpapers:
diff --git a/source/kde/slack-desc/kde-workspace b/source/kde/slack-desc/kde-workspace
deleted file mode 100644
index 3027e7333..000000000
--- a/source/kde/slack-desc/kde-workspace
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------------|
-kde-workspace: kde-workspace (KDE Plasma Desktop)
-kde-workspace:
-kde-workspace: This package provides the essential parts of the KDE Plasma Desktop
-kde-workspace: that are presented to the user.
-kde-workspace:
-kde-workspace:
-kde-workspace:
-kde-workspace:
-kde-workspace:
-kde-workspace:
-kde-workspace:
diff --git a/source/kde/slack-desc/kdeaccessibility b/source/kde/slack-desc/kdeaccessibility
deleted file mode 100644
index 91669ef7d..000000000
--- a/source/kde/slack-desc/kdeaccessibility
+++ /dev/null
@@ -1,20 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-kdeaccessibility: kdeaccessibility (Accessibility programs for KDE)
-kdeaccessibility:
-kdeaccessibility: KDE accessibility programs, including kmag (a screen magnifier),
-kdeaccessibility: kmousetool (clicks the mouse for you), and kmouth (a speech
-kdeaccessibility: synthesizer frontend).
-kdeaccessibility:
-kdeaccessibility:
-kdeaccessibility:
-kdeaccessibility:
-kdeaccessibility:
-kdeaccessibility:
-kdeaccessibility:
diff --git a/source/kde/slack-desc/kdeadmin b/source/kde/slack-desc/kdeadmin
deleted file mode 100644
index cef430766..000000000
--- a/source/kde/slack-desc/kdeadmin
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler---------------------------------------------------|
-kdeadmin: kdeadmin (System Administration tools)
-kdeadmin:
-kdeadmin: KDE system administration tools.
-kdeadmin:
-kdeadmin:
-kdeadmin:
-kdeadmin:
-kdeadmin:
-kdeadmin:
-kdeadmin:
-kdeadmin:
diff --git a/source/kde/slack-desc/kdeartwork b/source/kde/slack-desc/kdeartwork
deleted file mode 100644
index cc5f6f18e..000000000
--- a/source/kde/slack-desc/kdeartwork
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-          |-----handy-ruler-------------------------------------------------|
-kdeartwork: kdeartwork (Artwork for KDE)
-kdeartwork:
-kdeartwork: Additional themes, screensavers, sounds, wallpapers, and window
-kdeartwork: styles.
-kdeartwork:
-kdeartwork:
-kdeartwork:
-kdeartwork:
-kdeartwork:
-kdeartwork:
-kdeartwork:
diff --git a/source/kde/slack-desc/kdebase b/source/kde/slack-desc/kdebase
deleted file mode 100644
index bf91423e9..000000000
--- a/source/kde/slack-desc/kdebase
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kdebase: kdebase (KDE core applications and files)
-kdebase:
-kdebase: This package provides the core applications and infrastructure files
-kdebase: for the KDE Plasma Desktop.
-kdebase:
-kdebase:
-kdebase:
-kdebase:
-kdebase:
-kdebase:
-kdebase:
diff --git a/source/kde/slack-desc/kdebase-runtime b/source/kde/slack-desc/kdebase-runtime
deleted file mode 100644
index 09bf5774f..000000000
--- a/source/kde/slack-desc/kdebase-runtime
+++ /dev/null
@@ -1,18 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-               |-----handy-ruler------------------------------------------------------|
-kdebase-runtime: kdebase-runtime (KDE runtime core)
-kdebase-runtime:
-kdebase-runtime: This package contains core components of the KDE base runtime module.
-kdebase-runtime:
-kdebase-runtime:
-kdebase-runtime:
-kdebase-runtime:
-kdebase-runtime:
-kdebase-runtime:
-kdebase-runtime:
-kdebase-runtime:
diff --git a/source/kde/slack-desc/kdebase-workspace b/source/kde/slack-desc/kdebase-workspace
deleted file mode 100644
index 2ec11412b..000000000
--- a/source/kde/slack-desc/kdebase-workspace
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-kdebase-workspace: kdebase-workspace (KDE Plasma Desktop)
-kdebase-workspace:
-kdebase-workspace: This package provides the essential parts of the KDE Plasma Desktop
-kdebase-workspace: that are presented to the user.
-kdebase-workspace:
-kdebase-workspace:
-kdebase-workspace:
-kdebase-workspace:
-kdebase-workspace:
-kdebase-workspace:
-kdebase-workspace:
diff --git a/source/kde/slack-desc/kdebindings b/source/kde/slack-desc/kdebindings
deleted file mode 100644
index e927c76fe..000000000
--- a/source/kde/slack-desc/kdebindings
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kdebindings: kdebindings (KDE language bindings)
-kdebindings:
-kdebindings: KDE and most KDE applications are implemented using the C++
-kdebindings: programming language, but that doesn't mean you don't have a choice.
-kdebindings: This package contains a number of bindings to other languages,
-kdebindings: including scripting languages and other systems' programming
-kdebindings: languages, allowing them to be used to create applications for the
-kdebindings: KDE Platform.
-kdebindings:
-kdebindings:
-kdebindings:
diff --git a/source/kde/slack-desc/kdeconnect-kde b/source/kde/slack-desc/kdeconnect-kde
deleted file mode 100644
index d25e1bd76..000000000
--- a/source/kde/slack-desc/kdeconnect-kde
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kdeconnect-kde: kdeconnect-kde (Integrate Android with the KDE Desktop)
-kdeconnect-kde:
-kdeconnect-kde: KDE Connect is a module to connect KDE with your smartphone.
-kdeconnect-kde: Prominent features are: clipboard share, notifications sync, 
-kdeconnect-kde: multimedia remote control over secured network connections.
-kdeconnect-kde: Please note you will need to install KDE Connect on Android
-kdeconnect-kde: for this app to work:
-kdeconnect-kde:   play.google.com/store/apps/details?id=org.kde.kdeconnect-kde_tp
-kdeconnect-kde:
-kdeconnect-kde: See also:
-kdeconnect-kde:   http://albertvaka.wordpress.com/2013/08/05/introducing-kde-connect/
diff --git a/source/kde/slack-desc/kdeedu b/source/kde/slack-desc/kdeedu
deleted file mode 100644
index b97fdd759..000000000
--- a/source/kde/slack-desc/kdeedu
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kdeedu: kdeedu (Educational applications)
-kdeedu:
-kdeedu: Educational applications for the KDE Software Compilation.
-kdeedu:
-kdeedu:
-kdeedu:
-kdeedu:
-kdeedu:
-kdeedu:
-kdeedu:
-kdeedu:
diff --git a/source/kde/slack-desc/kdegames b/source/kde/slack-desc/kdegames
deleted file mode 100644
index c821c7fa7..000000000
--- a/source/kde/slack-desc/kdegames
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-kdegames: kdegames (KDE games)
-kdegames:
-kdegames: A collection of games for the KDE Software Compilation.
-kdegames:
-kdegames:
-kdegames:
-kdegames:
-kdegames:
-kdegames:
-kdegames:
-kdegames:
diff --git a/source/kde/slack-desc/kdegraphics b/source/kde/slack-desc/kdegraphics
deleted file mode 100644
index 7184942e0..000000000
--- a/source/kde/slack-desc/kdegraphics
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kdegraphics: kdegraphics (KDE graphics programs)
-kdegraphics:
-kdegraphics: Graphics programs for the KDE Software Compilation, including
-kdegraphics: gwenview, kcolorchooser, kbackgroundsnapshot, kolourpaint, kruler,
-kdegraphics: ksnapshot, okular, and xf86gammacfg.
-kdegraphics:
-kdegraphics:
-kdegraphics:
-kdegraphics:
-kdegraphics:
-kdegraphics:
diff --git a/source/kde/slack-desc/kdegraphics-mobipocket b/source/kde/slack-desc/kdegraphics-mobipocket
deleted file mode 100644
index fedd14df2..000000000
--- a/source/kde/slack-desc/kdegraphics-mobipocket
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                      |-----handy-ruler------------------------------------------------------|
-kdegraphics-mobipocket: kdegraphics-mobipocket (Mobipocket support for Okular)
-kdegraphics-mobipocket:
-kdegraphics-mobipocket: Mobipocket support for Okular.
-kdegraphics-mobipocket:
-kdegraphics-mobipocket:
-kdegraphics-mobipocket:
-kdegraphics-mobipocket:
-kdegraphics-mobipocket:
-kdegraphics-mobipocket:
-kdegraphics-mobipocket:
-kdegraphics-mobipocket:
diff --git a/source/kde/slack-desc/kdegraphics-strigi-analyzer b/source/kde/slack-desc/kdegraphics-strigi-analyzer
deleted file mode 100644
index 11b2e5ee8..000000000
--- a/source/kde/slack-desc/kdegraphics-strigi-analyzer
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                           |-----handy-ruler------------------------------------------------------|
-kdegraphics-strigi-analyzer: kdegraphics-strigi-analyzer (graphics plugins for strigi)
-kdegraphics-strigi-analyzer:
-kdegraphics-strigi-analyzer: Graphics file format plugins for Strigi Desktop Search.
-kdegraphics-strigi-analyzer: These plugins allow Strigi Desktop Search to extract
-kdegraphics-strigi-analyzer: additional information about several document and graphic file
-kdegraphics-strigi-analyzer: formats.
-kdegraphics-strigi-analyzer:
-kdegraphics-strigi-analyzer:
-kdegraphics-strigi-analyzer:
-kdegraphics-strigi-analyzer:
-kdegraphics-strigi-analyzer:
diff --git a/source/kde/slack-desc/kdegraphics-thumbnailers b/source/kde/slack-desc/kdegraphics-thumbnailers
deleted file mode 100644
index e07d3859d..000000000
--- a/source/kde/slack-desc/kdegraphics-thumbnailers
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                        |-----handy-ruler------------------------------------------------------|
-kdegraphics-thumbnailers: kdegraphics-thumbnailers (thumbnailers for various graphics formats)
-kdegraphics-thumbnailers:
-kdegraphics-thumbnailers: These plugins allow KDE software to create thumbnails for
-kdegraphics-thumbnailers: several advanced graphic file formats.
-kdegraphics-thumbnailers:
-kdegraphics-thumbnailers:
-kdegraphics-thumbnailers:
-kdegraphics-thumbnailers:
-kdegraphics-thumbnailers:
-kdegraphics-thumbnailers:
-kdegraphics-thumbnailers:
diff --git a/source/kde/slack-desc/kdelibs b/source/kde/slack-desc/kdelibs
deleted file mode 100644
index a89ea3c8a..000000000
--- a/source/kde/slack-desc/kdelibs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kdelibs: kdelibs (KDE libraries)
-kdelibs:
-kdelibs: System libraries and other resources required for the KDE Platform.
-kdelibs:
-kdelibs:
-kdelibs:
-kdelibs:
-kdelibs:
-kdelibs:
-kdelibs:
-kdelibs:
diff --git a/source/kde/slack-desc/kdemultimedia b/source/kde/slack-desc/kdemultimedia
deleted file mode 100644
index cd0586273..000000000
--- a/source/kde/slack-desc/kdemultimedia
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------------|
-kdemultimedia: kdemultimedia (KDE multimedia applications)
-kdemultimedia:
-kdemultimedia: Multimedia applications for the KDE Software Compilation.
-kdemultimedia:
-kdemultimedia:
-kdemultimedia:
-kdemultimedia:
-kdemultimedia:
-kdemultimedia:
-kdemultimedia:
-kdemultimedia:
diff --git a/source/kde/slack-desc/kdenetwork b/source/kde/slack-desc/kdenetwork
deleted file mode 100644
index 90120dd93..000000000
--- a/source/kde/slack-desc/kdenetwork
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-kdenetwork: kdenetwork (Network utilities for KDE)
-kdenetwork:
-kdenetwork: Network related utilities for the KDE Software Compilation.
-kdenetwork:
-kdenetwork:
-kdenetwork:
-kdenetwork:
-kdenetwork:
-kdenetwork:
-kdenetwork:
-kdenetwork:
diff --git a/source/kde/slack-desc/kdenetwork-filesharing b/source/kde/slack-desc/kdenetwork-filesharing
deleted file mode 100644
index 3ab0c1f6d..000000000
--- a/source/kde/slack-desc/kdenetwork-filesharing
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                      |-----handy-ruler------------------------------------------------------|
-kdenetwork-filesharing: kdenetwork-filesharing (share a directory with the local network)
-kdenetwork-filesharing:
-kdenetwork-filesharing: Konqueror properties dialog plugin to share a directory
-kdenetwork-filesharing: with the local network.
-kdenetwork-filesharing:
-kdenetwork-filesharing:
-kdenetwork-filesharing:
-kdenetwork-filesharing:
-kdenetwork-filesharing:
-kdenetwork-filesharing:
-kdenetwork-filesharing:
diff --git a/source/kde/slack-desc/kdenetwork-strigi-analyzers b/source/kde/slack-desc/kdenetwork-strigi-analyzers
deleted file mode 100644
index dc4f5db93..000000000
--- a/source/kde/slack-desc/kdenetwork-strigi-analyzers
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                           |-----handy-ruler-----------------------------------------------------|
-kdenetwork-strigi-analyzers: kdenetwork-strigi-analyzers (analyzer plugins for Strigi)
-kdenetwork-strigi-analyzers:
-kdenetwork-strigi-analyzers: This package contains analyzer plugins for Strigi.
-kdenetwork-strigi-analyzers:
-kdenetwork-strigi-analyzers: Homepage: http://kde.org/
-kdenetwork-strigi-analyzers:
-kdenetwork-strigi-analyzers:
-kdenetwork-strigi-analyzers:
-kdenetwork-strigi-analyzers:
-kdenetwork-strigi-analyzers:
-kdenetwork-strigi-analyzers:
diff --git a/source/kde/slack-desc/kdepim b/source/kde/slack-desc/kdepim
deleted file mode 100644
index 7a66c176c..000000000
--- a/source/kde/slack-desc/kdepim
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler-----------------------------------------------------|
-kdepim: kdepim (KDE Personal Information Management applications)
-kdepim:
-kdepim: The KDE-PIM project aims to bring together those who wish to help 
-kdepim: design, implement, test, etc. anything that's to do with personal 
-kdepim: information management.
-kdepim:
-kdepim: This rather broad scope encompasses mail clients, addressbooks, 
-kdepim: usenet news, scheduling, and even sticky notes.
-kdepim:
-kdepim:
-kdepim:
diff --git a/source/kde/slack-desc/kdepim-runtime b/source/kde/slack-desc/kdepim-runtime
deleted file mode 100644
index cb0ac6e73..000000000
--- a/source/kde/slack-desc/kdepim-runtime
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler-----------------------------------------------------|
-kdepim-runtime: kdepim-runtime (KDE Personal Information Management runtime)
-kdepim-runtime:
-kdepim-runtime: The KDE-PIM project aims to bring together those who wish to help 
-kdepim-runtime: design, implement, test, etc. anything that's to do with personal 
-kdepim-runtime: information management.
-kdepim-runtime:
-kdepim-runtime: This rather broad scope encompasses mail clients, addressbooks, 
-kdepim-runtime: usenet news, scheduling, and even sticky notes.
-kdepim-runtime:
-kdepim-runtime:
-kdepim-runtime:
diff --git a/source/kde/slack-desc/kdepimlibs b/source/kde/slack-desc/kdepimlibs
deleted file mode 100644
index cbd08ba48..000000000
--- a/source/kde/slack-desc/kdepimlibs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-kdepimlibs: kdepimlibs (Libraries for KDE-PIM)
-kdepimlibs:
-kdepimlibs: This module includes libraries that are central to the development and
-kdepimlibs: execution of a KDE-PIM application.
-kdepimlibs:
-kdepimlibs:
-kdepimlibs:
-kdepimlibs:
-kdepimlibs:
-kdepimlibs:
-kdepimlibs:
diff --git a/source/kde/slack-desc/kdeplasma-addons b/source/kde/slack-desc/kdeplasma-addons
deleted file mode 100644
index a9bc5738f..000000000
--- a/source/kde/slack-desc/kdeplasma-addons
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-kdeplasma-addons: kdeplasma-addons (Plasma addons for KDE)
-kdeplasma-addons:
-kdeplasma-addons: Plasmoids (or widgets) for the KDE Plasma Desktop shell.
-kdeplasma-addons:
-kdeplasma-addons:
-kdeplasma-addons:
-kdeplasma-addons:
-kdeplasma-addons:
-kdeplasma-addons:
-kdeplasma-addons:
-kdeplasma-addons:
diff --git a/source/kde/slack-desc/kdesdk b/source/kde/slack-desc/kdesdk
deleted file mode 100644
index ec62b7f46..000000000
--- a/source/kde/slack-desc/kdesdk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler-----------------------------------------------------|
-kdesdk: kdesdk (KDE SDK)
-kdesdk:
-kdesdk: KDE Software Development Kit. This is a collection of applications
-kdesdk: and tools used to develop on the KDE Platform. It also contains
-kdesdk: example code for use in learning KDE programming or starting a new
-kdesdk: KDE application.
-kdesdk:
-kdesdk:
-kdesdk:
-kdesdk:
-kdesdk:
diff --git a/source/kde/slack-desc/kdesdk-kioslaves b/source/kde/slack-desc/kdesdk-kioslaves
deleted file mode 100644
index 212887267..000000000
--- a/source/kde/slack-desc/kdesdk-kioslaves
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-kdesdk-kioslaves: kdesdk-kioslaves (KIO-slaves for KDE SDK)
-kdesdk-kioslaves:
-kdesdk-kioslaves: This package contains KIO-slaves for KDE SDK.
-kdesdk-kioslaves:
-kdesdk-kioslaves:
-kdesdk-kioslaves:
-kdesdk-kioslaves:
-kdesdk-kioslaves:
-kdesdk-kioslaves:
-kdesdk-kioslaves:
-kdesdk-kioslaves:
diff --git a/source/kde/slack-desc/kdesdk-strigi-analyzers b/source/kde/slack-desc/kdesdk-strigi-analyzers
deleted file mode 100644
index 5094cabcd..000000000
--- a/source/kde/slack-desc/kdesdk-strigi-analyzers
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                       |-----handy-ruler------------------------------------------------------|
-kdesdk-strigi-analyzers: kdesdk-strigi-analyzers (analyzer plugins for Strigi)
-kdesdk-strigi-analyzers:
-kdesdk-strigi-analyzers: This package contains analyzer plugins for Strigi.
-kdesdk-strigi-analyzers:
-kdesdk-strigi-analyzers:
-kdesdk-strigi-analyzers:
-kdesdk-strigi-analyzers:
-kdesdk-strigi-analyzers:
-kdesdk-strigi-analyzers:
-kdesdk-strigi-analyzers:
-kdesdk-strigi-analyzers:
diff --git a/source/kde/slack-desc/kdesdk-thumbnailers b/source/kde/slack-desc/kdesdk-thumbnailers
deleted file mode 100644
index b176e6be8..000000000
--- a/source/kde/slack-desc/kdesdk-thumbnailers
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                   |-----handy-ruler------------------------------------------------------|
-kdesdk-thumbnailers: kdesdk-thumbnailers (thumbnailers for KDE)
-kdesdk-thumbnailers:
-kdesdk-thumbnailers: Thumbnailers for KDE, including gnu gettext po translation
-kdesdk-thumbnailers: files and gettext translation templates.
-kdesdk-thumbnailers:
-kdesdk-thumbnailers:
-kdesdk-thumbnailers:
-kdesdk-thumbnailers:
-kdesdk-thumbnailers:
-kdesdk-thumbnailers:
-kdesdk-thumbnailers:
diff --git a/source/kde/slack-desc/kdetoys b/source/kde/slack-desc/kdetoys
deleted file mode 100644
index 9af6c6025..000000000
--- a/source/kde/slack-desc/kdetoys
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kdetoys: kdetoys (Toys for the KDE Software Compilation)
-kdetoys:
-kdetoys: Some toys for the KDE Software Compilation such as amor, kteatime,
-kdetoys: ktux, kweatherreport, and kweatherservice.
-kdetoys:
-kdetoys:
-kdetoys:
-kdetoys:
-kdetoys:
-kdetoys:
-kdetoys:
diff --git a/source/kde/slack-desc/kdeutils b/source/kde/slack-desc/kdeutils
deleted file mode 100644
index 927ac4369..000000000
--- a/source/kde/slack-desc/kdeutils
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-        |-----handy-ruler---------------------------------------------------|
-kdeutils: kdeutils (KDE Utilities)
-kdeutils:
-kdeutils: This package includes utilities for the KDE Software Compilation.
-kdeutils:
-kdeutils:
-kdeutils:
-kdeutils:
-kdeutils:
-kdeutils:
-kdeutils:
-kdeutils:
diff --git a/source/kde/slack-desc/kdev-python b/source/kde/slack-desc/kdev-python
deleted file mode 100644
index 9a548358c..000000000
--- a/source/kde/slack-desc/kdev-python
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kdev-python: kdev-python (Python language plugin for KDevelop)
-kdev-python:
-kdev-python: This KDevelop plugin provides support for the Python language.
-kdev-python:
-kdev-python:
-kdev-python:
-kdev-python:
-kdev-python:
-kdev-python:
-kdev-python:
-kdev-python:
diff --git a/source/kde/slack-desc/kdevelop b/source/kde/slack-desc/kdevelop
deleted file mode 100644
index 49f2da129..000000000
--- a/source/kde/slack-desc/kdevelop
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-kdevelop: kdevelop (development environment for KDE)
-kdevelop:
-kdevelop: The KDevelop integrated C/C++ application development environment.
-kdevelop:
-kdevelop:
-kdevelop:
-kdevelop:
-kdevelop:
-kdevelop:
-kdevelop:
-kdevelop:
diff --git a/source/kde/slack-desc/kdevelop-pg-qt b/source/kde/slack-desc/kdevelop-pg-qt
deleted file mode 100644
index 3b158dd2d..000000000
--- a/source/kde/slack-desc/kdevelop-pg-qt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kdevelop-pg-qt: kdevelop-pg-qt (KDevelop Parser Generator)
-kdevelop-pg-qt:
-kdevelop-pg-qt: KDevelop Parser Generator used in the PHP language plugin and others.
-kdevelop-pg-qt:
-kdevelop-pg-qt:
-kdevelop-pg-qt:
-kdevelop-pg-qt:
-kdevelop-pg-qt:
-kdevelop-pg-qt:
-kdevelop-pg-qt:
-kdevelop-pg-qt:
diff --git a/source/kde/slack-desc/kdevelop-php b/source/kde/slack-desc/kdevelop-php
deleted file mode 100644
index be58f46cd..000000000
--- a/source/kde/slack-desc/kdevelop-php
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kdevelop-php: kdevelop-php (PHP language plugin for KDevelop)
-kdevelop-php:
-kdevelop-php: This is a KDevelop plugin that provides support for the PHP language.
-kdevelop-php:
-kdevelop-php:
-kdevelop-php:
-kdevelop-php:
-kdevelop-php:
-kdevelop-php:
-kdevelop-php:
-kdevelop-php:
diff --git a/source/kde/slack-desc/kdevelop-php-docs b/source/kde/slack-desc/kdevelop-php-docs
deleted file mode 100644
index df368584c..000000000
--- a/source/kde/slack-desc/kdevelop-php-docs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-kdevelop-php-docs: kdevelop-php-docs (PHP documentation plugin for KDevelop)
-kdevelop-php-docs:
-kdevelop-php-docs: This KDevelop plugin integrates the php.net online documentation.
-kdevelop-php-docs:
-kdevelop-php-docs:
-kdevelop-php-docs:
-kdevelop-php-docs:
-kdevelop-php-docs:
-kdevelop-php-docs:
-kdevelop-php-docs:
-kdevelop-php-docs:
diff --git a/source/kde/slack-desc/kdevplatform b/source/kde/slack-desc/kdevplatform
deleted file mode 100644
index 04fe68c9e..000000000
--- a/source/kde/slack-desc/kdevplatform
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kdevplatform: kdevplatform (KDE development platform)
-kdevplatform:
-kdevplatform: This KDE module provides libraries used by kdevelop.
-kdevplatform:
-kdevplatform:
-kdevplatform:
-kdevplatform:
-kdevplatform:
-kdevplatform:
-kdevplatform:
-kdevplatform:
diff --git a/source/kde/slack-desc/kdewebdev b/source/kde/slack-desc/kdewebdev
deleted file mode 100644
index 294ef22e4..000000000
--- a/source/kde/slack-desc/kdewebdev
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-         |-----handy-ruler--------------------------------------------------|
-kdewebdev: kdewebdev (web development package for the KDE Platform)
-kdewebdev:
-kdewebdev: The kdewebdev package contains applications which are useful for
-kdewebdev: web development.
-kdewebdev:
-kdewebdev:
-kdewebdev:
-kdewebdev:
-kdewebdev:
-kdewebdev:
-kdewebdev:
diff --git a/source/kde/slack-desc/kdf b/source/kde/slack-desc/kdf
deleted file mode 100644
index 8c6392072..000000000
--- a/source/kde/slack-desc/kdf
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mkdiskfrees the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-   |-----handy-ruler------------------------------------------------------|
-kdf: kdf (show available disk space)
-kdf:
-kdf: kdf (KDiskFree) displays the available file devices (hard drive
-kdf: partitions, floppy and CD/DVD drives, etc.) along with information on
-kdf: their capacity, free space, type and mount point.
-kdf:
-kdf: kdf's home page is: http://utils.kde.org/projects/kdf
-kdf:
-kdf:
-kdf:
-kdf:
diff --git a/source/kde/slack-desc/kdiamond b/source/kde/slack-desc/kdiamond
deleted file mode 100644
index 66f838a73..000000000
--- a/source/kde/slack-desc/kdiamond
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-kdiamond: kdiamond (three-in-a-row game for KDE)
-kdiamond:
-kdiamond: KDiamond is a single player puzzle game. The object of the game is
-kdiamond: to build and remove lines of three similar diamonds.
-kdiamond:
-kdiamond:
-kdiamond:
-kdiamond:
-kdiamond:
-kdiamond:
-kdiamond:
diff --git a/source/kde/slack-desc/kdnssd b/source/kde/slack-desc/kdnssd
deleted file mode 100644
index 0a87fba13..000000000
--- a/source/kde/slack-desc/kdnssd
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kdnssd: kdnssd (network monitor for zeroconf)
-kdnssd:
-kdnssd: A network monitor for DNS-SD services (Zeroconf).
-kdnssd:
-kdnssd:
-kdnssd:
-kdnssd:
-kdnssd:
-kdnssd:
-kdnssd:
-kdnssd:
diff --git a/source/kde/slack-desc/kfilemetadata b/source/kde/slack-desc/kfilemetadata
deleted file mode 100644
index 88c2f7d6b..000000000
--- a/source/kde/slack-desc/kfilemetadata
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------------|
-kfilemetadata: kfilemetadata (a library for extracting file metadata)
-kfilemetadata:
-kfilemetadata: kfilemetadata is a library for extracting file metadata.
-kfilemetadata:
-kfilemetadata:
-kfilemetadata:
-kfilemetadata:
-kfilemetadata:
-kfilemetadata:
-kfilemetadata:
-kfilemetadata:
diff --git a/source/kde/slack-desc/kfloppy b/source/kde/slack-desc/kfloppy
deleted file mode 100644
index 06d313aee..000000000
--- a/source/kde/slack-desc/kfloppy
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mkfloppys the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kfloppy: kfloppy (floppy disk formatter)
-kfloppy:
-kfloppy: KFloppy is a utility that provides a straightforward graphical means
-kfloppy: to format 3.5" and 5.25" floppy disks.
-kfloppy:
-kfloppy: kfloppy's home page is: http://utils.kde.org/projects/kfloppy
-kfloppy:
-kfloppy:
-kfloppy:
-kfloppy:
-kfloppy:
diff --git a/source/kde/slack-desc/kfourinline b/source/kde/slack-desc/kfourinline
deleted file mode 100644
index 438602ad0..000000000
--- a/source/kde/slack-desc/kfourinline
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kfourinline: kfourinline (four-in-a-row board game)
-kfourinline:
-kfourinline: KFourInLine is a board game for two players based on the
-kfourinline: Connect-Four game. The players try to build up a row of
-kfourinline: four pieces using different strategies.
-kfourinline:
-kfourinline:
-kfourinline:
-kfourinline:
-kfourinline:
-kfourinline:
diff --git a/source/kde/slack-desc/kgamma b/source/kde/slack-desc/kgamma
deleted file mode 100644
index 943ca9ca8..000000000
--- a/source/kde/slack-desc/kgamma
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kgamma: kgamma (display gamma configuration)
-kgamma:
-kgamma: A KDE system settings module to configure display gamma.
-kgamma:
-kgamma:
-kgamma:
-kgamma:
-kgamma:
-kgamma:
-kgamma:
-kgamma:
diff --git a/source/kde/slack-desc/kgeography b/source/kde/slack-desc/kgeography
deleted file mode 100644
index 241d8e5ac..000000000
--- a/source/kde/slack-desc/kgeography
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-kgeography: kgeography (a geography learning tool)
-kgeography:
-kgeography: KGeography is a geography learning tool.
-kgeography: Right now it has three usage modes:
-kgeography: * Browse the maps clicking in a map division to see it's name
-kgeography: * The game tells you a map division name and you have to click on it
-kgeography: * The game shows you a map division flag and you have to guess
-kgeography:   its name 
-kgeography:
-kgeography: For more information, visit: http://kgeography.berlios.de/
-kgeography:
diff --git a/source/kde/slack-desc/kget b/source/kde/slack-desc/kget
deleted file mode 100644
index c6a03661a..000000000
--- a/source/kde/slack-desc/kget
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-kget: kget (download manager for KDE)
-kget:
-kget: kget is a download manager for KDE.
-kget:
-kget:
-kget:
-kget:
-kget:
-kget:
-kget:
-kget:
diff --git a/source/kde/slack-desc/kgoldrunner b/source/kde/slack-desc/kgoldrunner
deleted file mode 100644
index 53f93e24d..000000000
--- a/source/kde/slack-desc/kgoldrunner
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kgoldrunner: kgoldrunner (Hunt gold, dodge enemies and solve puzzles)
-kgoldrunner:
-kgoldrunner: KGoldrunner is a maze-threading game with a puzzle flavor.
-kgoldrunner: It has hundreds of levels where pieces of gold must be collected,
-kgoldrunner: with enemies in hot pursuit.
-kgoldrunner:
-kgoldrunner:
-kgoldrunner:
-kgoldrunner:
-kgoldrunner:
-kgoldrunner:
diff --git a/source/kde/slack-desc/kgpg b/source/kde/slack-desc/kgpg
deleted file mode 100644
index 65e833b57..000000000
--- a/source/kde/slack-desc/kgpg
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mkgpgs the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-kgpg: kgpg (KDE GUI for GnuPG)
-kgpg:
-kgpg: KGpg is a simple interface for GnuPG, a powerful encryption utility.
-kgpg:
-kgpg: kgpg's home page is: http://utils.kde.org/projects/kgpg
-kgpg:
-kgpg:
-kgpg:
-kgpg:
-kgpg:
-kgpg:
diff --git a/source/kde/slack-desc/khangman b/source/kde/slack-desc/khangman
deleted file mode 100644
index b862960a7..000000000
--- a/source/kde/slack-desc/khangman
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-khangman: khangman (classical hangman game)
-khangman:
-khangman: KHangman is the classical hangman game. The child should guess a word
-khangman: letter by letter. At each miss, the picture of a hangman appears.
-khangman: After 10 tries, if the word is not guessed, the game is over and
-khangman: the answer is displayed.
-khangman:
-khangman:
-khangman:
-khangman:
-khangman:
diff --git a/source/kde/slack-desc/kig b/source/kde/slack-desc/kig
deleted file mode 100644
index 7465113ff..000000000
--- a/source/kde/slack-desc/kig
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-   |-----handy-ruler------------------------------------------------------|
-kig: kig (interactive geometry game)
-kig:
-kig: Kig is an application meant to allow high school students to
-kig: interactively explore mathematical concepts, much like Dr.Geo, KGeo,
-kig: KSeg and Cabri.
-kig:
-kig:
-kig:
-kig:
-kig:
-kig:
diff --git a/source/kde/slack-desc/kigo b/source/kde/slack-desc/kigo
deleted file mode 100644
index dd883490d..000000000
--- a/source/kde/slack-desc/kigo
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-kigo: kigo (Go board game for KDE)
-kigo:
-kigo: Kigo is an open-source implementation of the popular Go game.
-kigo: Go is a strategic board game for two players. It is also known as igo
-kigo: (Japanese), weiqi or wei ch'i (Chinese) or baduk (Korean). Go is noted
-kigo: for being rich in strategic complexity despite its simple rules.
-kigo: The game is played by two players who alternately place black and
-kigo: white pieces on the vacant intersections of a grid of 19x19 lines
-kigo: (9x9 or 13x13 for easier games).
-kigo:
-kigo:
diff --git a/source/kde/slack-desc/killbots b/source/kde/slack-desc/killbots
deleted file mode 100644
index 20c6813ce..000000000
--- a/source/kde/slack-desc/killbots
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-killbots: killbots (Robots-like game for KDE)
-killbots:
-killbots: Killbots is a simple game of evading killer robots.
-killbots:
-killbots:
-killbots:
-killbots:
-killbots:
-killbots:
-killbots:
-killbots:
diff --git a/source/kde/slack-desc/kimono b/source/kde/slack-desc/kimono
deleted file mode 100644
index eb1b65dcb..000000000
--- a/source/kde/slack-desc/kimono
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kimono: kimono (C# mono KDE4 bindings)
-kimono:
-kimono: C# Mono KDE 4 language bindings.
-kimono:
-kimono: For more information, visit: http://www.www.org
-kimono:
-kimono:
-kimono:
-kimono:
-kimono:
-kimono:
diff --git a/source/kde/slack-desc/kio-mtp b/source/kde/slack-desc/kio-mtp
deleted file mode 100644
index 4cec1f67b..000000000
--- a/source/kde/slack-desc/kio-mtp
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kio-mtp: kio-mtp (Provides KIO Access to MTP devices)
-kio-mtp:
-kio-mtp: Provides KIO Access to MTP devices using the mtp:/// protocol.
-kio-mtp: MTP stands for Media Transfer Protocol. It is required in order to
-kio-mtp: access and manage files on devices running Android 4.0 and later.
-kio-mtp:
-kio-mtp: Kio-mtp has been developed by Philipp Schmidt.
-kio-mtp:
-kio-mtp:
-kio-mtp:
-kio-mtp:
diff --git a/source/kde/slack-desc/kipi-plugins b/source/kde/slack-desc/kipi-plugins
deleted file mode 100644
index 58fc361e0..000000000
--- a/source/kde/slack-desc/kipi-plugins
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kipi-plugins: Kipi Plugins (Plugins for libKipi)
-kipi-plugins:
-kipi-plugins: Kipi Plugins are additional functions for the KDE Images Managment
-kipi-plugins: Host Programs (digiKam, KimDaBa, ShowImg, and Gwenview). They can add
-kipi-plugins: extra menus and shortcuts, and extend the host programs features. You
-kipi-plugins: can install as many or as few as you like, from within host programs.
-kipi-plugins:
-kipi-plugins: Homepage: http://www.kipi-plugins.org/
-kipi-plugins:
-kipi-plugins:
-kipi-plugins:
diff --git a/source/kde/slack-desc/kiriki b/source/kde/slack-desc/kiriki
deleted file mode 100644
index d9b70fa07..000000000
--- a/source/kde/slack-desc/kiriki
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kiriki: kiriki (yahtzee-like dice game for KDE)
-kiriki:
-kiriki: Kiriki is an addictive and fun dice game for KDE, designed to be
-kiriki: played by as many as six players. Participants have to collect points
-kiriki: by rolling five dice for up to three times per single turn. 
-kiriki:
-kiriki:
-kiriki:
-kiriki:
-kiriki:
-kiriki:
diff --git a/source/kde/slack-desc/kiten b/source/kde/slack-desc/kiten
deleted file mode 100644
index 010a451d0..000000000
--- a/source/kde/slack-desc/kiten
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-kiten: kiten (a tool to learn Japanese)
-kiten:
-kiten: Kiten is a tool to learn Japanese.
-kiten:
-kiten:
-kiten:
-kiten:
-kiten:
-kiten:
-kiten:
-kiten:
diff --git a/source/kde/slack-desc/kjumpingcube b/source/kde/slack-desc/kjumpingcube
deleted file mode 100644
index 3911331cb..000000000
--- a/source/kde/slack-desc/kjumpingcube
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kjumpingcube: kjumpingcube (territory capture game)
-kjumpingcube:
-kjumpingcube: KJumpingcube is a simple dice driven tactical game. The playing area
-kjumpingcube: consists of squares containing points. Players move by clicking on
-kjumpingcube: either a vacant square, or on one of their own squares. 
-kjumpingcube:
-kjumpingcube:
-kjumpingcube:
-kjumpingcube:
-kjumpingcube:
-kjumpingcube:
diff --git a/source/kde/slack-desc/klettres b/source/kde/slack-desc/klettres
deleted file mode 100644
index 0293a101b..000000000
--- a/source/kde/slack-desc/klettres
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-klettres: klettres (language learning program)
-klettres:
-klettres: KLettres aims to help to learn the alphabet and then to read some
-klettres: syllables in different languages. It is meant to help learning the
-klettres: very first sounds of a new language, for children or for adults.
-klettres:
-klettres:
-klettres:
-klettres:
-klettres:
-klettres:
diff --git a/source/kde/slack-desc/klickety b/source/kde/slack-desc/klickety
deleted file mode 100644
index 657ef75b4..000000000
--- a/source/kde/slack-desc/klickety
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-klickety: klickety (strategy game)
-klickety:
-klickety: Klickety is a strategy game for KDE, an adaption of the Clickomania
-klickety: game. The rules are similar to those of the Same game: your goal is
-klickety: to clear the board by clicking on groups to destroy them.
-klickety:
-klickety:
-klickety:
-klickety:
-klickety:
-klickety:
diff --git a/source/kde/slack-desc/klines b/source/kde/slack-desc/klines
deleted file mode 100644
index 6233200c2..000000000
--- a/source/kde/slack-desc/klines
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-klines: klines (tactical game for KDE)
-klines:
-klines: KLines is a simple but highly addictive, one player game for KDE.
-klines: KLines has been inspired by well known game of Color Lines, written
-klines: by Olga Demina, Igor Ivkin and Gennady Denisov back in 1992.
-klines: You can also play an online demo version of this game. 
-klines:
-klines:
-klines:
-klines:
-klines:
diff --git a/source/kde/slack-desc/kmag b/source/kde/slack-desc/kmag
deleted file mode 100644
index ab5262b09..000000000
--- a/source/kde/slack-desc/kmag
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-kmag: kmag (Screen magnifier)
-kmag:
-kmag: Magnifies a part of your screen.
-kmag:
-kmag:
-kmag:
-kmag:
-kmag:
-kmag:
-kmag:
-kmag:
diff --git a/source/kde/slack-desc/kmahjongg b/source/kde/slack-desc/kmahjongg
deleted file mode 100644
index 96b24b47c..000000000
--- a/source/kde/slack-desc/kmahjongg
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-kmahjongg: kmahjongg (KDE port of Mahjongg game)
-kmahjongg:
-kmahjongg: KMahjongg is a clone of the well known tile based patience game of
-kmahjongg: the same name. In the game you have to empty a game board filled
-kmahjongg: with pieces, by pairwise removal of pieces of the same type.
-kmahjongg:
-kmahjongg:
-kmahjongg:
-kmahjongg:
-kmahjongg:
-kmahjongg:
diff --git a/source/kde/slack-desc/kmines b/source/kde/slack-desc/kmines
deleted file mode 100644
index bb7b09af0..000000000
--- a/source/kde/slack-desc/kmines
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-kmines: kmines (minesweeper clone for KDE)
-kmines:
-kmines: KMines is the classic Minesweeper game. The idea is to uncover all
-kmines: the squares without blowing up any mines. When a mine is blown up,
-kmines: the game is over. 
-kmines:
-kmines:
-kmines:
-kmines:
-kmines:
-kmines:
diff --git a/source/kde/slack-desc/kmix b/source/kde/slack-desc/kmix
deleted file mode 100644
index ccdf6f7d9..000000000
--- a/source/kde/slack-desc/kmix
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-kmix: kmix (sound mixer)
-kmix:
-kmix: KMix is an application to allow you to change the volume of your
-kmix: sound card. Though small, it is full-featured, and it supports
-kmix: several platforms and sound drivers.
-kmix:
-kmix:
-kmix:
-kmix:
-kmix:
-kmix:
diff --git a/source/kde/slack-desc/kmousetool b/source/kde/slack-desc/kmousetool
deleted file mode 100644
index 95ab30e62..000000000
--- a/source/kde/slack-desc/kmousetool
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-kmousetool: kmousetool (Automatic mouse clicks)
-kmousetool:
-kmousetool: Clicks the mouse for you, reducing hand strain.
-kmousetool:
-kmousetool:
-kmousetool:
-kmousetool:
-kmousetool:
-kmousetool:
-kmousetool:
-kmousetool:
diff --git a/source/kde/slack-desc/kmouth b/source/kde/slack-desc/kmouth
deleted file mode 100644
index 761686553..000000000
--- a/source/kde/slack-desc/kmouth
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kmouth: kmouth (Speech synthesis frontend)
-kmouth:
-kmouth: The computer "speaks" the entered text for talking with people.
-kmouth:
-kmouth:
-kmouth:
-kmouth:
-kmouth:
-kmouth:
-kmouth:
-kmouth:
diff --git a/source/kde/slack-desc/kmplot b/source/kde/slack-desc/kmplot
deleted file mode 100644
index a2a463330..000000000
--- a/source/kde/slack-desc/kmplot
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kmplot: kmplot (a mathematical function plotter)
-kmplot:
-kmplot: KmPlot is a mathematical function plotter for the KDE-Desktop. It has
-kmplot: a built-in powerful parser. You can plot different functions
-kmplot: simultaneously and combine them into new functions. KmPlot supports
-kmplot: functions with parameters and functions in polar coordinates. Several
-kmplot: grid modes are possible. Plots may be printed with high precision in
-kmplot: correct scale.
-kmplot:
-kmplot:
-kmplot:
diff --git a/source/kde/slack-desc/knavalbattle b/source/kde/slack-desc/knavalbattle
deleted file mode 100644
index 4b050f74a..000000000
--- a/source/kde/slack-desc/knavalbattle
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-knavalbattle: knavalbattle (KDE version of battleship game)
-knavalbattle:
-knavalbattle: KNavalBattle is a battleship game with built-in game server.
-knavalbattle: Ships are placed on a board which represents the sea. Players try
-knavalbattle: to hit each others ships in turns without knowing where they are
-knavalbattle: placed. The first player to destroy all ships wins the game. 
-knavalbattle:
-knavalbattle:
-knavalbattle:
-knavalbattle:
-knavalbattle:
diff --git a/source/kde/slack-desc/knetwalk b/source/kde/slack-desc/knetwalk
deleted file mode 100644
index 3bdb2bc3a..000000000
--- a/source/kde/slack-desc/knetwalk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-knetwalk: knetwalk (turn the board pieces to get computers connected)
-knetwalk:
-knetwalk: KNetwalk is a single player logic game. Construct the network,
-knetwalk: connecting all the terminals to the server in the fewest turns
-knetwalk: possible.
-knetwalk:
-knetwalk:
-knetwalk:
-knetwalk:
-knetwalk:
-knetwalk:
diff --git a/source/kde/slack-desc/koffice b/source/kde/slack-desc/koffice
deleted file mode 100644
index b4eca3292..000000000
--- a/source/kde/slack-desc/koffice
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-koffice: koffice (KDE office productivity suite)
-koffice:
-koffice: KOffice office productivity applications. Included are a word
-koffice: processor, spreadsheet, presentation program, chart and graph creator,
-koffice: vector graphics tool, database report creator, flowcharting program,
-koffice: integrated data management program, a pixel graphics editor,
-koffice: a mathematical formula editor, and KOffice Workspace
-koffice: (a combination of all of the above).
-koffice:
-koffice:
-koffice:
diff --git a/source/kde/slack-desc/kolf b/source/kde/slack-desc/kolf
deleted file mode 100644
index f4a235c18..000000000
--- a/source/kde/slack-desc/kolf
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-kolf: kolf (miniature golf game for KDE)
-kolf:
-kolf: Kolf is a miniature golf game. The game is played from an overhead
-kolf: view, with a short bar representing the golf club. Kolf features many
-kolf: different types of objects, such water hazards, slopes, sand traps,
-kolf: and black holes (warps), among others.
-kolf:
-kolf:
-kolf:
-kolf:
-kolf:
diff --git a/source/kde/slack-desc/kollision b/source/kde/slack-desc/kollision
deleted file mode 100644
index 9fa37793a..000000000
--- a/source/kde/slack-desc/kollision
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-kollision: kollision (simple ball dodging game)
-kollision:
-kollision: Kollision is a simple ball dodging game.
-kollision:
-kollision:
-kollision:
-kollision:
-kollision:
-kollision:
-kollision:
-kollision:
diff --git a/source/kde/slack-desc/kolourpaint b/source/kde/slack-desc/kolourpaint
deleted file mode 100644
index 764e1d485..000000000
--- a/source/kde/slack-desc/kolourpaint
+++ /dev/null
@@ -1,20 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kolourpaint: kolourpaint (easy to use paint program)
-kolourpaint:
-kolourpaint: KolourPaint is a easy-to-use paint program for KDE. It aims to be
-kolourpaint: conceptually simply to understand; providing a level of functionality
-kolourpaint: targeted towards the average user. It's designed for tasks like: 
-kolourpaint:
-kolourpaint: * Painting - drawing diagrams and "finger painting".
-kolourpaint: * Image Manipulation - editing screenshots and photos, and
-kolourpaint:   applying effects
-kolourpaint: * Icon Editing - drawing clipart and logos with transparency.
-kolourpaint:
-kolourpaint:
diff --git a/source/kde/slack-desc/kompare b/source/kde/slack-desc/kompare
deleted file mode 100644
index 6785e92ef..000000000
--- a/source/kde/slack-desc/kompare
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kompare: kompare (graphical diff utility)
-kompare:
-kompare: kompare is a graphical file differences tool.
-kompare:
-kompare:
-kompare:
-kompare:
-kompare:
-kompare:
-kompare:
-kompare:
diff --git a/source/kde/slack-desc/konquest b/source/kde/slack-desc/konquest
deleted file mode 100644
index aa072984f..000000000
--- a/source/kde/slack-desc/konquest
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-konquest: konquest (KDE version of Gnu-Lactic Konquest)
-konquest:
-konquest: This the KDE version of Gnu-Lactic Konquest, a multi-player strategy
-konquest: game. The goal of the game is to expand your interstellar empire
-konquest: across the galaxy.
-konquest:
-konquest:
-konquest:
-konquest:
-konquest:
-konquest:
diff --git a/source/kde/slack-desc/konsole b/source/kde/slack-desc/konsole
deleted file mode 100644
index 31cfa2c70..000000000
--- a/source/kde/slack-desc/konsole
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler-----------------------------------------------------|
-konsole: konsole (KDE's terminal emulator)
-konsole:
-konsole: Konsole is KDE's terminal emulator.
-konsole:
-konsole: Homepage: http://kde.org
-konsole:
-konsole:
-konsole:
-konsole:
-konsole:
-konsole:
diff --git a/source/kde/slack-desc/kopete b/source/kde/slack-desc/kopete
deleted file mode 100644
index 7b55446bd..000000000
--- a/source/kde/slack-desc/kopete
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kopete: kopete (multi-protocol instant messaging system)
-kopete:
-kopete: The goals of Kopete are to provide users with a standard and easy to
-kopete: use interface between all of their instant messaging systems, but at
-kopete: the same time also providing developers with the ease of writing
-kopete: plugins to support a new protocol.
-kopete:
-kopete: For more information, visit: http://userbase.kde.org/Kopete
-kopete:
-kopete:
-kopete:
diff --git a/source/kde/slack-desc/kopete-cryptography b/source/kde/slack-desc/kopete-cryptography
deleted file mode 100644
index 7529a8b1e..000000000
--- a/source/kde/slack-desc/kopete-cryptography
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                   |-----handy-ruler------------------------------------------------------|
-kopete-cryptography: kopete-cryptography (crypto support for kopete)
-kopete-cryptography:
-kopete-cryptography: Cryptographic support for Kopete, the KDE Instant Messenger.
-kopete-cryptography:
-kopete-cryptography:
-kopete-cryptography:
-kopete-cryptography:
-kopete-cryptography:
-kopete-cryptography:
-kopete-cryptography:
-kopete-cryptography:
diff --git a/source/kde/slack-desc/korundum b/source/kde/slack-desc/korundum
deleted file mode 100644
index 160b1a119..000000000
--- a/source/kde/slack-desc/korundum
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-korundum: korundum (KDE ruby bindings)
-korundum:
-korundum: Very complete bindings to both the KDE API and the Qt APIs.
-korundum: The Korundum package includes both a QtRuby Qt-only binding along
-korundum: with the full combined Qt/KDE one.
-korundum: The QtRuby package contains just Qt bindings with no dependencies
-korundum: on KDE.
-korundum:
-korundum: For more information, visit: http://rubyforge.org/projects/korundum/
-korundum:
-korundum:
diff --git a/source/kde/slack-desc/kpat b/source/kde/slack-desc/kpat
deleted file mode 100644
index 0d072f31b..000000000
--- a/source/kde/slack-desc/kpat
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-kpat: kpat (patience card game for KDE)
-kpat:
-kpat: KPat (aka KPatience) is a relaxing card sorting game. To win the game
-kpat: a player has to arrange a single deck of cards in certain order
-kpat: amongst each other.
-kpat:
-kpat:
-kpat:
-kpat:
-kpat:
-kpat:
diff --git a/source/kde/slack-desc/kplayer b/source/kde/slack-desc/kplayer
deleted file mode 100644
index 9ab377ed0..000000000
--- a/source/kde/slack-desc/kplayer
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kplayer: kplayer (KDE media player)
-kplayer:
-kplayer: KPlayer is a KDE multimedia player. With KPlayer you can easily play
-kplayer: a wide variety of video and audio files and streams using a rich and
-kplayer: friendly interface that follows KDE standards.
-kplayer:
-kplayer: KPlayer will work out of the box if properly installed, and because
-kplayer: it uses MPlayer as the media playing backend, it will play virtually
-kplayer: any file or Internet stream.
-kplayer:
-kplayer:
diff --git a/source/kde/slack-desc/kppp b/source/kde/slack-desc/kppp
deleted file mode 100644
index b9a4adebe..000000000
--- a/source/kde/slack-desc/kppp
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-kppp: kppp (dialer and frontend for pppd)
-kppp:
-kppp: KPPP is used to setup PPP (Point-to-Point Protocol) connections.
-kppp: This is most useful for connecting with a cell phone "modem" card
-kppp: these days. It is also use to configure real modem connections.
-kppp:
-kppp:
-kppp:
-kppp:
-kppp:
-kppp:
diff --git a/source/kde/slack-desc/kqtquickcharts b/source/kde/slack-desc/kqtquickcharts
deleted file mode 100644
index b5be05ca2..000000000
--- a/source/kde/slack-desc/kqtquickcharts
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kqtquickcharts: kqtquickcharts (plugin to render interactive graphs)
-kqtquickcharts:
-kqtquickcharts:
-kqtquickcharts:
-kqtquickcharts:
-kqtquickcharts:
-kqtquickcharts:
-kqtquickcharts:
-kqtquickcharts:
-kqtquickcharts:
-kqtquickcharts:
diff --git a/source/kde/slack-desc/krdc b/source/kde/slack-desc/krdc
deleted file mode 100644
index a5523fcfe..000000000
--- a/source/kde/slack-desc/krdc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-krdc: krdc (remote desktop client for KDE)
-krdc:
-krdc: KRDC is a client application that allows you to view or even control
-krdc: the desktop session on another machine that is running a compatible
-krdc: server. VNC and RDP is supported.
-krdc:
-krdc: Homepage: http://www.kde.org/applications/internet/krdc/
-krdc:
-krdc:
-krdc:
-krdc:
diff --git a/source/kde/slack-desc/kremotecontrol b/source/kde/slack-desc/kremotecontrol
deleted file mode 100644
index 4da69dde9..000000000
--- a/source/kde/slack-desc/kremotecontrol
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mkremotecontrols the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kremotecontrol: kremotecontrol (remote control frontend)
-kremotecontrol:
-kremotecontrol: KRemoteControl (formerly known as KDELirc) is a KDE frontend for
-kremotecontrol: your remote controls.
-kremotecontrol:
-kremotecontrol: kremotecontrol's home page is:
-kremotecontrol:   http://utils.kde.org/projects/kremotecontrol
-kremotecontrol:
-kremotecontrol:
-kremotecontrol:
-kremotecontrol:
diff --git a/source/kde/slack-desc/kreversi b/source/kde/slack-desc/kreversi
deleted file mode 100644
index e021ec7b5..000000000
--- a/source/kde/slack-desc/kreversi
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-kreversi: kreversi (reversi board game for KDE)
-kreversi:
-kreversi: KReversi is a simple one player strategy game played against the
-kreversi: computer. If a player's piece is captured by an opposing player, that
-kreversi: piece is turned over to reveal the color of that player. A winner is
-kreversi: declared when one player has more pieces of his own color on the board
-kreversi: and there are no more possible moves. 
-kreversi:
-kreversi:
-kreversi:
-kreversi:
diff --git a/source/kde/slack-desc/krfb b/source/kde/slack-desc/krfb
deleted file mode 100644
index 41fda0937..000000000
--- a/source/kde/slack-desc/krfb
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-krfb: krfb (desktop sharing)
-krfb:
-krfb: Krfb Desktop Sharing is a server application that allows you to share
-krfb: your current session with a user on another machine, who can use a
-krfb: VNC client to view or even control the desktop.
-krfb:
-krfb: More information at:  http://www.kde.org/applications/system/krfb/
-krfb:
-krfb:
-krfb:
-krfb:
diff --git a/source/kde/slack-desc/kross-interpreters b/source/kde/slack-desc/kross-interpreters
deleted file mode 100644
index 2029e00c6..000000000
--- a/source/kde/slack-desc/kross-interpreters
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                  |-----handy-ruler------------------------------------------------------|
-kross-interpreters: kross-interpreters (Kross interpreters)
-kross-interpreters:
-kross-interpreters: Set of interpreter plugins for the Kross archtecture in KDE.
-kross-interpreters:
-kross-interpreters: See also: http://developer.kde.org/language-bindings/
-kross-interpreters:
-kross-interpreters:
-kross-interpreters:
-kross-interpreters:
-kross-interpreters:
-kross-interpreters:
diff --git a/source/kde/slack-desc/kruler b/source/kde/slack-desc/kruler
deleted file mode 100644
index de6f8578e..000000000
--- a/source/kde/slack-desc/kruler
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kruler: kruler (a screen ruler for KDE)
-kruler:
-kruler: A screen ruler and color measurement tool for KDE.
-kruler:
-kruler:
-kruler:
-kruler:
-kruler:
-kruler:
-kruler:
-kruler:
diff --git a/source/kde/slack-desc/ksaneplugin b/source/kde/slack-desc/ksaneplugin
deleted file mode 100644
index 939cd1835..000000000
--- a/source/kde/slack-desc/ksaneplugin
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-ksaneplugin: ksaneplugin (scanning plugin using libksane)
-ksaneplugin:
-ksaneplugin: This is a KScan plugin that implements the scanning through libksane.
-ksaneplugin:
-ksaneplugin:
-ksaneplugin:
-ksaneplugin:
-ksaneplugin:
-ksaneplugin:
-ksaneplugin:
-ksaneplugin:
diff --git a/source/kde/slack-desc/kscd b/source/kde/slack-desc/kscd
deleted file mode 100644
index c873c598f..000000000
--- a/source/kde/slack-desc/kscd
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-kscd: kscd (CD player)
-kscd:
-kscd: KsCD is a small, fast, CDDB enabled audio CD player which supports
-kscd: multiple platforms.
-kscd:
-kscd:
-kscd:
-kscd:
-kscd:
-kscd:
-kscd:
diff --git a/source/kde/slack-desc/kscreen b/source/kde/slack-desc/kscreen
deleted file mode 100644
index b6773857f..000000000
--- a/source/kde/slack-desc/kscreen
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kscreen: kscreen (KDE screen management)
-kscreen:
-kscreen: KScreen is the new screen management software for KDE Plasma
-kscreen: Workspaces which tries to be as magic and automatic as possible for
-kscreen: users with basic needs and easy to configure for those who want
-kscreen: special setups. 
-kscreen:
-kscreen: For more information, visit:
-kscreen:   http://community.kde.org/Solid/Projects/ScreenManagement
-kscreen:
-kscreen:
diff --git a/source/kde/slack-desc/ksecrets b/source/kde/slack-desc/ksecrets
deleted file mode 100644
index 40d6564b0..000000000
--- a/source/kde/slack-desc/ksecrets
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-ksecrets: ksecrets (secrets management infrastructure)
-ksecrets:
-ksecrets: ksecretsservice is a secrets management infrastructure aiming to
-ksecrets: replace kwallet. 
-ksecrets:
-ksecrets: For more information, visit:
-ksecrets:   http://techbase.kde.org/Projects/Utils/ksecretsservice
-ksecrets:
-ksecrets:
-ksecrets:
-ksecrets:
diff --git a/source/kde/slack-desc/kshisen b/source/kde/slack-desc/kshisen
deleted file mode 100644
index dc43d0538..000000000
--- a/source/kde/slack-desc/kshisen
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kshisen: kshisen (Shisen-Sho Mahjongg-like tile game)
-kshisen:
-kshisen: KShisen is a solitaire-like game played using the standard set of
-kshisen: Mahjong tiles. Unlike Mahjong however, KShisen has only one layer
-kshisen: of scrambled tiles.
-kshisen:
-kshisen:
-kshisen:
-kshisen:
-kshisen:
-kshisen:
diff --git a/source/kde/slack-desc/ksirk b/source/kde/slack-desc/ksirk
deleted file mode 100644
index bb5940e34..000000000
--- a/source/kde/slack-desc/ksirk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-ksirk: ksirk (KDE port of the board game risk)
-ksirk:
-ksirk: Ksirk is a KDE port of the board game risk.
-ksirk:
-ksirk:
-ksirk:
-ksirk:
-ksirk:
-ksirk:
-ksirk:
-ksirk:
diff --git a/source/kde/slack-desc/ksnakeduel b/source/kde/slack-desc/ksnakeduel
deleted file mode 100644
index 8eb93ba23..000000000
--- a/source/kde/slack-desc/ksnakeduel
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-ksnakeduel: ksnakeduel (simple snake duel game for KDE)
-ksnakeduel:
-ksnakeduel: KSnakeDuel is a simple snake duel game for KDE. You can play
-ksnakeduel: KSnakeDuel against the computer or a friend. The aim of the game is
-ksnakeduel: to live longer than your opponent. To do that, avoid running into
-ksnakeduel: a wall, your own tail and that of your opponent. 
-ksnakeduel:
-ksnakeduel:
-ksnakeduel:
-ksnakeduel:
-ksnakeduel:
diff --git a/source/kde/slack-desc/ksnapshot b/source/kde/slack-desc/ksnapshot
deleted file mode 100644
index b3b2cee81..000000000
--- a/source/kde/slack-desc/ksnapshot
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-ksnapshot: ksnapshot (screen capture program)
-ksnapshot:
-ksnapshot: A screenshot utility for KDE.
-ksnapshot:
-ksnapshot:
-ksnapshot:
-ksnapshot:
-ksnapshot:
-ksnapshot:
-ksnapshot:
-ksnapshot:
diff --git a/source/kde/slack-desc/kspaceduel b/source/kde/slack-desc/kspaceduel
deleted file mode 100644
index 92882bf6a..000000000
--- a/source/kde/slack-desc/kspaceduel
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-kspaceduel: kspaceduel (space arcade game)
-kspaceduel:
-kspaceduel: In KSpaceduel each of two possible players controls a satellite
-kspaceduel: spaceship orbiting the sun. As the game progresses players have to
-kspaceduel: eliminate opponent's spacecraft.
-kspaceduel:
-kspaceduel:
-kspaceduel:
-kspaceduel:
-kspaceduel:
-kspaceduel:
diff --git a/source/kde/slack-desc/ksquares b/source/kde/slack-desc/ksquares
deleted file mode 100644
index 635c849b6..000000000
--- a/source/kde/slack-desc/ksquares
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-ksquares: ksquares (connect the dots to create squares)
-ksquares:
-ksquares: KSquares is a fun and exciting game for desktop environment.
-ksquares: The game is modeled after the well known pen and paper based
-ksquares: game of Dots and Boxes. 
-ksquares:
-ksquares:
-ksquares:
-ksquares:
-ksquares:
-ksquares:
diff --git a/source/kde/slack-desc/kstars b/source/kde/slack-desc/kstars
deleted file mode 100644
index 2df2c0bea..000000000
--- a/source/kde/slack-desc/kstars
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-kstars: kstars (a desktop planetarium)
-kstars:
-kstars: KStars is a desktop planetarium.
-kstars:
-kstars:
-kstars:
-kstars:
-kstars:
-kstars:
-kstars:
-kstars:
diff --git a/source/kde/slack-desc/ksudoku b/source/kde/slack-desc/ksudoku
deleted file mode 100644
index a1b8889c8..000000000
--- a/source/kde/slack-desc/ksudoku
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-ksudoku: ksudoku (sudoku game)
-ksudoku:
-ksudoku: KSudoku is a logic-based symbol placement puzzle.
-ksudoku: The player has to fill a grid so that each column, row as well as
-ksudoku: each square block on the game field contains only one instance of
-ksudoku: each symbol.
-ksudoku:
-ksudoku:
-ksudoku:
-ksudoku:
-ksudoku:
diff --git a/source/kde/slack-desc/ksystemlog b/source/kde/slack-desc/ksystemlog
deleted file mode 100644
index 89223c5cb..000000000
--- a/source/kde/slack-desc/ksystemlog
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-ksystemlog: ksystemlog (system log viewer)
-ksystemlog:
-ksystemlog: KSystemLog is a system log viewer tool. This program is developed
-ksystemlog: for beginner users, who don't know how to find information about
-ksystemlog: their Linux system, and don't know where log files are.
-ksystemlog: It is also of course designed for advanced users, who quickly want
-ksystemlog: to understand problems of their machine with a more powerful and
-ksystemlog: graphical tool than 'tail -f' and 'less' commands ;-)
-ksystemlog:
-ksystemlog: Visit: http://www.kde.org/applications/system/ksystemlog/
-ksystemlog:
diff --git a/source/kde/slack-desc/kteatime b/source/kde/slack-desc/kteatime
deleted file mode 100644
index 6beb93efe..000000000
--- a/source/kde/slack-desc/kteatime
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-kteatime: kteatime (tea cooker)
-kteatime:
-kteatime: KTeaTime is a handy timer for steeping tea. No longer will you have
-kteatime: to guess at how long it takes for your tea to be ready.
-kteatime: Simply select the type of tea you have, and it will alert you when
-kteatime: the tea is ready to drink.
-kteatime:
-kteatime: More information at http://www.kde.org/applications/games/kteatime/
-kteatime:
-kteatime:
-kteatime:
diff --git a/source/kde/slack-desc/ktimer b/source/kde/slack-desc/ktimer
deleted file mode 100644
index c7a7b6387..000000000
--- a/source/kde/slack-desc/ktimer
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mktimers the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-ktimer: ktimer (program scheduler)
-ktimer:
-ktimer: KTimer is a little tool to execute programs after some time.
-ktimer:
-ktimer: ktimer's home page is: http://utils.kde.org/projects/ktimer
-ktimer:
-ktimer:
-ktimer:
-ktimer:
-ktimer:
-ktimer:
diff --git a/source/kde/slack-desc/ktorrent b/source/kde/slack-desc/ktorrent
deleted file mode 100644
index afb3a203a..000000000
--- a/source/kde/slack-desc/ktorrent
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-ktorrent: ktorrent (KDE BitTorrent program)
-ktorrent:
-ktorrent: KTorrent is a BitTorrent program with many features:
-ktorrent: Download torrent files (of course :-), upload and download speed
-ktorrent: capping, Internet searching, UDP trackers, port forwarding with UPnP,
-ktorrent: IP blocking, importing of partially or fully downloaded files,
-ktorrent: support for distributed hash tables, protocol encryption,
-ktorrent: bandwidth scheduling, and much more.
-ktorrent:
-ktorrent: KTorrent's developers are Joris Guisson and Ivan Vasic.
-ktorrent:
diff --git a/source/kde/slack-desc/ktouch b/source/kde/slack-desc/ktouch
deleted file mode 100644
index 941abaee1..000000000
--- a/source/kde/slack-desc/ktouch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-ktouch: ktouch (touch typing tutor)
-ktouch:
-ktouch: A KDE program that helps you to learn and practice touch typing.
-ktouch:
-ktouch:
-ktouch:
-ktouch:
-ktouch:
-ktouch:
-ktouch:
-ktouch:
diff --git a/source/kde/slack-desc/ktuberling b/source/kde/slack-desc/ktuberling
deleted file mode 100644
index e8b0ffe77..000000000
--- a/source/kde/slack-desc/ktuberling
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-ktuberling: ktuberling (picture game for children)
-ktuberling:
-ktuberling: KTuberling a simple constructor game suitable for children and
-ktuberling: adults alike. The idea of the game is based around a once popular
-ktuberling: doll making concept. 
-ktuberling:
-ktuberling:
-ktuberling:
-ktuberling:
-ktuberling:
-ktuberling:
diff --git a/source/kde/slack-desc/kturtle b/source/kde/slack-desc/kturtle
deleted file mode 100644
index 9f7317ce0..000000000
--- a/source/kde/slack-desc/kturtle
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kturtle: kturtle (Logo programming environment)
-kturtle:
-kturtle: KTurtle is an educational Logo programming environment.
-kturtle:
-kturtle:
-kturtle:
-kturtle:
-kturtle:
-kturtle:
-kturtle:
-kturtle:
diff --git a/source/kde/slack-desc/ktux b/source/kde/slack-desc/ktux
deleted file mode 100644
index 1208671df..000000000
--- a/source/kde/slack-desc/ktux
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-ktux: ktux (tux screensaver for KDE)
-ktux:
-ktux: ktux is a neat Tux-in-a-spaceship screensaver for KScreenSaver.
-ktux:
-ktux:
-ktux:
-ktux:
-ktux:
-ktux:
-ktux:
-ktux:
diff --git a/source/kde/slack-desc/kubrick b/source/kde/slack-desc/kubrick
deleted file mode 100644
index 56779447c..000000000
--- a/source/kde/slack-desc/kubrick
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kubrick: kubrick (3-D game based on Rubik's Cube)
-kubrick:
-kubrick: Kubrick is a game based on the Rubik's Cube puzzle. The cube sizes
-kubrick: range from 2x2x2 up to 6x6x6, or you can play with irregular "bricks"
-kubrick: such as 5x3x2 or "mats" such as 6x4x1 or 2x2x1.
-kubrick:
-kubrick: The game has a selection of puzzles at several levels of difficulty,
-kubrick: as well as demos of pretty patterns and solution moves, or you can
-kubrick: make up your own puzzles. 
-kubrick:
-kubrick:
diff --git a/source/kde/slack-desc/kuser b/source/kde/slack-desc/kuser
deleted file mode 100644
index 90d56b7ac..000000000
--- a/source/kde/slack-desc/kuser
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-kuser: kuser (user manager for KDE)
-kuser:
-kuser: kuser is KDE's user manager (/etc/passwd and other methods).
-kuser:
-kuser:
-kuser:
-kuser:
-kuser:
-kuser:
-kuser:
-kuser:
diff --git a/source/kde/slack-desc/kwallet b/source/kde/slack-desc/kwallet
deleted file mode 100644
index 64fbcf43c..000000000
--- a/source/kde/slack-desc/kwallet
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mkwallets the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-kwallet: kwallet (KDE wallet manager)
-kwallet:
-kwallet: KDE Wallet Manager is a tool to manage your passwords under KDE.
-kwallet:
-kwallet: kwallet's home page is:
-kwallet:   https://projects.kde.org/projects/kde/kdeutils
-kwallet:
-kwallet:
-kwallet:
-kwallet:
-kwallet:
diff --git a/source/kde/slack-desc/kwalletmanager b/source/kde/slack-desc/kwalletmanager
deleted file mode 100644
index 82d055d84..000000000
--- a/source/kde/slack-desc/kwalletmanager
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mkwalletmanagers the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kwalletmanager: kwalletmanager (KDE wallet manager)
-kwalletmanager:
-kwalletmanager: KDE Wallet Manager is a tool to manage your passwords under KDE.
-kwalletmanager:
-kwalletmanager: kwalletmanager's home page is:
-kwalletmanager:   https://projects.kde.org/projects/kde/kdeutils
-kwalletmanager:
-kwalletmanager:
-kwalletmanager:
-kwalletmanager:
-kwalletmanager:
diff --git a/source/kde/slack-desc/kwebkitpart b/source/kde/slack-desc/kwebkitpart
deleted file mode 100644
index c8cb56ede..000000000
--- a/source/kde/slack-desc/kwebkitpart
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler-----------------------------------------------------|
-kwebkitpart: kwebkitpart (WebKit browser component)
-kwebkitpart:
-kwebkitpart: KWebKitPart is a web browser component for KDE based on (Qt)WebKit.
-kwebkitpart: You can use it for example for browsing the web in Konqueror.
-kwebkitpart:
-kwebkitpart: Homepage: http://kde-apps.org/content/show.php?content=127960
-kwebkitpart:
-kwebkitpart:
-kwebkitpart:
-kwebkitpart:
-kwebkitpart:
diff --git a/source/kde/slack-desc/kwordquiz b/source/kde/slack-desc/kwordquiz
deleted file mode 100644
index 5ed83ebd7..000000000
--- a/source/kde/slack-desc/kwordquiz
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-kwordquiz: kwordquiz (a general purpose flash card program)
-kwordquiz:
-kwordquiz: KWordQuiz is a general purpose flash card program.
-kwordquiz: It can be used for vocabulary learning and many other subjects.
-kwordquiz:
-kwordquiz:
-kwordquiz:
-kwordquiz:
-kwordquiz:
-kwordquiz:
-kwordquiz:
diff --git a/source/kde/slack-desc/libkcddb b/source/kde/slack-desc/libkcddb
deleted file mode 100644
index 2b2abc398..000000000
--- a/source/kde/slack-desc/libkcddb
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-libkcddb: libkcddb (KDE CDDB retrieval library)
-libkcddb:
-libkcddb: A KDE CDDB retrieval library.
-libkcddb:
-libkcddb:
-libkcddb:
-libkcddb:
-libkcddb:
-libkcddb:
-libkcddb:
-libkcddb:
diff --git a/source/kde/slack-desc/libkcompactdisc b/source/kde/slack-desc/libkcompactdisc
deleted file mode 100644
index 15342315d..000000000
--- a/source/kde/slack-desc/libkcompactdisc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-libkcompactdisc: libkcompactdisc (KDE library for playing & ripping CDs)
-libkcompactdisc:
-libkcompactdisc: A KDE library for playing & ripping CDs.
-libkcompactdisc:
-libkcompactdisc:
-libkcompactdisc:
-libkcompactdisc:
-libkcompactdisc:
-libkcompactdisc:
-libkcompactdisc:
-libkcompactdisc:
diff --git a/source/kde/slack-desc/libkdcraw b/source/kde/slack-desc/libkdcraw
deleted file mode 100644
index 8b1edab83..000000000
--- a/source/kde/slack-desc/libkdcraw
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-libkdcraw: libkdcraw (library wrapper around dcraw)
-libkdcraw:
-libkdcraw: Libkdcraw is a C++ interface around the dcraw binary program, used
-libkdcraw: to decode RAW picture files.
-libkdcraw:
-libkdcraw: For more information, visit: http://www.kipi-plugins.org/
-libkdcraw:
-libkdcraw:
-libkdcraw:
-libkdcraw:
-libkdcraw:
diff --git a/source/kde/slack-desc/libkdeedu b/source/kde/slack-desc/libkdeedu
deleted file mode 100644
index ab58c79c8..000000000
--- a/source/kde/slack-desc/libkdeedu
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-libkdeedu: libkdeedu (Educational applications)
-libkdeedu:
-libkdeedu: Educational applications for the KDE Software Compilation.
-libkdeedu:
-libkdeedu:
-libkdeedu:
-libkdeedu:
-libkdeedu:
-libkdeedu:
-libkdeedu:
-libkdeedu:
diff --git a/source/kde/slack-desc/libkdegames b/source/kde/slack-desc/libkdegames
deleted file mode 100644
index 6af9e5178..000000000
--- a/source/kde/slack-desc/libkdegames
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-libkdegames: libkdegames (common code and data for many KDE games)
-libkdegames:
-libkdegames: Libkdegames contains common code and data for many KDE games.
-libkdegames:
-libkdegames:
-libkdegames:
-libkdegames:
-libkdegames:
-libkdegames:
-libkdegames:
-libkdegames:
diff --git a/source/kde/slack-desc/libkexiv2 b/source/kde/slack-desc/libkexiv2
deleted file mode 100644
index 19314c9d2..000000000
--- a/source/kde/slack-desc/libkexiv2
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-libkexiv2: libkexiv2 (wrapper library for exiv2 library)
-libkexiv2:
-libkexiv2: Libkexiv2 is a KDE wrapper around the Exiv2 library to manipulate
-libkexiv2: pictures' metadata.
-libkexiv2:
-libkexiv2: For more information, visit: http://www.kipi-plugins.org/
-libkexiv2:
-libkexiv2:
-libkexiv2:
-libkexiv2:
-libkexiv2:
diff --git a/source/kde/slack-desc/libkipi b/source/kde/slack-desc/libkipi
deleted file mode 100644
index 18176c78f..000000000
--- a/source/kde/slack-desc/libkipi
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-libkipi: libKipi (KDE Image Plugin Interface)
-libkipi:
-libkipi: This package provides a generic KDE Image Plug-in Interface used by
-libkipi: some KDE image applications.
-libkipi: Plug-ins for this interface are in the kipi-plugins package.
-libkipi:
-libkipi: For more info, visit: http://www.kipi-plugins.org/
-libkipi:
-libkipi:
-libkipi:
-libkipi:
diff --git a/source/kde/slack-desc/libkmahjongg b/source/kde/slack-desc/libkmahjongg
deleted file mode 100644
index 3a0759818..000000000
--- a/source/kde/slack-desc/libkmahjongg
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-libkmahjongg: libkmahjongg (library for rendering of Mahjongg tilesets)
-libkmahjongg:
-libkmahjongg: libkmahjongg is a library used by several KDE games for loading
-libkmahjongg: and rendering of Mahjongg tilesets.
-libkmahjongg:
-libkmahjongg:
-libkmahjongg:
-libkmahjongg:
-libkmahjongg:
-libkmahjongg:
-libkmahjongg:
diff --git a/source/kde/slack-desc/libkomparediff2 b/source/kde/slack-desc/libkomparediff2
deleted file mode 100644
index d5d734dea..000000000
--- a/source/kde/slack-desc/libkomparediff2
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-libkomparediff2: libkomparediff2 (library to compare files and strings)
-libkomparediff2:
-libkomparediff2: libkomparediff2 is a shared library to compare files and strings using
-libkomparediff2: kdelibs and GNU diff, used in Kompare and KDevelop.
-libkomparediff2:
-libkomparediff2:
-libkomparediff2:
-libkomparediff2:
-libkomparediff2:
-libkomparediff2:
-libkomparediff2:
diff --git a/source/kde/slack-desc/libksane b/source/kde/slack-desc/libksane
deleted file mode 100644
index 1358e8bac..000000000
--- a/source/kde/slack-desc/libksane
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-libksane: libksane (KDE scan support interface)
-libksane:
-libksane: Libksane is a library to add scan support to KDE applications.
-libksane:
-libksane:
-libksane:
-libksane:
-libksane:
-libksane:
-libksane:
-libksane:
diff --git a/source/kde/slack-desc/libkscreen b/source/kde/slack-desc/libkscreen
deleted file mode 100644
index 640ec0721..000000000
--- a/source/kde/slack-desc/libkscreen
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-libkscreen: libkscreen (KDE screen management library)
-libkscreen:
-libkscreen: LibKScreen is a library that provides access to current configuration
-libkscreen: of connected displays and ways to change the configuration.
-libkscreen:
-libkscreen: For more information, visit:
-libkscreen:   http://community.kde.org/Solid/Projects/ScreenManagement
-libkscreen:
-libkscreen:
-libkscreen:
-libkscreen:
diff --git a/source/kde/slack-desc/libktorrent b/source/kde/slack-desc/libktorrent
deleted file mode 100644
index 6e2a20f15..000000000
--- a/source/kde/slack-desc/libktorrent
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-libktorrent: libktorrent (Protocol library for the KDE BitTorrent program)
-libktorrent:
-libktorrent: Libktorrent is the BitTorrent protocol library for ktorrent, which
-libktorrent: contains all the torrent downloading code. Although it is closely
-libktorrent: related to ktorrent, the goal is to make libktorrent an independent
-libktorrent: library which can be used by other applications.
-libktorrent:
-libktorrent: Homepage: http://ktorrent.org
-libktorrent:
-libktorrent:
-libktorrent:
diff --git a/source/kde/slack-desc/libmm-qt b/source/kde/slack-desc/libmm-qt
deleted file mode 100644
index 3081f8400..000000000
--- a/source/kde/slack-desc/libmm-qt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-libmm-qt: libmm-qt (ModemManager Qt bindings)
-libmm-qt:
-libmm-qt: This package contains Qt bindings for ModemManager.
-libmm-qt:
-libmm-qt:
-libmm-qt:
-libmm-qt:
-libmm-qt:
-libmm-qt:
-libmm-qt:
-libmm-qt:
diff --git a/source/kde/slack-desc/libnm-qt b/source/kde/slack-desc/libnm-qt
deleted file mode 100644
index 600c7582e..000000000
--- a/source/kde/slack-desc/libnm-qt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-libnm-qt: libnm-qt (NetworkManager Qt bindings)
-libnm-qt:
-libnm-qt: This package contains Qt bindings for NetworkManager.
-libnm-qt:
-libnm-qt:
-libnm-qt:
-libnm-qt:
-libnm-qt:
-libnm-qt:
-libnm-qt:
-libnm-qt:
diff --git a/source/kde/slack-desc/lokalize b/source/kde/slack-desc/lokalize
deleted file mode 100644
index 74ac9756e..000000000
--- a/source/kde/slack-desc/lokalize
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-lokalize: lokalize (computer-aided translation system)
-lokalize:
-lokalize: Lokalize is a computer-aided translation system that focuses on
-lokalize: productivity and quality assurance. It has components usual for CAT
-lokalize: tools: translation memory, glossary, and also a unique translation
-lokalize: merging (synchronization) capability. It is primarily targeted for
-lokalize: software translation and also integrates external conversion tools
-lokalize: for freelance office document translation.
-lokalize:
-lokalize: Home: http://www.kde.org/applications/development/lokalize/
-lokalize:
diff --git a/source/kde/slack-desc/lskat b/source/kde/slack-desc/lskat
deleted file mode 100644
index 360491e48..000000000
--- a/source/kde/slack-desc/lskat
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-lskat: lskat (Lieutenant Skat card game for KDE)
-lskat:
-lskat: Lieutenant Skat (from German "Offiziersskat") is a fun and engaging
-lskat: card game for two players, where the second player is either live
-lskat: opponent, or a built in artificial intelligence.
-lskat:
-lskat: For more information, visit: http://www.kde.org
-lskat:
-lskat:
-lskat:
-lskat:
diff --git a/source/kde/slack-desc/marble b/source/kde/slack-desc/marble
deleted file mode 100644
index 4c43c1dbc..000000000
--- a/source/kde/slack-desc/marble
+++ /dev/null
@@ -1,20 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-marble: marble (virtual globe)
-marble:
-marble: Marble is a virtual globe with advanced routing capabilities. You can
-marble: download maps from a variety of themes and explore the surroundings.
-marble: Record your trip and share it with your friends.
-marble: Features: online and offline routing, GPS tracking and recording,
-marble: themable maps (OpenStreetMap, Satellite Map and more), support for
-marble: different projections (globe, flat map, ...) and other planets,
-marble: download of maps and route data for offline usage.
-marble:
-marble:
-
diff --git a/source/kde/slack-desc/mplayerthumbs b/source/kde/slack-desc/mplayerthumbs
deleted file mode 100644
index f3669da80..000000000
--- a/source/kde/slack-desc/mplayerthumbs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------------|
-mplayerthumbs: mplayerthumbs (video thumbnail generator)
-mplayerthumbs:
-mplayerthumbs: MPlayerThumbs is a video thumbnail generator for KDE file managers
-mplayerthumbs: like Dolphin and Konqueror. It enables them to show preview images
-mplayerthumbs: of video files. 
-mplayerthumbs:
-mplayerthumbs:
-mplayerthumbs:
-mplayerthumbs:
-mplayerthumbs:
-mplayerthumbs:
diff --git a/source/kde/slack-desc/nepomuk-core b/source/kde/slack-desc/nepomuk-core
deleted file mode 100644
index 473445e40..000000000
--- a/source/kde/slack-desc/nepomuk-core
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-nepomuk-core: nepomuk-core (Nepomuk Core utilities and libraries)
-nepomuk-core:
-nepomuk-core: This package contains the Nepomuk Core utilities and libraries.
-nepomuk-core:
-nepomuk-core:
-nepomuk-core:
-nepomuk-core:
-nepomuk-core:
-nepomuk-core:
-nepomuk-core:
-nepomuk-core:
diff --git a/source/kde/slack-desc/nepomuk-widgets b/source/kde/slack-desc/nepomuk-widgets
deleted file mode 100644
index d10bb1c1d..000000000
--- a/source/kde/slack-desc/nepomuk-widgets
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-nepomuk-widgets: nepomuk-widgets (nepomuk widgets)
-nepomuk-widgets:
-nepomuk-widgets: This package contains all of the Nepomuk widgets.
-nepomuk-widgets:
-nepomuk-widgets: For more information, visit: http://nepomuk.kde.org/
-nepomuk-widgets:
-nepomuk-widgets:
-nepomuk-widgets:
-nepomuk-widgets:
-nepomuk-widgets:
-nepomuk-widgets:
diff --git a/source/kde/slack-desc/networkmanagement b/source/kde/slack-desc/networkmanagement
deleted file mode 100644
index 1c2ddcb33..000000000
--- a/source/kde/slack-desc/networkmanagement
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-networkmanagement: networkmanagement (KDE network control panel and widget)
-networkmanagement:
-networkmanagement: KDE network control panel and widget.
-networkmanagement:
-networkmanagement: For more information, visit:
-networkmanagement:   http://userbase.kde.org/NetworkManagement
-networkmanagement:
-networkmanagement:
-networkmanagement:
-networkmanagement:
-networkmanagement:
diff --git a/source/kde/slack-desc/okteta b/source/kde/slack-desc/okteta
deleted file mode 100644
index 23c1c6b03..000000000
--- a/source/kde/slack-desc/okteta
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-okteta: okteta (hex editor for KDE)
-okteta:
-okteta: A KDE hex editor for viewing and editing the raw data of files.
-okteta:
-okteta:
-okteta:
-okteta:
-okteta:
-okteta:
-okteta:
-okteta:
diff --git a/source/kde/slack-desc/okular b/source/kde/slack-desc/okular
deleted file mode 100644
index af5939337..000000000
--- a/source/kde/slack-desc/okular
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-okular: okular (a document viewer)
-okular:
-okular: Okular is a document viewer for KDE.
-okular:
-okular:
-okular:
-okular:
-okular:
-okular:
-okular:
-okular:
diff --git a/source/kde/slack-desc/oxygen-gtk2 b/source/kde/slack-desc/oxygen-gtk2
deleted file mode 100644
index 9398d8d48..000000000
--- a/source/kde/slack-desc/oxygen-gtk2
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-oxygen-gtk2: oxygen-gtk2 (Oxygen GTK+ engine)
-oxygen-gtk2:
-oxygen-gtk2: Oxygen-Gtk2 is a port of the KDE widget theme Oxygen, to GTK+.
-oxygen-gtk2: It's primary goal is to ensure visual consistency between GTK+ and
-oxygen-gtk2: qt-based applications running under kde. A secondary objective is
-oxygen-gtk2: to also have a stand-alone nice looking GTK+ theme that would behave
-oxygen-gtk2: well on other Desktop Environments.
-oxygen-gtk2: Unlike other attempts made to port the kde oxygen theme to GTK+, this
-oxygen-gtk2: attempt does not depend on Qt.
-oxygen-gtk2:
-oxygen-gtk2: See: http://projects.kde.org/projects/playground/artwork/oxygen-gtk
diff --git a/source/kde/slack-desc/oxygen-gtk3 b/source/kde/slack-desc/oxygen-gtk3
deleted file mode 100644
index 43b763672..000000000
--- a/source/kde/slack-desc/oxygen-gtk3
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-oxygen-gtk3: oxygen-gtk3 (Oxygen GTK+3 engine)
-oxygen-gtk3:
-oxygen-gtk3: Oxygen-Gtk3 is a port of the KDE widget theme Oxygen, to GTK+3.
-oxygen-gtk3: It's primary goal is to ensure visual consistency between GTK+ and
-oxygen-gtk3: qt-based applications running under kde. A secondary objective is
-oxygen-gtk3: to also have a stand-alone nice looking GTK+ theme that would behave
-oxygen-gtk3: well on other Desktop Environments.
-oxygen-gtk3: Unlike other attempts made to port the kde oxygen theme to GTK+, this
-oxygen-gtk3: attempt does not depend on Qt.
-oxygen-gtk3:
-oxygen-gtk3: See: http://projects.kde.org/projects/playground/artwork/oxygen-gtk
diff --git a/source/kde/slack-desc/oxygen-icons b/source/kde/slack-desc/oxygen-icons
deleted file mode 100644
index eb299e8e1..000000000
--- a/source/kde/slack-desc/oxygen-icons
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-oxygen-icons: oxygen-icons (Oxygen theme for the KDE Plasma Desktop)
-oxygen-icons:
-oxygen-icons: Oxygen provides a complete and modern icon theme for KDE.
-oxygen-icons:
-oxygen-icons: Visit the Oxygen project online: http://www.oxygen-icons.org
-oxygen-icons:
-oxygen-icons:
-oxygen-icons:
-oxygen-icons:
-oxygen-icons:
-oxygen-icons:
diff --git a/source/kde/slack-desc/pairs b/source/kde/slack-desc/pairs
deleted file mode 100644
index 6db425e99..000000000
--- a/source/kde/slack-desc/pairs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-pairs: pairs (a memory game)
-pairs:
-pairs: Pairs is a game that will help train your memory by remembering
-pairs: different images, shapes, sounds and text.
-pairs:
-pairs:
-pairs:
-pairs:
-pairs:
-pairs:
-pairs:
diff --git a/source/kde/slack-desc/palapeli b/source/kde/slack-desc/palapeli
deleted file mode 100644
index 7aed9102c..000000000
--- a/source/kde/slack-desc/palapeli
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-palapeli: palapeli (jigsaw puzzle game)
-palapeli:
-palapeli: Palapeli is a single-player jigsaw puzzle game. Unlike other games in
-palapeli: that genre, you are not limited to aligning pieces on imaginary grids.
-palapeli: The pieces are freely moveable. Also, Palapeli features real
-palapeli: persistency, i.e. everything you do is saved on your disk immediately.
-palapeli:
-palapeli:
-palapeli:
-palapeli:
-palapeli:
diff --git a/source/kde/slack-desc/parley b/source/kde/slack-desc/parley
deleted file mode 100644
index 765c0a705..000000000
--- a/source/kde/slack-desc/parley
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-parley: parley (vocabulary trainer)
-parley:
-parley: Parley is a vocabulary trainer for KDE.
-parley:
-parley:
-parley:
-parley:
-parley:
-parley:
-parley:
-parley:
diff --git a/source/kde/slack-desc/partitionmanager b/source/kde/slack-desc/partitionmanager
deleted file mode 100644
index 823a67f10..000000000
--- a/source/kde/slack-desc/partitionmanager
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------|
-partitionmanager: partitionmanager (Graphical partition manager for KDE4)
-partitionmanager:
-partitionmanager: Easily manage disks, partitions and filesystems on your KDE
-partitionmanager: desktop. Create, resize, move, copy, back up, restore or
-partitionmanager: delete partitions.
-partitionmanager:
-partitionmanager:
-partitionmanager:
-partitionmanager:
-partitionmanager:
-partitionmanager:
diff --git a/source/kde/slack-desc/perlkde b/source/kde/slack-desc/perlkde
deleted file mode 100644
index 2b70d1b8c..000000000
--- a/source/kde/slack-desc/perlkde
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-perlkde: perlkde (perl bindings for KDE)
-perlkde:
-perlkde: Perl bindings for KDE.
-perlkde:
-perlkde:
-perlkde:
-perlkde:
-perlkde:
-perlkde:
-perlkde:
-perlkde:
diff --git a/source/kde/slack-desc/perlqt b/source/kde/slack-desc/perlqt
deleted file mode 100644
index 2e63d4bd1..000000000
--- a/source/kde/slack-desc/perlqt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-perlqt: perlqt (Perl OO interface to Qt)
-perlqt:
-perlqt: A Perl Object Oriented interface to the Qt GUI Toolkit.
-perlqt: Access to the KDE Desktop Environment libraries is planned as well.
-perlqt:
-perlqt: For more information, visit: http://perlqt.sourceforge.net
-perlqt:
-perlqt:
-perlqt:
-perlqt:
-perlqt:
diff --git a/source/kde/slack-desc/picmi b/source/kde/slack-desc/picmi
deleted file mode 100644
index 667487153..000000000
--- a/source/kde/slack-desc/picmi
+++ /dev/null
@@ -1,20 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-picmi: picmi (logic puzzle game)
-picmi:
-picmi: Picmi is a single player logic-based puzzle game.
-picmi:
-picmi: The goal is to color cells according to numbers given at the side
-picmi: of the board in order to uncover a hidden pattern or picture. 
-picmi:
-picmi:
-picmi:
-picmi:
-picmi:
-picmi:
diff --git a/source/kde/slack-desc/plasma-nm b/source/kde/slack-desc/plasma-nm
deleted file mode 100644
index 2b9d2e171..000000000
--- a/source/kde/slack-desc/plasma-nm
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-plasma-nm: plasma-nm (KDE networkmanagement applet)
-plasma-nm:
-plasma-nm: This package contains the KDE networkmanagement applet. This applet
-plasma-nm: is written in QML and replaces the old widget based networkmanagement
-plasma-nm: applet.
-plasma-nm:
-plasma-nm:
-plasma-nm:
-plasma-nm:
-plasma-nm:
-plasma-nm:
diff --git a/source/kde/slack-desc/polkit-kde-agent-1 b/source/kde/slack-desc/polkit-kde-agent-1
deleted file mode 100644
index 8b6f29bae..000000000
--- a/source/kde/slack-desc/polkit-kde-agent-1
+++ /dev/null
@@ -1,18 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                  |-----handy-ruler-----------------------------------------------------|
-polkit-kde-agent-1: polkit-kde-agent-1 (KDE polkit authenticator)
-polkit-kde-agent-1:
-polkit-kde-agent-1: This is a polkit authenticator for KDE.
-polkit-kde-agent-1: 
-polkit-kde-agent-1: 
-polkit-kde-agent-1: 
-polkit-kde-agent-1: 
-polkit-kde-agent-1:
-polkit-kde-agent-1: 
-polkit-kde-agent-1:
diff --git a/source/kde/slack-desc/polkit-kde-kcmodules-1 b/source/kde/slack-desc/polkit-kde-kcmodules-1
deleted file mode 100644
index a98ca5fc8..000000000
--- a/source/kde/slack-desc/polkit-kde-kcmodules-1
+++ /dev/null
@@ -1,18 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-                      |-----handy-ruler-----------------------------------------------------|
-polkit-kde-kcmodules-1: polkit-kde-kcmodules-1 (KDE polkit kcmodules)
-polkit-kde-kcmodules-1:
-polkit-kde-kcmodules-1: This package contains the kcm_polkit modules for KDE.
-polkit-kde-kcmodules-1:
-polkit-kde-kcmodules-1:
-polkit-kde-kcmodules-1:
-polkit-kde-kcmodules-1:
-polkit-kde-kcmodules-1:
-polkit-kde-kcmodules-1:
-polkit-kde-kcmodules-1:
diff --git a/source/kde/slack-desc/polkit-qt-1 b/source/kde/slack-desc/polkit-qt-1
deleted file mode 100644
index d2e3aabe5..000000000
--- a/source/kde/slack-desc/polkit-qt-1
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler-----------------------------------------------------|
-polkit-qt-1: polkit-qt-1 (Qt polkit API wrapper)
-polkit-qt-1:
-polkit-qt-1: polkit-qt-1 aims to make it easy for Qt developers to take advantage
-polkit-qt-1: of the polkit API. It is a convenience wrapper around QAction and
-polkit-qt-1: QAbstractButton that lets you integrate those two components
-polkit-qt-1: easily with polkit.
-polkit-qt-1:
-polkit-qt-1: Homepage: http://techbase.kde.org/Polkit-Qt-1
-polkit-qt-1:
-polkit-qt-1:
-polkit-qt-1:
diff --git a/source/kde/slack-desc/poxml b/source/kde/slack-desc/poxml
deleted file mode 100644
index 18d1d864d..000000000
--- a/source/kde/slack-desc/poxml
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-poxml: poxml (translate DocBook XML files using gettext po files)
-poxml:
-poxml: This is a collection of tools that facilitate translating DocBook XML
-poxml: files using Gettext message files (PO files).
-poxml: Also included are several command-line utilities for manipulating
-poxml: DocBook XML files, PO files and PO template files.
-poxml:
-poxml:
-poxml:
-poxml:
-poxml:
diff --git a/source/kde/slack-desc/print-manager b/source/kde/slack-desc/print-manager
deleted file mode 100644
index 724d29754..000000000
--- a/source/kde/slack-desc/print-manager
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-             |-----handy-ruler------------------------------------------------------|
-print-manager: print-manager (tool for managing print jobs and printers)
-print-manager:
-print-manager: Print Manager (formerly printer-applet) is a system tray utility
-print-manager: that shows current print jobs, printer warnings, and errors.
-print-manager:
-print-manager: Homepage:
-print-manager:   https://projects.kde.org/projects/kde/kdeutils/print-manager
-print-manager:
-print-manager:
-print-manager:
-print-manager:
diff --git a/source/kde/slack-desc/printer-applet b/source/kde/slack-desc/printer-applet
deleted file mode 100644
index 77d31bb2d..000000000
--- a/source/kde/slack-desc/printer-applet
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side mprinter-applets the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-printer-applet: printer-applet (printer applet)
-printer-applet:
-printer-applet: Printer Applet is a system tray utility that shows current print
-printer-applet: jobs, printer warnings, and errors.
-printer-applet:
-printer-applet: Homepage: http://utils.kde.org/projects/printer-applet
-printer-applet:
-printer-applet:
-printer-applet:
-printer-applet:
-printer-applet:
diff --git a/source/kde/slack-desc/prison b/source/kde/slack-desc/prison
deleted file mode 100644
index aa990092d..000000000
--- a/source/kde/slack-desc/prison
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler-----------------------------------------------------|
-prison: prison (Qt based Barcode API)
-prison:
-prison: Prison is a barcode API currently offering a Qt API to produce 
-prison: QRCode barcodes and DotMatrix barcodes. 
-prison:
-prison: git clone git://anongit.kde.org/prison
-prison:
-prison:
-prison:
-prison:
-prison:
diff --git a/source/kde/slack-desc/pykde4 b/source/kde/slack-desc/pykde4
deleted file mode 100644
index de1a7e4a5..000000000
--- a/source/kde/slack-desc/pykde4
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-pykde4: pykde4 (Python bindings for KDE4)
-pykde4:
-pykde4: Python bindings for KDE4.
-pykde4:
-pykde4:
-pykde4:
-pykde4:
-pykde4:
-pykde4:
-pykde4:
-pykde4:
diff --git a/source/kde/slack-desc/qtruby b/source/kde/slack-desc/qtruby
deleted file mode 100644
index b5d37c5b9..000000000
--- a/source/kde/slack-desc/qtruby
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-qtruby: qtruby (Qt bindings for ruby)
-qtruby:
-qtruby: QtRuby is part of Korundum, very complete bindings to both the KDE
-qtruby: API and the Qt APIs. The Korundum package includes both a QtRuby
-qtruby: Qt-only binding along with the full combined Qt/KDE one.
-qtruby: The QtRuby package contains just Qt bindings, with no dependency
-qtruby: on KDE.
-qtruby:
-qtruby: For more information, see: http://rubyforge.org/projects/korundum/
-qtruby:
-qtruby:
diff --git a/source/kde/slack-desc/quanta b/source/kde/slack-desc/quanta
deleted file mode 100644
index 4a4889b9d..000000000
--- a/source/kde/slack-desc/quanta
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-quanta: quanta (Quanta Plus web development environment)
-quanta:
-quanta: Quanta Plus is a web development environment for HTML and associate
-quanta: languages. It is designed for quick web development.
-quanta: Quanta Plus includes the ability to run a debugger.
-quanta:
-quanta: Project page:
-quanta:   https://projects.kde.org/projects/playground/devtools/quanta
-quanta:
-quanta:
-quanta:
diff --git a/source/kde/slack-desc/qyoto b/source/kde/slack-desc/qyoto
deleted file mode 100644
index a3fa83b69..000000000
--- a/source/kde/slack-desc/qyoto
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-qyoto: qyoto (C# Mono Qt4 bindings)
-qyoto:
-qyoto: C# Mono Qt 4 language bindings.
-qyoto:
-qyoto: For more information, visit: http://www.www.org
-qyoto:
-qyoto:
-qyoto:
-qyoto:
-qyoto:
-qyoto:
diff --git a/source/kde/slack-desc/rocs b/source/kde/slack-desc/rocs
deleted file mode 100644
index e211e4a70..000000000
--- a/source/kde/slack-desc/rocs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-rocs: rocs (graph theory IDE)
-rocs:
-rocs: Rocs is a Graph Theory IDE for professors and students.
-rocs:
-rocs:
-rocs:
-rocs:
-rocs:
-rocs:
-rocs:
-rocs:
diff --git a/source/kde/slack-desc/skanlite b/source/kde/slack-desc/skanlite
deleted file mode 100644
index b4e994dae..000000000
--- a/source/kde/slack-desc/skanlite
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-skanlite: skanlite (a scanning program)
-skanlite:
-skanlite: Skanlite is a light-weight scanning application based on libksane.
-skanlite:
-skanlite:
-skanlite:
-skanlite:
-skanlite:
-skanlite:
-skanlite:
-skanlite:
diff --git a/source/kde/slack-desc/smokegen b/source/kde/slack-desc/smokegen
deleted file mode 100644
index 6fd6020d2..000000000
--- a/source/kde/slack-desc/smokegen
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-smokegen: smokegen (smoke generator)
-smokegen:
-smokegen: Smoke Generator. The main purpose of SMOKE is making it easier to
-smokegen: write bindings from scripting languages to Qt and KDE - with an
-smokegen: emphasis on ease of use and flexibility.
-smokegen:
-smokegen:
-smokegen:
-smokegen:
-smokegen:
-smokegen:
diff --git a/source/kde/slack-desc/smokekde b/source/kde/slack-desc/smokekde
deleted file mode 100644
index ebe909bae..000000000
--- a/source/kde/slack-desc/smokekde
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-smokekde: smokekde (smoke-kde library)
-smokekde:
-smokekde: Smoke generator.
-smokekde:
-smokekde:
-smokekde:
-smokekde:
-smokekde:
-smokekde:
-smokekde:
-smokekde:
diff --git a/source/kde/slack-desc/smokeqt b/source/kde/slack-desc/smokeqt
deleted file mode 100644
index ab1746d9a..000000000
--- a/source/kde/slack-desc/smokeqt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-smokeqt: smokeqt (bindings for Qt libraries)
-smokeqt:
-smokeqt: This package includes bindings for Qt libraries.
-smokeqt:
-smokeqt:
-smokeqt:
-smokeqt:
-smokeqt:
-smokeqt:
-smokeqt:
-smokeqt:
diff --git a/source/kde/slack-desc/step b/source/kde/slack-desc/step
deleted file mode 100644
index 9a3397b9b..000000000
--- a/source/kde/slack-desc/step
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-step: step (interactive physics simulator)
-step:
-step: Step is an interactive physical simulator.
-step:
-step: It works like this: you place some bodies on the scene, add some
-step: forces such as gravity or springs, then click "Simulate" and Step
-step: shows you how your scene will evolve according to the laws of physics.
-step: With Step you can not only learn but feel how physics works !
-step:
-step:
-step:
diff --git a/source/kde/slack-desc/strigi b/source/kde/slack-desc/strigi
deleted file mode 100644
index 2fbd672b0..000000000
--- a/source/kde/slack-desc/strigi
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler-----------------------------------------------------|
-strigi: strigi (fast and light desktop search engine)
-strigi:
-strigi: Strigi is a fast and light desktop search engine. It can handle a 
-strigi: large range of file formats such as emails, office documents, media
-strigi: files, and file archives. It can index files that are embedded in 
-strigi: other files. This means email attachments and files in zip files
-strigi: are searchable as if they were normal files on your harddisk. 
-strigi:
-strigi: Homepage: http://strigi.sourceforge.net/
-strigi:
-strigi:
diff --git a/source/kde/slack-desc/strigi-multimedia b/source/kde/slack-desc/strigi-multimedia
deleted file mode 100644
index 1e0c1b8f9..000000000
--- a/source/kde/slack-desc/strigi-multimedia
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-strigi-multimedia: strigi-multimedia (Strigi multimedia analyzers)
-strigi-multimedia:
-strigi-multimedia: Various analyzers to provide multimedia support to Strigi.
-strigi-multimedia:
-strigi-multimedia:
-strigi-multimedia:
-strigi-multimedia:
-strigi-multimedia:
-strigi-multimedia:
-strigi-multimedia:
-strigi-multimedia:
diff --git a/source/kde/slack-desc/superkaramba b/source/kde/slack-desc/superkaramba
deleted file mode 100644
index 2d196eb5a..000000000
--- a/source/kde/slack-desc/superkaramba
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side msuperkarambas the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-superkaramba: superkaramba (interactive widget manager)
-superkaramba:
-superkaramba: SuperKaramba is a tool that allows you to easily create
-superkaramba: interactive widgets on your KDE desktop.
-superkaramba:
-superkaramba: Home page: https://projects.kde.org/projects/kde/kdeutils/
-superkaramba:
-superkaramba:
-superkaramba:
-superkaramba:
-superkaramba:
diff --git a/source/kde/slack-desc/svgpart b/source/kde/slack-desc/svgpart
deleted file mode 100644
index ef95b6c97..000000000
--- a/source/kde/slack-desc/svgpart
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-svgpart: svgpart (SVG plugin for KDE)
-svgpart:
-svgpart: KPart for viewing SVG files in KDE.
-svgpart:
-svgpart:
-svgpart:
-svgpart:
-svgpart:
-svgpart:
-svgpart:
-svgpart:
diff --git a/source/kde/slack-desc/sweeper b/source/kde/slack-desc/sweeper
deleted file mode 100644
index 391dc89ea..000000000
--- a/source/kde/slack-desc/sweeper
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side msweepers the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-sweeper: sweeper (remove traces of your activities)
-sweeper:
-sweeper: Sweeper helps to clean unwanted traces the user leaves on the system.
-sweeper:
-sweeper: Home page: https://projects.kde.org/projects/kde/kdeutils/sweeper
-sweeper:
-sweeper:
-sweeper:
-sweeper:
-sweeper:
-sweeper:
diff --git a/source/kde/slack-desc/umbrello b/source/kde/slack-desc/umbrello
deleted file mode 100644
index a5fa2e14a..000000000
--- a/source/kde/slack-desc/umbrello
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-umbrello: umbrello (UML diagramming GUI)
-umbrello:
-umbrello: umbrello is a GUI for diagramming Unified Modelling Language (UML).
-umbrello:
-umbrello:
-umbrello:
-umbrello:
-umbrello:
-umbrello:
-umbrello:
-umbrello:
diff --git a/source/kde/slack-desc/wicd-kde b/source/kde/slack-desc/wicd-kde
deleted file mode 100644
index 8c0e87d98..000000000
--- a/source/kde/slack-desc/wicd-kde
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-wicd-kde: wicd-kde (Wicd client built on the KDE Development Platform)
-wicd-kde:
-wicd-kde: A Wicd client built on the KDE Development Platform.
-wicd-kde:
-wicd-kde: For more information, visit:
-wicd-kde:   https://projects.kde.org/projects/extragear/network/wicd-kde
-wicd-kde:
-wicd-kde:
-wicd-kde:
-wicd-kde:
-wicd-kde:
diff --git a/source/kde/slack-desc/zeroconf-ioslave b/source/kde/slack-desc/zeroconf-ioslave
deleted file mode 100644
index b823aea7b..000000000
--- a/source/kde/slack-desc/zeroconf-ioslave
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-zeroconf-ioslave: zeroconf-ioslave (network monitor for zeroconf)
-zeroconf-ioslave:
-zeroconf-ioslave: A network monitor for DNS-SD services (Zeroconf).
-zeroconf-ioslave:
-zeroconf-ioslave:
-zeroconf-ioslave:
-zeroconf-ioslave:
-zeroconf-ioslave:
-zeroconf-ioslave:
-zeroconf-ioslave:
-zeroconf-ioslave:
diff --git a/source/kdei/FTBFSlog b/source/kdei/FTBFSlog
deleted file mode 100644
index c39895348..000000000
--- a/source/kdei/FTBFSlog
+++ /dev/null
@@ -1,2 +0,0 @@
-Wed Jan 31 05:38:38 UTC 2018
-  All KDEI packages tested and found to build properly.
diff --git a/source/kdei/calligra-l10n/calligra-l10n.SlackBuild b/source/kdei/calligra-l10n/calligra-l10n.SlackBuild
deleted file mode 100755
index 22810b7b5..000000000
--- a/source/kdei/calligra-l10n/calligra-l10n.SlackBuild
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008  Robby Workman  Northport, AL, USA
-# Copyright 2012, 2013  Eric Hameleers, Eindhoven, NL
-# Copyright 2012, 2013, 2014, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#  This script should build any of the language packs if run with (for example):
-#    PKGLANG=de ./calligra-l10n.SlackBuild
-#  You should be able to build all of them with something like this:
-#    for i in $(cat languages) ; do PKGLANG=$i ./calligra-l10n.SlackBuild ; done
-# If ./languages is missing and this script is called without options, the
-# default is to create an up-to-date ./languages list and build all the
-# language packs.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-if [ ! -r ./languages ]; then
-  for file in calligra-l10n*.xz ; do
-    echo $file | cut -f 3 -d - >> ./languages
-  done
-fi
-
-[ -z $VERSION ] && export VERSION=2.9.11
-[ -z $ARCH ] && export ARCH=noarch
-[ -z $BUILD ] && export BUILD=1
-
-# Use this as CFLAGS and CXXFLAGS:
-if [ -z "$SLKCFLAGS" ]; then
-  if [ "$ARCH" = "i486" ]; then
-    export SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  elif [ "$ARCH" = "i586" ]; then
-    export SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  elif [ "$ARCH" = "s390" ]; then
-    export SLKCFLAGS="-O2"
-  elif [ "$ARCH" = "x86_64" ]; then
-    export SLKCFLAGS="-O2 -fPIC"
-  elif [ "$ARCH" = "armv7hl" ]; then
-    export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  fi
-fi
-
-# Get the kde environment variables
-[ -d kdebase ] && . ./kdebase/profile.d/kde.sh
-
-# Set the config option variables if they are not already set:
-[ -r ../KDE.options ] && . ../KDE.options
-
-TMP=${TMP:-/tmp/kde_build}
-
-make_language_pack() {
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION 
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-  make || exit 1
-  make install DESTDIR=$PKG || exit 1
-cd -
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-mkdir -p $PKG/install
-cat $CWD/slack-desc/slack-desc.calligra-l10n-$PKGLANG > $PKG/install/slack-desc
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-}
-
-if [ -z $PKGLANG ]; then
-  for PKGLANG in $(cat languages) ; do
-    PKGNAM=calligra-l10n-$PKGLANG
-    # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-    # the name of the created package would be, and then exit. This information
-    # could be useful to other scripts.
-    if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-      echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-      continue
-    fi
-    PKG=$TMP/package-calligra-l10n-$PKGLANG
-    # The global options may be overridden here (if needed):
-    [ -r ./local.options/$PKGLANG ] && . ./local.options/$PKGLANG
-    make_language_pack;
-  done
-else
-  PKGNAM=calligra-l10n-$PKGLANG
-  # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-  # the name of the created package would be, and then exit. This information
-  # could be useful to other scripts.
-  if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-    echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-    exit 0
-  fi
-  PKG=$TMP/package-calligra-l10n-$PKGLANG
-  # The global options may be overridden here (if needed):
-  [ -r ./local.options/$PKGLANG ] && . ./local.options/$PKGLANG
-  make_language_pack;
-fi
-
diff --git a/source/kdei/calligra-l10n/languages b/source/kdei/calligra-l10n/languages
deleted file mode 100644
index 98f24bbe4..000000000
--- a/source/kdei/calligra-l10n/languages
+++ /dev/null
@@ -1,29 +0,0 @@
-bs
-ca
-ca@valencia
-cs
-da
-de
-el
-en_GB
-es
-et
-fi
-fr
-gl
-hu
-it
-ja
-kk
-nb
-nl
-pl
-pt
-pt_BR
-ru
-sk
-sv
-tr
-uk
-zh_CN
-zh_TW
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-af b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-af
deleted file mode 100644
index b5bfc17f6..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-af
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-af: calligra-l10n-af
-calligra-l10n-af:
-calligra-l10n-af: Afrikaans language support for Calligra.
-calligra-l10n-af:
-calligra-l10n-af:
-calligra-l10n-af:
-calligra-l10n-af:
-calligra-l10n-af:
-calligra-l10n-af:
-calligra-l10n-af:
-calligra-l10n-af:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ar b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ar
deleted file mode 100644
index 0d63ba68a..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ar
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ar: calligra-l10n-ar
-calligra-l10n-ar:
-calligra-l10n-ar: Arabic language support for Calligra.
-calligra-l10n-ar:
-calligra-l10n-ar:
-calligra-l10n-ar:
-calligra-l10n-ar:
-calligra-l10n-ar:
-calligra-l10n-ar:
-calligra-l10n-ar:
-calligra-l10n-ar:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-az b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-az
deleted file mode 100644
index 954dd8d2a..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-az
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-az: calligra-l10n-az
-calligra-l10n-az:
-calligra-l10n-az: Azerbaijani language support for Calligra.
-calligra-l10n-az:
-calligra-l10n-az:
-calligra-l10n-az:
-calligra-l10n-az:
-calligra-l10n-az:
-calligra-l10n-az:
-calligra-l10n-az:
-calligra-l10n-az:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-bg b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-bg
deleted file mode 100644
index b3cde322a..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-bg: calligra-l10n-bg
-calligra-l10n-bg:
-calligra-l10n-bg: Bulgarian language support for Calligra.
-calligra-l10n-bg:
-calligra-l10n-bg:
-calligra-l10n-bg:
-calligra-l10n-bg:
-calligra-l10n-bg:
-calligra-l10n-bg:
-calligra-l10n-bg:
-calligra-l10n-bg:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-br b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-br
deleted file mode 100644
index e94f292f9..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-br
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-br: calligra-l10n-br
-calligra-l10n-br:
-calligra-l10n-br: Breton language support for Calligra.
-calligra-l10n-br:
-calligra-l10n-br:
-calligra-l10n-br:
-calligra-l10n-br:
-calligra-l10n-br:
-calligra-l10n-br:
-calligra-l10n-br:
-calligra-l10n-br:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-bs b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-bs
deleted file mode 100644
index cc8a5da70..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-bs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-bs: calligra-l10n-bs
-calligra-l10n-bs:
-calligra-l10n-bs: Bosnian language support for Calligra.
-calligra-l10n-bs:
-calligra-l10n-bs:
-calligra-l10n-bs:
-calligra-l10n-bs:
-calligra-l10n-bs:
-calligra-l10n-bs:
-calligra-l10n-bs:
-calligra-l10n-bs:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ca b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ca
deleted file mode 100644
index e384678a2..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ca
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ca: calligra-l10n-ca
-calligra-l10n-ca:
-calligra-l10n-ca: Catalan language support for Calligra.
-calligra-l10n-ca:
-calligra-l10n-ca:
-calligra-l10n-ca:
-calligra-l10n-ca:
-calligra-l10n-ca:
-calligra-l10n-ca:
-calligra-l10n-ca:
-calligra-l10n-ca:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ca@valencia b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ca@valencia
deleted file mode 100644
index 541229b48..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ca@valencia
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                         |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ca@valencia: calligra-l10n-ca@valencia
-calligra-l10n-ca@valencia:
-calligra-l10n-ca@valencia: Valencian (southern Catalan) language support for Calligra.
-calligra-l10n-ca@valencia:
-calligra-l10n-ca@valencia:
-calligra-l10n-ca@valencia:
-calligra-l10n-ca@valencia:
-calligra-l10n-ca@valencia:
-calligra-l10n-ca@valencia:
-calligra-l10n-ca@valencia:
-calligra-l10n-ca@valencia:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-cs b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-cs
deleted file mode 100644
index 3283206d1..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-cs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-cs: calligra-l10n-cs
-calligra-l10n-cs:
-calligra-l10n-cs: Czech language support for Calligra.
-calligra-l10n-cs:
-calligra-l10n-cs:
-calligra-l10n-cs:
-calligra-l10n-cs:
-calligra-l10n-cs:
-calligra-l10n-cs:
-calligra-l10n-cs:
-calligra-l10n-cs:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-cy b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-cy
deleted file mode 100644
index d2a082aa8..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-cy
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-cy: calligra-l10n-cy
-calligra-l10n-cy:
-calligra-l10n-cy: Welsh language support for Calligra.
-calligra-l10n-cy:
-calligra-l10n-cy:
-calligra-l10n-cy:
-calligra-l10n-cy:
-calligra-l10n-cy:
-calligra-l10n-cy:
-calligra-l10n-cy:
-calligra-l10n-cy:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-da b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-da
deleted file mode 100644
index f288a01a0..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-da
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-da: calligra-l10n-da
-calligra-l10n-da:
-calligra-l10n-da: Danish language support for Calligra.
-calligra-l10n-da:
-calligra-l10n-da:
-calligra-l10n-da:
-calligra-l10n-da:
-calligra-l10n-da:
-calligra-l10n-da:
-calligra-l10n-da:
-calligra-l10n-da:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-de b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-de
deleted file mode 100644
index a9fc19f63..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-de
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-de: calligra-l10n-de
-calligra-l10n-de:
-calligra-l10n-de: German language support for Calligra.
-calligra-l10n-de:
-calligra-l10n-de:
-calligra-l10n-de:
-calligra-l10n-de:
-calligra-l10n-de:
-calligra-l10n-de:
-calligra-l10n-de:
-calligra-l10n-de:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-el b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-el
deleted file mode 100644
index f6277b339..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-el
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-el: calligra-l10n-el
-calligra-l10n-el:
-calligra-l10n-el: Greek language support for Calligra.
-calligra-l10n-el:
-calligra-l10n-el:
-calligra-l10n-el:
-calligra-l10n-el:
-calligra-l10n-el:
-calligra-l10n-el:
-calligra-l10n-el:
-calligra-l10n-el:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-en_GB b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-en_GB
deleted file mode 100644
index 0890378aa..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-en_GB
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                   |-----handy-ruler------------------------------------------------------|
-calligra-l10n-en_GB: calligra-l10n-en_GB
-calligra-l10n-en_GB:
-calligra-l10n-en_GB: English (UK) language support for Calligra.
-calligra-l10n-en_GB:
-calligra-l10n-en_GB:
-calligra-l10n-en_GB:
-calligra-l10n-en_GB:
-calligra-l10n-en_GB:
-calligra-l10n-en_GB:
-calligra-l10n-en_GB:
-calligra-l10n-en_GB:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-eo b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-eo
deleted file mode 100644
index 4bc4edcdc..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-eo
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-eo: calligra-l10n-eo
-calligra-l10n-eo:
-calligra-l10n-eo: Esperanto language support for Calligra.
-calligra-l10n-eo:
-calligra-l10n-eo:
-calligra-l10n-eo:
-calligra-l10n-eo:
-calligra-l10n-eo:
-calligra-l10n-eo:
-calligra-l10n-eo:
-calligra-l10n-eo:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-es b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-es
deleted file mode 100644
index d95944b2f..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-es
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-es: calligra-l10n-es
-calligra-l10n-es:
-calligra-l10n-es: Spanish language support for Calligra.
-calligra-l10n-es:
-calligra-l10n-es:
-calligra-l10n-es:
-calligra-l10n-es:
-calligra-l10n-es:
-calligra-l10n-es:
-calligra-l10n-es:
-calligra-l10n-es:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-et b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-et
deleted file mode 100644
index 207237d25..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-et
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-et: calligra-l10n-et
-calligra-l10n-et:
-calligra-l10n-et: Estonian language support for Calligra.
-calligra-l10n-et:
-calligra-l10n-et:
-calligra-l10n-et:
-calligra-l10n-et:
-calligra-l10n-et:
-calligra-l10n-et:
-calligra-l10n-et:
-calligra-l10n-et:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-eu b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-eu
deleted file mode 100644
index 1ab048b82..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-eu
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makeu it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lineu for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-eu: calligra-l10n-eu
-calligra-l10n-eu:
-calligra-l10n-eu: Basque language support for Calligra.
-calligra-l10n-eu:
-calligra-l10n-eu:
-calligra-l10n-eu:
-calligra-l10n-eu:
-calligra-l10n-eu:
-calligra-l10n-eu:
-calligra-l10n-eu:
-calligra-l10n-eu:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fa b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fa
deleted file mode 100644
index 50228b349..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fa
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-fa: calligra-l10n-fa
-calligra-l10n-fa:
-calligra-l10n-fa: Persian (Farsi) language support for Calligra.
-calligra-l10n-fa:
-calligra-l10n-fa:
-calligra-l10n-fa:
-calligra-l10n-fa:
-calligra-l10n-fa:
-calligra-l10n-fa:
-calligra-l10n-fa:
-calligra-l10n-fa:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fi b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fi
deleted file mode 100644
index 400e52324..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fi
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-fi: calligra-l10n-fi
-calligra-l10n-fi:
-calligra-l10n-fi: Finnish language support for Calligra.
-calligra-l10n-fi:
-calligra-l10n-fi:
-calligra-l10n-fi:
-calligra-l10n-fi:
-calligra-l10n-fi:
-calligra-l10n-fi:
-calligra-l10n-fi:
-calligra-l10n-fi:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fr b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fr
deleted file mode 100644
index daf99176d..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fr
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-fr: calligra-l10n-fr
-calligra-l10n-fr:
-calligra-l10n-fr: French language support for Calligra.
-calligra-l10n-fr:
-calligra-l10n-fr:
-calligra-l10n-fr:
-calligra-l10n-fr:
-calligra-l10n-fr:
-calligra-l10n-fr:
-calligra-l10n-fr:
-calligra-l10n-fr:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fy b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fy
deleted file mode 100644
index feaf9860b..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-fy
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-fy: calligra-l10n-fy
-calligra-l10n-fy:
-calligra-l10n-fy: Abkhasysk language support for Calligra.
-calligra-l10n-fy:
-calligra-l10n-fy:
-calligra-l10n-fy:
-calligra-l10n-fy:
-calligra-l10n-fy:
-calligra-l10n-fy:
-calligra-l10n-fy:
-calligra-l10n-fy:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ga b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ga
deleted file mode 100644
index 75165068a..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ga
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makeu it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lineu for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ga: calligra-l10n-ga
-calligra-l10n-ga:
-calligra-l10n-ga: Irish Gaelic language support for Calligra.
-calligra-l10n-ga:
-calligra-l10n-ga:
-calligra-l10n-ga:
-calligra-l10n-ga:
-calligra-l10n-ga:
-calligra-l10n-ga:
-calligra-l10n-ga:
-calligra-l10n-ga:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-gl b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-gl
deleted file mode 100644
index aebbffda7..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-gl
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-gl: calligra-l10n-gl
-calligra-l10n-gl:
-calligra-l10n-gl: Galician language support for Calligra.
-calligra-l10n-gl:
-calligra-l10n-gl:
-calligra-l10n-gl:
-calligra-l10n-gl:
-calligra-l10n-gl:
-calligra-l10n-gl:
-calligra-l10n-gl:
-calligra-l10n-gl:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-he b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-he
deleted file mode 100644
index b3cb0bcb1..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-he
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-he: calligra-l10n-he
-calligra-l10n-he:
-calligra-l10n-he: Hebrew language support for Calligra.
-calligra-l10n-he:
-calligra-l10n-he:
-calligra-l10n-he:
-calligra-l10n-he:
-calligra-l10n-he:
-calligra-l10n-he:
-calligra-l10n-he:
-calligra-l10n-he:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hi b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hi
deleted file mode 100644
index 25af18e7f..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hi
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-hi: calligra-l10n-hi
-calligra-l10n-hi:
-calligra-l10n-hi: Hindi language support for Calligra.
-calligra-l10n-hi:
-calligra-l10n-hi:
-calligra-l10n-hi:
-calligra-l10n-hi:
-calligra-l10n-hi:
-calligra-l10n-hi:
-calligra-l10n-hi:
-calligra-l10n-hi:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hne b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hne
deleted file mode 100644
index e13c36205..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hne
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-calligra-l10n-hne: calligra-l10n-hne
-calligra-l10n-hne:
-calligra-l10n-hne: Chhattisgarhi language support for Calligra.
-calligra-l10n-hne:
-calligra-l10n-hne:
-calligra-l10n-hne:
-calligra-l10n-hne:
-calligra-l10n-hne:
-calligra-l10n-hne:
-calligra-l10n-hne:
-calligra-l10n-hne:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hsb b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hsb
deleted file mode 100644
index e0b290c4a..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hsb
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-calligra-l10n-hsb: calligra-l10n-hsb
-calligra-l10n-hsb:
-calligra-l10n-hsb: Upper Sorbian language support for Calligra.
-calligra-l10n-hsb:
-calligra-l10n-hsb:
-calligra-l10n-hsb:
-calligra-l10n-hsb:
-calligra-l10n-hsb:
-calligra-l10n-hsb:
-calligra-l10n-hsb:
-calligra-l10n-hsb:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hu b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hu
deleted file mode 100644
index 7029712d3..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-hu
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-hu: calligra-l10n-hu
-calligra-l10n-hu:
-calligra-l10n-hu: Hungarian language support for Calligra.
-calligra-l10n-hu:
-calligra-l10n-hu:
-calligra-l10n-hu:
-calligra-l10n-hu:
-calligra-l10n-hu:
-calligra-l10n-hu:
-calligra-l10n-hu:
-calligra-l10n-hu:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ia b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ia
deleted file mode 100644
index 7b055cf69..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ia
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ia: calligra-l10n-ia
-calligra-l10n-ia:
-calligra-l10n-ia: Interlingua language support for Calligra.
-calligra-l10n-ia:
-calligra-l10n-ia:
-calligra-l10n-ia:
-calligra-l10n-ia:
-calligra-l10n-ia:
-calligra-l10n-ia:
-calligra-l10n-ia:
-calligra-l10n-ia:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-is b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-is
deleted file mode 100644
index 3c528f8c4..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-is
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-is: calligra-l10n-is
-calligra-l10n-is:
-calligra-l10n-is: Icelandic language support for Calligra.
-calligra-l10n-is:
-calligra-l10n-is:
-calligra-l10n-is:
-calligra-l10n-is:
-calligra-l10n-is:
-calligra-l10n-is:
-calligra-l10n-is:
-calligra-l10n-is:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-it b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-it
deleted file mode 100644
index 6aecb9947..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-it
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-it: calligra-l10n-it
-calligra-l10n-it:
-calligra-l10n-it: Italian language support for Calligra.
-calligra-l10n-it:
-calligra-l10n-it:
-calligra-l10n-it:
-calligra-l10n-it:
-calligra-l10n-it:
-calligra-l10n-it:
-calligra-l10n-it:
-calligra-l10n-it:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ja b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ja
deleted file mode 100644
index 86eaeeb24..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ja
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ja: calligra-l10n-ja
-calligra-l10n-ja:
-calligra-l10n-ja: Japanese language support for Calligra.
-calligra-l10n-ja:
-calligra-l10n-ja:
-calligra-l10n-ja:
-calligra-l10n-ja:
-calligra-l10n-ja:
-calligra-l10n-ja:
-calligra-l10n-ja:
-calligra-l10n-ja:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-kk b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-kk
deleted file mode 100644
index 9724db2d1..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-kk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-kk: calligra-l10n-kk
-calligra-l10n-kk:
-calligra-l10n-kk: Kazakh language support for Calligra.
-calligra-l10n-kk:
-calligra-l10n-kk:
-calligra-l10n-kk:
-calligra-l10n-kk:
-calligra-l10n-kk:
-calligra-l10n-kk:
-calligra-l10n-kk:
-calligra-l10n-kk:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-km b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-km
deleted file mode 100644
index 9d030e8ff..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-km
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-km: calligra-l10n-km
-calligra-l10n-km:
-calligra-l10n-km: Khmer language support for Calligra.
-calligra-l10n-km:
-calligra-l10n-km:
-calligra-l10n-km:
-calligra-l10n-km:
-calligra-l10n-km:
-calligra-l10n-km:
-calligra-l10n-km:
-calligra-l10n-km:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lo b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lo
deleted file mode 100644
index cf8a8a502..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lo
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-lo: calligra-l10n-lo
-calligra-l10n-lo:
-calligra-l10n-lo: Lao language support for Calligra.
-calligra-l10n-lo:
-calligra-l10n-lo:
-calligra-l10n-lo:
-calligra-l10n-lo:
-calligra-l10n-lo:
-calligra-l10n-lo:
-calligra-l10n-lo:
-calligra-l10n-lo:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lt b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lt
deleted file mode 100644
index 7a1fd26c2..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-lt: calligra-l10n-lt
-calligra-l10n-lt:
-calligra-l10n-lt: Lithuanian language support for Calligra.
-calligra-l10n-lt:
-calligra-l10n-lt:
-calligra-l10n-lt:
-calligra-l10n-lt:
-calligra-l10n-lt:
-calligra-l10n-lt:
-calligra-l10n-lt:
-calligra-l10n-lt:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lv b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lv
deleted file mode 100644
index f6a031c11..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-lv
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-lv: calligra-l10n-lv
-calligra-l10n-lv:
-calligra-l10n-lv: Latvian language support for Calligra.
-calligra-l10n-lv:
-calligra-l10n-lv:
-calligra-l10n-lv:
-calligra-l10n-lv:
-calligra-l10n-lv:
-calligra-l10n-lv:
-calligra-l10n-lv:
-calligra-l10n-lv:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-mk b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-mk
deleted file mode 100644
index 8bbe754a9..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-mk: calligra-l10n-mk
-calligra-l10n-mk:
-calligra-l10n-mk: Macedonian language support for Calligra.
-calligra-l10n-mk:
-calligra-l10n-mk:
-calligra-l10n-mk:
-calligra-l10n-mk:
-calligra-l10n-mk:
-calligra-l10n-mk:
-calligra-l10n-mk:
-calligra-l10n-mk:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ms b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ms
deleted file mode 100644
index 3b86433db..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ms
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ms: calligra-l10n-ms
-calligra-l10n-ms:
-calligra-l10n-ms: Malay language support for Calligra.
-calligra-l10n-ms:
-calligra-l10n-ms:
-calligra-l10n-ms:
-calligra-l10n-ms:
-calligra-l10n-ms:
-calligra-l10n-ms:
-calligra-l10n-ms:
-calligra-l10n-ms:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-mt b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-mt
deleted file mode 100644
index 7fc7b0a23..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-mt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-mt: calligra-l10n-mt
-calligra-l10n-mt:
-calligra-l10n-mt: Maltese language support for Calligra.
-calligra-l10n-mt:
-calligra-l10n-mt:
-calligra-l10n-mt:
-calligra-l10n-mt:
-calligra-l10n-mt:
-calligra-l10n-mt:
-calligra-l10n-mt:
-calligra-l10n-mt:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nb b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nb
deleted file mode 100644
index e46faee9a..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nb
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-nb: calligra-l10n-nb
-calligra-l10n-nb:
-calligra-l10n-nb: Norwegian (Bokmaal) language support for Calligra.
-calligra-l10n-nb:
-calligra-l10n-nb:
-calligra-l10n-nb:
-calligra-l10n-nb:
-calligra-l10n-nb:
-calligra-l10n-nb:
-calligra-l10n-nb:
-calligra-l10n-nb:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nds b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nds
deleted file mode 100644
index 65b04171d..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nds
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-calligra-l10n-nds: calligra-l10n-nds
-calligra-l10n-nds:
-calligra-l10n-nds: Low Saxon language support for Calligra.
-calligra-l10n-nds:
-calligra-l10n-nds:
-calligra-l10n-nds:
-calligra-l10n-nds:
-calligra-l10n-nds:
-calligra-l10n-nds:
-calligra-l10n-nds:
-calligra-l10n-nds:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ne b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ne
deleted file mode 100644
index ce88c288c..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ne
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ne: calligra-l10n-ne
-calligra-l10n-ne:
-calligra-l10n-ne: Nepali language support for Calligra.
-calligra-l10n-ne:
-calligra-l10n-ne:
-calligra-l10n-ne:
-calligra-l10n-ne:
-calligra-l10n-ne:
-calligra-l10n-ne:
-calligra-l10n-ne:
-calligra-l10n-ne:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nl b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nl
deleted file mode 100644
index 198d23cf2..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nl
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-nl: calligra-l10n-nl
-calligra-l10n-nl:
-calligra-l10n-nl: Dutch language support for Calligra.
-calligra-l10n-nl:
-calligra-l10n-nl:
-calligra-l10n-nl:
-calligra-l10n-nl:
-calligra-l10n-nl:
-calligra-l10n-nl:
-calligra-l10n-nl:
-calligra-l10n-nl:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nn b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nn
deleted file mode 100644
index c6354d883..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-nn
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-nn: calligra-l10n-nn
-calligra-l10n-nn:
-calligra-l10n-nn: Norwegian (Nynorsk) language support for Calligra.
-calligra-l10n-nn:
-calligra-l10n-nn:
-calligra-l10n-nn:
-calligra-l10n-nn:
-calligra-l10n-nn:
-calligra-l10n-nn:
-calligra-l10n-nn:
-calligra-l10n-nn:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-no b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-no
deleted file mode 100644
index 0097eff36..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-no
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-no: calligra-l10n-no
-calligra-l10n-no:
-calligra-l10n-no: Norwegian (Bokmaal) language support for Calligra.
-calligra-l10n-no:
-calligra-l10n-no:
-calligra-l10n-no:
-calligra-l10n-no:
-calligra-l10n-no:
-calligra-l10n-no:
-calligra-l10n-no:
-calligra-l10n-no:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-no_NY b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-no_NY
deleted file mode 100644
index 512f6830a..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-no_NY
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                   |-----handy-ruler------------------------------------------------------|
-calligra-l10n-no_NY: calligra-l10n-no_NY
-calligra-l10n-no_NY:
-calligra-l10n-no_NY: Norwegian (Nynorsk) language support for Calligra.
-calligra-l10n-no_NY:
-calligra-l10n-no_NY:
-calligra-l10n-no_NY:
-calligra-l10n-no_NY:
-calligra-l10n-no_NY:
-calligra-l10n-no_NY:
-calligra-l10n-no_NY:
-calligra-l10n-no_NY:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pl b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pl
deleted file mode 100644
index a42566897..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pl
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-pl: calligra-l10n-pl
-calligra-l10n-pl:
-calligra-l10n-pl: Polish language support for Calligra.
-calligra-l10n-pl:
-calligra-l10n-pl:
-calligra-l10n-pl:
-calligra-l10n-pl:
-calligra-l10n-pl:
-calligra-l10n-pl:
-calligra-l10n-pl:
-calligra-l10n-pl:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pt b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pt
deleted file mode 100644
index 932c7d96f..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-pt: calligra-l10n-pt
-calligra-l10n-pt:
-calligra-l10n-pt: Portuguese language support for Calligra.
-calligra-l10n-pt:
-calligra-l10n-pt:
-calligra-l10n-pt:
-calligra-l10n-pt:
-calligra-l10n-pt:
-calligra-l10n-pt:
-calligra-l10n-pt:
-calligra-l10n-pt:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pt_BR b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pt_BR
deleted file mode 100644
index 7226e076b..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-pt_BR
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                   |-----handy-ruler------------------------------------------------------|
-calligra-l10n-pt_BR: calligra-l10n-pt_BR
-calligra-l10n-pt_BR:
-calligra-l10n-pt_BR: Brazil portuguese language support for Calligra.
-calligra-l10n-pt_BR:
-calligra-l10n-pt_BR:
-calligra-l10n-pt_BR:
-calligra-l10n-pt_BR:
-calligra-l10n-pt_BR:
-calligra-l10n-pt_BR:
-calligra-l10n-pt_BR:
-calligra-l10n-pt_BR:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ro b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ro
deleted file mode 100644
index f04543d9b..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ro
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ro: calligra-l10n-ro
-calligra-l10n-ro:
-calligra-l10n-ro: Romanian language support for Calligra.
-calligra-l10n-ro:
-calligra-l10n-ro:
-calligra-l10n-ro:
-calligra-l10n-ro:
-calligra-l10n-ro:
-calligra-l10n-ro:
-calligra-l10n-ro:
-calligra-l10n-ro:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ru b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ru
deleted file mode 100644
index 98b99dcc7..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ru
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ru: calligra-l10n-ru
-calligra-l10n-ru:
-calligra-l10n-ru: Russian language support for Calligra.
-calligra-l10n-ru:
-calligra-l10n-ru:
-calligra-l10n-ru:
-calligra-l10n-ru:
-calligra-l10n-ru:
-calligra-l10n-ru:
-calligra-l10n-ru:
-calligra-l10n-ru:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-se b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-se
deleted file mode 100644
index c63ddaca0..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-se
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-se: calligra-l10n-se
-calligra-l10n-se:
-calligra-l10n-se: Northern Sami language support for Calligra.
-calligra-l10n-se:
-calligra-l10n-se:
-calligra-l10n-se:
-calligra-l10n-se:
-calligra-l10n-se:
-calligra-l10n-se:
-calligra-l10n-se:
-calligra-l10n-se:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sk b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sk
deleted file mode 100644
index 078444341..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-sk: calligra-l10n-sk
-calligra-l10n-sk:
-calligra-l10n-sk: Slovak language support for Calligra.
-calligra-l10n-sk:
-calligra-l10n-sk:
-calligra-l10n-sk:
-calligra-l10n-sk:
-calligra-l10n-sk:
-calligra-l10n-sk:
-calligra-l10n-sk:
-calligra-l10n-sk:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sl b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sl
deleted file mode 100644
index 2c733cdee..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sl
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-sl: calligra-l10n-sl
-calligra-l10n-sl:
-calligra-l10n-sl: Slovenian language support for Calligra.
-calligra-l10n-sl:
-calligra-l10n-sl:
-calligra-l10n-sl:
-calligra-l10n-sl:
-calligra-l10n-sl:
-calligra-l10n-sl:
-calligra-l10n-sl:
-calligra-l10n-sl:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sr b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sr
deleted file mode 100644
index 0d6325604..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sr
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-sr: calligra-l10n-sr
-calligra-l10n-sr:
-calligra-l10n-sr: Serbian language support for Calligra.
-calligra-l10n-sr:
-calligra-l10n-sr:
-calligra-l10n-sr:
-calligra-l10n-sr:
-calligra-l10n-sr:
-calligra-l10n-sr:
-calligra-l10n-sr:
-calligra-l10n-sr:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sr@Latn b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sr@Latn
deleted file mode 100644
index 3c3c4718b..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sr@Latn
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                     |-----handy-ruler------------------------------------------------------|
-calligra-l10n-sr@Latn: calligra-l10n-sr@Latn
-calligra-l10n-sr@Latn:
-calligra-l10n-sr@Latn: Serbian in Latin script language support for Calligra.
-calligra-l10n-sr@Latn:
-calligra-l10n-sr@Latn:
-calligra-l10n-sr@Latn:
-calligra-l10n-sr@Latn:
-calligra-l10n-sr@Latn:
-calligra-l10n-sr@Latn:
-calligra-l10n-sr@Latn:
-calligra-l10n-sr@Latn:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sv b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sv
deleted file mode 100644
index 8a6c8a925..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-sv
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-sv: calligra-l10n-sv
-calligra-l10n-sv:
-calligra-l10n-sv: Swedish language support for Calligra.
-calligra-l10n-sv:
-calligra-l10n-sv:
-calligra-l10n-sv:
-calligra-l10n-sv:
-calligra-l10n-sv:
-calligra-l10n-sv:
-calligra-l10n-sv:
-calligra-l10n-sv:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ta b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ta
deleted file mode 100644
index e3539b678..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ta
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ta: calligra-l10n-ta
-calligra-l10n-ta:
-calligra-l10n-ta: Tamil language support for Calligra.
-calligra-l10n-ta:
-calligra-l10n-ta:
-calligra-l10n-ta:
-calligra-l10n-ta:
-calligra-l10n-ta:
-calligra-l10n-ta:
-calligra-l10n-ta:
-calligra-l10n-ta:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-tg b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-tg
deleted file mode 100644
index ed6a6bf92..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-tg
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-tg: calligra-l10n-tg
-calligra-l10n-tg:
-calligra-l10n-tg: Tajik language support for Calligra.
-calligra-l10n-tg:
-calligra-l10n-tg:
-calligra-l10n-tg:
-calligra-l10n-tg:
-calligra-l10n-tg:
-calligra-l10n-tg:
-calligra-l10n-tg:
-calligra-l10n-tg:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-th b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-th
deleted file mode 100644
index 22327ee18..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-th
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-th: calligra-l10n-th
-calligra-l10n-th:
-calligra-l10n-th: Thai language support for Calligra.
-calligra-l10n-th:
-calligra-l10n-th:
-calligra-l10n-th:
-calligra-l10n-th:
-calligra-l10n-th:
-calligra-l10n-th:
-calligra-l10n-th:
-calligra-l10n-th:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-tr b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-tr
deleted file mode 100644
index 144676094..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-tr
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-tr: calligra-l10n-tr
-calligra-l10n-tr:
-calligra-l10n-tr: Turkish language support for Calligra.
-calligra-l10n-tr:
-calligra-l10n-tr:
-calligra-l10n-tr:
-calligra-l10n-tr:
-calligra-l10n-tr:
-calligra-l10n-tr:
-calligra-l10n-tr:
-calligra-l10n-tr:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-uk b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-uk
deleted file mode 100644
index 1dc205147..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-uk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-uk: calligra-l10n-uk
-calligra-l10n-uk:
-calligra-l10n-uk: Ukrainian language support for Calligra.
-calligra-l10n-uk:
-calligra-l10n-uk:
-calligra-l10n-uk:
-calligra-l10n-uk:
-calligra-l10n-uk:
-calligra-l10n-uk:
-calligra-l10n-uk:
-calligra-l10n-uk:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-uz b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-uz
deleted file mode 100644
index 8628d79e7..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-uz
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-uz: calligra-l10n-uz
-calligra-l10n-uz:
-calligra-l10n-uz: Uzbek language support for Calligra.
-calligra-l10n-uz:
-calligra-l10n-uz:
-calligra-l10n-uz:
-calligra-l10n-uz:
-calligra-l10n-uz:
-calligra-l10n-uz:
-calligra-l10n-uz:
-calligra-l10n-uz:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ven b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ven
deleted file mode 100644
index c62947c0f..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-ven
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-calligra-l10n-ven: calligra-l10n-ven
-calligra-l10n-ven:
-calligra-l10n-ven: Venda language support for Calligra.
-calligra-l10n-ven:
-calligra-l10n-ven:
-calligra-l10n-ven:
-calligra-l10n-ven:
-calligra-l10n-ven:
-calligra-l10n-ven:
-calligra-l10n-ven:
-calligra-l10n-ven:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-wa b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-wa
deleted file mode 100644
index 4da625a8c..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-wa
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-wa: calligra-l10n-wa
-calligra-l10n-wa:
-calligra-l10n-wa: Walloon language support for Calligra.
-calligra-l10n-wa:
-calligra-l10n-wa:
-calligra-l10n-wa:
-calligra-l10n-wa:
-calligra-l10n-wa:
-calligra-l10n-wa:
-calligra-l10n-wa:
-calligra-l10n-wa:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-xh b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-xh
deleted file mode 100644
index 89ecfdfa4..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-xh
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-xh: calligra-l10n-xh
-calligra-l10n-xh:
-calligra-l10n-xh: Xhosa language support for Calligra.
-calligra-l10n-xh:
-calligra-l10n-xh:
-calligra-l10n-xh:
-calligra-l10n-xh:
-calligra-l10n-xh:
-calligra-l10n-xh:
-calligra-l10n-xh:
-calligra-l10n-xh:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zh_CN b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zh_CN
deleted file mode 100644
index 9fb17ead9..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zh_CN
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                   |-----handy-ruler------------------------------------------------------|
-calligra-l10n-zh_CN: calligra-l10n-zh_CN
-calligra-l10n-zh_CN:
-calligra-l10n-zh_CN: Simplified Chinese language support for Calligra.
-calligra-l10n-zh_CN:
-calligra-l10n-zh_CN:
-calligra-l10n-zh_CN:
-calligra-l10n-zh_CN:
-calligra-l10n-zh_CN:
-calligra-l10n-zh_CN:
-calligra-l10n-zh_CN:
-calligra-l10n-zh_CN:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zh_TW b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zh_TW
deleted file mode 100644
index 42b108095..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zh_TW
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                   |-----handy-ruler------------------------------------------------------|
-calligra-l10n-zh_TW: calligra-l10n-zh_TW
-calligra-l10n-zh_TW:
-calligra-l10n-zh_TW: Chinese language support for Calligra.
-calligra-l10n-zh_TW:
-calligra-l10n-zh_TW:
-calligra-l10n-zh_TW:
-calligra-l10n-zh_TW:
-calligra-l10n-zh_TW:
-calligra-l10n-zh_TW:
-calligra-l10n-zh_TW:
-calligra-l10n-zh_TW:
diff --git a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zu b/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zu
deleted file mode 100644
index fade4b034..000000000
--- a/source/kdei/calligra-l10n/slack-desc/slack-desc.calligra-l10n-zu
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-calligra-l10n-zu: calligra-l10n-zu
-calligra-l10n-zu:
-calligra-l10n-zu: Zulu language support for Calligra.
-calligra-l10n-zu:
-calligra-l10n-zu:
-calligra-l10n-zu:
-calligra-l10n-zu:
-calligra-l10n-zu:
-calligra-l10n-zu:
-calligra-l10n-zu:
-calligra-l10n-zu:
diff --git a/source/kdei/kde-l10n/kde-l10n.SlackBuild b/source/kdei/kde-l10n/kde-l10n.SlackBuild
deleted file mode 100755
index dda420582..000000000
--- a/source/kdei/kde-l10n/kde-l10n.SlackBuild
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008  Robby Workman  Northport, AL, USA
-# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#  This script should build any of the language packs if run with (for example):
-#    PKGLANG=de ./kde-l10n.SlackBuild
-#  You should be able to build all of them with something like this:
-#    for i in $(cat languages) ; do PKGLANG=$i ./kde-l10n.SlackBuild ; done
-# If ./languages is missing and this script is called without options, the
-# default is to create an up-to-date ./languages list and build all the
-# language packs.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-if [ ! -r ./languages ]; then
-  for file in kde-l10n*xz ; do
-    echo $file | cut -f 3 -d - >> ./languages
-  done
-fi
-
-[ -z $VERSION ] && export VERSION=4.14.3
-[ -z $ARCH ] && export ARCH=noarch
-[ -z $BUILD ] && export BUILD=1
-
-# Use this as CFLAGS and CXXFLAGS:
-if [ -z "$SLKCFLAGS" ]; then
-  if [ "$ARCH" = "i486" ]; then
-    export SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  elif [ "$ARCH" = "s390" ]; then
-    export SLKCFLAGS="-O2"
-  elif [ "$ARCH" = "x86_64" ]; then
-    export SLKCFLAGS="-O2 -fPIC"
-  elif [ "$ARCH" = "armv7hl" ]; then
-    export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  else
-    export SLKCFLAGS="-O2"
-  fi
-fi
-
-# Get the kde environment variables
-[ -d kdebase ] && . ./kdebase/profile.d/kde.sh
-
-# Set the config option variables if they are not already set:
-[ -r ../KDE.options ] && . ../KDE.options
-
-TMP=${TMP:-/tmp/kde_build}
-
-# This function will insert missing kdepim translations from kde-l10n-4.4.5:
-insert_kdepim() {
-  if [ -r $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.tar.xz ]; then
-    tar xvf $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.tar.xz
-  fi
-  for dir in $(find . -type d -name messages) $(find . -type d -name docs) ; do
-    ( cd $dir
-      if [ -d kdepim ]; then
-        echo "add_subdirectory( kdepim )" >> CMakeLists.txt.new
-      fi
-      if [ -r CMakeLists.txt ]; then
-        cat CMakeLists.txt >> CMakeLists.txt.new
-        mv CMakeLists.txt.new CMakeLists.txt
-      else
-        rm -f CMakeLists.txt.new
-      fi
-    )
-  done
-  # Update DTD specification.  This will fix some of the issues...
-  sed -i -e "s/V4.1.2-Based/V4.2-Based/g" $(grep -lr "V4.1.2-Based" *)
-  sed -i -e "s/V4.1-Based/V4.2-Based/g" $(grep -lr "V4.1-Based" *)
-  sed -i -e "s/V4.2-Based Variant V1.0/V4.2-Based Variant V1.1/g" $(grep -lr "V4.2-Based Variant V1.0" *)
-  if ls $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.*.diff.gz 1> /dev/null 2> /dev/null ; then
-    for patch in $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.*.diff.gz ; do
-      zcat $patch | patch -p1 --verbose || exit 1
-    done
-  fi
-}
-
-make_language_pack() {
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION 
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
-cd $PKGNAM-$VERSION || exit 1
-insert_kdepim;
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-mkdir -p build
-( cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-  make || exit 1
-  make install DESTDIR=$PKG || exit 1
-) || touch $TMP/$PKGNAM.failed
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    find . -type f -exec gzip -9 {} \+
-  )
-fi
-mkdir -p $PKG/install
-cat $CWD/slack-desc/slack-desc.kde-l10n-$PKGLANG > $PKG/install/slack-desc
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-}
-
-if [ -z $PKGLANG ]; then
-  for PKGLANG in $(cat languages) ; do
-    PKGNAM=kde-l10n-$PKGLANG
-    # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-    # the name of the created package would be, and then exit. This information
-    # could be useful to other scripts.
-    if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-      echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-      continue
-    fi
-    PKG=$TMP/package-kde-l10n-$PKGLANG
-    # The global options may be overridden here (if needed):
-    [ -r ./local.options/$PKGLANG ] && . ./local.options/$PKGLANG
-    make_language_pack;
-  done
-else
-  PKGNAM=kde-l10n-$PKGLANG
-  # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-  # the name of the created package would be, and then exit. This information
-  # could be useful to other scripts.
-  if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-    echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-    exit 0
-  fi
-  PKG=$TMP/package-kde-l10n-$PKGLANG
-  # The global options may be overridden here (if needed):
-  [ -r ./local.options/$PKGLANG ] && . ./local.options/$PKGLANG
-  make_language_pack;
-fi
-
diff --git a/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh b/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh
deleted file mode 100644
index 1c9162782..000000000
--- a/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# This script was used to extract the kdepim parts from the last kde-l10n
-# release that contained them.  The resulting kdepim-l10n sources will be
-# merged into our language packages.
-
-# This should be run in the directory containing the kde-l10n-*-4.4.5
-# source tarballs that you wish to create kdepim-l10n archives from.
-
-for file in kde-l10n*.tar.bz2 ; do
-  rm -rf $(basename $file .tar.bz2) kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5
-  echo "Extracting $file"
-  tar xf $file
-  mkdir kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5
-  ( cd $(basename $file .tar.bz2)
-    find . -name "kdepim" -type d -exec cp -a --parents "{}" ../kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5 \;
-  )
-  ( cd kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5
-    tar cf ../kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5.tar .
-  )
-  rm -f kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5.tar.bz2
-  bzip2 -9 kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5.tar
-  rm -r $(basename $file .tar.bz2) kdepim-l10n-$(echo $file | cut -f 3 -d -)-4.4.5
-done
diff --git a/source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff.gz.defunct b/source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff.gz.defunct
deleted file mode 100644
index 2ccf131b4..000000000
--- a/source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff.gz.defunct
+++ /dev/null
diff --git a/source/kdei/kde-l10n/languages b/source/kdei/kde-l10n/languages
deleted file mode 100644
index f4f96380e..000000000
--- a/source/kdei/kde-l10n/languages
+++ /dev/null
@@ -1,53 +0,0 @@
-ar
-bg
-bs
-ca
-ca@valencia
-cs
-da
-de
-el
-en_GB
-es
-et
-eu
-fa
-fi
-fr
-ga
-gl
-he
-hi
-hr
-hu
-ia
-id
-is
-it
-ja
-kk
-km
-ko
-lt
-lv
-mr
-nb
-nds
-nl
-nn
-pa
-pl
-pt
-pt_BR
-ro
-ru
-sk
-sl
-sr
-sv
-tr
-ug
-uk
-wa
-zh_CN
-zh_TW
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ar b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ar
deleted file mode 100644
index 2c2a240d1..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ar
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ar: kde-l10n-ar
-kde-l10n-ar:
-kde-l10n-ar: Arabic language support for KDE.
-kde-l10n-ar:
-kde-l10n-ar:
-kde-l10n-ar:
-kde-l10n-ar:
-kde-l10n-ar:
-kde-l10n-ar:
-kde-l10n-ar:
-kde-l10n-ar:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bg b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bg
deleted file mode 100644
index 95e616738..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-bg: kde-l10n-bg
-kde-l10n-bg:
-kde-l10n-bg: Bulgarian language support for KDE.
-kde-l10n-bg:
-kde-l10n-bg:
-kde-l10n-bg:
-kde-l10n-bg:
-kde-l10n-bg:
-kde-l10n-bg:
-kde-l10n-bg:
-kde-l10n-bg:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bn_IN b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bn_IN
deleted file mode 100644
index cf11a21c0..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bn_IN
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kde-l10n-bn_IN: kde-l10n-bn_IN
-kde-l10n-bn_IN:
-kde-l10n-bn_IN: Bengali language support for KDE.
-kde-l10n-bn_IN:
-kde-l10n-bn_IN:
-kde-l10n-bn_IN:
-kde-l10n-bn_IN:
-kde-l10n-bn_IN:
-kde-l10n-bn_IN:
-kde-l10n-bn_IN:
-kde-l10n-bn_IN:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bs b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bs
deleted file mode 100644
index 202f5a1b7..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-bs: kde-l10n-bs
-kde-l10n-bs:
-kde-l10n-bs: Bosnian language support for KDE.
-kde-l10n-bs:
-kde-l10n-bs:
-kde-l10n-bs:
-kde-l10n-bs:
-kde-l10n-bs:
-kde-l10n-bs:
-kde-l10n-bs:
-kde-l10n-bs:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca
deleted file mode 100644
index 300e8a039..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ca: kde-l10n-ca
-kde-l10n-ca:
-kde-l10n-ca: Catalan language support for KDE.
-kde-l10n-ca:
-kde-l10n-ca:
-kde-l10n-ca:
-kde-l10n-ca:
-kde-l10n-ca:
-kde-l10n-ca:
-kde-l10n-ca:
-kde-l10n-ca:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca@valencia b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca@valencia
deleted file mode 100644
index d66ecb120..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca@valencia
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                    |-----handy-ruler------------------------------------------------------|
-kde-l10n-ca@valencia: kde-l10n-ca@valencia
-kde-l10n-ca@valencia:
-kde-l10n-ca@valencia: Catalan (Valencian) language support for KDE.
-kde-l10n-ca@valencia:
-kde-l10n-ca@valencia:
-kde-l10n-ca@valencia:
-kde-l10n-ca@valencia:
-kde-l10n-ca@valencia:
-kde-l10n-ca@valencia:
-kde-l10n-ca@valencia:
-kde-l10n-ca@valencia:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-cs b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-cs
deleted file mode 100644
index b8c78d692..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-cs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-cs: kde-l10n-cs
-kde-l10n-cs:
-kde-l10n-cs: Czech language support for KDE.
-kde-l10n-cs:
-kde-l10n-cs:
-kde-l10n-cs:
-kde-l10n-cs:
-kde-l10n-cs:
-kde-l10n-cs:
-kde-l10n-cs:
-kde-l10n-cs:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-csb b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-csb
deleted file mode 100644
index a1edbab74..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-csb
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kde-l10n-csb: kde-l10n-csb
-kde-l10n-csb:
-kde-l10n-csb: Kashubian language support for KDE.
-kde-l10n-csb:
-kde-l10n-csb:
-kde-l10n-csb:
-kde-l10n-csb:
-kde-l10n-csb:
-kde-l10n-csb:
-kde-l10n-csb:
-kde-l10n-csb:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-da b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-da
deleted file mode 100644
index 24064640b..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-da
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-da: kde-l10n-da
-kde-l10n-da:
-kde-l10n-da: Danish language support for KDE.
-kde-l10n-da:
-kde-l10n-da:
-kde-l10n-da:
-kde-l10n-da:
-kde-l10n-da:
-kde-l10n-da:
-kde-l10n-da:
-kde-l10n-da:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-de b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-de
deleted file mode 100644
index 54ce431b7..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-de
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-de: kde-l10n-de
-kde-l10n-de:
-kde-l10n-de: German language support for KDE.
-kde-l10n-de:
-kde-l10n-de:
-kde-l10n-de:
-kde-l10n-de:
-kde-l10n-de:
-kde-l10n-de:
-kde-l10n-de:
-kde-l10n-de:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-el b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-el
deleted file mode 100644
index 1c77b14f4..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-el
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-el: kde-l10n-el
-kde-l10n-el:
-kde-l10n-el: Greek language support for KDE.
-kde-l10n-el:
-kde-l10n-el:
-kde-l10n-el:
-kde-l10n-el:
-kde-l10n-el:
-kde-l10n-el:
-kde-l10n-el:
-kde-l10n-el:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-en_GB b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-en_GB
deleted file mode 100644
index 3955cc43d..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-en_GB
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kde-l10n-en_GB: kde-l10n-en_GB
-kde-l10n-en_GB:
-kde-l10n-en_GB: English (UK) language support for KDE.
-kde-l10n-en_GB:
-kde-l10n-en_GB:
-kde-l10n-en_GB:
-kde-l10n-en_GB:
-kde-l10n-en_GB:
-kde-l10n-en_GB:
-kde-l10n-en_GB:
-kde-l10n-en_GB:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eo b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eo
deleted file mode 100644
index 0c259fa00..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eo
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-eo: kde-l10n-eo
-kde-l10n-eo:
-kde-l10n-eo: Esperanto language support for KDE.
-kde-l10n-eo:
-kde-l10n-eo:
-kde-l10n-eo:
-kde-l10n-eo:
-kde-l10n-eo:
-kde-l10n-eo:
-kde-l10n-eo:
-kde-l10n-eo:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-es b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-es
deleted file mode 100644
index d17fe01be..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-es
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-es: kde-l10n-es
-kde-l10n-es:
-kde-l10n-es: Spanish language support for KDE.
-kde-l10n-es:
-kde-l10n-es:
-kde-l10n-es:
-kde-l10n-es:
-kde-l10n-es:
-kde-l10n-es:
-kde-l10n-es:
-kde-l10n-es:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-et b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-et
deleted file mode 100644
index fe77141d6..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-et
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-et: kde-l10n-et
-kde-l10n-et:
-kde-l10n-et: Estonian language support for KDE.
-kde-l10n-et:
-kde-l10n-et:
-kde-l10n-et:
-kde-l10n-et:
-kde-l10n-et:
-kde-l10n-et:
-kde-l10n-et:
-kde-l10n-et:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eu b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eu
deleted file mode 100644
index 033869cc6..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-eu
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-eu: kde-l10n-eu
-kde-l10n-eu:
-kde-l10n-eu: Basque language support for KDE.
-kde-l10n-eu:
-kde-l10n-eu:
-kde-l10n-eu:
-kde-l10n-eu:
-kde-l10n-eu:
-kde-l10n-eu:
-kde-l10n-eu:
-kde-l10n-eu:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fa b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fa
deleted file mode 100644
index 293f497d0..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fa
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-fa: kde-l10n-fa
-kde-l10n-fa:
-kde-l10n-fa: Farsi language support for KDE.
-kde-l10n-fa:
-kde-l10n-fa:
-kde-l10n-fa:
-kde-l10n-fa:
-kde-l10n-fa:
-kde-l10n-fa:
-kde-l10n-fa:
-kde-l10n-fa:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fi b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fi
deleted file mode 100644
index d1a197fcf..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fi
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-fi: kde-l10n-fi
-kde-l10n-fi:
-kde-l10n-fi: Finnish language support for KDE.
-kde-l10n-fi:
-kde-l10n-fi:
-kde-l10n-fi:
-kde-l10n-fi:
-kde-l10n-fi:
-kde-l10n-fi:
-kde-l10n-fi:
-kde-l10n-fi:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fr b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fr
deleted file mode 100644
index 4dd64318b..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fr
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-fr: kde-l10n-fr
-kde-l10n-fr:
-kde-l10n-fr: French language support for KDE.
-kde-l10n-fr:
-kde-l10n-fr:
-kde-l10n-fr:
-kde-l10n-fr:
-kde-l10n-fr:
-kde-l10n-fr:
-kde-l10n-fr:
-kde-l10n-fr:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fy b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fy
deleted file mode 100644
index 3e0466758..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fy
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-fy: kde-l10n-fy
-kde-l10n-fy:
-kde-l10n-fy: Abkhasysk language support for KDE.
-kde-l10n-fy:
-kde-l10n-fy:
-kde-l10n-fy:
-kde-l10n-fy:
-kde-l10n-fy:
-kde-l10n-fy:
-kde-l10n-fy:
-kde-l10n-fy:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ga b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ga
deleted file mode 100644
index b26424e6d..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ga
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ga: kde-l10n-ga
-kde-l10n-ga:
-kde-l10n-ga: Irish language support for KDE.
-kde-l10n-ga:
-kde-l10n-ga:
-kde-l10n-ga:
-kde-l10n-ga:
-kde-l10n-ga:
-kde-l10n-ga:
-kde-l10n-ga:
-kde-l10n-ga:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gl b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gl
deleted file mode 100644
index 5e5503c7c..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gl
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-gl: kde-l10n-gl
-kde-l10n-gl:
-kde-l10n-gl: Galician language support for KDE.
-kde-l10n-gl:
-kde-l10n-gl:
-kde-l10n-gl:
-kde-l10n-gl:
-kde-l10n-gl:
-kde-l10n-gl:
-kde-l10n-gl:
-kde-l10n-gl:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gu b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gu
deleted file mode 100644
index 20f4aca13..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-gu
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-gu: kde-l10n-gu
-kde-l10n-gu:
-kde-l10n-gu: Gujarati language support for KDE.
-kde-l10n-gu:
-kde-l10n-gu:
-kde-l10n-gu:
-kde-l10n-gu:
-kde-l10n-gu:
-kde-l10n-gu:
-kde-l10n-gu:
-kde-l10n-gu:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-he b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-he
deleted file mode 100644
index c84dbe106..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-he
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-he: kde-l10n-he
-kde-l10n-he:
-kde-l10n-he: Hebrew language support for KDE.
-kde-l10n-he:
-kde-l10n-he:
-kde-l10n-he:
-kde-l10n-he:
-kde-l10n-he:
-kde-l10n-he:
-kde-l10n-he:
-kde-l10n-he:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hi b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hi
deleted file mode 100644
index f2103a231..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hi
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-hi: kde-l10n-hi
-kde-l10n-hi:
-kde-l10n-hi: Hindi language support for KDE.
-kde-l10n-hi:
-kde-l10n-hi:
-kde-l10n-hi:
-kde-l10n-hi:
-kde-l10n-hi:
-kde-l10n-hi:
-kde-l10n-hi:
-kde-l10n-hi:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hne b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hne
deleted file mode 100644
index 627c110d5..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hne
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kde-l10n-hne: kde-l10n-hne
-kde-l10n-hne:
-kde-l10n-hne: Chhattisgarhi language support for KDE.
-kde-l10n-hne:
-kde-l10n-hne:
-kde-l10n-hne:
-kde-l10n-hne:
-kde-l10n-hne:
-kde-l10n-hne:
-kde-l10n-hne:
-kde-l10n-hne:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hr b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hr
deleted file mode 100644
index bc9c6f990..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hr
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-hr: kde-l10n-hr
-kde-l10n-hr:
-kde-l10n-hr: Croatian language support for KDE.
-kde-l10n-hr:
-kde-l10n-hr:
-kde-l10n-hr:
-kde-l10n-hr:
-kde-l10n-hr:
-kde-l10n-hr:
-kde-l10n-hr:
-kde-l10n-hr:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hu b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hu
deleted file mode 100644
index fb8384be9..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-hu
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-hu: kde-l10n-hu
-kde-l10n-hu:
-kde-l10n-hu: Hungarian language support for KDE.
-kde-l10n-hu:
-kde-l10n-hu:
-kde-l10n-hu:
-kde-l10n-hu:
-kde-l10n-hu:
-kde-l10n-hu:
-kde-l10n-hu:
-kde-l10n-hu:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ia b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ia
deleted file mode 100644
index 3094e8684..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ia
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ia: kde-l10n-ia
-kde-l10n-ia:
-kde-l10n-ia: Interlingua language support for KDE.
-kde-l10n-ia:
-kde-l10n-ia:
-kde-l10n-ia:
-kde-l10n-ia:
-kde-l10n-ia:
-kde-l10n-ia:
-kde-l10n-ia:
-kde-l10n-ia:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-id b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-id
deleted file mode 100644
index 1629bd84d..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-id
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-id: kde-l10n-id
-kde-l10n-id:
-kde-l10n-id: Indonesian language support for KDE.
-kde-l10n-id:
-kde-l10n-id:
-kde-l10n-id:
-kde-l10n-id:
-kde-l10n-id:
-kde-l10n-id:
-kde-l10n-id:
-kde-l10n-id:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-is b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-is
deleted file mode 100644
index 39ae8e8ca..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-is
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-is: kde-l10n-is
-kde-l10n-is:
-kde-l10n-is: Icelandic language support for KDE.
-kde-l10n-is:
-kde-l10n-is:
-kde-l10n-is:
-kde-l10n-is:
-kde-l10n-is:
-kde-l10n-is:
-kde-l10n-is:
-kde-l10n-is:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-it b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-it
deleted file mode 100644
index d6af3ae3c..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-it
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-it: kde-l10n-it
-kde-l10n-it:
-kde-l10n-it: Italian language support for KDE.
-kde-l10n-it:
-kde-l10n-it:
-kde-l10n-it:
-kde-l10n-it:
-kde-l10n-it:
-kde-l10n-it:
-kde-l10n-it:
-kde-l10n-it:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ja b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ja
deleted file mode 100644
index 94783bbd1..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ja
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ja: kde-l10n-ja
-kde-l10n-ja:
-kde-l10n-ja: Japanese language support for KDE.
-kde-l10n-ja:
-kde-l10n-ja:
-kde-l10n-ja:
-kde-l10n-ja:
-kde-l10n-ja:
-kde-l10n-ja:
-kde-l10n-ja:
-kde-l10n-ja:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kk b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kk
deleted file mode 100644
index 3c23f859f..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-kk: kde-l10n-kk
-kde-l10n-kk:
-kde-l10n-kk: Kazakh language support for KDE.
-kde-l10n-kk:
-kde-l10n-kk:
-kde-l10n-kk:
-kde-l10n-kk:
-kde-l10n-kk:
-kde-l10n-kk:
-kde-l10n-kk:
-kde-l10n-kk:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-km b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-km
deleted file mode 100644
index 87b31349c..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-km
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-km: kde-l10n-km
-kde-l10n-km:
-kde-l10n-km: Khmer language support for KDE.
-kde-l10n-km:
-kde-l10n-km:
-kde-l10n-km:
-kde-l10n-km:
-kde-l10n-km:
-kde-l10n-km:
-kde-l10n-km:
-kde-l10n-km:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kn b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kn
deleted file mode 100644
index 591684db5..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-kn
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-kn: kde-l10n-kn
-kde-l10n-kn:
-kde-l10n-kn: Kannada language support for KDE.
-kde-l10n-kn:
-kde-l10n-kn:
-kde-l10n-kn:
-kde-l10n-kn:
-kde-l10n-kn:
-kde-l10n-kn:
-kde-l10n-kn:
-kde-l10n-kn:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ko b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ko
deleted file mode 100644
index 063b5a6c0..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ko
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ko: kde-l10n-ko
-kde-l10n-ko:
-kde-l10n-ko: Korean language support for KDE.
-kde-l10n-ko:
-kde-l10n-ko:
-kde-l10n-ko:
-kde-l10n-ko:
-kde-l10n-ko:
-kde-l10n-ko:
-kde-l10n-ko:
-kde-l10n-ko:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ku b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ku
deleted file mode 100644
index b1995425b..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ku
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ku: kde-l10n-ku
-kde-l10n-ku:
-kde-l10n-ku: Kurdish language support for KDE.
-kde-l10n-ku:
-kde-l10n-ku:
-kde-l10n-ku:
-kde-l10n-ku:
-kde-l10n-ku:
-kde-l10n-ku:
-kde-l10n-ku:
-kde-l10n-ku:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lt b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lt
deleted file mode 100644
index 081514e10..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-lt: kde-l10n-lt
-kde-l10n-lt:
-kde-l10n-lt: Lithuanian language support for KDE.
-kde-l10n-lt:
-kde-l10n-lt:
-kde-l10n-lt:
-kde-l10n-lt:
-kde-l10n-lt:
-kde-l10n-lt:
-kde-l10n-lt:
-kde-l10n-lt:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lv b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lv
deleted file mode 100644
index fd39a8ba8..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-lv
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-lv: kde-l10n-lv
-kde-l10n-lv:
-kde-l10n-lv: Latvian language support for KDE.
-kde-l10n-lv:
-kde-l10n-lv:
-kde-l10n-lv:
-kde-l10n-lv:
-kde-l10n-lv:
-kde-l10n-lv:
-kde-l10n-lv:
-kde-l10n-lv:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mai b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mai
deleted file mode 100644
index 5926c5951..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mai
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kde-l10n-mai: kde-l10n-mai
-kde-l10n-mai:
-kde-l10n-mai: Maithili language support for KDE.
-kde-l10n-mai:
-kde-l10n-mai:
-kde-l10n-mai:
-kde-l10n-mai:
-kde-l10n-mai:
-kde-l10n-mai:
-kde-l10n-mai:
-kde-l10n-mai:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mk b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mk
deleted file mode 100644
index e0eb2a72f..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-mk: kde-l10n-mk
-kde-l10n-mk:
-kde-l10n-mk: Macedonian language support for KDE.
-kde-l10n-mk:
-kde-l10n-mk:
-kde-l10n-mk:
-kde-l10n-mk:
-kde-l10n-mk:
-kde-l10n-mk:
-kde-l10n-mk:
-kde-l10n-mk:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ml b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ml
deleted file mode 100644
index 233bce3e9..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ml
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ml: kde-l10n-ml
-kde-l10n-ml:
-kde-l10n-ml: Malayalam language support for KDE.
-kde-l10n-ml:
-kde-l10n-ml:
-kde-l10n-ml:
-kde-l10n-ml:
-kde-l10n-ml:
-kde-l10n-ml:
-kde-l10n-ml:
-kde-l10n-ml:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mr b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mr
deleted file mode 100644
index 4c018c574..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-mr
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-mr: kde-l10n-mr
-kde-l10n-mr:
-kde-l10n-mr: Marathi language support for KDE.
-kde-l10n-mr:
-kde-l10n-mr:
-kde-l10n-mr:
-kde-l10n-mr:
-kde-l10n-mr:
-kde-l10n-mr:
-kde-l10n-mr:
-kde-l10n-mr:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nb b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nb
deleted file mode 100644
index 26ed3d980..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nb
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-nb: kde-l10n-nb
-kde-l10n-nb:
-kde-l10n-nb: Norwegian (Bokmaal) language support for KDE.
-kde-l10n-nb:
-kde-l10n-nb:
-kde-l10n-nb:
-kde-l10n-nb:
-kde-l10n-nb:
-kde-l10n-nb:
-kde-l10n-nb:
-kde-l10n-nb:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nds b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nds
deleted file mode 100644
index 9416ab177..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nds
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-kde-l10n-nds: kde-l10n-nds
-kde-l10n-nds:
-kde-l10n-nds: Low Saxon language support for KDE.
-kde-l10n-nds:
-kde-l10n-nds:
-kde-l10n-nds:
-kde-l10n-nds:
-kde-l10n-nds:
-kde-l10n-nds:
-kde-l10n-nds:
-kde-l10n-nds:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nl b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nl
deleted file mode 100644
index 182922bfd..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nl
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-nl: kde-l10n-nl
-kde-l10n-nl:
-kde-l10n-nl: Dutch language support for KDE.
-kde-l10n-nl:
-kde-l10n-nl:
-kde-l10n-nl:
-kde-l10n-nl:
-kde-l10n-nl:
-kde-l10n-nl:
-kde-l10n-nl:
-kde-l10n-nl:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nn b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nn
deleted file mode 100644
index 661b8d082..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-nn
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-nn: kde-l10n-nn
-kde-l10n-nn:
-kde-l10n-nn: Norwegian (Nynorsk) language support for KDE.
-kde-l10n-nn:
-kde-l10n-nn:
-kde-l10n-nn:
-kde-l10n-nn:
-kde-l10n-nn:
-kde-l10n-nn:
-kde-l10n-nn:
-kde-l10n-nn:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pa b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pa
deleted file mode 100644
index e79f2cfe4..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pa
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-pa: kde-l10n-pa
-kde-l10n-pa:
-kde-l10n-pa: Punjabi language support for KDE.
-kde-l10n-pa:
-kde-l10n-pa:
-kde-l10n-pa:
-kde-l10n-pa:
-kde-l10n-pa:
-kde-l10n-pa:
-kde-l10n-pa:
-kde-l10n-pa:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pl b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pl
deleted file mode 100644
index b269c6156..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pl
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-pl: kde-l10n-pl
-kde-l10n-pl:
-kde-l10n-pl: Polish language support for KDE.
-kde-l10n-pl:
-kde-l10n-pl:
-kde-l10n-pl:
-kde-l10n-pl:
-kde-l10n-pl:
-kde-l10n-pl:
-kde-l10n-pl:
-kde-l10n-pl:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt
deleted file mode 100644
index f35e7e65d..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-pt: kde-l10n-pt
-kde-l10n-pt:
-kde-l10n-pt: Portuguese language support for KDE.
-kde-l10n-pt:
-kde-l10n-pt:
-kde-l10n-pt:
-kde-l10n-pt:
-kde-l10n-pt:
-kde-l10n-pt:
-kde-l10n-pt:
-kde-l10n-pt:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt_BR b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt_BR
deleted file mode 100644
index dfb144764..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-pt_BR
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kde-l10n-pt_BR: kde-l10n-pt_BR
-kde-l10n-pt_BR:
-kde-l10n-pt_BR: Brazilian Portuguese language support for KDE.
-kde-l10n-pt_BR:
-kde-l10n-pt_BR:
-kde-l10n-pt_BR:
-kde-l10n-pt_BR:
-kde-l10n-pt_BR:
-kde-l10n-pt_BR:
-kde-l10n-pt_BR:
-kde-l10n-pt_BR:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ro b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ro
deleted file mode 100644
index 64bf733a6..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ro
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ro: kde-l10n-ro
-kde-l10n-ro:
-kde-l10n-ro: Romanian language support for KDE.
-kde-l10n-ro:
-kde-l10n-ro:
-kde-l10n-ro:
-kde-l10n-ro:
-kde-l10n-ro:
-kde-l10n-ro:
-kde-l10n-ro:
-kde-l10n-ro:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ru b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ru
deleted file mode 100644
index 6a3ff2f4f..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ru
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ru: kde-l10n-ru
-kde-l10n-ru:
-kde-l10n-ru: Russian language support for KDE.
-kde-l10n-ru:
-kde-l10n-ru:
-kde-l10n-ru:
-kde-l10n-ru:
-kde-l10n-ru:
-kde-l10n-ru:
-kde-l10n-ru:
-kde-l10n-ru:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-si b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-si
deleted file mode 100644
index 526ea8110..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-si
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-si: kde-l10n-si
-kde-l10n-si:
-kde-l10n-si: Sinhala language support for KDE.
-kde-l10n-si:
-kde-l10n-si:
-kde-l10n-si:
-kde-l10n-si:
-kde-l10n-si:
-kde-l10n-si:
-kde-l10n-si:
-kde-l10n-si:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sk b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sk
deleted file mode 100644
index 710ecb9a7..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-sk: kde-l10n-sk
-kde-l10n-sk:
-kde-l10n-sk: Slovak language support for KDE.
-kde-l10n-sk:
-kde-l10n-sk:
-kde-l10n-sk:
-kde-l10n-sk:
-kde-l10n-sk:
-kde-l10n-sk:
-kde-l10n-sk:
-kde-l10n-sk:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sl b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sl
deleted file mode 100644
index bbf62a4ca..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sl
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-sl: kde-l10n-sl
-kde-l10n-sl:
-kde-l10n-sl: Slovenian language support for KDE.
-kde-l10n-sl:
-kde-l10n-sl:
-kde-l10n-sl:
-kde-l10n-sl:
-kde-l10n-sl:
-kde-l10n-sl:
-kde-l10n-sl:
-kde-l10n-sl:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sr b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sr
deleted file mode 100644
index c5605005f..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sr
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-sr: kde-l10n-sr
-kde-l10n-sr:
-kde-l10n-sr: Serbian language support for KDE.
-kde-l10n-sr:
-kde-l10n-sr:
-kde-l10n-sr:
-kde-l10n-sr:
-kde-l10n-sr:
-kde-l10n-sr:
-kde-l10n-sr:
-kde-l10n-sr:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sv b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sv
deleted file mode 100644
index 6ada2deb0..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-sv
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-sv: kde-l10n-sv
-kde-l10n-sv:
-kde-l10n-sv: Swedish language support for KDE.
-kde-l10n-sv:
-kde-l10n-sv:
-kde-l10n-sv:
-kde-l10n-sv:
-kde-l10n-sv:
-kde-l10n-sv:
-kde-l10n-sv:
-kde-l10n-sv:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ta b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ta
deleted file mode 100644
index 1ef20a1e3..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ta
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ta: kde-l10n-ta
-kde-l10n-ta:
-kde-l10n-ta: Tamil language support for KDE.
-kde-l10n-ta:
-kde-l10n-ta:
-kde-l10n-ta:
-kde-l10n-ta:
-kde-l10n-ta:
-kde-l10n-ta:
-kde-l10n-ta:
-kde-l10n-ta:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tg b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tg
deleted file mode 100644
index 39ac24c1e..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tg
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-tg: kde-l10n-tg
-kde-l10n-tg:
-kde-l10n-tg: Tajik language support for KDE.
-kde-l10n-tg:
-kde-l10n-tg:
-kde-l10n-tg:
-kde-l10n-tg:
-kde-l10n-tg:
-kde-l10n-tg:
-kde-l10n-tg:
-kde-l10n-tg:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-th b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-th
deleted file mode 100644
index 33a82a80d..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-th
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-th: kde-l10n-th
-kde-l10n-th:
-kde-l10n-th: Thai language support for KDE.
-kde-l10n-th:
-kde-l10n-th:
-kde-l10n-th:
-kde-l10n-th:
-kde-l10n-th:
-kde-l10n-th:
-kde-l10n-th:
-kde-l10n-th:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tr b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tr
deleted file mode 100644
index c6e73b294..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-tr
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-tr: kde-l10n-tr
-kde-l10n-tr:
-kde-l10n-tr: Turkish language support for KDE.
-kde-l10n-tr:
-kde-l10n-tr:
-kde-l10n-tr:
-kde-l10n-tr:
-kde-l10n-tr:
-kde-l10n-tr:
-kde-l10n-tr:
-kde-l10n-tr:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ug b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ug
deleted file mode 100644
index 1b141c576..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ug
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-ug: kde-l10n-ug
-kde-l10n-ug:
-kde-l10n-ug: Uyghur language support for KDE.
-kde-l10n-ug:
-kde-l10n-ug:
-kde-l10n-ug:
-kde-l10n-ug:
-kde-l10n-ug:
-kde-l10n-ug:
-kde-l10n-ug:
-kde-l10n-ug:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-uk b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-uk
deleted file mode 100644
index 66d64641c..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-uk
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-uk: kde-l10n-uk
-kde-l10n-uk:
-kde-l10n-uk: Ukrainian language support for KDE.
-kde-l10n-uk:
-kde-l10n-uk:
-kde-l10n-uk:
-kde-l10n-uk:
-kde-l10n-uk:
-kde-l10n-uk:
-kde-l10n-uk:
-kde-l10n-uk:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-vi b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-vi
deleted file mode 100644
index a86a62e8d..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-vi
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-vi: kde-l10n-vi
-kde-l10n-vi:
-kde-l10n-vi: Vietnamese language support for KDE.
-kde-l10n-vi:
-kde-l10n-vi:
-kde-l10n-vi:
-kde-l10n-vi:
-kde-l10n-vi:
-kde-l10n-vi:
-kde-l10n-vi:
-kde-l10n-vi:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-wa b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-wa
deleted file mode 100644
index 5522370e9..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-wa
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-kde-l10n-wa: kde-l10n-wa
-kde-l10n-wa:
-kde-l10n-wa: Walloon language support for KDE.
-kde-l10n-wa:
-kde-l10n-wa:
-kde-l10n-wa:
-kde-l10n-wa:
-kde-l10n-wa:
-kde-l10n-wa:
-kde-l10n-wa:
-kde-l10n-wa:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_CN b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_CN
deleted file mode 100644
index 9246c0151..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_CN
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kde-l10n-zh_CN: kde-l10n-zh_CN
-kde-l10n-zh_CN:
-kde-l10n-zh_CN: Simplified Chinese language support for KDE.
-kde-l10n-zh_CN:
-kde-l10n-zh_CN:
-kde-l10n-zh_CN:
-kde-l10n-zh_CN:
-kde-l10n-zh_CN:
-kde-l10n-zh_CN:
-kde-l10n-zh_CN:
-kde-l10n-zh_CN:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_TW b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_TW
deleted file mode 100644
index 1cd511aa2..000000000
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_TW
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-kde-l10n-zh_TW: kde-l10n-zh_TW
-kde-l10n-zh_TW:
-kde-l10n-zh_TW: Chinese language support for KDE.
-kde-l10n-zh_TW:
-kde-l10n-zh_TW:
-kde-l10n-zh_TW:
-kde-l10n-zh_TW:
-kde-l10n-zh_TW:
-kde-l10n-zh_TW:
-kde-l10n-zh_TW:
-kde-l10n-zh_TW:
diff --git a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild b/source/l/ConsoleKit2/ConsoleKit2.SlackBuild
deleted file mode 100755
index 1c5c07a28..000000000
--- a/source/l/ConsoleKit2/ConsoleKit2.SlackBuild
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for ConsoleKit
-
-# Copyright 2009, 2015  Robby Workman, Northport, Alabama, USA
-# Copyright 2010, 2015  Eric Hameleers, Eindhoven, NL
-# Copyright 2010, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=ConsoleKit2
-VERSION=${VERSION:-1.2.1}
-BUILD=${BUILD:-4}
-
-# Maximum storage quota for XDG_RUNTIME_DIR:
-XDG_RUNTIME_QUOTA=${XDG_RUNTIME_QUOTA:-size=100M}
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  SLKLDFLAGS=""
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  SLKLDFLAGS=""
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  SLKLDFLAGS="-L/usr/lib64"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
-  SLKLDFLAGS=""
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  SLKLDFLAGS=""
-  LIBDIRSUFFIX=""
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-
-# Apply a reasonable maximum size for the user's XDG_RUNTIME_DIR:
-sed -i "s/mode=0700,uid=%d/mode=0700,$XDG_RUNTIME_QUOTA,uid=%d/g" src/ck-sysdeps-linux.c
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-# Choose correct options depending on whether PAM is installed:
-if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
-  PAM_OPTIONS="--enable-pam-module=yes --with-pam-module-dir=/lib${LIBDIRSUFFIX}/security --disable-libcgmanager"
-  unset SHADOW_OPTIONS
-else
-  unset PAM_OPTIONS
-  SHADOW_OPTIONS="--enable-pam-module=no"
-fi
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --with-rundir=/var/run \
-  --with-pid-file=/var/run/ConsoleKit/pid \
-  --enable-docbook-docs \
-  $PAM_OPTIONS \
-  $SHADOW_OPTIONS \
-  --enable-udev-acl \
-  --enable-polkit \
-  --disable-static \
-  --build=$TARGET || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-# The ones in /lib${LIBDIRSUFFIX}/security can also go:
-rm -f $PKG/lib${LIBDIRSUFFIX}/security/*.la
-
-# Let's not clobber config files
-mv $PKG/etc/ConsoleKit/seats.d/00-primary.seat \
-  $PKG/etc/ConsoleKit/seats.d/00-primary.seat.new
-
-# Add an init script
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.consolekit > $PKG/etc/rc.d/rc.consolekit.new
-chmod 0755 $PKG/etc/rc.d/rc.consolekit.new
-
-# Remove unused xinitrc.d script:
-rm -r $PKG/etc/X11/xinit/xinitrc.d
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Compress manual pages:
-find $PKG/usr/man -type f -exec gzip -9 {} \+
-for i in $( find $PKG/usr/man -type l ) ; do
-  ln -s $( readlink $i ).gz $i.gz
-  rm $i
-done
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING HACKING INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/ConsoleKit2/doinst.sh b/source/l/ConsoleKit2/doinst.sh
deleted file mode 100644
index c13a36e3e..000000000
--- a/source/l/ConsoleKit2/doinst.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-config etc/ConsoleKit/seats.d/00-primary.seat.new
-preserve_perms etc/rc.d/rc.consolekit.new
-
diff --git a/source/l/ConsoleKit2/rc.consolekit b/source/l/ConsoleKit2/rc.consolekit
deleted file mode 100644
index a1937569c..000000000
--- a/source/l/ConsoleKit2/rc.consolekit
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# /etc/rc.d/rc.consolekit
-#
-# Start/stop consolekit-kit daemon.
-#
-# This daemon is used by polkit's console auth agent.
-
-# Start consolekit:
-ck_start() {
-  echo "Starting ConsoleKit daemon:  /usr/sbin/console-kit-daemon"
-  /usr/sbin/console-kit-daemon
-}
-
-# Stop consolekit:
-ck_stop() {
-  if [ -r /var/run/ConsoleKit/pid ]; then
-    kill -HUP $(cat /var/run/ConsoleKit/pid)
-    rm -f /var/run/ConsoleKit/pid
-  else
-    killall -HUP -q console-kit-daemon
-  fi
-}
-
-case "$1" in
-'start')
-  ck_start
-  ;;
-'stop')
-  ck_stop
-  ;;
-*)
-  echo "Usage: $0 start|stop"
-esac
diff --git a/source/l/ConsoleKit2/slack-desc b/source/l/ConsoleKit2/slack-desc
deleted file mode 100644
index 6b51ea7df..000000000
--- a/source/l/ConsoleKit2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler-----------------------------------------------------|
-ConsoleKit2: ConsoleKit2 (user, login, and seat tracking framework)
-ConsoleKit2:
-ConsoleKit2: ConsoleKit2 is a framework for defining and tracking users, login
-ConsoleKit2: sessions, and seats.
-ConsoleKit2:
-ConsoleKit2: Homepage: https://github.com/ConsoleKit2/ConsoleKit2
-ConsoleKit2:
-ConsoleKit2:
-ConsoleKit2:
-ConsoleKit2:
-ConsoleKit2:
diff --git a/source/l/PyQt/PyQt.SlackBuild b/source/l/PyQt/PyQt.SlackBuild
deleted file mode 100755
index 801234244..000000000
--- a/source/l/PyQt/PyQt.SlackBuild
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for PyQt
-
-# Copyright 2008  Aleksandar Samardzic <asamardzic@gmail.com>
-# Copyright 2008, 2009, 2010, 2011, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Robby Workman <rworkman@slackware.com>
-# Modified by Eric Hameleers <alien@slackware.com>
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=PyQt
-VERSION=${VERSION:-$(echo ${PKGNAM}4_gpl_x11-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-else
-  SLKCFLAGS="-O2"
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null )
-PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null )
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-
-rm -rf ${PKGNAM}4_gpl_x11-$VERSION
-tar xvf $CWD/${PKGNAM}4_gpl_x11-$VERSION.tar.?z || exit 1
-cd ${PKGNAM}4_gpl_x11-$VERSION || exit 1
-
-# Fix phonon detection:
-zcat $CWD/$PKGNAM.phonon.diff.gz | patch -p1 --verbose || exit 1
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-# This avoids compiling a version number into KDE's .la files:
-export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
-export QT4DIR=/usr/lib${LIBDIRSUFFIX}/qt
-
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-
-python3 configure.py \
-  --confirm-license \
-  --qsci-api \
-  --verbose
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
-make clean
-
-mv $PKG/usr/bin/pyuic4 $PKG/usr/bin/pyuic4-py3
-rm -rf $PKG/$PYTHON3LIB/${PKGNAM}4/uic/port_v2/
-
-python2 configure.py \
-  --confirm-license \
-  --qsci-api \
-  --verbose
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
-
-rm -rf $PKG/$PYTHON2LIB/${PKGNAM}4/uic/port_v3/
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Remove rpaths:
-for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do
-  if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
-    patchelf --remove-rpath $file
-  fi
-done
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS doc/* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz
diff --git a/source/l/PyQt/PyQt.phonon.diff b/source/l/PyQt/PyQt.phonon.diff
deleted file mode 100644
index feda65096..000000000
--- a/source/l/PyQt/PyQt.phonon.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- PyQt-x11-gpl-4.6.2/configure.py.orig	2010-01-08 23:39:46.000000000 +0100
-+++ PyQt-x11-gpl-4.6.2/configure.py	2010-01-08 23:45:18.000000000 +0100
-@@ -451,7 +451,7 @@
-             generate_code("QtXmlPatterns")
- 
-         if "phonon" in pyqt_modules:
--            generate_code("phonon")
-+            generate_code("phonon", extra_include_dirs=["/usr/include/phonon"])
- 
-         if "QtAssistant" in pyqt_modules:
-             generate_code("QtAssistant")
diff --git a/source/l/PyQt/slack-desc b/source/l/PyQt/slack-desc
deleted file mode 100644
index e8cf45acd..000000000
--- a/source/l/PyQt/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-PyQt: PyQt (Python bindings for Qt)
-PyQt:
-PyQt: PyQt is a set of Python bindings for the Qt application framework and
-PyQt: runs on all platforms supported by Qt.
-PyQt: 
-PyQt: Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
-PyQt: 
-PyQt:
-PyQt:
-PyQt:
-PyQt:
diff --git a/source/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild
index ec2cd41ba..708c02a92 100755
--- a/source/l/QScintilla/QScintilla.SlackBuild
+++ b/source/l/QScintilla/QScintilla.SlackBuild
@@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=QScintilla
 VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -142,66 +142,8 @@ if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
     #make  || exit 1
     #make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
   cd -
-
-  # In order to compile Qt4 support next, clean up first:
-  make clean -C Qt4Qt5 || exit 1
-  make clean -C designer-Qt4Qt5 || exit 1
-  make clean -C Python || exit 1
 fi
 
-# QT4 support:
-echo "-- Compiling Qt4 support --"
-cd Qt4Qt5
-  echo "-- >> Qt4Qt5 --"
-  qmake \
-    -o Makefile \
-    QMAKE_CFLAGS+="$SLKCFLAGS" \
-    QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
-    qscintilla.pro || exit 1
-  make $NUMJOBS || exit 1
-  make install INSTALL_ROOT=$PKG || exit 1
-cd -
-
-cd designer-Qt4Qt5
-  echo "-- >> designer-Qt4Qt5 --"
-  qmake \
-    -o Makefile \
-    INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 \
-    QMAKE_CFLAGS+="$SLKCFLAGS" \
-    QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \
-    designer.pro || exit 1
-  make $NUMJOBS || exit 1
-  make install INSTALL_ROOT=$PKG || exit 1
-cd -
-
-cd Python
-  echo "-- >> Python --"
-  python3 configure.py \
-      --verbose \
-      --qmake /usr/bin/qmake \
-      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
-      || exit 1
-  make -j1 || exit 1
-  make -j1 install INSTALL_ROOT=$PKG || exit 1
-
-  make clean || exit 1
-
-  python2 configure.py \
-      --verbose \
-      --qmake /usr/bin/qmake \
-      -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \
-      || exit 1
-  make -j1 || exit 1
-  make -j1 install INSTALL_ROOT=$PKG || exit 1
-cd -
-
-# Link the shared qt4 libraries into /usr/lib${LIBDIRSUFFIX}:
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  for file in $(ls -1 qt/lib/*.so* 2>/dev/null) ; do
-    ln -sf $file .
-  done
-)
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/testing/source/vtown/deps/QtAV/QtAV.SlackBuild b/source/l/QtAV/QtAV.SlackBuild
index 64f012ffd..3e4cd3438 100755
--- a/testing/source/vtown/deps/QtAV/QtAV.SlackBuild
+++ b/source/l/QtAV/QtAV.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=QtAV
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/QtAV/QtAV.url b/source/l/QtAV/QtAV.url
index 8927fd5b6..8927fd5b6 100644
--- a/testing/source/vtown/deps/QtAV/QtAV.url
+++ b/source/l/QtAV/QtAV.url
diff --git a/testing/source/vtown/input-methods/kcm-fcitx/doinst.sh b/source/l/QtAV/doinst.sh
index 5fb28930d..5fb28930d 100644
--- a/testing/source/vtown/input-methods/kcm-fcitx/doinst.sh
+++ b/source/l/QtAV/doinst.sh
diff --git a/testing/source/vtown/deps/QtAV/fetch-QtAV.sh b/source/l/QtAV/fetch-QtAV.sh
index d802d7add..d802d7add 100755
--- a/testing/source/vtown/deps/QtAV/fetch-QtAV.sh
+++ b/source/l/QtAV/fetch-QtAV.sh
diff --git a/testing/source/vtown/deps/QtAV/slack-desc b/source/l/QtAV/slack-desc
index 95f8483f0..95f8483f0 100644
--- a/testing/source/vtown/deps/QtAV/slack-desc
+++ b/source/l/QtAV/slack-desc
diff --git a/source/l/SDL2/SDL2.SlackBuild b/source/l/SDL2/SDL2.SlackBuild
index 984c58803..a07d35960 100755
--- a/source/l/SDL2/SDL2.SlackBuild
+++ b/source/l/SDL2/SDL2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=SDL2
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/accountsservice/accountsservice.SlackBuild b/source/l/accountsservice/accountsservice.SlackBuild
index 53402fd12..0c2c02b3f 100755
--- a/testing/source/vtown/deps/accountsservice/accountsservice.SlackBuild
+++ b/source/l/accountsservice/accountsservice.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=accountsservice
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/accountsservice/accountsservice.url b/source/l/accountsservice/accountsservice.url
index 73889e637..73889e637 100644
--- a/testing/source/vtown/deps/accountsservice/accountsservice.url
+++ b/source/l/accountsservice/accountsservice.url
diff --git a/testing/source/vtown/deps/accountsservice/slack-desc b/source/l/accountsservice/slack-desc
index e11fb6e85..e11fb6e85 100644
--- a/testing/source/vtown/deps/accountsservice/slack-desc
+++ b/source/l/accountsservice/slack-desc
diff --git a/source/l/akonadi/akonadi-mariadb-10.2.patch b/source/l/akonadi/akonadi-mariadb-10.2.patch
deleted file mode 100644
index 99b096fb3..000000000
--- a/source/l/akonadi/akonadi-mariadb-10.2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 22c53fa2aa97c7f0b5d7a1947821c5b3aef9de0f
-Author: Heinz Wiesinger <pprkut@liwjatan.at>
-Date:   Sun Sep 17 15:55:48 2017 +0200
-
-    Only remove init connections to the database on server shutdown.
-    
-    With MariaDB 10.2 libmysqlclient was replaced with libmariadb that
-    changed how establishing database connections behaves. The MySQL
-    QSQL driver calls mysql_server_end() on QSqlDatabase::removeDatabase()
-    if the overall connection count dropped to 0 (which it does when
-    the init connection is removed).
-    A future QSqlDatabase:addDatabase() would call mysql_server_init()
-    again, but this no longer works with libmariadb as that one only
-    allows calling mysql_server_init() once. Future calls are simply
-    ignored.
-    
-    In order to prevent this from happening we have to keep the
-    init connection open until the server shuts down, so the connection
-    count only drops to 0 at shutdown and mysql_server_end() isn't
-    called before.
-    
-    This is a workaround for QTBUG-63108
-
-diff --git a/server/src/akonadi.cpp b/server/src/akonadi.cpp
-index 5369320c8..6d31f6ff4 100644
---- a/server/src/akonadi.cpp
-+++ b/server/src/akonadi.cpp
-@@ -370,12 +370,13 @@ void AkonadiServer::createDatabase()
-             db.close();
-         }
-     }
--    QSqlDatabase::removeDatabase( initCon );
- }
- 
- void AkonadiServer::stopDatabaseProcess()
- {
-     if ( !DbConfig::configuredDatabase()->useInternalServer() ) {
-+        // closing initConnection this late to work around QTBUG-63108
-+        QSqlDatabase::removeDatabase(QLatin1String("initConnection"));
-         return;
-     }
- 
-diff --git a/server/src/storage/dbconfigmysql.cpp b/server/src/storage/dbconfigmysql.cpp
-index 10f99db70..36f1f3a42 100644
---- a/server/src/storage/dbconfigmysql.cpp
-+++ b/server/src/storage/dbconfigmysql.cpp
-@@ -395,8 +395,6 @@ void DbConfigMysql::startInternalServer()
-       db.close();
-     }
-   }
--
--  QSqlDatabase::removeDatabase( initCon );
- }
- 
- void DbConfigMysql::stopInternalServer()
-@@ -405,6 +403,9 @@ void DbConfigMysql::stopInternalServer()
-     return;
-   }
- 
-+  // closing initConnection this late to work around QTBUG-63108
-+  QSqlDatabase::removeDatabase(QLatin1String("initConnection"));
-+
-   // first, try the nicest approach
-   if ( !mCleanServerShutdownCommand.isEmpty() ) {
-     QProcess::execute( mCleanServerShutdownCommand );
diff --git a/source/l/akonadi/akonadi.SlackBuild b/source/l/akonadi/akonadi.SlackBuild
deleted file mode 100755
index da12a4634..000000000
--- a/source/l/akonadi/akonadi.SlackBuild
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh 
-
-# Slackware build script for akonadi
-
-# Copyright 2008  Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010, 2011, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=akonadi
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-16}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-# Update mysql configuration
-zcat $CWD/mysql-global.conf.patch.gz | patch -p1 --verbose || exit 1
-
-# Work around problems with MariaDB 10.2
-zcat $CWD/akonadi-mariadb-10.2.patch.gz | patch -p1 --verbose || exit 1
-
-# If we do not specify the correct QT_PLUGINS_DIR, then the application
-# decides on using $QT4DIR/qt4/plugins instead.
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \
-    -DQT_PLUGINS_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd -
-
-if [ -d $PKG/usr/man ]; then
-  gzip -9 $PKG/usr/man/man?/*
-fi
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS INSTALL README lgpl-license \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/akonadi/doinst.sh b/source/l/akonadi/doinst.sh
deleted file mode 100644
index aab1b9e3c..000000000
--- a/source/l/akonadi/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1
-fi
-
diff --git a/source/l/akonadi/mysql-global.conf.patch b/source/l/akonadi/mysql-global.conf.patch
deleted file mode 100644
index 24bf6ea0c..000000000
--- a/source/l/akonadi/mysql-global.conf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -r -u akonadi-1.13.0.orig/server/src/storage/mysql-global.conf akonadi-1.13.0/server/src/storage/mysql-global.conf
---- akonadi-1.13.0.orig/server/src/storage/mysql-global.conf	2014-08-10 12:38:58.000000000 +0200
-+++ akonadi-1.13.0/server/src/storage/mysql-global.conf	2017-08-31 19:43:35.000000000 +0200
-@@ -37,13 +37,13 @@
- # use InnoDB for transactions and better crash recovery
- default_storage_engine=innodb
- 
--# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:1M)
--# Deprecated in MySQL >= 5.6.3
--innodb_additional_mem_pool_size=1M
-+# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:8M)
-+# Deprecated in MySQL >= 5.6.3, removed in 5.7 (works in MariaDB)
-+# innodb_additional_mem_pool_size=8M
- 
- # memory buffer InnoDB uses to cache data and indexes of its tables (default:128M)
- # Larger values means less I/O
--innodb_buffer_pool_size=80M
-+innodb_buffer_pool_size=128M
- 
- # Create a .ibd file for each table (default:0)
- innodb_file_per_table=1
diff --git a/source/l/akonadi/slack-desc b/source/l/akonadi/slack-desc
deleted file mode 100644
index e046a8876..000000000
--- a/source/l/akonadi/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler-----------------------------------------------------|
-akonadi: akonadi (PIM storage service)
-akonadi:
-akonadi: akonadi is an extensible cross-desktop storage service for PIM data 
-akonadi: and meta data providing concurrent read, write, and query access. 
-akonadi: It will provide a unique desktop wide object identification and 
-akonadi: retrieval.
-akonadi:
-akonadi: Homepage: http://www.kdepim.org/akonadi/
-akonadi:
-akonadi:
-akonadi:
diff --git a/source/l/attica/attica.SlackBuild b/source/l/attica/attica.SlackBuild
deleted file mode 100755
index 36615ca5d..000000000
--- a/source/l/attica/attica.SlackBuild
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash
-
-# Copyright 2009, 2010, 2011  Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2010, 2011, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=attica
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
-  PATH=$QTDIR/bin:$PATH \
-  cmake \
-    $KDE_OPT_ARGS \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd -
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a AUTHORS* COPYING* README* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/attica/slack-desc b/source/l/attica/slack-desc
deleted file mode 100644
index b9a96f33a..000000000
--- a/source/l/attica/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler-------------------------------------------------------|
-attica: attica (Qt Collaboration library)
-attica: 
-attica: Attica is a Qt library that implements the freedesktop.org
-attica: specification for the Open Collaboration Services API version 1.4.
-attica: It grants easy access to the services such as querying information
-attica: about persons and contents.
-attica:
-attica: Homepage: http://www.kde.org
-attica:
-attica:
-attica:
diff --git a/source/l/automoc4/automoc4.SlackBuild b/source/l/automoc4/automoc4.SlackBuild
deleted file mode 100755
index 167ef1d59..000000000
--- a/source/l/automoc4/automoc4.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh 
-
-# Copyright 2009, 2010, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=automoc4
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-automoc4
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-tar xvf $CWD/automoc4-$VERSION.tar.?z* || exit 1
-cd automoc4-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd -
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/automoc4-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/automoc4/slack-desc b/source/l/automoc4/slack-desc
deleted file mode 100644
index 892792ffe..000000000
--- a/source/l/automoc4/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-        |-----handy-ruler-----------------------------------------------------|
-automoc4: automoc4 (automatic moc for Qt4)
-automoc4:
-automoc4: This package contains the automoc4 binary which is used to run moc
-automoc4: on the right source files in a Qt 4 or KDE 4 application.
-automoc4: Moc is the meta object compiler which is a widely used tool with Qt
-automoc4: and creates standard C++ files to provide syntactic sugar of the
-automoc4: signal/slots mechanism.
-automoc4:
-automoc4:
-automoc4: See also  http://www.kde.org
-automoc4:
diff --git a/testing/source/vtown/deps/cfitsio/cfitsio.SlackBuild b/source/l/cfitsio/cfitsio.SlackBuild
index 626bdb7a5..655418fad 100755
--- a/testing/source/vtown/deps/cfitsio/cfitsio.SlackBuild
+++ b/source/l/cfitsio/cfitsio.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cfitsio
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/cfitsio/cfitsio.url b/source/l/cfitsio/cfitsio.url
index e56983a58..e56983a58 100644
--- a/testing/source/vtown/deps/cfitsio/cfitsio.url
+++ b/source/l/cfitsio/cfitsio.url
diff --git a/testing/source/vtown/deps/cfitsio/slack-desc b/source/l/cfitsio/slack-desc
index 35f969727..35f969727 100644
--- a/testing/source/vtown/deps/cfitsio/slack-desc
+++ b/source/l/cfitsio/slack-desc
diff --git a/testing/source/vtown/deps/cryfs/cryfs.SlackBuild b/source/l/cryfs/cryfs.SlackBuild
index eccc2d205..11f021f04 100755
--- a/testing/source/vtown/deps/cryfs/cryfs.SlackBuild
+++ b/source/l/cryfs/cryfs.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cryfs
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/cryfs/cryfs.url b/source/l/cryfs/cryfs.url
index e1bf0c480..e1bf0c480 100644
--- a/testing/source/vtown/deps/cryfs/cryfs.url
+++ b/source/l/cryfs/cryfs.url
diff --git a/testing/source/vtown/deps/cryfs/slack-desc b/source/l/cryfs/slack-desc
index 8dd66bdbd..8dd66bdbd 100644
--- a/testing/source/vtown/deps/cryfs/slack-desc
+++ b/source/l/cryfs/slack-desc
diff --git a/testing/source/vtown/deps/cryptopp/cryptopp.SlackBuild b/source/l/cryptopp/cryptopp.SlackBuild
index 309a15890..4ce5a9694 100755
--- a/testing/source/vtown/deps/cryptopp/cryptopp.SlackBuild
+++ b/source/l/cryptopp/cryptopp.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=cryptopp
 VERSION=${VERSION:-8.2.0}
 SRCVER=$(echo $VERSION | tr -d '.')
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/deps/cryptopp/cryptopp.url b/source/l/cryptopp/cryptopp.url
index 1bc3357dd..1bc3357dd 100644
--- a/testing/source/vtown/deps/cryptopp/cryptopp.url
+++ b/source/l/cryptopp/cryptopp.url
diff --git a/testing/source/vtown/deps/cryptopp/slack-desc b/source/l/cryptopp/slack-desc
index 11da183c6..11da183c6 100644
--- a/testing/source/vtown/deps/cryptopp/slack-desc
+++ b/source/l/cryptopp/slack-desc
diff --git a/testing/source/vtown/deps/dotconf/dotconf.SlackBuild b/source/l/dotconf/dotconf.SlackBuild
index 686934c86..d99226dd1 100755
--- a/testing/source/vtown/deps/dotconf/dotconf.SlackBuild
+++ b/source/l/dotconf/dotconf.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dotconf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/dotconf/dotconf.url b/source/l/dotconf/dotconf.url
index 17e18ef72..17e18ef72 100644
--- a/testing/source/vtown/deps/dotconf/dotconf.url
+++ b/source/l/dotconf/dotconf.url
diff --git a/testing/source/vtown/deps/dotconf/slack-desc b/source/l/dotconf/slack-desc
index b79dc103d..b79dc103d 100644
--- a/testing/source/vtown/deps/dotconf/slack-desc
+++ b/source/l/dotconf/slack-desc
diff --git a/testing/source/vtown/deps/dvdauthor/dvdauthor-0.7.2_imagemagick7.patch b/source/l/dvdauthor/dvdauthor-0.7.2_imagemagick7.patch
index 0f6bed437..0f6bed437 100644
--- a/testing/source/vtown/deps/dvdauthor/dvdauthor-0.7.2_imagemagick7.patch
+++ b/source/l/dvdauthor/dvdauthor-0.7.2_imagemagick7.patch
diff --git a/testing/source/vtown/deps/dvdauthor/dvdauthor.SlackBuild b/source/l/dvdauthor/dvdauthor.SlackBuild
index 2d431d0da..d25691c8b 100755
--- a/testing/source/vtown/deps/dvdauthor/dvdauthor.SlackBuild
+++ b/source/l/dvdauthor/dvdauthor.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dvdauthor
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/dvdauthor/dvdauthor.url b/source/l/dvdauthor/dvdauthor.url
index d08d87824..d08d87824 100644
--- a/testing/source/vtown/deps/dvdauthor/dvdauthor.url
+++ b/source/l/dvdauthor/dvdauthor.url
diff --git a/testing/source/vtown/deps/dvdauthor/slack-desc b/source/l/dvdauthor/slack-desc
index 01b9f5503..01b9f5503 100644
--- a/testing/source/vtown/deps/dvdauthor/slack-desc
+++ b/source/l/dvdauthor/slack-desc
diff --git a/source/l/eigen3/eigen3.SlackBuild b/source/l/eigen3/eigen3.SlackBuild
index f4c926014..30ce46284 100755
--- a/source/l/eigen3/eigen3.SlackBuild
+++ b/source/l/eigen3/eigen3.SlackBuild
@@ -24,9 +24,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=eigen
-VERSION=3.2.10
-SRCVER="eigen-b9cd8366d4e8"
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -71,9 +70,9 @@ PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
 mkdir -p $PKG $TMP
 cd $TMP
-rm -rf eigen-$SRCVER
-tar xvf $CWD/eigen-$VERSION.tar.xz || exit 1
-cd eigen-$SRCVER || exit 1
+rm -rf eigen-$VERSION
+tar xvf $CWD/eigen-$VERSION.tar.?z || exit 1
+cd eigen-$VERSION || exit 1
 
 chown -R root:root .
 find -L . \
@@ -107,4 +106,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/eigen3-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/eigen3/slack-desc b/source/l/eigen3/slack-desc
index 253eba8f0..8c4398f89 100644
--- a/source/l/eigen3/slack-desc
+++ b/source/l/eigen3/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-eigen3: eigen3 (c++ math library)
+eigen3: eigen3 (C++ math library)
 eigen3:
 eigen3: Eigen is a C++ template library for linear algebra: matrices, vectors,
 eigen3: numerical solvers, and related algorithms.
diff --git a/testing/source/vtown/deps/frei0r-plugins/frei0r-plugins.SlackBuild b/source/l/frei0r-plugins/frei0r-plugins.SlackBuild
index 90c011a7c..2f9b516fe 100755
--- a/testing/source/vtown/deps/frei0r-plugins/frei0r-plugins.SlackBuild
+++ b/source/l/frei0r-plugins/frei0r-plugins.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=frei0r-plugins
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/frei0r-plugins/frei0r-plugins.url b/source/l/frei0r-plugins/frei0r-plugins.url
index df2f24cae..df2f24cae 100644
--- a/testing/source/vtown/deps/frei0r-plugins/frei0r-plugins.url
+++ b/source/l/frei0r-plugins/frei0r-plugins.url
diff --git a/testing/source/vtown/deps/frei0r-plugins/slack-desc b/source/l/frei0r-plugins/slack-desc
index d7fe4b3c0..d7fe4b3c0 100644
--- a/testing/source/vtown/deps/frei0r-plugins/slack-desc
+++ b/source/l/frei0r-plugins/slack-desc
diff --git a/source/l/grantlee/grantlee.SlackBuild b/source/l/grantlee/grantlee.SlackBuild
index af781224b..1da9cf98d 100755
--- a/source/l/grantlee/grantlee.SlackBuild
+++ b/source/l/grantlee/grantlee.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# Copyright 2010, 2011  Eric Hameleers, Eindhoven, NL
-# Copyright 2010, 2011, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015, 2016, 2017, 2020  Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -10,35 +10,32 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=grantlee
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -49,9 +46,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -59,7 +61,7 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
   LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
@@ -71,42 +73,51 @@ PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
+
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
+
 chown -R root:root .
 find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
-  PATH=$QTDIR/bin:$PATH \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+# Configure, build, and install:
+mkdir cmake-build
+cd cmake-build
   cmake \
-    $KDE_OPT_ARGS \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd -
+    .. || exit 1
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd ..
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  cp -a AUTHORS* CHANGELOG* COPYING* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a AUTHORS CHANGELOG COPYING* GOALS README \
-  $PKG/usr/doc/$PKGNAM-$VERSION
+# If there's a CHANGELOG, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGELOG ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG
+  touch -r CHANGELOG $DOCSDIR/CHANGELOG
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/testing/source/vtown/deps/grantlee/grantlee.url b/source/l/grantlee/grantlee.url
index e78ca6f50..e78ca6f50 100644
--- a/testing/source/vtown/deps/grantlee/grantlee.url
+++ b/source/l/grantlee/grantlee.url
diff --git a/source/l/grantlee/slack-desc b/source/l/grantlee/slack-desc
index 8acc268cc..136660265 100644
--- a/source/l/grantlee/slack-desc
+++ b/source/l/grantlee/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler-------------------------------------------------------|
-grantlee: grantlee (string template engine)
-grantlee: 
-grantlee: Grantlee is a plugin based String Template system written using the
-grantlee: Qt framework. The goals of the project are to make it easier for
-grantlee: application developers to separate the structure of documents from
-grantlee: the data they contain, opening the door for theming.
+grantlee: grantlee (string template engine for Qt)
 grantlee:
-grantlee: Homepage: http://gitorious.org/grantlee/
+grantlee: Grantlee is a plugin based String Template system written with the Qt
+grantlee: framework. The goals of the project are to make it easier for
+grantlee: application developers to separate the structure of documents from the
+grantlee: data they contain, opening the door for theming.
+grantlee:
+grantlee: Homepage: https://github.com/steveire/grantlee
 grantlee:
 grantlee:
 grantlee:
diff --git a/source/l/gst-plugins-base/gst-plugins-base.SlackBuild b/source/l/gst-plugins-base/gst-plugins-base.SlackBuild
index a14932a28..22de14190 100755
--- a/source/l/gst-plugins-base/gst-plugins-base.SlackBuild
+++ b/source/l/gst-plugins-base/gst-plugins-base.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gst-plugins-base
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/gtk+3/9a693c7228a88b76a007aed41b101d89d084cf9b.diff b/source/l/gtk+3/9a693c7228a88b76a007aed41b101d89d084cf9b.diff
deleted file mode 100644
index b9efbf6fe..000000000
--- a/source/l/gtk+3/9a693c7228a88b76a007aed41b101d89d084cf9b.diff
+++ /dev/null
@@ -1,583 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 62c17b2b8472ee8552405e26f4b1a13307619009..a26b03d3c3e1ece50fa171cfc4af316315da2edd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@ m4_define([cairo_required_version], [1.14.0])
- m4_define([gdk_pixbuf_required_version], [2.30.0])
- m4_define([introspection_required_version], [1.39.0])
- m4_define([wayland_required_version], [1.14.91])
--m4_define([wayland_protocols_required_version], [1.14])
-+m4_define([wayland_protocols_required_version], [1.17])
- m4_define([epoxy_required_version], [1.4])
- m4_define([cloudproviders_required_version], [0.2.5])
- m4_define([sysprof_required_version], [3.33.2])
-diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
-index 31f12251b30b175e353888c6ce4fb315fa34ce13..6595013d3f00314c42d4a530ecfeba39d1c5d477 100644
---- a/gdk/wayland/Makefile.am
-+++ b/gdk/wayland/Makefile.am
-@@ -40,7 +40,9 @@ BUILT_SOURCES = 				\
- 	server-decoration-client-protocol.h		\
- 	server-decoration-protocol.c			\
- 	gtk-shell-client-protocol.h		\
--	gtk-shell-protocol.c
-+	gtk-shell-protocol.c			\
-+	primary-selection-unstable-v1-client-protocol.h		\
-+	primary-selection-unstable-v1-protocol.c
- 
- nodist_libgdk_wayland_la_SOURCES =		\
- 	$(BUILT_SOURCES)
-diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
-index 7d81eaff3b40e3775e1c21637773145f56acb7bc..c5b273eb908d727751dafc22d710f10a20d16a79 100644
---- a/gdk/wayland/gdkdevice-wayland.c
-+++ b/gdk/wayland/gdkdevice-wayland.c
-@@ -237,7 +237,8 @@ struct _GdkWaylandSeat
-   uint32_t keyboard_time;
-   uint32_t keyboard_key_serial;
- 
--  struct gtk_primary_selection_device *primary_data_device;
-+  struct gtk_primary_selection_device *gtk_primary_data_device;
-+  struct zwp_primary_selection_device_v1 *zwp_primary_data_device_v1;
-   struct wl_data_device *data_device;
-   GdkDragContext *drop_context;
- 
-@@ -1308,23 +1309,43 @@ static const struct wl_data_device_listener data_device_listener = {
- };
- 
- static void
--primary_selection_data_offer (void                                *data,
--                              struct gtk_primary_selection_device *gtk_primary_selection_device,
--                              struct gtk_primary_selection_offer  *gtk_primary_offer)
-+primary_selection_data_offer (void     *data,
-+                              gpointer  primary_selection_device,
-+                              gpointer  primary_offer)
- {
-   GdkWaylandSeat *seat = data;
- 
-   GDK_NOTE (EVENTS,
-             g_message ("primary selection offer, device %p, data offer %p",
--                       gtk_primary_selection_device, gtk_primary_offer));
-+                       primary_selection_device, primary_offer));
- 
--  gdk_wayland_selection_ensure_primary_offer (seat->display, gtk_primary_offer);
-+  gdk_wayland_selection_ensure_primary_offer (seat->display, primary_offer);
- }
- 
- static void
--primary_selection_selection (void                                *data,
--                             struct gtk_primary_selection_device *gtk_primary_selection_device,
--                             struct gtk_primary_selection_offer  *gtk_primary_offer)
-+gtk_primary_selection_data_offer (void                                *data,
-+                                  struct gtk_primary_selection_device *primary_selection_device,
-+                                  struct gtk_primary_selection_offer  *primary_offer)
-+{
-+  primary_selection_data_offer (data,
-+                                (gpointer) primary_selection_device,
-+                                (gpointer) primary_offer);
-+}
-+
-+static void
-+zwp_primary_selection_v1_data_offer (void                                   *data,
-+                                     struct zwp_primary_selection_device_v1 *primary_selection_device,
-+                                     struct zwp_primary_selection_offer_v1  *primary_offer)
-+{
-+  primary_selection_data_offer (data,
-+                                (gpointer) primary_selection_device,
-+                                (gpointer) primary_offer);
-+}
-+
-+static void
-+primary_selection_selection (void     *data,
-+                             gpointer  primary_selection_device,
-+                             gpointer  primary_offer)
- {
-   GdkWaylandSeat *seat = data;
-   GdkAtom selection;
-@@ -1334,16 +1355,41 @@ primary_selection_selection (void                                *data,
- 
-   GDK_NOTE (EVENTS,
-             g_message ("primary selection selection, device %p, data offer %p",
--                       gtk_primary_selection_device, gtk_primary_offer));
-+                       primary_selection_device, primary_offer));
- 
-   selection = gdk_atom_intern_static_string ("PRIMARY");
--  gdk_wayland_selection_set_offer (seat->display, selection, gtk_primary_offer);
-+  gdk_wayland_selection_set_offer (seat->display, selection, primary_offer);
-   emit_selection_owner_change (seat->keyboard_focus, selection);
- }
- 
--static const struct gtk_primary_selection_device_listener primary_selection_device_listener = {
--  primary_selection_data_offer,
--  primary_selection_selection,
-+static void
-+gtk_primary_selection_selection (void                                *data,
-+                                 struct gtk_primary_selection_device *primary_selection_device,
-+                                 struct gtk_primary_selection_offer  *primary_offer)
-+{
-+  primary_selection_selection (data,
-+                               (gpointer) primary_selection_device,
-+                               (gpointer) primary_offer);
-+}
-+
-+static void
-+zwp_primary_selection_v1_selection (void                                   *data,
-+                                    struct zwp_primary_selection_device_v1 *primary_selection_device,
-+                                    struct zwp_primary_selection_offer_v1  *primary_offer)
-+{
-+  primary_selection_selection (data,
-+                               (gpointer) primary_selection_device,
-+                               (gpointer) primary_offer);
-+}
-+
-+static const struct gtk_primary_selection_device_listener gtk_primary_device_listener = {
-+  gtk_primary_selection_data_offer,
-+  gtk_primary_selection_selection,
-+};
-+
-+static const struct zwp_primary_selection_device_v1_listener zwp_primary_device_v1_listener = {
-+  zwp_primary_selection_v1_data_offer,
-+  zwp_primary_selection_v1_selection,
- };
- 
- static GdkDevice * get_scroll_device (GdkWaylandSeat              *seat,
-@@ -5078,13 +5124,23 @@ _gdk_wayland_device_manager_add_seat (GdkDeviceManager *device_manager,
-   wl_seat_add_listener (seat->wl_seat, &seat_listener, seat);
-   wl_seat_set_user_data (seat->wl_seat, seat);
- 
--  if (display_wayland->primary_selection_manager)
-+  if (display_wayland->zwp_primary_selection_manager_v1)
-     {
--      seat->primary_data_device =
--        gtk_primary_selection_device_manager_get_device (display_wayland->primary_selection_manager,
-+      seat->zwp_primary_data_device_v1 =
-+        zwp_primary_selection_device_manager_v1_get_device (display_wayland->zwp_primary_selection_manager_v1,
-+                                                            seat->wl_seat);
-+      zwp_primary_selection_device_v1_add_listener (seat->zwp_primary_data_device_v1,
-+                                                    &zwp_primary_device_v1_listener,
-+                                                    seat);
-+    }
-+  else if (display_wayland->gtk_primary_selection_manager)
-+    {
-+      seat->gtk_primary_data_device =
-+        gtk_primary_selection_device_manager_get_device (display_wayland->gtk_primary_selection_manager,
-                                                          seat->wl_seat);
--      gtk_primary_selection_device_add_listener (seat->primary_data_device,
--                                                 &primary_selection_device_listener, seat);
-+      gtk_primary_selection_device_add_listener (seat->gtk_primary_data_device,
-+                                                 &gtk_primary_device_listener,
-+                                                 seat);
-     }
- 
-   seat->data_device =
-@@ -5355,8 +5411,8 @@ gdk_wayland_seat_set_selection (GdkSeat               *seat,
- }
- 
- void
--gdk_wayland_seat_set_primary (GdkSeat                             *seat,
--                              struct gtk_primary_selection_source *source)
-+gdk_wayland_seat_set_primary (GdkSeat  *seat,
-+                              gpointer  source)
- {
-   GdkWaylandSeat *wayland_seat = GDK_WAYLAND_SEAT (seat);
-   GdkWaylandDisplay *display_wayland;
-@@ -5366,8 +5422,16 @@ gdk_wayland_seat_set_primary (GdkSeat                             *seat,
-     {
-       display_wayland = GDK_WAYLAND_DISPLAY (gdk_seat_get_display (seat));
-       serial = _gdk_wayland_display_get_serial (display_wayland);
--      gtk_primary_selection_device_set_selection (wayland_seat->primary_data_device,
--                                                  source, serial);
-+      if (wayland_seat->zwp_primary_data_device_v1)
-+        {
-+          zwp_primary_selection_device_v1_set_selection (wayland_seat->zwp_primary_data_device_v1,
-+                                                         source, serial);
-+        }
-+      else if (wayland_seat->gtk_primary_data_device)
-+        {
-+          gtk_primary_selection_device_set_selection (wayland_seat->gtk_primary_data_device,
-+                                                      source, serial);
-+        }
-     }
- }
- 
-diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
-index d4503c256236ae942bde999c964fbf1d85abdf29..dfb8d3069a36ddb72340815cd2e809596416ccaf 100644
---- a/gdk/wayland/gdkdisplay-wayland.c
-+++ b/gdk/wayland/gdkdisplay-wayland.c
-@@ -476,10 +476,16 @@ gdk_registry_handle_global (void               *data,
-     }
-   else if (strcmp (interface, "gtk_primary_selection_device_manager") == 0)
-     {
--      display_wayland->primary_selection_manager =
-+      display_wayland->gtk_primary_selection_manager =
-         wl_registry_bind(display_wayland->wl_registry, id,
-                          &gtk_primary_selection_device_manager_interface, 1);
-     }
-+  else if (strcmp (interface, "zwp_primary_selection_device_manager_v1") == 0)
-+    {
-+      display_wayland->zwp_primary_selection_manager_v1 =
-+        wl_registry_bind(display_wayland->wl_registry, id,
-+                         &zwp_primary_selection_device_manager_v1_interface, 1);
-+    }
-   else if (strcmp (interface, "zwp_tablet_manager_v2") == 0)
-     {
-       display_wayland->tablet_manager =
-diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
-index 1e4a9860f61c71466bdb58e288abcb83129fc63d..62696300d15531d0ca212428c8eb3325fe10eb96 100644
---- a/gdk/wayland/gdkdisplay-wayland.h
-+++ b/gdk/wayland/gdkdisplay-wayland.h
-@@ -35,6 +35,7 @@
- #include <gdk/wayland/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h>
- #include <gdk/wayland/server-decoration-client-protocol.h>
- #include <gdk/wayland/xdg-output-unstable-v1-client-protocol.h>
-+#include <gdk/wayland/primary-selection-unstable-v1-client-protocol.h>
- 
- #include <glib.h>
- #include <gdk/gdkkeys.h>
-@@ -88,7 +89,8 @@ struct _GdkWaylandDisplay
-   struct wl_data_device_manager *data_device_manager;
-   struct wl_subcompositor *subcompositor;
-   struct zwp_pointer_gestures_v1 *pointer_gestures;
--  struct gtk_primary_selection_device_manager *primary_selection_manager;
-+  struct gtk_primary_selection_device_manager *gtk_primary_selection_manager;
-+  struct zwp_primary_selection_device_manager_v1 *zwp_primary_selection_manager_v1;
-   struct zwp_tablet_manager_v2 *tablet_manager;
-   struct zxdg_exporter_v1 *xdg_exporter;
-   struct zxdg_importer_v1 *xdg_importer;
-diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
-index fc8e9fe2800b129a9ac0432ee85511633eb407f5..4a921b3b9965085b580cbb736f280cfae60efb86 100644
---- a/gdk/wayland/gdkprivate-wayland.h
-+++ b/gdk/wayland/gdkprivate-wayland.h
-@@ -191,8 +191,8 @@ struct wl_data_device * gdk_wayland_device_get_data_device (GdkDevice *gdk_devic
- void gdk_wayland_seat_set_selection (GdkSeat               *seat,
-                                      struct wl_data_source *source);
- 
--void gdk_wayland_seat_set_primary (GdkSeat                             *seat,
--                                   struct gtk_primary_selection_source *source);
-+void gdk_wayland_seat_set_primary (GdkSeat  *seat,
-+                                   gpointer  source);
- 
- GdkDragContext * gdk_wayland_device_get_drop_context (GdkDevice *gdk_device);
- 
-@@ -249,8 +249,8 @@ void gdk_wayland_selection_free (GdkWaylandSelection *selection);
- 
- void gdk_wayland_selection_ensure_offer (GdkDisplay           *display,
-                                          struct wl_data_offer *wl_offer);
--void gdk_wayland_selection_ensure_primary_offer (GdkDisplay                         *display,
--                                                 struct gtk_primary_selection_offer *wp_offer);
-+void gdk_wayland_selection_ensure_primary_offer (GdkDisplay *display,
-+                                                 gpointer    wp_offer);
- 
- void gdk_wayland_selection_set_offer (GdkDisplay           *display,
-                                       GdkAtom               selection,
-diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c
-index 0dd3aa9ebfd4dbd80666fcd1c122f67fb2d44569..f85f595616a51168be49b3dd92612ccd6d325fa7 100644
---- a/gdk/wayland/gdkselection-wayland.c
-+++ b/gdk/wayland/gdkselection-wayland.c
-@@ -104,7 +104,7 @@ struct _GdkWaylandSelection
-   GArray *source_targets;
-   GdkAtom requested_target;
- 
--  struct gtk_primary_selection_source *primary_source;
-+  gpointer primary_source;
-   GdkWindow *primary_owner;
- 
-   struct wl_data_source *clipboard_source;
-@@ -434,6 +434,18 @@ gdk_wayland_selection_new (void)
-   return selection;
- }
- 
-+static void
-+primary_selection_source_destroy (gpointer primary_source)
-+{
-+  GdkDisplay *display = gdk_display_get_default ();
-+  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
-+
-+  if (display_wayland->zwp_primary_selection_manager_v1)
-+    zwp_primary_selection_source_v1_destroy (primary_source);
-+  else if (display_wayland->gtk_primary_selection_manager)
-+    gtk_primary_selection_source_destroy (primary_source);
-+}
-+
- void
- gdk_wayland_selection_free (GdkWaylandSelection *selection)
- {
-@@ -448,7 +460,7 @@ gdk_wayland_selection_free (GdkWaylandSelection *selection)
-   g_ptr_array_unref (selection->stored_selections);
- 
-   if (selection->primary_source)
--    gtk_primary_selection_source_destroy (selection->primary_source);
-+    primary_selection_source_destroy (selection->primary_source);
-   if (selection->clipboard_source)
-     wl_data_source_destroy (selection->clipboard_source);
-   if (selection->dnd_source)
-@@ -546,27 +558,47 @@ static const struct wl_data_offer_listener data_offer_listener = {
- };
- 
- static void
--primary_offer_offer (void                               *data,
--                     struct gtk_primary_selection_offer *gtk_offer,
--                     const char                         *type)
-+primary_offer_offer (void       *data,
-+                     gpointer    offer,
-+                     const char *type)
- {
-   GdkWaylandSelection *selection = data;
-   DataOfferData *info;
-   GdkAtom atom = gdk_atom_intern (type, FALSE);
- 
--  info = g_hash_table_lookup (selection->offers, gtk_offer);
-+  info = g_hash_table_lookup (selection->offers, offer);
- 
-   if (!info || g_list_find (info->targets, atom))
-     return;
- 
-   GDK_NOTE (EVENTS,
--            g_message ("primary offer offer, offer %p, type = %s", gtk_offer, type));
-+            g_message ("primary offer offer, offer %p, type = %s", offer, type));
- 
-   info->targets = g_list_prepend (info->targets, atom);
- }
- 
--static const struct gtk_primary_selection_offer_listener primary_offer_listener = {
--  primary_offer_offer,
-+static void
-+gtk_primary_offer_offer (void                               *data,
-+                         struct gtk_primary_selection_offer *offer,
-+                         const char                         *type)
-+{
-+  primary_offer_offer (data, (gpointer) offer, type);
-+}
-+
-+static void
-+zwp_primary_offer_v1_offer (void                                  *data,
-+                            struct zwp_primary_selection_offer_v1 *offer,
-+                            const char                            *type)
-+{
-+  primary_offer_offer (data, (gpointer) offer, type);
-+}
-+
-+static const struct gtk_primary_selection_offer_listener gtk_primary_offer_listener = {
-+  gtk_primary_offer_offer,
-+};
-+
-+static const struct zwp_primary_selection_offer_v1_listener zwp_primary_offer_listener_v1 = {
-+  zwp_primary_offer_v1_offer,
- };
- 
- SelectionData *
-@@ -604,9 +636,10 @@ gdk_wayland_selection_ensure_offer (GdkDisplay           *display,
- }
- 
- void
--gdk_wayland_selection_ensure_primary_offer (GdkDisplay                         *display,
--                                            struct gtk_primary_selection_offer *gtk_offer)
-+gdk_wayland_selection_ensure_primary_offer (GdkDisplay *display,
-+                                            gpointer    gtk_offer)
- {
-+  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
-   GdkWaylandSelection *selection = gdk_wayland_display_get_selection (display);
-   DataOfferData *info;
- 
-@@ -614,12 +647,24 @@ gdk_wayland_selection_ensure_primary_offer (GdkDisplay                         *
- 
-   if (!info)
-     {
--      info = data_offer_data_new (gtk_offer,
--                                  (GDestroyNotify) gtk_primary_selection_offer_destroy);
--      g_hash_table_insert (selection->offers, gtk_offer, info);
--      gtk_primary_selection_offer_add_listener (gtk_offer,
--                                                &primary_offer_listener,
--                                                selection);
-+      if (display_wayland->zwp_primary_selection_manager_v1)
-+        {
-+          info = data_offer_data_new (gtk_offer,
-+                                      (GDestroyNotify) zwp_primary_selection_offer_v1_destroy);
-+          g_hash_table_insert (selection->offers, gtk_offer, info);
-+          zwp_primary_selection_offer_v1_add_listener (gtk_offer,
-+                                                       &zwp_primary_offer_listener_v1,
-+                                                       selection);
-+        }
-+      else if (display_wayland->gtk_primary_selection_manager)
-+        {
-+          info = data_offer_data_new (gtk_offer,
-+                                      (GDestroyNotify) gtk_primary_selection_offer_destroy);
-+          g_hash_table_insert (selection->offers, gtk_offer, info);
-+          gtk_primary_selection_offer_add_listener (gtk_offer,
-+                                                    &gtk_primary_offer_listener,
-+                                                    selection);
-+        }
-     }
- }
- 
-@@ -1138,10 +1183,10 @@ static const struct wl_data_source_listener data_source_listener = {
- };
- 
- static void
--primary_source_send (void                                *data,
--                     struct gtk_primary_selection_source *source,
--                     const char                          *mime_type,
--                     int32_t                              fd)
-+primary_source_send (void       *data,
-+                     gpointer    source,
-+                     const char *mime_type,
-+                     int32_t     fd)
- {
-   GdkWaylandSelection *wayland_selection = data;
- 
-@@ -1163,8 +1208,26 @@ primary_source_send (void                                *data,
- }
- 
- static void
--primary_source_cancelled (void                                *data,
--                          struct gtk_primary_selection_source *source)
-+gtk_primary_source_send (void                                *data,
-+                         struct gtk_primary_selection_source *source,
-+                         const char                          *mime_type,
-+                         int32_t                              fd)
-+{
-+  primary_source_send (data, (gpointer) source, mime_type, fd);
-+}
-+
-+static void
-+zwp_primary_source_v1_send (void                                   *data,
-+                            struct zwp_primary_selection_source_v1 *source,
-+                            const char                             *mime_type,
-+                            int32_t                                 fd)
-+{
-+  primary_source_send (data, (gpointer) source, mime_type, fd);
-+}
-+
-+static void
-+primary_source_cancelled (void     *data,
-+                          gpointer  source)
- {
-   GdkDisplay *display;
-   GdkAtom atom;
-@@ -1180,9 +1243,28 @@ primary_source_cancelled (void                                *data,
-   gdk_wayland_selection_unset_data_source (display, atom);
- }
- 
--static const struct gtk_primary_selection_source_listener primary_source_listener = {
--  primary_source_send,
--  primary_source_cancelled,
-+static void
-+gtk_primary_source_cancelled (void                                *data,
-+                              struct gtk_primary_selection_source *source)
-+{
-+  primary_source_cancelled (data, source);
-+}
-+
-+static void
-+zwp_primary_source_v1_cancelled (void                                   *data,
-+                                 struct zwp_primary_selection_source_v1 *source)
-+{
-+  primary_source_cancelled (data, source);
-+}
-+
-+static const struct gtk_primary_selection_source_listener gtk_primary_source_listener = {
-+  gtk_primary_source_send,
-+  gtk_primary_source_cancelled,
-+};
-+
-+static const struct zwp_primary_selection_source_v1_listener zwp_primary_source_v1_listener = {
-+  zwp_primary_source_v1_send,
-+  zwp_primary_source_v1_cancelled,
- };
- 
- struct wl_data_source *
-@@ -1204,11 +1286,11 @@ gdk_wayland_selection_get_data_source (GdkWindow *owner,
-     {
-       if (wayland_selection->primary_source &&
-           (!owner || owner == wayland_selection->primary_owner))
--        return (gpointer) wayland_selection->primary_source;
-+        return wayland_selection->primary_source;
- 
-       if (wayland_selection->primary_source)
-         {
--          gtk_primary_selection_source_destroy (wayland_selection->primary_source);
-+          primary_selection_source_destroy (wayland_selection->primary_source);
-           wayland_selection->primary_source = NULL;
-         }
-     }
-@@ -1234,11 +1316,18 @@ gdk_wayland_selection_get_data_source (GdkWindow *owner,
- 
-   if (selection == atoms[ATOM_PRIMARY])
-     {
--      if (display_wayland->primary_selection_manager)
-+      if (display_wayland->zwp_primary_selection_manager_v1)
-+        {
-+          source = zwp_primary_selection_device_manager_v1_create_source (display_wayland->zwp_primary_selection_manager_v1);
-+          zwp_primary_selection_source_v1_add_listener (source,
-+                                                        &zwp_primary_source_v1_listener,
-+                                                        wayland_selection);
-+        }
-+      else if (display_wayland->gtk_primary_selection_manager)
-         {
--          source = gtk_primary_selection_device_manager_create_source (display_wayland->primary_selection_manager);
-+          source = gtk_primary_selection_device_manager_create_source (display_wayland->gtk_primary_selection_manager);
-           gtk_primary_selection_source_add_listener (source,
--                                                     &primary_source_listener,
-+                                                     &gtk_primary_source_listener,
-                                                      wayland_selection);
-         }
-     }
-@@ -1278,7 +1367,7 @@ gdk_wayland_selection_unset_data_source (GdkDisplay *display,
-     {
-       if (wayland_selection->primary_source)
-         {
--          gtk_primary_selection_source_destroy (wayland_selection->primary_source);
-+          primary_selection_source_destroy (wayland_selection->primary_source);
-           wayland_selection->primary_source = NULL;
-         }
-     }
-@@ -1449,6 +1538,7 @@ _gdk_wayland_display_convert_selection (GdkDisplay *display,
-                                         GdkAtom     target,
-                                         guint32     time)
- {
-+  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
-   GdkWaylandSelection *wayland_selection = gdk_wayland_display_get_selection (display);
-   const SelectionData *selection_data;
-   SelectionBuffer *buffer_data;
-@@ -1514,9 +1604,16 @@ _gdk_wayland_display_convert_selection (GdkDisplay *display,
-           g_unix_open_pipe (pipe_fd, FD_CLOEXEC, NULL);
- 
-           if (selection == atoms[ATOM_PRIMARY])
--            gtk_primary_selection_offer_receive (offer, mimetype, pipe_fd[1]);
-+            {
-+              if (display_wayland->zwp_primary_selection_manager_v1)
-+                zwp_primary_selection_offer_v1_receive (offer, mimetype, pipe_fd[1]);
-+              else if (display_wayland->gtk_primary_selection_manager)
-+                gtk_primary_selection_offer_receive (offer, mimetype, pipe_fd[1]);
-+            }
-           else
--            wl_data_offer_receive (offer, mimetype, pipe_fd[1]);
-+            {
-+              wl_data_offer_receive (offer, mimetype, pipe_fd[1]);
-+            }
- 
-           stream = g_unix_input_stream_new (pipe_fd[0], TRUE);
-           close (pipe_fd[1]);
-diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
-index 8f6b7faf31ca379cd602ae437b7864308b1bffd6..e66afd7f95bfc6e39cd200eedf55813862213664 100644
---- a/gdk/wayland/meson.build
-+++ b/gdk/wayland/meson.build
-@@ -56,6 +56,7 @@ proto_sources = [
-   ['keyboard-shortcuts-inhibit', 'unstable', 'v1', ],
-   ['server-decoration', 'private' ],
-   ['xdg-output', 'unstable', 'v1', ],
-+  ['primary-selection', 'unstable', 'v1', ],
- ]
- 
- gdk_wayland_gen_headers = []
-diff --git a/meson.build b/meson.build
-index a3a7545ae103a88fc73cffe917c79848018f1a61..9c80fafc0314aed310018bc1f8851bc00e85f68a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -30,7 +30,7 @@ atk_req            = '>= 2.15.1'
- cairo_req          = '>= 1.14.0'
- gdk_pixbuf_req     = '>= 2.30.0'
- introspection_req  = '>= 1.39.0'
--wayland_proto_req  = '>= 1.14'
-+wayland_proto_req  = '>= 1.17'
- wayland_req        = '>= 1.14.91'
- epoxy_req          = '>= 1.4'
- cloudproviders_req = '>= 0.2.5'
diff --git a/source/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild
index 4e44e2caf..377b619a9 100755
--- a/source/l/gtk+3/gtk+3.SlackBuild
+++ b/source/l/gtk+3/gtk+3.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gtk+3
 VERSION=${VERSION:-$(echo gtk+-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -82,9 +82,6 @@ find . \
 # the configure process doesn't try to call it:
 zcat $CWD/gtk.fix.missing.version-check.py.diff.gz | patch -p1 --verbose || exit 1
 
-# Fix middle button paste between GTK+ and KDE apps on Wayland:
-zcat $CWD/9a693c7228a88b76a007aed41b101d89d084cf9b.diff.gz | patch -p1 --verbose || exit 1
-
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
 export CXXFLAGS="$SLKCFLAGS -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
diff --git a/source/l/gvfs/gvfs.SlackBuild b/source/l/gvfs/gvfs.SlackBuild
index f0f423b68..7cd928045 100755
--- a/source/l/gvfs/gvfs.SlackBuild
+++ b/source/l/gvfs/gvfs.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gvfs
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -95,7 +95,7 @@ meson setup \
   -Ddnssd=false \
   -Dgoa=false \
   -Dgoogle=false \
-  -Dlogind=false \
+  -Dlogind=true \
   -Dman=true \
   -Dnfs=false \
   -Dsystemduserunitdir=no \
diff --git a/testing/source/vtown/deps/kdsoap/kdsoap.SlackBuild b/source/l/kdsoap/kdsoap.SlackBuild
index af6ab2219..c6df5a089 100755
--- a/testing/source/vtown/deps/kdsoap/kdsoap.SlackBuild
+++ b/source/l/kdsoap/kdsoap.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=kdsoap
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/kdsoap/kdsoap.url b/source/l/kdsoap/kdsoap.url
index dc0f8926e..dc0f8926e 100644
--- a/testing/source/vtown/deps/kdsoap/kdsoap.url
+++ b/source/l/kdsoap/kdsoap.url
diff --git a/testing/source/vtown/deps/kdsoap/slack-desc b/source/l/kdsoap/slack-desc
index f272d0a96..f272d0a96 100644
--- a/testing/source/vtown/deps/kdsoap/slack-desc
+++ b/source/l/kdsoap/slack-desc
diff --git a/testing/source/vtown/deps/lensfun/lensfun.SlackBuild b/source/l/lensfun/lensfun.SlackBuild
index 6ba811733..4342c7ce9 100755
--- a/testing/source/vtown/deps/lensfun/lensfun.SlackBuild
+++ b/source/l/lensfun/lensfun.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=lensfun
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/lensfun/lensfun.url b/source/l/lensfun/lensfun.url
index 913b9f399..913b9f399 100644
--- a/testing/source/vtown/deps/lensfun/lensfun.url
+++ b/source/l/lensfun/lensfun.url
diff --git a/testing/source/vtown/deps/lensfun/slack-desc b/source/l/lensfun/slack-desc
index e39b450fd..e39b450fd 100644
--- a/testing/source/vtown/deps/lensfun/slack-desc
+++ b/source/l/lensfun/slack-desc
diff --git a/testing/source/vtown/deps/libappindicator/libappindicator.SlackBuild b/source/l/libappindicator/libappindicator.SlackBuild
index 79ffe9baf..39c46969a 100755
--- a/testing/source/vtown/deps/libappindicator/libappindicator.SlackBuild
+++ b/source/l/libappindicator/libappindicator.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libappindicator
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -92,7 +92,7 @@ done
 
 build_it() {
 # Configure, build, and install:
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS  -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ../configure \
   --prefix=/usr \
diff --git a/testing/source/vtown/deps/libappindicator/slack-desc b/source/l/libappindicator/slack-desc
index 895eb5f41..895eb5f41 100644
--- a/testing/source/vtown/deps/libappindicator/slack-desc
+++ b/source/l/libappindicator/slack-desc
diff --git a/source/l/libbluedevil/libbluedevil.SlackBuild b/source/l/libbluedevil/libbluedevil.SlackBuild
deleted file mode 100755
index 863d58708..000000000
--- a/source/l/libbluedevil/libbluedevil.SlackBuild
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-
-# Copyright 2011, 2012  Eric Hameleers, Eindhoven, NL
-# Copyright 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=libbluedevil
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
-cd ${PKGNAM}-$VERSION || exit 1
-
-# Make sure ownerships and permissions are sane:
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-# Build and install:
-mkdir build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc/kde \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DBUILD_tests:BOOL=OFF \
-    ..
-  make $NUMJOBS VERBOSE=1 || make || exit 1
-  make install DESTDIR=$PKG || exit 1
-cd -
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* HACKING README* $PKG/usr/doc/$PKGNAM-$VERSION || true
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/libbluedevil/slack-desc b/source/l/libbluedevil/slack-desc
deleted file mode 100644
index 012f3d9ea..000000000
--- a/source/l/libbluedevil/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-libbluedevil: libbluedevil (Qt wrapper for bluez)
-libbluedevil: 
-libbluedevil: This is a Qt-based library for handling Bluetooth functionality.
-libbluedevil:
-libbluedevil: Homepage: http://ereslibre.es/
-libbluedevil:
-libbluedevil:
-libbluedevil:
-libbluedevil:
-libbluedevil:
-libbluedevil:
diff --git a/testing/source/vtown/deps/libburn/libburn.SlackBuild b/source/l/libburn/libburn.SlackBuild
index 54eb66dff..52a80555d 100755
--- a/testing/source/vtown/deps/libburn/libburn.SlackBuild
+++ b/source/l/libburn/libburn.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libburn
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/libburn/libburn.url b/source/l/libburn/libburn.url
index 02c4e769b..02c4e769b 100644
--- a/testing/source/vtown/deps/libburn/libburn.url
+++ b/source/l/libburn/libburn.url
diff --git a/testing/source/vtown/deps/libburn/slack-desc b/source/l/libburn/slack-desc
index 6c68d4a52..6c68d4a52 100644
--- a/testing/source/vtown/deps/libburn/slack-desc
+++ b/source/l/libburn/slack-desc
diff --git a/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild
index 2a77669bd..2b986317e 100755
--- a/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild
+++ b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild
@@ -1,51 +1,48 @@
 #!/bin/bash
 
-# Copyright 2010, 2011, 2012  Eric Hameleers, Eindhoven, The Netherlands
-# Copyright 2010, 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2012, 2014, 2015, 2017, 2020  Eric Hameleers, Eindhoven, The Netherlands
+# Copyright 2010, 2011, 2012, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
-
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-# Pull this package from git due to some copyright related
-# problems going on at Canonical...
-# git clone git://gitorious.org/dbusmenu/dbusmenu-qt.git dbusmenu-qt
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This project has moved to https://launchpad.net/libdbusmenu-qt
+# Get the latest code with:
+# bzr branch lp:libdbusmenu-qt
 #
 # Get version number from
 # grep dbusmenu_qt_VERSION dbusmenu-qt/CMakeLists.txt
 
-PKGNAM=libdbusmenu-qt
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+cd $(dirname $0) ; CWD=$(pwd)
 
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+PKGNAM=libdbusmenu-qt
+VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 4- -d . | cut -f 1 -d _ | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -56,15 +53,23 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -75,42 +80,48 @@ PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
+
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}_${VERSION}.orig.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
 find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+# Configure, build, and install:
+mkdir cmake-build
+cd cmake-build
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \
   PATH=$QTDIR/bin:$PATH \
   cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
+    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
+    -DDOC_INSTALL_DIR="doc" \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DUSE_QT4:BOOL=FALSE \
+    -DUSE_QT5:BOOL=TRUE \
+    .. || exit 1
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  COPYING NEWS README \
-  $PKG/usr/doc/$PKGNAM-$VERSION
+  COPYING* NEWS* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/doc
-mv $PKG/usr/share/doc/dbusmenu-qt/* $PKG/usr/doc/$PKGNAM-$VERSION/doc
+# Don't package API docs:
 rm -rf $PKG/usr/share/doc
 
 mkdir -p $PKG/install
@@ -118,4 +129,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/testing/source/vtown/deps/libdbusmenu-qt/libdbusmenu-qt.url b/source/l/libdbusmenu-qt/libdbusmenu-qt.url
index 57ed56dbb..57ed56dbb 100644
--- a/testing/source/vtown/deps/libdbusmenu-qt/libdbusmenu-qt.url
+++ b/source/l/libdbusmenu-qt/libdbusmenu-qt.url
diff --git a/source/l/libdbusmenu-qt/slack-desc b/source/l/libdbusmenu-qt/slack-desc
index 42029d657..508d674c7 100644
--- a/source/l/libdbusmenu-qt/slack-desc
+++ b/source/l/libdbusmenu-qt/slack-desc
@@ -5,14 +5,14 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-              |-----handy-ruler-----------------------------------------------------|
+              |-----handy-ruler------------------------------------------------------|
 libdbusmenu-qt: libdbusmenu-qt (Qt implementation of the DBusMenu spec)
 libdbusmenu-qt:
 libdbusmenu-qt: This library provides a Qt implementation of the DBusMenu protocol.
 libdbusmenu-qt: The DBusMenu protocol makes it possible for applications to export
 libdbusmenu-qt: and import their menus over DBus.
 libdbusmenu-qt:
-libdbusmenu-qt: Homepage: http://people.canonical.com/~agateau/dbusmenu/
+libdbusmenu-qt: Homepage: https://launchpad.net/libdbusmenu-qt
 libdbusmenu-qt:
 libdbusmenu-qt:
 libdbusmenu-qt:
diff --git a/testing/source/vtown/deps/libdbusmenu/libdbusmenu.SlackBuild b/source/l/libdbusmenu/libdbusmenu.SlackBuild
index cda282409..0d93309ce 100755
--- a/testing/source/vtown/deps/libdbusmenu/libdbusmenu.SlackBuild
+++ b/source/l/libdbusmenu/libdbusmenu.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libdbusmenu
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/libdbusmenu/libdbusmenu_configure_valgrind.patch b/source/l/libdbusmenu/libdbusmenu_configure_valgrind.patch
index a57877810..a57877810 100644
--- a/testing/source/vtown/deps/libdbusmenu/libdbusmenu_configure_valgrind.patch
+++ b/source/l/libdbusmenu/libdbusmenu_configure_valgrind.patch
diff --git a/testing/source/vtown/deps/libdbusmenu/slack-desc b/source/l/libdbusmenu/slack-desc
index 9bc6ed9ff..9bc6ed9ff 100644
--- a/testing/source/vtown/deps/libdbusmenu/slack-desc
+++ b/source/l/libdbusmenu/slack-desc
diff --git a/testing/source/vtown/deps/libdmtx/libdmtx.SlackBuild b/source/l/libdmtx/libdmtx.SlackBuild
index c13e1e8b6..f1ce55072 100755
--- a/testing/source/vtown/deps/libdmtx/libdmtx.SlackBuild
+++ b/source/l/libdmtx/libdmtx.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libdmtx
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/libdmtx/libdmtx.url b/source/l/libdmtx/libdmtx.url
index b2baaf776..b2baaf776 100644
--- a/testing/source/vtown/deps/libdmtx/libdmtx.url
+++ b/source/l/libdmtx/libdmtx.url
diff --git a/testing/source/vtown/deps/libdmtx/slack-desc b/source/l/libdmtx/slack-desc
index 3846d4de3..3846d4de3 100644
--- a/testing/source/vtown/deps/libdmtx/slack-desc
+++ b/source/l/libdmtx/slack-desc
diff --git a/testing/source/vtown/deps/libindicator/libindicator.LIBM.diff b/source/l/libindicator/libindicator.LIBM.diff
index fae77e3a6..fae77e3a6 100644
--- a/testing/source/vtown/deps/libindicator/libindicator.LIBM.diff
+++ b/source/l/libindicator/libindicator.LIBM.diff
diff --git a/testing/source/vtown/deps/libindicator/libindicator.SlackBuild b/source/l/libindicator/libindicator.SlackBuild
index c212e634c..3e904a3ef 100755
--- a/testing/source/vtown/deps/libindicator/libindicator.SlackBuild
+++ b/source/l/libindicator/libindicator.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libindicator
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/libindicator/slack-desc b/source/l/libindicator/slack-desc
index e28015fa1..e28015fa1 100644
--- a/testing/source/vtown/deps/libindicator/slack-desc
+++ b/source/l/libindicator/slack-desc
diff --git a/source/l/liblastfm/liblastfm.SlackBuild b/source/l/liblastfm/liblastfm.SlackBuild
deleted file mode 100755
index 89cd535d7..000000000
--- a/source/l/liblastfm/liblastfm.SlackBuild
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for liblastfm
-
-# Copyright 2009 Vincent Batts
-# Copyright 2011, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM="liblastfm"
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir cmake-build
-cd cmake-build
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-cmake \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_INSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \
-  -DBUILD_FINGERPRINT="ON" \
-  -DBUILD_WITH_QT4="ON" .. || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-cd ..
-
-if [ -d $PKG/usr/man ]; then
-  gzip -9 $PKG/usr/man/man?/*
-fi
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  COPYING* README* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/liblastfm/liblastfm.url b/source/l/liblastfm/liblastfm.url
deleted file mode 100644
index 8bdd15172..000000000
--- a/source/l/liblastfm/liblastfm.url
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/lastfm/liblastfm
diff --git a/source/l/liblastfm/slack-desc b/source/l/liblastfm/slack-desc
deleted file mode 100644
index 921b5d42e..000000000
--- a/source/l/liblastfm/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-liblastfm: liblastfm (last fm library)
-liblastfm:
-liblastfm: The last.fm audio scrobbling service library.
-liblastfm:
-liblastfm:
-liblastfm:
-liblastfm:
-liblastfm:
-liblastfm:
-liblastfm:
-liblastfm:
diff --git a/testing/source/vtown/deps/libqalculate/libqalculate.SlackBuild b/source/l/libqalculate/libqalculate.SlackBuild
index 6ee78cca8..82062ea8a 100755
--- a/testing/source/vtown/deps/libqalculate/libqalculate.SlackBuild
+++ b/source/l/libqalculate/libqalculate.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libqalculate
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/libqalculate/libqalculate.url b/source/l/libqalculate/libqalculate.url
index 718016a15..718016a15 100644
--- a/testing/source/vtown/deps/libqalculate/libqalculate.url
+++ b/source/l/libqalculate/libqalculate.url
diff --git a/testing/source/vtown/deps/libqalculate/slack-desc b/source/l/libqalculate/slack-desc
index b01a3e8f5..b01a3e8f5 100644
--- a/testing/source/vtown/deps/libqalculate/slack-desc
+++ b/source/l/libqalculate/slack-desc
diff --git a/testing/source/vtown/deps/mlt/mlt.SlackBuild b/source/l/mlt/mlt.SlackBuild
index 96f3f9e02..59182265f 100755
--- a/testing/source/vtown/deps/mlt/mlt.SlackBuild
+++ b/source/l/mlt/mlt.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mlt
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/mlt/mlt.deps b/source/l/mlt/mlt.deps
index 9c0527b33..9c0527b33 100644
--- a/testing/source/vtown/deps/mlt/mlt.deps
+++ b/source/l/mlt/mlt.deps
diff --git a/testing/source/vtown/deps/mlt/mlt.url b/source/l/mlt/mlt.url
index e2907785c..e2907785c 100644
--- a/testing/source/vtown/deps/mlt/mlt.url
+++ b/source/l/mlt/mlt.url
diff --git a/testing/source/vtown/deps/mlt/slack-desc b/source/l/mlt/slack-desc
index debc9002c..debc9002c 100644
--- a/testing/source/vtown/deps/mlt/slack-desc
+++ b/source/l/mlt/slack-desc
diff --git a/testing/source/vtown/deps/opencv/opencv.SlackBuild b/source/l/opencv/opencv.SlackBuild
index 7f7ef9511..fb2ccd052 100755
--- a/testing/source/vtown/deps/opencv/opencv.SlackBuild
+++ b/source/l/opencv/opencv.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=opencv
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/opencv/opencv.url b/source/l/opencv/opencv.url
index db4af844d..db4af844d 100644
--- a/testing/source/vtown/deps/opencv/opencv.url
+++ b/source/l/opencv/opencv.url
diff --git a/testing/source/vtown/deps/opencv/slack-desc b/source/l/opencv/slack-desc
index c979cdda6..c979cdda6 100644
--- a/testing/source/vtown/deps/opencv/slack-desc
+++ b/source/l/opencv/slack-desc
diff --git a/testing/source/vtown/deps/phonon-backend-gstreamer/phonon-backend-gstreamer.SlackBuild b/source/l/phonon-backend-gstreamer/phonon-backend-gstreamer.SlackBuild
index 94f5cd7b9..f1e2be9a0 100755
--- a/testing/source/vtown/deps/phonon-backend-gstreamer/phonon-backend-gstreamer.SlackBuild
+++ b/source/l/phonon-backend-gstreamer/phonon-backend-gstreamer.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=phonon-backend-gstreamer
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/phonon-backend-gstreamer/phonon-backend-gstreamer.url b/source/l/phonon-backend-gstreamer/phonon-backend-gstreamer.url
index 6d6621d75..6d6621d75 100644
--- a/testing/source/vtown/deps/phonon-backend-gstreamer/phonon-backend-gstreamer.url
+++ b/source/l/phonon-backend-gstreamer/phonon-backend-gstreamer.url
diff --git a/testing/source/vtown/deps/phonon-backend-gstreamer/slack-desc b/source/l/phonon-backend-gstreamer/slack-desc
index bb76521f2..bb76521f2 100644
--- a/testing/source/vtown/deps/phonon-backend-gstreamer/slack-desc
+++ b/source/l/phonon-backend-gstreamer/slack-desc
diff --git a/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild b/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild
deleted file mode 100755
index 6d2f50272..000000000
--- a/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/bash
-# Copyright 2011, 2012, 2014  Eric Hameleers, Eindhoven, NL
-# Copyright 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=phonon-gstreamer
-SRCNAM=phonon-backend-gstreamer
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-2}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
-cd $SRCNAM-$VERSION || exit 1
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-echo Building ...
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DSYSCONF_INSTALL_DIR=/etc \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    .. || exit 1
-  make $NUMJOBS || exit 1
-  make DESTDIR=$PKG install || exit 1
-cd -
-
-# Conditional build of Qt5 support:
-if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
-  mkdir -p build-qt5
-  cd build-qt5
-    cmake \
-      -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DMAN_INSTALL_DIR=/usr/man \
-      -DSYSCONF_INSTALL_DIR=/etc \
-      -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-      -DPHONON_BUILD_PHONON4QT5=ON \
-      .. || exit 1
-    make $NUMJOBS || exit 1
-    make DESTDIR=$PKG install || exit 1
-  cd -
-fi
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  COPYING.LIB gstreamer/lgpl-* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).
-gz $i.gz ; rm $i ; done
-fi
-
-# Strip binaries (if any):
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/phonon-gstreamer/slack-desc b/source/l/phonon-gstreamer/slack-desc
deleted file mode 100644
index 924967e0c..000000000
--- a/source/l/phonon-gstreamer/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                |-----handy-ruler------------------------------------------------------|
-phonon-gstreamer: phonon-gstreamer (gstreamer backend for phonon)
-phonon-gstreamer:
-phonon-gstreamer: This package provides an additional gstreamer backend for the phonon
-phonon-gstreamer: multimedia framework used in KDE.
-phonon-gstreamer:
-phonon-gstreamer: For more information, visit:
-phonon-gstreamer: https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer
-phonon-gstreamer:
-phonon-gstreamer:
-phonon-gstreamer:
-phonon-gstreamer:
diff --git a/source/l/phonon/phonon.SlackBuild b/source/l/phonon/phonon.SlackBuild
index a85c26685..3c97b93b8 100755
--- a/source/l/phonon/phonon.SlackBuild
+++ b/source/l/phonon/phonon.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh 
 
 # Copyright 2008  Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2012, 2014, 2015, 2016, 2017, 2018, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,26 +22,21 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified 2010, 2011, 2012, 2014  Eric Hameleers, Eindhoven, NL
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=phonon
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 if [ "$ARCH" = "i586" ]; then
@@ -76,25 +72,28 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-phonon
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -r phonon-$VERSION
-tar xvf $CWD/phonon-$VERSION.tar.?z* || exit 1
-cd phonon-$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
 find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir build
-cd build
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+# Qt5 is the only supported version as of 4.11.0:
+mkdir build-qt5
+cd build-qt5
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -105,36 +104,12 @@ cd build
     -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \
     -DWITH_QZeitgeist=BOOL:OFF \
     -DWITH_PulseAudio=BOOL:${PULSEAUDIO} \
+    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
     ..
   make $NUMJOBS || make || exit 1
   make install DESTDIR=$PKG || exit 1
 cd -
 
-# Conditional build of Qt5 support:
-if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
-  mkdir build-qt5
-  cd build-qt5
-    cmake \
-      -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DMAN_INSTALL_DIR=/usr/man \
-      -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \
-      -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \
-      -DWITH_QZeitgeist=BOOL:OFF \
-      -DWITH_PulseAudio=BOOL:ON \
-      -DPHONON_BUILD_PHONON4QT5=ON \
-      -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
-      ..
-    make $NUMJOBS || make || exit 1
-    make install DESTDIR=$PKG || exit 1
-  cd -
-fi
-
-# PyQT won't find the header files otherwise:
-sed -i -e 's#{includedir}$#& -I\${includedir}/phonon#' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/phonon.pc
-
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man
@@ -150,8 +125,8 @@ if [ -d $PKG/usr/man ]; then
   )
 fi
 
-mkdir -p $PKG/usr/doc/phonon-$VERSION
-cp -a phonon/{BUGS,IDEAS,TODO} $PKG/usr/doc/phonon-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a doc/{BUGS,IDEAS,TODO} $PKG/usr/doc/$PKGNAM-$VERSION
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -160,5 +135,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/phonon-$VERSION-$ARCH-$BUILD$TAG.txz
-
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz
diff --git a/testing/source/vtown/deps/phonon/phonon.deps b/source/l/phonon/phonon.deps
index bc90dbd95..bc90dbd95 100644
--- a/testing/source/vtown/deps/phonon/phonon.deps
+++ b/source/l/phonon/phonon.deps
diff --git a/testing/source/vtown/deps/phonon/phonon.url b/source/l/phonon/phonon.url
index f0620e58e..f0620e58e 100644
--- a/testing/source/vtown/deps/phonon/phonon.url
+++ b/source/l/phonon/phonon.url
diff --git a/source/l/phonon/slack-desc b/source/l/phonon/slack-desc
index 97f667a4f..253c95add 100644
--- a/source/l/phonon/slack-desc
+++ b/source/l/phonon/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-phonon: phonon (multimedia framework for KDE4)
+phonon: phonon (multimedia framework for KDE)
 phonon:
 phonon: Phonon is the multimedia API provided by Qt and is the standard
 phonon: abstraction for handling multimedia streams within the KDE Software
 phonon: Compilation. Phonon provides an API for multimedia using various
-phonon: backends (gstreamer, mplayer, xine) to handle the lower level I/O.
+phonon: backends (e.g. GStreamer or VLC) to handle the lower level I/O.
 phonon:
 phonon: Homepage: http://phonon.kde.org
 phonon:
diff --git a/testing/source/vtown/deps/pipewire/doinst.sh b/source/l/pipewire/doinst.sh
index 50765972b..50765972b 100644
--- a/testing/source/vtown/deps/pipewire/doinst.sh
+++ b/source/l/pipewire/doinst.sh
diff --git a/testing/source/vtown/deps/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild
index 7b7d2a6d1..d3210a726 100755
--- a/testing/source/vtown/deps/pipewire/pipewire.SlackBuild
+++ b/source/l/pipewire/pipewire.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pipewire
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/pipewire/pipewire.url b/source/l/pipewire/pipewire.url
index c9f6477ee..c9f6477ee 100644
--- a/testing/source/vtown/deps/pipewire/pipewire.url
+++ b/source/l/pipewire/pipewire.url
diff --git a/testing/source/vtown/deps/pipewire/slack-desc b/source/l/pipewire/slack-desc
index 180d5602b..180d5602b 100644
--- a/testing/source/vtown/deps/pipewire/slack-desc
+++ b/source/l/pipewire/slack-desc
diff --git a/source/l/polkit-qt-1/polkit-qt-1.SlackBuild b/source/l/polkit-qt-1/polkit-qt-1.SlackBuild
index 7c5ee922c..5d5a8c375 100755
--- a/source/l/polkit-qt-1/polkit-qt-1.SlackBuild
+++ b/source/l/polkit-qt-1/polkit-qt-1.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2009, 2010, 2011, 2012, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2012, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,21 +23,18 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=polkit-qt-1
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -48,74 +45,86 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
   LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
-# Avoid a version number in .la files:
-if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
-fi
-
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
-mkdir -p $TMP $PKG/usr
+mkdir -p $TMP $PKG
+
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
 find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+# Configure, build, and install:
+mkdir cmake-build
+cd cmake-build
   cmake \
-    $KDE_OPT_ARGS \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     .. || exit 1
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd -
-
-if [ -d $PKG/usr/man ]; then
-  gzip -9 $PKG/usr/man/man?/*
-fi
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd ..
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  COPYING* README* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  AUTHORS* ChangeLog CHANGES COPYING* LICENSE* NEWS* README* THANKS* TODO* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/testing/source/vtown/deps/polkit-qt-1/polkit-qt-1.url b/source/l/polkit-qt-1/polkit-qt-1.url
index 5f88bb433..5f88bb433 100644
--- a/testing/source/vtown/deps/polkit-qt-1/polkit-qt-1.url
+++ b/source/l/polkit-qt-1/polkit-qt-1.url
diff --git a/source/l/polkit-qt-1/pull-polkit-qt-1 b/source/l/polkit-qt-1/pull-polkit-qt-1
deleted file mode 100644
index 42d648777..000000000
--- a/source/l/polkit-qt-1/pull-polkit-qt-1
+++ /dev/null
@@ -1,6 +0,0 @@
-rm -rf polkit-qt-1
-git clone git://anongit.kde.org/polkit-qt-1
-( cd polkit-qt-1 && rm -rf .git* )
-mv polkit-qt-1 polkit-qt-1-$(date +%Y%m%d)git
-tar cf polkit-qt-1-$(date +%Y%m%d)git.tar polkit-qt-1-$(date +%Y%m%d)git
-xz -9 polkit-qt-1-$(date +%Y%m%d)git.tar
diff --git a/source/l/polkit-qt-1/slack-desc b/source/l/polkit-qt-1/slack-desc
index 92ecd543d..f1fdd088b 100644
--- a/source/l/polkit-qt-1/slack-desc
+++ b/source/l/polkit-qt-1/slack-desc
@@ -10,10 +10,10 @@ polkit-qt-1: polkit-qt-1 (Qt polkit API wrapper)
 polkit-qt-1:
 polkit-qt-1: polkit-qt-1 aims to make it easy for Qt developers to take advantage
 polkit-qt-1: of the polkit API. It is a convenience wrapper around QAction and
-polkit-qt-1: QAbstractButton that lets you integrate those two components
-polkit-qt-1: easily with polkit.
+polkit-qt-1: QAbstractButton that lets you integrate those two components easily
+polkit-qt-1: with polkit.
 polkit-qt-1:
-polkit-qt-1: Homepage: http://techbase.kde.org/Polkit-Qt-1
+polkit-qt-1: Homepage: https://projects.kde.org/projects/kdesupport/polkit-qt-1/
 polkit-qt-1:
 polkit-qt-1:
 polkit-qt-1:
diff --git a/testing/source/vtown/deps/polkit/0001-configure-fix-elogind-support.patch b/source/l/polkit/0001-configure-fix-elogind-support.patch
index 4c40bd9b2..4c40bd9b2 100644
--- a/testing/source/vtown/deps/polkit/0001-configure-fix-elogind-support.patch
+++ b/source/l/polkit/0001-configure-fix-elogind-support.patch
diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild
index 3182b9958..0c12c80a6 100755
--- a/source/l/polkit/polkit.SlackBuild
+++ b/source/l/polkit/polkit.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=polkit
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -82,6 +82,9 @@ find . \
 
 zcat $CWD/dont-set-wheel-group-as-admin.diff.gz | patch -p1 || exit 1
 
+# https://gitlab.freedesktop.org/polkit/polkit/-/issues/29
+zcat $CWD/0001-configure-fix-elogind-support.patch.gz | patch -p1 || exit 1
+
 # If we get here and don't have a polkitd user/group, add one.
 # Otherwise a few directories in the package will have wrong permissions.
 if ! grep -q "^polkitd:" /etc/passwd ; then
@@ -99,9 +102,15 @@ else
 fi
 
 if [ ! -r configure ]; then
-  NOCONFIGURE=1 ./autogen.sh
+  if [ -x ./autogen.sh ]; then
+    NOCONFIGURE=1 ./autogen.sh
+  else
+    autoreconf -vif
+  fi
 fi
 
+LIBELOGIND_CFLAGS="$(pkg-config --cflags libelogind)" \
+LIBELOGIND_LIBS="$(pkg-config --libs libelogind)" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -117,7 +126,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-examples \
   --enable-introspection \
   --enable-libsystemd-login=no \
-  --enable-libelogind=no \
+  --enable-libelogind=yes \
   $PAM_OPTIONS \
   $SHADOW_OPTIONS \
   --enable-verbose-mode \
@@ -179,9 +188,8 @@ if [ -r ChangeLog ]; then
 fi
 
 mkdir -p $PKG/install
-zcat $CWD/doinst.sh > $PKG/install/doinst.sh
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/qca-qt5/qca-qt5.SlackBuild b/source/l/qca-qt5/qca-qt5.SlackBuild
deleted file mode 100755
index fba0b3195..000000000
--- a/source/l/qca-qt5/qca-qt5.SlackBuild
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015, 2020  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2015, 2016, 2017, 2018, 2019, 2020  Eric Hameleers, Eindhoven, NL
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=qca-qt5
-SRCNAM=qca
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
-cd $SRCNAM-$VERSION || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-# Configure, build, and install:
-mkdir cmake-build
-cd cmake-build
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DQCA_MAN_INSTALL_DIR=/usr/man \
-    -DQCA_INSTALL_IN_QT_PREFIX:BOOL=ON \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DBUILD_TESTS:BOOL=OFF \
-    .. || exit 1
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG || exit 1
-cd ..
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Compress manual pages:
-find $PKG/usr/man -type f -exec gzip -9 {} \+
-for i in $( find $PKG/usr/man -type l ) ; do
-  ln -s $( readlink $i ).gz $i.gz
-  rm $i
-done
-
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
-cp -a \
-  COPYING* INSTALL* README* TODO* \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/l/qca-qt5/slack-desc b/source/l/qca-qt5/slack-desc
deleted file mode 100644
index 7d8852bea..000000000
--- a/source/l/qca-qt5/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-qca-qt5: qca-qt5 (Qt Cryptographic Architecture for Qt5)
-qca-qt5:
-qca-qt5: QCA aims to provide a straightforward and cross-platform cryptographic
-qca-qt5: API using Qt datatypes and conventions. The library and plugins
-qca-qt5: support a range of cryptographic features, including SSL/TLS, X.509
-qca-qt5: certificates, SASL, OpenPGP, smartcards, and much more.
-qca-qt5:
-qca-qt5: Homepage: https://github.com/KDE/qca
-qca-qt5:
-qca-qt5:
-qca-qt5:
diff --git a/source/l/qca/Add_support_for_OpenSSL_1.1.0.diff b/source/l/qca/Add_support_for_OpenSSL_1.1.0.diff
deleted file mode 100644
index 01d8bab5a..000000000
--- a/source/l/qca/Add_support_for_OpenSSL_1.1.0.diff
+++ /dev/null
@@ -1,1720 +0,0 @@
-From d58e20ee652038dc4ec4fe4765dc3639ed735526 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sat, 16 Dec 2017 22:29:40 +0100
-Subject: Add support for OpenSSL 1.1.0
-
-Test Plan:
-Ran the testsuite with OpenSSL 1.1.0g and 1.0.2j, all passed.
-Using this code with kdeconnect and okteta successfully on my system now.
-
-Reviewers: iromanov
-
-Subscribers: anthonyfieroni, alonbl, heikobecker, cfeck, asturmlechner, bero, rdieter
-
-Differential Revision: https://phabricator.kde.org/D9416
----
- plugins/qca-ossl/ossl110-compat.h | 283 ++++++++++++++++++
- plugins/qca-ossl/qca-ossl.cpp     | 583 ++++++++++++++++++++++++--------------
- create mode 100644 plugins/qca-ossl/ossl110-compat.h
-
-diff --git a/plugins/qca-ossl/ossl110-compat.h b/plugins/qca-ossl/ossl110-compat.h
-new file mode 100644
-index 0000000..ec15475
---- /dev/null
-+++ b/plugins/qca-ossl/ossl110-compat.h
-@@ -0,0 +1,283 @@
-+/*
-+ * Copyright (C) 2017 Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-+ *
-+ */
-+
-+#ifndef OSSL110COMPAT_H
-+#define OSSL110COMPAT_H
-+
-+#include <openssl/evp.h>
-+#include <openssl/hmac.h>
-+#include <openssl/rsa.h>
-+#include <openssl/dsa.h>
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#define RSA_F_RSA_METH_DUP 161
-+
-+static void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps)
-+{
-+    if (pr)
-+        *pr = sig->r;
-+    if (ps)
-+        *ps = sig->s;
-+}
-+
-+static int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
-+{
-+    if (!sig) return 0;
-+    sig->r = r;
-+    sig->s = s;
-+    return 1;
-+}
-+
-+static void DSA_get0_pqg(const DSA *dsa, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
-+{
-+    if (p)
-+        *p = dsa->p;
-+    if (q)
-+        *q = dsa->q;
-+    if (g)
-+        *g = dsa->g;
-+}
-+
-+static int DSA_set0_pqg(DSA *dsa, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+    if (!dsa) return 0;
-+    dsa->p = p;
-+    dsa->q = q;
-+    dsa->g = g;
-+    return 1;
-+}
-+
-+static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
-+{
-+    if (n)
-+        *n = rsa->n;
-+    if (e)
-+        *e = rsa->e;
-+    if (d)
-+        *d = rsa->d;
-+}
-+
-+static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d)
-+{
-+    if (!rsa) return 0;
-+    rsa->n = n;
-+    rsa->e = e;
-+    rsa->d = d;
-+    return 1;
-+}
-+
-+static void RSA_get0_factors(const RSA *rsa, const BIGNUM **p, const BIGNUM **q)
-+{
-+    if (p)
-+        *p = rsa->p;
-+    if (q)
-+        *q = rsa->q;
-+}
-+
-+static int RSA_set0_factors(RSA *rsa, BIGNUM *p, BIGNUM *q)
-+{
-+    if (!rsa) return 0;
-+    rsa->p = p;
-+    rsa->q = q;
-+    return 1;
-+}
-+
-+static void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
-+{
-+    if (p)
-+        *p = dh->p;
-+    if (q)
-+        *q = dh->q;
-+    if (g)
-+        *g = dh->g;
-+}
-+
-+static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-+{
-+    if (!dh) return 0;
-+    dh->p = p;
-+    dh->q = q;
-+    dh->g = g;
-+    return 1;
-+}
-+
-+static void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key)
-+{
-+    if (pub_key)
-+        *pub_key = dh->pub_key;
-+    if (priv_key)
-+        *priv_key = dh->priv_key;
-+}
-+
-+static int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key)
-+{
-+    if (!dh) return 0;
-+    dh->pub_key = pub_key;
-+    dh->priv_key = priv_key;
-+    return 1;
-+}
-+
-+static void DSA_get0_key(const DSA *dsa, const BIGNUM **pub_key, const BIGNUM **priv_key)
-+{
-+    if (pub_key)
-+        *pub_key = dsa->pub_key;
-+    if (priv_key)
-+        *priv_key = dsa->priv_key;
-+}
-+
-+static int DSA_set0_key(DSA *dsa, BIGNUM *pub_key, BIGNUM *priv_key)
-+{
-+    if (!dsa) return 0;
-+    dsa->pub_key = pub_key;
-+    dsa->priv_key = priv_key;
-+    return 1;
-+}
-+
-+static void X509_SIG_getm(const X509_SIG *sig, X509_ALGOR **palg, ASN1_OCTET_STRING **pdigest)
-+{
-+    if (palg)
-+        *palg = sig->algor;
-+    if (pdigest)
-+        *pdigest = sig->digest;
-+}
-+
-+static void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, const X509_ALGOR **palg)
-+{
-+    if (psig)
-+        *psig = req->signature;
-+    if (palg)
-+        *palg = req->sig_alg;
-+}
-+
-+static void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, const X509_ALGOR **palg)
-+{
-+    if (psig)
-+        *psig = crl->signature;
-+    if (palg)
-+        *palg = crl->sig_alg;
-+}
-+
-+static RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth)
-+{
-+    if (!meth)
-+        return NULL;
-+
-+    RSA_METHOD *_meth = (RSA_METHOD *) OPENSSL_malloc(sizeof(*_meth));
-+
-+    if (!_meth)
-+    {
-+        RSAerr(RSA_F_RSA_METH_DUP, ERR_R_MALLOC_FAILURE);
-+        return NULL;
-+    }
-+
-+    memcpy(_meth, meth, sizeof(*_meth));
-+    _meth->name = strdup(meth->name);
-+    if (!_meth->name) {
-+        OPENSSL_free(_meth);
-+        RSAerr(RSA_F_RSA_METH_DUP, ERR_R_MALLOC_FAILURE);
-+        return NULL;
-+    }
-+
-+    return _meth;
-+}
-+
-+static int RSA_meth_set_priv_enc(RSA_METHOD *rsa, int (*priv_enc) (int flen, const unsigned char *from,
-+    unsigned char *to, RSA *rsa, int padding))
-+{
-+    if (!rsa) return 0;
-+    rsa->rsa_priv_enc = priv_enc;
-+    return 1;
-+}
-+
-+static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int (*priv_dec) (int flen, const unsigned char *from,
-+    unsigned char *to, RSA *rsa, int padding))
-+{
-+    if (!rsa) return 0;
-+    rsa->rsa_priv_dec = priv_dec;
-+    return 1;
-+}
-+
-+static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
-+    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
-+{
-+    if (!meth) return 0;
-+    meth->rsa_sign = sign;
-+    return 1;
-+}
-+
-+static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m,
-+    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa))
-+{
-+    if (!meth) return 0;
-+    meth->rsa_verify = verify;
-+    return 1;
-+}
-+
-+static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
-+{
-+    if (!meth) return 0;
-+    meth->finish = finish;
-+    return 1;
-+}
-+
-+static HMAC_CTX *HMAC_CTX_new()
-+{
-+    HMAC_CTX *ctx = (HMAC_CTX *) OPENSSL_malloc(sizeof(HMAC_CTX));
-+    if (ctx)
-+        HMAC_CTX_init(ctx);
-+    return ctx;
-+}
-+
-+static void HMAC_CTX_free(HMAC_CTX *ctx)
-+{
-+    if (!ctx)
-+        return;
-+    HMAC_CTX_cleanup(ctx);
-+    EVP_MD_CTX_cleanup(&ctx->i_ctx);
-+    EVP_MD_CTX_cleanup(&ctx->o_ctx);
-+    EVP_MD_CTX_cleanup(&ctx->md_ctx);
-+    OPENSSL_free(ctx);
-+}
-+
-+#define ASN1_STRING_get0_data(...) (const unsigned char*)ASN1_STRING_data(__VA_ARGS__)
-+
-+#define EVP_MD_CTX_new(...) EVP_MD_CTX_create(__VA_ARGS__)
-+#define EVP_MD_CTX_free(...) EVP_MD_CTX_destroy(__VA_ARGS__)
-+
-+#define EVP_PKEY_up_ref(pkey) CRYPTO_add(&(pkey)->references, 1, CRYPTO_LOCK_EVP_PKEY)
-+#define X509_up_ref(cert) CRYPTO_add(&(cert)->references, 1, CRYPTO_LOCK_X509)
-+#define X509_CRL_up_ref(crl) CRYPTO_add(&(crl)->references, 1, CRYPTO_LOCK_X509_CRL)
-+
-+#define EVP_PKEY_id(pky) (pky)->type
-+#define EVP_PKEY_get0_DSA(pky) (pky)->pkey.dsa
-+#define EVP_PKEY_get0_RSA(pky) (pky)->pkey.rsa
-+#define EVP_PKEY_get0_DH(pky) (pky)->pkey.dh
-+
-+#define X509_CRL_get0_lastUpdate X509_CRL_get_lastUpdate
-+#define X509_CRL_get0_nextUpdate X509_CRL_get_nextUpdate
-+
-+#define X509_REQ_get_signature_nid(req) OBJ_obj2nid((req)->sig_alg->algorithm)
-+#define X509_CRL_get_signature_nid(crl) OBJ_obj2nid((crl)->sig_alg->algorithm)
-+
-+#define X509_REVOKED_get0_serialNumber(rev) (rev)->serialNumber
-+#define X509_REVOKED_get0_revocationDate(rev) (rev)->revocationDate
-+
-+#endif // OPENSSL_VERSION_NUMBER < 0x10100000L
-+
-+#endif // OSSL110COMPAT_H
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index a507604..39dbc2b 100644
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -2,6 +2,7 @@
- /*
-  * Copyright (C) 2004-2007  Justin Karneges <justin@affinix.com>
-  * Copyright (C) 2004-2006  Brad Hards <bradh@frogmouth.net>
-+ * Copyright (C) 2017       Fabian Vogt <fabian@ritter-vogt.de>
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -39,6 +40,8 @@
- #include <openssl/pkcs12.h>
- #include <openssl/ssl.h>
- 
-+#include "ossl110-compat.h"
-+
- #ifndef OSSL_097
- // comment this out if you'd rather use openssl 0.9.6
- #define OSSL_097
-@@ -53,6 +56,16 @@
- 	((_STACK*) (1 ? p : (type*)0))
- #endif
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    #define OSSL_110
-+#endif
-+
-+// OpenSSL 1.1.0 compatibility macros
-+#ifdef OSSL_110
-+#define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
-+#define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT
-+#endif
-+
- using namespace QCA;
- 
- namespace opensslQCAPlugin {
-@@ -94,7 +107,7 @@ static QByteArray bio2ba(BIO *b)
- 	return buf;
- }
- 
--static BigInteger bn2bi(BIGNUM *n)
-+static BigInteger bn2bi(const BIGNUM *n)
- {
- 	SecureArray buf(BN_num_bytes(n) + 1);
- 	buf[0] = 0; // positive
-@@ -110,7 +123,7 @@ static BIGNUM *bi2bn(const BigInteger &n)
- 
- // take lowest bytes of BIGNUM to fit
- // pad with high byte zeroes to fit
--static SecureArray bn2fixedbuf(BIGNUM *n, int size)
-+static SecureArray bn2fixedbuf(const BIGNUM *n, int size)
- {
- 	SecureArray buf(BN_num_bytes(n));
- 	BN_bn2bin(n, (unsigned char *)buf.data());
-@@ -128,8 +141,11 @@ static SecureArray dsasig_der_to_raw(const SecureArray &in)
- 	const unsigned char *inp = (const unsigned char *)in.data();
- 	d2i_DSA_SIG(&sig, &inp, in.size());
- 
--	SecureArray part_r = bn2fixedbuf(sig->r, 20);
--	SecureArray part_s = bn2fixedbuf(sig->s, 20);
-+	const BIGNUM *bnr, *bns;
-+	DSA_SIG_get0(sig, &bnr, &bns);
-+
-+	SecureArray part_r = bn2fixedbuf(bnr, 20);
-+	SecureArray part_s = bn2fixedbuf(bns, 20);
- 	SecureArray result;
- 	result.append(part_r);
- 	result.append(part_s);
-@@ -144,12 +160,16 @@ static SecureArray dsasig_raw_to_der(const SecureArray &in)
- 		return SecureArray();
- 
- 	DSA_SIG *sig = DSA_SIG_new();
--	SecureArray part_r(20);
--	SecureArray part_s(20);
-+	SecureArray part_r(20); BIGNUM *bnr;
-+	SecureArray part_s(20); BIGNUM *bns;
- 	memcpy(part_r.data(), in.data(), 20);
- 	memcpy(part_s.data(), in.data() + 20, 20);
--	sig->r = BN_bin2bn((const unsigned char *)part_r.data(), part_r.size(), NULL);
--	sig->s = BN_bin2bn((const unsigned char *)part_s.data(), part_s.size(), NULL);
-+	bnr = BN_bin2bn((const unsigned char *)part_r.data(), part_r.size(), NULL);
-+	bns = BN_bin2bn((const unsigned char *)part_s.data(), part_s.size(), NULL);
-+
-+	if(DSA_SIG_set0(sig, bnr, bns) == 0)
-+		return SecureArray();
-+	// Not documented what happens in the failure case, free bnr and bns?
- 
- 	int len = i2d_DSA_SIG(sig, NULL);
- 	SecureArray result(len);
-@@ -1005,29 +1025,39 @@ public:
- 	opensslHashContext(const EVP_MD *algorithm, Provider *p, const QString &type) : HashContext(p, type)
- 	{
- 		m_algorithm = algorithm;
--		EVP_DigestInit( &m_context, m_algorithm );
-+		m_context = EVP_MD_CTX_new();
-+		EVP_DigestInit( m_context, m_algorithm );
-+	}
-+
-+	opensslHashContext(const opensslHashContext &other)
-+	    : HashContext(other)
-+	{
-+		m_algorithm = other.m_algorithm;
-+		m_context = EVP_MD_CTX_new();
-+		EVP_MD_CTX_copy_ex(m_context, other.m_context);
- 	}
- 
- 	~opensslHashContext()
- 	{
--		EVP_MD_CTX_cleanup(&m_context);
-+		EVP_MD_CTX_free(m_context);
- 	}
- 
- 	void clear()
- 	{
--		EVP_MD_CTX_cleanup(&m_context);
--		EVP_DigestInit( &m_context, m_algorithm );
-+		EVP_MD_CTX_free(m_context);
-+		m_context = EVP_MD_CTX_new();
-+		EVP_DigestInit( m_context, m_algorithm );
- 	}
- 
- 	void update(const MemoryRegion &a)
- 	{
--		EVP_DigestUpdate( &m_context, (unsigned char*)a.data(), a.size() );
-+		EVP_DigestUpdate( m_context, (unsigned char*)a.data(), a.size() );
- 	}
- 
- 	MemoryRegion final()
- 	{
- 		SecureArray a( EVP_MD_size( m_algorithm ) );
--		EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 );
-+		EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 );
- 		return a;
- 	}
- 
-@@ -1038,7 +1068,7 @@ public:
- 
- protected:
- 	const EVP_MD *m_algorithm;
--	EVP_MD_CTX m_context;
-+	EVP_MD_CTX *m_context;
- };
- 
- 
-@@ -1048,7 +1078,21 @@ public:
- 	opensslPbkdf1Context(const EVP_MD *algorithm, Provider *p, const QString &type) : KDFContext(p, type)
- 	{
- 		m_algorithm = algorithm;
--		EVP_DigestInit( &m_context, m_algorithm );
-+		m_context = EVP_MD_CTX_new();
-+		EVP_DigestInit( m_context, m_algorithm );
-+	}
-+
-+	opensslPbkdf1Context(const opensslPbkdf1Context &other)
-+	    : KDFContext(other)
-+	{
-+		m_algorithm = other.m_algorithm;
-+		m_context = EVP_MD_CTX_new();
-+		EVP_MD_CTX_copy(m_context, other.m_context);
-+	}
-+
-+	~opensslPbkdf1Context()
-+	{
-+		EVP_MD_CTX_free(m_context);
- 	}
- 
- 	Provider::Context *clone() const
-@@ -1082,16 +1126,16 @@ public:
- 		  DK = Tc<0..dkLen-1>
- 		*/
- 		// calculate T_1
--		EVP_DigestUpdate( &m_context, (unsigned char*)secret.data(), secret.size() );
--		EVP_DigestUpdate( &m_context, (unsigned char*)salt.data(), salt.size() );
-+		EVP_DigestUpdate( m_context, (unsigned char*)secret.data(), secret.size() );
-+		EVP_DigestUpdate( m_context, (unsigned char*)salt.data(), salt.size() );
- 		SecureArray a( EVP_MD_size( m_algorithm ) );
--		EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 );
-+		EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 );
- 
- 		// calculate T_2 up to T_c
- 		for ( unsigned int i = 2; i <= iterationCount; ++i ) {
--			EVP_DigestInit( &m_context, m_algorithm );
--			EVP_DigestUpdate( &m_context, (unsigned char*)a.data(), a.size() );
--			EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 );
-+			EVP_DigestInit( m_context, m_algorithm );
-+			EVP_DigestUpdate( m_context, (unsigned char*)a.data(), a.size() );
-+			EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 );
- 		}
- 
- 		// shrink a to become DK, of the required length
-@@ -1137,19 +1181,19 @@ public:
- 		  DK = Tc<0..dkLen-1>
- 		*/
- 		// calculate T_1
--		EVP_DigestUpdate( &m_context, (unsigned char*)secret.data(), secret.size() );
--		EVP_DigestUpdate( &m_context, (unsigned char*)salt.data(), salt.size() );
-+		EVP_DigestUpdate( m_context, (unsigned char*)secret.data(), secret.size() );
-+		EVP_DigestUpdate( m_context, (unsigned char*)salt.data(), salt.size() );
- 		SecureArray a( EVP_MD_size( m_algorithm ) );
--		EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 );
-+		EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 );
- 
- 		// calculate T_2 up to T_c
- 		*iterationCount = 2 - 1;	// <- Have to remove 1, unless it computes one
- 		timer.start();				// ^  time more than the base function
- 									// ^  with the same iterationCount
- 		while (timer.elapsed() < msecInterval) {
--			EVP_DigestInit( &m_context, m_algorithm );
--			EVP_DigestUpdate( &m_context, (unsigned char*)a.data(), a.size() );
--			EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 );
-+			EVP_DigestInit( m_context, m_algorithm );
-+			EVP_DigestUpdate( m_context, (unsigned char*)a.data(), a.size() );
-+			EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 );
- 			++(*iterationCount);
- 		}
- 
-@@ -1164,7 +1208,7 @@ public:
- 
- protected:
- 	const EVP_MD *m_algorithm;
--	EVP_MD_CTX m_context;
-+	EVP_MD_CTX *m_context;
- };
- 
- class opensslPbkdf2Context : public KDFContext
-@@ -1232,12 +1276,28 @@ public:
- 	opensslHMACContext(const EVP_MD *algorithm, Provider *p, const QString &type) : MACContext(p, type)
- 	{
- 		m_algorithm = algorithm;
--		HMAC_CTX_init( &m_context );
-+		m_context = HMAC_CTX_new();
-+#ifndef OSSL_110
-+		HMAC_CTX_init( m_context );
-+#endif
-+	}
-+
-+	opensslHMACContext(const opensslHMACContext &other)
-+	    : MACContext(other)
-+	{
-+		m_algorithm = other.m_algorithm;
-+		m_context = HMAC_CTX_new();
-+		HMAC_CTX_copy(m_context, other.m_context);
-+	}
-+
-+	~opensslHMACContext()
-+	{
-+		HMAC_CTX_free(m_context);
- 	}
- 
- 	void setup(const SymmetricKey &key)
- 	{
--		HMAC_Init_ex( &m_context, key.data(), key.size(), m_algorithm, 0 );
-+		HMAC_Init_ex( m_context, key.data(), key.size(), m_algorithm, 0 );
- 	}
- 
- 	KeyLength keyLength() const
-@@ -1247,14 +1307,18 @@ public:
- 
- 	void update(const MemoryRegion &a)
- 	{
--		HMAC_Update( &m_context, (unsigned char *)a.data(), a.size() );
-+		HMAC_Update( m_context, (unsigned char *)a.data(), a.size() );
- 	}
- 
- 	void final(MemoryRegion *out)
- 	{
- 		SecureArray sa( EVP_MD_size( m_algorithm ), 0 );
--		HMAC_Final(&m_context, (unsigned char *)sa.data(), 0 );
--		HMAC_CTX_cleanup(&m_context);
-+		HMAC_Final(m_context, (unsigned char *)sa.data(), 0 );
-+#ifdef OSSL_110
-+		HMAC_CTX_reset(m_context);
-+#else
-+		HMAC_CTX_cleanup(m_context);
-+#endif
- 		*out = sa;
- 	}
- 
-@@ -1264,7 +1328,7 @@ public:
- 	}
- 
- protected:
--	HMAC_CTX m_context;
-+	HMAC_CTX *m_context;
- 	const EVP_MD *m_algorithm;
- };
- 
-@@ -1278,7 +1342,7 @@ class EVPKey
- public:
- 	enum State { Idle, SignActive, SignError, VerifyActive, VerifyError };
- 	EVP_PKEY *pkey;
--	EVP_MD_CTX mdctx;
-+	EVP_MD_CTX *mdctx;
- 	State state;
- 	bool raw_type;
- 	SecureArray raw;
-@@ -1288,19 +1352,23 @@ public:
- 		pkey = 0;
- 		raw_type = false;
- 		state = Idle;
-+		mdctx = EVP_MD_CTX_new();
- 	}
- 
- 	EVPKey(const EVPKey &from)
- 	{
- 		pkey = from.pkey;
--		CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
-+		EVP_PKEY_up_ref(pkey);
- 		raw_type = false;
- 		state = Idle;
-+		mdctx = EVP_MD_CTX_new();
-+		EVP_MD_CTX_copy(mdctx, from.mdctx);
- 	}
- 
- 	~EVPKey()
- 	{
- 		reset();
-+		EVP_MD_CTX_free(mdctx);
- 	}
- 
- 	void reset()
-@@ -1323,8 +1391,8 @@ public:
- 		else
- 		{
- 			raw_type = false;
--			EVP_MD_CTX_init(&mdctx);
--			if(!EVP_SignInit_ex(&mdctx, type, NULL))
-+			EVP_MD_CTX_init(mdctx);
-+			if(!EVP_SignInit_ex(mdctx, type, NULL))
- 				state = SignError;
- 		}
- 	}
-@@ -1340,8 +1408,8 @@ public:
- 		else
- 		{
- 			raw_type = false;
--			EVP_MD_CTX_init(&mdctx);
--			if(!EVP_VerifyInit_ex(&mdctx, type, NULL))
-+			EVP_MD_CTX_init(mdctx);
-+			if(!EVP_VerifyInit_ex(mdctx, type, NULL))
- 				state = VerifyError;
- 		}
- 	}
-@@ -1353,7 +1421,7 @@ public:
- 			if (raw_type)
- 				raw += in;
- 			else
--				if(!EVP_SignUpdate(&mdctx, in.data(), (unsigned int)in.size()))
-+				if(!EVP_SignUpdate(mdctx, in.data(), (unsigned int)in.size()))
- 					state = SignError;
- 		}
- 		else if(state == VerifyActive)
-@@ -1361,7 +1429,7 @@ public:
- 			if (raw_type)
- 				raw += in;
- 			else
--				if(!EVP_VerifyUpdate(&mdctx, in.data(), (unsigned int)in.size()))
-+				if(!EVP_VerifyUpdate(mdctx, in.data(), (unsigned int)in.size()))
- 					state = VerifyError;
- 		}
- 	}
-@@ -1374,17 +1442,20 @@ public:
- 			unsigned int len = out.size();
- 			if (raw_type)
- 			{
--				if (pkey->type == EVP_PKEY_RSA)
-+				int type = EVP_PKEY_id(pkey);
-+
-+				if (type == EVP_PKEY_RSA)
- 				{
-+					RSA *rsa = EVP_PKEY_get0_RSA(pkey);
- 					if(RSA_private_encrypt (raw.size(), (unsigned char *)raw.data(),
--											(unsigned char *)out.data(), pkey->pkey.rsa,
-+					                        (unsigned char *)out.data(), rsa,
- 											RSA_PKCS1_PADDING) == -1) {
- 
- 						state = SignError;
- 						return SecureArray ();
- 					}
- 				}
--				else if (pkey->type == EVP_PKEY_DSA)
-+				else if (type == EVP_PKEY_DSA)
- 				{
- 					state = SignError;
- 					return SecureArray ();
-@@ -1396,7 +1467,7 @@ public:
- 				}
- 			}
- 			else {
--				if(!EVP_SignFinal(&mdctx, (unsigned char *)out.data(), &len, pkey))
-+				if(!EVP_SignFinal(mdctx, (unsigned char *)out.data(), &len, pkey))
- 				{
- 					state = SignError;
- 					return SecureArray();
-@@ -1419,16 +1490,19 @@ public:
- 				SecureArray out(EVP_PKEY_size(pkey));
- 				int len = 0;
- 
--				if (pkey->type == EVP_PKEY_RSA) {
-+				int type = EVP_PKEY_id(pkey);
-+
-+				if (type == EVP_PKEY_RSA) {
-+					RSA *rsa = EVP_PKEY_get0_RSA(pkey);
- 					if((len = RSA_public_decrypt (sig.size(), (unsigned char *)sig.data(),
--												  (unsigned char *)out.data (), pkey->pkey.rsa,
-+					                                (unsigned char *)out.data (), rsa,
- 												  RSA_PKCS1_PADDING)) == -1) {
- 
- 						state = VerifyError;
- 						return false;
- 					}
- 				}
--				else if (pkey->type == EVP_PKEY_DSA)
-+				else if (type == EVP_PKEY_DSA)
- 				{
- 					state = VerifyError;
- 					return false;
-@@ -1448,7 +1522,7 @@ public:
- 			}
- 			else
- 			{
--				if(EVP_VerifyFinal(&mdctx, (unsigned char *)sig.data(), (unsigned int)sig.size(), pkey) != 1)
-+				if(EVP_VerifyFinal(mdctx, (unsigned char *)sig.data(), (unsigned int)sig.size(), pkey) != 1)
- 				{
- 					state = VerifyError;
- 					return false;
-@@ -1562,9 +1636,11 @@ static bool make_dlgroup(const QByteArray &seed, int bits, int counter, DLParams
- 		return false;
- 	if(ret_counter != counter)
- 		return false;
--	params->p = bn2bi(dsa->p);
--	params->q = bn2bi(dsa->q);
--	params->g = bn2bi(dsa->g);
-+	const BIGNUM *bnp, *bnq, *bng;
-+	DSA_get0_pqg(dsa, &bnp, &bnq, &bng);
-+	params->p = bn2bi(bnp);
-+	params->q = bn2bi(bnq);
-+	params->g = bn2bi(bng);
- 	DSA_free(dsa);
- 	return true;
- }
-@@ -1827,10 +1903,11 @@ public:
- 			return;
- 
- 		// extract the public key into DER format
--		int len = i2d_RSAPublicKey(evp.pkey->pkey.rsa, NULL);
-+		RSA *rsa_pkey = EVP_PKEY_get0_RSA(evp.pkey);
-+		int len = i2d_RSAPublicKey(rsa_pkey, NULL);
- 		SecureArray result(len);
- 		unsigned char *p = (unsigned char *)result.data();
--		i2d_RSAPublicKey(evp.pkey->pkey.rsa, &p);
-+		i2d_RSAPublicKey(rsa_pkey, &p);
- 		p = (unsigned char *)result.data();
- 
- 		// put the DER public key back into openssl
-@@ -1853,7 +1930,7 @@ public:
- 
- 	virtual int maximumEncryptSize(EncryptionAlgorithm alg) const
- 	{
--		RSA *rsa = evp.pkey->pkey.rsa;
-+		RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey);
- 		int size = 0;
- 		switch(alg)
- 		{
-@@ -1868,7 +1945,7 @@ public:
- 
- 	virtual SecureArray encrypt(const SecureArray &in, EncryptionAlgorithm alg)
- 	{
--		RSA *rsa = evp.pkey->pkey.rsa;
-+		RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey);
- 		SecureArray buf = in;
- 		int max = maximumEncryptSize(alg);
- 
-@@ -1901,7 +1978,7 @@ public:
- 
- 	virtual bool decrypt(const SecureArray &in, SecureArray *out, EncryptionAlgorithm alg)
- 	{
--		RSA *rsa = evp.pkey->pkey.rsa;
-+		RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey);
- 		SecureArray result(RSA_size(rsa));
- 		int pad;
- 
-@@ -2022,14 +2099,10 @@ public:
- 		evp.reset();
- 
- 		RSA *rsa = RSA_new();
--		rsa->n = bi2bn(n);
--		rsa->e = bi2bn(e);
--		rsa->p = bi2bn(p);
--		rsa->q = bi2bn(q);
--		rsa->d = bi2bn(d);
--
--		if(!rsa->n || !rsa->e || !rsa->p || !rsa->q || !rsa->d)
-+		if(RSA_set0_key(rsa, bi2bn(n), bi2bn(e), bi2bn(d)) == 0
-+		    || RSA_set0_factors(rsa, bi2bn(p), bi2bn(q)) == 0)
- 		{
-+			// Free BIGNUMS?
- 			RSA_free(rsa);
- 			return;
- 		}
-@@ -2037,7 +2110,7 @@ public:
- 		// When private key has no Public Exponent (e) or Private Exponent (d)
- 		// need to disable blinding. Otherwise decryption will be broken.
- 		// http://www.mail-archive.com/openssl-users@openssl.org/msg63530.html
--		if(BN_is_zero(rsa->e) || BN_is_zero(rsa->d))
-+		if(e == BigInteger(0) || d == BigInteger(0))
- 			RSA_blinding_off(rsa);
- 
- 		evp.pkey = EVP_PKEY_new();
-@@ -2050,10 +2123,7 @@ public:
- 		evp.reset();
- 
- 		RSA *rsa = RSA_new();
--		rsa->n = bi2bn(n);
--		rsa->e = bi2bn(e);
--
--		if(!rsa->n || !rsa->e)
-+		if(RSA_set0_key(rsa, bi2bn(n), bi2bn(e), NULL) == 0)
- 		{
- 			RSA_free(rsa);
- 			return;
-@@ -2066,27 +2136,42 @@ public:
- 
- 	virtual BigInteger n() const
- 	{
--		return bn2bi(evp.pkey->pkey.rsa->n);
-+		RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey);
-+		const BIGNUM *bnn;
-+		RSA_get0_key(rsa, &bnn, NULL, NULL);
-+		return bn2bi(bnn);
- 	}
- 
- 	virtual BigInteger e() const
- 	{
--		return bn2bi(evp.pkey->pkey.rsa->e);
-+		RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey);
-+		const BIGNUM *bne;
-+		RSA_get0_key(rsa, NULL, &bne, NULL);
-+		return bn2bi(bne);
- 	}
- 
- 	virtual BigInteger p() const
- 	{
--		return bn2bi(evp.pkey->pkey.rsa->p);
-+		RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey);
-+		const BIGNUM *bnp;
-+		RSA_get0_factors(rsa, &bnp, NULL);
-+		return bn2bi(bnp);
- 	}
- 
- 	virtual BigInteger q() const
- 	{
--		return bn2bi(evp.pkey->pkey.rsa->q);
-+		RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey);
-+		const BIGNUM *bnq;
-+		RSA_get0_factors(rsa, NULL, &bnq);
-+		return bn2bi(bnq);
- 	}
- 
- 	virtual BigInteger d() const
- 	{
--		return bn2bi(evp.pkey->pkey.rsa->d);
-+		RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey);
-+		const BIGNUM *bnd;
-+		RSA_get0_key(rsa, NULL, NULL, &bnd);
-+		return bn2bi(bnd);
- 	}
- 
- private slots:
-@@ -2135,10 +2220,12 @@ public:
- 	virtual void run()
- 	{
- 		DSA *dsa = DSA_new();
--		dsa->p = bi2bn(domain.p());
--		dsa->q = bi2bn(domain.q());
--		dsa->g = bi2bn(domain.g());
--		if(!DSA_generate_key(dsa))
-+		BIGNUM *pne = bi2bn(domain.p()),
-+		*qne = bi2bn(domain.q()),
-+		*gne = bi2bn(domain.g());
-+
-+		if(!DSA_set0_pqg(dsa, pne, qne, gne)
-+		    || !DSA_generate_key(dsa))
- 		{
- 			DSA_free(dsa);
- 			return;
-@@ -2213,10 +2300,11 @@ public:
- 			return;
- 
- 		// extract the public key into DER format
--		int len = i2d_DSAPublicKey(evp.pkey->pkey.dsa, NULL);
-+		DSA *dsa_pkey = EVP_PKEY_get0_DSA(evp.pkey);
-+		int len = i2d_DSAPublicKey(dsa_pkey, NULL);
- 		SecureArray result(len);
- 		unsigned char *p = (unsigned char *)result.data();
--		i2d_DSAPublicKey(evp.pkey->pkey.dsa, &p);
-+		i2d_DSAPublicKey(dsa_pkey, &p);
- 		p = (unsigned char *)result.data();
- 
- 		// put the DER public key back into openssl
-@@ -2245,7 +2333,7 @@ public:
- 		else
- 			transformsig = false;
- 
--		evp.startSign(EVP_dss1());
-+		evp.startSign(EVP_sha1());
- 	}
- 
- 	virtual void startVerify(SignatureAlgorithm, SignatureFormat format)
-@@ -2256,7 +2344,7 @@ public:
- 		else
- 			transformsig = false;
- 
--		evp.startVerify(EVP_dss1());
-+		evp.startVerify(EVP_sha1());
- 	}
- 
- 	virtual void update(const MemoryRegion &in)
-@@ -2306,13 +2394,14 @@ public:
- 		evp.reset();
- 
- 		DSA *dsa = DSA_new();
--		dsa->p = bi2bn(domain.p());
--		dsa->q = bi2bn(domain.q());
--		dsa->g = bi2bn(domain.g());
--		dsa->pub_key = bi2bn(y);
--		dsa->priv_key = bi2bn(x);
-+		BIGNUM *bnp = bi2bn(domain.p());
-+		BIGNUM *bnq = bi2bn(domain.q());
-+		BIGNUM *bng = bi2bn(domain.g());
-+		BIGNUM *bnpub_key = bi2bn(y);
-+		BIGNUM *bnpriv_key = bi2bn(x);
- 
--		if(!dsa->p || !dsa->q || !dsa->g || !dsa->pub_key || !dsa->priv_key)
-+		if(!DSA_set0_pqg(dsa, bnp, bnq, bng)
-+		    || !DSA_set0_key(dsa, bnpub_key, bnpriv_key))
- 		{
- 			DSA_free(dsa);
- 			return;
-@@ -2328,12 +2417,13 @@ public:
- 		evp.reset();
- 
- 		DSA *dsa = DSA_new();
--		dsa->p = bi2bn(domain.p());
--		dsa->q = bi2bn(domain.q());
--		dsa->g = bi2bn(domain.g());
--		dsa->pub_key = bi2bn(y);
-+		BIGNUM *bnp = bi2bn(domain.p());
-+		BIGNUM *bnq = bi2bn(domain.q());
-+		BIGNUM *bng = bi2bn(domain.g());
-+		BIGNUM *bnpub_key = bi2bn(y);
- 
--		if(!dsa->p || !dsa->q || !dsa->g || !dsa->pub_key)
-+		if(!DSA_set0_pqg(dsa, bnp, bnq, bng)
-+		    || !DSA_set0_key(dsa, bnpub_key, NULL))
- 		{
- 			DSA_free(dsa);
- 			return;
-@@ -2346,17 +2436,26 @@ public:
- 
- 	virtual DLGroup domain() const
- 	{
--		return DLGroup(bn2bi(evp.pkey->pkey.dsa->p), bn2bi(evp.pkey->pkey.dsa->q), bn2bi(evp.pkey->pkey.dsa->g));
-+		DSA *dsa = EVP_PKEY_get0_DSA(evp.pkey);
-+		const BIGNUM *bnp, *bnq, *bng;
-+		DSA_get0_pqg(dsa, &bnp, &bnq, &bng);
-+		return DLGroup(bn2bi(bnp), bn2bi(bnq), bn2bi(bng));
- 	}
- 
- 	virtual BigInteger y() const
- 	{
--		return bn2bi(evp.pkey->pkey.dsa->pub_key);
-+		DSA *dsa = EVP_PKEY_get0_DSA(evp.pkey);
-+		const BIGNUM *bnpub_key;
-+		DSA_get0_key(dsa, &bnpub_key, NULL);
-+		return bn2bi(bnpub_key);
- 	}
- 
- 	virtual BigInteger x() const
- 	{
--		return bn2bi(evp.pkey->pkey.dsa->priv_key);
-+		DSA *dsa = EVP_PKEY_get0_DSA(evp.pkey);
-+		const BIGNUM *bnpriv_key;
-+		DSA_get0_key(dsa, NULL, &bnpriv_key);
-+		return bn2bi(bnpriv_key);
- 	}
- 
- private slots:
-@@ -2405,9 +2504,10 @@ public:
- 	virtual void run()
- 	{
- 		DH *dh = DH_new();
--		dh->p = bi2bn(domain.p());
--		dh->g = bi2bn(domain.g());
--		if(!DH_generate_key(dh))
-+		BIGNUM *bnp = bi2bn(domain.p());
-+		BIGNUM *bng = bi2bn(domain.g());
-+		if(!DH_set0_pqg(dh, bnp, NULL, bng)
-+		        || !DH_generate_key(dh))
- 		{
- 			DH_free(dh);
- 			return;
-@@ -2479,11 +2579,14 @@ public:
- 		if(!sec)
- 			return;
- 
--		DH *orig = evp.pkey->pkey.dh;
-+		DH *orig = EVP_PKEY_get0_DH(evp.pkey);
- 		DH *dh = DH_new();
--		dh->p = BN_dup(orig->p);
--		dh->g = BN_dup(orig->g);
--		dh->pub_key = BN_dup(orig->pub_key);
-+		const BIGNUM *bnp, *bng, *bnpub_key;
-+		DH_get0_pqg(orig, &bnp, NULL, &bng);
-+		DH_get0_key(orig, &bnpub_key, NULL);
-+
-+		DH_set0_key(dh, BN_dup(bnpub_key), NULL);
-+		DH_set0_pqg(dh, BN_dup(bnp), NULL, BN_dup(bng));
- 
- 		evp.reset();
- 
-@@ -2499,10 +2602,13 @@ public:
- 
- 	virtual SymmetricKey deriveKey(const PKeyBase &theirs)
- 	{
--		DH *dh = evp.pkey->pkey.dh;
--		DH *them = static_cast<const DHKey *>(&theirs)->evp.pkey->pkey.dh;
-+		DH *dh = EVP_PKEY_get0_DH(evp.pkey);
-+		DH *them = EVP_PKEY_get0_DH(static_cast<const DHKey *>(&theirs)->evp.pkey);
-+		const BIGNUM *bnpub_key;
-+		DH_get0_key(them, &bnpub_key, NULL);
-+
- 		SecureArray result(DH_size(dh));
--		int ret = DH_compute_key((unsigned char *)result.data(), them->pub_key, dh);
-+		int ret = DH_compute_key((unsigned char *)result.data(), bnpub_key, dh);
- 		if(ret <= 0)
- 			return SymmetricKey();
- 		result.resize(ret);
-@@ -2532,12 +2638,13 @@ public:
- 		evp.reset();
- 
- 		DH *dh = DH_new();
--		dh->p = bi2bn(domain.p());
--		dh->g = bi2bn(domain.g());
--		dh->pub_key = bi2bn(y);
--		dh->priv_key = bi2bn(x);
-+		BIGNUM *bnp = bi2bn(domain.p());
-+		BIGNUM *bng = bi2bn(domain.g());
-+		BIGNUM *bnpub_key = bi2bn(y);
-+		BIGNUM *bnpriv_key = bi2bn(x);
- 
--		if(!dh->p || !dh->g || !dh->pub_key || !dh->priv_key)
-+		if(!DH_set0_key(dh, bnpub_key, bnpriv_key)
-+		    || !DH_set0_pqg(dh, bnp, NULL, bng))
- 		{
- 			DH_free(dh);
- 			return;
-@@ -2553,11 +2660,12 @@ public:
- 		evp.reset();
- 
- 		DH *dh = DH_new();
--		dh->p = bi2bn(domain.p());
--		dh->g = bi2bn(domain.g());
--		dh->pub_key = bi2bn(y);
-+		BIGNUM *bnp = bi2bn(domain.p());
-+		BIGNUM *bng = bi2bn(domain.g());
-+		BIGNUM *bnpub_key = bi2bn(y);
- 
--		if(!dh->p || !dh->g || !dh->pub_key)
-+        if(!DH_set0_key(dh, bnpub_key, NULL)
-+                || !DH_set0_pqg(dh, bnp, NULL, bng))
- 		{
- 			DH_free(dh);
- 			return;
-@@ -2570,17 +2678,26 @@ public:
- 
- 	virtual DLGroup domain() const
- 	{
--		return DLGroup(bn2bi(evp.pkey->pkey.dh->p), bn2bi(evp.pkey->pkey.dh->g));
-+		DH *dh = EVP_PKEY_get0_DH(evp.pkey);
-+		const BIGNUM *bnp, *bng;
-+		DH_get0_pqg(dh, &bnp, NULL, &bng);
-+		return DLGroup(bn2bi(bnp), bn2bi(bng));
- 	}
- 
- 	virtual BigInteger y() const
- 	{
--		return bn2bi(evp.pkey->pkey.dh->pub_key);
-+		DH *dh = EVP_PKEY_get0_DH(evp.pkey);
-+		const BIGNUM *bnpub_key;
-+		DH_get0_key(dh, &bnpub_key, NULL);
-+		return bn2bi(bnpub_key);
- 	}
- 
- 	virtual BigInteger x() const
- 	{
--		return bn2bi(evp.pkey->pkey.dh->priv_key);
-+		DH *dh = EVP_PKEY_get0_DH(evp.pkey);
-+		const BIGNUM *bnpriv_key;
-+		DH_get0_key(dh, NULL, &bnpriv_key);
-+		return bn2bi(bnpriv_key);
- 	}
- 
- private slots:
-@@ -2619,10 +2736,14 @@ public:
- 	{
- 		key = _key;
- 		RSA_set_method(rsa, rsa_method());
-+#ifndef OSSL_110
- 		rsa->flags |= RSA_FLAG_SIGN_VER;
-+#endif
- 		RSA_set_app_data(rsa, this);
--		rsa->n = bi2bn(_key.n());
--		rsa->e = bi2bn(_key.e());
-+		BIGNUM *bnn = bi2bn(_key.n());
-+		BIGNUM *bne = bi2bn(_key.e());
-+
-+		RSA_set0_key(rsa, bnn, bne, NULL);
- 	}
- 
- 	RSA_METHOD *rsa_method()
-@@ -2631,12 +2752,16 @@ public:
- 
- 		if(!ops)
- 		{
--			ops = new RSA_METHOD(*RSA_get_default_method());
--			ops->rsa_priv_enc = 0;//pkcs11_rsa_encrypt;
--			ops->rsa_priv_dec = rsa_priv_dec;
--			ops->rsa_sign = rsa_sign;
--			ops->rsa_verify = 0;//pkcs11_rsa_verify;
--			ops->finish = rsa_finish;
-+			ops = RSA_meth_dup(RSA_get_default_method());
-+			RSA_meth_set_priv_enc(ops, NULL); //pkcs11_rsa_encrypt
-+			RSA_meth_set_priv_dec(ops, rsa_priv_dec); //pkcs11_rsa_encrypt
-+#ifdef OSSL_110
-+			RSA_meth_set_sign(ops, NULL);
-+#else
-+			RSA_meth_set_sign(ops, rsa_sign);
-+#endif
-+			RSA_meth_set_verify(ops, NULL); //pkcs11_rsa_verify
-+			RSA_meth_set_finish(ops, rsa_finish);
- 		}
- 		return ops;
- 	}
-@@ -2676,6 +2801,7 @@ public:
- 		return -1;
- 	}
- 
-+#ifndef OSSL_110
- 	static int rsa_sign(int type, const unsigned char *m, unsigned int m_len, unsigned char *sigret, unsigned int *siglen, const RSA *rsa)
- 	{
- 		QCA_RSA_METHOD *self = (QCA_RSA_METHOD *)RSA_get_app_data(rsa);
-@@ -2692,7 +2818,6 @@ public:
- 		}
- 		else
- 		{
--
- 			// make X509 packet
- 			X509_SIG sig;
- 			ASN1_TYPE parameter;
-@@ -2766,6 +2891,7 @@ public:
- 
- 		return 1;
- 	}
-+#endif
- 
- 	static int rsa_finish(RSA *rsa)
- 	{
-@@ -2867,21 +2993,22 @@ public:
- 	PKeyBase *pkeyToBase(EVP_PKEY *pkey, bool sec) const
- 	{
- 		PKeyBase *nk = 0;
--		if(pkey->type == EVP_PKEY_RSA)
-+		int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey));
-+		if(pkey_type == EVP_PKEY_RSA)
- 		{
- 			RSAKey *c = new RSAKey(provider());
- 			c->evp.pkey = pkey;
- 			c->sec = sec;
- 			nk = c;
- 		}
--		else if(pkey->type == EVP_PKEY_DSA)
-+		else if(pkey_type == EVP_PKEY_DSA)
- 		{
- 			DSAKey *c = new DSAKey(provider());
- 			c->evp.pkey = pkey;
- 			c->sec = sec;
- 			nk = c;
- 		}
--		else if(pkey->type == EVP_PKEY_DH)
-+		else if(pkey_type == EVP_PKEY_DH)
- 		{
- 			DHKey *c = new DHKey(provider());
- 			c->evp.pkey = pkey;
-@@ -2899,8 +3026,10 @@ public:
- 	{
- 		EVP_PKEY *pkey = get_pkey();
- 
-+		int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey));
-+
- 		// OpenSSL does not have DH import/export support
--		if(pkey->type == EVP_PKEY_DH)
-+		if(pkey_type == EVP_PKEY_DH)
- 			return QByteArray();
- 
- 		BIO *bo = BIO_new(BIO_s_mem());
-@@ -2913,8 +3042,10 @@ public:
- 	{
- 		EVP_PKEY *pkey = get_pkey();
- 
-+		int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey));
-+
- 		// OpenSSL does not have DH import/export support
--		if(pkey->type == EVP_PKEY_DH)
-+		if(pkey_type == EVP_PKEY_DH)
- 			return QString();
- 
- 		BIO *bo = BIO_new(BIO_s_mem());
-@@ -2979,9 +3110,10 @@ public:
- 			return SecureArray();
- 
- 		EVP_PKEY *pkey = get_pkey();
-+		int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey));
- 
- 		// OpenSSL does not have DH import/export support
--		if(pkey->type == EVP_PKEY_DH)
-+		if(pkey_type == EVP_PKEY_DH)
- 			return SecureArray();
- 
- 		BIO *bo = BIO_new(BIO_s_mem());
-@@ -3008,9 +3140,10 @@ public:
- 			return QString();
- 
- 		EVP_PKEY *pkey = get_pkey();
-+		int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey));
- 
- 		// OpenSSL does not have DH import/export support
--		if(pkey->type == EVP_PKEY_DH)
-+		if(pkey_type == EVP_PKEY_DH)
- 			return QString();
- 
- 		BIO *bo = BIO_new(BIO_s_mem());
-@@ -3111,11 +3244,18 @@ public:
- 			crl = from.crl;
- 
- 			if(cert)
--				CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509);
-+				X509_up_ref(cert);
- 			if(req)
-+			{
-+#ifdef OSSL_110
-+				// Not exposed, so copy
-+				req = X509_REQ_dup(req);
-+#else
- 				CRYPTO_add(&req->references, 1, CRYPTO_LOCK_X509_REQ);
-+#endif
-+			}
- 			if(crl)
--				CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509_CRL);
-+				X509_CRL_up_ref(crl);
- 		}
- 
- 		return *this;
-@@ -3221,7 +3361,7 @@ public:
- //
- // This code is mostly taken from OpenSSL v0.9.5a
- // by Eric Young
--QDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt)
-+QDateTime ASN1_UTCTIME_QDateTime(const ASN1_UTCTIME *tm, int *isGmt)
- {
- 	QDateTime qdt;
- 	char *v;
-@@ -3319,7 +3459,7 @@ public:
- 
- 	void fromX509(X509 *x)
- 	{
--		CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+		X509_up_ref(x);
- 		item.cert = x;
- 		make_props();
- 	}
-@@ -3350,7 +3490,7 @@ public:
- 		if(priv.key()->type() == PKey::RSA)
- 			md = EVP_sha1();
- 		else if(priv.key()->type() == PKey::DSA)
--			md = EVP_dss1();
-+			md = EVP_sha1();
- 		else
- 			return false;
- 
-@@ -3481,7 +3621,7 @@ public:
- 
- 		const MyCertContext *our_cc = this;
- 		X509 *x = our_cc->item.cert;
--		CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+		X509_up_ref(x);
- 		sk_X509_push(untrusted_list, x);
- 
- 		const MyCertContext *other_cc = static_cast<const MyCertContext *>(other);
-@@ -3596,14 +3736,21 @@ public:
- 				p.policies = get_cert_policies(ex);
- 		}
- 
--		if (x->signature)
-+#ifdef OSSL_110
-+		const
-+#endif
-+		ASN1_BIT_STRING *signature;
-+
-+		X509_get0_signature(&signature, NULL, x);
-+		if(signature)
- 		{
--			p.sig = QByteArray(x->signature->length, 0);
--			for (int i=0; i< x->signature->length; i++)
--				p.sig[i] = x->signature->data[i];
-+			p.sig = QByteArray(signature->length, 0);
-+			for (int i=0; i< signature->length; i++)
-+				p.sig[i] = signature->data[i];
- 		}
- 
--		switch( OBJ_obj2nid(x->cert_info->signature->algorithm) )
-+
-+		switch( X509_get_signature_nid(x) )
- 		{
- 		case NID_sha1WithRSAEncryption:
- 			p.sigalgo = QCA::EMSA3_SHA1;
-@@ -3635,7 +3782,7 @@ public:
- 			p.sigalgo = QCA::EMSA3_SHA512;
- 			break;
- 		default:
--			qDebug() << "Unknown signature value: " << OBJ_obj2nid(x->cert_info->signature->algorithm);
-+			qDebug() << "Unknown signature value: " << X509_get_signature_nid(x);
- 			p.sigalgo = QCA::SignatureUnknown;
- 		}
- 
-@@ -3752,7 +3899,7 @@ public:
- 		if(privateKey -> key()->type() == PKey::RSA)
- 			md = EVP_sha1();
- 		else if(privateKey -> key()->type() == PKey::DSA)
--			md = EVP_dss1();
-+			md = EVP_sha1();
- 		else
- 			return 0;
- 
-@@ -3935,7 +4082,7 @@ public:
- 		if(priv.key()->type() == PKey::RSA)
- 			md = EVP_sha1();
- 		else if(priv.key()->type() == PKey::DSA)
--			md = EVP_dss1();
-+			md = EVP_sha1();
- 		else
- 			return false;
- 
-@@ -4096,14 +4243,17 @@ public:
- 
- 		sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
- 
--		if (x->signature)
-+		const ASN1_BIT_STRING *signature;
-+
-+		X509_REQ_get0_signature(x, &signature, NULL);
-+		if(signature)
- 		{
--			p.sig = QByteArray(x->signature->length, 0);
--			for (int i=0; i< x->signature->length; i++)
--				p.sig[i] = x->signature->data[i];
-+			p.sig = QByteArray(signature->length, 0);
-+			for (int i=0; i< signature->length; i++)
-+				p.sig[i] = signature->data[i];
- 		}
- 
--		switch( OBJ_obj2nid(x->sig_alg->algorithm) )
-+		switch( X509_REQ_get_signature_nid(x) )
- 		{
- 		case NID_sha1WithRSAEncryption:
- 			p.sigalgo = QCA::EMSA3_SHA1;
-@@ -4123,7 +4273,7 @@ public:
- 			p.sigalgo = QCA::EMSA1_SHA1;
- 			break;
- 		default:
--			qDebug() << "Unknown signature value: " << OBJ_obj2nid(x->sig_alg->algorithm);
-+			qDebug() << "Unknown signature value: " << X509_REQ_get_signature_nid(x);
- 			p.sigalgo = QCA::SignatureUnknown;
- 		}
- 
-@@ -4187,7 +4337,7 @@ public:
- 
- 	void fromX509(X509_CRL *x)
- 	{
--		CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL);
-+		X509_CRL_up_ref(x);
- 		item.crl = x;
- 		make_props();
- 	}
-@@ -4232,15 +4382,15 @@ public:
- 
- 		issuer = get_cert_name(X509_CRL_get_issuer(x));
- 
--		p.thisUpdate = ASN1_UTCTIME_QDateTime(X509_CRL_get_lastUpdate(x), NULL);
--		p.nextUpdate = ASN1_UTCTIME_QDateTime(X509_CRL_get_nextUpdate(x), NULL);
-+		p.thisUpdate = ASN1_UTCTIME_QDateTime(X509_CRL_get0_lastUpdate(x), NULL);
-+		p.nextUpdate = ASN1_UTCTIME_QDateTime(X509_CRL_get0_nextUpdate(x), NULL);
- 
- 		STACK_OF(X509_REVOKED)* revokeStack  = X509_CRL_get_REVOKED(x);
- 
- 		for (int i = 0; i < sk_X509_REVOKED_num(revokeStack); ++i) {
- 			X509_REVOKED *rev = sk_X509_REVOKED_value(revokeStack, i);
--			BigInteger serial = bn2bi(ASN1_INTEGER_to_BN(rev->serialNumber, NULL));
--			QDateTime time = ASN1_UTCTIME_QDateTime( rev->revocationDate, NULL);
-+			BigInteger serial = bn2bi(ASN1_INTEGER_to_BN(X509_REVOKED_get0_serialNumber(rev), NULL));
-+			QDateTime time = ASN1_UTCTIME_QDateTime( X509_REVOKED_get0_revocationDate(rev), NULL);
- 			QCA::CRLEntry::Reason reason = QCA::CRLEntry::Unspecified;
- 			int pos = X509_REVOKED_get_ext_by_NID(rev, NID_crl_reason, -1);
- 			if (pos != -1) {
-@@ -4289,13 +4439,18 @@ public:
- 			p.revoked.append(thisEntry);
- 		}
- 
--		if (x->signature)
-+		const ASN1_BIT_STRING *signature;
-+
-+		X509_CRL_get0_signature(x, &signature, NULL);
-+		if(signature)
- 		{
--			p.sig = QByteArray(x->signature->length, 0);
--			for (int i=0; i< x->signature->length; i++)
--				p.sig[i] = x->signature->data[i];
-+			p.sig = QByteArray(signature->length, 0);
-+			for (int i=0; i< signature->length; i++)
-+				p.sig[i] = signature->data[i];
- 		}
--		switch( OBJ_obj2nid(x->sig_alg->algorithm) )
-+
-+
-+		switch( X509_CRL_get_signature_nid(x) )
- 		{
- 		case NID_sha1WithRSAEncryption:
- 			p.sigalgo = QCA::EMSA3_SHA1;
-@@ -4327,7 +4482,7 @@ public:
- 			p.sigalgo = QCA::EMSA3_SHA512;
- 			break;
- 		default:
--			qWarning() << "Unknown signature value: " << OBJ_obj2nid(x->sig_alg->algorithm);
-+			qWarning() << "Unknown signature value: " << X509_CRL_get_signature_nid(x);
- 			p.sigalgo = QCA::SignatureUnknown;
- 		}
- 
-@@ -4488,21 +4643,21 @@ Validity MyCertContext::validate(const QList<CertContext*> &trusted, const QList
- 	{
- 		const MyCertContext *cc = static_cast<const MyCertContext *>(trusted[n]);
- 		X509 *x = cc->item.cert;
--		CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+		X509_up_ref(x);
- 		sk_X509_push(trusted_list, x);
- 	}
- 	for(n = 0; n < untrusted.count(); ++n)
- 	{
- 		const MyCertContext *cc = static_cast<const MyCertContext *>(untrusted[n]);
- 		X509 *x = cc->item.cert;
--		CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+		X509_up_ref(x);
- 		sk_X509_push(untrusted_list, x);
- 	}
- 	for(n = 0; n < crls.count(); ++n)
- 	{
- 		const MyCRLContext *cc = static_cast<const MyCRLContext *>(crls[n]);
- 		X509_CRL *x = cc->item.crl;
--		CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL);
-+		X509_CRL_up_ref(x);
- 		crl_list.append(x);
- 	}
- 
-@@ -4527,7 +4682,7 @@ Validity MyCertContext::validate(const QList<CertContext*> &trusted, const QList
- 	int ret = X509_verify_cert(ctx);
- 	int err = -1;
- 	if(!ret)
--		err = ctx->error;
-+		err = X509_STORE_CTX_get_error(ctx);
- 
- 	// cleanup
- 	X509_STORE_CTX_free(ctx);
-@@ -4561,21 +4716,21 @@ Validity MyCertContext::validate_chain(const QList<CertContext*> &chain, const Q
- 	{
- 		const MyCertContext *cc = static_cast<const MyCertContext *>(trusted[n]);
- 		X509 *x = cc->item.cert;
--		CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+		X509_up_ref(x);
- 		sk_X509_push(trusted_list, x);
- 	}
- 	for(n = 1; n < chain.count(); ++n)
- 	{
- 		const MyCertContext *cc = static_cast<const MyCertContext *>(chain[n]);
- 		X509 *x = cc->item.cert;
--		CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+		X509_up_ref(x);
- 		sk_X509_push(untrusted_list, x);
- 	}
- 	for(n = 0; n < crls.count(); ++n)
- 	{
- 		const MyCRLContext *cc = static_cast<const MyCRLContext *>(crls[n]);
- 		X509_CRL *x = cc->item.crl;
--		CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL);
-+		X509_CRL_up_ref(x);
- 		crl_list.append(x);
- 	}
- 
-@@ -4600,7 +4755,7 @@ Validity MyCertContext::validate_chain(const QList<CertContext*> &chain, const Q
- 	int ret = X509_verify_cert(ctx);
- 	int err = -1;
- 	if(!ret)
--		err = ctx->error;
-+		err = X509_STORE_CTX_get_error(ctx);
- 
- 	// grab the chain, which may not be fully populated
- 	STACK_OF(X509) *xchain = X509_STORE_CTX_get_chain(ctx);
-@@ -4664,7 +4819,7 @@ public:
- 			for(int n = 1; n < chain.count(); ++n)
- 			{
- 				X509 *x = static_cast<const MyCertContext *>(chain[n])->item.cert;
--				CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+				X509_up_ref(x);
- 				sk_X509_push(ca, x);
- 			}
- 		}
-@@ -5399,7 +5554,7 @@ public:
- 		OpenSSL_add_ssl_algorithms();
- 		SSL_CTX *ctx = 0;
- 		switch (version) {
--#ifndef OPENSSL_NO_SSL2
-+#if !defined(OPENSSL_NO_SSL2) && !defined(OSSL_110)
- 		case TLS::SSL_v2:
- 			ctx = SSL_CTX_new(SSLv2_client_method());
- 			break;
-@@ -5430,8 +5585,8 @@ public:
- 		STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl);
- 		QStringList cipherList;
- 		for(int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) {
--			SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i);
--			cipherList += cipherIDtoString(version, thisCipher->id);
-+			const SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i);
-+			cipherList += cipherIDtoString(version, SSL_CIPHER_get_id(thisCipher));
- 		}
- 
- 		SSL_free(ssl);
-@@ -5808,13 +5963,15 @@ public:
- 	{
- 		SessionInfo sessInfo;
- 
--		sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session));
-+		SSL_SESSION *session = SSL_get0_session(ssl);
-+		sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(session));
-+		int ssl_version = SSL_version(ssl);
- 
--		if (ssl->version == TLS1_VERSION)
-+		if (ssl_version == TLS1_VERSION)
- 			sessInfo.version = TLS::TLS_v1;
--		else if (ssl->version == SSL3_VERSION)
-+		else if (ssl_version == SSL3_VERSION)
- 			sessInfo.version = TLS::SSL_v3;
--		else if (ssl->version == SSL2_VERSION)
-+		else if (ssl_version == SSL2_VERSION)
- 			sessInfo.version = TLS::SSL_v2;
- 		else {
- 			qDebug("unexpected version response");
-@@ -5822,7 +5979,7 @@ public:
- 		}
- 
- 		sessInfo.cipherSuite = cipherIDtoString( sessInfo.version,
--												 SSL_get_current_cipher(ssl)->id);
-+		                                         SSL_CIPHER_get_id(SSL_get_current_cipher(ssl)));
- 
- 		sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl, &(sessInfo.cipherBits));
- 
-@@ -6394,7 +6551,7 @@ public:
- 			for(int n = 0; n < nonroots.count(); ++n)
- 			{
- 				X509 *x = static_cast<MyCertContext *>(nonroots[n].context())->item.cert;
--				CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+				X509_up_ref(x);
- 				sk_X509_push(other_certs, x);
- 			}
- 
-@@ -6436,7 +6593,7 @@ public:
- 
- 			other_certs = sk_X509_new_null();
- 			X509 *x = static_cast<MyCertContext *>(target.context())->item.cert;
--			CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+			X509_up_ref(x);
- 			sk_X509_push(other_certs, x);
- 
- 			bi = BIO_new(BIO_s_mem());
-@@ -6499,7 +6656,7 @@ public:
- 			for(int n = 0; n < untrusted_list.count(); ++n)
- 			{
- 				X509 *x = static_cast<MyCertContext *>(untrusted_list[n].context())->item.cert;
--				CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
-+				X509_up_ref(x);
- 				sk_X509_push(other_certs, x);
- 			}
- 
-@@ -6750,14 +6907,27 @@ public:
- 	opensslCipherContext(const EVP_CIPHER *algorithm, const int pad, Provider *p, const QString &type) : CipherContext(p, type)
- 	{
- 		m_cryptoAlgorithm = algorithm;
--		EVP_CIPHER_CTX_init(&m_context);
-+		m_context = EVP_CIPHER_CTX_new();
-+		EVP_CIPHER_CTX_init(m_context);
- 		m_pad = pad;
- 		m_type = type;
- 	}
- 
-+	opensslCipherContext(const opensslCipherContext &other)
-+	    : CipherContext(other)
-+	{
-+		m_cryptoAlgorithm = other.m_cryptoAlgorithm;
-+		m_context = EVP_CIPHER_CTX_new();
-+		EVP_CIPHER_CTX_copy(m_context, other.m_context);
-+		m_direction = other.m_direction;
-+		m_pad = other.m_pad;
-+		m_type = other.m_type;
-+	}
-+
- 	~opensslCipherContext()
- 	{
--		EVP_CIPHER_CTX_cleanup(&m_context);
-+		EVP_CIPHER_CTX_cleanup(m_context);
-+		EVP_CIPHER_CTX_free(m_context);
- 	}
- 
- 	void setup(Direction dir,
-@@ -6772,20 +6943,20 @@ public:
- 			m_cryptoAlgorithm = EVP_des_ede();
- 		}
- 		if (Encode == m_direction) {
--			EVP_EncryptInit_ex(&m_context, m_cryptoAlgorithm, 0, 0, 0);
--			EVP_CIPHER_CTX_set_key_length(&m_context, key.size());
-+			EVP_EncryptInit_ex(m_context, m_cryptoAlgorithm, 0, 0, 0);
-+			EVP_CIPHER_CTX_set_key_length(m_context, key.size());
--			EVP_EncryptInit_ex(&m_context, 0, 0,
-+			EVP_EncryptInit_ex(m_context, 0, 0,
- 							   (const unsigned char*)(key.data()),
- 							   (const unsigned char*)(iv.data()));
- 		} else {
--			EVP_DecryptInit_ex(&m_context, m_cryptoAlgorithm, 0, 0, 0);
--			EVP_CIPHER_CTX_set_key_length(&m_context, key.size());
-+			EVP_DecryptInit_ex(m_context, m_cryptoAlgorithm, 0, 0, 0);
-+			EVP_CIPHER_CTX_set_key_length(m_context, key.size());
--			EVP_DecryptInit_ex(&m_context, 0, 0,
-+			EVP_DecryptInit_ex(m_context, 0, 0,
- 							   (const unsigned char*)(key.data()),
- 							   (const unsigned char*)(iv.data()));
- 		}
- 
--		EVP_CIPHER_CTX_set_padding(&m_context, m_pad);
-+		EVP_CIPHER_CTX_set_padding(m_context, m_pad);
- 	}
- 
- 	Provider::Context *clone() const
-@@ -6803,7 +6974,7 @@ public:
- 
- 	int blockSize() const
- 	{
--		return EVP_CIPHER_CTX_block_size(&m_context);
-+		return EVP_CIPHER_CTX_block_size(m_context);
- 	}
- 
- 	bool update(const SecureArray &in, SecureArray *out)
-@@ -6821,7 +6992,7 @@ public:
- 		out->resize(in.size()+blockSize());
- 		int resultLength;
- 		if (Encode == m_direction) {
--			if (0 == EVP_EncryptUpdate(&m_context,
-+			if (0 == EVP_EncryptUpdate(m_context,
- 									   (unsigned char*)out->data(),
- 									   &resultLength,
- 									   (unsigned char*)in.data(),
-@@ -6829,7 +7000,7 @@ public:
- 				return false;
- 			}
- 		} else {
--			if (0 == EVP_DecryptUpdate(&m_context,
-+			if (0 == EVP_DecryptUpdate(m_context,
- 									   (unsigned char*)out->data(),
- 									   &resultLength,
- 									   (unsigned char*)in.data(),
-@@ -6846,13 +7017,13 @@ public:
- 		out->resize(blockSize());
- 		int resultLength;
- 		if (Encode == m_direction) {
--			if (0 == EVP_EncryptFinal_ex(&m_context,
-+			if (0 == EVP_EncryptFinal_ex(m_context,
- 										 (unsigned char*)out->data(),
- 										 &resultLength)) {
- 				return false;
- 			}
- 		} else {
--			if (0 == EVP_DecryptFinal_ex(&m_context,
-+			if (0 == EVP_DecryptFinal_ex(m_context,
- 										 (unsigned char*)out->data(),
- 										 &resultLength)) {
- 				return false;
-@@ -6899,7 +7070,7 @@ public:
- 
- 
- protected:
--	EVP_CIPHER_CTX m_context;
-+	EVP_CIPHER_CTX *m_context;
- 	const EVP_CIPHER *m_cryptoAlgorithm;
- 	Direction m_direction;
- 	int m_pad;
diff --git a/source/l/qca/qca.SlackBuild b/source/l/qca/qca.SlackBuild
index c76db2da6..550c32d05 100755
--- a/source/l/qca/qca.SlackBuild
+++ b/source/l/qca/qca.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-# Copyright 2006, 2008, 2009, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015, 2016, 2017, 2018, 2019, 2020  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,23 +21,22 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by Robby Workman <rworkman@slackware.com> for qca-2.0.0
-# No additional license terms and no copyright claim
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qca
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+SRCNAM=qca
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
-# Automatically determine architecture for build & packaging:
+# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)    export ARCH=$( uname -m ) ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -47,72 +47,82 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
+
 cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
-cd $PKGNAM-$VERSION || exit 1
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
+cd $SRCNAM-$VERSION || exit 1
+
 chown -R root:root .
 find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-# Support OpenSSL-1.1.x:
-zcat $CWD/Add_support_for_OpenSSL_1.1.0.diff.gz | patch -p1 --verbose || exit 1
-
-# This unit test patch won't apply, so whatever. Don't need it.
-#qca.tlsunittest.cpp.diff.gz | patch -p1 --verbose || exit 1
-
-mkdir build
-cd build
-
-cmake \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DQCA_MAN_INSTALL_DIR=/usr/man \
-  -DQCA_FEATURE_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/qt/mkspecs/features/ \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \
-  -DLIB_SUFFIX="${LIBDIRSUFFIX}" \
-  -DQT4_BUILD:BOOL=ON \
-  .. || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+# Configure, build, and install:
+mkdir cmake-build
+cd cmake-build
+  cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DQCA_MAN_INSTALL_DIR=/usr/man \
+    -DQCA_INSTALL_IN_QT_PREFIX:BOOL=ON \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_TESTS:BOOL=OFF \
+    .. || exit 1
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd ..
 
-gzip -9 $PKG/usr/man/man?/*.?
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-cd ..
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  COPYING INSTALL README TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
+  COPYING* INSTALL* README* TODO* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n /tmp/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/l/qca/qca.tlsunittest.cpp.diff b/source/l/qca/qca.tlsunittest.cpp.diff
deleted file mode 100644
index 0b3d6090a..000000000
--- a/source/l/qca/qca.tlsunittest.cpp.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/unittest/tls/tlsunittest.cpp b/unittest/tls/tlsunittest.cpp
-index 38caf2d..ba8ed94 100644
---- a/unittest/tls/tlsunittest.cpp
-+++ b/unittest/tls/tlsunittest.cpp
-@@ -60,14 +60,16 @@ void TLSUnitTest::testCipherList()
- 	QCA::TLS *tls = new QCA::TLS(QCA::TLS::Stream, 0, "qca-ossl");
- 	QStringList cipherList = tls->supportedCipherSuites(QCA::TLS::TLS_v1);
- 	QVERIFY( cipherList.contains("TLS_DHE_RSA_WITH_AES_256_CBC_SHA") );
--	QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_256_CBC_SHA") );
- 	QVERIFY( cipherList.contains("TLS_RSA_WITH_AES_256_CBC_SHA") );
--	QVERIFY( cipherList.contains("TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA") );
--	QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA") );
--	QVERIFY( cipherList.contains("TLS_RSA_WITH_3DES_EDE_CBC_SHA") );
- 	QVERIFY( cipherList.contains("TLS_DHE_RSA_WITH_AES_128_CBC_SHA") );
--	QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_128_CBC_SHA") );
--	QVERIFY( cipherList.contains("TLS_RSA_WITH_AES_128_CBC_SHA") );
-+
-+	// openSUSE TW OpenSSL 1.1 does not have this
-+	// QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_256_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("TLS_RSA_WITH_3DES_EDE_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("TLS_RSA_WITH_AES_128_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_128_CBC_SHA") );
- 
- 	// Fedora 26 openssl has no this cipher suites.
- 	// QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_SHA") );
-@@ -89,16 +91,17 @@ void TLSUnitTest::testCipherList()
- 	// QVERIFY( cipherList.contains("TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5") );
- 	// QVERIFY( cipherList.contains("TLS_RSA_EXPORT_WITH_RC4_40_MD5") );
- 
--	cipherList = tls->supportedCipherSuites(QCA::TLS::SSL_v3);
--	QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_AES_256_CBC_SHA") );
--	QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_256_CBC_SHA") );
--	QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_256_CBC_SHA") );
--	QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA") );
--	QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA") );
--	QVERIFY( cipherList.contains("SSL_RSA_WITH_3DES_EDE_CBC_SHA") );
--	QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_AES_128_CBC_SHA") );
--	QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_128_CBC_SHA") );
--	QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_128_CBC_SHA") );
-+	// OpenSSL 1.1 in openSUSE TW has it disabled by default
-+	// cipherList = tls->supportedCipherSuites(QCA::TLS::SSL_v3);
-+	// QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_AES_256_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_256_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_256_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("SSL_RSA_WITH_3DES_EDE_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_AES_128_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_128_CBC_SHA") );
-+	// QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_128_CBC_SHA") );
- 
- 	// Fedora 22 has no SSL_RSA_WITH_RC4_128_MD5
- 	// QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_MD5") );
--- 
-cgit v0.11.2
-
diff --git a/source/l/qca-qt5/qca-qt5.url b/source/l/qca/qca.url
index 6761b96a5..6761b96a5 100644
--- a/source/l/qca-qt5/qca-qt5.url
+++ b/source/l/qca/qca.url
diff --git a/source/l/qca/slack-desc b/source/l/qca/slack-desc
index fe30b1a34..ec4e9f0d6 100644
--- a/source/l/qca/slack-desc
+++ b/source/l/qca/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
    |-----handy-ruler------------------------------------------------------|
 qca: qca (Qt Cryptographic Architecture)
 qca:
-qca: QCA aims to provide a straightforward and cross-platform crypto API,
-qca: using Qt datatypes and conventions. QCA separates the API from the
-qca: implementation, using plugins known as Providers. The advantage of
-qca: this model is to allow applications to avoid linking to or explicitly
-qca: depending on any particular cryptographic library. This allows one
-qca: to easily change or upgrade crypto implementations without needing
-qca: to recompile the application.
+qca: QCA aims to provide a straightforward and cross-platform cryptographic
+qca: API using Qt datatypes and conventions. The library and plugins
+qca: support a range of cryptographic features, including SSL/TLS, X.509
+qca: certificates, SASL, OpenPGP, smartcards, and much more.
+qca:
+qca: Homepage: https://github.com/KDE/qca
+qca:
+qca:
 qca:
-qca: QCA was written by Justin Karneges.
diff --git a/source/l/qimageblitz/qimageblitz.SlackBuild b/source/l/qimageblitz/qimageblitz.SlackBuild
deleted file mode 100755
index 578a16cd4..000000000
--- a/source/l/qimageblitz/qimageblitz.SlackBuild
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007-2008 Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=qimageblitz
-VERSION=0.0.6
-BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-qimageblitz
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf qimageblitz-$VERSION
-tar xvf $CWD/qimageblitz-$VERSION.tar.bz2 || exit 1
-cd qimageblitz-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
-  PATH=$QTDIR/bin:$PATH \
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd -
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/usr/doc/qimageblitz-$VERSION
-cp -a AUTHORS COPYING* README* $PKG/usr/doc/qimageblitz-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/qimageblitz-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/qimageblitz/qimageblitz.info b/source/l/qimageblitz/qimageblitz.info
deleted file mode 100644
index 49a399536..000000000
--- a/source/l/qimageblitz/qimageblitz.info
+++ /dev/null
@@ -1,8 +0,0 @@
-PRGNAM="qimageblitz"
-VERSION="0.0.4"
-HOMEPAGE="http://sourceforge.net/projects/qimageblitz"
-DOWNLOAD="http://downloads.sourceforge.net/qimageblitz/qimageblitz-0.0.4.tar.bz2"
-MD5SUM="cb87c7f1c0455e8984ee4830f1e749cf"
-MAINTAINER="Robby Workman"
-EMAIL="rw@rlworkman.net"
-APPROVED=
diff --git a/source/l/qimageblitz/slack-desc b/source/l/qimageblitz/slack-desc
deleted file mode 100644
index a4d3e34a7..000000000
--- a/source/l/qimageblitz/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------|
-qimageblitz: qimageblitz (Graphical effect and filter library for KDE4)
-qimageblitz:
-qimageblitz: Blitz is a graphical effect and filter library for KDE4.0 that 
-qimageblitz: contains many improvements over KDE 3.x's kdefx library 
-qimageblitz: including bugfixes, memory and speed improvements, and MMX/SSE
-qimageblitz: support.
-qimageblitz:
-qimageblitz:
-qimageblitz:
-qimageblitz:
-qimageblitz:
diff --git a/source/l/qjson/qjson.SlackBuild b/source/l/qjson/qjson.SlackBuild
deleted file mode 100755
index caf678b3f..000000000
--- a/source/l/qjson/qjson.SlackBuild
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-# Copyright 2013  Eric Hameleers, Eindhoven, NL
-# Copyright 2013, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=qjson
-VERSION=${VERSION:-0.9.0}
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMAN_INSTALL_DIR=/usr/man \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd -
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  README* COPYING* doc \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/qjson/slack-desc b/source/l/qjson/slack-desc
deleted file mode 100644
index 994c01fb6..000000000
--- a/source/l/qjson/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-qjson: qjson (manage JSON objects with Qt)
-qjson:
-qjson: JSON (JavaScript Object Notation) is a lightweight data-interchange
-qjson: format. It can represents integer, real number, string, an ordered
-qjson: sequence of value, and a collection of name/value pairs.
-qjson: QJson is a qt-based library that maps JSON data to QVariant objects:
-qjson: JSON arrays will be mapped to QVariantList instances, while JSON's
-qjson: objects will be mapped to QVariantMap.
-qjson:
-qjson: http://qjson.sourceforge.net/
-qjson:
diff --git a/testing/source/vtown/deps/qrencode/qrencode.SlackBuild b/source/l/qrencode/qrencode.SlackBuild
index 76293e426..476045f12 100755
--- a/testing/source/vtown/deps/qrencode/qrencode.SlackBuild
+++ b/source/l/qrencode/qrencode.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qrencode
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/qrencode/qrencode.url b/source/l/qrencode/qrencode.url
index fb85876b6..fb85876b6 100644
--- a/testing/source/vtown/deps/qrencode/qrencode.url
+++ b/source/l/qrencode/qrencode.url
diff --git a/testing/source/vtown/deps/qrencode/slack-desc b/source/l/qrencode/slack-desc
index ec1095650..ec1095650 100644
--- a/testing/source/vtown/deps/qrencode/slack-desc
+++ b/source/l/qrencode/slack-desc
diff --git a/source/l/qt-gstreamer/doinst.sh b/source/l/qt-gstreamer/doinst.sh
deleted file mode 100644
index aab1b9e3c..000000000
--- a/source/l/qt-gstreamer/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1
-fi
-
diff --git a/source/l/qt-gstreamer/qt-gstreamer.SlackBuild b/source/l/qt-gstreamer/qt-gstreamer.SlackBuild
deleted file mode 100755
index 3270912dc..000000000
--- a/source/l/qt-gstreamer/qt-gstreamer.SlackBuild
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh 
-
-# Copyright 2014, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2014  Eric Hameleers, Eindhoven, NL
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=qt-gstreamer
-VERSION=${VERSION:-1.2.0}
-BUILD=${BUILD:-2}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-# Fix build with gstreamer-1.16.x. This is rather pointless since qt-gstreamer
-# is considered dead (in -current only artikulate uses it, and in Plasma 5
-# nothing does), but we'll queue a fix for the FTBFS anyway:
-zcat $CWD/qt-gstreamer.gstreamer-1.16.x.diff.gz | patch -p1 --verbose || exit 1
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DQT_VERSION=4 \
-    ..
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG || exit 1
-cd -
-
-# Conditional build of Qt5 support:
-if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
-  mkdir -p build-qt5
-  cd build-qt5
-    cmake \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-      -DQT_VERSION=5 \
-      ..
-    make $NUMJOBS || make || exit 1
-    make install DESTDIR=$PKG || exit 1
-  cd -
-fi
-
-if [ -d $PKG/usr/man ]; then
-  gzip -9 $PKG/usr/man/man?/*
-fi
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  COPYING HACKING NEWS README \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/qt-gstreamer/qt-gstreamer.gstreamer-1.16.x.diff b/source/l/qt-gstreamer/qt-gstreamer.gstreamer-1.16.x.diff
deleted file mode 100644
index d97ace63d..000000000
--- a/source/l/qt-gstreamer/qt-gstreamer.gstreamer-1.16.x.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./src/QGst/caps.cpp.orig	2014-07-08 13:38:36.000000000 -0500
-+++ ./src/QGst/caps.cpp	2019-04-21 20:39:17.810000919 -0500
-@@ -54,7 +54,8 @@
- 
- void Caps::append(const CapsPtr & caps2)
- {
--    gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2));
-+    GstCaps *caps3 = caps2;
-+    gst_caps_append(object<GstCaps>(), gst_caps_copy(caps3));
- }
- 
- CapsPtr Caps::merge(CapsPtr & caps2)
diff --git a/source/l/qt-gstreamer/slack-desc b/source/l/qt-gstreamer/slack-desc
deleted file mode 100644
index 08d633d91..000000000
--- a/source/l/qt-gstreamer/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-            |-----handy-ruler-----------------------------------------------------|
-qt-gstreamer: qt-gstreamer (C++ bindings for gstreamer)
-qt-gstreamer:
-qt-gstreamer: QtGStreamer provides C++ bindings for GStreamer with a Qt-style API,
-qt-gstreamer: plus some helper classes and elements for integrating GStreamer
-qt-gstreamer: better in Qt applications.
-qt-gstreamer: The goal of this module is to allow easy use of GStreamer for
-qt-gstreamer: applications targetting MeeGo Mobile or the KDE desktop.
-qt-gstreamer:
-qt-gstreamer: Homepage:
-qt-gstreamer:  http://gstreamer.freedesktop.org/modules/qt-gstreamer.html
-qt-gstreamer:
diff --git a/source/l/qt/Qt.pc b/source/l/qt/Qt.pc
deleted file mode 100644
index 29d1131c6..000000000
--- a/source/l/qt/Qt.pc
+++ /dev/null
@@ -1,16 +0,0 @@
-prefix=/usr/lib${LIBDIRSUFFIX}/qt
-bindir=${prefix}/bin
-datadir=${prefix}
-docdir=${prefix}/doc
-headerdir=${prefix}/include
-importdir=${prefix}/imports
-libdir=${prefix}/lib
-moc=${bindir}/moc
-plugindir=${prefix}/plugins
-qmake=${bindir}/qmake
-sysconfdir=/etc
-translationdir=${prefix}/translations
-
-Name: Qt
-Description: Qt Configuration
-Version: 4.8.6
diff --git a/source/l/qt/README b/source/l/qt/README
deleted file mode 100644
index 9bbcb3467..000000000
--- a/source/l/qt/README
+++ /dev/null
@@ -1,9 +0,0 @@
-qt-<version>_<git revision> is actually KDE's version of Qt from git
-that includes important patches not yet present in mainline Qt.
-
-The recommended version of Qt for KDE may be obtained from the
-repository with this command:
-
-git clone git://gitorious.org/+kde-developers/qt/kde-qt.git
-
-(see the SlackBuild for more details)
diff --git a/source/l/qt/doinst.sh b/source/l/qt/doinst.sh
deleted file mode 100644
index b9a2c53ba..000000000
--- a/source/l/qt/doinst.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-if [ -x sbin/ldconfig ]; then
-  chroot . /sbin/ldconfig 2> /dev/null
-fi
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
-fi
-
-
diff --git a/source/l/qt/patches/qt-4.8-disable-sslv3.patch b/source/l/qt/patches/qt-4.8-disable-sslv3.patch
deleted file mode 100644
index c9b1996ec..000000000
--- a/source/l/qt/patches/qt-4.8-disable-sslv3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2019-11-09 12:55:26.646752874 -0600
-+++ ./src/network/ssl/qsslsocket_openssl_symbols.cpp	2019-11-09 12:58:22.032754751 -0600
-@@ -253,7 +253,9 @@
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- #if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #else
-@@ -263,7 +265,9 @@
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- #if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #else
-@@ -272,7 +276,9 @@
- DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #else
- DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#ifndef OPENSSL_NO_SSL3
- DEFINEFUNC(SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
-@@ -756,7 +762,9 @@
-     RESOLVEFUNC(SSL_shutdown, 173, libs.first )
-     RESOLVEFUNC(SSL_write, 188, libs.first )
-     RESOLVEFUNC(SSLv2_client_method, 192, libs.first )
-+#ifndef OPENSSL_NO_SSL3
-     RESOLVEFUNC(SSLv3_client_method, 195, libs.first )
-+#endif
-     RESOLVEFUNC(SSLv23_client_method, 189, libs.first )
-     RESOLVEFUNC(TLSv1_client_method, 198, libs.first )
-     RESOLVEFUNC(SSLv2_server_method, 194, libs.first )
---- ./src/network/ssl/qsslsocket_openssl.cpp.orig	2019-11-09 12:55:01.605752606 -0600
-+++ ./src/network/ssl/qsslsocket_openssl.cpp	2019-11-09 12:55:26.632752874 -0600
-@@ -273,7 +273,11 @@
- #endif
-         break;
-     case QSsl::SslV3:
-+#ifndef OPENSSL_NO_SSL3
-         ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
-+#else
-+        ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
-+#endif
-         break;
-     case QSsl::SecureProtocols: // SslV2 will be disabled below
-     case QSsl::TlsV1SslV3: // SslV2 will be disabled below
diff --git a/source/l/qt/patches/qt-4.8-poll.patch b/source/l/qt/patches/qt-4.8-poll.patch
deleted file mode 100644
index aed363c66..000000000
--- a/source/l/qt/patches/qt-4.8-poll.patch
+++ /dev/null
@@ -1,812 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.6/src/corelib/io/qprocess_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/corelib/io/qprocess_unix.cpp
---- qt-everywhere-opensource-src-4.8.6/src/corelib/io/qprocess_unix.cpp.poll	2014-03-30 15:36:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/corelib/io/qprocess_unix.cpp	2014-03-31 18:04:05.958260978 -0500
-@@ -158,13 +158,6 @@ static void qt_sa_sigchld_sigaction(int
-     }
- }
- 
--static inline void add_fd(int &nfds, int fd, fd_set *fdset)
--{
--    FD_SET(fd, fdset);
--    if ((fd) > nfds)
--        nfds = fd;
--}
--
- struct QProcessInfo {
-     QProcess *process;
-     int deathPipe;
-@@ -256,9 +249,9 @@ QProcessManager::~QProcessManager()
- void QProcessManager::run()
- {
-     forever {
--        fd_set readset;
--        FD_ZERO(&readset);
--        FD_SET(qt_qprocess_deadChild_pipe[0], &readset);
-+	pollfd fd;
-+	fd.fd = qt_qprocess_deadChild_pipe[0];
-+	fd.events = POLLIN;
- 
- #if defined (QPROCESS_DEBUG)
-         qDebug() << "QProcessManager::run() waiting for children to die";
-@@ -267,8 +260,8 @@ void QProcessManager::run()
-         // block forever, or until activity is detected on the dead child
-         // pipe. the only other peers are the SIGCHLD signal handler, and the
-         // QProcessManager destructor.
--        int nselect = select(qt_qprocess_deadChild_pipe[0] + 1, &readset, 0, 0, 0);
--        if (nselect < 0) {
-+        int ret = qt_safe_poll(&fd, 1, -1, /* retry_eintr */ false);
-+        if (ret < 0) {
-             if (errno == EINTR)
-                 continue;
-             break;
-@@ -1027,17 +1020,6 @@ void QProcessPrivate::killProcess()
-         ::kill(pid_t(pid), SIGKILL);
- }
- 
--static int select_msecs(int nfds, fd_set *fdread, fd_set *fdwrite, int timeout)
--{
--    if (timeout < 0)
--        return qt_safe_select(nfds, fdread, fdwrite, 0, 0);
--
--    struct timeval tv;
--    tv.tv_sec = timeout / 1000;
--    tv.tv_usec = (timeout % 1000) * 1000;
--    return qt_safe_select(nfds, fdread, fdwrite, 0, &tv);
--}
--
- /*
-    Returns the difference between msecs and elapsed. If msecs is -1,
-    however, -1 is returned.
-@@ -1060,10 +1042,10 @@ bool QProcessPrivate::waitForStarted(int
- 	   childStartedPipe[0]);
- #endif
- 
--    fd_set fds;
--    FD_ZERO(&fds);
--    FD_SET(childStartedPipe[0], &fds);
--    if (select_msecs(childStartedPipe[0] + 1, &fds, 0, msecs) == 0) {
-+    pollfd fd;
-+    fd.fd = childStartedPipe[0];
-+    fd.events = POLLIN;
-+    if (qt_safe_poll(&fd, 1, msecs) == 0) {
-         processError = QProcess::Timedout;
-         q->setErrorString(QProcess::tr("Process operation timed out"));
- #if defined (QPROCESS_DEBUG)
-@@ -1079,6 +1061,47 @@ bool QProcessPrivate::waitForStarted(int
-     return startedEmitted;
- }
- 
-+class QProcessFDSet {
-+    pollfd fds[5];
-+
-+    static size_t size()
-+    {
-+	return sizeof(fds)/sizeof(fds[0]);
-+    }
-+
-+public:
-+    QProcessFDSet(QProcessPrivate &proc)
-+    {
-+	for (size_t i = 0; i < size(); ++i) {
-+	    fds[i].fd = -1;
-+	    fds[i].events = POLLIN;
-+	}
-+	death().fd = proc.deathPipe[0];
-+
-+        if (proc.processState == QProcess::Starting)
-+	    started().fd = proc.childStartedPipe[0];
-+
-+	stdout().fd = proc.stdoutChannel.pipe[0];
-+	stderr().fd = proc.stderrChannel.pipe[0];
-+
-+        if (!proc.writeBuffer.isEmpty()) {
-+	    stdin().fd = proc.stdinChannel.pipe[1];
-+	    stdin().events = POLLOUT;
-+	}
-+    }
-+
-+    int poll(int timeout)
-+    {
-+	return qt_safe_poll(fds, size(), timeout);
-+    }
-+
-+    pollfd &death() { return fds[0]; }
-+    pollfd &started() { return fds[1]; }
-+    pollfd &stdout() { return fds[2]; }
-+    pollfd &stderr() { return fds[3]; }
-+    pollfd &stdin() { return fds[4]; }
-+};
-+
- bool QProcessPrivate::waitForReadyRead(int msecs)
- {
-     Q_Q(QProcess);
-@@ -1090,28 +1113,9 @@ bool QProcessPrivate::waitForReadyRead(i
-     stopWatch.start();
- 
-     forever {
--        fd_set fdread;
--        fd_set fdwrite;
--
--        FD_ZERO(&fdread);
--        FD_ZERO(&fdwrite);
--
--        int nfds = deathPipe[0];
--        FD_SET(deathPipe[0], &fdread);
--
--        if (processState == QProcess::Starting)
--            add_fd(nfds, childStartedPipe[0], &fdread);
--
--        if (stdoutChannel.pipe[0] != -1)
--            add_fd(nfds, stdoutChannel.pipe[0], &fdread);
--        if (stderrChannel.pipe[0] != -1)
--            add_fd(nfds, stderrChannel.pipe[0], &fdread);
--
--        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1)
--            add_fd(nfds, stdinChannel.pipe[1], &fdwrite);
--
-+	QProcessFDSet fdset(*this);
-         int timeout = qt_timeout_value(msecs, stopWatch.elapsed());
--        int ret = select_msecs(nfds + 1, &fdread, &fdwrite, timeout);
-+        int ret = fdset.poll(timeout);
-         if (ret < 0) {
-             break;
-         }
-@@ -1121,18 +1125,18 @@ bool QProcessPrivate::waitForReadyRead(i
- 	    return false;
- 	}
- 
--	if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) {
-+	if (qt_readable(fdset.started())) {
-             if (!_q_startupNotification())
-                 return false;
- 	}
- 
-         bool readyReadEmitted = false;
--	if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread)) {
-+	if (qt_readable(fdset.stdout())) {
- 	    bool canRead = _q_canReadStandardOutput();
-             if (processChannel == QProcess::StandardOutput && canRead)
-                 readyReadEmitted = true;
- 	}
--	if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread)) {
-+	if (qt_readable(fdset.stderr())) {
- 	    bool canRead = _q_canReadStandardError();
-             if (processChannel == QProcess::StandardError && canRead)
-                 readyReadEmitted = true;
-@@ -1140,13 +1144,13 @@ bool QProcessPrivate::waitForReadyRead(i
-         if (readyReadEmitted)
-             return true;
- 
--	if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite))
-+	if (qt_writable(fdset.stdin()))
- 	    _q_canWrite();
- 
--	if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) {
-+	if (qt_readable(fdset.death())) {
-             if (_q_processDied())
-                 return false;
--        }
-+	}
-     }
-     return false;
- }
-@@ -1162,29 +1166,9 @@ bool QProcessPrivate::waitForBytesWritte
-     stopWatch.start();
- 
-     while (!writeBuffer.isEmpty()) {
--        fd_set fdread;
--        fd_set fdwrite;
--
--        FD_ZERO(&fdread);
--        FD_ZERO(&fdwrite);
--
--        int nfds = deathPipe[0];
--        FD_SET(deathPipe[0], &fdread);
--
--        if (processState == QProcess::Starting)
--            add_fd(nfds, childStartedPipe[0], &fdread);
--
--        if (stdoutChannel.pipe[0] != -1)
--            add_fd(nfds, stdoutChannel.pipe[0], &fdread);
--        if (stderrChannel.pipe[0] != -1)
--            add_fd(nfds, stderrChannel.pipe[0], &fdread);
--
--
--        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1)
--            add_fd(nfds, stdinChannel.pipe[1], &fdwrite);
--
-+	QProcessFDSet fdset(*this);
- 	int timeout = qt_timeout_value(msecs, stopWatch.elapsed());
--	int ret = select_msecs(nfds + 1, &fdread, &fdwrite, timeout);
-+	int ret = fdset.poll(timeout);
-         if (ret < 0) {
-             break;
-         }
-@@ -1195,24 +1179,24 @@ bool QProcessPrivate::waitForBytesWritte
- 	    return false;
- 	}
- 
--	if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) {
-+	if (qt_readable(fdset.started())) {
- 	    if (!_q_startupNotification())
- 		return false;
- 	}
- 
--	if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite))
-+	if (qt_writable(fdset.stdin()))
- 	    return _q_canWrite();
- 
--	if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread))
-+	if (qt_readable(fdset.stdout()))
- 	    _q_canReadStandardOutput();
- 
--	if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread))
-+	if (qt_readable(fdset.stderr()))
- 	    _q_canReadStandardError();
- 
--	if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) {
--            if (_q_processDied())
--                return false;
--        }
-+	if (qt_readable(fdset.death())) {
-+	    if (_q_processDied())
-+		return false;
-+	}
-     }
- 
-     return false;
-@@ -1229,29 +1213,9 @@ bool QProcessPrivate::waitForFinished(in
-     stopWatch.start();
- 
-     forever {
--        fd_set fdread;
--        fd_set fdwrite;
--        int nfds = -1;
--
--        FD_ZERO(&fdread);
--        FD_ZERO(&fdwrite);
--
--        if (processState == QProcess::Starting)
--            add_fd(nfds, childStartedPipe[0], &fdread);
--
--        if (stdoutChannel.pipe[0] != -1)
--            add_fd(nfds, stdoutChannel.pipe[0], &fdread);
--        if (stderrChannel.pipe[0] != -1)
--            add_fd(nfds, stderrChannel.pipe[0], &fdread);
--
--        if (processState == QProcess::Running)
--            add_fd(nfds, deathPipe[0], &fdread);
--
--        if (!writeBuffer.isEmpty() && stdinChannel.pipe[1] != -1)
--            add_fd(nfds, stdinChannel.pipe[1], &fdwrite);
--
-+	QProcessFDSet fdset(*this);
- 	int timeout = qt_timeout_value(msecs, stopWatch.elapsed());
--	int ret = select_msecs(nfds + 1, &fdread, &fdwrite, timeout);
-+	int ret = fdset.poll(timeout);
-         if (ret < 0) {
-             break;
-         }
-@@ -1261,20 +1225,20 @@ bool QProcessPrivate::waitForFinished(in
- 	    return false;
- 	}
- 
--	if (childStartedPipe[0] != -1 && FD_ISSET(childStartedPipe[0], &fdread)) {
-+	if (qt_readable(fdset.started())) {
- 	    if (!_q_startupNotification())
- 		return false;
- 	}
--	if (stdinChannel.pipe[1] != -1 && FD_ISSET(stdinChannel.pipe[1], &fdwrite))
-+	if (qt_writable(fdset.stdin()))
- 	    _q_canWrite();
- 
--	if (stdoutChannel.pipe[0] != -1 && FD_ISSET(stdoutChannel.pipe[0], &fdread))
-+	if (qt_readable(fdset.stdout()))
- 	    _q_canReadStandardOutput();
- 
--	if (stderrChannel.pipe[0] != -1 && FD_ISSET(stderrChannel.pipe[0], &fdread))
-+	if (qt_readable(fdset.stderr()))
- 	    _q_canReadStandardError();
- 
--	if (deathPipe[0] == -1 || FD_ISSET(deathPipe[0], &fdread)) {
-+	if (qt_readable(fdset.death())) {
-             if (_q_processDied())
-                 return true;
- 	}
-@@ -1284,10 +1248,10 @@ bool QProcessPrivate::waitForFinished(in
- 
- bool QProcessPrivate::waitForWrite(int msecs)
- {
--    fd_set fdwrite;
--    FD_ZERO(&fdwrite);
--    FD_SET(stdinChannel.pipe[1], &fdwrite);
--    return select_msecs(stdinChannel.pipe[1] + 1, 0, &fdwrite, msecs < 0 ? 0 : msecs) == 1;
-+    pollfd fd;
-+    fd.fd = stdinChannel.pipe[1];
-+    fd.events = POLLIN;
-+    return qt_safe_poll(&fd, 1, msecs);
- }
- 
- void QProcessPrivate::findExitCode()
-diff -up qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix.cpp
---- qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix.cpp.poll	2014-03-30 15:36:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix.cpp	2014-03-31 18:01:59.369715403 -0500
-@@ -99,4 +99,165 @@ int qt_safe_select(int nfds, fd_set *fdr
-     }
- }
- 
-+#ifndef Q_OS_VXWORKS
-+
-+int qt_safe_poll(struct pollfd *fds, int nfds, int timeout_ms, bool retry_eintr)
-+{
-+    if (nfds == 0)
-+	return 0;
-+    if (nfds < 0) {
-+	errno = EINVAL;
-+	return -1;
-+    }
-+
-+    // Retry on ret == 0 if the deadline has not yet passed because
-+    // Linux can return early from the syscall, without setting EINTR.
-+    if (timeout_ms < 0) {
-+	forever {
-+	    int ret = ::poll(fds, nfds, -1);
-+	    if (ret > 0)
-+		return ret;
-+	    if (retry_eintr) {
-+		if (ret == 0 || ret == -1 && errno == EINTR) {
-+		    continue;
-+		} else {
-+		    return -1;
-+		}
-+	    }
-+	    if (ret == 0) {
-+		errno = EINTR;
-+		return -1;
-+	    }
-+	    return ret;
-+	}
-+    }
-+
-+    timeval previous = qt_gettime();
-+    timeval deadline = previous;
-+    deadline.tv_sec += timeout_ms / 1000;
-+    deadline.tv_usec += (timeout_ms % 1000) * 1000;
-+    if (deadline.tv_usec >= 1000000) {
-+	++deadline.tv_sec;
-+	deadline.tv_usec -= 1000000;
-+    }
-+    int remaining = timeout_ms;
-+
-+    forever {
-+	int ret = ::poll(fds, nfds, remaining);
-+	if (ret > 0)
-+	    return ret;
-+	timeval now = qt_gettime();
-+	if ((now.tv_sec > deadline.tv_sec // past deadline
-+	     || (now.tv_sec == deadline.tv_sec
-+		 && now.tv_usec >= deadline.tv_usec))
-+	    || (now.tv_sec < previous.tv_sec // time warp
-+		|| (now.tv_sec == previous.tv_sec
-+		    && now.tv_usec < previous.tv_usec))
-+	    || (ret < 0 && (errno != EINTR || !retry_eintr))) // other error
-+	    return ret;
-+	if (ret == 0 && !retry_eintr) {
-+	    errno = EINTR;
-+	    return -1;
-+	}
-+        remaining = (deadline.tv_sec - now.tv_sec) * 1000
-+		     + (deadline.tv_usec - now.tv_usec) / 1000;
-+	previous = now;
-+    }
-+}
-+
-+#else
-+
-+// Poll emulation for VxWorks.
-+
-+static int mark_bad_descriptors(pollfd *fds, int nfds)
-+{
-+    fd_set r;
-+    FD_ZERO(&r);
-+    struct timeval tv;
-+    tv.tv_sec = 0;
-+    tv.tv_usec = 0;
-+    int ret = 0;
-+
-+    // Check each descriptor invidually for badness.
-+    for (int i = 0; i < nfds; ++i) {
-+        pollfd &fd(fds[i]);
-+        if (fd.fd >= 0) {
-+            FD_SET(fd.fd, &r);
-+            int ret = qt_safe_select(fd.fd + 1, &r, NULL, NULL, &tv);
-+            FD_CLR(fd.fd, &r);
-+            if (ret < 0 && errno == EBADF) {
-+                fd.revents = POLLNVAL;
-+                ++ret;
-+            }
-+        }
-+    }
-+    Q_ASSERT(ret > 0);
-+    return ret;
-+}
-+
-+int qt_safe_poll(pollfd *fds, int nfds, int timeout, bool retry_eintr)
-+{
-+    fd_set r, w;
-+    FD_ZERO(&r);
-+    FD_ZERO(&w);
-+    int maxfd = -1;
-+
-+    // Extract the watched descriptors.
-+    for (int i = 0; i < nfds; ++i) {
-+        pollfd &fd(fds[i]);
-+        if (fd.fd >= 0 && fd.fd < FD_SETSIZE) {
-+            if (fd.events & POLLIN) {
-+                FD_SET(fd.fd, &r);
-+                if (fd.fd > maxfd)
-+                    maxfd = fd.fd;
-+            }
-+            if (fd.events & POLLOUT) {
-+                FD_SET(fd.fd, &w);
-+                if (fd.fd > maxfd)
-+                    maxfd = fd.fd;
-+            }
-+        }
-+    }
-+
-+    // If timeout is negative, wait indefinitely for activity.
-+    timeval tv;
-+    timeval *ptv;
-+    if (timeout >= 0) {
-+        tv.tv_sec = timeout / 1000;
-+        tv.tv_usec = (timeout % 1000) * 1000;
-+        ptv = &tv;
-+    } else
-+        ptv = NULL;
-+
-+    int ret;
-+    if (retry_eintr)
-+        ret = qt_safe_select(maxfd + 1, &r, &w, NULL, ptv);
-+    else
-+        ret = ::select(maxfd + 1, &r, &w, NULL, ptv);
-+    if (ret < 0 && errno == EBADF) {
-+        return mark_bad_descriptors(fds, nfds);
-+    }
-+    if (ret <= 0)
-+        return ret;
-+
-+    // Set the revents flags.
-+    ret = 0;
-+    for (int i = 0; i < nfds; ++i) {
-+        pollfd &fd(fds[i]);
-+        fd.revents = 0;
-+        if (fd.fd >= 0 && fd.fd < FD_SETSIZE) {
-+            if ((fd.events & POLLIN) && FD_ISSET(fd.fd, &r))
-+                fd.revents |= POLLIN;
-+            if ((fd.events & POLLOUT) && FD_ISSET(fd.fd, &w))
-+                fd.revents |= POLLOUT;
-+            if (fd.revents)
-+                ++ret;
-+        }
-+    }
-+    Q_ASSERT(ret > 0);
-+    return ret;
-+}
-+
-+#endif
-+
- QT_END_NAMESPACE
-diff -up qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix_p.h.poll qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix_p.h
---- qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix_p.h.poll	2014-03-30 15:36:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/corelib/kernel/qcore_unix_p.h	2014-03-31 18:01:59.370715392 -0500
-@@ -345,9 +345,42 @@ static inline pid_t qt_safe_waitpid(pid_
- 
- timeval qt_gettime(); // in qelapsedtimer_mac.cpp or qtimestamp_unix.cpp
- 
-+// Deprecated due to FD_SETSIZE limitation, use qt_safe_poll instead.
- Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept,
-                                  const struct timeval *tv);
- 
-+#ifndef Q_OS_VXWORKS
-+#include <poll.h>
-+#else
-+
-+// Poll emulation for VxWorks.
-+
-+struct pollfd {
-+  int fd;
-+  short events;
-+  short revents;
-+};
-+
-+#define POLLIN 1
-+#define POLLOUT 2
-+#define POLLERR 4
-+#define POLLHUP 8
-+#define POLLNVAL 16
-+#endif
-+
-+inline bool qt_readable(const pollfd &fd)
-+{
-+  return fd.fd >= 0 && (fd.revents & (POLLIN | POLLHUP | POLLERR | POLLNVAL)) != 0;
-+}
-+
-+inline bool qt_writable(const pollfd &fd)
-+{
-+  return fd.fd >= 0 && (fd.revents & (POLLOUT | POLLHUP | POLLERR | POLLNVAL)) != 0;
-+}
-+
-+Q_CORE_EXPORT int qt_safe_poll(pollfd *fds, int nfds, int timeout,
-+                               bool retry_eintr = true);
-+
- // according to X/OPEN we have to define semun ourselves
- // we use prefix as on some systems sem.h will have it
- struct semid_ds;
-diff -up qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalserver_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalserver_unix.cpp
---- qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalserver_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalserver_unix.cpp	2014-03-31 18:01:59.370715392 -0500
-@@ -208,16 +208,11 @@ void QLocalServerPrivate::_q_onNewConnec
- 
- void QLocalServerPrivate::waitForNewConnection(int msec, bool *timedOut)
- {
--    fd_set readfds;
--    FD_ZERO(&readfds);
--    FD_SET(listenSocket, &readfds);
-+    struct pollfd fd;
-+    fd.fd = listenSocket;
-+    fd.events = POLLIN;
- 
--    timeval timeout;
--    timeout.tv_sec = msec / 1000;
--    timeout.tv_usec = (msec % 1000) * 1000;
--
--    int result = -1;
--    result = qt_safe_select(listenSocket + 1, &readfds, 0, 0, (msec == -1) ? 0 : &timeout);
-+    int result = qt_safe_poll(&fd, 1, msec);
-     if (-1 == result) {
-         setError(QLatin1String("QLocalServer::waitForNewConnection"));
-         closeServer();
-diff -up qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalsocket_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalsocket_unix.cpp
---- qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalsocket_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/network/socket/qlocalsocket_unix.cpp	2014-03-31 18:01:59.370715392 -0500
-@@ -56,10 +56,6 @@
- #include <qdebug.h>
- #include <qelapsedtimer.h>
- 
--#ifdef Q_OS_VXWORKS
--#  include <selectLib.h>
--#endif
--
- #define QT_CONNECT_TIMEOUT 30000
- 
- QT_BEGIN_NAMESPACE
-@@ -520,32 +516,17 @@ bool QLocalSocket::waitForConnected(int
-     if (state() != ConnectingState)
-         return (state() == ConnectedState);
- 
--    fd_set fds;
--    FD_ZERO(&fds);
--    FD_SET(d->connectingSocket, &fds);
--
--    timeval timeout;
--    timeout.tv_sec = msec / 1000;
--    timeout.tv_usec = (msec % 1000) * 1000;
--
--    // timeout can not be 0 or else select will return an error.
--    if (0 == msec)
--        timeout.tv_usec = 1000;
-+    pollfd fd;
-+    fd.fd = d->connectingSocket;
-+    fd.events = POLLIN | POLLOUT;
- 
-     int result = -1;
-     // on Linux timeout will be updated by select, but _not_ on other systems.
-     QElapsedTimer timer;
-+    int remaining = msec;
-     timer.start();
--    while (state() == ConnectingState
--           && (-1 == msec || timer.elapsed() < msec)) {
--#ifdef Q_OS_SYMBIAN
--        // On Symbian, ready-to-write is signaled when non-blocking socket
--        // connect is finised. Is ready-to-read really used on other
--        // UNIX paltforms when using non-blocking AF_UNIX socket?
--        result = ::select(d->connectingSocket + 1, 0, &fds, 0, &timeout);
--#else
--        result = ::select(d->connectingSocket + 1, &fds, 0, 0, &timeout);
--#endif
-+    while (state() == ConnectingState) {
-+        result = qt_safe_poll(&fd, 1, remaining, /* retry_eintr */ false);
-         if (-1 == result && errno != EINTR) {
-             d->errorOccurred( QLocalSocket::UnknownSocketError,
-                     QLatin1String("QLocalSocket::waitForConnected"));
-@@ -553,6 +534,11 @@ bool QLocalSocket::waitForConnected(int
-         }
-         if (result > 0)
-             d->_q_connectToSocket();
-+        if (msec >= 0) {
-+            remaining = timer.elapsed() - msec;
-+            if (remaining < 0)
-+                break;
-+        }
-     }
- 
-     return (state() == ConnectedState);
-diff -up qt-everywhere-opensource-src-4.8.6/src/network/socket/qnativesocketengine_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/network/socket/qnativesocketengine_unix.cpp
---- qt-everywhere-opensource-src-4.8.6/src/network/socket/qnativesocketengine_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/network/socket/qnativesocketengine_unix.cpp	2014-03-31 18:01:59.371715381 -0500
-@@ -1068,48 +1068,40 @@ qint64 QNativeSocketEnginePrivate::nativ
- 
- int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) const
- {
--    fd_set fds;
--    FD_ZERO(&fds);
--    FD_SET(socketDescriptor, &fds);
--
--    struct timeval tv;
--    tv.tv_sec = timeout / 1000;
--    tv.tv_usec = (timeout % 1000) * 1000;
--
--    int retval;
--    if (selectForRead)
--        retval = qt_safe_select(socketDescriptor + 1, &fds, 0, 0, timeout < 0 ? 0 : &tv);
--    else
--        retval = qt_safe_select(socketDescriptor + 1, 0, &fds, 0, timeout < 0 ? 0 : &tv);
--
--    return retval;
-+    struct pollfd fd;
-+    fd.fd = socketDescriptor;
-+    if (selectForRead) {
-+	fd.events = POLLIN;
-+    } else {
-+	fd.events = POLLOUT;
-+    }
-+    return qt_safe_poll(&fd, 1, timeout);
- }
- 
- int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool checkRead, bool checkWrite,
-                        bool *selectForRead, bool *selectForWrite) const
- {
--    fd_set fdread;
--    FD_ZERO(&fdread);
-+    struct pollfd fd;
-+    fd.fd = socketDescriptor;
-     if (checkRead)
--        FD_SET(socketDescriptor, &fdread);
--
--    fd_set fdwrite;
--    FD_ZERO(&fdwrite);
-+	fd.events =  POLLIN;
-+    else
-+	fd.events = 0;
-     if (checkWrite)
--        FD_SET(socketDescriptor, &fdwrite);
--
--    struct timeval tv;
--    tv.tv_sec = timeout / 1000;
--    tv.tv_usec = (timeout % 1000) * 1000;
--
--    int ret;
--    ret = qt_safe_select(socketDescriptor + 1, &fdread, &fdwrite, 0, timeout < 0 ? 0 : &tv);
--
-+	fd.events |= POLLOUT;
-+    int ret = qt_safe_poll(&fd, 1, timeout);
-     if (ret <= 0)
--        return ret;
--    *selectForRead = FD_ISSET(socketDescriptor, &fdread);
--    *selectForWrite = FD_ISSET(socketDescriptor, &fdwrite);
--
-+	return ret;
-+    bool r = (fd.revents & (POLLIN | POLLHUP | POLLERR)) != 0;
-+    bool w = (fd.revents & (POLLOUT | POLLHUP | POLLERR)) != 0;
-+    // Emulate the return value from select(2).
-+    ret = 0;
-+    if (r)
-+	++ret;
-+    if (w)
-+	++ret;
-+    *selectForRead = r;
-+    *selectForWrite = w;
-     return ret;
- }
- 
-diff -up qt-everywhere-opensource-src-4.8.6/src/qt3support/network/q3socketdevice_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/qt3support/network/q3socketdevice_unix.cpp
---- qt-everywhere-opensource-src-4.8.6/src/qt3support/network/q3socketdevice_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/qt3support/network/q3socketdevice_unix.cpp	2014-03-31 18:01:59.371715381 -0500
-@@ -68,6 +68,7 @@ static inline int qt_socket_socket(int d
- #endif
- 
- #include "q3socketdevice.h"
-+#include "private/qcore_unix_p.h"
- 
- #ifndef QT_NO_NETWORK
- 
-@@ -588,19 +589,10 @@ Q_LONG Q3SocketDevice::waitForMore( int
- {
-     if ( !isValid() )
- 	return -1;
--    if ( fd >= FD_SETSIZE )
--	return -1;
--
--    fd_set fds;
--    struct timeval tv;
--
--    FD_ZERO( &fds );
--    FD_SET( fd, &fds );
--
--    tv.tv_sec = msecs / 1000;
--    tv.tv_usec = (msecs % 1000) * 1000;
- 
--    int rv = select( fd+1, &fds, 0, 0, msecs < 0 ? 0 : &tv );
-+    pollfd pfd;
-+    pfd.fd = fd;
-+    int rv = qt_safe_poll(&pfd, 1, msecs, /* retry_eintr */ false);
- 
-     if ( rv < 0 )
- 	return -1;
-diff -up qt-everywhere-opensource-src-4.8.6/src/qt3support/other/q3process_unix.cpp.poll qt-everywhere-opensource-src-4.8.6/src/qt3support/other/q3process_unix.cpp
---- qt-everywhere-opensource-src-4.8.6/src/qt3support/other/q3process_unix.cpp.poll	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/qt3support/other/q3process_unix.cpp	2014-03-31 18:01:59.372715370 -0500
-@@ -981,13 +981,10 @@ bool Q3Process::isRunning() const
- 	// On heavy processing, the socket notifier for the sigchild might not
- 	// have found time to fire yet.
- 	if ( d->procManager && d->procManager->sigchldFd[1] < FD_SETSIZE ) {
--	    fd_set fds;
--	    struct timeval tv;
--	    FD_ZERO( &fds );
--	    FD_SET( d->procManager->sigchldFd[1], &fds );
--	    tv.tv_sec = 0;
--	    tv.tv_usec = 0;
--	    if ( ::select( d->procManager->sigchldFd[1]+1, &fds, 0, 0, &tv ) > 0 )
-+	    pollfd fd;
-+	    fd.fd = d->procManager->sigchldFd[1];
-+	    fd.events = POLLIN;
-+	    if ( qt_safe_poll(&fd, 1, 0, /* retry_eintr */ false) > 0 )
- 		d->procManager->sigchldHnd( d->procManager->sigchldFd[1] );
- 	}
- 
-@@ -1124,29 +1121,21 @@ void Q3Process::socketRead( int fd )
- 	}
-     }
- 
--    if ( fd < FD_SETSIZE ) {
--	fd_set fds;
--	struct timeval tv;
--	FD_ZERO( &fds );
--	FD_SET( fd, &fds );
--	tv.tv_sec = 0;
--	tv.tv_usec = 0;
--	while ( ::select( fd+1, &fds, 0, 0, &tv ) > 0 ) {
--	    // prepare for the next round
--	    FD_ZERO( &fds );
--	    FD_SET( fd, &fds );
--	    // read data
--	    ba = new QByteArray( basize );
--	    n = ::read( fd, ba->data(), basize );
--	    if ( n > 0 ) {
--		ba->resize( n );
--		buffer->append( ba );
--		ba = 0;
--	    } else {
--		delete ba;
--		ba = 0;
--		break;
--	    }
-+    pollfd pfd;
-+    pfd.fd = fd;
-+    pfd.events = POLLIN;
-+    while (qt_safe_poll(&pfd, 1, 0)) {
-+	// read data
-+	ba = new QByteArray( basize );
-+	n = ::read( fd, ba->data(), basize );
-+	if ( n > 0 ) {
-+	    ba->resize( n );
-+	    buffer->append( ba );
-+	    ba = 0;
-+	} else {
-+	    delete ba;
-+	    ba = 0;
-+	    break;
- 	}
-     }
- 
diff --git a/source/l/qt/patches/qt-aarch64.patch b/source/l/qt/patches/qt-aarch64.patch
deleted file mode 100644
index cbe815dea..000000000
--- a/source/l/qt/patches/qt-aarch64.patch
+++ /dev/null
@@ -1,514 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/include/QtCore/headers.pri.aarch64 qt-everywhere-opensource-src-4.8.7/include/QtCore/headers.pri
---- qt-everywhere-opensource-src-4.8.7/include/QtCore/headers.pri.aarch64	2015-05-08 21:48:32.714057739 -0500
-+++ qt-everywhere-opensource-src-4.8.7/include/QtCore/headers.pri	2015-05-08 21:53:21.088761971 -0500
-@@ -1,3 +1,3 @@
--SYNCQT.HEADER_FILES = ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_nacl.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv5.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_armv7.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_integrity.h ../corelib/arch/qatomic_m68k.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qelapsedtimer.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qlocale_blackberry.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qscopedvaluerollback.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/xml/qxmlstream.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-nacl.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h ../corelib/global/qconfig.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../../include/QtCore/QtCore 
-+SYNCQT.HEADER_FILES = ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_nacl.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../corelib/arch/qatomic_aarch64.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv5.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_armv7.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_integrity.h ../corelib/arch/qatomic_m68k.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qelapsedtimer.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qlocale_blackberry.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qscopedvaluerollback.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/xml/qxmlstream.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-nacl.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h ../corelib/global/qconfig.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../../include/QtCore/QtCore 
- SYNCQT.HEADER_CLASSES = ../../include/QtCore/QAbstractEventDispatcher ../../include/QtCore/QModelIndex ../../include/QtCore/QPersistentModelIndex ../../include/QtCore/QModelIndexList ../../include/QtCore/QAbstractItemModel ../../include/QtCore/QAbstractTableModel ../../include/QtCore/QAbstractListModel ../../include/QtCore/QBasicTimer ../../include/QtCore/QCoreApplication ../../include/QtCore/QtCleanUpFunction ../../include/QtCore/QEvent ../../include/QtCore/QTimerEvent ../../include/QtCore/QChildEvent ../../include/QtCore/QCustomEvent ../../include/QtCore/QDynamicPropertyChangeEvent ../../include/QtCore/QEventLoop ../../include/QtCore/QMetaMethod ../../include/QtCore/QMetaEnum ../../include/QtCore/QMetaProperty ../../include/QtCore/QMetaClassInfo ../../include/QtCore/QMetaType ../../include/QtCore/QMetaTypeId ../../include/QtCore/QMetaTypeId2 ../../include/QtCore/QMimeData ../../include/QtCore/QObjectList ../../include/QtCore/QObjectData ../../include/QtCore/QObject ../../include/QtCore/QObjectUserData ../../include/QtCore/QObjectCleanupHandler ../../include/QtCore/QGenericArgument ../../include/QtCore/QGenericReturnArgument ../../include/QtCore/QArgument ../../include/QtCore/QReturnArgument ../../include/QtCore/QMetaObject ../../include/QtCore/QMetaObjectAccessor ../../include/QtCore/QMetaObjectExtraData ../../include/QtCore/QPointer ../../include/QtCore/QSharedMemory ../../include/QtCore/QSignalMapper ../../include/QtCore/QSocketNotifier ../../include/QtCore/QSystemSemaphore ../../include/QtCore/QTimer ../../include/QtCore/QTranslator ../../include/QtCore/QVariant ../../include/QtCore/QVariantList ../../include/QtCore/QVariantMap ../../include/QtCore/QVariantHash ../../include/QtCore/QVariantComparisonHelper ../../include/QtCore/QAbstractAnimation ../../include/QtCore/QAnimationDriver ../../include/QtCore/QAnimationGroup ../../include/QtCore/QParallelAnimationGroup ../../include/QtCore/QPauseAnimation ../../include/QtCore/QPropertyAnimation ../../include/QtCore/QSequentialAnimationGroup ../../include/QtCore/QVariantAnimation ../../include/QtCore/QtAlgorithms ../../include/QtCore/QBitArray ../../include/QtCore/QBitRef ../../include/QtCore/QByteArray ../../include/QtCore/QByteRef ../../include/QtCore/QByteArrayMatcher ../../include/QtCore/QCache ../../include/QtCore/QLatin1Char ../../include/QtCore/QChar ../../include/QtCore/QtContainerFwd ../../include/QtCore/QContiguousCacheData ../../include/QtCore/QContiguousCacheTypedData ../../include/QtCore/QContiguousCache ../../include/QtCore/QCryptographicHash ../../include/QtCore/QDate ../../include/QtCore/QTime ../../include/QtCore/QDateTime ../../include/QtCore/QEasingCurve ../../include/QtCore/QElapsedTimer ../../include/QtCore/QHashData ../../include/QtCore/QHashDummyValue ../../include/QtCore/QHashDummyNode ../../include/QtCore/QHashNode ../../include/QtCore/QHash ../../include/QtCore/QMultiHash ../../include/QtCore/QHashIterator ../../include/QtCore/QMutableHashIterator ../../include/QtCore/QLine ../../include/QtCore/QLineF ../../include/QtCore/QLinkedListData ../../include/QtCore/QLinkedListNode ../../include/QtCore/QLinkedList ../../include/QtCore/QLinkedListIterator ../../include/QtCore/QMutableLinkedListIterator ../../include/QtCore/QListData ../../include/QtCore/QList ../../include/QtCore/QListIterator ../../include/QtCore/QMutableListIterator ../../include/QtCore/QSystemLocale ../../include/QtCore/QLocale ../../include/QtCore/QBBSystemLocaleData ../../include/QtCore/QMapData ../../include/QtCore/QMapNode ../../include/QtCore/QMapPayloadNode ../../include/QtCore/QMap ../../include/QtCore/QMultiMap ../../include/QtCore/QMapIterator ../../include/QtCore/QMutableMapIterator ../../include/QtCore/QMargins ../../include/QtCore/QPair ../../include/QtCore/QPoint ../../include/QtCore/QPointF ../../include/QtCore/QQueue ../../include/QtCore/QRect ../../include/QtCore/QRectF ../../include/QtCore/QRegExp ../../include/QtCore/QScopedPointerDeleter ../../include/QtCore/QScopedPointerArrayDeleter ../../include/QtCore/QScopedPointerPodDeleter ../../include/QtCore/QScopedPointer ../../include/QtCore/QScopedArrayPointer ../../include/QtCore/QScopedValueRollback ../../include/QtCore/QSet ../../include/QtCore/QSetIterator ../../include/QtCore/QMutableSetIterator ../../include/QtCore/QSharedData ../../include/QtCore/QSharedDataPointer ../../include/QtCore/QExplicitlySharedDataPointer ../../include/QtCore/QSharedPointer ../../include/QtCore/QWeakPointer ../../include/QtCore/QSize ../../include/QtCore/QSizeF ../../include/QtCore/QStack ../../include/QtCore/QStdWString ../../include/QtCore/QString ../../include/QtCore/QLatin1String ../../include/QtCore/QCharRef ../../include/QtCore/QConstString ../../include/QtCore/QStringRef ../../include/QtCore/QLatin1Literal ../../include/QtCore/QAbstractConcatenable ../../include/QtCore/QConcatenable ../../include/QtCore/QStringBuilder ../../include/QtCore/QStringListIterator ../../include/QtCore/QMutableStringListIterator ../../include/QtCore/QStringList ../../include/QtCore/QStringMatcher ../../include/QtCore/QTextBoundaryFinder ../../include/QtCore/QTimeLine ../../include/QtCore/QVarLengthArray ../../include/QtCore/QVectorData ../../include/QtCore/QVectorTypedData ../../include/QtCore/QVector ../../include/QtCore/QVectorIterator ../../include/QtCore/QMutableVectorIterator ../../include/QtCore/QFactoryInterface ../../include/QtCore/QLibrary ../../include/QtCore/QtPlugin ../../include/QtCore/QtPluginInstanceFunction ../../include/QtCore/QPluginLoader ../../include/QtCore/QUuid ../../include/QtCore/QXmlStreamStringRef ../../include/QtCore/QXmlStreamAttribute ../../include/QtCore/QXmlStreamAttributes ../../include/QtCore/QXmlStreamNamespaceDeclaration ../../include/QtCore/QXmlStreamNamespaceDeclarations ../../include/QtCore/QXmlStreamNotationDeclaration ../../include/QtCore/QXmlStreamNotationDeclarations ../../include/QtCore/QXmlStreamEntityDeclaration ../../include/QtCore/QXmlStreamEntityDeclarations ../../include/QtCore/QXmlStreamEntityResolver ../../include/QtCore/QXmlStreamReader ../../include/QtCore/QXmlStreamWriter ../../include/QtCore/QAtomicInt ../../include/QtCore/QAtomicPointer ../../include/QtCore/QBasicAtomicInt ../../include/QtCore/QBasicAtomicPointer ../../include/QtCore/QMutex ../../include/QtCore/QMutexLocker ../../include/QtCore/QMutexData ../../include/QtCore/QReadWriteLock ../../include/QtCore/QReadLocker ../../include/QtCore/QWriteLocker ../../include/QtCore/QSemaphore ../../include/QtCore/QThread ../../include/QtCore/QThreadStorageData ../../include/QtCore/QThreadStorage ../../include/QtCore/QWaitCondition ../../include/QtCore/QAbstractState ../../include/QtCore/QAbstractTransition ../../include/QtCore/QEventTransition ../../include/QtCore/QFinalState ../../include/QtCore/QHistoryState ../../include/QtCore/QSignalTransition ../../include/QtCore/QState ../../include/QtCore/QStateMachine ../../include/QtCore/QFuture ../../include/QtCore/QFutureIterator ../../include/QtCore/QMutableFutureIterator ../../include/QtCore/QFutureInterfaceBase ../../include/QtCore/QFutureInterface ../../include/QtCore/QFutureSynchronizer ../../include/QtCore/QFutureWatcherBase ../../include/QtCore/QFutureWatcher ../../include/QtCore/QRunnable ../../include/QtCore/QtConcurrentFilter ../../include/QtCore/QtConcurrentMap ../../include/QtCore/QtConcurrentRun ../../include/QtCore/QThreadPool ../../include/QtCore/QAbstractFileEngine ../../include/QtCore/QAbstractFileEngineHandler ../../include/QtCore/QAbstractFileEngineIterator ../../include/QtCore/QBuffer ../../include/QtCore/QDataStream ../../include/QtCore/QtDebug ../../include/QtCore/QDebug ../../include/QtCore/QNoDebug ../../include/QtCore/QDir ../../include/QtCore/QDirIterator ../../include/QtCore/QFile ../../include/QtCore/QFileInfo ../../include/QtCore/QFileInfoList ../../include/QtCore/QFileInfoListIterator ../../include/QtCore/QFileSystemWatcher ../../include/QtCore/QFSFileEngine ../../include/QtCore/QIODevice ../../include/QtCore/Q_PID ../../include/QtCore/QProcessEnvironment ../../include/QtCore/QProcess ../../include/QtCore/QResource ../../include/QtCore/QSettings ../../include/QtCore/QTemporaryFile ../../include/QtCore/QTextStream ../../include/QtCore/QTextStreamFunction ../../include/QtCore/QTextStreamManipulator ../../include/QtCore/QTS ../../include/QtCore/QTextIStream ../../include/QtCore/QTextOStream ../../include/QtCore/QUrl ../../include/QtCore/QtEndian ../../include/QtCore/QtGlobal ../../include/QtCore/QIntegerForSize ../../include/QtCore/QNoImplicitBoolCast ../../include/QtCore/Q_INT8 ../../include/QtCore/Q_UINT8 ../../include/QtCore/Q_INT16 ../../include/QtCore/Q_UINT16 ../../include/QtCore/Q_INT32 ../../include/QtCore/Q_UINT32 ../../include/QtCore/Q_INT64 ../../include/QtCore/Q_UINT64 ../../include/QtCore/Q_LLONG ../../include/QtCore/Q_ULLONG ../../include/QtCore/Q_LONG ../../include/QtCore/Q_ULONG ../../include/QtCore/QSysInfo ../../include/QtCore/QtMsgHandler ../../include/QtCore/QGlobalStatic ../../include/QtCore/QGlobalStaticDeleter ../../include/QtCore/QBool ../../include/QtCore/QTypeInfo ../../include/QtCore/QFlag ../../include/QtCore/QIncompatibleFlag ../../include/QtCore/QFlags ../../include/QtCore/QForeachContainer ../../include/QtCore/QForeachContainerBase ../../include/QtCore/QLibraryInfo ../../include/QtCore/Qt ../../include/QtCore/QInternal ../../include/QtCore/QCOORD ../../include/QtCore/QtConfig ../../include/QtCore/QTextCodec ../../include/QtCore/QTextEncoder ../../include/QtCore/QTextDecoder ../../include/QtCore/QTextCodecFactoryInterface ../../include/QtCore/QTextCodecPlugin 
- SYNCQT.PRIVATE_HEADER_FILES = ../corelib/kernel/qabstracteventdispatcher_p.h ../corelib/kernel/qabstractitemmodel_p.h ../corelib/kernel/qcore_mac_p.h ../corelib/kernel/qcore_symbian_p.h ../corelib/kernel/qcore_unix_p.h ../corelib/kernel/qcoreapplication_p.h ../corelib/kernel/qcorecmdlineargs_p.h ../corelib/kernel/qcoreglobaldata_p.h ../corelib/kernel/qcrashhandler_p.h ../corelib/kernel/qeventdispatcher_blackberry_p.h ../corelib/kernel/qeventdispatcher_glib_p.h ../corelib/kernel/qeventdispatcher_symbian_p.h ../corelib/kernel/qeventdispatcher_unix_p.h ../corelib/kernel/qeventdispatcher_win_p.h ../corelib/kernel/qfunctions_p.h ../corelib/kernel/qmetaobject_p.h ../corelib/kernel/qobject_p.h ../corelib/kernel/qsharedmemory_p.h ../corelib/kernel/qsystemerror_p.h ../corelib/kernel/qsystemsemaphore_p.h ../corelib/kernel/qtranslator_p.h ../corelib/kernel/qvariant_p.h ../corelib/kernel/qwineventnotifier_p.h ../corelib/animation/qabstractanimation_p.h ../corelib/animation/qanimationgroup_p.h ../corelib/animation/qparallelanimationgroup_p.h ../corelib/animation/qpropertyanimation_p.h ../corelib/animation/qsequentialanimationgroup_p.h ../corelib/animation/qvariantanimation_p.h ../corelib/tools/qbytedata_p.h ../corelib/tools/qdatetime_p.h ../corelib/tools/qharfbuzz_p.h ../corelib/tools/qlocale_data_p.h ../corelib/tools/qlocale_p.h ../corelib/tools/qlocale_tools_p.h ../corelib/tools/qpodlist_p.h ../corelib/tools/qringbuffer_p.h ../corelib/tools/qscopedpointer_p.h ../corelib/tools/qsimd_p.h ../corelib/tools/qtools_p.h ../corelib/tools/qunicodetables_p.h ../corelib/plugin/qelfparser_p.h ../corelib/plugin/qfactoryloader_p.h ../corelib/plugin/qlibrary_p.h ../corelib/plugin/qsystemlibrary_p.h ../corelib/xml/qxmlstream_p.h ../corelib/xml/qxmlutils_p.h ../corelib/thread/qmutex_p.h ../corelib/thread/qmutexpool_p.h ../corelib/thread/qorderedmutexlocker_p.h ../corelib/thread/qreadwritelock_p.h ../corelib/thread/qthread_p.h ../corelib/statemachine/qabstractstate_p.h ../corelib/statemachine/qabstracttransition_p.h ../corelib/statemachine/qeventtransition_p.h ../corelib/statemachine/qhistorystate_p.h ../corelib/statemachine/qsignaleventgenerator_p.h ../corelib/statemachine/qsignaltransition_p.h ../corelib/statemachine/qstate_p.h ../corelib/statemachine/qstatemachine_p.h ../corelib/concurrent/qfutureinterface_p.h ../corelib/concurrent/qfuturewatcher_p.h ../corelib/concurrent/qthreadpool_p.h ../corelib/io/qabstractfileengine_p.h ../corelib/io/qdatastream_p.h ../corelib/io/qdataurl_p.h ../corelib/io/qdir_p.h ../corelib/io/qfile_p.h ../corelib/io/qfileinfo_p.h ../corelib/io/qfilesystemengine_p.h ../corelib/io/qfilesystementry_p.h ../corelib/io/qfilesystemiterator_p.h ../corelib/io/qfilesystemmetadata_p.h ../corelib/io/qfilesystemwatcher_dnotify_p.h ../corelib/io/qfilesystemwatcher_fsevents_p.h ../corelib/io/qfilesystemwatcher_inotify_p.h ../corelib/io/qfilesystemwatcher_kqueue_p.h ../corelib/io/qfilesystemwatcher_p.h ../corelib/io/qfilesystemwatcher_symbian_p.h ../corelib/io/qfilesystemwatcher_win_p.h ../corelib/io/qfsfileengine_iterator_p.h ../corelib/io/qfsfileengine_p.h ../corelib/io/qiodevice_p.h ../corelib/io/qnoncontiguousbytedevice_p.h ../corelib/io/qprocess_p.h ../corelib/io/qresource_iterator_p.h ../corelib/io/qresource_p.h ../corelib/io/qsettings_p.h ../corelib/io/qtldurl_p.h ../corelib/io/qurltlds_p.h ../corelib/io/qwindowspipewriter_p.h ../corelib/global/qnumeric_p.h ../corelib/global/qt_pch.h ../corelib/codecs/qfontlaocodec_p.h ../corelib/codecs/qiconvcodec_p.h ../corelib/codecs/qisciicodec_p.h ../corelib/codecs/qlatincodec_p.h ../corelib/codecs/qsimplecodec_p.h ../corelib/codecs/qtextcodec_p.h ../corelib/codecs/qtsciicodec_p.h ../corelib/codecs/qutfcodec_p.h 
-diff -up qt-everywhere-opensource-src-4.8.7/include/QtCore/qatomic_aarch64.h.aarch64 qt-everywhere-opensource-src-4.8.7/include/QtCore/qatomic_aarch64.h
---- qt-everywhere-opensource-src-4.8.7/include/QtCore/qatomic_aarch64.h.aarch64	2015-05-08 21:48:32.715057744 -0500
-+++ qt-everywhere-opensource-src-4.8.7/include/QtCore/qatomic_aarch64.h	2015-05-08 21:48:32.715057744 -0500
-@@ -0,0 +1 @@
-+#include "../../src/corelib/arch/qatomic_aarch64.h"
-diff -up qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri.aarch64 qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
---- qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri.aarch64	2015-05-07 09:14:47.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri	2015-05-08 21:48:33.268061013 -0500
-@@ -66,6 +66,12 @@ contains(JAVASCRIPTCORE_JIT,no) {
-     }
- }
- 
-+# Hack around AARCH64 fail wrt JSValue.h
-+equals(QT_ARCH, aarch64) {
-+    message("JavaScriptCore aarch64 hack: -fpermissive")
-+    QMAKE_CXXFLAGS += -fpermissive
-+}
-+
- wince* {
-     INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
-     SOURCES += $$QT_SOURCE_TREE/src/3rdparty/ce-compat/ce_time.c
-diff -up qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri.aarch64 qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
---- qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri.aarch64	2015-05-07 09:14:45.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri	2015-05-08 21:48:33.268061013 -0500
-@@ -63,6 +63,12 @@ contains (CONFIG, text_breaking_with_icu
-     DEFINES += WTF_USE_QT_ICU_TEXT_BREAKING=1
- }
- 
-+# Hack around AARCH64 fail wrt JSValue.h
-+equals(QT_ARCH, aarch64) {
-+    message("JavaScriptCore aarch64 hack: -fpermissive")
-+    QMAKE_CXXFLAGS += -fpermissive
-+}
-+
- wince* {
-     INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
-     INCLUDEPATH += $$PWD/../JavaScriptCore/os-win32
-diff -up qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.aarch64 qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
---- qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.aarch64	2015-05-07 09:14:45.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h	2015-05-08 21:48:33.269061019 -0500
-@@ -369,7 +369,16 @@
- 
- #endif /* ARM */
- 
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
-+/* CPU(AARCH64) - AArch64 */
-+#if defined(__aarch64__)
-+#define WTF_CPU_AARCH64 1
-+#if defined(__AARCH64EB__)
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+#endif
-+
-+/* Not sure about this one, qt5-qtwebkit doesn't include it -- rex */
-+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(AARCH64)
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
- 
-@@ -1003,7 +1012,7 @@
-     || CPU(SPARC64) \
-     || CPU(S390X) \
-     || CPU(PPC64) \
--    || CPU(MIPS64)
-+    || CPU(MIPS64) || CPU(AARCH64)
- #define WTF_USE_JSVALUE64 1
- #else
- #define WTF_USE_JSVALUE32_64 1
-diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/arch/aarch64/qatomic_aarch64.cpp.aarch64 qt-everywhere-opensource-src-4.8.7/src/corelib/arch/aarch64/qatomic_aarch64.cpp
---- qt-everywhere-opensource-src-4.8.7/src/corelib/arch/aarch64/qatomic_aarch64.cpp.aarch64	2015-05-08 21:48:33.269061019 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/corelib/arch/aarch64/qatomic_aarch64.cpp	2015-05-08 21:48:33.269061019 -0500
-@@ -0,0 +1,70 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012, 2013 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the QtCore module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia.  For licensing terms and
-+** conditions see http://qt.digia.com/licensing.  For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights.  These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include <QtCore/qglobal.h>
-+
-+#include <unistd.h>
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+# include <sched.h>
-+#endif
-+#include <time.h>
-+
-+QT_BEGIN_NAMESPACE
-+
-+QT_USE_NAMESPACE
-+
-+Q_CORE_EXPORT void qt_atomic_yield(int *count)
-+{
-+#ifdef _POSIX_PRIORITY_SCHEDULING
-+    if((*count)++ < 50) {
-+        sched_yield();
-+    } else
-+#endif
-+    {
-+        struct timespec tm;
-+        tm.tv_sec = 0;
-+        tm.tv_nsec = 2000001;
-+        nanosleep(&tm, NULL);
-+        *count = 0;
-+    }
-+}
-+
-+QT_END_NAMESPACE
-diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/arch/arch.pri.aarch64 qt-everywhere-opensource-src-4.8.7/src/corelib/arch/arch.pri
---- qt-everywhere-opensource-src-4.8.7/src/corelib/arch/arch.pri.aarch64	2015-05-07 09:14:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/corelib/arch/arch.pri	2015-05-08 21:48:33.270061025 -0500
-@@ -31,7 +31,9 @@ integrity:HEADERS += arch/qatomic_integr
-                        arch/qatomic_s390.h \
-                        arch/qatomic_x86_64.h \
-                        arch/qatomic_sh.h \
--                       arch/qatomic_sh4a.h
-+                       arch/qatomic_sh4a.h \
-+                       arch/qatomic_aarch64.h \
-+
- 
- QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH
- DEPENDPATH += $$QT_ARCH_CPP
-diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/arch/qatomic_aarch64.h.aarch64 qt-everywhere-opensource-src-4.8.7/src/corelib/arch/qatomic_aarch64.h
---- qt-everywhere-opensource-src-4.8.7/src/corelib/arch/qatomic_aarch64.h.aarch64	2015-05-08 21:48:33.270061025 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/corelib/arch/qatomic_aarch64.h	2015-05-08 21:48:33.270061025 -0500
-@@ -0,0 +1,335 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the QtCore module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia.  For licensing terms and
-+** conditions see http://qt.digia.com/licensing.  For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights.  These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file.  Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#ifndef QATOMIC_AARCH64_H
-+#define QATOMIC_AARCH64_H
-+
-+QT_BEGIN_HEADER
-+
-+QT_BEGIN_NAMESPACE
-+
-+#define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isReferenceCountingNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isReferenceCountingWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_INT_TEST_AND_SET_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isTestAndSetNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isTestAndSetWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_INT_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isFetchAndStoreNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isFetchAndStoreWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_INT_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-+
-+inline bool QBasicAtomicInt::isFetchAndAddNative()
-+{ return true; }
-+inline bool QBasicAtomicInt::isFetchAndAddWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_POINTER_TEST_AND_SET_IS_ALWAYS_NATIVE
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetNative()
-+{ return true; }
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isTestAndSetWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_POINTER_FETCH_AND_STORE_IS_ALWAYS_NATIVE
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreNative()
-+{ return true; }
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndStoreWaitFree()
-+{ return false; }
-+
-+#define Q_ATOMIC_POINTER_FETCH_AND_ADD_IS_ALWAYS_NATIVE
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddNative()
-+{ return true; }
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
-+{ return false; }
-+
-+#ifndef Q_DATA_MEMORY_BARRIER
-+# define Q_DATA_MEMORY_BARRIER asm volatile("dmb sy\n":::"memory")
-+#endif
-+#ifndef Q_COMPILER_MEMORY_BARRIER
-+# define Q_COMPILER_MEMORY_BARRIER asm volatile("":::"memory")
-+#endif
-+
-+inline bool QBasicAtomicInt::ref()
-+{
-+    int newValue;
-+
-+    Q_COMPILER_MEMORY_BARRIER;
-+    newValue = __atomic_add_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+    Q_COMPILER_MEMORY_BARRIER;
-+
-+    return newValue != 0;
-+}
-+
-+inline bool QBasicAtomicInt::deref()
-+{
-+    int newValue;
-+
-+    Q_COMPILER_MEMORY_BARRIER;
-+    newValue = __atomic_sub_fetch(&_q_value, 1, __ATOMIC_ACQ_REL);
-+    Q_COMPILER_MEMORY_BARRIER;
-+
-+    return newValue != 0;
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
-+{
-+    bool val;
-+
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val =  __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+					false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreRelaxed(int newValue)
-+{
-+    int val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddRelaxed(int valueToAdd)
-+{
-+    int val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
-+{
-+    bool val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val =  __atomic_compare_exchange_n (&_q_value, &expectedValue, newValue,
-+					false, __ATOMIC_RELAXED, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
-+{
-+    T *val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_exchange_n(&_q_value, newValue, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
-+{
-+    T *val;
-+    Q_COMPILER_MEMORY_BARRIER;
-+    val = __atomic_fetch_add(&_q_value, valueToAdd, __ATOMIC_RELAXED);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return val;
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
-+{
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return testAndSetRelaxed(expectedValue, newValue);
-+}
-+
-+inline bool QBasicAtomicInt::testAndSetOrdered(int expectedValue, int newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
-+{
-+    int returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreRelease(int newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndStoreRelaxed(newValue);
-+}
-+
-+inline int QBasicAtomicInt::fetchAndStoreOrdered(int newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    int returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
-+{
-+    int returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddRelease(int valueToAdd)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndAddRelaxed(valueToAdd);
-+}
-+
-+inline int QBasicAtomicInt::fetchAndAddOrdered(int valueToAdd)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    int returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValue, T *newValue)
-+{
-+    bool returnValue = testAndSetRelaxed(expectedValue, newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValue, T *newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return testAndSetRelaxed(expectedValue, newValue);
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetOrdered(T *expectedValue, T *newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    bool returnValue = testAndSetAcquire(expectedValue, newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
-+{
-+    T *returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndStoreRelaxed(newValue);
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreOrdered(T *newValue)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    T *returnValue = fetchAndStoreRelaxed(newValue);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
-+{
-+    T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_DATA_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    return fetchAndAddRelaxed(valueToAdd);
-+}
-+
-+template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
-+{
-+    Q_DATA_MEMORY_BARRIER;
-+    T *returnValue = fetchAndAddRelaxed(valueToAdd);
-+    Q_COMPILER_MEMORY_BARRIER;
-+    return returnValue;
-+}
-+
-+#undef Q_DATA_MEMORY_BARRIER
-+#undef Q_COMPILER_MEMORY_BARRIER
-+
-+QT_END_NAMESPACE
-+
-+QT_END_HEADER
-+
-+#endif // QATOMIC_AARCH64_H
-diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/arch/qatomic_arch.h.aarch64 qt-everywhere-opensource-src-4.8.7/src/corelib/arch/qatomic_arch.h
---- qt-everywhere-opensource-src-4.8.7/src/corelib/arch/qatomic_arch.h.aarch64	2015-05-07 09:14:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/corelib/arch/qatomic_arch.h	2015-05-08 21:48:33.271061031 -0500
-@@ -94,6 +94,8 @@ QT_BEGIN_HEADER
- #  include "QtCore/qatomic_sh4a.h"
- #elif defined(QT_ARCH_NACL)
- #  include "QtCore/qatomic_generic.h"
-+#elif defined(QT_ARCH_AARCH64)
-+#  include "QtCore/qatomic_aarch64.h"
- #else
- #  error "Qt has not been ported to this architecture"
- #endif
diff --git a/source/l/qt/patches/qt-cupsEnumDests.patch b/source/l/qt/patches/qt-cupsEnumDests.patch
deleted file mode 100644
index 7d59f22e8..000000000
--- a/source/l/qt/patches/qt-cupsEnumDests.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp.cupsEnumDests qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp
---- qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp.cupsEnumDests	2012-11-23 10:09:53.000000000 +0000
-+++ qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp	2013-07-03 15:30:06.232936976 +0100
-@@ -50,9 +50,19 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+typedef int (*CupsEnumDests)(unsigned flags, int msec, int *cancel,
-+			     cups_ptype_t type, cups_ptype_t mask,
-+			     cups_dest_cb_t cb, void *user_data);
-+typedef http_t * (*CupsConnectDest)(cups_dest_t *dest, unsigned flags,
-+				    int msec, int *cancel,
-+				    char *resource, size_t resourcesize,
-+				    cups_dest_cb_t cb, void *user_data);
-+typedef int (*CupsCopyDest)(cups_dest_t *dest, int num_dests,
-+			    cups_dest_t **dests);
- typedef int (*CupsGetDests)(cups_dest_t **dests);
- typedef void (*CupsFreeDests)(int num_dests, cups_dest_t *dests);
- typedef const char* (*CupsGetPPD)(const char *printer);
-+typedef const char* (*CupsGetPPD2)(http_t *http, const char *printer);
- typedef int (*CupsMarkOptions)(ppd_file_t *ppd, int num_options, cups_option_t *options);
- typedef ppd_file_t* (*PPDOpenFile)(const char *filename);
- typedef void (*PPDMarkDefaults)(ppd_file_t *ppd);
-@@ -66,12 +76,24 @@ typedef const char* (*CupsLangEncoding)(
- typedef int (*CupsAddOption)(const char *name, const char *value, int num_options, cups_option_t **options);
- typedef int (*CupsTempFd)(char *name, int len);
- typedef int (*CupsPrintFile)(const char * name, const char * filename, const char * title, int num_options, cups_option_t * options);
-+typedef int (*CupsPrintFile2)(http_t *http, const char *name, const char *filename, const char *title, int num_options, cups_option_t *options);
-+
-+typedef struct
-+{
-+    cups_dest_t *printers;
-+    int num_printers;
-+} EnumDestsContext;
- 
- static bool cupsLoaded = false;
- static int qt_cups_num_printers = 0;
-+static cups_dest_t *qt_cups_printers = 0;
-+static CupsEnumDests _cupsEnumDests = 0;
-+static CupsConnectDest _cupsConnectDest = 0;
-+static CupsCopyDest _cupsCopyDest = 0;
- static CupsGetDests _cupsGetDests = 0;
- static CupsFreeDests _cupsFreeDests = 0;
- static CupsGetPPD _cupsGetPPD = 0;
-+static CupsGetPPD2 _cupsGetPPD2 = 0;
- static PPDOpenFile _ppdOpenFile = 0;
- static PPDMarkDefaults _ppdMarkDefaults = 0;
- static PPDClose _ppdClose = 0;
-@@ -84,14 +106,35 @@ static CupsLangEncoding _cupsLangEncodin
- static CupsAddOption _cupsAddOption = 0;
- static CupsTempFd _cupsTempFd = 0;
- static CupsPrintFile _cupsPrintFile = 0;
-+static CupsPrintFile2 _cupsPrintFile2 = 0;
-+
-+static int enum_dest_cb (void *user_data, unsigned flags, cups_dest_t *dest)
-+{
-+    EnumDestsContext *context = (EnumDestsContext *) user_data;
-+
-+    if ((flags & (CUPS_DEST_FLAGS_UNCONNECTED |
-+		  CUPS_DEST_FLAGS_REMOVED |
-+		  CUPS_DEST_FLAGS_ERROR |
-+		  CUPS_DEST_FLAGS_RESOLVING |
-+		  CUPS_DEST_FLAGS_CONNECTING |
-+		  CUPS_DEST_FLAGS_CANCELED)) == 0)
-+	context->num_printers = _cupsCopyDest (dest, context->num_printers,
-+					       &context->printers);
-+
-+    return 1;
-+}
- 
- static void resolveCups()
- {
-     QLibrary cupsLib(QLatin1String("cups"), 2);
-     if(cupsLib.load()) {
-+        _cupsEnumDests = (CupsEnumDests) cupsLib.resolve("cupsEnumDests");
-+	_cupsConnectDest = (CupsConnectDest) cupsLib.resolve("cupsConnectDest");
-+	_cupsCopyDest = (CupsCopyDest) cupsLib.resolve("cupsCopyDest");
-         _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests");
-         _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests");
-         _cupsGetPPD = (CupsGetPPD) cupsLib.resolve("cupsGetPPD");
-+        _cupsGetPPD2 = (CupsGetPPD2) cupsLib.resolve("cupsGetPPD2");
-         _cupsLangGet = (CupsLangGet) cupsLib.resolve("cupsLangGet");
-         _cupsLangEncoding = (CupsLangEncoding) cupsLib.resolve("cupsLangEncoding");
-         _ppdOpenFile = (PPDOpenFile) cupsLib.resolve("ppdOpenFile");
-@@ -104,14 +147,27 @@ static void resolveCups()
-         _cupsAddOption = (CupsAddOption) cupsLib.resolve("cupsAddOption");
-         _cupsTempFd = (CupsTempFd) cupsLib.resolve("cupsTempFd");
-         _cupsPrintFile = (CupsPrintFile) cupsLib.resolve("cupsPrintFile");
-+        _cupsPrintFile2 = (CupsPrintFile2) cupsLib.resolve("cupsPrintFile2");
- 
--        if (_cupsGetDests && _cupsFreeDests) {
--            cups_dest_t *printers;
-+	if (_cupsEnumDests && _cupsCopyDest &&
-+	    _cupsConnectDest && _cupsGetPPD2 &&
-+	    _cupsPrintFile2) {
-+	    EnumDestsContext context;
-+	    context.printers = 0;
-+	    context.num_printers = 0;
-+	    _cupsEnumDests(0, -1, 0, 0, 0,
-+			   enum_dest_cb, &context);
-+
-+	    qt_cups_printers = context.printers;
-+	    qt_cups_num_printers = context.num_printers;
-+	} else if (_cupsGetDests && _cupsFreeDests) {
-+	    cups_dest_t *printers;
-             int num_printers = _cupsGetDests(&printers);
--            if (num_printers)
--                _cupsFreeDests(num_printers, printers);
--            qt_cups_num_printers = num_printers;
--        }
-+
-+	    if (num_printers)
-+		_cupsFreeDests(num_printers, printers);
-+	    qt_cups_num_printers = num_printers;
-+	}
-     }
-     cupsLoaded = true;
- }
-@@ -134,7 +190,15 @@ QCUPSSupport::QCUPSSupport()
-         return;
- 
-     // Update the available printer count
--    qt_cups_num_printers = prnCount = _cupsGetDests(&printers);
-+    if (qt_cups_printers && _cupsCopyDest) {
-+      int i;
-+      for (i = 0; i < qt_cups_num_printers; ++i) {
-+	  prnCount = _cupsCopyDest (&qt_cups_printers[i],
-+				    prnCount,
-+				    &printers);
-+      }
-+    } else
-+      qt_cups_num_printers = prnCount = _cupsGetDests(&printers);
- 
-     for (int i = 0; i <  prnCount; ++i) {
-         if (printers[i].is_default) {
-@@ -188,7 +252,19 @@ const ppd_file_t* QCUPSSupport::setCurre
-     currPPD = 0;
-     page_sizes = 0;
- 
--    const char *ppdFile = _cupsGetPPD(printers[index].name);
-+    const char *ppdFile = 0;
-+    if (_cupsConnectDest && _cupsGetPPD2) {
-+	char resource[HTTP_MAX_URI];
-+	http_t *http = _cupsConnectDest (&printers[index], 0, -1, 0,
-+					 resource, sizeof (resource),
-+					 0, 0);
-+	if (http) {
-+	    char *name = strrchr (resource, '/');
-+	    if (name)
-+		ppdFile = _cupsGetPPD2 (http, ++name);
-+	}
-+    } else
-+	ppdFile = _cupsGetPPD(printers[index].name);
- 
-     if (!ppdFile)
-       return 0;
-@@ -343,7 +419,29 @@ bool QCUPSSupport::printerHasPPD(const c
- {
-     if (!isAvailable())
-         return false;
--    const char *ppdFile = _cupsGetPPD(printerName);
-+
-+    const char *ppdFile = 0;
-+    if (_cupsConnectDest && _cupsGetPPD2) {
-+	int i;
-+	for (i = 0; i < prnCount; ++i)
-+	    if (!strcmp (printers[i].name, printerName))
-+		break;
-+
-+	if (i == prnCount)
-+	    return false;
-+
-+	char resource[HTTP_MAX_URI];
-+	http_t *http = _cupsConnectDest (&printers[i], 0, -1, 0,
-+					 resource, sizeof (resource),
-+					 0, 0);
-+	if (http) {
-+	    char *name = strrchr (resource, '/');
-+	    if (name)
-+		ppdFile = _cupsGetPPD2 (http, ++name);
-+	}
-+    } else
-+	ppdFile = _cupsGetPPD(printerName);
-+
-     if (ppdFile)
-         unlink(ppdFile);
-     return (ppdFile != 0);
-@@ -394,6 +492,26 @@ QPair<int, QString> QCUPSSupport::tempFd
- int QCUPSSupport::printFile(const char * printerName, const char * filename, const char * title,
-                             int num_options, cups_option_t * options)
- {
-+    if (_cupsConnectDest && _cupsPrintFile2) {
-+	int i;
-+	for (i = 0; i < prnCount; ++i)
-+	    if (!strcmp (printers[i].name, printerName))
-+		break;
-+
-+	if (i != prnCount) {
-+	    char resource[HTTP_MAX_URI];
-+	    http_t *http = _cupsConnectDest (&printers[i], 0, -1, 0,
-+					     resource, sizeof (resource),
-+					     0, 0);
-+	    if (http) {
-+		char *name = strrchr (resource, '/');
-+		if (name)
-+		    return _cupsPrintFile2 (http, ++name, filename, title,
-+					    num_options, options);
-+	    }
-+	}
-+    }
-+
-     return _cupsPrintFile(printerName, filename, title, num_options, options);
- }
- 
-diff -up qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h.cupsEnumDests qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h
---- qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h.cupsEnumDests	2012-11-23 10:09:53.000000000 +0000
-+++ qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h	2013-07-03 15:27:24.733343017 +0100
-@@ -92,7 +92,7 @@ public:
- 
-     QStringList options() const;
- 
--    static bool printerHasPPD(const char *printerName);
-+    bool printerHasPPD(const char *printerName);
- 
-     QString unicodeString(const char *s);
- 
-diff -up qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp.cupsEnumDests qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp.cupsEnumDests	2013-07-03 15:27:24.531342277 +0100
-+++ qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp	2013-07-03 15:27:24.733343017 +0100
-@@ -844,7 +844,7 @@ void QPrinter::setPrinterName(const QStr
-     if(d->use_default_engine
-         && d->outputFormat == QPrinter::NativeFormat) {
-         if (QCUPSSupport::cupsVersion() >= 10200
--            && QCUPSSupport::printerHasPPD(name.toLocal8Bit().constData()))
-+            && QCUPSSupport().printerHasPPD(name.toLocal8Bit().constData()))
-             setOutputFormat(QPrinter::PdfFormat);
-         else
-             setOutputFormat(QPrinter::PostScriptFormat);
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
deleted file mode 100644
index e0305e11b..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.6.2-cups.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
-     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+    if (cups) {
-+        const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                options.duplexShort->setChecked(true);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                options.duplexLong->setChecked(true);
-+            else
-+                options.noDuplex->setChecked(true);
-+        }
-+
-+        if (cups->currentPPD()) {
-+            // set default color
-+            if (cups->currentPPD()->color_device)
-+                options.color->setChecked(true);
-+            else
-+                options.grayscale->setChecked(true);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups->ppdOption("Collate");
-+        if (collate)
-+            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
-+    }
- }
- #endif
- 
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
-                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
-         setOutputFormat(QPrinter::PdfFormat);
-     }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+    // fill in defaults from ppd file
-+    QCUPSSupport cups;
-+
-+    int printernum = -1;
-+    for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+            printernum = i;
-+    }
-+    if (printernum >= 0) {
-+        cups.setCurrentPrinter(printernum);
-+
-+        const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                setDuplex(DuplexShortSide);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                setDuplex(DuplexLongSide);
-+            else
-+                setDuplex(DuplexNone);
-+        }
-+
-+        if (cups.currentPPD()) {
-+            // set default color
-+            if (cups.currentPPD()->color_device)
-+                setColorMode(Color);
-+            else
-+                setColorMode(GrayScale);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups.ppdOption("Collate");
-+        if (collate)
-+            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+    }
-+#endif
- }
- 
- /*!
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
deleted file mode 100644
index d4e5924df..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp
---- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp	2010-06-02 04:03:15.000000000 +0200
-+++ qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck/src/gui/kernel/qguieventdispatcher_glib.cpp	2010-12-08 22:22:38.000000000 +0100
-@@ -76,7 +76,7 @@
-     GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
-     return (XEventsQueued(X11->display, QueuedAfterFlush)
-             || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
--                && !source->d->queuedUserInputEvents.isEmpty()));
-+                && source->d && !source->d->queuedUserInputEvents.isEmpty()));
- }
- 
- static gboolean x11EventSourceCheck(GSource *s)
-@@ -84,7 +84,7 @@
-     GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
-     return (XEventsQueued(X11->display, QueuedAfterFlush)
-             || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
--                && !source->d->queuedUserInputEvents.isEmpty()));
-+                && source->d && !source->d->queuedUserInputEvents.isEmpty()));
- }
- 
- static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data)
-@@ -95,7 +95,7 @@
-     do {
-         XEvent event;
-         if (!(source->flags & QEventLoop::ExcludeUserInputEvents)
--            && !source->d->queuedUserInputEvents.isEmpty()) {
-+            && source->d && !source->d->queuedUserInputEvents.isEmpty()) {
-             // process a pending user input event
-             event = source->d->queuedUserInputEvents.takeFirst();
-         } else if (XEventsQueued(X11->display, QueuedAlready)) {
-@@ -112,7 +112,8 @@
-                 case XKeyRelease:
-                 case EnterNotify:
-                 case LeaveNotify:
--                    source->d->queuedUserInputEvents.append(event);
-+                    if (source->d)
-+                        source->d->queuedUserInputEvents.append(event);
-                     continue;
- 
-                 case ClientMessage:
-@@ -127,7 +128,8 @@
-                             break;
-                         }
-                     }
--                    source->d->queuedUserInputEvents.append(event);
-+                    if (source->d)
-+                        source->d->queuedUserInputEvents.append(event);
-                     continue;
- 
-                 default:
-@@ -140,7 +142,7 @@
-         }
- 
-         // send through event filter
--        if (source->q->filterEvent(&event))
-+        if (source->q && source->q->filterEvent(&event))
-             continue;
- 
-         if (qApp->x11ProcessEvent(&event) == 1)
-@@ -152,7 +154,8 @@
- 
-  out:
- 
--    source->d->runTimersOnceWithNormalPriority();
-+    if (source->d)
-+        source->d->runTimersOnceWithNormalPriority();
- 
-     if (callback)
-         callback(user_data);
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch
deleted file mode 100644
index 4279ce2e7..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037 qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h
---- qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h.QTBUG-22037	2011-10-03 22:44:32.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.0/src/corelib/tools/qlist.h	2011-10-15 14:25:52.238694974 -0500
-@@ -769,26 +769,18 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::clea
- template <typename T>
- Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t)
- {
--    int index = indexOf(_t);
--    if (index == -1)
--        return 0;
--
-+    detachShared();
-     const T t = _t;
--    detach();
--
--    Node *i = reinterpret_cast<Node *>(p.at(index));
--    Node *e = reinterpret_cast<Node *>(p.end());
--    Node *n = i;
--    node_destruct(i);
--    while (++i != e) {
--        if (i->t() == t)
--            node_destruct(i);
--        else
--            *n++ = *i;
--    }
--
--    int removedCount = e - n;
--    d->end -= removedCount;
-+    int removedCount=0, i=0;
-+    Node *n;
-+    while (i < p.size())
-+        if ((n = reinterpret_cast<Node *>(p.at(i)))->t() == t) {
-+            node_destruct(n);
-+            p.remove(i);
-+            ++removedCount;
-+        } else {
-+            ++i;
-+        }
-     return removedCount;
- }
- 
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch
deleted file mode 100644
index 6fedcc810..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h
---- qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h.s390-atomic	2011-12-18 16:15:20.000000000 +0100
-+++ qt-everywhere-opensource-src-4.8.0/src/corelib/arch/qatomic_s390.h	2011-12-18 16:17:34.000000000 +0100
-@@ -400,6 +400,16 @@ Q_INLINE_TEMPLATE T* QBasicAtomicPointer
- 
- 
- template <typename T>
-+Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueToAdd)
-+{
-+#ifndef __s390x__
-+    return (T *)__CS_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "ar", "", "bcr 15,0\n");
-+#else
-+    return (T *)__CSG_OLD_LOOP(&_q_value, valueToAdd * sizeof(T), "agr", "", "bcr 15,0\n");
-+#endif
-+}
-+
-+template <typename T>
- Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
- {
-     return fetchAndAddOrdered(valueToAdd);
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch
deleted file mode 100644
index 5c8b5a1dd..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf
---- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf.multilib	2011-05-23 12:26:21.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-32/qmake.conf	2011-05-25 13:39:38.789054074 +0200
-@@ -12,6 +12,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
- QMAKE_CFLAGS		= -m32
- QMAKE_LFLAGS		= -m32
- 
-+QMAKE_CFLAGS_RELEASE   += -O2
-+
- include(../common/linux.conf)
- include(../common/gcc-base-unix.conf)
- include(../common/g++-unix.conf)
-diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf
---- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf.multilib	2011-05-23 12:26:21.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++-64/qmake.conf	2011-05-25 13:39:47.460747770 +0200
-@@ -15,6 +15,8 @@ QMAKE_INCREMENTAL_STYLE = sublib
- QMAKE_CFLAGS		= -m64
- QMAKE_LFLAGS		= -m64
- 
-+QMAKE_CFLAGS_RELEASE   += -O2
-+
- include(../common/linux.conf)
- include(../common/gcc-base-unix.conf)
- include(../common/g++-unix.conf)
-diff -up qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf
---- qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf.multilib	2011-05-23 12:26:21.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.0-tp/mkspecs/linux-g++/qmake.conf	2011-05-25 13:39:26.630088814 +0200
-@@ -9,6 +9,8 @@ CONFIG			+= qt warn_on release increment
- QT			+= core gui
- QMAKE_INCREMENTAL_STYLE = sublib
- 
-+QMAKE_CFLAGS_RELEASE   += -O2
-+
- include(../common/linux.conf)
- include(../common/gcc-base-unix.conf)
- include(../common/g++-unix.conf)
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch
deleted file mode 100644
index 947f7582d..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp
---- qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp.qtreeview-kpackagekit-crash	2011-05-23 12:26:21.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.0-tp/src/gui/itemviews/qtreeview.cpp	2011-05-25 13:24:33.137315194 +0200
-@@ -3215,7 +3215,7 @@ int QTreeViewPrivate::itemHeight(int ite
-         return defaultItemHeight;
-     if (viewItems.isEmpty())
-         return 0;
--    const QModelIndex &index = viewItems.at(item).index;
-+    QModelIndex index = viewItems.at(item).index;
-     if (!index.isValid())
-         return 0;
-     int height = viewItems.at(item).height;
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
deleted file mode 100644
index e84446ce8..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp.linguist_qtmake-qt4 qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp
---- qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp.linguist_qtmake-qt4	2012-04-26 21:45:50.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp	2012-05-29 12:17:03.416561535 +0200
-@@ -314,9 +314,9 @@ int main(int argc, char **argv)
-             parseHandler.verbose = evalHandler.verbose = cd.isVerbose();
-             ProFileOption option;
- #ifdef QT_BOOTSTRAPPED
--            option.initProperties(binDir + QLatin1String("/qmake"));
-+            option.initProperties(binDir + QLatin1String("/qmake-qt4"));
- #else
--            option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
-+            option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4"));
- #endif
-             ProFileParser parser(0, &parseHandler);
-             ProFileEvaluator visitor(&option, &parser, &evalHandler);
-diff -up qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp.linguist_qtmake-qt4 qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp
---- qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp.linguist_qtmake-qt4	2012-04-26 21:45:50.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp	2012-05-29 11:46:48.811134546 +0200
-@@ -765,7 +765,7 @@ int main(int argc, char **argv)
- 
-         parseHandler.verbose = evalHandler.verbose = !!(options & Verbose);
-         ProFileOption option;
--        option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
-+        option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4"));
-         option.setCommandLineArguments(QStringList() << QLatin1String("CONFIG+=lupdate_run"));
-         ProFileParser parser(0, &parseHandler);
- 
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch
deleted file mode 100644
index 745831467..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro
---- qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro.debuginfo	2012-03-14 09:01:17.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.1/src/qt3support/qt3support.pro	2012-05-11 11:55:37.780070386 -0500
-@@ -34,6 +34,3 @@ MOCDIR = .moc
- 
- *-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing
- 
--CONFIG -= separate_debug_info
--CONFIG += no_debug_info
--
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.2--assistant-crash.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.2--assistant-crash.patch
deleted file mode 100644
index f0a41a42e..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.2--assistant-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp.me qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp
---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp.me	2012-06-19 12:52:22.740180410 +0200
-+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp	2012-06-19 12:52:51.953194103 +0200
-@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
-     if (helpEngine.usesAppFont())
-         font = helpEngine.appFont();
- 
--    const QWidgetList &widgets = qApp->allWidgets();
--    foreach (QWidget* widget, widgets)
-+    foreach (QWidget* widget, QApplication::allWidgets())
-         widget->setFont(font);
- }
- 
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch
deleted file mode 100644
index 9c53f3c26..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp.icu_no_debug qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp
---- qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp.icu_no_debug	2012-09-06 02:33:45.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp	2012-09-11 09:04:21.542379795 -0500
-@@ -84,7 +84,9 @@ bool qt_initIcu(const QString &localeStr
-         QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
-         lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
-         if (!lib.load()) {
-+#ifndef QT_NO_DEBUG
-             qWarning() << "Unable to load library icui18n" << lib.errorString();
-+#endif
-             status = ErrorLoading;
-             return false;
-         }
-@@ -114,7 +116,9 @@ bool qt_initIcu(const QString &localeStr
-         QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
-         ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
-         if (!ucLib.load()) {
-+#ifndef QT_NO_DEBUG
-             qWarning() << "Unable to load library icuuc" << ucLib.errorString();
-+#endif
-             status = ErrorLoading;
-             return false;
-         }
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-no_Werror.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-no_Werror.patch
deleted file mode 100644
index 86dcc288d..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-no_Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri
---- qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri.no_Werror	2012-09-06 02:33:50.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri	2012-09-11 09:03:19.152159783 -0500
-@@ -102,7 +102,7 @@ CONFIG -= warn_on
- 
- # Treat warnings as errors on x86/Linux/GCC
- linux-g++* {
--    !CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
-+    #!CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
- 
-     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
-         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch
deleted file mode 100644
index dd3a5a022..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp
---- qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp.qdbusconnection_no_debug.patch	2012-09-06 02:33:44.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.3/src/dbus/qdbusconnection.cpp	2012-09-11 08:55:29.854026815 -0500
-@@ -1109,8 +1109,10 @@ public:
-         // make sure this connection is running on the main thread
-         QCoreApplication *instance = QCoreApplication::instance();
-         if (!instance) {
-+#ifndef QT_NO_DEBUG
-             qWarning("QDBusConnection: %s D-Bus connection created before QCoreApplication. Application may misbehave.",
-                      type == SessionBus ? "session" : type == SystemBus ? "system" : "generic");
-+#endif
-         } else if (QDBusConnectionPrivate::d(*this)) {
-             QDBusConnectionPrivate::d(*this)->moveToThread(instance->thread());
-         }
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.4-qmake_pkgconfig_requires_private.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.4-qmake_pkgconfig_requires_private.patch
deleted file mode 100644
index 0494c81f0..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.4-qmake_pkgconfig_requires_private.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.4/qmake/generators/makefile.cpp.qmake_pkgconfig_requires_private qt-everywhere-opensource-src-4.8.4/qmake/generators/makefile.cpp
---- qt-everywhere-opensource-src-4.8.4/qmake/generators/makefile.cpp.qmake_pkgconfig_requires_private	2012-11-23 04:11:21.000000000 -0600
-+++ qt-everywhere-opensource-src-4.8.4/qmake/generators/makefile.cpp	2013-02-11 07:36:36.192779528 -0600
-@@ -3293,6 +3293,12 @@ MakefileGenerator::writePkgConfigFile()
-         t << "Requires: " << requires << endl;
-     }
- 
-+    // requires.private
-+    const QString requires_private = project->values("QMAKE_PKGCONFIG_REQUIRES_PRIVATE").join(" ");
-+    if (!requires_private.isEmpty()) {
-+        t << "Requires.private: " << requires_private << endl;
-+    }
-+
-     t << endl;
- }
- 
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch
deleted file mode 100644
index 81d74ff4d..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf.QTBUG-14467 qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf
---- qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf.QTBUG-14467	2013-05-30 16:19:17.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.5/mkspecs/features/qt_functions.prf	2013-06-09 11:53:45.709773603 -0500
-@@ -72,7 +72,7 @@ defineTest(qtAddLibrary) {
-     }
-     isEmpty(LINKAGE) {
-        if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
--           win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
-+           win32:LINKAGE = -l$${LIB_NAME}d$${QT_LIBINFIX}
-            mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
-        }
-        isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
-diff -up qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf.QTBUG-14467 qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf
---- qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf.QTBUG-14467	2013-05-30 16:19:17.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.5/mkspecs/features/win32/windows.prf	2013-06-09 11:53:45.710773593 -0500
-@@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app"){
- 
-     qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
-         isEqual(entryLib, -lqtmain): {
--            CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
-+            CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}d$${QT_LIBINFIX}
-             else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}
-         } else {
-             QMAKE_LIBS += $${entryLib}
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch
deleted file mode 100644
index 018872f6d..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp.QTBUG-21900 qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp
---- qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp.QTBUG-21900	2013-05-30 16:18:05.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/gui/kernel/qapplication_x11.cpp	2013-06-09 11:53:45.891771748 -0500
-@@ -818,6 +818,27 @@ static Bool qt_sync_request_scanner(Disp
- #endif
- #endif // QT_NO_XSYNC
- 
-+struct qt_configure_event_data
-+{
-+    WId window;
-+    WId parent;
-+};
-+
-+static Bool qt_configure_event_scanner(Display*, XEvent *event, XPointer arg)
-+{
-+    qt_configure_event_data *data =
-+        reinterpret_cast<qt_configure_event_data*>(arg);
-+    if (event->type == ConfigureNotify &&
-+        event->xconfigure.window == data->window) {
-+        return true;
-+    } else if (event->type == ReparentNotify &&
-+               event->xreparent.window == data->window) {
-+        data->parent = event->xreparent.parent;
-+    }
-+
-+    return false;
-+}
-+
- static void qt_x11_create_intern_atoms()
- {
-     const char *names[QX11Data::NAtoms];
-@@ -5302,8 +5323,11 @@ bool QETWidget::translateConfigEvent(con
-         if (d->extra->compress_events) {
-             // ConfigureNotify compression for faster opaque resizing
-             XEvent otherEvent;
--            while (XCheckTypedWindowEvent(X11->display, internalWinId(), ConfigureNotify,
--                                          &otherEvent)) {
-+            qt_configure_event_data configureData;
-+            configureData.window = internalWinId();
-+            configureData.parent = d->topData()->parentWinId;
-+            while (XCheckIfEvent(X11->display, &otherEvent,
-+                                 &qt_configure_event_scanner, (XPointer)&configureData)) {
-                 if (qt_x11EventFilter(&otherEvent))
-                     continue;
- 
-@@ -5316,13 +5340,19 @@ bool QETWidget::translateConfigEvent(con
-                 newSize.setWidth(otherEvent.xconfigure.width);
-                 newSize.setHeight(otherEvent.xconfigure.height);
- 
-+                trust = isVisible()
-+                        && (configureData.parent == XNone ||
-+                            configureData.parent == QX11Info::appRootWindow());
-+
-                 if (otherEvent.xconfigure.send_event || trust) {
-                     newCPos.rx() = otherEvent.xconfigure.x +
-                                    otherEvent.xconfigure.border_width;
-                     newCPos.ry() = otherEvent.xconfigure.y +
-                                    otherEvent.xconfigure.border_width;
-                     isCPos = true;
--                }
-+                } else {
-+                    isCPos = false;
-+               }
-             }
- #ifndef QT_NO_XSYNC
-             qt_sync_request_event_data sync_event;
-@@ -5335,9 +5365,14 @@ bool QETWidget::translateConfigEvent(con
-         }
- 
-         if (!isCPos) {
--            // we didn't get an updated position of the toplevel.
--            // either we haven't moved or there is a bug in the window manager.
--            // anyway, let's query the position to be certain.
-+            // If the last configure event didn't have a trustable position,
-+            // it's necessary to query, see ICCCM 4.24:
-+            //
-+            //  Any real ConfigureNotify event on a top-level window implies
-+            //  that the window’s position on the root may have changed, even
-+            //  though the event reports that the window’s position in its
-+            //  parent is unchanged because the window may have been reparented.
-+
-             int x, y;
-             Window child;
-             XTranslateCoordinates(X11->display, internalWinId(),
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch
deleted file mode 100644
index 5ca91145e..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.8.5-CVE-2013-4549/src/xml/sax/qxml.cpp qt-everywhere-opensource-src-4.8.5-QTBUG-35459/src/xml/sax/qxml.cpp
---- qt-everywhere-opensource-src-4.8.5-CVE-2013-4549/src/xml/sax/qxml.cpp	2013-12-05 19:23:33.000000000 +0100
-+++ qt-everywhere-opensource-src-4.8.5-QTBUG-35459/src/xml/sax/qxml.cpp	2014-01-13 20:13:59.000000000 +0100
-@@ -428,7 +428,7 @@
-     // for the DTD currently being parsed.
-     static const int dtdRecursionLimit = 2;
-     // The maximum amount of characters an entity value may contain, after expansion.
--    static const int entityCharacterLimit = 1024;
-+    static const int entityCharacterLimit = 4096;
- 
-     const QString &string();
-     void stringClear();
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch
deleted file mode 100644
index ee1d19136..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862 qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp
---- qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp.QTBUG-4862	2013-06-09 12:02:50.323221694 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/corelib/io/qfilesystemengine_unix.cpp	2013-06-09 12:38:53.140804742 -0500
-@@ -624,6 +624,25 @@ QString QFileSystemEngine::homePath()
- {
-     QString home = QFile::decodeName(qgetenv("HOME"));
-     if (home.isEmpty())
-+    {
-+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
-+        int size_max = sysconf(_SC_GETPW_R_SIZE_MAX);
-+        if (size_max == -1)
-+            size_max = 1024;
-+        QVarLengthArray<char, 1024> buf(size_max);
-+#endif
-+        struct passwd *pw = 0;
-+        uid_t user_id = getuid();
-+        pw = getpwuid(user_id);
-+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
-+        struct passwd entry;
-+        getpwuid_r(user_id, &entry, buf.data(), buf.size(), &pw);
-+#else
-+        pw = getpwuid(user_id);
-+#endif
-+        home = QFile::decodeName(QByteArray(pw->pw_dir));
-+    }
-+    if (home.isEmpty())
-         home = rootPath();
-     return QDir::cleanPath(home);
- }
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-mysql_config.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-mysql_config.patch
deleted file mode 100644
index fc0ee7670..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-mysql_config.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/configure.mysql_config qt-everywhere-opensource-src-4.8.5/configure
---- qt-everywhere-opensource-src-4.8.5/configure.mysql_config	2013-06-07 00:16:41.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.5/configure	2014-03-07 10:09:27.412071146 -0600
-@@ -5480,8 +5480,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
- 		[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config`
-                 if [ -x "$CFG_MYSQL_CONFIG" ]; then
-                     QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
-+                    $CFG_MYSQL_CONFIG --variable=pkglibdir &>/dev/null && \
-+                      QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --variable=pkglibdir 2>/dev/null`
-+                    if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then
-+                    QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r"
-+                    QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient"
-+                    else
-                     QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
-                     QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
-+                    fi
- 		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
-                     QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
-                 fi
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch
deleted file mode 100644
index 9a9f77353..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
---- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check	2013-06-09 16:28:22.938840346 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp	2013-06-09 17:03:01.781125479 -0500
-@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets()
-         return;
-     }
- 
--    static QString themeName;
--    if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
--        themeName = getThemeName();
--
--        if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
--            // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
--            // we cannot support the GTK_Qt Gtk engine
--            qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
--            return;
--        }
--    }
--
-     if (QGtkStylePrivate::gtk_init) {
-         // Gtk will set the Qt error handler so we have to reset it afterwards
-         x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0);
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch
deleted file mode 100644
index 6a87783e3..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.qt_plugin_path qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp
---- qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.qt_plugin_path	2013-06-07 00:16:52.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp	2013-06-21 07:14:10.045039936 -0500
-@@ -2511,6 +2511,15 @@ QStringList QCoreApplication::libraryPat
-             if (!app_libpaths->contains(installPathPlugins))
-                 app_libpaths->append(installPathPlugins);
-         }
-+
-+        // hack in support for kde4 plugin paths -- Rex
-+        QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
-+        if (QFile::exists(kde4PathPlugins)) {
-+            // Make sure we convert from backslashes to slashes.
-+            //kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
-+            if (!app_libpaths->contains(kde4PathPlugins))
-+                app_libpaths->append(kde4PathPlugins);
-+        }
- #endif
- 
-         // If QCoreApplication is not yet instantiated,
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch
deleted file mode 100644
index 2deeb51bb..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri
---- qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri.tds_no_strict_aliasing	2013-06-09 11:57:49.198291245 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/sql/drivers/tds/qsql_tds.pri	2013-06-09 12:01:24.120100371 -0500
-@@ -1,6 +1,8 @@
- HEADERS += $$PWD/qsql_tds.h
- SOURCES += $$PWD/qsql_tds.cpp
- 
-+*-g++*: QMAKE_CXXFLAGS += -fno-strict-aliasing
-+
- unix|win32-g++*: {
-     LIBS += $$QT_LFLAGS_TDS
-     !contains(LIBS, .*sybdb.*):LIBS += -lsybdb
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-uic_multilib.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-uic_multilib.patch
deleted file mode 100644
index d04d1be5a..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-uic_multilib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/src/tools/moc/moc.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/moc/moc.cpp
-diff -up qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp
---- qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp.uic_multilib	2013-05-30 16:18:04.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/tools/uic3/embed.cpp	2013-06-09 11:50:25.597813974 -0500
-@@ -152,8 +152,7 @@ void Ui3Reader::embed(const char *projec
-     for ( it = images.begin(); it != images.end(); ++it )
-         out << "**      " << *it << "\n";
-     out << "**\n";
--    out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
--    out << "**      by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n";
-+    out << "** Created: by: The User Interface Compiler for Qt version " << QT_VERSION_STR << "\n";
-     out << "**\n";
-     out << "** WARNING! All changes made in this file will be lost!\n";
-     out << "****************************************************************************/\n";
-diff -up qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp
---- qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp.uic_multilib	2013-05-30 16:18:04.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/tools/uic3/uic.cpp	2013-06-09 11:51:28.310174526 -0500
-@@ -146,8 +146,7 @@ void Uic::writeCopyrightHeader(DomUI *ui
-         out << "/********************************************************************************\n";
-         out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n";
-         out << "**\n";
--        out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
--        out << "**      " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
-+        out << "** Created by: " << QString::fromLatin1("Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR));
-         out << "**\n";
-         out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n";
-         out << "********************************************************************************/\n\n";
-diff -up qt-everywhere-opensource-src-4.8.5/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.8.5/src/tools/uic/uic.cpp
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-webcore_debuginfo.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-webcore_debuginfo.patch
deleted file mode 100644
index 1ea8af2b0..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.5-webcore_debuginfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebCore/WebCore.pri.webkit_debuginfo qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebCore/WebCore.pri
---- qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebCore/WebCore.pri.webkit_debuginfo	2013-06-07 00:16:55.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebCore/WebCore.pri	2013-07-11 14:04:19.937056249 -0500
-@@ -5,6 +5,12 @@ include(features.pri)
- 
- # Uncomment this to enable Texture Mapper.
- # CONFIG += texmap
-+#
-+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64)|equals(QT_ARCH, powerpc64)|equals(QT_ARCH, powerpc) {
-+    message("WebCore workaround for QtWebkit: do not build with -g, but with -g1")
-+    QMAKE_CXXFLAGS_RELEASE -= -g
-+    QMAKE_CXXFLAGS_RELEASE += -g1
-+}
- 
- QT *= network
- 
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
deleted file mode 100644
index b6f5525dc..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 09:14:44.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-12-08 12:32:46.638962448 -0600
-@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
-     pp.macros["Q_MOC_RUN"];
-     pp.macros["__cplusplus"];
- 
--    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
-+    // Workaround a bugs while parsing some boost headers. See QTBUG-22829 
-     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
-+    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
-+    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
-+    pp.macros["BOOST_TYPE_TRAITS_HPP"];
-+    pp.macros["_SYS_SYSMACROS_H_OUTER"];
- 
-     QByteArray filename;
-     QByteArray output;
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch
deleted file mode 100644
index 6d3bf2f2c..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/corelib/kernel/qeventdispatcher_glib.cpp.sav	2014-03-28 15:26:37.000000000 +0100
-+++ src/corelib/kernel/qeventdispatcher_glib.cpp	2014-04-24 09:44:09.358659204 +0200
-@@ -255,22 +255,30 @@ struct GPostEventSource
-     GSource source;
-     QAtomicInt serialNumber;
-     int lastSerialNumber;
-+    QEventLoop::ProcessEventsFlags processEventsFlags;
-     QEventDispatcherGlibPrivate *d;
- };
- 
- static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
- {
-+    GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-     QThreadData *data = QThreadData::current();
-     if (!data)
-         return false;
- 
-+    QEventLoop::ProcessEventsFlags excludeAllFlags
-+        = QEventLoop::ExcludeUserInputEvents
-+        | QEventLoop::ExcludeSocketNotifiers
-+        | QEventLoop::X11ExcludeTimers;
-+    if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags)
-+        return false;
-+
-     gint dummy;
-     if (!timeout)
-         timeout = &dummy;
-     const bool canWait = data->canWaitLocked();
-     *timeout = canWait ? -1 : 0;
- 
--    GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-     return (!canWait
-             || (source->serialNumber != source->lastSerialNumber));
- }
-@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch(
- {
-     GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-     source->lastSerialNumber = source->serialNumber;
--    QCoreApplication::sendPostedEvents();
--    source->d->runTimersOnceWithNormalPriority();
-+    QEventLoop::ProcessEventsFlags excludeAllFlags
-+        = QEventLoop::ExcludeUserInputEvents
-+        | QEventLoop::ExcludeSocketNotifiers
-+        | QEventLoop::X11ExcludeTimers;
-+    if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) {
-+        QCoreApplication::sendPostedEvents();
-+        source->d->runTimersOnceWithNormalPriority();
-+    }
-     return true; // i dunno, george...
- }
- 
-@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa
-     postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs,
-                                                                         sizeof(GPostEventSource)));
-     postEventSource->serialNumber = 1;
-+    postEventSource->processEventsFlags = QEventLoop::AllEvents;
-     postEventSource->d = this;
-     g_source_set_can_recurse(&postEventSource->source, true);
-     g_source_attach(&postEventSource->source, mainContext);
-@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents
- 
-     // tell postEventSourcePrepare() and timerSource about any new flags
-     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
-+    d->postEventSource->processEventsFlags = flags;
-     d->timerSource->processEventsFlags = flags;
-     d->socketNotifierSource->processEventsFlags = flags;
- 
-@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents
-     while (!result && canWait)
-         result = g_main_context_iteration(d->mainContext, canWait);
- 
-+    d->postEventSource->processEventsFlags = savedFlags;
-     d->timerSource->processEventsFlags = savedFlags;
-     d->socketNotifierSource->processEventsFlags = savedFlags;
- 
---- src/corelib/kernel/qeventdispatcher_unix.cpp.sav	2013-06-07 07:16:52.000000000 +0200
-+++ src/corelib/kernel/qeventdispatcher_unix.cpp	2014-04-24 09:43:06.927589535 +0200
-@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents
- 
-     // we are awake, broadcast it
-     emit awake();
--    QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
-+
-+    QEventLoop::ProcessEventsFlags excludeAllFlags
-+        = QEventLoop::ExcludeUserInputEvents
-+        | QEventLoop::ExcludeSocketNotifiers
-+        | QEventLoop::X11ExcludeTimers;
-+    if ((flags & excludeAllFlags) == excludeAllFlags)
-+        return false;
-+    if(( flags & excludeAllFlags ) != excludeAllFlags )
-+        QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
- 
-     int nevents = 0;
-     const bool canWait = (d->threadData->canWaitLocked()
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch
deleted file mode 100644
index 6949bbfef..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Author: Jan-Marek Glogowski <glogow@fbihome.de>
-Date:   Thu Mar 06 18:44:43 2014 +0100
-
-    Honor QEventLoop::ExcludeSocketNotifiers in glib event loop.
-    
-    Implements QEventLoop::ExcludeSocketNotifiers in the same way 
-    QEventLoop::X11ExcludeTimers is already implemented for the glib
-    event loop.
-
---- qt4-x11-4.8.1.orig/src/corelib/kernel/qeventdispatcher_glib.cpp
-+++ qt4-x11-4.8.1/src/corelib/kernel/qeventdispatcher_glib.cpp
-@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier
- struct GSocketNotifierSource
- {
-     GSource source;
-+    QEventLoop::ProcessEventsFlags processEventsFlags;
-     QList<GPollFDWithQSocketNotifier *> pollfds;
- };
- 
-@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceChec
-     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
- 
-     bool pending = false;
-+    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
-+        return pending;
-+
-     for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
-         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
- 
-@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDisp
-     QEvent event(QEvent::SockAct);
- 
-     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
-+    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
-+        return true;
-+
-     for (int i = 0; i < src->pollfds.count(); ++i) {
-         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
- 
-@@ -330,6 +337,7 @@ QEventDispatcherGlibPrivate::QEventDispa
-         reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs,
-                                                                sizeof(GSocketNotifierSource)));
-     (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>();
-+    socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
-     g_source_set_can_recurse(&socketNotifierSource->source, true);
-     g_source_attach(&socketNotifierSource->source, mainContext);
- 
-@@ -415,6 +423,7 @@ bool QEventDispatcherGlib::processEvents
-     // tell postEventSourcePrepare() and timerSource about any new flags
-     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
-     d->timerSource->processEventsFlags = flags;
-+    d->socketNotifierSource->processEventsFlags = flags;
- 
-     if (!(flags & QEventLoop::EventLoopExec)) {
-         // force timers to be sent at normal priority
-@@ -426,6 +435,7 @@ bool QEventDispatcherGlib::processEvents
-         result = g_main_context_iteration(d->mainContext, canWait);
- 
-     d->timerSource->processEventsFlags = savedFlags;
-+    d->socketNotifierSource->processEventsFlags = savedFlags;
- 
-     if (canWait)
-         emit awake();
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-38585.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-38585.patch
deleted file mode 100644
index 22643e8d5..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-38585.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gui/kernel/qclipboard_x11.cpp.sav	2014-04-25 09:52:03.855693228 +0200
-+++ src/gui/kernel/qclipboard_x11.cpp	2014-04-25 09:51:58.038693777 +0200
-@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Win
-                 return false;
- 
-             XSync(X11->display, false);
--            usleep(50000);
-+            if (!XPending(X11->display))
-+                usleep(5000);
- 
-             now.start();
- 
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-s390.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-s390.patch
deleted file mode 100644
index 5098c0822..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-s390.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390 qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
---- qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.s390	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-03-31 17:59:16.846465899 -0500
-@@ -189,6 +189,18 @@
- #define WTF_CPU_SPARC 1
- #endif
- 
-+/* CPU(S390X) - S390 64-bit */
-+#if defined(__s390x__)
-+#define WTF_CPU_S390X 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+
-+/* CPU(S390) - S390 32-bit */
-+#if defined(__s390__)
-+#define WTF_CPU_S390 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+
- /* CPU(X86) - i386 / x86 32-bit */
- #if   defined(__i386__) \
-     || defined(i386)     \
-@@ -903,7 +915,7 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
-+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(S390X)
- #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM) || CPU(PPC64)
- #define WTF_USE_JSVALUE32 1
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-system-clucene.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-system-clucene.patch
deleted file mode 100644
index 63a746290..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-system-clucene.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/fulltextsearch.pri qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/fulltextsearch.pri
---- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/fulltextsearch.pri	2014-04-10 20:37:12.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/fulltextsearch.pri	2014-10-26 03:33:45.000000000 +0100
-@@ -1,125 +1,7 @@
--DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
--win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
--
--CLUCENEDIR = ../../../../src/3rdparty/clucene/src/CLucene
--
--INCLUDEPATH += . .. \
--               $$CLUCENEDIR \
--               $$CLUCENEDIR/../ \
--               $$CLUCENEDIR/analysis \
--               $$CLUCENEDIR/analysis/standard \
--               $$CLUCENEDIR/config \
--               $$CLUCENEDIR/debug \
--               $$CLUCENEDIR/document \
--               $$CLUCENEDIR/index \
--               $$CLUCENEDIR/queryParser \
--               $$CLUCENEDIR/search \
--               $$CLUCENEDIR/store \
--               $$CLUCENEDIR/util
--
--
--SOURCES += $$CLUCENEDIR/StdHeader.cpp \
--           $$CLUCENEDIR/analysis/AnalysisHeader.cpp \
--           $$CLUCENEDIR/analysis/Analyzers.cpp \
--           $$CLUCENEDIR/config/gunichartables.cpp \
--           $$CLUCENEDIR/config/repl_lltot.cpp \
--           $$CLUCENEDIR/config/repl_tcscasecmp.cpp \
--           $$CLUCENEDIR/config/repl_tcslwr.cpp \
--           $$CLUCENEDIR/config/repl_tcstod.cpp \
--           $$CLUCENEDIR/config/repl_tcstoll.cpp \
--           $$CLUCENEDIR/config/repl_tprintf.cpp \
--           $$CLUCENEDIR/config/threads.cpp \
--           $$CLUCENEDIR/config/utf8.cpp \
--           $$CLUCENEDIR/debug/condition.cpp \
--           $$CLUCENEDIR/debug/error.cpp \
--           $$CLUCENEDIR/debug/memtracking.cpp \
--           $$CLUCENEDIR/document/DateField.cpp \
--           $$CLUCENEDIR/document/Document.cpp \
--           $$CLUCENEDIR/document/Field.cpp \
--           $$CLUCENEDIR/index/CompoundFile.cpp \
--           $$CLUCENEDIR/index/DocumentWriter.cpp \
--           $$CLUCENEDIR/index/FieldInfos.cpp \
--           $$CLUCENEDIR/index/FieldsReader.cpp \
--           $$CLUCENEDIR/index/FieldsWriter.cpp \
--           $$CLUCENEDIR/index/IndexModifier.cpp \
--           $$CLUCENEDIR/index/IndexReader.cpp \
--           $$CLUCENEDIR/index/IndexWriter.cpp \
--           $$CLUCENEDIR/index/MultiReader.cpp \
--           $$CLUCENEDIR/index/SegmentInfos.cpp \
--           $$CLUCENEDIR/index/SegmentMergeInfo.cpp \
--           $$CLUCENEDIR/index/SegmentMergeQueue.cpp \
--           $$CLUCENEDIR/index/SegmentMerger.cpp \
--           $$CLUCENEDIR/index/SegmentReader.cpp \
--           $$CLUCENEDIR/index/SegmentTermDocs.cpp \
--           $$CLUCENEDIR/index/SegmentTermEnum.cpp \
--           $$CLUCENEDIR/index/SegmentTermPositions.cpp \
--           $$CLUCENEDIR/index/SegmentTermVector.cpp \
--           $$CLUCENEDIR/index/Term.cpp \
--           $$CLUCENEDIR/index/TermInfo.cpp \
--           $$CLUCENEDIR/index/TermInfosReader.cpp \
--           $$CLUCENEDIR/index/TermInfosWriter.cpp \
--           $$CLUCENEDIR/index/TermVectorReader.cpp \
--           $$CLUCENEDIR/index/TermVectorWriter.cpp \
--           $$CLUCENEDIR/queryParser/Lexer.cpp \
--           $$CLUCENEDIR/queryParser/MultiFieldQueryParser.cpp \
--           $$CLUCENEDIR/queryParser/QueryParser.cpp \
--           $$CLUCENEDIR/queryParser/QueryParserBase.cpp \
--           $$CLUCENEDIR/queryParser/QueryToken.cpp \
--           $$CLUCENEDIR/queryParser/TokenList.cpp \
--           $$CLUCENEDIR/search/BooleanQuery.cpp \
--           $$CLUCENEDIR/search/BooleanScorer.cpp \
--           $$CLUCENEDIR/search/CachingWrapperFilter.cpp \
--           $$CLUCENEDIR/search/ChainedFilter.cpp \
--           $$CLUCENEDIR/search/ConjunctionScorer.cpp \
--           $$CLUCENEDIR/search/DateFilter.cpp \
--           $$CLUCENEDIR/search/ExactPhraseScorer.cpp \
--           $$CLUCENEDIR/search/Explanation.cpp \
--           $$CLUCENEDIR/search/FieldCache.cpp \
--           $$CLUCENEDIR/search/FieldCacheImpl.cpp \
--           $$CLUCENEDIR/search/FieldDocSortedHitQueue.cpp \
--           $$CLUCENEDIR/search/FieldSortedHitQueue.cpp \
--           $$CLUCENEDIR/search/FilteredTermEnum.cpp \
--           $$CLUCENEDIR/search/FuzzyQuery.cpp \
--           $$CLUCENEDIR/search/HitQueue.cpp \
--           $$CLUCENEDIR/search/Hits.cpp \
--           $$CLUCENEDIR/search/IndexSearcher.cpp \
--           $$CLUCENEDIR/search/MultiSearcher.cpp \
--           $$CLUCENEDIR/search/MultiTermQuery.cpp \
--           $$CLUCENEDIR/search/PhrasePositions.cpp \
--           $$CLUCENEDIR/search/PhraseQuery.cpp \
--           $$CLUCENEDIR/search/PhraseScorer.cpp \
--           $$CLUCENEDIR/search/PrefixQuery.cpp \
--           $$CLUCENEDIR/search/QueryFilter.cpp \
--           $$CLUCENEDIR/search/RangeFilter.cpp \
--           $$CLUCENEDIR/search/RangeQuery.cpp \
--           $$CLUCENEDIR/search/SearchHeader.cpp \
--           $$CLUCENEDIR/search/Similarity.cpp \
--           $$CLUCENEDIR/search/SloppyPhraseScorer.cpp \
--           $$CLUCENEDIR/search/Sort.cpp \
--           $$CLUCENEDIR/search/TermQuery.cpp \
--           $$CLUCENEDIR/search/TermScorer.cpp \
--           $$CLUCENEDIR/search/WildcardQuery.cpp \
--           $$CLUCENEDIR/search/WildcardTermEnum.cpp \
--           $$CLUCENEDIR/store/FSDirectory.cpp \
--           $$CLUCENEDIR/store/IndexInput.cpp \
--           $$CLUCENEDIR/store/IndexOutput.cpp \
--           $$CLUCENEDIR/store/Lock.cpp \
--           $$CLUCENEDIR/store/MMapInput.cpp \
--           $$CLUCENEDIR/store/RAMDirectory.cpp \
--           $$CLUCENEDIR/store/TransactionalRAMDirectory.cpp \
--           $$CLUCENEDIR/util/BitSet.cpp \
--           $$CLUCENEDIR/util/Equators.cpp \
--           $$CLUCENEDIR/util/FastCharStream.cpp \
--           $$CLUCENEDIR/util/fileinputstream.cpp \
--           $$CLUCENEDIR/util/Misc.cpp \
--           $$CLUCENEDIR/util/Reader.cpp \
--           $$CLUCENEDIR/util/StringBuffer.cpp \
--           $$CLUCENEDIR/util/StringIntern.cpp \
--           $$CLUCENEDIR/util/ThreadLocal.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardAnalyzer.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardFilter.cpp \
--           $$CLUCENEDIR/analysis/standard/StandardTokenizer.cpp
- 
-+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
-+LIBS += -L$$[QT_INSTALL_LIBS]/clucene09 -lclucene
-+#DEFINES += LUCENE_ENABLE_REFCOUNT (must be set at CLucene build time!)
- 
- #Header files
- HEADERS += qclucene_global_p.h \
-diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene-config_p.h qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
---- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene-config_p.h	2014-04-10 20:37:12.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene-config_p.h	2014-10-26 02:28:54.000000000 +0100
-@@ -15,6 +15,8 @@
- **
- ****************************************************************************/
- 
-+#error This header must not be included when building against system CLucene.
-+
- #ifndef QCLUCENE_CONFIG_P_H
- #define QCLUCENE_CONFIG_P_H
- 
-diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene_global_p.h qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
---- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qclucene_global_p.h	2014-04-10 20:37:12.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qclucene_global_p.h	2014-10-26 02:31:54.000000000 +0100
-@@ -29,20 +29,10 @@
- // We mean it.
- //
- 
--#if !defined(_MSC_VER)
--#   include "qclucene-config_p.h"
--#endif
--
- #include <QtCore/QChar>
- #include <QtCore/QString>
- 
--#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
--#   if !defined(TCHAR)
--#       define TCHAR wchar_t
--#   endif
--#else
--#   include <windows.h>
--#endif
-+#include <CLucene/StdHeader.h>
- 
- QT_BEGIN_HEADER
- 
-@@ -56,52 +46,6 @@
- #   define QHELP_EXPORT Q_DECL_IMPORT
- #endif
- 
--//
--//  W A R N I N G
--//  -------------
--//
--// adjustments here, need to be done in 
--// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
--//
--#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
--
--#elif !defined(DISABLE_NAMESPACE)
--#   ifdef QT_NAMESPACE
--#       define CL_NS_DEF(sub) namespace QT_NAMESPACE { namespace lucene{ namespace sub{
--#       define CL_NS_DEF2(sub,sub2) namespace QT_NAMESPACE { namespace lucene{ namespace sub{ namespace sub2 {
--
--#       define CL_NS_END }}}
--#       define CL_NS_END2 }}}}
--
--#       define CL_NS_USE(sub) using namespace QT_NAMESPACE::lucene::sub;
--#       define CL_NS_USE2(sub,sub2) using namespace QT_NAMESPACE::lucene::sub::sub2;
--
--#       define CL_NS(sub) QT_NAMESPACE::lucene::sub
--#       define CL_NS2(sub,sub2) QT_NAMESPACE::lucene::sub::sub2
--#   else
--#       define CL_NS_DEF(sub) namespace lucene{ namespace sub{
--#       define CL_NS_DEF2(sub,sub2) namespace lucene{ namespace sub{ namespace sub2 {
--
--#       define CL_NS_END }}
--#       define CL_NS_END2 }}}
--
--#       define CL_NS_USE(sub) using namespace lucene::sub;
--#       define CL_NS_USE2(sub,sub2) using namespace lucene::sub::sub2;
--
--#       define CL_NS(sub) lucene::sub
--#       define CL_NS2(sub,sub2) lucene::sub::sub2
--#   endif
--#else
--#   define CL_NS_DEF(sub)
--#   define CL_NS_DEF2(sub, sub2)
--#   define CL_NS_END
--#   define CL_NS_END2
--#   define CL_NS_USE(sub)
--#   define CL_NS_USE2(sub,sub2)
--#   define CL_NS(sub)
--#   define CL_NS2(sub,sub2)
--#endif
--
- namespace {
-     TCHAR* QStringToTChar(const QString &str)
-     {
-diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexreader.cpp qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexreader.cpp
---- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexreader.cpp	2014-04-10 20:37:12.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexreader.cpp	2014-10-26 02:48:02.000000000 +0100
-@@ -18,6 +18,8 @@
- #include "qindexreader_p.h"
- #include "qclucene_global_p.h"
- 
-+#include <QtCore/QDir>
-+
- #include <CLucene.h>
- #include <CLucene/index/IndexReader.h>
- 
-@@ -59,13 +61,13 @@
- {
-     using namespace lucene::index;
- 
--    return IndexReader::isLuceneFile(filename);
-+    return IndexReader::isLuceneFile(filename.toLocal8Bit().constData());
- }
- 
- bool QCLuceneIndexReader::indexExists(const QString &directory)
- {
-     using namespace lucene::index;
--    return IndexReader::indexExists(directory);
-+    return IndexReader::indexExists(directory.toLocal8Bit().constData());
- }
- 
- QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path)
-@@ -73,7 +75,7 @@
-     using namespace lucene::index;
- 
-     QCLuceneIndexReader indexReader;
--    indexReader.d->reader = IndexReader::open(path);
-+    indexReader.d->reader = IndexReader::open(path.toLocal8Bit().constData());
-     
-     return indexReader;
- }
-@@ -81,25 +83,29 @@
- void QCLuceneIndexReader::unlock(const QString &path)
- {
-     using namespace lucene::index;
--    IndexReader::unlock(path);
-+    IndexReader::unlock(path.toLocal8Bit().constData());
- }
- 
- bool QCLuceneIndexReader::isLocked(const QString &directory)
- {
-+    // The system CLucene fails here if the directory does not exist yet, unlike
-+    // the bundled one. Work around that.
-+    QDir::current().mkpath(directory);
-+
-     using namespace lucene::index;
--    return IndexReader::isLocked(directory);
-+    return IndexReader::isLocked(directory.toLocal8Bit().constData());
- }
- 
- quint64 QCLuceneIndexReader::lastModified(const QString &directory)
- {
-     using namespace lucene::index;
--    return quint64(IndexReader::lastModified(directory));
-+    return quint64(IndexReader::lastModified(directory.toLocal8Bit().constData()));
- }
- 
- qint64 QCLuceneIndexReader::getCurrentVersion(const QString &directory)
- {
-     using namespace lucene::index;
--    return qint64(IndexReader::getCurrentVersion(directory));
-+    return qint64(IndexReader::getCurrentVersion(directory.toLocal8Bit().constData()));
- }
- 
- void QCLuceneIndexReader::close()
-@@ -155,7 +161,7 @@
- void QCLuceneIndexReader::setNorm(qint32 doc, const QString &field, qreal value)
- {
-     TCHAR *fieldName = QStringToTChar(field);
--    d->reader->setNorm(int32_t(doc), fieldName, qreal(value));
-+    d->reader->setNorm(int32_t(doc), fieldName, (float_t)value);
-     delete [] fieldName;
- }
- 
-diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexwriter.cpp qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
---- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qindexwriter.cpp	2014-04-10 20:37:12.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qindexwriter.cpp	2014-10-26 02:48:27.000000000 +0100
-@@ -18,6 +18,8 @@
- #include "qindexwriter_p.h"
- #include "qindexreader_p.h"
- 
-+#include <QtCore/QDir>
-+
- #include <CLucene.h>
- #include <CLucene/index/IndexWriter.h>
- 
-@@ -50,7 +52,12 @@
-     : d(new QCLuceneIndexWriterPrivate())
-     , analyzer(analyzer)
- {
--    d->writer = new lucene::index::IndexWriter(path, 
-+    // The system CLucene cannot create directories recursively, so do it here.
-+    // Ignore failure: If it failed, we will get an error from CLucene anyway.
-+    if (create)
-+        QDir::current().mkpath(path);
-+
-+    d->writer = new lucene::index::IndexWriter(path.toLocal8Bit().constData(), 
-         analyzer.d->analyzer, create, closeDir);
- }
- 
-diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qsearchable.cpp qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qsearchable.cpp
---- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/fulltextsearch/qsearchable.cpp	2014-04-10 20:37:12.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/fulltextsearch/qsearchable.cpp	2014-10-26 02:48:44.000000000 +0100
-@@ -95,7 +95,7 @@
-     : QCLuceneSearcher()
- {
-     lucene::search::IndexSearcher *searcher =
--        new lucene::search::IndexSearcher(path);
-+        new lucene::search::IndexSearcher(path.toLocal8Bit().constData());
- 
-     reader.d->reader = searcher->getReader();
-     reader.d->deleteCLuceneIndexReader = false;
-diff -ur qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/lib.pro qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/lib.pro
---- qt-everywhere-opensource-src-4.8.6/tools/assistant/lib/lib.pro	2014-04-10 20:37:12.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.6-system-clucene/tools/assistant/lib/lib.pro	2014-10-26 02:27:55.000000000 +0100
-@@ -43,6 +43,7 @@
-     qhelp_global.cpp
- 
- # access to clucene
-+INCLUDEPATH += /usr/include/clucene09 $$[QT_INSTALL_LIBS]/clucene09 $$[QT_INSTALL_LIBS]
- SOURCES += qhelpsearchindexwriter_clucene.cpp \
-     qhelpsearchindexreader_clucene.cpp
- HEADERS += qhelpenginecore.h \
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch
deleted file mode 100644
index 60749d382..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch
+++ /dev/null
@@ -1,1456 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.cpp.systemtrayicon qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.cpp
---- qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.cpp.systemtrayicon	2014-03-30 15:36:45.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.cpp	2014-03-31 18:16:39.707974934 -0500
-@@ -158,15 +158,23 @@ void Window::createIconGroupBox()
-     iconComboBox->addItem(QIcon(":/images/bad.svg"), tr("Bad"));
-     iconComboBox->addItem(QIcon(":/images/heart.svg"), tr("Heart"));
-     iconComboBox->addItem(QIcon(":/images/trash.svg"), tr("Trash"));
-+    iconComboBox->addItem(QIcon::fromTheme("system-file-manager"), tr("File Manager"));
- 
-     showIconCheckBox = new QCheckBox(tr("Show icon"));
-     showIconCheckBox->setChecked(true);
- 
-+#if defined(Q_WS_X11)
-+    jitToolTipCheckBox = new QCheckBox(tr("Just In Time Tooltip"));
-+#endif
-+
-     QHBoxLayout *iconLayout = new QHBoxLayout;
-     iconLayout->addWidget(iconLabel);
-     iconLayout->addWidget(iconComboBox);
-     iconLayout->addStretch();
-     iconLayout->addWidget(showIconCheckBox);
-+#if defined(Q_WS_X11)
-+    iconLayout->addWidget(jitToolTipCheckBox);
-+#endif
-     iconGroupBox->setLayout(iconLayout);
- }
- 
-@@ -254,5 +262,37 @@ void Window::createTrayIcon()
-     trayIconMenu->addAction(quitAction);
- 
-     trayIcon = new QSystemTrayIcon(this);
-+    QByteArray category = qgetenv("SNI_CATEGORY");
-+    if (!category.isEmpty()) {
-+        trayIcon->setProperty("_qt_sni_category", QString::fromLocal8Bit(category));
-+    }
-     trayIcon->setContextMenu(trayIconMenu);
-+
-+#if defined(Q_WS_X11)
-+    trayIcon->installEventFilter(this);
-+#endif
-+}
-+
-+#if defined(Q_WS_X11)
-+bool Window::eventFilter(QObject *, QEvent *event)
-+{
-+    switch(event->type()) {
-+    case QEvent::ToolTip:
-+        if (jitToolTipCheckBox->isChecked()) {
-+            QString timeString = QTime::currentTime().toString();
-+            trayIcon->setToolTip(tr("Current Time: %1").arg(timeString));
-+        }
-+        break;
-+    case QEvent::Wheel: {
-+        QWheelEvent *wheelEvent = static_cast<QWheelEvent*>(event);
-+        int delta = wheelEvent->delta() > 0 ? 1 : -1;
-+        int index = (iconComboBox->currentIndex() + delta) % iconComboBox->count();
-+        iconComboBox->setCurrentIndex(index);
-+        break;
-+    }
-+    default:
-+        break;
-+    }
-+    return false;
- }
-+#endif
-diff -up qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.h.systemtrayicon qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.h
---- qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.h.systemtrayicon	2014-03-30 15:36:45.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/examples/desktop/systray/window.h	2014-03-31 18:16:39.707974934 -0500
-@@ -69,6 +69,9 @@ public:
- 
- protected:
-     void closeEvent(QCloseEvent *event);
-+#if defined(Q_WS_X11)
-+    bool eventFilter(QObject *object, QEvent *event);
-+#endif
- 
- private slots:
-     void setIcon(int index);
-@@ -86,6 +89,9 @@ private:
-     QLabel *iconLabel;
-     QComboBox *iconComboBox;
-     QCheckBox *showIconCheckBox;
-+#if defined(Q_WS_X11)
-+    QCheckBox *jitToolTipCheckBox;
-+#endif
- 
-     QGroupBox *messageGroupBox;
-     QLabel *typeLabel;
-diff -up qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys.cpp.systemtrayicon qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys.cpp
---- qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys.cpp.systemtrayicon	2014-03-31 18:16:39.707974934 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys.cpp	2014-03-31 18:16:39.707974934 -0500
-@@ -0,0 +1,65 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the QtGui module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** GNU Lesser General Public License Usage
-+** This file may be used under the terms of the GNU Lesser General Public
-+** License version 2.1 as published by the Free Software Foundation and
-+** appearing in the file LICENSE.LGPL included in the packaging of this
-+** file. Please review the following information to ensure the GNU Lesser
-+** General Public License version 2.1 requirements will be met:
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Nokia gives you certain additional
-+** rights. These rights are described in the Nokia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU General
-+** Public License version 3.0 as published by the Free Software Foundation
-+** and appearing in the file LICENSE.GPL included in the packaging of this
-+** file. Please review the following information to ensure the GNU General
-+** Public License version 3.0 requirements will be met:
-+** http://www.gnu.org/copyleft/gpl.html.
-+**
-+** Other Usage
-+** Alternatively, this file may be used in accordance with the terms and
-+** conditions contained in a signed written agreement between you and Nokia.
-+**
-+**
-+**
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+#ifndef QT_NO_SYSTEMTRAYICON
-+
-+#include "qabstractsystemtrayiconsys_p.h"
-+
-+
-+QSystemTrayIconSysFactoryInterface::QSystemTrayIconSysFactoryInterface()
-+{
-+}
-+
-+/////////////////////////////////////////////////
-+QAbstractSystemTrayIconSys::QAbstractSystemTrayIconSys(QSystemTrayIcon *icon)
-+: trayIcon(icon)
-+{
-+}
-+
-+QAbstractSystemTrayIconSys::~QAbstractSystemTrayIconSys()
-+{
-+}
-+
-+void QAbstractSystemTrayIconSys::sendActivated(QSystemTrayIcon::ActivationReason reason)
-+{
-+    qtsystray_sendActivated(trayIcon, reason);
-+}
-+
-+#endif
-diff -up qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys_p.h.systemtrayicon qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys_p.h
---- qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys_p.h.systemtrayicon	2014-03-31 18:16:39.708974924 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qabstractsystemtrayiconsys_p.h	2014-03-31 18:16:39.708974924 -0500
-@@ -0,0 +1,106 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the QtGui module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** GNU Lesser General Public License Usage
-+** This file may be used under the terms of the GNU Lesser General Public
-+** License version 2.1 as published by the Free Software Foundation and
-+** appearing in the file LICENSE.LGPL included in the packaging of this
-+** file. Please review the following information to ensure the GNU Lesser
-+** General Public License version 2.1 requirements will be met:
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Nokia gives you certain additional
-+** rights. These rights are described in the Nokia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU General
-+** Public License version 3.0 as published by the Free Software Foundation
-+** and appearing in the file LICENSE.GPL included in the packaging of this
-+** file. Please review the following information to ensure the GNU General
-+** Public License version 3.0 requirements will be met:
-+** http://www.gnu.org/copyleft/gpl.html.
-+**
-+** Other Usage
-+** Alternatively, this file may be used in accordance with the terms and
-+** conditions contained in a signed written agreement between you and Nokia.
-+**
-+**
-+**
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#ifndef QABSTRACTSYSTEMTRAYICONSYS_P_H
-+#define QABSTRACTSYSTEMTRAYICONSYS_P_H
-+
-+//
-+//  W A R N I N G
-+//  -------------
-+//
-+// This file is not part of the Qt API.  It exists for the convenience
-+// of a number of Qt sources files.  This header file may change from
-+// version to version without notice, or even be removed.
-+//
-+// We mean it.
-+//
-+
-+#ifndef QT_NO_SYSTEMTRAYICON
-+
-+#include <qfactoryinterface.h>
-+#include <qsystemtrayicon.h>
-+
-+class QAbstractSystemTrayIconSys;
-+
-+class Q_GUI_EXPORT QSystemTrayIconSysFactoryInterface : public QObject, public QFactoryInterface
-+{
-+    Q_OBJECT
-+public:
-+    QSystemTrayIconSysFactoryInterface();
-+    virtual QAbstractSystemTrayIconSys * create(QSystemTrayIcon *) = 0;
-+    virtual bool isAvailable() const = 0;
-+
-+    // \reimp
-+    virtual QStringList keys() const { return QStringList() << QLatin1String("default"); }
-+
-+Q_SIGNALS:
-+    void availableChanged(bool);
-+};
-+
-+#define QSystemTrayIconSysFactoryInterface_iid "com.nokia.qt.QSystemTrayIconSysFactoryInterface"
-+Q_DECLARE_INTERFACE(QSystemTrayIconSysFactoryInterface, QSystemTrayIconSysFactoryInterface_iid)
-+
-+class QRect;
-+
-+class Q_GUI_EXPORT QAbstractSystemTrayIconSys
-+{
-+public:
-+    QAbstractSystemTrayIconSys(QSystemTrayIcon *icon);
-+    virtual ~QAbstractSystemTrayIconSys();
-+
-+    virtual QRect geometry() const = 0;
-+    virtual void updateVisibility() = 0;
-+    virtual void updateIcon() = 0;
-+    virtual void updateToolTip() = 0;
-+    virtual void updateMenu() = 0;
-+    virtual void showMessage(const QString &title, const QString &message,
-+                     QSystemTrayIcon::MessageIcon icon, int msecs) = 0;
-+
-+    void sendActivated(QSystemTrayIcon::ActivationReason);
-+
-+protected:
-+    QSystemTrayIcon *trayIcon;
-+};
-+
-+#endif // QT_NO_SYSTEMTRAYICON
-+
-+#endif // QABSTRACTSYSTEMTRAYICONSYS_P_H
-+
-diff -up qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon.cpp.systemtrayicon qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon.cpp
---- qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon.cpp.systemtrayicon	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon.cpp	2014-03-31 18:16:39.708974924 -0500
-@@ -287,12 +287,6 @@ bool QSystemTrayIcon::isVisible() const
- */
- bool QSystemTrayIcon::event(QEvent *e)
- {
--#if defined(Q_WS_X11)
--    if (e->type() == QEvent::ToolTip) {
--        Q_D(QSystemTrayIcon);
--        return d->sys->deliverToolTipEvent(e);
--    }
--#endif
-     return QObject::event(e);
- }
- 
-diff -up qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_p.h.systemtrayicon qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_p.h
---- qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_p.h.systemtrayicon	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_p.h	2014-03-31 18:16:39.708974924 -0500
-@@ -62,10 +62,17 @@
- #include "QtGui/qpixmap.h"
- #include "QtCore/qstring.h"
- #include "QtCore/qpointer.h"
-+#if defined(Q_WS_X11)
-+#include "QtCore/qset.h"
-+#endif
- 
- QT_BEGIN_NAMESPACE
- 
-+#if defined(Q_WS_X11)
-+class QAbstractSystemTrayIconSys;
-+#else
- class QSystemTrayIconSys;
-+#endif
- class QToolButton;
- class QLabel;
- 
-@@ -75,6 +82,9 @@ class QSystemTrayIconPrivate : public QO
- 
- public:
-     QSystemTrayIconPrivate() : sys(0), visible(false) { }
-+    #if defined(Q_WS_X11)
-+    ~QSystemTrayIconPrivate();
-+    #endif
- 
-     void install_sys();
-     void remove_sys();
-@@ -90,7 +100,11 @@ public:
-     QPointer<QMenu> menu;
-     QIcon icon;
-     QString toolTip;
-+    #if defined(Q_WS_X11)
-+    QAbstractSystemTrayIconSys *sys;
-+    #else
-     QSystemTrayIconSys *sys;
-+    #endif
-     bool visible;
- };
- 
-@@ -123,60 +137,37 @@ private:
- };
- 
- #if defined(Q_WS_X11)
--QT_BEGIN_INCLUDE_NAMESPACE
--#include <QtCore/qcoreapplication.h>
--#include <X11/Xlib.h>
--#include <X11/Xatom.h>
--#include <X11/Xutil.h>
--QT_END_INCLUDE_NAMESPACE
-+class QSystemTrayIconSysFactoryInterface;
- 
--class QSystemTrayIconSys : public QWidget
-+/**
-+ * This class acts as a composite QSystemTrayIconSysFactory: It can create
-+ * instances of QAbstractSystemTrayIconSys* using either a plugin or the
-+ * builtin factory and will cause QSystemTrayIconPrivate to recreate their
-+ * 'sys' instances if the plugin availability changes.
-+ */
-+class QSystemTrayIconSysFactory : public QObject
- {
--    friend class QSystemTrayIconPrivate;
--
-+    Q_OBJECT
- public:
--    QSystemTrayIconSys(QSystemTrayIcon *q);
--    ~QSystemTrayIconSys();
--    enum {
--        SYSTEM_TRAY_REQUEST_DOCK = 0,
--        SYSTEM_TRAY_BEGIN_MESSAGE = 1,
--        SYSTEM_TRAY_CANCEL_MESSAGE =2
--    };
--
--    void addToTray();
--    void updateIcon();
--    XVisualInfo* getSysTrayVisualInfo();
--
--    // QObject::event is public but QWidget's ::event() re-implementation
--    // is protected ;(
--    inline bool deliverToolTipEvent(QEvent *e)
--    { return QWidget::event(e); }
--
--    static Window sysTrayWindow;
--    static QList<QSystemTrayIconSys *> trayIcons;
--    static QCoreApplication::EventFilter oldEventFilter;
--    static bool sysTrayTracker(void *message, long *result);
--    static Window locateSystemTray();
--    static Atom sysTraySelection;
--    static XVisualInfo sysTrayVisual;
-+    QSystemTrayIconSysFactory();
-+    void registerSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate);
-+    void unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate);
- 
--protected:
--    void paintEvent(QPaintEvent *pe);
--    void resizeEvent(QResizeEvent *re);
--    bool x11Event(XEvent *event);
--    void mousePressEvent(QMouseEvent *event);
--    void mouseDoubleClickEvent(QMouseEvent *event);
--#ifndef QT_NO_WHEELEVENT
--    void wheelEvent(QWheelEvent *event);
--#endif
--    bool event(QEvent *e);
-+    QAbstractSystemTrayIconSys *create(QSystemTrayIcon *) const;
-+
-+    bool isAvailable() const;
-+
-+private Q_SLOTS:
-+    void refreshTrayIconPrivates();
- 
- private:
--    QPixmap background;
--    QSystemTrayIcon *q;
--    Colormap colormap;
-+    QSystemTrayIconSysFactoryInterface *factory() const;
-+    void loadPluginFactory();
-+
-+    QSystemTrayIconSysFactoryInterface *pluginFactory;
-+    QSet<QSystemTrayIconPrivate *> trayIconPrivates;
- };
--#endif // Q_WS_X11
-+#endif
- 
- QT_END_NAMESPACE
- 
-diff -up qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_x11.cpp.systemtrayicon qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_x11.cpp
---- qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_x11.cpp.systemtrayicon	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qsystemtrayicon_x11.cpp	2014-03-31 18:16:39.709974914 -0500
-@@ -38,311 +38,122 @@
- ** $QT_END_LICENSE$
- **
- ****************************************************************************/
-+#ifndef QT_NO_SYSTEMTRAYICON
-+
-+#include <private/qfactoryloader_p.h>
- 
--#include "private/qt_x11_p.h"
--#include "qlabel.h"
--#include "qx11info_x11.h"
--#include "qpainter.h"
--#include "qpixmap.h"
--#include "qbitmap.h"
--#include "qevent.h"
--#include "qapplication.h"
--#include "qlist.h"
--#include "qmenu.h"
--#include "qtimer.h"
- #include "qsystemtrayicon_p.h"
--#include "qpaintengine.h"
-+#include "qabstractsystemtrayiconsys_p.h"
-+#include "qcoreapplication.h"
-+#include "qxembedsystemtrayicon_x11_p.h"
- 
--#ifndef QT_NO_SYSTEMTRAYICON
- QT_BEGIN_NAMESPACE
- 
--Window QSystemTrayIconSys::sysTrayWindow = XNone;
--QList<QSystemTrayIconSys *> QSystemTrayIconSys::trayIcons;
--QCoreApplication::EventFilter QSystemTrayIconSys::oldEventFilter = 0;
--Atom QSystemTrayIconSys::sysTraySelection = XNone;
--XVisualInfo QSystemTrayIconSys::sysTrayVisual = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
--
--// Locate the system tray
--Window QSystemTrayIconSys::locateSystemTray()
--{
--    Display *display = QX11Info::display();
--    if (sysTraySelection == XNone) {
--        int screen = QX11Info::appScreen();
--        QString net_sys_tray = QString::fromLatin1("_NET_SYSTEM_TRAY_S%1").arg(screen);
--        sysTraySelection = XInternAtom(display, net_sys_tray.toLatin1(), False);
--    }
--
--    return XGetSelectionOwner(QX11Info::display(), sysTraySelection);
--}
-+Q_GLOBAL_STATIC(QSystemTrayIconSysFactory, qt_guiSystemTrayIconSysFactory)
- 
--XVisualInfo* QSystemTrayIconSys::getSysTrayVisualInfo()
-+QSystemTrayIconSysFactory::QSystemTrayIconSysFactory()
-+: pluginFactory(0)
- {
--    Display *display = QX11Info::display();
--
--    if (!sysTrayVisual.visual) {
--        Window win = locateSystemTray();
--        if (win != XNone) {
--            Atom actual_type;
--            int actual_format;
--            ulong nitems, bytes_remaining;
--            uchar *data = 0;
--            int result = XGetWindowProperty(display, win, ATOM(_NET_SYSTEM_TRAY_VISUAL), 0, 1,
--                                            False, XA_VISUALID, &actual_type,
--                                            &actual_format, &nitems, &bytes_remaining, &data);
--            VisualID vid = 0;
--            if (result == Success && data && actual_type == XA_VISUALID && actual_format == 32 &&
--                nitems == 1 && bytes_remaining == 0)
--                vid = *(VisualID*)data;
--            if (data)
--                XFree(data);
--            if (vid == 0)
--                return 0;
--
--            uint mask = VisualIDMask;
--            XVisualInfo *vi, rvi;
--            int count;
--            rvi.visualid = vid;
--            vi = XGetVisualInfo(display, mask, &rvi, &count);
--            if (vi) {
--                sysTrayVisual = vi[0];
--                XFree((char*)vi);
--            }
--            if (sysTrayVisual.depth != 32)
--                memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
--        }
--    }
--
--    return sysTrayVisual.visual ? &sysTrayVisual : 0;
- }
- 
--bool QSystemTrayIconSys::sysTrayTracker(void *message, long *result)
-+void QSystemTrayIconSysFactory::loadPluginFactory()
- {
--    bool retval = false;
--    if (QSystemTrayIconSys::oldEventFilter)
--        retval = QSystemTrayIconSys::oldEventFilter(message, result);
--
--    if (trayIcons.isEmpty())
--        return retval;
--
--    Display *display = QX11Info::display();
--    XEvent *ev = (XEvent *)message;
--    if  (ev->type == DestroyNotify && ev->xany.window == sysTrayWindow) {
--	sysTrayWindow = locateSystemTray();
--        memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
--        for (int i = 0; i < trayIcons.count(); i++) {
--            if (sysTrayWindow == XNone) {
--	        QBalloonTip::hideBalloon();
--                trayIcons[i]->hide(); // still no luck
--                trayIcons[i]->destroy();
--                trayIcons[i]->create();
--	    } else
--                trayIcons[i]->addToTray(); // add it to the new tray
--        }
--        retval = true;
--    } else if (ev->type == ClientMessage && sysTrayWindow == XNone) {
--        static Atom manager_atom = XInternAtom(display, "MANAGER", False);
--        XClientMessageEvent *cm = (XClientMessageEvent *)message;
--        if ((cm->message_type == manager_atom) && ((Atom)cm->data.l[1] == sysTraySelection)) {
--	    sysTrayWindow = cm->data.l[2];
--            memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
--	    XSelectInput(display, sysTrayWindow, StructureNotifyMask);
--            for (int i = 0; i < trayIcons.count(); i++) {
--                trayIcons[i]->addToTray();
--            }
--            retval = true;
--        }
--    } else if (ev->type == PropertyNotify && ev->xproperty.atom == ATOM(_NET_SYSTEM_TRAY_VISUAL) &&
--               ev->xproperty.window == sysTrayWindow) {
--        memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
--        for (int i = 0; i < trayIcons.count(); i++) {
--            trayIcons[i]->addToTray();
--        }
--    }
--
--    return retval;
--}
--
--QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *q)
--    : QWidget(0, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint),
--      q(q), colormap(0)
--{
--    setAttribute(Qt::WA_AlwaysShowToolTips);
--    setAttribute(Qt::WA_QuitOnClose, false);
--    setAttribute(Qt::WA_NoSystemBackground, true);
--    setAttribute(Qt::WA_PaintOnScreen);
--
--    static bool eventFilterAdded = false;
--    Display *display = QX11Info::display();
--    if (!eventFilterAdded) {
--        oldEventFilter = qApp->setEventFilter(sysTrayTracker);
--	eventFilterAdded = true;
--	Window root = QX11Info::appRootWindow();
--        XWindowAttributes attr;
--        XGetWindowAttributes(display, root, &attr);
--        if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) {
--            (void) QApplication::desktop(); // lame trick to ensure our event mask is not overridden
--            XSelectInput(display, root, attr.your_event_mask | StructureNotifyMask); // for MANAGER selection
--        }
-+    if (pluginFactory) {
-+        return;
-     }
--    if (trayIcons.isEmpty()) {
--        sysTrayWindow = locateSystemTray();
--	if (sysTrayWindow != XNone)
--	    XSelectInput(display, sysTrayWindow, StructureNotifyMask); // track tray events
-+#ifndef QT_NO_LIBRARY
-+    QFactoryLoader loader(QSystemTrayIconSysFactoryInterface_iid, QLatin1String("/systemtrayicon"));
-+    pluginFactory = qobject_cast<QSystemTrayIconSysFactoryInterface *>(loader.instance(QLatin1String("default")));
-+    if (pluginFactory) {
-+        // Set parent to ensure factory destructor is called when application
-+        // is closed
-+        pluginFactory->setParent(QCoreApplication::instance());
-+        connect(pluginFactory, SIGNAL(availableChanged(bool)), SLOT(refreshTrayIconPrivates()));
-     }
--    trayIcons.append(this);
--    setMouseTracking(true);
--#ifndef QT_NO_TOOLTIP
--    setToolTip(q->toolTip());
--#endif
--    if (sysTrayWindow != XNone)
--        addToTray();
-+#endif // QT_NO_LIBRARY
- }
- 
--QSystemTrayIconSys::~QSystemTrayIconSys()
-+QSystemTrayIconSysFactoryInterface *QSystemTrayIconSysFactory::factory() const
- {
--    trayIcons.removeAt(trayIcons.indexOf(this));
--    Display *display = QX11Info::display();
--    if (trayIcons.isEmpty()) {
--        if (sysTrayWindow == XNone)
--            return;
--        if (display)
--            XSelectInput(display, sysTrayWindow, 0); // stop tracking the tray
--        sysTrayWindow = XNone;
-+    if (!pluginFactory) {
-+        const_cast<QSystemTrayIconSysFactory*>(this)->loadPluginFactory();
-     }
--    if (colormap)
--        XFreeColormap(display, colormap);
-+    if (pluginFactory && pluginFactory->isAvailable()) {
-+        return pluginFactory;
-+    }
-+    static QXEmbedSystemTrayIconSysFactory def;
-+    return def.isAvailable() ? &def : 0;
- }
- 
--void QSystemTrayIconSys::addToTray()
-+void QSystemTrayIconSysFactory::refreshTrayIconPrivates()
- {
--    Q_ASSERT(sysTrayWindow != XNone);
--    Display *display = QX11Info::display();
--
--    XVisualInfo *vi = getSysTrayVisualInfo();
--    if (vi && vi->visual) {
--        Window root = RootWindow(display, vi->screen);
--        Window p = root;
--        if (QWidget *pw = parentWidget())
--            p = pw->effectiveWinId();
--        colormap = XCreateColormap(display, root, vi->visual, AllocNone);
--        XSetWindowAttributes wsa;
--        wsa.background_pixmap = 0;
--        wsa.colormap = colormap;
--        wsa.background_pixel = 0;
--        wsa.border_pixel = 0;
--        Window wid = XCreateWindow(display, p, -1, -1, 1, 1,
--                                   0, vi->depth, InputOutput, vi->visual,
--                                   CWBackPixmap|CWBackPixel|CWBorderPixel|CWColormap, &wsa);
--        create(wid);
--    } else {
--        XSetWindowBackgroundPixmap(display, winId(), ParentRelative);
--    }
--
--    // GNOME, NET WM Specification
--    static Atom netwm_tray_atom = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", False);
--    long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, static_cast<long>(winId()), 0, 0 };
--    XEvent ev;
--    memset(&ev, 0, sizeof(ev));
--    ev.xclient.type = ClientMessage;
--    ev.xclient.window = sysTrayWindow;
--    ev.xclient.message_type = netwm_tray_atom;
--    ev.xclient.format = 32;
--    memcpy((char *)&ev.xclient.data, (const char *) l, sizeof(l));
--    XSendEvent(display, sysTrayWindow, False, 0, &ev);
--    setMinimumSize(22, 22); // required at least on GNOME
--}
--
--void QSystemTrayIconSys::updateIcon()
--{
--    update();
--}
--
--void QSystemTrayIconSys::resizeEvent(QResizeEvent *re)
--{
--     QWidget::resizeEvent(re);
--     updateIcon();
--}
--
--void QSystemTrayIconSys::paintEvent(QPaintEvent*)
--{
--    QPainter p(this);
--    if (!getSysTrayVisualInfo()) {
--        const QRegion oldSystemClip = p.paintEngine()->systemClip();
--        const QRect clearedRect = oldSystemClip.boundingRect();
--        XClearArea(QX11Info::display(), winId(), clearedRect.x(), clearedRect.y(),
--                   clearedRect.width(), clearedRect.height(), False);
--        QPaintEngine *pe = p.paintEngine();
--        pe->setSystemClip(clearedRect);
--        q->icon().paint(&p, rect());
--        pe->setSystemClip(oldSystemClip);
--    } else {
--        p.setCompositionMode(QPainter::CompositionMode_Source);
--        p.fillRect(rect(), Qt::transparent);
--        p.setCompositionMode(QPainter::CompositionMode_SourceOver);
--        q->icon().paint(&p, rect());
-+    Q_FOREACH(QSystemTrayIconPrivate *trayIconPrivate, trayIconPrivates) {
-+        if (trayIconPrivate->sys) {
-+            delete trayIconPrivate->sys;
-+            trayIconPrivate->sys = 0;
-+        }
-+        // When visible is true, sys is usually not 0 but it can be 0 if the
-+        // call to install_sys() failed.
-+        if (trayIconPrivate->visible) {
-+            trayIconPrivate->install_sys();
-+        }
-     }
- }
- 
--void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev)
-+void QSystemTrayIconSysFactory::registerSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate)
- {
--    QPoint globalPos = ev->globalPos();
--    if (ev->button() == Qt::RightButton && q->contextMenu())
--        q->contextMenu()->popup(globalPos);
--
--    if (QBalloonTip::isBalloonVisible()) {
--        emit q->messageClicked();
--        QBalloonTip::hideBalloon();
--    }
--
--    if (ev->button() == Qt::LeftButton)
--        emit q->activated(QSystemTrayIcon::Trigger);
--    else if (ev->button() == Qt::RightButton)
--        emit q->activated(QSystemTrayIcon::Context);
--    else if (ev->button() == Qt::MidButton)
--        emit q->activated(QSystemTrayIcon::MiddleClick);
-+    trayIconPrivates.insert(trayIconPrivate);
- }
- 
--void QSystemTrayIconSys::mouseDoubleClickEvent(QMouseEvent *ev)
-+void QSystemTrayIconSysFactory::unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate)
- {
--    if (ev->button() == Qt::LeftButton)
--        emit q->activated(QSystemTrayIcon::DoubleClick);
-+    trayIconPrivates.remove(trayIconPrivate);
- }
- 
--#ifndef QT_NO_WHEELEVENT
--void QSystemTrayIconSys::wheelEvent(QWheelEvent *e)
-+QAbstractSystemTrayIconSys *QSystemTrayIconSysFactory::create(QSystemTrayIcon *trayIcon) const
- {
--    QApplication::sendEvent(q, e);
-+    QSystemTrayIconSysFactoryInterface *f = factory();
-+    if (!f) {
-+        qWarning("No systemtrayicon available");
-+        return 0;
-+    }
-+    return f->create(trayIcon);
- }
--#endif
- 
--bool QSystemTrayIconSys::event(QEvent *e)
-+bool QSystemTrayIconSysFactory::isAvailable() const
- {
--    if (e->type() == QEvent::ToolTip) {
--        return QApplication::sendEvent(q, e);
--    }
--    return QWidget::event(e);
-+    return factory();
- }
- 
--bool QSystemTrayIconSys::x11Event(XEvent *event)
-+////////////////////////////////////////////////
-+QSystemTrayIconPrivate::~QSystemTrayIconPrivate()
- {
--    if (event->type == ReparentNotify)
--        show();
--    return QWidget::x11Event(event);
-+    qt_guiSystemTrayIconSysFactory()->unregisterSystemTrayIconPrivate(this);
-+    delete sys;
- }
- 
--////////////////////////////////////////////////////////////////////////////
- void QSystemTrayIconPrivate::install_sys()
- {
-     Q_Q(QSystemTrayIcon);
--    if (!sys)
--        sys = new QSystemTrayIconSys(q);
-+    if (!sys) {
-+        // Register ourself even if create() fails: our "sys" will get created
-+        // later by refreshTrayIconPrivates() if a systemtray becomes
-+        // available. This situation can happen for applications which are
-+        // started at login time, while the desktop itself is starting up.
-+        qt_guiSystemTrayIconSysFactory()->registerSystemTrayIconPrivate(this);
-+        sys = qt_guiSystemTrayIconSysFactory()->create(q);
-+        if (!sys) {
-+            return;
-+        }
-+    }
-+    sys->updateVisibility();
- }
- 
- QRect QSystemTrayIconPrivate::geometry_sys() const
- {
--    if (!sys)
--	return QRect();
--    return QRect(sys->mapToGlobal(QPoint(0, 0)), sys->size());
-+    if (!sys || !visible)
-+        return QRect();
-+    return sys->geometry();
- }
- 
- void QSystemTrayIconPrivate::remove_sys()
-@@ -350,35 +161,35 @@ void QSystemTrayIconPrivate::remove_sys(
-     if (!sys)
-         return;
-     QBalloonTip::hideBalloon();
--    sys->hide(); // this should do the trick, but...
--    delete sys; // wm may resize system tray only for DestroyEvents
--    sys = 0;
-+    sys->updateVisibility();
- }
- 
- void QSystemTrayIconPrivate::updateIcon_sys()
- {
--    if (!sys)
-+    if (!sys || !visible)
-         return;
-     sys->updateIcon();
- }
- 
- void QSystemTrayIconPrivate::updateMenu_sys()
- {
--
-+    if (!sys || !visible)
-+        return;
-+    sys->updateMenu();
- }
- 
- void QSystemTrayIconPrivate::updateToolTip_sys()
- {
--    if (!sys)
-+    if (!sys || !visible)
-         return;
- #ifndef QT_NO_TOOLTIP
--    sys->setToolTip(toolTip);
-+    sys->updateToolTip();
- #endif
- }
- 
- bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
- {
--    return QSystemTrayIconSys::locateSystemTray() != XNone;
-+    return qt_guiSystemTrayIconSysFactory()->isAvailable();
- }
- 
- bool QSystemTrayIconPrivate::supportsMessages_sys()
-@@ -389,12 +200,9 @@ bool QSystemTrayIconPrivate::supportsMes
- void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title,
-                                    QSystemTrayIcon::MessageIcon icon, int msecs)
- {
--    if (!sys)
-+    if (!sys || !visible)
-         return;
--    QPoint g = sys->mapToGlobal(QPoint(0, 0));
--    QBalloonTip::showBalloon(icon, message, title, sys->q,
--                             QPoint(g.x() + sys->width()/2, g.y() + sys->height()/2),
--                             msecs);
-+    sys->showMessage(message, title, icon, msecs);
- }
- 
- QT_END_NAMESPACE
-diff -up qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11.cpp.systemtrayicon qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11.cpp
---- qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11.cpp.systemtrayicon	2014-03-31 18:16:39.709974914 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11.cpp	2014-03-31 18:16:39.709974914 -0500
-@@ -0,0 +1,469 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the QtGui module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** GNU Lesser General Public License Usage
-+** This file may be used under the terms of the GNU Lesser General Public
-+** License version 2.1 as published by the Free Software Foundation and
-+** appearing in the file LICENSE.LGPL included in the packaging of this
-+** file. Please review the following information to ensure the GNU Lesser
-+** General Public License version 2.1 requirements will be met:
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Nokia gives you certain additional
-+** rights. These rights are described in the Nokia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU General
-+** Public License version 3.0 as published by the Free Software Foundation
-+** and appearing in the file LICENSE.GPL included in the packaging of this
-+** file. Please review the following information to ensure the GNU General
-+** Public License version 3.0 requirements will be met:
-+** http://www.gnu.org/copyleft/gpl.html.
-+**
-+** Other Usage
-+** Alternatively, this file may be used in accordance with the terms and
-+** conditions contained in a signed written agreement between you and Nokia.
-+**
-+**
-+**
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+#include "qxembedsystemtrayicon_x11_p.h"
-+
-+#ifndef QT_NO_SYSTEMTRAYICON
-+
-+#include "private/qt_x11_p.h"
-+#include "qapplication.h"
-+#include "qevent.h"
-+#include "qlist.h"
-+#include "qmenu.h"
-+#include "qpainter.h"
-+#include "qpaintengine.h"
-+#include "qsystemtrayicon_p.h"
-+#include "qx11info_x11.h"
-+
-+QT_BEGIN_INCLUDE_NAMESPACE
-+#include <QtCore/qcoreapplication.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
-+#include <X11/Xutil.h>
-+QT_END_INCLUDE_NAMESPACE
-+
-+QT_BEGIN_NAMESPACE
-+
-+class QSystemTrayIconWidget : public QWidget
-+{
-+public:
-+    QSystemTrayIconWidget(QSystemTrayIcon *q, QXEmbedSystemTrayIconSys *s);
-+    ~QSystemTrayIconWidget();
-+
-+    static Window locateSystemTray();
-+
-+protected:
-+    void paintEvent(QPaintEvent *pe);
-+    void resizeEvent(QResizeEvent *re);
-+    bool x11Event(XEvent *event);
-+    void mousePressEvent(QMouseEvent *event);
-+    void mouseDoubleClickEvent(QMouseEvent *event);
-+#ifndef QT_NO_WHEELEVENT
-+    void wheelEvent(QWheelEvent *event);
-+#endif
-+    bool event(QEvent *e);
-+
-+private:
-+    enum {
-+        SYSTEM_TRAY_REQUEST_DOCK = 0,
-+        SYSTEM_TRAY_BEGIN_MESSAGE = 1,
-+        SYSTEM_TRAY_CANCEL_MESSAGE =2
-+    };
-+
-+    void addToTray();
-+    static XVisualInfo* getSysTrayVisualInfo();
-+
-+    static Window sysTrayWindow;
-+    static QList<QSystemTrayIconWidget *> trayIcons;
-+    static QCoreApplication::EventFilter oldEventFilter;
-+    static bool sysTrayTracker(void *message, long *result);
-+    static Atom sysTraySelection;
-+    static XVisualInfo sysTrayVisual;
-+
-+    QSystemTrayIcon *q;
-+    QXEmbedSystemTrayIconSys *sys;
-+    Colormap colormap;
-+};
-+
-+Window QSystemTrayIconWidget::sysTrayWindow = XNone;
-+QList<QSystemTrayIconWidget *> QSystemTrayIconWidget::trayIcons;
-+QCoreApplication::EventFilter QSystemTrayIconWidget::oldEventFilter = 0;
-+Atom QSystemTrayIconWidget::sysTraySelection = XNone;
-+XVisualInfo QSystemTrayIconWidget::sysTrayVisual = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-+
-+QSystemTrayIconWidget::QSystemTrayIconWidget(QSystemTrayIcon* q, QXEmbedSystemTrayIconSys* sys)
-+: QWidget(0, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
-+, q(q)
-+, sys(sys)
-+, colormap(0)
-+{
-+    setAttribute(Qt::WA_AlwaysShowToolTips);
-+    setAttribute(Qt::WA_QuitOnClose, false);
-+    setAttribute(Qt::WA_NoSystemBackground, true);
-+    setAttribute(Qt::WA_PaintOnScreen);
-+    setMouseTracking(true);
-+#ifndef QT_NO_TOOLTIP
-+    setToolTip(q->toolTip());
-+#endif
-+
-+    static bool eventFilterAdded = false;
-+    Display *display = QX11Info::display();
-+    if (!eventFilterAdded) {
-+        oldEventFilter = qApp->setEventFilter(sysTrayTracker);
-+        eventFilterAdded = true;
-+        Window root = QX11Info::appRootWindow();
-+        XWindowAttributes attr;
-+        XGetWindowAttributes(display, root, &attr);
-+        if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) {
-+            (void) QApplication::desktop(); // lame trick to ensure our event mask is not overridden
-+            XSelectInput(display, root, attr.your_event_mask | StructureNotifyMask); // for MANAGER selection
-+        }
-+    }
-+    if (trayIcons.isEmpty()) {
-+        sysTrayWindow = locateSystemTray();
-+        if (sysTrayWindow != XNone)
-+            XSelectInput(display, sysTrayWindow, StructureNotifyMask); // track tray events
-+    }
-+    trayIcons.append(this);
-+    if (sysTrayWindow != XNone)
-+        addToTray();
-+}
-+
-+QSystemTrayIconWidget::~QSystemTrayIconWidget()
-+{
-+    trayIcons.removeAt(trayIcons.indexOf(this));
-+    Display *display = QX11Info::display();
-+    if (trayIcons.isEmpty()) {
-+        if (sysTrayWindow == XNone)
-+            return;
-+        if (display)
-+            XSelectInput(display, sysTrayWindow, 0); // stop tracking the tray
-+        sysTrayWindow = XNone;
-+    }
-+    if (colormap)
-+        XFreeColormap(display, colormap);
-+}
-+
-+void QSystemTrayIconWidget::resizeEvent(QResizeEvent *re)
-+{
-+    QWidget::resizeEvent(re);
-+    update();
-+}
-+
-+void QSystemTrayIconWidget::paintEvent(QPaintEvent*)
-+{
-+    QPainter p(this);
-+    if (!getSysTrayVisualInfo()) {
-+        const QRegion oldSystemClip = p.paintEngine()->systemClip();
-+        const QRect clearedRect = oldSystemClip.boundingRect();
-+        XClearArea(QX11Info::display(), winId(), clearedRect.x(), clearedRect.y(),
-+                   clearedRect.width(), clearedRect.height(), False);
-+        QPaintEngine *pe = p.paintEngine();
-+        pe->setSystemClip(clearedRect);
-+        q->icon().paint(&p, rect());
-+        pe->setSystemClip(oldSystemClip);
-+    } else {
-+        p.setCompositionMode(QPainter::CompositionMode_Source);
-+        p.fillRect(rect(), Qt::transparent);
-+        p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-+        q->icon().paint(&p, rect());
-+    }
-+}
-+
-+void QSystemTrayIconWidget::mousePressEvent(QMouseEvent *ev)
-+{
-+    QPoint globalPos = ev->globalPos();
-+    if (ev->button() == Qt::RightButton && q->contextMenu())
-+        q->contextMenu()->popup(globalPos);
-+
-+    if (QBalloonTip::isBalloonVisible()) {
-+        QMetaObject::invokeMethod(q, "messageClicked");
-+        QBalloonTip::hideBalloon();
-+    }
-+
-+    if (ev->button() == Qt::LeftButton)
-+        qtsystray_sendActivated(q, QSystemTrayIcon::Trigger);
-+    else if (ev->button() == Qt::RightButton)
-+        qtsystray_sendActivated(q, QSystemTrayIcon::Context);
-+    else if (ev->button() == Qt::MidButton)
-+        qtsystray_sendActivated(q, QSystemTrayIcon::MiddleClick);
-+}
-+
-+void QSystemTrayIconWidget::mouseDoubleClickEvent(QMouseEvent *ev)
-+{
-+    if (ev->button() == Qt::LeftButton)
-+        qtsystray_sendActivated(q, QSystemTrayIcon::DoubleClick);
-+}
-+
-+#ifndef QT_NO_WHEELEVENT
-+void QSystemTrayIconWidget::wheelEvent(QWheelEvent *e)
-+{
-+    sys->sendWheelEventToTrayIcon(e->delta(), e->orientation());
-+}
-+#endif
-+
-+bool QSystemTrayIconWidget::event(QEvent *e)
-+{
-+    if (e->type() == QEvent::ToolTip) {
-+        sys->sendToolTipEventToTrayIcon();
-+    }
-+    return QWidget::event(e);
-+}
-+
-+bool QSystemTrayIconWidget::x11Event(XEvent *event)
-+{
-+    if (event->type == ReparentNotify)
-+        show();
-+    return QWidget::x11Event(event);
-+}
-+
-+// Locate the system tray
-+Window QSystemTrayIconWidget::locateSystemTray()
-+{
-+    Display *display = QX11Info::display();
-+    if (sysTraySelection == XNone) {
-+        int screen = QX11Info::appScreen();
-+        QString net_sys_tray = QString::fromLatin1("_NET_SYSTEM_TRAY_S%1").arg(screen);
-+        sysTraySelection = XInternAtom(display, net_sys_tray.toLatin1(), False);
-+    }
-+
-+    return XGetSelectionOwner(QX11Info::display(), sysTraySelection);
-+}
-+
-+XVisualInfo* QSystemTrayIconWidget::getSysTrayVisualInfo()
-+{
-+    Display *display = QX11Info::display();
-+
-+    if (!sysTrayVisual.visual) {
-+        Window win = locateSystemTray();
-+        if (win != XNone) {
-+            Atom actual_type;
-+            int actual_format;
-+            ulong nitems, bytes_remaining;
-+            uchar *data = 0;
-+            int result = XGetWindowProperty(display, win, ATOM(_NET_SYSTEM_TRAY_VISUAL), 0, 1,
-+                                            False, XA_VISUALID, &actual_type,
-+                                            &actual_format, &nitems, &bytes_remaining, &data);
-+            VisualID vid = 0;
-+            if (result == Success && data && actual_type == XA_VISUALID && actual_format == 32 &&
-+                nitems == 1 && bytes_remaining == 0)
-+                vid = *(VisualID*)data;
-+            if (data)
-+                XFree(data);
-+            if (vid == 0)
-+                return 0;
-+
-+            uint mask = VisualIDMask;
-+            XVisualInfo *vi, rvi;
-+            int count;
-+            rvi.visualid = vid;
-+            vi = XGetVisualInfo(display, mask, &rvi, &count);
-+            if (vi) {
-+                sysTrayVisual = vi[0];
-+                XFree((char*)vi);
-+            }
-+            if (sysTrayVisual.depth != 32)
-+                memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
-+        }
-+    }
-+
-+    return sysTrayVisual.visual ? &sysTrayVisual : 0;
-+}
-+
-+bool QSystemTrayIconWidget::sysTrayTracker(void *message, long *result)
-+{
-+    bool retval = false;
-+    if (QSystemTrayIconWidget::oldEventFilter)
-+        retval = QSystemTrayIconWidget::oldEventFilter(message, result);
-+
-+    if (trayIcons.isEmpty())
-+        return retval;
-+
-+    Display *display = QX11Info::display();
-+    XEvent *ev = (XEvent *)message;
-+    if  (ev->type == DestroyNotify && ev->xany.window == sysTrayWindow) {
-+        sysTrayWindow = locateSystemTray();
-+        memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
-+        for (int i = 0; i < trayIcons.count(); i++) {
-+            if (sysTrayWindow == XNone) {
-+                QBalloonTip::hideBalloon();
-+                trayIcons[i]->hide(); // still no luck
-+                trayIcons[i]->destroy();
-+                trayIcons[i]->create();
-+            } else
-+                trayIcons[i]->addToTray(); // add it to the new tray
-+        }
-+        retval = true;
-+    } else if (ev->type == ClientMessage && sysTrayWindow == XNone) {
-+        static Atom manager_atom = XInternAtom(display, "MANAGER", False);
-+        XClientMessageEvent *cm = (XClientMessageEvent *)message;
-+        if ((cm->message_type == manager_atom) && ((Atom)cm->data.l[1] == sysTraySelection)) {
-+            sysTrayWindow = cm->data.l[2];
-+            memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
-+            XSelectInput(display, sysTrayWindow, StructureNotifyMask);
-+            for (int i = 0; i < trayIcons.count(); i++) {
-+                trayIcons[i]->addToTray();
-+            }
-+            retval = true;
-+        }
-+    } else if (ev->type == PropertyNotify && ev->xproperty.atom == ATOM(_NET_SYSTEM_TRAY_VISUAL) &&
-+               ev->xproperty.window == sysTrayWindow) {
-+        memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
-+        for (int i = 0; i < trayIcons.count(); i++) {
-+            trayIcons[i]->addToTray();
-+        }
-+    }
-+
-+    return retval;
-+}
-+
-+void QSystemTrayIconWidget::addToTray()
-+{
-+    Q_ASSERT(sysTrayWindow != XNone);
-+    Display *display = QX11Info::display();
-+
-+    XVisualInfo *vi = getSysTrayVisualInfo();
-+    if (vi && vi->visual) {
-+        Window root = RootWindow(display, vi->screen);
-+        Window p = root;
-+        if (QWidget *pw = parentWidget())
-+            p = pw->effectiveWinId();
-+        colormap = XCreateColormap(display, root, vi->visual, AllocNone);
-+        XSetWindowAttributes wsa;
-+        wsa.background_pixmap = 0;
-+        wsa.colormap = colormap;
-+        wsa.background_pixel = 0;
-+        wsa.border_pixel = 0;
-+        Window wid = XCreateWindow(display, p, -1, -1, 1, 1,
-+                                   0, vi->depth, InputOutput, vi->visual,
-+                                   CWBackPixmap|CWBackPixel|CWBorderPixel|CWColormap, &wsa);
-+        create(wid);
-+    } else {
-+        XSetWindowBackgroundPixmap(display, winId(), ParentRelative);
-+    }
-+
-+    // GNOME, NET WM Specification
-+    static Atom netwm_tray_atom = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", False);
-+    long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, static_cast<long>(winId()), 0, 0 };
-+    XEvent ev;
-+    memset(&ev, 0, sizeof(ev));
-+    ev.xclient.type = ClientMessage;
-+    ev.xclient.window = sysTrayWindow;
-+    ev.xclient.message_type = netwm_tray_atom;
-+    ev.xclient.format = 32;
-+    memcpy((char *)&ev.xclient.data, (const char *) l, sizeof(l));
-+    XSendEvent(display, sysTrayWindow, False, 0, &ev);
-+    setMinimumSize(22, 22); // required at least on GNOME
-+}
-+
-+////////////////////////////////////////////////////////////////////////////
-+QXEmbedSystemTrayIconSys::QXEmbedSystemTrayIconSys(QSystemTrayIcon *q)
-+: QAbstractSystemTrayIconSys(q)
-+, widget(0)
-+{
-+}
-+
-+QXEmbedSystemTrayIconSys::~QXEmbedSystemTrayIconSys()
-+{
-+    delete widget;
-+}
-+
-+QRect QXEmbedSystemTrayIconSys::geometry() const
-+{
-+    if (!widget)
-+        return QRect();
-+    return QRect(widget->mapToGlobal(QPoint(0, 0)), widget->size());
-+}
-+
-+void QXEmbedSystemTrayIconSys::updateIcon()
-+{
-+    if (!widget)
-+        return;
-+    widget->update();
-+}
-+
-+void QXEmbedSystemTrayIconSys::updateToolTip()
-+{
-+    if (!widget)
-+        return;
-+    widget->setToolTip(trayIcon->toolTip());
-+}
-+
-+void QXEmbedSystemTrayIconSys::showMessage(const QString &message, const QString &title,
-+                                   QSystemTrayIcon::MessageIcon icon, int msecs)
-+{
-+    if (!widget)
-+        return;
-+    QPoint point = geometry().center();
-+    QBalloonTip::showBalloon(icon, message, title, trayIcon, point, msecs);
-+}
-+
-+void QXEmbedSystemTrayIconSys::updateVisibility()
-+{
-+    bool visible = trayIcon->isVisible();
-+    if (visible && !widget)
-+        widget = new QSystemTrayIconWidget(trayIcon, this);
-+    else if (!visible && widget) {
-+        delete widget;
-+        widget = 0;
-+    }
-+}
-+
-+void QXEmbedSystemTrayIconSys::sendToolTipEventToTrayIcon()
-+{
-+#ifndef QT_NO_TOOLTIP
-+    // Pass the event through QSystemTrayIcon so that it gets a chance to
-+    // update the tooltip, then asks widget to show the tooltip
-+    Q_ASSERT(widget);
-+    QPoint globalPos = QCursor::pos();
-+    QPoint pos = widget->mapFromGlobal(globalPos);
-+    QHelpEvent event(QEvent::ToolTip, pos, globalPos);
-+    QApplication::sendEvent(trayIcon, &event);
-+#endif
-+}
-+
-+void QXEmbedSystemTrayIconSys::sendWheelEventToTrayIcon(int delta, Qt::Orientation orientation)
-+{
-+#ifndef QT_NO_WHEELEVENT
-+    Q_ASSERT(widget);
-+    QPoint globalPos = QCursor::pos();
-+    QPoint pos = widget->mapFromGlobal(globalPos);
-+    QWheelEvent event(pos, globalPos, delta, Qt::NoButton, Qt::NoModifier, orientation);
-+    QApplication::sendEvent(trayIcon, &event);
-+#endif
-+}
-+
-+void QXEmbedSystemTrayIconSys::updateMenu()
-+{
-+}
-+
-+/////////////////////////////////////////////////////////////
-+QAbstractSystemTrayIconSys * QXEmbedSystemTrayIconSysFactory::create(QSystemTrayIcon *icon)
-+{
-+    return new QXEmbedSystemTrayIconSys(icon);
-+}
-+
-+bool QXEmbedSystemTrayIconSysFactory::isAvailable() const
-+{
-+    return QSystemTrayIconWidget::locateSystemTray() != XNone;
-+}
-+
-+QT_END_NAMESPACE
-+#endif //QT_NO_SYSTEMTRAYICON
-diff -up qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11_p.h.systemtrayicon qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11_p.h
---- qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11_p.h.systemtrayicon	2014-03-31 18:16:39.709974914 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/util/qxembedsystemtrayicon_x11_p.h	2014-03-31 18:16:39.709974914 -0500
-@@ -0,0 +1,104 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-+** All rights reserved.
-+** Contact: Nokia Corporation (qt-info@nokia.com)
-+**
-+** This file is part of the QtGui module of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** GNU Lesser General Public License Usage
-+** This file may be used under the terms of the GNU Lesser General Public
-+** License version 2.1 as published by the Free Software Foundation and
-+** appearing in the file LICENSE.LGPL included in the packaging of this
-+** file. Please review the following information to ensure the GNU Lesser
-+** General Public License version 2.1 requirements will be met:
-+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Nokia gives you certain additional
-+** rights. These rights are described in the Nokia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU General
-+** Public License version 3.0 as published by the Free Software Foundation
-+** and appearing in the file LICENSE.GPL included in the packaging of this
-+** file. Please review the following information to ensure the GNU General
-+** Public License version 3.0 requirements will be met:
-+** http://www.gnu.org/copyleft/gpl.html.
-+**
-+** Other Usage
-+** Alternatively, this file may be used in accordance with the terms and
-+** conditions contained in a signed written agreement between you and Nokia.
-+**
-+**
-+**
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#ifndef QXEMBEDSYSTEMTRAYICON_X11_P_H
-+#define QXEMBEDSYSTEMTRAYICON_X11_P_H
-+
-+//
-+//  W A R N I N G
-+//  -------------
-+//
-+// This file is not part of the Qt API.  It exists for the convenience
-+// of a number of Qt sources files.  This header file may change from
-+// version to version without notice, or even be removed.
-+//
-+// We mean it.
-+//
-+
-+#ifndef QT_NO_SYSTEMTRAYICON
-+
-+#include "qabstractsystemtrayiconsys_p.h"
-+
-+QT_BEGIN_NAMESPACE
-+
-+class QSystemTrayIconWidget;
-+
-+class QXEmbedSystemTrayIconSys : public QAbstractSystemTrayIconSys
-+{
-+public:
-+    QXEmbedSystemTrayIconSys(QSystemTrayIcon *);
-+    ~QXEmbedSystemTrayIconSys();
-+
-+    QRect geometry() const;
-+
-+    void updateVisibility();
-+
-+    void updateIcon();
-+
-+    void updateToolTip();
-+
-+    void updateMenu();
-+
-+    void showMessage(const QString &message, const QString &title,
-+                     QSystemTrayIcon::MessageIcon icon, int msecs);
-+
-+private:
-+    friend class QSystemTrayIconWidget;
-+    QSystemTrayIconWidget *widget;
-+
-+    void sendToolTipEventToTrayIcon();
-+
-+    void sendWheelEventToTrayIcon(int delta, Qt::Orientation orientation);
-+};
-+
-+struct QXEmbedSystemTrayIconSysFactory : public QSystemTrayIconSysFactoryInterface
-+{
-+    QAbstractSystemTrayIconSys * create(QSystemTrayIcon *trayIcon);
-+    bool isAvailable() const;
-+};
-+
-+
-+QT_END_NAMESPACE
-+
-+#endif // QT_NO_SYSTEMTRAYICON
-+
-+#endif // QXEMBEDSYSTEMTRAYICON_X11_P_H
-+
-diff -up qt-everywhere-opensource-src-4.8.6/src/gui/util/util.pri.systemtrayicon qt-everywhere-opensource-src-4.8.6/src/gui/util/util.pri
---- qt-everywhere-opensource-src-4.8.6/src/gui/util/util.pri.systemtrayicon	2014-03-30 15:36:49.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.6/src/gui/util/util.pri	2014-03-31 18:16:39.710974903 -0500
-@@ -29,8 +29,13 @@ wince* {
- }
- 
- unix:x11 {
-+		HEADERS += \
-+				util/qabstractsystemtrayiconsys_p.h \
-+				util/qxembedsystemtrayicon_x11_p.h
- 		SOURCES += \
--				util/qsystemtrayicon_x11.cpp
-+				util/qabstractsystemtrayiconsys.cpp \
-+				util/qsystemtrayicon_x11.cpp \
-+				util/qxembedsystemtrayicon_x11.cpp
- }
- 
- embedded|qpa {
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-QT_VERSION_CHECK.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-QT_VERSION_CHECK.patch
deleted file mode 100644
index 9bce98ff8..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-QT_VERSION_CHECK.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h
---- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h.majmin	2015-05-07 09:14:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h	2016-12-08 12:10:29.677359701 -0600
-@@ -52,7 +52,7 @@
- /*
-    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
- */
--#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
-+#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
- 
- #define QT_PACKAGEDATE_STR "2015-05-07"
- 
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch
deleted file mode 100644
index 572a955dc..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp
---- qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than	2016-02-10 16:31:02.450152334 +0100
-+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp	2016-02-10 16:31:51.495307579 +0100
-@@ -40,7 +40,7 @@
- ****************************************************************************/
- 
- #include <alsa/asoundlib.h>
--#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
- #error "Alsa version found too old, require >= 1.0.10"
- #endif
- 
-diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
-index 973cbab..0b27e9d 100644
---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
-+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
-@@ -63,7 +63,7 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode
-     device = QLatin1String(dev);
-     this->mode = mode;
- 
--#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     checkSurround();
- #endif
- }
-@@ -159,13 +159,13 @@ bool QAudioDeviceInfoInternal::open()
-     QList<QByteArray> devices = availableDevices(mode);
- 
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(devices.first().constData());
- #else
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = device;
- #else
-         int idx = 0;
-@@ -212,13 +212,13 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
-     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
- 
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(devices.first().constData());
- #else
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = device;
- #else
-         int idx = 0;
-@@ -396,7 +396,7 @@ void QAudioDeviceInfoInternal::updateLists()
-     }
-     channelz.append(1);
-     channelz.append(2);
--#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     if (surround40) channelz.append(4);
-     if (surround51) channelz.append(6);
-     if (surround71) channelz.append(8);
-@@ -419,7 +419,7 @@ QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
-     QList<QByteArray> devices;
-     QByteArray filter;
- 
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     // Create a list of all current audio devices that support mode
-     void **hints, **n;
-     char *name, *descr, *io;
-@@ -498,7 +498,7 @@ QByteArray QAudioDeviceInfoInternal::defaultOutputDevice()
-     return devices.first();
- }
- 
--#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- void QAudioDeviceInfoInternal::checkSurround()
- {
-     QList<QByteArray> devices;
-diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
-index 96febf4..714bf60 100644
---- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
-+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
-@@ -98,7 +98,7 @@ private:
-     bool open();
-     void close();
- 
--#if (SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-     void checkSurround();
-     bool surround40;
-     bool surround51;
-diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
-index 339fd9f..abfa4a1 100644
---- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
-+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
-@@ -284,13 +284,13 @@ bool QAudioInputPrivate::open()
-     QString dev = QString(QLatin1String(m_device.constData()));
-     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioInput);
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(devices.first());
- #else
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(m_device);
- #else
-         int idx = 0;
-diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
-index bf85de5..c29a89f 100644
---- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
-+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
-@@ -299,13 +299,13 @@ bool QAudioOutputPrivate::open()
-     QString dev = QString(QLatin1String(m_device.constData()));
-     QList<QByteArray> devices = QAudioDeviceInfoInternal::availableDevices(QAudio::AudioOutput);
-     if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(devices.first());
- #else
-         dev = QLatin1String("hw:0,0");
- #endif
-     } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
-         dev = QLatin1String(m_device);
- #else
-         int idx = 0;
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-crash-in-qppmhandler.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-crash-in-qppmhandler.patch
deleted file mode 100644
index eeed1b97c..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-crash-in-qppmhandler.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp.me qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp
---- qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp.me	2019-03-22 10:22:16.213800109 +0100
-+++ qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp	2019-03-22 10:22:40.721890281 +0100
-@@ -108,7 +108,7 @@ static bool read_pbm_header(QIODevice *d
-     else
-         mcc = read_pbm_int(device);               // get max color component
- 
--    if (w <= 0 || w > 32767 || h <= 0 || h > 32767 || mcc <= 0)
-+    if (w <= 0 || w > 32767 || h <= 0 || h > 32767 || mcc <= 0 || mcc > 0xffff)
-         return false;                                        // weird P.M image
- 
-     return true;
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-firebird.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-firebird.patch
deleted file mode 100644
index 456abceb3..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-firebird.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp.ibase qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp
---- qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp.ibase	2015-05-07 09:14:42.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.cpp	2016-11-30 10:55:05.825339674 -0600
-@@ -39,7 +39,7 @@
- **
- ****************************************************************************/
- 
--#include <ibase.h>
-+#include <firebird/ibase.h>
- 
- int main(int, char **)
- {
-diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro.ibase qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro
---- qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro.ibase	2015-05-07 09:14:42.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/ibase/ibase.pro	2016-11-30 10:56:11.017740104 -0600
-@@ -1,4 +1,4 @@
- SOURCES = ibase.cpp
- CONFIG -= qt dylib
- mac:CONFIG -= app_bundle
--LIBS += -lgds
-+LIBS += -lfbclient
-diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h.ibase qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h
---- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h.ibase	2015-05-07 09:14:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.h	2016-11-30 10:57:34.516252974 -0600
-@@ -45,7 +45,7 @@
- #include <QtSql/qsqlresult.h>
- #include <QtSql/qsqldriver.h>
- #include <QtSql/private/qsqlcachedresult_p.h>
--#include <ibase.h>
-+#include <firebird/ibase.h>
- 
- QT_BEGIN_HEADER
- 
-diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri.ibase qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri
---- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri.ibase	2015-05-07 09:14:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/ibase/qsql_ibase.pri	2016-11-30 10:57:11.783113341 -0600
-@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_ibase.h
- SOURCES += $$PWD/qsql_ibase.cpp
- 
- unix {
--    !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
-+    !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lfbclient
- } else {
-     !contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
-         win32-borland:LIBS += gds32.lib
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-gcc6.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-gcc6.patch
deleted file mode 100644
index 421292939..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure
---- qt-everywhere-opensource-src-4.8.7/configure.gcc6	2016-04-15 07:04:19.430268222 -0500
-+++ qt-everywhere-opensource-src-4.8.7/configure	2016-04-15 07:05:22.157568689 -0500
-@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
-     *-g++*)
- 	# Check gcc's version
- 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
--	    5*|4*|3.4*)
-+	    9*|8*|7*|6*|5*|4*|3.4*)
- 		;;
-             3.3*)
-                 canBuildWebKit="no"
-@@ -8060,7 +8060,7 @@ g++*)
-     3.*)
-         COMPILER_VERSION="3.*"
-         ;;
--    5*|4.*)
-+    9*|8*|7*|6*|5*|4.*)
-         COMPILER_VERSION="4"
-         ;;
-     *)
-diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
---- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6	2015-05-07 09:14:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h	2016-04-15 07:04:19.431268227 -0500
-@@ -70,8 +70,8 @@ namespace QPatternist
-             ForegroundShift = 10,
-             BackgroundShift = 20,
-             SpecialShift    = 20,
--            ForegroundMask  = ((1 << ForegroundShift) - 1) << ForegroundShift,
--            BackgroundMask  = ((1 << BackgroundShift) - 1) << BackgroundShift
-+            ForegroundMask  = 0x1f << ForegroundShift,
-+            BackgroundMask  = 0x7 << BackgroundShift
-         };
- 
-     public:
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-gcc8_qtscript.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-gcc8_qtscript.patch
deleted file mode 100644
index 7e79d2174..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-gcc8_qtscript.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8 qt-everywhere-opensource-src-4.8.7/src/script/script.pro
---- qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8	2015-05-07 09:14:43.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/script/script.pro	2018-05-19 16:01:24.699926959 -0500
-@@ -91,6 +91,9 @@ symbian {
-     TARGET.UID3=0x2001B2E1
- }
- 
-+# hack around gcc8 optimization bug with -O2
-+QMAKE_CXXFLAGS_RELEASE += -O1
-+
- symbian {
-     symbian-abld|symbian-sbsv2 {
-         MMP_RULES += ALWAYS_BUILD_AS_ARM
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-icu59.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-icu59.patch
deleted file mode 100644
index 3edcdef02..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-icu59.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Subject: Fix build with ICU >= 59
-
-ICU >= 59 requires C++11 for its header files.
-Qt can't be compiled with -std=c++11 as a whole, so only enable
-it for qlocale_icu.cpp.
-
-Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
-===================================================================
---- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/tools.pri
-+++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
-@@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/
- else:include($$PWD/../../3rdparty/zlib_dependency.pri)
- 
- contains(QT_CONFIG,icu) {
--    SOURCES += tools/qlocale_icu.cpp
-+    cpp11.name = cpp11
-+    cpp11.input = SOURCES_CPP11
-+    cpp11.dependency_type = TYPE_C
-+    cpp11.variable_out = OBJECTS
-+    cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
-+    cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-+    QMAKE_EXTRA_COMPILERS += cpp11
-+
-+    SOURCES_CPP11 += tools/qlocale_icu.cpp
-     DEFINES += QT_USE_ICU
- }
- 
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-mariadb.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-mariadb.patch
deleted file mode 100644
index 7e480138b..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-mariadb.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp.mariadb qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp
---- qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp.mariadb	2015-05-07 09:14:48.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/src/sql/drivers/mysql/qsql_mysql.cpp	2017-10-23 14:13:15.871808984 -0500
-@@ -1105,11 +1105,16 @@ static void qLibraryInit()
-     }
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
-+
-+#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
-+    qAddPostRoutine(mysql_server_end);
-+#endif
- }
- 
- static void qLibraryEnd()
- {
- #ifndef Q_NO_MYSQL_EMBEDDED
-+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
- # if MYSQL_VERSION_ID > 40000
- #  if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003
-     mysql_library_end();
-@@ -1118,6 +1123,7 @@ static void qLibraryEnd()
- #  endif
- # endif
- #endif
-+#endif
- }
- 
- QMYSQLDriver::QMYSQLDriver(QObject * parent)
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-mips64.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-mips64.patch
deleted file mode 100644
index 6456f2c61..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-mips64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urp qt-everywhere-opensource-src-4.8.7/configure q/configure
---- qt-everywhere-opensource-src-4.8.7/configure	2016-04-03 16:49:50.218644449 +0200
-+++ q/configure	2016-04-03 17:22:35.376405024 +0200
-@@ -3331,6 +3331,9 @@ arm*)
-     CFG_ARCH=arm
-     COMPAT_ARCH=armv6
-     ;;
-+mips*)
-+    CFG_ARCH=mips
-+    ;;
- esac
- 
- if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch
deleted file mode 100644
index 6a9946030..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslcertificate.cpp
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp	2015-05-07 16:14:44.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslcertificate.cpp	2018-01-05 17:44:16.997588265 +0100
-@@ -259,10 +259,10 @@
- QByteArray QSslCertificate::version() const
- {
-     QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
--    if (d->versionString.isEmpty() && d->x509)
-+    if (d->versionString.isEmpty() && d->x509) {
-         d->versionString =
--            QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
--
-+	    QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
-+    }
-     return d->versionString;
- }
- 
-@@ -276,7 +276,7 @@
- {
-     QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
-     if (d->serialNumberString.isEmpty() && d->x509) {
--        ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber;
-+        ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509);
-         // if we cannot convert to a long, just output the hexadecimal number
-         if (serialNumber->length > 4) {
-             QByteArray hexString;
-@@ -489,24 +489,33 @@
-     QSslKey key;
- 
-     key.d->type = QSsl::PublicKey;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     X509_PUBKEY *xkey = d->x509->cert_info->key;
-+#else
-+    X509_PUBKEY *xkey = q_X509_get_X509_PUBKEY(d->x509);
-+#endif
-     EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey);
-     Q_ASSERT(pkey);
- 
--    if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) {
-+    int key_id;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    key_id = q_EVP_PKEY_type(pkey->type);
-+#else
-+    key_id = q_EVP_PKEY_base_id(pkey);
-+#endif
-+    if (key_id == EVP_PKEY_RSA) {
-         key.d->rsa = q_EVP_PKEY_get1_RSA(pkey);
-         key.d->algorithm = QSsl::Rsa;
-         key.d->isNull = false;
--    } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) {
-+    } else if (key_id == EVP_PKEY_DSA) {
-         key.d->dsa = q_EVP_PKEY_get1_DSA(pkey);
-         key.d->algorithm = QSsl::Dsa;
-         key.d->isNull = false;
--    } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) {
-+    } else if (key_id == EVP_PKEY_DH) {
-         // DH unsupported
-     } else {
-         // error?
-     }
--
-     q_EVP_PKEY_free(pkey);
-     return key;
- }
-@@ -687,7 +696,11 @@
-         unsigned char *data = 0;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         q_CRYPTO_free(data);
-+#else
-+        q_CRYPTO_free(data, __FILE__, __LINE__);
-+#endif
-     }
-     return info;
- }
-diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslkey.cpp
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp	2015-05-07 16:14:44.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslkey.cpp	2018-01-05 18:00:27.453937599 +0100
-@@ -321,8 +321,19 @@
- {
-     if (d->isNull)
-         return -1;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     return (d->algorithm == QSsl::Rsa)
-            ? q_BN_num_bits(d->rsa->n) : q_BN_num_bits(d->dsa->p);
-+#else
-+    if (d->algorithm == QSsl::Rsa) {
-+        return q_RSA_bits(d->rsa);
-+    } else {
-+        const BIGNUM *p = (const BIGNUM *) NULL;
-+        q_DSA_get0_pqg(d->dsa, &p, (const BIGNUM **) NULL, (const BIGNUM **) NULL);
-+        return q_BN_num_bits(p);
-+    }
-+#endif
-+
- }
- 
- /*!
-diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl.cpp
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp	2015-05-07 16:14:44.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl.cpp	2018-01-05 12:06:06.336990956 +0100
-@@ -93,6 +93,7 @@
- bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
- bool QSslSocketPrivate::s_loadRootCertsOnDemand = false;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- /* \internal
- 
-     From OpenSSL's thread(3) manual page:
-@@ -174,6 +175,8 @@
- }
- } // extern "C"
- 
-+#endif //OPENSSL_VERSION_NUMBER >= 0x10100000L
-+
- QSslSocketBackendPrivate::QSslSocketBackendPrivate()
-     : ssl(0),
-       ctx(0),
-@@ -222,9 +225,12 @@
-             ciph.d->encryptionMethod = descriptionList.at(4).mid(4);
-         ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export"));
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         ciph.d->bits = cipher->strength_bits;
-         ciph.d->supportedBits = cipher->alg_bits;
--
-+#else
-+	ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits);
-+#endif
-     }
-     return ciph;
- }
-@@ -363,7 +369,7 @@
-         //
-         // See also: QSslContext::fromConfiguration()
-         if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) {
--            q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle());
-+	  q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle());
-         }
-     }
- 
-@@ -500,8 +506,10 @@
- */
- void QSslSocketPrivate::deinitialize()
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     q_CRYPTO_set_id_callback(0);
-     q_CRYPTO_set_locking_callback(0);
-+#endif
- }
- 
- /*!
-@@ -522,13 +530,17 @@
-         return false;
- 
-     // Check if the library itself needs to be initialized.
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     QMutexLocker locker(openssl_locks()->initLock());
-+#endif
-     if (!s_libraryLoaded) {
-         s_libraryLoaded = true;
- 
-         // Initialize OpenSSL.
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         q_CRYPTO_set_id_callback(id_function);
-         q_CRYPTO_set_locking_callback(locking_function);
-+#endif
-         if (q_SSL_library_init() != 1)
-             return false;
-         q_SSL_load_error_strings();
-@@ -567,7 +579,9 @@
- 
- void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
- {
--    QMutexLocker locker(openssl_locks()->initLock());
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  QMutexLocker locker(openssl_locks()->initLock());
-+#endif
-     if (s_loadedCiphersAndCerts)
-         return;
-     s_loadedCiphersAndCerts = true;
-@@ -659,13 +673,18 @@
-     STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl);
-     for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) {
-         if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) {
--            if (cipher->valid) {
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+	  if (cipher->valid) {
-+#endif
-                 QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
-                 if (!ciph.isNull()) {
-                     if (!ciph.name().toLower().startsWith(QLatin1String("adh")))
-                         ciphers << ciph;
-                 }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-             }
-+#endif
-         }
-     }
- 
-diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_p.h qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_p.h
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_p.h	2015-05-07 16:14:44.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_p.h	2018-01-05 12:06:06.337990940 +0100
-@@ -84,6 +84,10 @@
- #include <openssl/tls1.h>
- #endif
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#define OPENSSL_NO_SSL2
-+#endif
-+
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
- typedef _STACK STACK;
- #endif
-diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols.cpp
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp	2015-05-07 16:14:44.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols.cpp	2018-01-05 17:59:10.636973932 +0100
-@@ -111,16 +111,30 @@
- DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
- DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
- DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
-+#else
-+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
-+#endif
- DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
- DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
-+#else
-+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
- DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
- DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG)
- DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)
-+#endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#else
-+DEFINEFUNC3(void, CRYPTO_free, void *a, a, const char *b, b, int c, c, return, DUMMYARG)
-+#endif
- DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG)
- #if  OPENSSL_VERSION_NUMBER < 0x00908000L
- DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return)
-@@ -157,6 +171,7 @@
- DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG)
- DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return)
- DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
- DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-@@ -166,6 +181,12 @@
- DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return)
- #endif
-+#else
-+DEFINEFUNC(int, OPENSSL_sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, OPENSSL_sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(void, OPENSSL_sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, OPENSSL_sk_value, STACK *a, a, int b, b, return 0, return)
-+#endif
- DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return)
- DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return)
- DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return)
-@@ -213,8 +234,12 @@
- #else
- DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return)
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return)
- DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG)
-+#else
-+DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return)
-+#endif
- DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return)
- #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
- DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return)
-@@ -229,13 +254,21 @@
- DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
- DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#else
-+DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
- #ifndef OPENSSL_NO_SSL2
- DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #endif
- DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
-+#else
-+DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return)
-+#endif
- DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
- #else
- DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
-@@ -274,7 +307,11 @@
- DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return)
- DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return)
- DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return)
-+#else
-+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return)
-+#endif
- DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return)
- #ifdef SSLEAY_MACROS
- DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return)
-@@ -282,10 +319,34 @@
- DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return)
- DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return)
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG)
-+#else
-+DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return)
-+#endif
- DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return)
-+#else
-+DEFINEFUNC(unsigned long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
-+#endif
-+DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return)
-+
-+DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+DEFINEFUNC(int, EVP_PKEY_id, const EVP_PKEY *pkey, pkey, return 0, return)
-+DEFINEFUNC(int, EVP_PKEY_base_id, const EVP_PKEY *pkey, pkey, return 0, return)
-+DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *cipher, cipher, int *alg_bits, alg_bits, return 0, return)
-+DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return)
-+DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return)
-+DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return)
-+DEFINEFUNC(int, RSA_bits,  const RSA *rsa, rsa, return 0, return)
-+DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
-+DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *x, x, return 0, return)
-+DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *x, x, return 0, return)
-+DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return)
-+#endif
- 
- #ifdef Q_OS_SYMBIAN
- #define RESOLVEFUNC(func, ordinal, lib) \
-@@ -580,7 +641,11 @@
-     static volatile bool symbolsResolved = false;
-     static volatile bool triedToResolveSymbols = false;
- #ifndef QT_NO_THREAD
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init));
-+#else
-+    QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_OPENSSL_init_ssl));
-+#endif
- #endif
-     if (symbolsResolved)
-         return true;
-@@ -614,9 +679,11 @@
-     RESOLVEFUNC(BIO_write, 269, libs.second )
-     RESOLVEFUNC(BN_num_bits, 387, libs.second )
-     RESOLVEFUNC(CRYPTO_free, 469, libs.second )
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(CRYPTO_num_locks, 500, libs.second )
-     RESOLVEFUNC(CRYPTO_set_id_callback, 513, libs.second )
-     RESOLVEFUNC(CRYPTO_set_locking_callback, 516, libs.second )
-+#endif
-     RESOLVEFUNC(DSA_free, 594, libs.second )
-     RESOLVEFUNC(ERR_error_string, 744, libs.second )
-     RESOLVEFUNC(ERR_get_error, 749, libs.second )
-@@ -674,8 +741,10 @@
-     RESOLVEFUNC(SSL_get_peer_cert_chain, 117, libs.first )
-     RESOLVEFUNC(SSL_get_peer_certificate, 118, libs.first )
-     RESOLVEFUNC(SSL_get_verify_result, 132, libs.first )
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(SSL_library_init, 137, libs.first )
-     RESOLVEFUNC(SSL_load_error_strings, 139, libs.first )
-+#endif
-     RESOLVEFUNC(SSL_new, 140, libs.first )
- #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
-     RESOLVEFUNC(SSL_ctrl, 95, libs.first )
-@@ -747,9 +816,11 @@
-     RESOLVEFUNC(BIO_write)
-     RESOLVEFUNC(BN_num_bits)
-     RESOLVEFUNC(CRYPTO_free)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(CRYPTO_num_locks)
-     RESOLVEFUNC(CRYPTO_set_id_callback)
-     RESOLVEFUNC(CRYPTO_set_locking_callback)
-+#endif
-     RESOLVEFUNC(DSA_free)
-     RESOLVEFUNC(ERR_error_string)
-     RESOLVEFUNC(ERR_get_error)
-@@ -779,10 +850,17 @@
-     RESOLVEFUNC(RAND_seed)
-     RESOLVEFUNC(RAND_status)
-     RESOLVEFUNC(RSA_free)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(sk_free)
-     RESOLVEFUNC(sk_num)
-     RESOLVEFUNC(sk_pop_free)
-     RESOLVEFUNC(sk_value)
-+#else
-+    RESOLVEFUNC(OPENSSL_sk_free)
-+    RESOLVEFUNC(OPENSSL_sk_num)
-+    RESOLVEFUNC(OPENSSL_sk_pop_free)
-+    RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(SSL_CIPHER_description)
-     RESOLVEFUNC(SSL_CTX_check_private_key)
-     RESOLVEFUNC(SSL_CTX_ctrl)
-@@ -797,6 +875,7 @@
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-+    RESOLVEFUNC(SSL_CTX_get_cert_store)
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-@@ -807,8 +886,12 @@
-     RESOLVEFUNC(SSL_get_peer_cert_chain)
-     RESOLVEFUNC(SSL_get_peer_certificate)
-     RESOLVEFUNC(SSL_get_verify_result)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(SSL_library_init)
-     RESOLVEFUNC(SSL_load_error_strings)
-+#else
-+    RESOLVEFUNC(OPENSSL_init_ssl)
-+#endif
-     RESOLVEFUNC(SSL_new)
- #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
-     RESOLVEFUNC(SSL_ctrl)
-@@ -819,17 +902,47 @@
-     RESOLVEFUNC(SSL_set_connect_state)
-     RESOLVEFUNC(SSL_shutdown)
-     RESOLVEFUNC(SSL_write)
-+
-+    RESOLVEFUNC(X509_get_serialNumber)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    RESOLVEFUNC(SSL_CTX_ctrl)
-+    RESOLVEFUNC(EVP_PKEY_id)
-+    RESOLVEFUNC(EVP_PKEY_base_id)
-+    RESOLVEFUNC(SSL_CIPHER_get_bits)
-+    RESOLVEFUNC(SSL_CTX_set_options)
-+    RESOLVEFUNC(X509_get_version)
-+    RESOLVEFUNC(X509_get_X509_PUBKEY)
-+    RESOLVEFUNC(RSA_bits)
-+    RESOLVEFUNC(DSA_security_bits)
-+    RESOLVEFUNC(DSA_get0_pqg)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    RESOLVEFUNC(X509_get_notAfter)
-+    RESOLVEFUNC(X509_get_notBefore)
-+#else
-+    RESOLVEFUNC(X509_getm_notAfter)
-+    RESOLVEFUNC(X509_getm_notBefore)
-+#endif
-+#endif
-+
- #ifndef OPENSSL_NO_SSL2
-     RESOLVEFUNC(SSLv2_client_method)
- #endif
-     RESOLVEFUNC(SSLv3_client_method)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(SSLv23_client_method)
-+#else
-+    RESOLVEFUNC(TLS_client_method)
-+#endif
-     RESOLVEFUNC(TLSv1_client_method)
- #ifndef OPENSSL_NO_SSL2
-     RESOLVEFUNC(SSLv2_server_method)
- #endif
-     RESOLVEFUNC(SSLv3_server_method)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(SSLv23_server_method)
-+#else
-+    RESOLVEFUNC(TLS_server_method)
-+#endif
-     RESOLVEFUNC(TLSv1_server_method)
-     RESOLVEFUNC(X509_NAME_entry_count)
-     RESOLVEFUNC(X509_NAME_get_entry)
-@@ -846,7 +959,11 @@
-     RESOLVEFUNC(X509_STORE_CTX_get_error)
-     RESOLVEFUNC(X509_STORE_CTX_get_error_depth)
-     RESOLVEFUNC(X509_STORE_CTX_get_current_cert)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(X509_STORE_CTX_get_chain)
-+#else
-+    RESOLVEFUNC(X509_STORE_CTX_get0_chain)
-+#endif
-     RESOLVEFUNC(X509_cmp)
- #ifndef SSLEAY_MACROS
-     RESOLVEFUNC(X509_dup)
-@@ -867,10 +984,18 @@
-     RESOLVEFUNC(d2i_DSAPrivateKey)
-     RESOLVEFUNC(d2i_RSAPrivateKey)
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf)
-     RESOLVEFUNC(OPENSSL_add_all_algorithms_conf)
-+#else
-+    RESOLVEFUNC(OPENSSL_init_crypto)
-+#endif
-     RESOLVEFUNC(SSL_CTX_load_verify_locations)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     RESOLVEFUNC(SSLeay)
-+#else
-+    RESOLVEFUNC(OpenSSL_version_num)
-+#endif
- #endif // Q_OS_SYMBIAN
-     symbolsResolved = true;
-     delete libs.first;
-diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols_p.h
---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h	2015-05-07 16:14:44.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols_p.h	2018-01-05 17:59:42.041550255 +0100
-@@ -207,16 +207,31 @@
- int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
- long q_BIO_ctrl(BIO *a, int b, long c, void *d);
- int q_BIO_free(BIO *a);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- BIO *q_BIO_new(BIO_METHOD *a);
-+#else
-+BIO *q_BIO_new(const BIO_METHOD *a);
-+#endif
- BIO *q_BIO_new_mem_buf(void *a, int b);
- int q_BIO_read(BIO *a, void *b, int c);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- BIO_METHOD *q_BIO_s_mem();
-+#else
-+const BIO_METHOD *q_BIO_s_mem();
-+#endif
- int q_BIO_write(BIO *a, const void *b, int c);
- int q_BN_num_bits(const BIGNUM *a);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- int q_CRYPTO_num_locks();
- void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int));
- void q_CRYPTO_set_id_callback(unsigned long (*a)());
- void q_CRYPTO_free(void *a);
-+#else
-+#define q_CRYPTO_num_locks() 1
-+#define q_CRYPTO_set_locking_callback(a)
-+#define q_CRYPTO_set_id_callback(a)
-+void q_CRYPTO_free(void *a, const char *b, int c);
-+#endif
- void q_DSA_free(DSA *a);
- #if OPENSSL_VERSION_NUMBER >= 0x00908000L
- // 0.9.8 broke SC and BC by changing this function's signature.
-@@ -258,6 +273,7 @@
- void q_RAND_seed(const void *a, int b);
- int q_RAND_status();
- void q_RSA_free(RSA *a);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- int q_sk_num(STACK *a);
- void q_sk_pop_free(STACK *a, void (*b)(void *));
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-@@ -267,6 +283,16 @@
- void q_sk_free(STACK *a);
- char * q_sk_value(STACK *a, int b);
- #endif
-+#else
-+int q_OPENSSL_sk_num(STACK *a);
-+void q_OPENSSL_sk_pop_free(STACK *a, void (*b)(void *));
-+void q_OPENSSL_sk_free(_STACK *a);
-+void * q_OPENSSL_sk_value(STACK *a, int b);
-+#define q_sk_num q_OPENSSL_sk_num
-+#define q_sk_pop_free q_OPENSSL_sk_pop_free
-+#define q_sk_free q_OPENSSL_sk_free
-+#define q_sk_value q_OPENSSL_sk_value
-+#endif
- int q_SSL_accept(SSL *a);
- int q_SSL_clear(SSL *a);
- char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c);
-@@ -314,8 +340,14 @@
- #else
- long q_SSL_get_verify_result(SSL *a);
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- int q_SSL_library_init();
- void q_SSL_load_error_strings();
-+#else
-+int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#define q_SSL_library_init() q_OPENSSL_init_ssl(0, (const OPENSSL_INIT_SETTINGS *) NULL)
-+#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, (const OPENSSL_INIT_SETTINGS *) NULL)
-+#endif
- SSL *q_SSL_new(SSL_CTX *a);
- #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
- long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg);
-@@ -328,11 +360,21 @@
- #if OPENSSL_VERSION_NUMBER >= 0x10000000L
- const SSL_METHOD *q_SSLv2_client_method();
- const SSL_METHOD *q_SSLv3_client_method();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- const SSL_METHOD *q_SSLv23_client_method();
-+#else
-+const SSL_METHOD *q_TLS_client_method();
-+#define q_SSLv23_client_method q_TLS_client_method
-+#endif
- const SSL_METHOD *q_TLSv1_client_method();
- const SSL_METHOD *q_SSLv2_server_method();
- const SSL_METHOD *q_SSLv3_server_method();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- const SSL_METHOD *q_SSLv23_server_method();
-+#else
-+const SSL_METHOD *q_TLS_server_method();
-+#define q_SSLv23_server_method q_TLS_server_method
-+#endif
- const SSL_METHOD *q_TLSv1_server_method();
- #else
- SSL_METHOD *q_SSLv2_client_method();
-@@ -377,7 +419,12 @@
- int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
- int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
- X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
-+#else
-+STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx);
-+#define q_X509_STORE_CTX_get_chain q_X509_STORE_CTX_get0_chain
-+#endif
- 
- #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
- #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
-@@ -399,7 +446,25 @@
- 		PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\
- 			bp,(char *)x,enc,kstr,klen,cb,u)
- #endif
-+
-+X509_STORE * q_SSL_CTX_get_cert_store(const SSL_CTX *ctx);
-+ASN1_INTEGER * q_X509_get_serialNumber(X509 *x);
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
-+#define q_X509_get_version(x) X509_get_version(x)
-+#else
-+int q_EVP_PKEY_id(const EVP_PKEY *pkey);
-+int q_EVP_PKEY_base_id(const EVP_PKEY *pkey);
-+int q_SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits);
-+long q_SSL_CTX_set_options(SSL_CTX *ctx, long options);
-+long q_X509_get_version(X509 *x);
-+X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x);
-+int q_RSA_bits(const RSA *rsa);
-+int q_DSA_security_bits(const DSA *dsa);
-+void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
-+#endif
-+
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
- #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st))
-@@ -410,8 +475,17 @@
- #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i))
- #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \
-         q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- #define q_X509_get_notAfter(x) X509_get_notAfter(x)
- #define q_X509_get_notBefore(x) X509_get_notBefore(x)
-+#else
-+ASN1_TIME *q_X509_getm_notAfter(X509 *x);
-+ASN1_TIME *q_X509_getm_notBefore(X509 *x);
-+#define q_X509_get_notAfter(x) q_X509_getm_notAfter(x)
-+#define q_X509_get_notBefore(x) q_X509_getm_notBefore(x)
-+#endif
-+
- #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
- 					(char *)(rsa))
- #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
-@@ -421,10 +495,21 @@
- #else
- #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_noconf()
- #endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- void q_OPENSSL_add_all_algorithms_noconf();
- void q_OPENSSL_add_all_algorithms_conf();
-+#else
-+int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, (const OPENSSL_INIT_SETTINGS *) NULL)
-+#  define q_OPENSSL_add_all_algorithms_noconf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, (const OPENSSL_INIT_SETTINGS *) NULL)
-+#endif
- int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- long q_SSLeay();
-+#else
-+unsigned long q_OpenSSL_version_num();
-+#define q_SSLeay q_OpenSSL_version_num
-+#endif
- 
- // Helper function
- class QDateTime;
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-qforeach.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-qforeach.patch
deleted file mode 100644
index 836dc13a4..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-qforeach.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/corelib/global/qglobal.h
-+++ b/src/corelib/global/qglobal.h
-@@ -2482,22 +2482,32 @@ typedef uint Flags;
- 
- #endif /* Q_NO_TYPESAFE_FLAGS */
- 
--#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
-+#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
- /* make use of typeof-extension */
- template <typename T>
- class QForeachContainer {
- public:
--    inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { }
-+    inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { }
-     const T c;
-     int brk;
-     typename T::const_iterator i, e;
-+    int control;
- };
- 
-+// Explanation of the control word:
-+//  - it's initialized to 1
-+//  - that means both the inner and outer loops start
-+//  - if there were no breaks, at the end of the inner loop, it's set to 0, which
-+//    causes it to exit (the inner loop is run exactly once)
-+//  - at the end of the outer loop, it's inverted, so it becomes 1 again, allowing
-+//    the outer loop to continue executing
-+//  - if there was a break inside the inner loop, it will exit with control still
-+//    set to 1; in that case, the outer loop will invert it to 0 and will exit too
- #define Q_FOREACH(variable, container)                                \
- for (QForeachContainer<__typeof__(container)> _container_(container); \
--     !_container_.brk && _container_.i != _container_.e;              \
--     __extension__  ({ ++_container_.brk; ++_container_.i; }))                       \
--    for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;}))
-+     _container_.control && _container_.i != _container_.e;         \
-+     ++_container_.i, _container_.control ^= 1)                     \
-+    for (variable = *_container_.i; _container_.control; _container_.control = 0)
- 
- #else
- 
diff --git a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-qmake_LFLAGS.patch b/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-qmake_LFLAGS.patch
deleted file mode 100644
index f1a5a12e1..000000000
--- a/source/l/qt/patches/qt-everywhere-opensource-src-4.8.7-qmake_LFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix.qmake_LFLAGS qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix
---- qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix.qmake_LFLAGS	2015-05-07 09:14:42.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.7/qmake/Makefile.unix	2018-02-15 08:25:13.168838577 -0600
-@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@
- QTOBJS = @QMAKE_QTOBJS@
- QTSRCS = @QMAKE_QTSRCS@
- QMAKESPEC = @QMAKESPEC@
--LFLAGS = @QMAKE_LFLAGS@
-+LFLAGS = @QMAKE_LFLAGS@ $(QMAKE_LFLAGS_RELEASE)
- 
- #qmake code
- OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o  \
diff --git a/source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch b/source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch
deleted file mode 100644
index 71e30c4f9..000000000
--- a/source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gui/kernel/qguiplatformplugin.cpp.adwaita	2015-02-12 14:32:45.217935391 +0100
-+++ src/gui/kernel/qguiplatformplugin.cpp	2015-02-12 14:46:11.471866038 +0100
-@@ -165,8 +165,13 @@ QString QGuiPlatformPlugin::styleName()
-     case DE_GNOME: {
-         QStringList availableStyles = QStyleFactory::keys();
-         // Set QGtkStyle for GNOME if available
-+        QString adwaitaStyleKey = QString::fromLatin1("adwaita");
-         QString gtkStyleKey = QString::fromLatin1("GTK+");
--        if (availableStyles.contains(gtkStyleKey)) {
-+        if (availableStyles.contains(adwaitaStyleKey)) {
-+            stylename = adwaitaStyleKey;
-+            break;
-+        }
-+        else if (availableStyles.contains(gtkStyleKey)) {
-             stylename = gtkStyleKey;
-             break;
-         }
diff --git a/source/l/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch b/source/l/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
deleted file mode 100644
index e5ab4bad9..000000000
--- a/source/l/qt/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h
---- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_i386.h	2009-02-25 22:09:21.000000000 +0100
-+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_i386.h	2009-04-01 17:54:21.000000000 +0200
-@@ -115,8 +115,8 @@
-     asm volatile("lock\n"
-                  "incl %0\n"
-                  "setne %1"
--                 : "=m" (_q_value), "=qm" (ret)
--                 : "m" (_q_value)
-+                 : "+m" (_q_value), "=qm" (ret)
-+                 :
-                  : "memory");
-     return ret != 0;
- }
-@@ -127,8 +127,8 @@
-     asm volatile("lock\n"
-                  "decl %0\n"
-                  "setne %1"
--                 : "=m" (_q_value), "=qm" (ret)
--                 : "m" (_q_value)
-+                 : "+m" (_q_value), "=qm" (ret)
-+                 :
-                  : "memory");
-     return ret != 0;
- }
-diff -ur qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h
---- qt-x11-opensource-src-4.5.0/src/corelib/arch/qatomic_x86_64.h	2009-02-25 22:09:21.000000000 +0100
-+++ qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm/src/corelib/arch/qatomic_x86_64.h	2009-04-01 17:54:32.000000000 +0200
-@@ -116,8 +116,8 @@
-     asm volatile("lock\n"
-                  "incl %0\n"
-                  "setne %1"
--                 : "=m" (_q_value), "=qm" (ret)
--                 : "m" (_q_value)
-+                 : "+m" (_q_value), "=qm" (ret)
-+                 :
-                  : "memory");
-     return ret != 0;
- }
-@@ -128,8 +128,8 @@
-     asm volatile("lock\n"
-                  "decl %0\n"
-                  "setne %1"
--                 : "=m" (_q_value), "=qm" (ret)
--                 : "m" (_q_value)
-+                 : "+m" (_q_value), "=qm" (ret)
-+                 :
-                  : "memory");
-     return ret != 0;
- }
diff --git a/source/l/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch b/source/l/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
deleted file mode 100644
index 4ab3ea4b1..000000000
--- a/source/l/qt/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp
---- qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp.enable_ft_lcdfilter	2009-04-21 18:57:41.000000000 -0500
-+++ qt-x11-opensource-src-4.5.1/src/gui/text/qfontengine_ft.cpp	2009-04-24 11:17:49.562695405 -0500
-@@ -72,7 +72,7 @@
- #include FT_CONFIG_OPTIONS_H
- #endif
- 
--#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
-+#if defined(FT_LCD_FILTER_H)
- #define QT_USE_FREETYPE_LCDFILTER
- #endif
- 
diff --git a/source/l/qt/profile.d/qt4.csh b/source/l/qt/profile.d/qt4.csh
deleted file mode 100644
index 6e2c726cb..000000000
--- a/source/l/qt/profile.d/qt4.csh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/csh
-# Environment path variables for the Qt package:
-if ( ! $?QT4DIR ) then
-    # It's best to use the generic directory to avoid
-    # compiling in a version-containing path:
-    if ( -d /usr/lib/qt ) then
-        setenv QT4DIR /usr/lib/qt
-    else
-        # Find the newest Qt directory and set $QT4DIR to that:
-        foreach qtd ( /usr/lib/qt-* )
-            if ( -d $qtd ) then
-                setenv QT4DIR $qtd
-            endif
-        end
-    endif
-endif
-set path = ( $path $QT4DIR/bin )
-if ( $?CPLUS_INCLUDE_PATH ) then
-    setenv CPLUS_INCLUDE_PATH $QT4DIR/include:$CPLUS_INCLUDE_PATH
-else
-    setenv CPLUS_INCLUDE_PATH $QT4DIR/include
-endif
diff --git a/source/l/qt/profile.d/qt4.sh b/source/l/qt/profile.d/qt4.sh
deleted file mode 100644
index 5b4b830aa..000000000
--- a/source/l/qt/profile.d/qt4.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Environment variables for the Qt package.
-#
-# It's best to use the generic directory to avoid
-# compiling in a version-containing path:
-if [ -d /usr/lib/qt ]; then
-  QT4DIR=/usr/lib/qt
-else
-  # Find the newest Qt directory and set $QT4DIR to that:
-  for qtd in /usr/lib/qt-* ; do
-    if [ -d $qtd ]; then
-      QT4DIR=$qtd
-    fi
-  done
-fi
-if [ ! "$CPLUS_INCLUDE_PATH" = "" ]; then
-  CPLUS_INCLUDE_PATH=$QT4DIR/include:$CPLUS_INCLUDE_PATH
-else
-  CPLUS_INCLUDE_PATH=$QT4DIR/include
-fi
-PATH="$PATH:$QT4DIR/bin"
-export QT4DIR
-export CPLUS_INCLUDE_PATH
diff --git a/source/l/qt/qt-nowebkit.SlackBuild b/source/l/qt/qt-nowebkit.SlackBuild
deleted file mode 100755
index f9e08a396..000000000
--- a/source/l/qt/qt-nowebkit.SlackBuild
+++ /dev/null
@@ -1,362 +0,0 @@
-#!/bin/bash
-
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Merged some ideas from Alex Sarmardzic's script for qt4 at SlackBuilds.org
-# ^^ Modified by Robby Workman <rworkman@slackware.com> for QT4 & KDE4
-
-# We're using qt-copy instead of a released qt version, as this git release
-# has at least one bugfix strongly recommended by the kde developers.
-
-# Obtained from:
-# git clone git://gitorious.org/+kde-developers/qt/kde-qt.git
-# git checkout origin/4.5.3-patched
-# git checkout origin/4.6.0-stable-patched
-# git checkout origin/4.6.1-patched
-# git checkout origin/4.7.0-patched
-#
-# Alternate method (we don't use this):
-# wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched
-#
-# Modifications 2010, 2011, 2012  Eric Hameleers, Eindhoven, NL
-# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2, 4.8.4, 4.8.5, 4.8.6 are built from original nokia sources.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=qt
-VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-17}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  # To prevent "qatomic_armv6.h error: output number 2 not directly addressable"
-  # More permanent solution is to patch gcc:
-  # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf qt-everywhere-opensource-src-$VERSION
-tar xvf $CWD/qt-everywhere-opensource-src-$VERSION.tar.xz     # For qt releases
-cd qt-everywhere-opensource-src-$VERSION || exit 1
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-if [ $ARCH = "i486" -o $ARCH = "i586" ]; then
-  sed -i -e "s/QMAKE_CFLAGS_RELEASE        += -O2/QMAKE_CFLAGS_RELEASE        += $SLKCFLAGS/" mkspecs/common/gcc-base.conf || exit 1
-fi
-
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-uic_multilib.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-webcore_debuginfo.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-cupsEnumDests.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-prefer_adwaita_on_gnome.patch.gz | patch -p0 --verbose || exit 1
-#zcat $CWD/patches/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.1-linguist_qmake-qt4.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.1-qt3support_debuginfo.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.4-qmake_pkgconfig_requires_private.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-firebird.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-QT_VERSION_CHECK.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-mysql_config.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.6.2-cups.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-mariadb.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-qmake_LFLAGS.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-14467.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.0-tp-qtreeview-kpackagekit-crash.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.6-s390.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.3-no_Werror.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.0-s390-atomic.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.3-icu_no_debug.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.2--assistant-crash.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-4.8-poll.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch.gz | patch -p0 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-38585.patch.gz | patch -p0 --verbose || exit 1
-#zcat $CWD/patches/qt-everywhere-opensource-src-4.8.6-system-clucene.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-mips64.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-gcc6.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-gcc8_qtscript.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-aarch64.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-qforeach.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-crash-in-qppmhandler.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch.gz | patch -p1 --verbose || exit 1
-#zcat $CWD/patches/qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-everywhere-opensource-src-4.8.7-icu59.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/qt-4.8-disable-sslv3.patch.gz | patch -p1 --verbose || exit 1
-
-# All other distros I checked build with -no-webkit. But this has the downside of
-# breaking the build when QtWebKit is present on the build system and some things
-# (assistant for one) are built without support for QtWebKit. So let's go with
-# -webkit and remove the built files later from the package. -HW
-
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks"
-export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks"
-./configure \
-  -confirm-license \
-  -opensource \
-  -prefix /usr/lib${LIBDIRSUFFIX}/qt \
-  -fast \
-  -release \
-  -system-libpng \
-  -system-libjpeg \
-  -system-zlib \
-  -system-sqlite \
-  -plugin-sql-sqlite \
-  -dbus \
-  -webkit \
-  -no-phonon \
-  -nomake examples \
-  -nomake demos \
-  -nomake docs \
-  -no-separate-debug-info \
-  -no-pch
-  # No-precompiled-headers is ccache-friendly.
-
-# Sometimes a failure happens when parallelizing make.  Try again if make fails,
-# but make a failure the second time around (single threaded) a fatal error:
-make $NUMJOBS || make || exit 1
-make install INSTALL_ROOT=$PKG || exit 1
-
-# dropping the just built WebKit since we replace it with an external one
-rm -f $PKG/usr/lib$LIBDIRSUFFIX/qt/lib/libQtWebKit*
-rm -f $PKG/usr/lib$LIBDIRSUFFIX/qt/lib/pkgconfig/QtWebKit.pc
-rm -rf $PKG/usr/lib$LIBDIRSUFFIX/qt/imports/QtWebKit
-rm -rf $PKG/usr/lib$LIBDIRSUFFIX/qt/include/QtWebKit
-
-# The infamous qt -> qt-${VERSION} link that keeps the full path out of .la files:
-( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf qt qt-${VERSION} )
-
-# Add a missing Qt.pc which is needed by KDE applications:
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig
-cat <<EOF > $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/Qt.pc
-prefix=/usr/lib${LIBDIRSUFFIX}/qt
-bindir=\${prefix}/bin
-datadir=\${prefix}
-docdir=\${prefix}/doc
-headerdir=\${prefix}/include
-importdir=\${prefix}/imports
-libdir=\${prefix}/lib
-moc=\${bindir}/moc
-plugindir=\${prefix}/plugins
-qmake=\${bindir}/qmake
-sysconfdir=\${prefix}/etc/settings
-translationdir=\${prefix}/translations
-
-Name: Qt
-Description: Qt Configuration
-Version: $VERSION
-EOF
-
-# libjscore is used internally.  Prevent a false dependency on this in the .la and .pc files:
-sed -i "s,-ljscore,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
-sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
-
-# Make sure that .la, .pc, and .prl files use the correct $LIBDIRSUFFIX:
-sed -i "s,-L/usr/X11R6/lib ,-L/usr/X11R6/lib${LIBDIRSUFFIX} ,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.prl
-
-# Link the shared libraries into /usr/lib:
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  for file in qt/lib/*.so* ; do
-    ln -sf $file .
-  done
-)
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add profile scripts
-mkdir -p $PKG/etc/profile.d
-sed -e "s#usr/lib/#usr/lib${LIBDIRSUFFIX}/#g" $CWD/profile.d/qt4.sh \
-  > $PKG/etc/profile.d/qt4.sh
-sed -e "s#usr/lib/#usr/lib${LIBDIRSUFFIX}/#g" $CWD/profile.d/qt4.csh \
-  > $PKG/etc/profile.d/qt4.csh
-chmod 0755 $PKG/etc/profile.d/*
-
-# Put a ton of links to more "normal" places.  I'd just use a prefix of /usr, but it
-# creates a ton of new (and ambiguously named) /usr directories...
-mkdir -p $PKG/usr/bin
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/qt/bin
-  for file in * ; do
-    ( cd $PKG/usr/bin ; ln -sf /usr/lib${LIBDIRSUFFIX}/qt/bin/$file . )
-  done
-)
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig
-  for file in *.pc ; do
-    ( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ; ln -sf /usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/$file . )
-  done
-)
-
-# Install Qt's private headers - at least Gentoo and Fedora are adding these
-# and some software has (inevitably) started depending on them:
-# We're using `rsync -R` as easy way to preserve relative path names:
-rsync -aR \
-  include/Qt{Core,Declarative,Gui,Script}/private \
-  src/{corelib,declarative,gui,script}/*/*_p.h \
-  ${PKG}/usr/lib${LIBDIRSUFFIX}/qt/
-
-# Add menu entries for all those hidden but great Qt applications:
-# Assistant icons
-install -p -m644 -D tools/assistant/tools/assistant/images/assistant.png $PKG/usr/share/icons/hicolor/32x32/apps/assistant.png
-install -p -m644 -D tools/assistant/tools/assistant/images/assistant-128.png $PKG/usr/share/icons/hicolor/128x128/apps/assistant.png
-# Designer icon
-install -p -m644 -D tools/designer/src/designer/images/designer.png $PKG/usr/share/icons/hicolor/128x128/apps/designer.png
-# Linguist icons
-for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
-  size=$(echo $(basename ${icon}) | cut -d- -f2)
-  install -p -m644 -D ${icon} $PKG/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png
-done
-# Qt logo:
-convert doc/src/images/qt-logo.png  -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt-logo.png
-
-# And the .desktop files
-mkdir -p $PKG/usr/share/applications
-cat <<EOF > $PKG/usr/share/applications/designer.desktop
-[Desktop Entry]
-Name=Qt4 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt4 applications
-Exec=designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
-EOF
-cat <<EOF > $PKG/usr/share/applications/assistant.desktop
-[Desktop Entry]
-Name=Qt4 Assistant
-Comment=Shows Qt4 documentation and examples
-Exec=assistant
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
-EOF
-cat <<EOF > $PKG/usr/share/applications/linguist.desktop
-[Desktop Entry]
-Name=Qt4 Linguist
-Comment=Add translations to Qt4 applications
-Exec=linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
-EOF
-cat <<EOF > $PKG/usr/share/applications/qtconfig.desktop
-[Desktop Entry]
-Name=Qt4 Config
-Comment=Configure Qt4 behavior, styles, fonts
-Exec=qtconfig
-Icon=qt-logo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-EOF
-
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a *GPL_EXCEPTION* FAQ* INSTALL KNOWN* LICENSE* README* changes-* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt/doc/html ]; then
-  ( cd $PKG/usr/doc/$PKGNAM-$VERSION
-    ln -sf /usr/lib${LIBDIRSUFFIX}/qt/doc/html .
-  )
-fi
-
-mkdir -p $PKG/install
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/qt/qt.SlackBuild b/source/l/qt/qt.SlackBuild
deleted file mode 100755
index 01ddf720e..000000000
--- a/source/l/qt/qt.SlackBuild
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-# Copyright  2015  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# This script builds Qt, packages it without WebKit, upgrades the machine to
-# a WebKit-less Qt, builds a WebKit package, merges the two packages, and
-# finally upgrades the machine to a combined package.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=qt
-QTVERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-# Adjust the combined package $BUILD in qt-nowebkit.SlackBuild:
-QTBUILD=$(grep BUILD= qt-nowebkit.SlackBuild | cut -f 2 -d - | cut -f 1 -d \})
-WEBKITVERSION=$(ls qtwebkit/qtwebkit-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-# This $BUILD doesn't really need to change as long as these are combined:
-WEBKITBUILD=$(grep BUILD= qtwebkit/qtwebkit.SlackBuild | cut -f 2 -d - | cut -f 1 -d \})
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-${QTVERSION}-${ARCH}-${QTBUILD}.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "x86_64" ]; then
-  LIBDIRSUFFIX="64"
-else
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-
-# Build Qt and package it without WebKit:
-rm -f $TMP/qt-${QTVERSION}-${ARCH}-${QTBUILD}.txz
-./qt-nowebkit.SlackBuild
-if [ ! -r $TMP/qt-${QTVERSION}-${ARCH}-${QTBUILD}.txz ]; then
-  echo "FATAL:  Failed to build Qt package without WebKit."
-  exit 1
-fi
-
-# Upgrade system to Qt (without WebKit):
-/sbin/upgradepkg --reinstall --install-new $TMP/qt-${QTVERSION}-${ARCH}-${QTBUILD}.txz
-
-# Build standalone WebKit package (qtwebkit):
-rm -f $TMP/qtwebkit-${WEBKITVERSION}-${ARCH}-${WEBKITBUILD}.txz
-( cd qtwebkit
-  ./qtwebkit.SlackBuild )
-if [ ! -r $TMP/qtwebkit-${WEBKITVERSION}-${ARCH}-${WEBKITBUILD}.txz ]; then
-  echo "FATAL:  Failed to build QtWebKit standalone package."
-  rm -f $TMP/qt-${QTVERSION}-${ARCH}-${QTBUILD}.txz
-  exit 1
-fi
-
-# Combine the packages:
-rm -rf $TMP/package-qt
-mkdir -p $TMP/package-qt
-( cd $TMP/package-qt
-  /sbin/explodepkg $TMP/qtwebkit-${WEBKITVERSION}-${ARCH}-${WEBKITBUILD}.txz
-  /sbin/explodepkg $TMP/qt-${QTVERSION}-${ARCH}-${QTBUILD}.txz
-  cat $TMP/package-qtwebkit/install/doinst.sh | grep '^(' >> install/doinst.sh
-  mv usr/doc/qtwebkit-* usr/doc/qt-*
-  # Remove rpaths:
-  for file in $(find . | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do
-    if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
-      patchelf --remove-rpath $file
-    fi
-  done
-  # Don't ship .la files:
-  rm -f usr/lib${LIBDIRSUFFIX}/*.la
-  rm -f usr/lib${LIBDIRSUFFIX}/qt/lib/*.la
-  /sbin/makepkg -l y -c n ../qt-${QTVERSION}-${ARCH}-${QTBUILD}.txz
-)
-
-# Remove intermediate qtwebkit package:
-rm -f $TMP/qtwebkit-${WEBKITVERSION}-${ARCH}-${WEBKITBUILD}.txz
-
-# Upgrade system to the combined Qt/WebKit package:
-/sbin/upgradepkg --reinstall --install-new $TMP/qt-${QTVERSION}-${ARCH}-${QTBUILD}.txz
-
-# Done.
-
diff --git a/source/l/qt/qtwebkit/doinst.sh b/source/l/qt/qtwebkit/doinst.sh
deleted file mode 100644
index 6f7c5df07..000000000
--- a/source/l/qt/qtwebkit/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if [ -x sbin/ldconfig ]; then
-  chroot . /sbin/ldconfig 2> /dev/null
-fi
-
diff --git a/source/l/qt/qtwebkit/qtwebkit.SlackBuild b/source/l/qt/qtwebkit/qtwebkit.SlackBuild
deleted file mode 100755
index e14e37656..000000000
--- a/source/l/qt/qtwebkit/qtwebkit.SlackBuild
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/sh
-
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2015  Heinz Wiesinger, Amsterdam, The Netherlands
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Derived from the main qt SlackBuild
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=qtwebkit
-VERSION=$(ls qtwebkit-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-1}
-
-NUMJOBS=${NUMJOBS:--j7}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686 -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks"
-  LIBDIRSUFFIX=""
-  WEBKITFLAGS="--no-force-sse2"
-elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks"
-  LIBDIRSUFFIX=""
-  WEBKITFLAGS="--no-force-sse2"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2 -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks"
-  LIBDIRSUFFIX=""
-  WEBKITFLAGS="--no-force-sse2"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks"
-  LIBDIRSUFFIX="64"
-  WEBKITFLAGS=""
-elif [ "$ARCH" = "armv7hl" ]; then
-  # To prevent "qatomic_armv6.h error: output number 2 not directly addressable"
-  # More permanent solution is to patch gcc:
-  # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks"
-  LIBDIRSUFFIX=""
-  WEBKITFLAGS="--no-force-sse2"
-else
-  SLKCFLAGS="-O2 -std=gnu++98 -fpermissive -fno-delete-null-pointer-checks"
-  LIBDIRSUFFIX=""
-  WEBKITFLAGS="--no-force-sse2"
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf qtwebkit-$VERSION
-tar xvf $CWD/qtwebkit-$VERSION.tar.xz
-cd qtwebkit-$VERSION || exit 1
-
-# Patch to fix compiling with gcc5:
-zcat $CWD/qtwebkit.putByIndexBeyondVectorLengthWithArrayStorage.diff.gz | patch -p1 --verbose || exit 1
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-QTDIR="/usr/lib$LIBDIRSUFFIX/qt" \
-Tools/Scripts/build-webkit \
-  --qt \
-  --prefix=/usr/lib${LIBDIRSUFFIX}/qt \
-  --release \
-  --no-webkit2 \
-  --makeargs="$NUMJOBS" \
-  --qmakearg="CONFIG+=production_build QMAKE_CFLAGS=\"$SLKCFLAGS\" QMAKE_CXXFLAGS=\"$SLKCFLAGS\"" \
-  $WEBKITFLAGS || exit 1
-
-# To add support for WebP images add this to --qmakearg
-# DEFINES+=HAVE_LIBWEBP=1
-
-make INSTALL_ROOT=$PKG -C WebKitBuild/Release install || exit 1
-
-# libjscore is used internally.  Prevent a false dependency on this in the .pc files:
-sed -i "s,-ljscore,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
-sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
-
-# libwebcore is used internally.  Prevent a false dependency on this in the .pc files:
-sed -i \
-  -e "s#-L/usr/lib${LIBDIRSUFFIX}/qt/lib -L../../WebCore/release -L../../JavaScriptCore/release -L/usr/X11R6/lib$LIBDIRSUFFIX  -lwebcore##g" \
-  -e "s#-L/usr/lib${LIBDIRSUFFIX}/qt/lib -L../../WebCore/release -L../../JavaScriptCore/release -L/usr/X11R6/lib  -lwebcore##g" \
-  -e "s#-L$TMP/qtwebkit-$VERSION/WebKitBuild/Release/Source/WebKit/release##g" \
-  -e "s#-L$TMP/qtwebkit-$VERSION/WebKitBuild/Release/Source/WebCore/release##g" \
-  -e "s#-L$TMP/qtwebkit-$VERSION/WebKitBuild/Release/Source/ThirdParty/ANGLE/release##g" \
-  -e "s#-L$TMP/qtwebkit-$VERSION/WebKitBuild/Release/Source/JavaScriptCore/release##g" \
-  -e "s#-L$TMP/qtwebkit-$VERSION/WebKitBuild/Release/Source/WTF/release##g" \
-  -e "s# -lwebcore##g" \
-  $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/QtWebKit.pc
-
-# Link the shared libraries into /usr/lib:
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  for file in qt/lib/*.so* ; do
-    ln -sf $file .
-  done
-)
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig
-  for file in *.pc ; do
-    ( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ; ln -sf /usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/$file . )
-  done
-)
-
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a ChangeLog $PKG/usr/doc/$PKGNAM-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/qt/qtwebkit/qtwebkit.putByIndexBeyondVectorLengthWithArrayStorage.diff b/source/l/qt/qtwebkit/qtwebkit.putByIndexBeyondVectorLengthWithArrayStorage.diff
deleted file mode 100644
index 94696b769..000000000
--- a/source/l/qt/qtwebkit/qtwebkit.putByIndexBeyondVectorLengthWithArrayStorage.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./Source/JavaScriptCore/runtime/JSObject.cpp.orig	2014-09-24 06:42:05.000000000 -0500
-+++ ./Source/JavaScriptCore/runtime/JSObject.cpp	2015-11-18 22:41:05.673463626 -0600
-@@ -1922,6 +1922,10 @@
-     }
- }
- 
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value);
-+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value);
-+
- void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage)
- {
-     JSGlobalData& globalData = exec->globalData();
diff --git a/source/l/qt/qtwebkit/qtwebkit.url b/source/l/qt/qtwebkit/qtwebkit.url
deleted file mode 100644
index 4e832e125..000000000
--- a/source/l/qt/qtwebkit/qtwebkit.url
+++ /dev/null
@@ -1 +0,0 @@
-http://download.kde.org/stable/qtwebkit-2.3/2.3.4/src/qtwebkit-2.3.4.tar.gz
diff --git a/source/l/qt/qtwebkit/slack-desc b/source/l/qt/qtwebkit/slack-desc
deleted file mode 100644
index 2971354cf..000000000
--- a/source/l/qt/qtwebkit/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-        |-----handy-ruler------------------------------------------------------|
-qtwebkit: QtWebKit (Qt bindings for the WebKit browser engine)
-qtwebkit:
-qtwebkit: WebKit is an open source web browser engine. WebKit's HTML and
-qtwebkit: JavaScript code began as a branch of the KHTML and KJS libraries from
-qtwebkit: KDE. As part of KDE framework KHTML was based on Qt but during their
-qtwebkit: porting efforts Apple's engineers made WebKit toolkit independent.
-qtwebkit: QtWebKit is a project aiming at porting this fabulous engine back
-qtwebkit: to Qt.
-qtwebkit:
-qtwebkit: Homepage: http://www.qt.io/
-qtwebkit:
diff --git a/source/l/qt/slack-desc b/source/l/qt/slack-desc
deleted file mode 100644
index f8051460f..000000000
--- a/source/l/qt/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-  |-----handy-ruler------------------------------------------------------|
-qt: qt (a C++ graphical user interface toolkit)
-qt:
-qt: Qt is a complete and well-developed object-oriented framework for
-qt: developing graphical user interface (GUI) applications using C++.
-qt:
-qt: Homepage: http://www.qt.io/
-qt:
-qt:
-qt:
-qt:
-qt:
diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild
index 66e072aa8..2f5382426 100755
--- a/source/l/qt5/qt5.SlackBuild
+++ b/source/l/qt5/qt5.SlackBuild
@@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qt5
 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 PKGSRC=$(echo $VERSION | cut -d - -f 1)
 PKGVER=$(echo $VERSION | tr - _)
 
@@ -93,6 +93,7 @@ case "$ARCH" in
 esac
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+export NINJAJOBS="$NUMJOBS"
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
diff --git a/testing/source/vtown/deps/qtkeychain/qtkeychain.SlackBuild b/source/l/qtkeychain/qtkeychain.SlackBuild
index 1d1175afe..19df06f56 100755
--- a/testing/source/vtown/deps/qtkeychain/qtkeychain.SlackBuild
+++ b/source/l/qtkeychain/qtkeychain.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qtkeychain
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/qtkeychain/qtkeychain.url b/source/l/qtkeychain/qtkeychain.url
index 7fcebc24d..7fcebc24d 100644
--- a/testing/source/vtown/deps/qtkeychain/qtkeychain.url
+++ b/source/l/qtkeychain/qtkeychain.url
diff --git a/testing/source/vtown/deps/qtkeychain/slack-desc b/source/l/qtkeychain/slack-desc
index 8bc91eca1..8bc91eca1 100644
--- a/testing/source/vtown/deps/qtkeychain/slack-desc
+++ b/source/l/qtkeychain/slack-desc
diff --git a/source/l/qtscriptgenerator/include-everything.patch b/source/l/qtscriptgenerator/include-everything.patch
deleted file mode 100644
index cef0e1fa1..000000000
--- a/source/l/qtscriptgenerator/include-everything.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- b/generator/qtscript_masterinclude.h	2009-03-21 20:37:30.719523909 -0400
-+++ a/generator/qtscript_masterinclude.h	2009-03-21 21:00:25.108149339 -0400
-@@ -31,17 +31,41 @@
- 
- #include <QtUiTools/QtUiTools>
- 
--#ifndef QT_NO_XMLPATTERNS
--#  include <QtXmlPatterns/QtXmlPatterns>
--#endif
--
--#ifndef QT_NO_WEBKIT
--#  include <QtWebKit/QtWebKit>
--#endif
--
--#ifndef QT_NO_PHONON
--#  include <phonon/phonon>
--#endif
-+#include <QtXmlPatterns/QtXmlPatterns>                                                              
-+
-+#include <QtWebKit/QtWebKit>                                                                        
-+                                                                                                    
-+#include "phonon/abstractaudiooutput.h"                                                             
-+#include "phonon/abstractmediastream.h"                                                             
-+#include "phonon/abstractvideooutput.h"                                                             
-+#include "phonon/addoninterface.h"                                                                  
-+#include "phonon/audiooutput.h"                                                                     
-+#include "phonon/audiooutputinterface.h"                                                            
-+#include "phonon/backendcapabilities.h"                                                             
-+#include "phonon/backendinterface.h"
-+#include "phonon/effect.h"
-+#include "phonon/effectinterface.h"
-+#include "phonon/effectparameter.h"
-+#include "phonon/effectwidget.h"
-+#include "phonon/mediacontroller.h"
-+#include "phonon/medianode.h"
-+#include "phonon/mediaobject.h"
-+#include "phonon/mediaobjectinterface.h"
-+#include "phonon/mediasource.h"
-+#include "phonon/objectdescription.h"
-+#include "phonon/objectdescriptionmodel.h"
-+#include "phonon/path.h"
-+#include "phonon/phonondefs.h"
-+#include "phonon/phononnamespace.h"
-+#include "phonon/platformplugin.h"
-+#include "phonon/seekslider.h"
-+#include "phonon/streaminterface.h"
-+#include "phonon/videoplayer.h"
-+#include "phonon/videowidget.h"
-+#include "phonon/videowidgetinterface.h"
-+#include "phonon/volumefadereffect.h"
-+#include "phonon/volumefaderinterface.h"
-+#include "phonon/volumeslider.h"
- 
- #include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
- 
diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild
deleted file mode 100755
index 713356ebf..000000000
--- a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for qtscriptgenerator
-
-# Copyright 2009  Heinz Wiesinger <pprkut@liwjatan.at>
-# Copyright 2009, 2012, 2013, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=qtscriptgenerator
-VERSION=${VERSION:-0.2.0}
-BUILD=${BUILD:-3}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fpermissive"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fpermissive"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2 -fpermissive"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -fpermissive"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale -fpermissive"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t -fpermissive"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2 -fpermissive"
-  LIBDIRSUFFIX=""
-fi
-
-# Avoid a version number in .la files:
-if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-src-$VERSION
-tar xvf $CWD/$PKGNAM-src-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-src-$VERSION || exit 1
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-zcat $CWD/include-everything.patch.gz | patch -p1 --verbose || exit 1
-
-cd generator
-  echo "Building generator..."
-  qmake || exit 1
-  make $NUMJOBS || exit 1
-  ./generator --include-paths=/usr/lib${LIBDIRSUFFIX}/qt/include:/usr/include || exit 1
-cd -
-
-# Leaving off the || exit 1 in two make statements below, or we get nowhere :/
-cd qtbindings
-  echo "Building qtbindings..."
-  sed -i "s|CONFIG += debug_and_release|CONFIG += release|" \
-    qtbindingsbase.pri
-  qmake || exit 1
-  make $NUMJOBS qmake_all
-  sed -i "s|-I/usr/lib${LIBDIRSUFFIX}/qt/include/phonon|-I/usr/include/phonon|" \
-    qtscript_phonon/Makefile
-  make $NUMJOBS all
-cd -
-
-cd tools/qsexec/src
-  echo "Building tools/qsexec/src..."
-  qmake || exit 1
-  make $NUMJOBS || exit 1
-cd -
-
-cd qtbindings/qtscript_uitools
-  echo "Building qtbindings/qtscript_uitools..."
-  qmake || exit 1
-  make $NUMJOBS all || exit 1
-cd -
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/qt/{bin,plugins/script}
-
-install -m 755 tools/qsexec/qsexec $PKG/usr/lib${LIBDIRSUFFIX}/qt/bin/qsexec || exit 1
-install -m 755 generator/generator $PKG/usr/lib${LIBDIRSUFFIX}/qt/bin/generator || exit 1
-cp -a plugins/script/libqtscript* $PKG/usr/lib${LIBDIRSUFFIX}/qt/plugins/script/
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a tools/qsexec/README.TXT README.qsexec
-cp -a \
-  LICENSE.GPL README* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.info b/source/l/qtscriptgenerator/qtscriptgenerator.info
deleted file mode 100644
index 684f5c6b5..000000000
--- a/source/l/qtscriptgenerator/qtscriptgenerator.info
+++ /dev/null
@@ -1,8 +0,0 @@
-PRGNAM="qtscriptgenerator"
-VERSION="0.1.0"
-HOMEPAGE="http://code.google.com/p/qtscriptgenerator/"
-DOWNLOAD="http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-0.1.0.tar.gz"
-MD5SUM="ca4046ad4bda36cd4e21649d4b98886d"
-MAINTAINER="ppr:kut"
-EMAIL="pprkut@liwjatan.at"
-APPROVED=""
diff --git a/source/l/qtscriptgenerator/slack-desc b/source/l/qtscriptgenerator/slack-desc
deleted file mode 100644
index c4f2e096a..000000000
--- a/source/l/qtscriptgenerator/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-                 |-----handy-ruler------------------------------------------------------|
-qtscriptgenerator: qtscriptgenerator (Qt API Bindings for QtScript)
-qtscriptgenerator:
-qtscriptgenerator: Qt Script Generator is a tool that generates Qt bindings for Qt
-qtscriptgenerator: Script. With the generated bindings you get access to substantial
-qtscriptgenerator: portions of the Qt API from within QtScript.
-qtscriptgenerator:
-qtscriptgenerator: Homepage: http://code.google.com/p/qtscriptgenerator/
-qtscriptgenerator:
-qtscriptgenerator:
-qtscriptgenerator:
-qtscriptgenerator:
diff --git a/testing/source/vtown/deps/quazip/quazip.SlackBuild b/source/l/quazip/quazip.SlackBuild
index b3db636a8..02d21a0f5 100755
--- a/testing/source/vtown/deps/quazip/quazip.SlackBuild
+++ b/source/l/quazip/quazip.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=quazip
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/quazip/quazip.url b/source/l/quazip/quazip.url
index 11f0b1e63..11f0b1e63 100644
--- a/testing/source/vtown/deps/quazip/quazip.url
+++ b/source/l/quazip/quazip.url
diff --git a/testing/source/vtown/deps/quazip/slack-desc b/source/l/quazip/slack-desc
index cc51199fa..cc51199fa 100644
--- a/testing/source/vtown/deps/quazip/slack-desc
+++ b/source/l/quazip/slack-desc
diff --git a/source/l/raptor2/raptor2.SlackBuild b/source/l/raptor2/raptor2.SlackBuild
deleted file mode 100755
index 1153263c3..000000000
--- a/source/l/raptor2/raptor2.SlackBuild
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007, 2012, 2013  Heinz Wiesinger, Amsterdam, NL
-# Copyright 2008, 2009, 2010, 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Robby Workman <rworkman@slackware.com>
-# Modified by Eric Hameleers <alien@slackware.com>
-# No added terms or copyright claims
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=raptor2
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-10}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static \
-  --with-icu-config=/usr/bin/icu-config \
-  --build=$TARGET || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \+
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* INSTALL* LICENSE* NEWS* \
-  NOTICE README* RELEASE.html UPGRADING* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-( cd $PKG/usr/doc/$PKGNAM-$VERSION
-  ln -s /usr/share/gtk-doc/html/$PKGNAM html
-)
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/raptor2/slack-desc b/source/l/raptor2/slack-desc
deleted file mode 100644
index 8842687d0..000000000
--- a/source/l/raptor2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-raptor2: raptor2 (RDF Parser & Serializer)
-raptor2:
-raptor2: Raptor is a free software/Open Source C library that provides a set of
-raptor2: parsers and serializers that generate Resource Description Framework
-raptor2: (RDF) triples by parsing syntaxes or serialize the triples into a
-raptor2: syntax. The supported parsing syntaxes are RDF/XML, N-Triples, TRiG,
-raptor2: Turtle, RSS tag soup including all versions of RSS, Atom 1.0 and 0.3,
-raptor2: GRDDL and microformats for HTML, XHTML and XML.
-raptor2:
-raptor2: Homepage: http://librdf.org/
-raptor2:
diff --git a/source/l/rasqal/rasqal.SlackBuild b/source/l/rasqal/rasqal.SlackBuild
deleted file mode 100755
index 846a37c9e..000000000
--- a/source/l/rasqal/rasqal.SlackBuild
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007, 2013  Heinz Wiesinger, Amsterdam, NL
-# Copyright 2008, 2009, 2010, 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Robby Workman <rworkman@slackware.com>
-# Modified by Eric Hameleers <alien@slackware.com>
-# No added terms or copyright claims
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=rasqal
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static \
-  --build=$TARGET || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \+
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* INSTALL INSTALL.html LICENSE* NEWS* NOTICE README* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-( cd $PKG/usr/doc/$PKGNAM-$VERSION
-  ln -s /usr/share/gtk-doc/html/$PKGNAM html
-)
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/rasqal/slack-desc b/source/l/rasqal/slack-desc
deleted file mode 100644
index e65a98f7d..000000000
--- a/source/l/rasqal/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-rasqal: rasqal (RDF parsing library)
-rasqal:
-rasqal: Rasqal is a library providing full support for querying Resource
-rasqal: Description Framework (RDF) including parsing query syntaxes,
-rasqal: constructing the queries, executing them and returning result formats.
-rasqal: It currently handles the RDF Data Query Language (RDQL) and SPARQL
-rasqal: Query language.
-rasqal:
-rasqal: Homepage: http://librdf.org/
-rasqal:
-rasqal:
diff --git a/source/l/readline/readline-8.0-patches/readline80-001 b/source/l/readline/readline-8.0-patches/readline80-001
deleted file mode 100644
index aa72a9dfa..000000000
--- a/source/l/readline/readline-8.0-patches/readline80-001
+++ /dev/null
@@ -1,38 +0,0 @@
-			   READLINE PATCH REPORT
-			   =====================
-
-Readline-Release: 8.0
-Patch-ID: readline80-001
-
-Bug-Reported-by:	chet.ramey@case.edu
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-The history file reading code doesn't close the file descriptor open to
-the history file when it encounters a zero-length file.
-
-Patch (apply with `patch -p0'):
-
-*** ../readline-8.0-patched/histfile.c	2018-06-11 09:14:52.000000000 -0400
---- histfile.c	2019-05-16 15:55:57.000000000 -0400
-***************
-*** 306,309 ****
---- 312,316 ----
-      {
-        free (input);
-+       close (file);
-        return 0;	/* don't waste time if we don't have to */
-      }
-*** ../readline-8.0/patchlevel	2013-11-15 08:11:11.000000000 -0500
---- patchlevel	2014-03-21 08:28:40.000000000 -0400
-***************
-*** 1,3 ****
-  # Do not edit -- exists only for use by patch
-  
-! 0
---- 1,3 ----
-  # Do not edit -- exists only for use by patch
-  
-! 1
diff --git a/source/l/readline/readline-8.0-patches/readline80-002 b/source/l/readline/readline-8.0-patches/readline80-002
deleted file mode 100644
index 7923d9d16..000000000
--- a/source/l/readline/readline-8.0-patches/readline80-002
+++ /dev/null
@@ -1,60 +0,0 @@
-			   READLINE PATCH REPORT
-			   =====================
-
-Readline-Release: 8.0
-Patch-ID: readline80-002
-
-Bug-Reported-by:	lessbug@qq.com
-Bug-Reference-ID:	<tencent_6AA531D9A5CC4121D86BD5CDA2E0DA98C605@qq.com>
-Bug-Reference-URL:
-
-Bug-Description:
-
-When using previous-history to go back beyond the beginning of the history list,
-it's possible to move to an incorrect partial line.
-
-Patch (apply with `patch -p0'):
-
-*** ../readline-8.0-patched/misc.c	2017-07-07 17:30:12.000000000 -0400
---- misc.c	2019-05-16 11:43:46.000000000 -0400
-***************
-*** 577,580 ****
---- 590,594 ----
-  {
-    HIST_ENTRY *old_temp, *temp;
-+   int had_saved_line;
-  
-    if (count < 0)
-***************
-*** 589,592 ****
---- 603,607 ----
-  
-    /* If we don't have a line saved, then save this one. */
-+   had_saved_line = _rl_saved_line_for_history != 0;
-    rl_maybe_save_line ();
-  
-***************
-*** 612,616 ****
-    if (temp == 0)
-      {
-!       rl_maybe_unsave_line ();
-        rl_ding ();
-      }
---- 627,632 ----
-    if (temp == 0)
-      {
-!       if (had_saved_line == 0)
-!         _rl_free_saved_history_line ();
-        rl_ding ();
-      }
-*** ../readline-8.0/patchlevel	2013-11-15 08:11:11.000000000 -0500
---- patchlevel	2014-03-21 08:28:40.000000000 -0400
-***************
-*** 1,3 ****
-  # Do not edit -- exists only for use by patch
-  
-! 1
---- 1,3 ----
-  # Do not edit -- exists only for use by patch
-  
-! 2
diff --git a/source/l/readline/readline-8.0-patches/readline80-003 b/source/l/readline/readline-8.0-patches/readline80-003
deleted file mode 100644
index b37145817..000000000
--- a/source/l/readline/readline-8.0-patches/readline80-003
+++ /dev/null
@@ -1,69 +0,0 @@
-			   READLINE PATCH REPORT
-			   =====================
-
-Readline-Release: 8.0
-Patch-ID: readline80-003
-
-Bug-Reported-by:	HIROSE Masaaki <hirose31@gmail.com>
-Bug-Reference-ID:	<CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com>
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html
-
-Bug-Description:
-
-Reading history entries with timestamps can result in history entries joined
-by linefeeds.
-
-Patch (apply with `patch -p0'):
-
-*** ../readline-8.0-patched/histfile.c	2018-06-11 09:14:52.000000000 -0400
---- histfile.c	2019-05-16 15:55:57.000000000 -0400
-***************
-*** 370,376 ****
-  
-    has_timestamps = HIST_TIMESTAMP_START (buffer);
-!   history_multiline_entries += has_timestamps && history_write_timestamps;  
-  
-    /* Skip lines until we are at FROM. */
-    for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
-      if (*line_end == '\n')
---- 370,378 ----
-  
-    has_timestamps = HIST_TIMESTAMP_START (buffer);
-!   history_multiline_entries += has_timestamps && history_write_timestamps;
-  
-    /* Skip lines until we are at FROM. */
-+   if (has_timestamps)
-+     last_ts = buffer;
-    for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
-      if (*line_end == '\n')
-***************
-*** 381,385 ****
---- 383,398 ----
-  	if (HIST_TIMESTAMP_START(p) == 0)
-  	  current_line++;
-+ 	else
-+ 	  last_ts = p;
-  	line_start = p;
-+ 	/* If we are at the last line (current_line == from) but we have
-+ 	   timestamps (has_timestamps), then line_start points to the
-+ 	   text of the last command, and we need to skip to its end. */
-+ 	if (current_line >= from && has_timestamps)
-+ 	  {
-+ 	    for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++)
-+ 	      ;
-+ 	    line_start = (*line_end == '\n') ? line_end + 1 : line_end;
-+ 	  }
-        }
-  
-
-*** ../readline-8.0/patchlevel	2013-11-15 08:11:11.000000000 -0500
---- patchlevel	2014-03-21 08:28:40.000000000 -0400
-***************
-*** 1,3 ****
-  # Do not edit -- exists only for use by patch
-  
-! 2
---- 1,3 ----
-  # Do not edit -- exists only for use by patch
-  
-! 3
diff --git a/source/l/readline/readline-8.0-patches/readline80-004 b/source/l/readline/readline-8.0-patches/readline80-004
deleted file mode 100644
index 8a40ebe9a..000000000
--- a/source/l/readline/readline-8.0-patches/readline80-004
+++ /dev/null
@@ -1,47 +0,0 @@
-			   READLINE PATCH REPORT
-			   =====================
-
-Readline-Release: 8.0
-Patch-ID: readline80-004
-
-Bug-Reported-by:	auroralanes@protonmail.ch
-Bug-Reference-ID:	<WikEDKluAyoha9IDLp83rbN7_Uinr2rrpvSV_z4wmt9qur9piN-FNOn17P0cAizEVah1Fvc9d641vIIWX_7SC6EUTz0CatnOH-C-UK3rPYc=@protonmail.ch>
-Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-readline/2020-01/msg00008.html
-
-Bug-Description:
-
-If writing the history file fails, and renaming the backup history file fails,
-it's possible for readline's history code to return the wrong error to its
-caller.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-20200124/lib/readline/histfile.c	2019-11-19 10:31:58.000000000 -0500
---- histfile.c	2020-02-01 16:28:29.000000000 -0500
-***************
-*** 621,624 ****
---- 621,625 ----
-    if (rv != 0)
-      {
-+       rv = errno;
-        if (tempname)
-  	unlink (tempname);
-***************
-*** 768,771 ****
---- 769,773 ----
-    if (rv != 0)
-      {
-+       rv = errno;
-        if (tempname)
-  	unlink (tempname);
-*** ../readline-8.0/patchlevel	2013-11-15 08:11:11.000000000 -0500
---- patchlevel	2014-03-21 08:28:40.000000000 -0400
-***************
-*** 1,3 ****
-  # Do not edit -- exists only for use by patch
-  
-! 3
---- 1,3 ----
-  # Do not edit -- exists only for use by patch
-  
-! 4
diff --git a/source/l/redland/redland.SlackBuild b/source/l/redland/redland.SlackBuild
deleted file mode 100755
index 1be554313..000000000
--- a/source/l/redland/redland.SlackBuild
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007, 2013  Heinz Wiesinger, Amsterdam, NL
-# Copyright 2008, 2009, 2010, 2011, 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Robby Workman <rworkman@slackware.com>
-# Modified by Eric Hameleers <alien@slackware.com>
-# No added terms and no copyright claims
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=redland
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static \
-  --with-included-ltdl=no \
-  --with-bdb-lib=/usr/lib${LIBDIRSUFFIX} \
-  --with-bdb-dbname=db-4.8 \
-  --with-threads \
-  --build=$TARGET
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \+
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* INSTALL INSTALL.html LICENSE* NEWS* NOTICE \
-  README* RELEASE.html TODO* \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-( cd $PKG/usr/doc/$PKGNAM-$VERSION
-  ln -s /usr/share/gtk-doc/html/$PKGNAM html
-)
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/redland/slack-desc b/source/l/redland/slack-desc
deleted file mode 100644
index eff13c477..000000000
--- a/source/l/redland/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler----------------------------------------------------|
-redland: redland (RDF high-level interface library)
-redland:
-redland: Redland is a library that provides a high-level interface for the
-redland: Resource Description Framework (RDF) allowing the RDF graph to be
-redland: parsed from XML, stored, queried and manipulated. Redland
-redland: implements each of the RDF concepts in its own class via an object
-redland: based API, reflected into the language APIs, currently C#, Java,
-redland: Perl, PHP, Python, Ruby and Tcl.
-redland:
-redland: Homepage: http://librdf.org/
-redland:
diff --git a/testing/source/vtown/deps/rttr/rttr.SlackBuild b/source/l/rttr/rttr.SlackBuild
index 7380b1dc8..d5b8531e8 100755
--- a/testing/source/vtown/deps/rttr/rttr.SlackBuild
+++ b/source/l/rttr/rttr.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rttr
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2 -d -)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/rttr/rttr.url b/source/l/rttr/rttr.url
index 7d4f58631..7d4f58631 100644
--- a/testing/source/vtown/deps/rttr/rttr.url
+++ b/source/l/rttr/rttr.url
diff --git a/testing/source/vtown/deps/rttr/slack-desc b/source/l/rttr/slack-desc
index 36154eb8e..36154eb8e 100644
--- a/testing/source/vtown/deps/rttr/slack-desc
+++ b/source/l/rttr/slack-desc
diff --git a/source/l/soprano/slack-desc b/source/l/soprano/slack-desc
deleted file mode 100644
index 1b3dca07e..000000000
--- a/source/l/soprano/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler-----------------------------------------------------|
-soprano: soprano (C++/Qt4 framework for RDF data)
-soprano:
-soprano: Soprano (formally known as QRDF) is a library which provides 
-soprano: a nice Qt interface to RDF storage solutions. It has a modular
-soprano: structure which allows to replace the actual RDF storage 
-soprano: implementation used. 
-soprano:
-soprano: Homepage: http://soprano.sourceforge.net/
-soprano:
-soprano:
-soprano:
diff --git a/source/l/soprano/soprano.SlackBuild b/source/l/soprano/soprano.SlackBuild
deleted file mode 100755
index c3d1f0c45..000000000
--- a/source/l/soprano/soprano.SlackBuild
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007-2008 Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010, 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=soprano
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-soprano
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf soprano-$VERSION
-tar xvf $CWD/soprano-$VERSION.tar.bz2 || exit 1
-cd soprano-${VERSION}* || exit 1
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
-  PATH=$QTDIR/bin:$PATH \
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd ..
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/usr/doc/soprano-$VERSION
-cp -a \
-  AUTHORS COPYING* ChangeLog INSTALL README TODO \
-  $PKG/usr/doc/soprano-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/soprano-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/testing/source/vtown/deps/speech-dispatcher/slack-desc b/source/l/speech-dispatcher/slack-desc
index 2e837b065..2e837b065 100644
--- a/testing/source/vtown/deps/speech-dispatcher/slack-desc
+++ b/source/l/speech-dispatcher/slack-desc
diff --git a/testing/source/vtown/deps/speech-dispatcher/speech-dispatcher.SlackBuild b/source/l/speech-dispatcher/speech-dispatcher.SlackBuild
index e3bb02ba7..57d1ce118 100755
--- a/testing/source/vtown/deps/speech-dispatcher/speech-dispatcher.SlackBuild
+++ b/source/l/speech-dispatcher/speech-dispatcher.SlackBuild
@@ -25,8 +25,9 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=speech-dispatcher
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+SRCNAM=speech-dispatcher
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
@@ -75,9 +76,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
-cd $PKGNAM-$VERSION || exit 1
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
+cd $SRCNAM-$VERSION || exit 1
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -97,6 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
+  --mandir=/usr/man \
   --infodir=/usr/info \
   --disable-static \
   --build=$TARGET || exit 1
@@ -148,7 +150,7 @@ config() {
 EOT
 
 cd $PKG
-  for CONFF in $(find etc/${PKGNAM} -type f) ; do
+  for CONFF in $(find etc/speech-dispatcher -type f) ; do
     mv ${CONFF} ${CONFF}.new
     echo "config ${CONFF}.new" >> $PKG/install/doinst.sh
   done
diff --git a/source/l/speech-dispatcher/speech-dispatcher.url b/source/l/speech-dispatcher/speech-dispatcher.url
new file mode 100644
index 000000000..a3587a3c9
--- /dev/null
+++ b/source/l/speech-dispatcher/speech-dispatcher.url
@@ -0,0 +1 @@
+https://github.com/brailcom/speechd
diff --git a/source/l/strigi/README b/source/l/strigi/README
deleted file mode 100644
index 218e8ce2f..000000000
--- a/source/l/strigi/README
+++ /dev/null
@@ -1,17 +0,0 @@
-trueg's blog,
-http://trueg.wordpress.com/2011/09/22/about-strigi-soprano-virtuoso-clucene-and-libstreamanalyzer/
-
-recommends using a newer libstreamanalyzer (and friends) than what is currently formally released.
-
-I ran the script
-https://projects.kde.org/projects/kdesupport/strigi/strigi/repository/revisions/master/changes/createtararchive.sh
-to generate a tarball, and am hosting it at:
-
-http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2
-http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2.md5sum
-http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2.sha1sum
-
-for others' convenience.
-
--- rex
-
diff --git a/source/l/strigi/libstreamanalyzer-0001-Fix-for-non-valid-values-in-Exif-field-ISOSpeedRatin.patch b/source/l/strigi/libstreamanalyzer-0001-Fix-for-non-valid-values-in-Exif-field-ISOSpeedRatin.patch
deleted file mode 100644
index 45201c8a7..000000000
--- a/source/l/strigi/libstreamanalyzer-0001-Fix-for-non-valid-values-in-Exif-field-ISOSpeedRatin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b6dc8d4c14135c2fddb1143106d90cbb3acf94b7 Mon Sep 17 00:00:00 2001
-From: Jos van den Oever <jos@vandenoever.info>
-Date: Thu, 7 Feb 2013 06:11:22 +0100
-Subject: [PATCH 1/5] Fix for non valid values in Exif field ISOSpeedRatings
- reported in bug https://bugs.kde.org/show_bug.cgi?id=304439
-
-BUG: 304439
----
- plugins/endplugins/jpegendanalyzer.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/plugins/endplugins/jpegendanalyzer.cpp b/plugins/endplugins/jpegendanalyzer.cpp
-index 78ed36a..02b095b 100644
---- a/plugins/endplugins/jpegendanalyzer.cpp
-+++ b/plugins/endplugins/jpegendanalyzer.cpp
-@@ -322,6 +322,11 @@ JpegEndAnalyzer::analyze(AnalysisResult& ar, ::InputStream* in) {
-                 ar.addValue(factory->exifFields.find("Exif.Image.DateTime")->second, uint32_t(mktime(&date)));
-             }
-         }
-+        else if (i->key() == "Exif.Photo.ISOSpeedRatings") {
-+            stringstream st;
-+            st << i->toLong();
-+            ar.addValue(factory->exifFields.find("Exif.Photo.ISOSpeedRatings")->second, st.str());
-+        }
-         else if (i->key() != "Exif.Photo.PixelXDimension" && i->key() != "Exif.Photo.PixelYDimension") {
-             map<string,const RegisteredField*>::const_iterator f
-                     = factory->exifFields.find(i->key());
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/libstreamanalyzer-0002-order-matters-for-systems-that-have-things-already-i.patch b/source/l/strigi/libstreamanalyzer-0002-order-matters-for-systems-that-have-things-already-i.patch
deleted file mode 100644
index c940f6cf3..000000000
--- a/source/l/strigi/libstreamanalyzer-0002-order-matters-for-systems-that-have-things-already-i.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 22d1b9923a61e0f890a39c80f661aeffaaeb2cb5 Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Wed, 13 Feb 2013 17:29:52 +0100
-Subject: [PATCH 2/5] order matters for systems that have things already
- installed
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7819ddf..6dee36b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -119,13 +119,13 @@ configure_file(${libstreamanalyzer_SOURCE_DIR}/strigi_thread.h.cmake
-                ${libstreamanalyzer_BINARY_DIR}/include/strigi/strigi_thread.h)
- 
- # every directory needs the headers that will be installed
--include_directories(${LIBSTREAMS_INCLUDE_DIRS}
--                    ${libstreamanalyzer_SOURCE_DIR}/include
-+include_directories(${libstreamanalyzer_SOURCE_DIR}/include
-                     ${libstreamanalyzer_SOURCE_DIR}/include/strigi
-                     ${libstreamanalyzer_BINARY_DIR}/include
-                     ${libstreamanalyzer_BINARY_DIR}/include/strigi
-                     ${libstreamanalyzer_SOURCE_DIR}/lib
-                     ${libstreamanalyzer_BINARY_DIR}/lib
-+                    ${LIBSTREAMS_INCLUDE_DIRS}
-                     ${ICONV_INCLUDE_DIR}
-                     ${LIBSTREAMS_LIBRARY_DIRS}
-                     ${EXIV2_INCLUDEDIR}
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/libstreamanalyzer-0003-Fix-Krazy-issues.patch b/source/l/strigi/libstreamanalyzer-0003-Fix-Krazy-issues.patch
deleted file mode 100644
index fab488321..000000000
--- a/source/l/strigi/libstreamanalyzer-0003-Fix-Krazy-issues.patch
+++ /dev/null
@@ -1,1266 +0,0 @@
-From 8af24118fec3a0effee3a01ad37f4c4daddfe700 Mon Sep 17 00:00:00 2001
-From: Jos van den Oever <jos@vandenoever.info>
-Date: Fri, 12 Jul 2013 15:15:18 +0200
-Subject: [PATCH 3/5] Fix Krazy issues.
-
----
- .krazy                                             |  2 +
- cmake/FindCLucene.cmake                            | 18 ++++++++
- cmake/FindCLucene1.cmake                           | 18 ++++++++
- cmake/FindExiv2.cmake                              |  2 +-
- cmake/FindFFmpeg.cmake                             |  2 +-
- cmake/FindIconv.cmake                              | 19 ++++++++
- cmake/FindXAttr.cmake                              | 19 ++++++++
- include/strigi/classproperties.h                   |  4 +-
- include/strigi/fieldproperties.h                   |  4 +-
- include/strigi/fieldtypes.h                        |  4 +-
- include/strigi/filelister.h                        |  4 +-
- include/strigi/streamanalyzer.h                    |  2 +-
- include/strigi/variant.h                           | 14 +++---
- lib/endanalyzers/arendanalyzer.h                   |  2 +-
- lib/endanalyzers/bmpendanalyzer.h                  |  2 +-
- lib/endanalyzers/bz2endanalyzer.h                  |  2 +-
- lib/endanalyzers/flacendanalyzer.h                 |  2 +-
- lib/endanalyzers/gzipendanalyzer.h                 |  2 +-
- lib/endanalyzers/id3endanalyzer.cpp                |  6 +--
- lib/endanalyzers/id3endanalyzer.h                  |  2 +-
- lib/endanalyzers/lzmaendanalyzer.h                 |  2 +-
- lib/endanalyzers/mailendanalyzer.h                 |  2 +-
- lib/endanalyzers/mpegendanalyzer.h                 |  2 +-
- lib/endanalyzers/odfendanalyzer.h                  |  2 +-
- lib/endanalyzers/oleendanalyzer.h                  |  2 +-
- lib/endanalyzers/pdfendanalyzer.h                  |  2 +-
- lib/endanalyzers/pngendanalyzer.h                  |  2 +-
- lib/endanalyzers/rpmendanalyzer.h                  |  2 +-
- lib/endanalyzers/sdfendanalyzer.h                  |  2 +-
- lib/endanalyzers/tarendanalyzer.h                  |  2 +-
- lib/endanalyzers/zipendanalyzer.h                  |  2 +-
- lib/eventanalyzers/mimeeventanalyzer.h             |  2 +-
- lib/eventthroughanalyzer.h                         |  2 +-
- lib/fieldpropertiesdb.cpp                          | 20 ++++----
- lib/helperanalyzers/odfcontenthelperanalyzer.cpp   |  1 -
- lib/helperanalyzers/odfmetahelperanalyzer.cpp      |  1 -
- lib/libstreamanalyzer.pc.cmake                     | 19 ++++++++
- lib/lineanalyzers/m3ustreamanalyzer.h              |  2 +-
- lib/lineanalyzers/odfmimetypelineanalyzer.h        |  2 +-
- lib/lineeventanalyzer.h                            |  2 +-
- lib/logging.h                                      |  2 +-
- lib/rdfnamespaces.h                                |  4 +-
- lib/saxeventanalyzer.h                             |  2 +-
- lib/throughanalyzers/oggthroughanalyzer.h          |  2 +-
- lib/xmlparser/xmlstream.h                          |  4 +-
- plugins/endplugins/ffmpegendanalyzer.cpp           |  6 +--
- plugins/eventplugins/SHA1.h                        |  6 +--
- .../indexers/cluceneindexer/cluceneindexreader.cpp |  4 +-
- .../indexers/cluceneindexer/cluceneindexwriter.cpp | 54 +---------------------
- .../cluceneindexer/jsgzipcompressstream.cpp        |  2 +-
- .../indexers/cluceneindexer/tests/CLuceneTest.cpp  | 19 ++++++++
- plugins/indexers/cluceneindexer/timeofday.h        | 39 ++++++++--------
- .../clucenengindexer/cluceneindexreader.cpp        |  8 ++--
- .../clucenengindexer/cluceneindexwriter.cpp        |  4 +-
- .../clucenengindexer/indexdump/indexdump.cpp       |  5 +-
- .../clucenengindexer/tests/CLuceneTest.cpp         | 19 ++++++++
- plugins/indexers/clucenengindexer/timeofday.h      | 39 ++++++++--------
- plugins/lineplugins/deblineanalyzer.h              |  2 +-
- plugins/throughplugins/authroughanalyzer.h         |  2 +-
- plugins/throughplugins/dummy.cpp                   | 19 ++++++++
- plugins/throughplugins/pcxthroughanalyzer.h        |  2 +-
- 61 files changed, 271 insertions(+), 176 deletions(-)
- create mode 100644 .krazy
-
-diff --git a/.krazy b/.krazy
-new file mode 100644
-index 0000000..b0e1177
---- /dev/null
-+++ b/.krazy
-@@ -0,0 +1,2 @@
-+# see http://techbase.kde.org/Development/Tutorials/Code_Checking#Controlling_Krazy_on_the_EBN for an explanation of this file
-+EXCLUDE syscalls,typedefs
-diff --git a/cmake/FindCLucene.cmake b/cmake/FindCLucene.cmake
-index 906afcc..31d1557 100644
---- a/cmake/FindCLucene.cmake
-+++ b/cmake/FindCLucene.cmake
-@@ -1,3 +1,21 @@
-+# This file is part of Strigi Desktop Search
-+#
-+# Copyright (C) 2007 Jos van den Oever <jos@vandenoever.info>
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Library General Public
-+# License as published by the Free Software Foundation; either
-+# version 2 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Library General Public License for more details.
-+#
-+# You should have received a copy of the GNU Library General Public License
-+# along with this library; see the file COPYING.LIB.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
- #
- # This module looks for clucene (http://clucene.sf.net) support
- # It will define the following values
-diff --git a/cmake/FindCLucene1.cmake b/cmake/FindCLucene1.cmake
-index ae431c8..d8ce7dd 100644
---- a/cmake/FindCLucene1.cmake
-+++ b/cmake/FindCLucene1.cmake
-@@ -1,3 +1,21 @@
-+# This file is part of Strigi Desktop Search
-+#
-+# Copyright (C) 2007 Jos van den Oever <jos@vandenoever.info>
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Library General Public
-+# License as published by the Free Software Foundation; either
-+# version 2 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Library General Public License for more details.
-+#
-+# You should have received a copy of the GNU Library General Public License
-+# along with this library; see the file COPYING.LIB.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
- #
- # This module looks for clucene (http://clucene.sf.net) support
- # It will define the pkgconfig values with a CLUCENE1_ prefix...
-diff --git a/cmake/FindExiv2.cmake b/cmake/FindExiv2.cmake
-index 5997c98..7ddb6ac 100644
---- a/cmake/FindExiv2.cmake
-+++ b/cmake/FindExiv2.cmake
-@@ -13,7 +13,7 @@
- # The minimum required version of Exiv2 can be specified using the
- # standard syntax, e.g. find_package(Exiv2 0.17)
- #
--# For compatiblity, also the variable EXIV2_MIN_VERSION can be set to the minimum version
-+# For compatibility, also the variable EXIV2_MIN_VERSION can be set to the minimum version
- # you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.
- 
- # Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
-diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
-index 526be5f..4e1d50e 100644
---- a/cmake/FindFFmpeg.cmake
-+++ b/cmake/FindFFmpeg.cmake
-@@ -7,7 +7,7 @@
- #  FFMPEG_LIBRARIES     - Link these to use the required ffmpeg components.
- #  FFMPEG_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
- #
--# For each of the components it will additionaly set.
-+# For each of the components it will additionally set.
- #   - AVCODEC
- #   - AVDEVICE
- #   - AVFORMAT
-diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
-index ce40ab2..fd5a3af 100644
---- a/cmake/FindIconv.cmake
-+++ b/cmake/FindIconv.cmake
-@@ -1,3 +1,22 @@
-+# This file is part of Strigi Desktop Search
-+#
-+# Copyright (C) 2006 Jos van den Oever <jos@vandenoever.info>
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Library General Public
-+# License as published by the Free Software Foundation; either
-+# version 2 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Library General Public License for more details.
-+#
-+# You should have received a copy of the GNU Library General Public License
-+# along with this library; see the file COPYING.LIB.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
-+
- # - Try to find Iconv 
- # Once done this will define 
- # 
-diff --git a/cmake/FindXAttr.cmake b/cmake/FindXAttr.cmake
-index c285a46..c66884e 100644
---- a/cmake/FindXAttr.cmake
-+++ b/cmake/FindXAttr.cmake
-@@ -1,3 +1,22 @@
-+# This file is part of Strigi Desktop Search
-+#
-+# Copyright (C) 2007 Jos van den Oever <jos@vandenoever.info>
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Library General Public
-+# License as published by the Free Software Foundation; either
-+# version 2 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Library General Public License for more details.
-+#
-+# You should have received a copy of the GNU Library General Public License
-+# along with this library; see the file COPYING.LIB.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
-+
- # - Try to find the xattr header
- # Once done this will define 
- # 
-diff --git a/include/strigi/classproperties.h b/include/strigi/classproperties.h
-index 0a8d5d5..688bc6a 100644
---- a/include/strigi/classproperties.h
-+++ b/include/strigi/classproperties.h
-@@ -39,8 +39,8 @@ public:
-     };
-     ClassProperties();
-     ClassProperties(const ClassProperties&);
--    ClassProperties(const Private&);
--    ClassProperties(const std::string& key);
-+    explicit ClassProperties(const Private&);
-+    explicit ClassProperties(const std::string& key);
-     ~ClassProperties();
-     const ClassProperties& operator=(const ClassProperties&);
-     bool valid() const;
-diff --git a/include/strigi/fieldproperties.h b/include/strigi/fieldproperties.h
-index dc53703..f1a9f77 100644
---- a/include/strigi/fieldproperties.h
-+++ b/include/strigi/fieldproperties.h
-@@ -39,8 +39,8 @@ public:
-     };
-     FieldProperties();
-     FieldProperties(const FieldProperties&);
--    FieldProperties(const Private&);
--    FieldProperties(const std::string& key);
-+    explicit FieldProperties(const Private&);
-+    explicit FieldProperties(const std::string& key);
-     ~FieldProperties();
-     const FieldProperties& operator=(const FieldProperties&);
-     /**
-diff --git a/include/strigi/fieldtypes.h b/include/strigi/fieldtypes.h
-index e369ad4..8bc9669 100644
---- a/include/strigi/fieldtypes.h
-+++ b/include/strigi/fieldtypes.h
-@@ -69,7 +69,7 @@ private:
-      * @param fieldname a (unique) name for what this field represents
-      *   the same name should be used in .fieldproperties files in [] brackets
-      */
--    RegisteredField(const std::string& key);
-+    explicit RegisteredField(const std::string& key);
- public:
-     /**
-      * @brief Get the key for this field.
-@@ -101,7 +101,7 @@ public:
-      * primitive type, an array or an object of some
-      * description.
-      *
--     * It is up the the caller to keep track of the type of
-+     * It is up the caller to keep track of the type of
-      * the data that is pointed to.  The RegisteredField does
-      * not take ownership of the data, and it the caller's
-      * responsibility to ensure that any data allocated with
-diff --git a/include/strigi/filelister.h b/include/strigi/filelister.h
-index 5fe7f3e..ab1b6ef 100644
---- a/include/strigi/filelister.h
-+++ b/include/strigi/filelister.h
-@@ -50,7 +50,7 @@ private:
-     class Private;
-     Private* p;
- public:
--    FileLister(const Strigi::AnalyzerConfiguration* ic=0);
-+    explicit FileLister(const Strigi::AnalyzerConfiguration* ic=0);
-     ~FileLister();
- 
-     void startListing(const std::string& dir);
-@@ -76,7 +76,7 @@ private:
-     class Private;
-     Private* p;
- public:
--    DirLister(const Strigi::AnalyzerConfiguration* ic=0);
-+    explicit DirLister(const Strigi::AnalyzerConfiguration* ic=0);
-     ~DirLister();
- 
-     void startListing(const std::string& dir);
-diff --git a/include/strigi/streamanalyzer.h b/include/strigi/streamanalyzer.h
-index 4074463..5a5ed0e 100644
---- a/include/strigi/streamanalyzer.h
-+++ b/include/strigi/streamanalyzer.h
-@@ -50,7 +50,7 @@ private:
-     StreamAnalyzerPrivate* const p;
- 
- public:
--    StreamAnalyzer(AnalyzerConfiguration& c);
-+    explicit StreamAnalyzer(AnalyzerConfiguration& c);
-     ~StreamAnalyzer();
-     void setIndexWriter(IndexWriter& writer);
-     signed char indexFile(const char *filepath);
-diff --git a/include/strigi/variant.h b/include/strigi/variant.h
-index f81b604..bb2ccab 100644
---- a/include/strigi/variant.h
-+++ b/include/strigi/variant.h
-@@ -40,13 +40,13 @@ private:
-     VariantPrivate* const p;
- public:
-     Variant();
--    Variant(bool v);
--    Variant(int32_t v);
--    Variant(uint32_t v);
--    Variant(const char* v);
--    Variant(const std::string& v);
--    Variant(const std::vector<std::string>& v);
--    Variant(const std::vector<std::vector<std::string> >& v);
-+    explicit Variant(bool v);
-+    explicit Variant(int32_t v);
-+    explicit Variant(uint32_t v);
-+    explicit Variant(const char* v);
-+    explicit Variant(const std::string& v);
-+    explicit Variant(const std::vector<std::string>& v);
-+    explicit Variant(const std::vector<std::vector<std::string> >& v);
-     Variant(const Variant& v);
-     ~Variant();
-     Type type() const;
-diff --git a/lib/endanalyzers/arendanalyzer.h b/lib/endanalyzers/arendanalyzer.h
-index 801964d..0a12f84 100644
---- a/lib/endanalyzers/arendanalyzer.h
-+++ b/lib/endanalyzers/arendanalyzer.h
-@@ -28,7 +28,7 @@ class ArEndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const ArEndAnalyzerFactory* factory;
- public:
--    ArEndAnalyzer(const ArEndAnalyzerFactory* f)
-+    explicit ArEndAnalyzer(const ArEndAnalyzerFactory* f)
-         :factory(f) {}
- 
-     bool checkHeader(const char* header, int32_t headersize) const;
-diff --git a/lib/endanalyzers/bmpendanalyzer.h b/lib/endanalyzers/bmpendanalyzer.h
-index c829a5c..38e1109 100644
---- a/lib/endanalyzers/bmpendanalyzer.h
-+++ b/lib/endanalyzers/bmpendanalyzer.h
-@@ -28,7 +28,7 @@ class BmpEndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const BmpEndAnalyzerFactory* factory;
- public:
--    BmpEndAnalyzer(const BmpEndAnalyzerFactory* f) :factory(f) {}
-+    explicit BmpEndAnalyzer(const BmpEndAnalyzerFactory* f) :factory(f) {}
-     bool checkHeader(const char* header, int32_t headersize) const;
-     signed char analyze(Strigi::AnalysisResult& idx, Strigi::InputStream* in);
-     const char* name() const { return "BmpEndAnalyzer"; }
-diff --git a/lib/endanalyzers/bz2endanalyzer.h b/lib/endanalyzers/bz2endanalyzer.h
-index e88c158..e7266b2 100644
---- a/lib/endanalyzers/bz2endanalyzer.h
-+++ b/lib/endanalyzers/bz2endanalyzer.h
-@@ -28,7 +28,7 @@ class Bz2EndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const Bz2EndAnalyzerFactory* factory;
- public:
--    Bz2EndAnalyzer(const Bz2EndAnalyzerFactory* f)
-+    explicit Bz2EndAnalyzer(const Bz2EndAnalyzerFactory* f)
-         :factory(f) {}
- 
-     bool checkHeader(const char* header, int32_t headersize) const;
-diff --git a/lib/endanalyzers/flacendanalyzer.h b/lib/endanalyzers/flacendanalyzer.h
-index 535940e..f1bcf1f 100644
---- a/lib/endanalyzers/flacendanalyzer.h
-+++ b/lib/endanalyzers/flacendanalyzer.h
-@@ -33,7 +33,7 @@ class FlacEndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const FlacEndAnalyzerFactory* factory;
- public:
--    FlacEndAnalyzer(const FlacEndAnalyzerFactory* f) :factory(f) {}
-+    explicit FlacEndAnalyzer(const FlacEndAnalyzerFactory* f) :factory(f) {}
-     bool checkHeader(const char* header, int32_t headersize) const;
-     signed char analyze(Strigi::AnalysisResult& idx, Strigi::InputStream* in);
-     const char* name() const { return "FlacEndAnalyzer"; }
-diff --git a/lib/endanalyzers/gzipendanalyzer.h b/lib/endanalyzers/gzipendanalyzer.h
-index 51b9008..2793721 100644
---- a/lib/endanalyzers/gzipendanalyzer.h
-+++ b/lib/endanalyzers/gzipendanalyzer.h
-@@ -28,7 +28,7 @@ class GZipEndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const GZipEndAnalyzerFactory* factory;
- public:
--    GZipEndAnalyzer(const GZipEndAnalyzerFactory* f)
-+    explicit GZipEndAnalyzer(const GZipEndAnalyzerFactory* f)
-         :factory(f) {}
- 
-     bool checkHeader(const char* header, int32_t headersize) const;
-diff --git a/lib/endanalyzers/id3endanalyzer.cpp b/lib/endanalyzers/id3endanalyzer.cpp
-index a453a39..c500715 100644
---- a/lib/endanalyzers/id3endanalyzer.cpp
-+++ b/lib/endanalyzers/id3endanalyzer.cpp
-@@ -342,7 +342,7 @@ ID3EndAnalyzer::checkHeader(const char* header, int32_t headersize) const {
-   const unsigned char* usbuf = (const unsigned char*)header;
-   int32_t i;
- 
--  for(i=0; (header[i] == '\0') && (i<headersize); i++);
-+  for(i=0; (header[i] == '\0') && (i<headersize); ++i);
-   return (headersize>=6+i)
- 	  && (
- 	    (strncmp("ID3", header+i, 3) == 0	// check that it's ID3
-@@ -411,7 +411,7 @@ class genre_number_parser {
-         parse_string(genre);
-     }
-     /**
--     * wether or not parsing was successful
-+     * whether or not parsing was successful
-      */
-     operator bool() {
-         return success;
-@@ -480,7 +480,7 @@ ID3EndAnalyzer::analyze(Strigi::AnalysisResult& indexable, Strigi::InputStream*
- 	    string deunsyncbuf;
- 	    if (unsync) {
- 	      deunsyncbuf.reserve(size-1);
--	      for(int32_t i = 0; i<size-1; i++)
-+	      for(int32_t i = 0; i<size-1; ++i)
- 		if ( (i==0) || (p[11+i]!=0) || (p[10+i]!=0xff) )
- 		  deunsyncbuf.push_back(p[11+i]);
- 	      decoded_value = deunsyncbuf.c_str();
-diff --git a/lib/endanalyzers/id3endanalyzer.h b/lib/endanalyzers/id3endanalyzer.h
-index 293c993..337dcfd 100644
---- a/lib/endanalyzers/id3endanalyzer.h
-+++ b/lib/endanalyzers/id3endanalyzer.h
-@@ -30,7 +30,7 @@ class ID3EndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const ID3EndAnalyzerFactory* factory;
- public:
--    ID3EndAnalyzer(const ID3EndAnalyzerFactory* f) :factory(f) {}
-+    explicit ID3EndAnalyzer(const ID3EndAnalyzerFactory* f) :factory(f) {}
-     bool checkHeader(const char* header, int32_t headersize) const;
-     signed char analyze(Strigi::AnalysisResult& idx, Strigi::InputStream* in);
-     const char* name() const { return "ID3EndAnalyzer"; }
-diff --git a/lib/endanalyzers/lzmaendanalyzer.h b/lib/endanalyzers/lzmaendanalyzer.h
-index cad65aa..7fb118a 100644
---- a/lib/endanalyzers/lzmaendanalyzer.h
-+++ b/lib/endanalyzers/lzmaendanalyzer.h
-@@ -28,7 +28,7 @@ class LzmaEndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const LzmaEndAnalyzerFactory* factory;
- public:
--    LzmaEndAnalyzer(const LzmaEndAnalyzerFactory* f)
-+    explicit LzmaEndAnalyzer(const LzmaEndAnalyzerFactory* f)
-         :factory(f) {}
- 
-     bool checkHeader(const char* header, int32_t headersize) const;
-diff --git a/lib/endanalyzers/mailendanalyzer.h b/lib/endanalyzers/mailendanalyzer.h
-index 4c7d391..8d77420 100644
---- a/lib/endanalyzers/mailendanalyzer.h
-+++ b/lib/endanalyzers/mailendanalyzer.h
-@@ -28,7 +28,7 @@ class MailEndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const MailEndAnalyzerFactory* factory;
- public:
--    MailEndAnalyzer(const MailEndAnalyzerFactory* f) :factory(f) {}
-+    explicit MailEndAnalyzer(const MailEndAnalyzerFactory* f) :factory(f) {}
-     bool checkHeader(const char* header, int32_t headersize) const;
-     signed char analyze(Strigi::AnalysisResult& idx, Strigi::InputStream* in);
-     const char* name() const { return "MailEndAnalyzer"; }
-diff --git a/lib/endanalyzers/mpegendanalyzer.h b/lib/endanalyzers/mpegendanalyzer.h
-index 42b65e9..1d0a2f2 100644
---- a/lib/endanalyzers/mpegendanalyzer.h
-+++ b/lib/endanalyzers/mpegendanalyzer.h
-@@ -58,7 +58,7 @@ private:
- 
- 
- public:
--    MpegEndAnalyzer(const MpegEndAnalyzerFactory* f) :factory(f)
-+    explicit MpegEndAnalyzer(const MpegEndAnalyzerFactory* f) :factory(f)
-     {
-         this->frame_rate_table[0] = 0.0;   /* Pad */
-         //Official frame rates
-diff --git a/lib/endanalyzers/odfendanalyzer.h b/lib/endanalyzers/odfendanalyzer.h
-index f426c25..8da3137 100644
---- a/lib/endanalyzers/odfendanalyzer.h
-+++ b/lib/endanalyzers/odfendanalyzer.h
-@@ -36,7 +36,7 @@ public:
-     Strigi::OdfMetaHelperAnalyzer metaHelper;
-     Strigi::OdfContentHelperAnalyzer contentHelper;
-     
--    OdfEndAnalyzer(const OdfEndAnalyzerFactory* f) :factory(f){};
-+    explicit OdfEndAnalyzer(const OdfEndAnalyzerFactory* f) :factory(f){};
-     bool checkHeader(const char* header, int32_t headersize) const;
-     signed char analyze(Strigi::AnalysisResult& idx, Strigi::InputStream* in);
-     const char* name() const { return "OdfEndAnalyzer"; }
-diff --git a/lib/endanalyzers/oleendanalyzer.h b/lib/endanalyzers/oleendanalyzer.h
-index df89ce4..b94bc40 100644
---- a/lib/endanalyzers/oleendanalyzer.h
-+++ b/lib/endanalyzers/oleendanalyzer.h
-@@ -64,7 +64,7 @@ private:
-     std::string getStreamString(Strigi::InputStream*) const;
-     bool tryFIB(Strigi::AnalysisResult& ar, Strigi::InputStream* in);
- public:
--    OleEndAnalyzer(const OleEndAnalyzerFactory* const f) :factory(f) {}
-+    explicit OleEndAnalyzer(const OleEndAnalyzerFactory* const f) :factory(f) {}
-     bool checkHeader(const char* header, int32_t headersize) const;
-     bool tryPropertyStream(Strigi::AnalysisResult& idx, Strigi::InputStream* s);
-     signed char analyze(Strigi::AnalysisResult& idx, Strigi::InputStream* in);
-diff --git a/lib/endanalyzers/pdfendanalyzer.h b/lib/endanalyzers/pdfendanalyzer.h
-index b157bdb..c72fc71 100644
---- a/lib/endanalyzers/pdfendanalyzer.h
-+++ b/lib/endanalyzers/pdfendanalyzer.h
-@@ -40,7 +40,7 @@ private:
-     Strigi::StreamStatus handle(Strigi::InputStream* s);
-     Strigi::StreamStatus handle(const std::string& s);
- public:
--    PdfEndAnalyzer(const PdfEndAnalyzerFactory* f);
-+    explicit PdfEndAnalyzer(const PdfEndAnalyzerFactory* f);
- };
- 
- class PdfEndAnalyzerFactory : public Strigi::StreamEndAnalyzerFactory {
-diff --git a/lib/endanalyzers/pngendanalyzer.h b/lib/endanalyzers/pngendanalyzer.h
-index 9144758..066aaac 100644
---- a/lib/endanalyzers/pngendanalyzer.h
-+++ b/lib/endanalyzers/pngendanalyzer.h
-@@ -42,7 +42,7 @@ private:
-     signed char addMetaData(const std::string& key, Strigi::AnalysisResult& as,
-         Strigi::InputStream* in);
- public:
--    PngEndAnalyzer(const PngEndAnalyzerFactory* f);
-+    explicit PngEndAnalyzer(const PngEndAnalyzerFactory* f);
- };
- 
- class PngEndAnalyzerFactory : public Strigi::StreamEndAnalyzerFactory {
-diff --git a/lib/endanalyzers/rpmendanalyzer.h b/lib/endanalyzers/rpmendanalyzer.h
-index fdaf0f4..b5ccbd6 100644
---- a/lib/endanalyzers/rpmendanalyzer.h
-+++ b/lib/endanalyzers/rpmendanalyzer.h
-@@ -28,7 +28,7 @@ class RpmEndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const RpmEndAnalyzerFactory* factory;
- public:
--    RpmEndAnalyzer(const RpmEndAnalyzerFactory* f)
-+    explicit RpmEndAnalyzer(const RpmEndAnalyzerFactory* f)
-         :factory(f) {}
- 
-     bool checkHeader(const char* header, int32_t headersize) const;
-diff --git a/lib/endanalyzers/sdfendanalyzer.h b/lib/endanalyzers/sdfendanalyzer.h
-index f6ab67f..56b1d77 100644
---- a/lib/endanalyzers/sdfendanalyzer.h
-+++ b/lib/endanalyzers/sdfendanalyzer.h
-@@ -29,7 +29,7 @@ class SdfEndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const SdfEndAnalyzerFactory* factory;
- public:
--    SdfEndAnalyzer(const SdfEndAnalyzerFactory* f) :factory(f) {}
-+    explicit SdfEndAnalyzer(const SdfEndAnalyzerFactory* f) :factory(f) {}
-     bool checkHeader(const char* header, int32_t headersize) const;
-     signed char analyze(Strigi::AnalysisResult& idx, Strigi::InputStream* in);
-     const char* name() const { return "SdfEndAnalyzer"; }
-diff --git a/lib/endanalyzers/tarendanalyzer.h b/lib/endanalyzers/tarendanalyzer.h
-index 875d560..28bedf0 100644
---- a/lib/endanalyzers/tarendanalyzer.h
-+++ b/lib/endanalyzers/tarendanalyzer.h
-@@ -28,7 +28,7 @@ class TarEndAnalyzer : public Strigi::StreamEndAnalyzer {
- private:
-     const TarEndAnalyzerFactory* factory;
- public:
--    TarEndAnalyzer(const TarEndAnalyzerFactory* f)
-+    explicit TarEndAnalyzer(const TarEndAnalyzerFactory* f)
-         :factory(f) {}
- 
-     bool checkHeader(const char* header, int32_t headersize) const;
-diff --git a/lib/endanalyzers/zipendanalyzer.h b/lib/endanalyzers/zipendanalyzer.h
-index 3d87217..653645d 100644
---- a/lib/endanalyzers/zipendanalyzer.h
-+++ b/lib/endanalyzers/zipendanalyzer.h
-@@ -28,7 +28,7 @@ class ZipEndAnalyzer : public Strigi::StreamEndAnalyzer {
- public:
-     const ZipEndAnalyzerFactory* const factory;
- 
--    ZipEndAnalyzer(const ZipEndAnalyzerFactory* f) :factory(f) {}
-+    explicit ZipEndAnalyzer(const ZipEndAnalyzerFactory* f) :factory(f) {}
-     bool checkHeader(const char* header, int32_t headersize) const;
-     signed char analyze(Strigi::AnalysisResult& idx, Strigi::InputStream* in);
-     const char* name() const { return "ZipEndAnalyzer"; }
-diff --git a/lib/eventanalyzers/mimeeventanalyzer.h b/lib/eventanalyzers/mimeeventanalyzer.h
-index d0d2506..fd28b7b 100644
---- a/lib/eventanalyzers/mimeeventanalyzer.h
-+++ b/lib/eventanalyzers/mimeeventanalyzer.h
-@@ -39,7 +39,7 @@ private:
-     void handleData(const char* data, uint32_t length);
-     bool isReadyWithStream();
- public:
--    MimeEventAnalyzer(const MimeEventAnalyzerFactory*);
-+    explicit MimeEventAnalyzer(const MimeEventAnalyzerFactory*);
-     ~MimeEventAnalyzer();
- };
- 
-diff --git a/lib/eventthroughanalyzer.h b/lib/eventthroughanalyzer.h
-index 1b45312..b866402 100644
---- a/lib/eventthroughanalyzer.h
-+++ b/lib/eventthroughanalyzer.h
-@@ -50,7 +50,7 @@ private:
-     void handleEnd();
-     const char* name() const { return "EventThroughAnalyzer"; }
- public:
--    EventThroughAnalyzer(std::vector<StreamEventAnalyzer*>& e)
-+    explicit EventThroughAnalyzer(std::vector<StreamEventAnalyzer*>& e)
-             : event(e), datastream(0), result(0), ready(true){}
-     ~EventThroughAnalyzer();
- };
-diff --git a/lib/fieldpropertiesdb.cpp b/lib/fieldpropertiesdb.cpp
-index 79264ce..07d5204 100644
---- a/lib/fieldpropertiesdb.cpp
-+++ b/lib/fieldpropertiesdb.cpp
-@@ -291,30 +291,30 @@ FieldPropertiesDb::Private::addEssentialProperties() {
- 
-     props.typeuri = FieldRegister::datetimeType;
-     props.uri = FieldRegister::mtimeFieldName;
--    properties[FieldRegister::mtimeFieldName] = props;
-+    properties[FieldRegister::mtimeFieldName] = FieldProperties(props);
- 
-     props.typeuri = FieldRegister::integerType;
-     props.uri = FieldRegister::sizeFieldName;
--    properties[FieldRegister::sizeFieldName] = props;
-+    properties[FieldRegister::sizeFieldName] = FieldProperties(props);
- 
-     props.uri = FieldRegister::embeddepthFieldName;
--    properties[FieldRegister::embeddepthFieldName] = props;
-+    properties[FieldRegister::embeddepthFieldName] = FieldProperties(props);
- 
-     props.typeuri = FieldRegister::stringType;
-     props.uri = FieldRegister::pathFieldName;
-     props.tokenized = false; // should not be tokenized: needed for retrieval 
--    properties[FieldRegister::pathFieldName] = props;
-+    properties[FieldRegister::pathFieldName] = FieldProperties(props);
- 
-     props.uri = FieldRegister::filenameFieldName;
-     props.tokenized = true;
--    properties[FieldRegister::filenameFieldName] = props;
-+    properties[FieldRegister::filenameFieldName] = FieldProperties(props);
- 
-     props.uri = FieldRegister::mimetypeFieldName;
--    properties[FieldRegister::mimetypeFieldName] = props;
-+    properties[FieldRegister::mimetypeFieldName] = FieldProperties(props);
- 
-     props.uri = FieldRegister::parentLocationFieldName;
-     props.tokenized = false; // should not be tokenized: needed for retrieval
--    properties[FieldRegister::parentLocationFieldName] = props;
-+    properties[FieldRegister::parentLocationFieldName] = FieldProperties(props);
- }
- void
- FieldPropertiesDb::Private::loadProperties(const string& dir) {
-@@ -751,7 +751,7 @@ FieldPropertiesDb::Private::endElementNsSAX2Func(void *ctx,
- void
- FieldPropertiesDb::Private::storeProperties(FieldProperties::Private& p) {
-     if (p.uri.size()) {
--        properties[p.uri] = p;
-+        properties[p.uri] = FieldProperties(p);
-     }
-     p.clear();
- }
-@@ -773,14 +773,14 @@ FieldPropertiesDb::addField(const std::string& key, const std::string& type,
-     if (parent.size()) {
-         props.parentUris.push_back(parent);
-     }
--    p->properties[key] = props;
-+    p->properties[key] = FieldProperties(props);
- }
- void
- FieldPropertiesDb::addField(const std::string& key) {
-     FieldProperties::Private props;
-     props.uri = key;
-     props.typeuri = FieldRegister::stringType;
--    p->properties[key] = props;
-+    p->properties[key] = FieldProperties(props);
- }
- void
- FieldProperties::Private::clear() {
-diff --git a/lib/helperanalyzers/odfcontenthelperanalyzer.cpp b/lib/helperanalyzers/odfcontenthelperanalyzer.cpp
-index d2a0a72..df3352a 100644
---- a/lib/helperanalyzers/odfcontenthelperanalyzer.cpp
-+++ b/lib/helperanalyzers/odfcontenthelperanalyzer.cpp
-@@ -25,7 +25,6 @@
- #include <cstring>
- #include <string>
- 
--#include <strigi/analysisresult.h>
- #include <strigi/fieldtypes.h>
- #include "../rdfnamespaces.h"
- 
-diff --git a/lib/helperanalyzers/odfmetahelperanalyzer.cpp b/lib/helperanalyzers/odfmetahelperanalyzer.cpp
-index 3409707..6b53be0 100644
---- a/lib/helperanalyzers/odfmetahelperanalyzer.cpp
-+++ b/lib/helperanalyzers/odfmetahelperanalyzer.cpp
-@@ -27,7 +27,6 @@
- #include <string>
- #include <iostream>
- 
--#include <strigi/analysisresult.h>
- #include <strigi/fieldtypes.h>
- #include "../rdfnamespaces.h"
- 
-diff --git a/lib/libstreamanalyzer.pc.cmake b/lib/libstreamanalyzer.pc.cmake
-index bd13339..38c0ccb 100644
---- a/lib/libstreamanalyzer.pc.cmake
-+++ b/lib/libstreamanalyzer.pc.cmake
-@@ -1,3 +1,22 @@
-+# This file is part of Strigi Desktop Search
-+#
-+# Copyright (C) 2007 Jos van den Oever <jos@vandenoever.info>
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Library General Public
-+# License as published by the Free Software Foundation; either
-+# version 2 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Library General Public License for more details.
-+#
-+# You should have received a copy of the GNU Library General Public License
-+# along with this library; see the file COPYING.LIB.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
-+
- prefix=${CMAKE_INSTALL_PREFIX}
- exec_prefix=${CMAKE_INSTALL_PREFIX}/bin
- libdir=${LIB_DESTINATION}
-diff --git a/lib/lineanalyzers/m3ustreamanalyzer.h b/lib/lineanalyzers/m3ustreamanalyzer.h
-index 9033f14..d3fe71d 100644
---- a/lib/lineanalyzers/m3ustreamanalyzer.h
-+++ b/lib/lineanalyzers/m3ustreamanalyzer.h
-@@ -42,7 +42,7 @@ private:
-     std::string constructAbsolutePath(const std::string& relative) const;
- 
- public:
--    M3uLineAnalyzer(const M3uLineAnalyzerFactory* f) : factory(f) {}
-+    explicit M3uLineAnalyzer(const M3uLineAnalyzerFactory* f) : factory(f) {}
-     ~M3uLineAnalyzer() {}
- 
-     const char* name() const { 
-diff --git a/lib/lineanalyzers/odfmimetypelineanalyzer.h b/lib/lineanalyzers/odfmimetypelineanalyzer.h
-index c53aa19..0bb81aa 100644
---- a/lib/lineanalyzers/odfmimetypelineanalyzer.h
-+++ b/lib/lineanalyzers/odfmimetypelineanalyzer.h
-@@ -40,7 +40,7 @@ public:
- 
- class OdfMimeTypeLineAnalyzer : public Strigi::StreamLineAnalyzer {
- public:
--    OdfMimeTypeLineAnalyzer(const OdfMimeTypeLineAnalyzerFactory *factory);
-+    explicit OdfMimeTypeLineAnalyzer(const OdfMimeTypeLineAnalyzerFactory *factory);
- 
-     const char* name() const {
-         return "OdfMimeTypeLineAnalyzer";
-diff --git a/lib/lineeventanalyzer.h b/lib/lineeventanalyzer.h
-index 5c67eac..ccd9043 100644
---- a/lib/lineeventanalyzer.h
-+++ b/lib/lineeventanalyzer.h
-@@ -57,7 +57,7 @@ private:
-     void emitData(const char* data, uint32_t length);
-     void initEncoding(std::string encoding);
- public:
--    LineEventAnalyzer(std::vector<StreamLineAnalyzer*>&s);
-+    explicit LineEventAnalyzer(std::vector<StreamLineAnalyzer*>&s);
-     ~LineEventAnalyzer();
- };
- 
-diff --git a/lib/logging.h b/lib/logging.h
-index 8a42795..c9e34c6 100644
---- a/lib/logging.h
-+++ b/lib/logging.h
-@@ -44,4 +44,4 @@
- #define slog(x) (void)
- #endif
- 
--#endif
-\ No newline at end of file
-+#endif
-diff --git a/lib/rdfnamespaces.h b/lib/rdfnamespaces.h
-index 9aad41d..aa35714 100644
---- a/lib/rdfnamespaces.h
-+++ b/lib/rdfnamespaces.h
-@@ -18,8 +18,8 @@
-  * Boston, MA 02110-1301, USA.
-  */
- 
--#ifndef RDFNAMESAPCES
--#define RDFNAMESPACES
-+#ifndef RDFNAMESPACES_H
-+#define RDFNAMESPACES_H
- 
- // This is a list of the most often encountered rdf namespaces used by analyzers
- // For internal use ONLY and should not be installed
-diff --git a/lib/saxeventanalyzer.h b/lib/saxeventanalyzer.h
-index 3bb9101..b5eec45 100644
---- a/lib/saxeventanalyzer.h
-+++ b/lib/saxeventanalyzer.h
-@@ -40,7 +40,7 @@ private:
-     void handleData(const char* data, uint32_t length);
-     bool isReadyWithStream();
- public:
--    SaxEventAnalyzer(std::vector<StreamSaxAnalyzer*>&s);
-+    explicit SaxEventAnalyzer(std::vector<StreamSaxAnalyzer*>&s);
-     ~SaxEventAnalyzer();
- };
- 
-diff --git a/lib/throughanalyzers/oggthroughanalyzer.h b/lib/throughanalyzers/oggthroughanalyzer.h
-index c28853a..c3530a1 100644
---- a/lib/throughanalyzers/oggthroughanalyzer.h
-+++ b/lib/throughanalyzers/oggthroughanalyzer.h
-@@ -35,7 +35,7 @@ private:
-     Strigi::AnalysisResult* indexable;
-     const OggThroughAnalyzerFactory* factory;
- public:
--    OggThroughAnalyzer(const OggThroughAnalyzerFactory* f) :factory(f) {}
-+    explicit OggThroughAnalyzer(const OggThroughAnalyzerFactory* f) :factory(f) {}
-     ~OggThroughAnalyzer() {}
-     void setIndexable(Strigi::AnalysisResult*);
-     Strigi::InputStream *connectInputStream(Strigi::InputStream *in);
-diff --git a/lib/xmlparser/xmlstream.h b/lib/xmlparser/xmlstream.h
-index 083e55e..6b48eb5 100644
---- a/lib/xmlparser/xmlstream.h
-+++ b/lib/xmlparser/xmlstream.h
-@@ -35,7 +35,7 @@ private:
-     class Private;
-     Private* p;
- public:
--    XMLStream(const std::string& xml);
-+    explicit XMLStream(const std::string& xml);
-     ~XMLStream();
-     void setFromAttribute(bool&, const char*);
-     void setFromAttribute(int&, const char*);
-@@ -82,7 +82,7 @@ public:
-     std::list<SimpleNode> nodes;
-     std::string text;
- 
--    SimpleNode(const std::string& xml);
-+    explicit SimpleNode(const std::string& xml);
- };
- 
- 
-diff --git a/plugins/endplugins/ffmpegendanalyzer.cpp b/plugins/endplugins/ffmpegendanalyzer.cpp
-index 25e2a9a..f219912 100644
---- a/plugins/endplugins/ffmpegendanalyzer.cpp
-+++ b/plugins/endplugins/ffmpegendanalyzer.cpp
-@@ -377,7 +377,7 @@ FFMPEGEndAnalyzer::analyze(AnalysisResult& ar, ::InputStream* in) {
-     ar.addValue(factory->typeProperty, NFO "Video");
-   }
- 
--  for(uint32_t i=0; i<fc->nb_streams; i++) {
-+  for(uint32_t i=0; i<fc->nb_streams; ++i) {
-     const AVStream &stream = *fc->streams[i];
-     const AVCodecContext &codec = *stream.codec;
-     
-@@ -394,9 +394,9 @@ FFMPEGEndAnalyzer::analyze(AnalysisResult& ar, ::InputStream* in) {
-       }
- 
- #if (LIBAVUTIL_VERSION_MAJOR < 51)
--      //FIXME we must stop using the deprecated fuction av_metadata_get and use
-+      //FIXME we must stop using the deprecated function av_metadata_get and use
-       // av_dict_get once we are able to detect the version of FFMpeg being used
--      // using version macros. same goes for all occurences of this function.
-+      // using version macros. same goes for all occurrences of this function.
-       AVMetadataTag *entry = av_metadata_get(stream.metadata, "language", NULL, 0);
- #else
-       AVDictionaryEntry *entry = av_dict_get(stream.metadata, "language", NULL, 0);
-diff --git a/plugins/eventplugins/SHA1.h b/plugins/eventplugins/SHA1.h
-index 47c2558..d78bbfc 100644
---- a/plugins/eventplugins/SHA1.h
-+++ b/plugins/eventplugins/SHA1.h
-@@ -115,10 +115,7 @@
- #define SHA1_WIPE_VARIABLES
- #endif
- 
--#if defined(SHA1_HAS_TCHAR)
--#include <tchar.h>
--#else
--#ifdef _MSC_VER
-+#if defined(SHA1_HAS_TCHAR) || defined(_MSC_VER)
- #include <tchar.h>
- #else
- #ifndef TCHAR
-@@ -136,7 +133,6 @@
- #define _sntprintf snprintf
- #endif
- #endif
--#endif
- 
- // Fallback, if no 64-bit support
- #ifndef _fseeki64
-diff --git a/plugins/indexers/cluceneindexer/cluceneindexreader.cpp b/plugins/indexers/cluceneindexer/cluceneindexreader.cpp
-index 6e0ea36..17738b2 100644
---- a/plugins/indexers/cluceneindexer/cluceneindexreader.cpp
-+++ b/plugins/indexers/cluceneindexer/cluceneindexreader.cpp
-@@ -310,11 +310,11 @@ CLuceneIndexReader::Private::createSingleFieldQuery(const string& field,
-           q = _CLNEW TermQuery(t);
-           break;
-     case Strigi::Query::Contains:
--          t = createWildCardTerm(fieldname.c_str(), "*" + val + "*");
-+          t = createWildCardTerm(fieldname.c_str(), '*' + val + '*');
-           q = _CLNEW WildcardQuery(t);
-           break;
-     case Strigi::Query::StartsWith:
--          t = createWildCardTerm(fieldname.c_str(), val + "*");
-+          t = createWildCardTerm(fieldname.c_str(), val + '*');
-           q = _CLNEW WildcardQuery(t);
-           break;
-     case Strigi::Query::Equals:
-diff --git a/plugins/indexers/cluceneindexer/cluceneindexwriter.cpp b/plugins/indexers/cluceneindexer/cluceneindexwriter.cpp
-index 8658180..b340db3 100644
---- a/plugins/indexers/cluceneindexer/cluceneindexwriter.cpp
-+++ b/plugins/indexers/cluceneindexer/cluceneindexwriter.cpp
-@@ -270,7 +270,7 @@ CLuceneIndexWriter::deleteEntry(const string& entry,
- }
- {
-     // delete all deeper nested files
--    wstring v = utf8toucs2(entry+"/");
-+    wstring v = utf8toucs2(entry + '/');
-     Term* t = _CLNEW Term(parentlocation(), v.c_str());
-     PrefixFilter* filter = _CLNEW PrefixFilter(t);
-     BitSet* b = filter->bits(reader);
-@@ -372,58 +372,6 @@ CLuceneIndexWriter::cleanUp() {
-     if (!locked) {
-         return;
-     }
--    /*
--    //this is a hack and will not work with new versions of the index..
--        //furthermore, segmentinfos is a private class.
--    lucene::index::SegmentInfos infos;
--    try {
--        //Have SegmentInfos read the segments file in directory
--        infos.read(directory);
--    } catch(...) {
--        lock->release();
--        return; //todo: this may suggest an error...
--    }
--    lock->release();
--
--    int i;
--    set<string> segments;
--    for (i = 0; i < infos.size(); i++) {
--            lucene::index::SegmentInfo* info = infos.info(i);
--            segments.insert(info->name);
--    }
--
--    char** files = directory->list();
--    char tmp[CL_MAX_PATH];
--    for (i = 0; files[i] != NULL; ++i) {
--        char* file = files[i];
--
--        int fileLength = strlen(file);
--        if ( fileLength < 6 ) {
--            continue;
--        }
--
--        if (strncmp(file,"segments", 8) == 0
--                || strncmp(file, "deletable", 9) == 0) {
--            continue;
--        }
--        if (!isLuceneFile(file)) {
--            continue;
--        }
--
--        strcpy(tmp, file);
--        tmp[fileLength-4] = '\0';
--
--        if (segments.find(tmp) != segments.end()) {
--            continue;
--        }
--
--        directory->deleteFile(file, false);
--    }
--    for (i = 0; files[i] != NULL; i++) {
--        _CLDELETE_CaARRAY(files[i]);
--    }
--    _CLDELETE_ARRAY(files);
--    */
- }
- 
- void
-diff --git a/plugins/indexers/cluceneindexer/jsgzipcompressstream.cpp b/plugins/indexers/cluceneindexer/jsgzipcompressstream.cpp
-index 2e428a2..d39505f 100644
---- a/plugins/indexers/cluceneindexer/jsgzipcompressstream.cpp
-+++ b/plugins/indexers/cluceneindexer/jsgzipcompressstream.cpp
-@@ -17,8 +17,8 @@
-  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
--#include <CLucene/StdHeader.h>
- #include "jsgzipcompressstream.h"
-+#include <CLucene/StdHeader.h>
- #include <CLucene/util/jstreamsconfig.h>
- #include <zlib.h>
- 
-diff --git a/plugins/indexers/cluceneindexer/tests/CLuceneTest.cpp b/plugins/indexers/cluceneindexer/tests/CLuceneTest.cpp
-index 9b1ff75..836c653 100644
---- a/plugins/indexers/cluceneindexer/tests/CLuceneTest.cpp
-+++ b/plugins/indexers/cluceneindexer/tests/CLuceneTest.cpp
-@@ -1,3 +1,22 @@
-+/* This file is part of Strigi Desktop Search
-+ *
-+ * Copyright (C) 2006 Jos van den Oever <jos@vandenoever.info>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public License
-+ * along with this library; see the file COPYING.LIB.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ */
- #include <strigi/strigiconfig.h>
- #include "compat.h"
- #include "indexpluginloader.h"
-diff --git a/plugins/indexers/cluceneindexer/timeofday.h b/plugins/indexers/cluceneindexer/timeofday.h
-index 7c8bb7e..97a8c41 100644
---- a/plugins/indexers/cluceneindexer/timeofday.h
-+++ b/plugins/indexers/cluceneindexer/timeofday.h
-@@ -1,22 +1,23 @@
--/*
--* Defines gettimeofday
--*
--* Based on timeval.h Copyright (c) by Wu Yongwei <wuyongwei@gmail.com>
--*
--* This library is free software; you can redistribute it and/or
--* modify it under the terms of the GNU Lesser General Public
--* License as published by the Free Software Foundation; either
--* version 2.1 of the License, or (at your option) any later version.
--*
--* This library is distributed in the hope that it will be useful,
--* but WITHOUT ANY WARRANTY; without even the implied warranty of
--* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--* Lesser General Public License for more details.
--*
--* You should have received a copy of the GNU Lesser General Public
--* License along with this library; if not, write to the Free Software
--* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--*/
-+/**
-+ * Defines gettimeofday
-+ *
-+ * Based on timeval.h Copyright (c) by Wu Yongwei <wuyongwei@gmail.com>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; see the file COPYING.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ */
- 
- #include "config.h"
- #include <errno.h>
-diff --git a/plugins/indexers/clucenengindexer/cluceneindexreader.cpp b/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
-index 0274329..8e20847 100644
---- a/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
-+++ b/plugins/indexers/clucenengindexer/cluceneindexreader.cpp
-@@ -476,8 +476,8 @@ CLuceneIndexReader::getDocuments(const std::vector<std::string>& fullFields,
-         doc.resize(fullFields.size());
- 
-         const Document::FieldsType& fields = *d.getFields();
--        for ( Document::FieldsType::const_iterator itr = fields.begin();
--              itr != fields.end(); itr++ ) {
-+        for (Document::FieldsType::const_iterator itr = fields.begin();
-+             itr != fields.end(); ++itr) {
-             Field* field = *itr;
-             string name(wchartoutf8(field->name()));
-             for (uint j = 0; j < fullFields.size(); ++j) {
-@@ -546,8 +546,8 @@ CLuceneIndexReader::getHits(const Strigi::Query& q,
-         doc.resize(fields.size());
- 
-         const Document::FieldsType fields = *d->getFields();
--        for ( Document::FieldsType::const_iterator itr = fields.begin();
--              itr != fields.end(); itr++ ) {
-+        for (Document::FieldsType::const_iterator itr = fields.begin();
-+                 itr != fields.end(); ++itr) {
-             Field* field = *itr;
- 
-             string name(wchartoutf8(field->name()));
-diff --git a/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp b/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp
-index 3ba6eeb..b0a9ff7 100644
---- a/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp
-+++ b/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp
-@@ -229,7 +229,7 @@ CLuceneIndexWriter::deleteEntry(const string& entry, lucene::index::IndexWriter*
- }
- {
-     // delete all deeper nested files
--    wstring v = utf8toucs2(entry+"/");
-+    wstring v = utf8toucs2(entry + '/');
-     Term* t(_CLNEW Term(parentlocation(), v.c_str()));
-     PrefixFilter* filter = _CLNEW PrefixFilter(t);
-     BitSet* b = filter->bits(reader);
-@@ -248,7 +248,7 @@ void
- CLuceneIndexWriter::deleteAllEntries() {
-     lucene::index::IndexReader* reader = manager->checkReader();
-     if ( reader != NULL ){
--      for ( int32_t i=0;i<reader->maxDoc();i++ ){
-+      for ( int32_t i=0;i<reader->maxDoc(); ++i) {
-         reader->deleteDocument(i);
-       }
-       reader->flush();
-diff --git a/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp b/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp
-index e2b4e1c..5937d3c 100644
---- a/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp
-+++ b/plugins/indexers/clucenengindexer/indexdump/indexdump.cpp
-@@ -48,9 +48,8 @@ t2a(const TCHAR* t) {
- void
- docdump(Document* doc) {
-     Document::FieldsType fields = doc->getFields();
--    for ( Document::FieldsType::iterator itr = fields.begin();
--          itr != fields.end();
--          itr++ ){
-+    for (Document::FieldsType::iterator itr = fields.begin();
-+             itr != fields.end(); ++itr) {
-         TCHAR* s = (*itr)->toString();
-         printf("%s\n", t2a(s).c_str());
-         _CLDELETE_CARRAY(s);
-diff --git a/plugins/indexers/clucenengindexer/tests/CLuceneTest.cpp b/plugins/indexers/clucenengindexer/tests/CLuceneTest.cpp
-index f5e1b7f..19d69b7 100644
---- a/plugins/indexers/clucenengindexer/tests/CLuceneTest.cpp
-+++ b/plugins/indexers/clucenengindexer/tests/CLuceneTest.cpp
-@@ -1,3 +1,22 @@
-+/* This file is part of Strigi Desktop Search
-+ *
-+ * Copyright (C) 2006 Jos van den Oever <jos@vandenoever.info>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public License
-+ * along with this library; see the file COPYING.LIB.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ */
- #include <strigi/strigiconfig.h>
- #include "indexpluginloader.h"
- #include "indexmanager.h"
-diff --git a/plugins/indexers/clucenengindexer/timeofday.h b/plugins/indexers/clucenengindexer/timeofday.h
-index 7c8bb7e..97a8c41 100644
---- a/plugins/indexers/clucenengindexer/timeofday.h
-+++ b/plugins/indexers/clucenengindexer/timeofday.h
-@@ -1,22 +1,23 @@
--/*
--* Defines gettimeofday
--*
--* Based on timeval.h Copyright (c) by Wu Yongwei <wuyongwei@gmail.com>
--*
--* This library is free software; you can redistribute it and/or
--* modify it under the terms of the GNU Lesser General Public
--* License as published by the Free Software Foundation; either
--* version 2.1 of the License, or (at your option) any later version.
--*
--* This library is distributed in the hope that it will be useful,
--* but WITHOUT ANY WARRANTY; without even the implied warranty of
--* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--* Lesser General Public License for more details.
--*
--* You should have received a copy of the GNU Lesser General Public
--* License along with this library; if not, write to the Free Software
--* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--*/
-+/**
-+ * Defines gettimeofday
-+ *
-+ * Based on timeval.h Copyright (c) by Wu Yongwei <wuyongwei@gmail.com>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; see the file COPYING.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ */
- 
- #include "config.h"
- #include <errno.h>
-diff --git a/plugins/lineplugins/deblineanalyzer.h b/plugins/lineplugins/deblineanalyzer.h
-index 25b40b0..e2b3cd9 100644
---- a/plugins/lineplugins/deblineanalyzer.h
-+++ b/plugins/lineplugins/deblineanalyzer.h
-@@ -36,7 +36,7 @@ private:
-     unsigned int finished;
-     Strigi::AnalysisResult* result;
- public:
--    DebLineAnalyzer(const DebLineAnalyzerFactory* f) : factory(f) {}
-+    explicit DebLineAnalyzer(const DebLineAnalyzerFactory* f) : factory(f) {}
- };
- 
- class DebLineAnalyzerFactory : public Strigi::StreamLineAnalyzerFactory {
-diff --git a/plugins/throughplugins/authroughanalyzer.h b/plugins/throughplugins/authroughanalyzer.h
-index 18ae6d6..75335d1 100644
---- a/plugins/throughplugins/authroughanalyzer.h
-+++ b/plugins/throughplugins/authroughanalyzer.h
-@@ -36,7 +36,7 @@ private:
-     Strigi::AnalysisResult* analysisResult;
-     const AuThroughAnalyzerFactory* factory;
- public:
--    AuThroughAnalyzer(const AuThroughAnalyzerFactory* f) :factory(f) {}
-+    explicit AuThroughAnalyzer(const AuThroughAnalyzerFactory* f) :factory(f) {}
-     ~AuThroughAnalyzer() {}
-     void setIndexable(Strigi::AnalysisResult* i);
-     Strigi::InputStream *connectInputStream(Strigi::InputStream *in);
-diff --git a/plugins/throughplugins/dummy.cpp b/plugins/throughplugins/dummy.cpp
-index 2bfadc3..73d9ffb 100644
---- a/plugins/throughplugins/dummy.cpp
-+++ b/plugins/throughplugins/dummy.cpp
-@@ -1,3 +1,22 @@
-+/* This file is part of Strigi Desktop Search
-+ *
-+ * Copyright (C) 2008 Sebastian Trueg<sebastian@trueg.de>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Library General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Library General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Library General Public License
-+ * along with this library; see the file COPYING.LIB.  If not, write to
-+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
-+ */
- #include <strigi/streamthroughanalyzer.h>
- #include <strigi/analyzerplugin.h>
- 
-diff --git a/plugins/throughplugins/pcxthroughanalyzer.h b/plugins/throughplugins/pcxthroughanalyzer.h
-index a16fb5e..cde824a 100644
---- a/plugins/throughplugins/pcxthroughanalyzer.h
-+++ b/plugins/throughplugins/pcxthroughanalyzer.h
-@@ -30,7 +30,7 @@ private:
-     Strigi::AnalysisResult* indexable;
-     const PcxThroughAnalyzerFactory* factory;
- public:
--    PcxThroughAnalyzer(const PcxThroughAnalyzerFactory* f) :factory(f) {}
-+    explicit PcxThroughAnalyzer(const PcxThroughAnalyzerFactory* f) :factory(f) {}
-     ~PcxThroughAnalyzer() {}
-     void setIndexable(Strigi::AnalysisResult*);
-     Strigi::InputStream *connectInputStream(Strigi::InputStream *in);
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/libstreamanalyzer-0004-ffmpeg-Rename-mutex-to-g_mutex.patch b/source/l/strigi/libstreamanalyzer-0004-ffmpeg-Rename-mutex-to-g_mutex.patch
deleted file mode 100644
index a114d029c..000000000
--- a/source/l/strigi/libstreamanalyzer-0004-ffmpeg-Rename-mutex-to-g_mutex.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ae11c0b24fd3be995185ebdc5a5bbbb92ff30843 Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Tue, 10 Sep 2013 17:50:56 +0300
-Subject: [PATCH 4/5] ffmpeg: Rename `mutex' to `g_mutex'.
-
-std::mutex is an actual type in C++11 and is implemented by libc++. The
-build was failing because references to `mutex' in lockmgr were ambiguous,
-as both the mutex variable defined above and std::mutex (because of the
-`using namespace std' statement) were found.
----
- plugins/endplugins/ffmpegendanalyzer.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/endplugins/ffmpegendanalyzer.cpp b/plugins/endplugins/ffmpegendanalyzer.cpp
-index f219912..eaed07f 100644
---- a/plugins/endplugins/ffmpegendanalyzer.cpp
-+++ b/plugins/endplugins/ffmpegendanalyzer.cpp
-@@ -56,22 +56,22 @@ public:
-     signed char analyze(AnalysisResult& idx, ::InputStream* in);
- };
- 
--STRIGI_MUTEX_DEFINE(mutex);
-+STRIGI_MUTEX_DEFINE(g_mutex);
- 
- static int
- lockmgr(void **mtx, enum AVLockOp op) {
-   // pre-allocating a single mutex is the only way to get it to work without changing strigi_thread.h
--  assert( (*mtx == &mutex) || (op == AV_LOCK_CREATE) );
-+  assert( (*mtx == &g_mutex) || (op == AV_LOCK_CREATE) );
-   switch(op) {
-   case AV_LOCK_CREATE:
--    *mtx = &mutex;
--    return !!STRIGI_MUTEX_INIT(&mutex);
-+    *mtx = &g_mutex;
-+    return !!STRIGI_MUTEX_INIT(&g_mutex);
-   case AV_LOCK_OBTAIN:
--    return !!STRIGI_MUTEX_LOCK(&mutex);
-+    return !!STRIGI_MUTEX_LOCK(&g_mutex);
-   case AV_LOCK_RELEASE:
--    return !!STRIGI_MUTEX_UNLOCK(&mutex);
-+    return !!STRIGI_MUTEX_UNLOCK(&g_mutex);
-   case AV_LOCK_DESTROY:
--    STRIGI_MUTEX_DESTROY(&mutex);
-+    STRIGI_MUTEX_DESTROY(&g_mutex);
-     return 0;
-   }
-   return 1;
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/libstreamanalyzer-0005-use-rpath-only-when-needed.patch b/source/l/strigi/libstreamanalyzer-0005-use-rpath-only-when-needed.patch
deleted file mode 100644
index bcbf50bb3..000000000
--- a/source/l/strigi/libstreamanalyzer-0005-use-rpath-only-when-needed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 82c277bc0264798b291417e675611d7e3bead176 Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Wed, 1 Jan 2014 09:55:46 -0600
-Subject: [PATCH 5/5] use rpath only when needed
-
-cmake code borrowed from soprano
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6dee36b..d5cd1eb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -57,8 +57,13 @@ set(DATA_DESTINATION    "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
- # These two options below make it set the RPATH of the installed targets to all
- # RPATH directories outside the current CMAKE_BINARY_DIR and also the library
- # install directory. Alex
-+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemPlatformLibDir)
-+list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCLibDir)
-+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCxxLibDir)
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
-+if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
- set(CMAKE_INSTALL_RPATH                ${LIB_DESTINATION} )
-+endif()
- 
- if(NOT WIN32 AND NOT CMAKE_SYSTEM MATCHES "SunOS-5*.")
-   add_definitions(-fPIC)
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/libstreams-0001-Generate-config.h-after-looking-for-dependencies.patch b/source/l/strigi/libstreams-0001-Generate-config.h-after-looking-for-dependencies.patch
deleted file mode 100644
index 895c9f7e8..000000000
--- a/source/l/strigi/libstreams-0001-Generate-config.h-after-looking-for-dependencies.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b82f954e71be45aef152bbf8925a3070b7e4c69a Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Fri, 5 Apr 2013 02:13:31 +0300
-Subject: [PATCH 1/5] Generate config.h after looking for dependencies.
-
-At least lib/config.h.cmake's ICONV_SECOND_ARGUMENT_IS_CONST depends
-on FindIconv.cmake having been called before, otherwise it is always
-undefined.
-
-This fixes a regression introduced in 61a7ffe.
-
-CCMAIL: cgiboudeaux@gmx.com
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd95c92..b2d959c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,9 +46,6 @@ endif()
- # check for visibility support
- macro_check_gcc_visibility(__STRIGI_HAVE_GCC_VISIBILITY)
- 
--# Generate include/strigi/strigiconfig.h and lib/config.h
--include(ConfigureChecks.cmake)
--
- # check for required packages
- find_package(ZLIB)
- set_package_properties(ZLIB PROPERTIES
-@@ -77,6 +74,9 @@ set_package_properties(Threads PROPERTIES
- 
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
-+# Generate include/strigi/strigiconfig.h and lib/config.h
-+include(ConfigureChecks.cmake)
-+
- ##### building and testing #####
- # every directory needs the headers that will be installed
- include_directories(${libstreams_SOURCE_DIR}/include
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/libstreams-0002-Reduce-noise-in-analysis-tools-complain-about-resour.patch b/source/l/strigi/libstreams-0002-Reduce-noise-in-analysis-tools-complain-about-resour.patch
deleted file mode 100644
index 7179526ff..000000000
--- a/source/l/strigi/libstreams-0002-Reduce-noise-in-analysis-tools-complain-about-resour.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 314f9d8f4fc50323e9f670ef54f0263cec08abc3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
-Date: Tue, 9 Apr 2013 04:01:23 +0300
-Subject: [PATCH 2/5] Reduce noise in analysis tools complain about resource
- leak
-
-Cppcheck gives false alerts. This will stop it complaining about
-resource leakage.
-Thanks to mpyne for review of patch
-
-REVIEW: 109920
----
- lib/fileinputstream.cpp          | 4 ++--
- lib/skippingfileinputstream.cpp  | 4 ++--
- lib/skippingfileinputstream2.cpp | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/lib/fileinputstream.cpp b/lib/fileinputstream.cpp
-index 2801d1b..820b831 100644
---- a/lib/fileinputstream.cpp
-+++ b/lib/fileinputstream.cpp
-@@ -39,8 +39,8 @@ FileInputStream::FileInputStream(const char* filepath, int32_t buffersize) {
-         m_status = Error;
-         return;
-     }
--    FILE* f = fopen(filepath, "rb");
--    open(f, filepath, buffersize);
-+    file = fopen(filepath, "rb");
-+    open(file, filepath, buffersize);
- }
- FileInputStream::FileInputStream(FILE* file, const char* filepath,
-         int32_t buffersize) {
-diff --git a/lib/skippingfileinputstream.cpp b/lib/skippingfileinputstream.cpp
-index dcb4d32..9759c54 100644
---- a/lib/skippingfileinputstream.cpp
-+++ b/lib/skippingfileinputstream.cpp
-@@ -38,8 +38,8 @@ SkippingFileInputStream::SkippingFileInputStream(const char* filepath) {
-         m_status = Error;
-         return;
-     }
--    FILE* f = fopen(filepath, "rb");
--    open(f, filepath);
-+    file = fopen(filepath, "rb");
-+    open(file, filepath);
- }
- void
- SkippingFileInputStream::open(FILE* f, const char* path) {
-diff --git a/lib/skippingfileinputstream2.cpp b/lib/skippingfileinputstream2.cpp
-index dc618f4..dcfcef2 100644
---- a/lib/skippingfileinputstream2.cpp
-+++ b/lib/skippingfileinputstream2.cpp
-@@ -36,8 +36,8 @@ SkippingFileInputStream2::SkippingFileInputStream2(const char* filepath, int32_t
-         m_status = Error;
-         return;
-     }
--    FILE* f = fopen(filepath, "rb");
--    open(f, filepath, buffersize);
-+    file = fopen(filepath, "rb");
-+    open(file, filepath, buffersize);
- }
- SkippingFileInputStream2::SkippingFileInputStream2(FILE* file, const char* filepath,
-         int32_t buffersize) {
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/libstreams-0003-Build-fix-for-gcc-4.8.patch b/source/l/strigi/libstreams-0003-Build-fix-for-gcc-4.8.patch
deleted file mode 100644
index 203286381..000000000
--- a/source/l/strigi/libstreams-0003-Build-fix-for-gcc-4.8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6fedeb66cc3c59bce24146f079295a1d404c749c Mon Sep 17 00:00:00 2001
-From: Jos van den Oever <jos@vandenoever.info>
-Date: Sat, 1 Jun 2013 17:59:36 +0200
-Subject: [PATCH 3/5] Build fix for gcc 4.8.
-
----
- include/strigi/bufferedstream.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/strigi/bufferedstream.h b/include/strigi/bufferedstream.h
-index 563da8a..05f5500 100644
---- a/include/strigi/bufferedstream.h
-+++ b/include/strigi/bufferedstream.h
-@@ -34,7 +34,7 @@ namespace Strigi {
-  * BufferedStream will do the rest.
-  */
- template <class T>
--class BufferedStream : public StreamBase<T> {
-+class STREAMS_EXPORT BufferedStream : public StreamBase<T> {
- private:
-     StreamBuffer<T> buffer;
-     bool finishedWritingToBuffer;
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/libstreams-0004-Fix-Krazy-issues.patch b/source/l/strigi/libstreams-0004-Fix-Krazy-issues.patch
deleted file mode 100644
index 57036e627..000000000
--- a/source/l/strigi/libstreams-0004-Fix-Krazy-issues.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-From 8aa2b21fe596ddfe9de250190ede78ee34f19d2d Mon Sep 17 00:00:00 2001
-From: Jos van den Oever <jos@vandenoever.info>
-Date: Fri, 12 Jul 2013 13:04:44 +0200
-Subject: [PATCH 4/5] Fix Krazy issues.
-
----
- .krazy                                     |  3 +++
- cmake/FindIconv.cmake                      | 19 +++++++++++++++++++
- include/strigi/archivereader.h             |  6 +++---
- include/strigi/bz2inputstream.h            |  2 +-
- include/strigi/dataeventinputstream.h      |  2 +-
- include/strigi/kmpsearcher.h               |  2 +-
- include/strigi/lzmainputstream.h           |  2 +-
- include/strigi/stringterminatedsubstream.h |  2 +-
- include/strigi/substreamprovider.h         |  2 +-
- lib/libstreams.pc.cmake                    | 19 +++++++++++++++++++
- lib/signatureinputstream.h                 |  2 +-
- lib/strigiconfig.cpp                       |  2 +-
- lib/stringreader.h                         |  2 --
- tests/api/ArchiveReaderTest.cpp            |  4 ++--
- tests/sharedtestcode/unknownsizestream.h   |  4 ++--
- 15 files changed, 56 insertions(+), 17 deletions(-)
- create mode 100644 .krazy
-
-diff --git a/.krazy b/.krazy
-new file mode 100644
-index 0000000..4822bdd
---- /dev/null
-+++ b/.krazy
-@@ -0,0 +1,3 @@
-+# see http://techbase.kde.org/Development/Tutorials/Code_Checking#Controlling_Krazy_on_the_EBN for an explanation of this file
-+EXCLUDE syscalls,typedefs
-+IGNORESUBS tests/data
-diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
-index ce40ab2..fd5a3af 100644
---- a/cmake/FindIconv.cmake
-+++ b/cmake/FindIconv.cmake
-@@ -1,3 +1,22 @@
-+# This file is part of Strigi Desktop Search
-+#
-+# Copyright (C) 2006 Jos van den Oever <jos@vandenoever.info>
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Library General Public
-+# License as published by the Free Software Foundation; either
-+# version 2 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Library General Public License for more details.
-+#
-+# You should have received a copy of the GNU Library General Public License
-+# along with this library; see the file COPYING.LIB.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
-+
- # - Try to find Iconv 
- # Once done this will define 
- # 
-diff --git a/include/strigi/archivereader.h b/include/strigi/archivereader.h
-index 823a432..ffe3f22 100644
---- a/include/strigi/archivereader.h
-+++ b/include/strigi/archivereader.h
-@@ -38,7 +38,7 @@ public:
-      * @brief Opens a stream for the given url.
-      *
-      * What is meant by @p url will depend on context.  In the context of an
--     * archive with a file system-like directory stucture, it will be the path
-+     * archive with a file system-like directory structure, it will be the path
-      * to the file relative the root of the archive (eg: /foo/bar).
-      *
-      * @param url unique name of or path to an item
-@@ -49,7 +49,7 @@ public:
-      * @brief Gets information about a given url
-      *
-      * What is meant by @p url will depend on context.  In the context of an
--     * archive with a file system-like directory stucture, it will be the path
-+     * archive with a file system-like directory structure, it will be the path
-      * to the file relative the root of the archive (eg: /foo/bar).
-      *
-      * @param url unique name of or path to an item
-@@ -89,7 +89,7 @@ public:
-          * @param e a vector containing information about each
-          * item in the directory
-          */
--        DirLister(Private* p);
-+        explicit DirLister(Private* p);
-         /**
-          * @brief Copy constructor
-          */
-diff --git a/include/strigi/bz2inputstream.h b/include/strigi/bz2inputstream.h
-index aa40e88..09e566a 100644
---- a/include/strigi/bz2inputstream.h
-+++ b/include/strigi/bz2inputstream.h
-@@ -30,7 +30,7 @@ private:
-     Private* const p;
-     int32_t fillBuffer(char* start, int32_t space);
- public:
--    BZ2InputStream(InputStream* input);
-+    explicit BZ2InputStream(InputStream* input);
-     ~BZ2InputStream();
-     static bool checkHeader(const char* data, int32_t datasize);
- };
-diff --git a/include/strigi/dataeventinputstream.h b/include/strigi/dataeventinputstream.h
-index 05368e2..c8205c4 100644
---- a/include/strigi/dataeventinputstream.h
-+++ b/include/strigi/dataeventinputstream.h
-@@ -48,7 +48,7 @@ public:
-      * When handleEnd is called, it is guaranteed that each
-      * element in the input stream has been passed in exactly
-      * one call to this function, and that the calls happened
--     * in the same order as the the data occurred in the
-+     * in the same order as the data occurred in the
-      * InputStream.
-      *
-      * You should not call this function yourself.  It forms
-diff --git a/include/strigi/kmpsearcher.h b/include/strigi/kmpsearcher.h
-index e3ec19d..28d049b 100644
---- a/include/strigi/kmpsearcher.h
-+++ b/include/strigi/kmpsearcher.h
-@@ -39,7 +39,7 @@ private:
-     int32_t maxlen;
- public:
-     KmpSearcher() :table(0) { }
--    KmpSearcher(const std::string& query);
-+    explicit KmpSearcher(const std::string& query);
-     ~KmpSearcher() {
-         if (table) {
-             free(table);
-diff --git a/include/strigi/lzmainputstream.h b/include/strigi/lzmainputstream.h
-index fa7cf87..530edc3 100644
---- a/include/strigi/lzmainputstream.h
-+++ b/include/strigi/lzmainputstream.h
-@@ -30,7 +30,7 @@ private:
-     Private* const p;
-     int32_t fillBuffer(char* start, int32_t space);
- public:
--    LZMAInputStream(InputStream* input);
-+    explicit LZMAInputStream(InputStream* input);
-     ~LZMAInputStream();
-     static bool checkHeader(const char* data, int32_t datasize);
- };
-diff --git a/include/strigi/stringterminatedsubstream.h b/include/strigi/stringterminatedsubstream.h
-index 9f96bcc..fabb40d 100644
---- a/include/strigi/stringterminatedsubstream.h
-+++ b/include/strigi/stringterminatedsubstream.h
-@@ -30,7 +30,7 @@ namespace Strigi {
-  *
-  * This class stops reading data when either the end of the
-  * underlying stream is reacher, or a given terminator is encountered
-- * in the the stream.
-+ * in the stream.
-  */
- class STREAMS_EXPORT StringTerminatedSubStream : public InputStream {
- private:
-diff --git a/include/strigi/substreamprovider.h b/include/strigi/substreamprovider.h
-index 21ce324..3036d32 100644
---- a/include/strigi/substreamprovider.h
-+++ b/include/strigi/substreamprovider.h
-@@ -88,7 +88,7 @@ public:
-      *
-      * @param input the inputstream that will be split into substreams
-      */
--    SubStreamProvider(InputStream *input)
-+    explicit SubStreamProvider(InputStream *input)
-         : m_status(Ok)
-         , m_input(input)
-         , m_entrystream(0)
-diff --git a/lib/libstreams.pc.cmake b/lib/libstreams.pc.cmake
-index 8259b46..ce1205d 100644
---- a/lib/libstreams.pc.cmake
-+++ b/lib/libstreams.pc.cmake
-@@ -1,3 +1,22 @@
-+# This file is part of Strigi Desktop Search
-+#
-+# Copyright (C) 2007 Jos van den Oever <jos@vandenoever.info>
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Library General Public
-+# License as published by the Free Software Foundation; either
-+# version 2 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Library General Public License for more details.
-+#
-+# You should have received a copy of the GNU Library General Public License
-+# along with this library; see the file COPYING.LIB.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
-+
- prefix=${CMAKE_INSTALL_PREFIX}
- exec_prefix=${CMAKE_INSTALL_PREFIX}/bin
- libdir=${LIB_DESTINATION}
-diff --git a/lib/signatureinputstream.h b/lib/signatureinputstream.h
-index 7302c75..63a2f0d 100644
---- a/lib/signatureinputstream.h
-+++ b/lib/signatureinputstream.h
-@@ -30,7 +30,7 @@ namespace Strigi {
-  *
-  * This class stops reading data when either the end of the
-  * underlying stream is reacher, or a given terminator is encountered
-- * in the the stream.
-+ * in the stream.
-  */
- class SignatureInputStream : public InputStream {
- private:
-diff --git a/lib/strigiconfig.cpp b/lib/strigiconfig.cpp
-index 6607ebd..9d9d8f9 100644
---- a/lib/strigiconfig.cpp
-+++ b/lib/strigiconfig.cpp
-@@ -32,4 +32,4 @@ namespace Strigi {
-     const char* versionString() {
-         return STRIGI_VERSION_STRING;
-     }
--}
-\ No newline at end of file
-+}
-diff --git a/lib/stringreader.h b/lib/stringreader.h
-index 4d60b67..1a57c5c 100644
---- a/lib/stringreader.h
-+++ b/lib/stringreader.h
-@@ -20,11 +20,9 @@
- #ifndef STRINGREADER_H
- #define STRINGREADER_H
- 
--#ifdef __GNUC__
- #error stringreader.h is deprecated. Include stringstream.h instead.
- #error StringReader has been renamed to StringStream
- #error Use StringInputStream for StringStream<char>
- #error Use StringReader for StringStream<wchar_t>
--#endif
- 
- #endif
-diff --git a/tests/api/ArchiveReaderTest.cpp b/tests/api/ArchiveReaderTest.cpp
-index ffb7cd7..6d38050 100644
---- a/tests/api/ArchiveReaderTest.cpp
-+++ b/tests/api/ArchiveReaderTest.cpp
-@@ -50,7 +50,7 @@ test2(const char* path) {
-     EntryInfo e;
-     while (dl.nextEntry(e)) {
-         string filepath(path);
--        filepath += "/";
-+        filepath += '/';
-         filepath += e.filename;
-         if (e.type == EntryInfo::File) {
-             test1(filepath.c_str());
-@@ -83,7 +83,7 @@ walkdirectories(const char* path, void (*callback)(const char*)) {
-             if (S_ISREG(dirstat.st_mode)) {
-                 callback(filepath.c_str());
-             } else if (S_ISDIR(dirstat.st_mode)) {
--                filepath += "/";
-+                filepath += '/';
-                 walkdirectories(filepath.c_str(), callback);
-             }
-         }
-diff --git a/tests/sharedtestcode/unknownsizestream.h b/tests/sharedtestcode/unknownsizestream.h
-index bde063e..73d3d49 100644
---- a/tests/sharedtestcode/unknownsizestream.h
-+++ b/tests/sharedtestcode/unknownsizestream.h
-@@ -17,8 +17,8 @@
-  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  * Boston, MA 02110-1301, USA.
-  */
--#ifndef STRIGI_UNKNOWNSIZEINPUTSTREAM
--#define STRIGI_UNKNOWNSIZEINPUTSTREAM
-+#ifndef STRIGI_UNKNOWNSIZEINPUTSTREAM_H
-+#define STRIGI_UNKNOWNSIZEINPUTSTREAM_H
- 
- #include <strigi/strigiconfig.h>
- #include <strigi/streambase.h>
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/libstreams-0005-use-rpath-only-when-needed.patch b/source/l/strigi/libstreams-0005-use-rpath-only-when-needed.patch
deleted file mode 100644
index 9a79c13bb..000000000
--- a/source/l/strigi/libstreams-0005-use-rpath-only-when-needed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f552becab291908030f8cc27de83155eb182c7ba Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Wed, 1 Jan 2014 09:53:44 -0600
-Subject: [PATCH 5/5] use rpath only when needed
-
-cmake code borrowed from soprano
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b2d959c..a3948c2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,8 +34,13 @@ set(INCLUDE_DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
- # These two options below make it set the RPATH of the installed targets to all
- # RPATH directories outside the current CMAKE_BINARY_DIR and also the library
- # install directory. Alex
-+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemPlatformLibDir)
-+list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCLibDir)
-+list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCxxLibDir)
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
-+if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
- set(CMAKE_INSTALL_RPATH ${LIB_DESTINATION})
-+endif()
- 
- if(NOT MSVC AND NOT MINGW AND NOT CMAKE_SYSTEM MATCHES "SunOS-5*.")
-   add_definitions(-fPIC)
--- 
-1.8.4.2
-
diff --git a/source/l/strigi/slack-desc b/source/l/strigi/slack-desc
deleted file mode 100644
index adc25f5ff..000000000
--- a/source/l/strigi/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler-----------------------------------------------------|
-strigi: strigi (fast and light desktop search engine)
-strigi:
-strigi: Strigi is a fast and light desktop search engine. It can handle a 
-strigi: large range of file formats such as emails, office documents, media
-strigi: files, and file archives. It can index files that are embedded in 
-strigi: other files. This means email attachments and files in zip files
-strigi: are searchable as if they were normal files on your harddisk. 
-strigi:
-strigi: Homepage: http://strigi.sourceforge.net/
-strigi:
-strigi:
diff --git a/source/l/strigi/strigi.SlackBuild b/source/l/strigi/strigi.SlackBuild
deleted file mode 100755
index 55c44421a..000000000
--- a/source/l/strigi/strigi.SlackBuild
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007-2008 Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=strigi
-VERSION=${VERSION:-0.7.8}
-BUILD=${BUILD:-4}
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=gnu++98"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2 -std=gnu++98"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -std=gnu++98"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -std=gnu++98"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2 -std=gnu++98"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-
-( cd libstreamanalyzer
-zcat $CWD/libstreamanalyzer*.patch.gz | patch -p1 --verbose || exit 1
-)
-( cd libstreams
-zcat $CWD/libstreams*.patch.gz | patch -p1 --verbose || exit 1
-)
-echo "target_link_libraries(index2dump streamanalyzer clucene-shared)" >> libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt
-
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-mkdir -p build
-cd build
-  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
-  PATH=$QTDIR/bin:$PATH \
-  cmake \
-    -DENABLE_INOTIFY:BOOL=ON \
-    -DENABLE_DBUS:BOOL=ON \
-    -DENABLE_EXPAT:BOOL=ON \
-    -DENABLE_FFMPEG:BOOL=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    ..
-   make $NUMJOBS || make || exit 1
-   make install DESTDIR=$PKG || exit 1
-cd -
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING NEWS README TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/strigi/strigi.info b/source/l/strigi/strigi.info
deleted file mode 100644
index 2301f49b5..000000000
--- a/source/l/strigi/strigi.info
+++ /dev/null
@@ -1,4 +0,0 @@
-PRGNAM="strigi"
-VERSION="0.5.9"
-HOMEPAGE="http://strigi.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/strigi/strigi-0.5.9.tar.bz2"
diff --git a/testing/source/vtown/deps/vid.stab/fetch-vid.stab.sh b/source/l/vid.stab/fetch-vid.stab.sh
index 04becb61f..04becb61f 100755
--- a/testing/source/vtown/deps/vid.stab/fetch-vid.stab.sh
+++ b/source/l/vid.stab/fetch-vid.stab.sh
diff --git a/testing/source/vtown/deps/vid.stab/slack-desc b/source/l/vid.stab/slack-desc
index 54a2d04d9..54a2d04d9 100644
--- a/testing/source/vtown/deps/vid.stab/slack-desc
+++ b/source/l/vid.stab/slack-desc
diff --git a/testing/source/vtown/deps/vid.stab/vid.stab.SlackBuild b/source/l/vid.stab/vid.stab.SlackBuild
index 2029e92d0..12092282b 100755
--- a/testing/source/vtown/deps/vid.stab/vid.stab.SlackBuild
+++ b/source/l/vid.stab/vid.stab.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=vid.stab
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/deps/vid.stab/vid.stab.url b/source/l/vid.stab/vid.stab.url
index b98ec60e9..b98ec60e9 100644
--- a/testing/source/vtown/deps/vid.stab/vid.stab.url
+++ b/source/l/vid.stab/vid.stab.url
diff --git a/source/l/xapian-core/xapian-core.SlackBuild b/source/l/xapian-core/xapian-core.SlackBuild
index c3bc72fea..9867e7c3f 100755
--- a/source/l/xapian-core/xapian-core.SlackBuild
+++ b/source/l/xapian-core/xapian-core.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xapian-core
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/n/NetworkManager/55NetworkManager b/source/n/NetworkManager/55NetworkManager
deleted file mode 100644
index d7b3ee6ae..000000000
--- a/source/n/NetworkManager/55NetworkManager
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# If we are running NetworkManager, tell it we are going to sleep.
-
-. "${PM_FUNCTIONS}"
-
-suspend_nm()
-{
-	# Tell NetworkManager to shut down networking
-        printf "Having NetworkManager put all interaces to sleep..."
-	dbus_send --system --print-reply               \
-		--dest=org.freedesktop.NetworkManager  \
-		/org/freedesktop/NetworkManager        \
-		org.freedesktop.NetworkManager.Sleep   \
-		boolean:true && \
-	    echo Done. || echo Failed.
-}
-
-resume_nm()
-{
-	# Wake up NetworkManager and make it do a new connection
-	printf "Having NetworkManager wake interfaces back up..."
-        dbus_send --system --print-reply              \
-		--dest=org.freedesktop.NetworkManager \
-		/org/freedesktop/NetworkManager       \
-		org.freedesktop.NetworkManager.Sleep  \
-		boolean:false && \
-	    echo Done. || echo Failed.
-}
-
-case "$1" in
-	hibernate|suspend)
-		suspend_nm
-		;;
-	thaw|resume)
-		resume_nm
-		;;
-	*) exit $NA
-		;;
-esac
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild
index 569597524..c826785b0 100755
--- a/source/n/NetworkManager/NetworkManager.SlackBuild
+++ b/source/n/NetworkManager/NetworkManager.SlackBuild
@@ -131,8 +131,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-nmtui=yes \
   --enable-json-validation \
   --enable-ovs \
-  --with-session-tracking=consolekit \
-  --with-suspend-resume=consolekit \
+  --with-consolekit=no \
+  --with-session-tracking=elogind \
+  --with-suspend-resume=elogind \
   --with-hostname-persist=slackware \
   --build=$TARGET || exit 1
 
@@ -168,11 +169,10 @@ mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.networkmanager > $PKG/etc/rc.d/rc.networkmanager.new
 chmod 0644 $PKG/etc/rc.d/rc.networkmanager.new
 
-# Add the pm-utils hook back in
-# xfce4-power-manager needs to be built *without* NM support
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/
-cat $CWD/55NetworkManager > $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/55NetworkManager
-chmod 0755 $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/55NetworkManager
+# Move dbus configs to system location:
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
 
 # Add default (plain) config file to enable keyfile plugin
 cat $CWD/NetworkManager.conf > $PKG/etc/NetworkManager/NetworkManager.conf.new
diff --git a/testing/source/vtown/input-methods/OpenCC/OpenCC.SlackBuild b/source/x/OpenCC/OpenCC.SlackBuild
index 27ee8187a..98272cfad 100755
--- a/testing/source/vtown/input-methods/OpenCC/OpenCC.SlackBuild
+++ b/source/x/OpenCC/OpenCC.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=OpenCC
 VERSION=${VERSION:-$(echo OpenCC-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev | cut -f 2- -d .)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/OpenCC/OpenCC.url b/source/x/OpenCC/OpenCC.url
index 4e89094c4..4e89094c4 100644
--- a/testing/source/vtown/input-methods/OpenCC/OpenCC.url
+++ b/source/x/OpenCC/OpenCC.url
diff --git a/testing/source/vtown/input-methods/OpenCC/slack-desc b/source/x/OpenCC/slack-desc
index 385efb74b..385efb74b 100644
--- a/testing/source/vtown/input-methods/OpenCC/slack-desc
+++ b/source/x/OpenCC/slack-desc
diff --git a/testing/source/vtown/input-methods/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild b/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
index 20253172f..fb640a7a2 100755
--- a/testing/source/vtown/input-methods/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
+++ b/source/x/cldr-emoji-annotation/cldr-emoji-annotation.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cldr-emoji-annotation
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/cldr-emoji-annotation/slack-desc b/source/x/cldr-emoji-annotation/slack-desc
index aec79d993..aec79d993 100644
--- a/testing/source/vtown/input-methods/cldr-emoji-annotation/slack-desc
+++ b/source/x/cldr-emoji-annotation/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-anthy/fcitx-anthy.SlackBuild b/source/x/fcitx-anthy/fcitx-anthy.SlackBuild
index f161b00f2..6c60c2043 100755
--- a/testing/source/vtown/input-methods/fcitx-anthy/fcitx-anthy.SlackBuild
+++ b/source/x/fcitx-anthy/fcitx-anthy.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-anthy
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-anthy/slack-desc b/source/x/fcitx-anthy/slack-desc
index 3bce31908..3bce31908 100644
--- a/testing/source/vtown/input-methods/fcitx-anthy/slack-desc
+++ b/source/x/fcitx-anthy/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-configtool/fcitx-configtool.SlackBuild b/source/x/fcitx-configtool/fcitx-configtool.SlackBuild
index 16d3ec5c1..666542b5f 100755
--- a/testing/source/vtown/input-methods/fcitx-configtool/fcitx-configtool.SlackBuild
+++ b/source/x/fcitx-configtool/fcitx-configtool.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-configtool
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | cut -f 2- -d _ | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-configtool/slack-desc b/source/x/fcitx-configtool/slack-desc
index 88e431f67..88e431f67 100644
--- a/testing/source/vtown/input-methods/fcitx-configtool/slack-desc
+++ b/source/x/fcitx-configtool/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-hangul/fcitx-hangul.SlackBuild b/source/x/fcitx-hangul/fcitx-hangul.SlackBuild
index 014cecfff..8a7c44449 100755
--- a/testing/source/vtown/input-methods/fcitx-hangul/fcitx-hangul.SlackBuild
+++ b/source/x/fcitx-hangul/fcitx-hangul.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-hangul
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-hangul/slack-desc b/source/x/fcitx-hangul/slack-desc
index 8ad9742b3..8ad9742b3 100644
--- a/testing/source/vtown/input-methods/fcitx-hangul/slack-desc
+++ b/source/x/fcitx-hangul/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-kkc/fcitx-kkc.SlackBuild b/source/x/fcitx-kkc/fcitx-kkc.SlackBuild
index 55a542599..bf9b746bb 100755
--- a/testing/source/vtown/input-methods/fcitx-kkc/fcitx-kkc.SlackBuild
+++ b/source/x/fcitx-kkc/fcitx-kkc.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-kkc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-kkc/slack-desc b/source/x/fcitx-kkc/slack-desc
index 3121c890c..3121c890c 100644
--- a/testing/source/vtown/input-methods/fcitx-kkc/slack-desc
+++ b/source/x/fcitx-kkc/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-libpinyin/fcitx-libpinyin.SlackBuild b/source/x/fcitx-libpinyin/fcitx-libpinyin.SlackBuild
index efb01b4b9..7b802cf4b 100755
--- a/testing/source/vtown/input-methods/fcitx-libpinyin/fcitx-libpinyin.SlackBuild
+++ b/source/x/fcitx-libpinyin/fcitx-libpinyin.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=fcitx-libpinyin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
 MODEL_VERSION=${MODEL_VERSION:-20161206}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-libpinyin/slack-desc b/source/x/fcitx-libpinyin/slack-desc
index 6f55e6dec..6f55e6dec 100644
--- a/testing/source/vtown/input-methods/fcitx-libpinyin/slack-desc
+++ b/source/x/fcitx-libpinyin/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-m17n/fcitx-m17n.SlackBuild b/source/x/fcitx-m17n/fcitx-m17n.SlackBuild
index 3cabaefa0..309a30779 100755
--- a/testing/source/vtown/input-methods/fcitx-m17n/fcitx-m17n.SlackBuild
+++ b/source/x/fcitx-m17n/fcitx-m17n.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-m17n
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-m17n/slack-desc b/source/x/fcitx-m17n/slack-desc
index 0a362c7fc..0a362c7fc 100644
--- a/testing/source/vtown/input-methods/fcitx-m17n/slack-desc
+++ b/source/x/fcitx-m17n/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-qt5/fcitx-qt5.SlackBuild b/source/x/fcitx-qt5/fcitx-qt5.SlackBuild
index 0c7a53bdb..90aa739a2 100755
--- a/testing/source/vtown/input-methods/fcitx-qt5/fcitx-qt5.SlackBuild
+++ b/source/x/fcitx-qt5/fcitx-qt5.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-qt5
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-qt5/slack-desc b/source/x/fcitx-qt5/slack-desc
index 0b4a02036..0b4a02036 100644
--- a/testing/source/vtown/input-methods/fcitx-qt5/slack-desc
+++ b/source/x/fcitx-qt5/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-sayura/fcitx-sayura.SlackBuild b/source/x/fcitx-sayura/fcitx-sayura.SlackBuild
index c962c0386..ab6bfd330 100755
--- a/testing/source/vtown/input-methods/fcitx-sayura/fcitx-sayura.SlackBuild
+++ b/source/x/fcitx-sayura/fcitx-sayura.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-sayura
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-sayura/slack-desc b/source/x/fcitx-sayura/slack-desc
index 5a277c9a6..5a277c9a6 100644
--- a/testing/source/vtown/input-methods/fcitx-sayura/slack-desc
+++ b/source/x/fcitx-sayura/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-table-extra/fcitx-table-extra.SlackBuild b/source/x/fcitx-table-extra/fcitx-table-extra.SlackBuild
index 7868f74e1..9a349d161 100755
--- a/testing/source/vtown/input-methods/fcitx-table-extra/fcitx-table-extra.SlackBuild
+++ b/source/x/fcitx-table-extra/fcitx-table-extra.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-table-extra
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-table-extra/slack-desc b/source/x/fcitx-table-extra/slack-desc
index a7dcf89f2..a7dcf89f2 100644
--- a/testing/source/vtown/input-methods/fcitx-table-extra/slack-desc
+++ b/source/x/fcitx-table-extra/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-table-other/fcitx-table-other.SlackBuild b/source/x/fcitx-table-other/fcitx-table-other.SlackBuild
index d5edc3549..2a55517e2 100755
--- a/testing/source/vtown/input-methods/fcitx-table-other/fcitx-table-other.SlackBuild
+++ b/source/x/fcitx-table-other/fcitx-table-other.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-table-other
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-table-other/slack-desc b/source/x/fcitx-table-other/slack-desc
index 3c50ceab1..3c50ceab1 100644
--- a/testing/source/vtown/input-methods/fcitx-table-other/slack-desc
+++ b/source/x/fcitx-table-other/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx-unikey/fcitx-unikey.SlackBuild b/source/x/fcitx-unikey/fcitx-unikey.SlackBuild
index a688e1e56..09fa001d1 100755
--- a/testing/source/vtown/input-methods/fcitx-unikey/fcitx-unikey.SlackBuild
+++ b/source/x/fcitx-unikey/fcitx-unikey.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx-unikey
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/fcitx-unikey/slack-desc b/source/x/fcitx-unikey/slack-desc
index 9a805566e..9a805566e 100644
--- a/testing/source/vtown/input-methods/fcitx-unikey/slack-desc
+++ b/source/x/fcitx-unikey/slack-desc
diff --git a/testing/source/vtown/input-methods/fcitx/doinst.sh b/source/x/fcitx/doinst.sh
index c9d0cf4d7..c9d0cf4d7 100644
--- a/testing/source/vtown/input-methods/fcitx/doinst.sh
+++ b/source/x/fcitx/doinst.sh
diff --git a/testing/source/vtown/input-methods/fcitx/fcitx-autostart.patch b/source/x/fcitx/fcitx-autostart.patch
index 10924fbeb..10924fbeb 100644
--- a/testing/source/vtown/input-methods/fcitx/fcitx-autostart.patch
+++ b/source/x/fcitx/fcitx-autostart.patch
diff --git a/testing/source/vtown/input-methods/fcitx/fcitx.SlackBuild b/source/x/fcitx/fcitx.SlackBuild
index 63ad00846..8c6f2116f 100755
--- a/testing/source/vtown/input-methods/fcitx/fcitx.SlackBuild
+++ b/source/x/fcitx/fcitx.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fcitx
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | cut -f 2- -d _ | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -103,7 +103,9 @@ cd build
     -DSYSCONFDIR=/etc \
     -DENABLE_GTK2_IM_MODULE=On \
     -DENABLE_GTK3_IM_MODULE=On \
-    -DENABLE_QT_IM_MODULE=On \
+    -DENABLE_QT=Off \
+    -DENABLE_QT_IM_MODULE=Off \
+    -DENABLE_QT_GUI=Off \
     -DENABLE_OPENCC=On \
     ..
   make $NUMJOBS || make || exit 1
diff --git a/testing/source/vtown/input-methods/fcitx/slack-desc b/source/x/fcitx/slack-desc
index c64bd1b50..c64bd1b50 100644
--- a/testing/source/vtown/input-methods/fcitx/slack-desc
+++ b/source/x/fcitx/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-anthy/doinst.sh b/source/x/ibus-anthy/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-anthy/doinst.sh
+++ b/source/x/ibus-anthy/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-anthy/ibus-anthy.SlackBuild b/source/x/ibus-anthy/ibus-anthy.SlackBuild
index 1ac8aa215..a414c40eb 100755
--- a/testing/source/vtown/input-methods/ibus-anthy/ibus-anthy.SlackBuild
+++ b/source/x/ibus-anthy/ibus-anthy.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-anthy
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-anthy/slack-desc b/source/x/ibus-anthy/slack-desc
index 9e99a4e7e..9e99a4e7e 100644
--- a/testing/source/vtown/input-methods/ibus-anthy/slack-desc
+++ b/source/x/ibus-anthy/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-hangul/doinst.sh b/source/x/ibus-hangul/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-hangul/doinst.sh
+++ b/source/x/ibus-hangul/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-hangul/ibus-hangul.SlackBuild b/source/x/ibus-hangul/ibus-hangul.SlackBuild
index 12f4067c2..a2bd60b58 100755
--- a/testing/source/vtown/input-methods/ibus-hangul/ibus-hangul.SlackBuild
+++ b/source/x/ibus-hangul/ibus-hangul.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-hangul
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-hangul/slack-desc b/source/x/ibus-hangul/slack-desc
index ed2969e17..ed2969e17 100644
--- a/testing/source/vtown/input-methods/ibus-hangul/slack-desc
+++ b/source/x/ibus-hangul/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-kkc/doinst.sh b/source/x/ibus-kkc/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-kkc/doinst.sh
+++ b/source/x/ibus-kkc/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-kkc/ibus-kkc.SlackBuild b/source/x/ibus-kkc/ibus-kkc.SlackBuild
index 9b9911fb4..4da48c498 100755
--- a/testing/source/vtown/input-methods/ibus-kkc/ibus-kkc.SlackBuild
+++ b/source/x/ibus-kkc/ibus-kkc.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-kkc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-kkc/slack-desc b/source/x/ibus-kkc/slack-desc
index b3492eba5..b3492eba5 100644
--- a/testing/source/vtown/input-methods/ibus-kkc/slack-desc
+++ b/source/x/ibus-kkc/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-libpinyin/doinst.sh b/source/x/ibus-libpinyin/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-libpinyin/doinst.sh
+++ b/source/x/ibus-libpinyin/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-libpinyin/ibus-libpinyin.SlackBuild b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild
index ec73dbd74..2e9446ba2 100755
--- a/testing/source/vtown/input-methods/ibus-libpinyin/ibus-libpinyin.SlackBuild
+++ b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-libpinyin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-libpinyin/slack-desc b/source/x/ibus-libpinyin/slack-desc
index 8b6870601..8b6870601 100644
--- a/testing/source/vtown/input-methods/ibus-libpinyin/slack-desc
+++ b/source/x/ibus-libpinyin/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-m17n/ibus-m17n.SlackBuild b/source/x/ibus-m17n/ibus-m17n.SlackBuild
index 26168cd72..e904c416c 100755
--- a/testing/source/vtown/input-methods/ibus-m17n/ibus-m17n.SlackBuild
+++ b/source/x/ibus-m17n/ibus-m17n.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-m17n
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-m17n/slack-desc b/source/x/ibus-m17n/slack-desc
index 4ddaf242b..4ddaf242b 100644
--- a/testing/source/vtown/input-methods/ibus-m17n/slack-desc
+++ b/source/x/ibus-m17n/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-table/doinst.sh b/source/x/ibus-table/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/input-methods/ibus-table/doinst.sh
+++ b/source/x/ibus-table/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus-table/ibus-table.SlackBuild b/source/x/ibus-table/ibus-table.SlackBuild
index ba5060100..08ca1dc1d 100755
--- a/testing/source/vtown/input-methods/ibus-table/ibus-table.SlackBuild
+++ b/source/x/ibus-table/ibus-table.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-table
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-table/slack-desc b/source/x/ibus-table/slack-desc
index 74fc53553..74fc53553 100644
--- a/testing/source/vtown/input-methods/ibus-table/slack-desc
+++ b/source/x/ibus-table/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus-unikey/gcc-6.diff b/source/x/ibus-unikey/gcc-6.diff
index 424bd74fb..424bd74fb 100644
--- a/testing/source/vtown/input-methods/ibus-unikey/gcc-6.diff
+++ b/source/x/ibus-unikey/gcc-6.diff
diff --git a/testing/source/vtown/input-methods/ibus-unikey/ibus-unikey.SlackBuild b/source/x/ibus-unikey/ibus-unikey.SlackBuild
index 90ffb17ee..6da27fdb5 100755
--- a/testing/source/vtown/input-methods/ibus-unikey/ibus-unikey.SlackBuild
+++ b/source/x/ibus-unikey/ibus-unikey.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus-unikey
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus-unikey/slack-desc b/source/x/ibus-unikey/slack-desc
index 36d347a7d..36d347a7d 100644
--- a/testing/source/vtown/input-methods/ibus-unikey/slack-desc
+++ b/source/x/ibus-unikey/slack-desc
diff --git a/testing/source/vtown/input-methods/ibus/Blocks.txt b/source/x/ibus/Blocks.txt
index a4f851b14..a4f851b14 100644
--- a/testing/source/vtown/input-methods/ibus/Blocks.txt
+++ b/source/x/ibus/Blocks.txt
diff --git a/testing/source/vtown/input-methods/ibus/NamesList.txt b/source/x/ibus/NamesList.txt
index ebfd93919..ebfd93919 100644
--- a/testing/source/vtown/input-methods/ibus/NamesList.txt
+++ b/source/x/ibus/NamesList.txt
diff --git a/testing/source/vtown/input-methods/ibus/doinst.sh b/source/x/ibus/doinst.sh
index 23c5addd6..23c5addd6 100644
--- a/testing/source/vtown/input-methods/ibus/doinst.sh
+++ b/source/x/ibus/doinst.sh
diff --git a/testing/source/vtown/input-methods/ibus/emoji-test.txt b/source/x/ibus/emoji-test.txt
index ed3541dc2..ed3541dc2 100644
--- a/testing/source/vtown/input-methods/ibus/emoji-test.txt
+++ b/source/x/ibus/emoji-test.txt
diff --git a/testing/source/vtown/input-methods/ibus/ibus-autostart b/source/x/ibus/ibus-autostart
index 4f274335a..4f274335a 100644
--- a/testing/source/vtown/input-methods/ibus/ibus-autostart
+++ b/source/x/ibus/ibus-autostart
diff --git a/testing/source/vtown/input-methods/ibus/ibus-autostart-plasma.desktop b/source/x/ibus/ibus-autostart-plasma.desktop
index 981418619..981418619 100644
--- a/testing/source/vtown/input-methods/ibus/ibus-autostart-plasma.desktop
+++ b/source/x/ibus/ibus-autostart-plasma.desktop
diff --git a/testing/source/vtown/input-methods/ibus/ibus-autostart.desktop b/source/x/ibus/ibus-autostart.desktop
index e77a639bb..e77a639bb 100644
--- a/testing/source/vtown/input-methods/ibus/ibus-autostart.desktop
+++ b/source/x/ibus/ibus-autostart.desktop
diff --git a/testing/source/vtown/input-methods/ibus/ibus.SlackBuild b/source/x/ibus/ibus.SlackBuild
index 2df202c35..77457f354 100755
--- a/testing/source/vtown/input-methods/ibus/ibus.SlackBuild
+++ b/source/x/ibus/ibus.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/ibus/ibus.url b/source/x/ibus/ibus.url
index 05ed7824f..05ed7824f 100644
--- a/testing/source/vtown/input-methods/ibus/ibus.url
+++ b/source/x/ibus/ibus.url
diff --git a/testing/source/vtown/input-methods/ibus/slack-desc b/source/x/ibus/slack-desc
index eb1862c0e..eb1862c0e 100644
--- a/testing/source/vtown/input-methods/ibus/slack-desc
+++ b/source/x/ibus/slack-desc
diff --git a/testing/source/vtown/input-methods/libgee/libgee.SlackBuild b/source/x/libgee/libgee.SlackBuild
index 6c9806dc0..832fa2233 100755
--- a/testing/source/vtown/input-methods/libgee/libgee.SlackBuild
+++ b/source/x/libgee/libgee.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libgee
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/libgee/slack-desc b/source/x/libgee/slack-desc
index 50a1a339e..50a1a339e 100644
--- a/testing/source/vtown/input-methods/libgee/slack-desc
+++ b/source/x/libgee/slack-desc
diff --git a/testing/source/vtown/input-methods/libkkc-data/libkkc-data.SlackBuild b/source/x/libkkc-data/libkkc-data.SlackBuild
index accbb406b..c7d79fc24 100755
--- a/testing/source/vtown/input-methods/libkkc-data/libkkc-data.SlackBuild
+++ b/source/x/libkkc-data/libkkc-data.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libkkc-data
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/libkkc-data/slack-desc b/source/x/libkkc-data/slack-desc
index 45f13c9c0..45f13c9c0 100644
--- a/testing/source/vtown/input-methods/libkkc-data/slack-desc
+++ b/source/x/libkkc-data/slack-desc
diff --git a/testing/source/vtown/input-methods/libkkc/libkkc.SlackBuild b/source/x/libkkc/libkkc.SlackBuild
index 27d69c4aa..47713ebbc 100755
--- a/testing/source/vtown/input-methods/libkkc/libkkc.SlackBuild
+++ b/source/x/libkkc/libkkc.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libkkc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/libkkc/slack-desc b/source/x/libkkc/slack-desc
index 402328e58..402328e58 100644
--- a/testing/source/vtown/input-methods/libkkc/slack-desc
+++ b/source/x/libkkc/slack-desc
diff --git a/testing/source/vtown/input-methods/libpinyin/libpinyin.SlackBuild b/source/x/libpinyin/libpinyin.SlackBuild
index 5abd7eaea..3ca1ddf25 100755
--- a/testing/source/vtown/input-methods/libpinyin/libpinyin.SlackBuild
+++ b/source/x/libpinyin/libpinyin.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=libpinyin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
 MODEL_VERSION=${MODEL_VERSION:-17}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/libpinyin/modelxx.text.url b/source/x/libpinyin/modelxx.text.url
index 4225c3858..4225c3858 100644
--- a/testing/source/vtown/input-methods/libpinyin/modelxx.text.url
+++ b/source/x/libpinyin/modelxx.text.url
diff --git a/testing/source/vtown/input-methods/libpinyin/slack-desc b/source/x/libpinyin/slack-desc
index 118619fe2..118619fe2 100644
--- a/testing/source/vtown/input-methods/libpinyin/slack-desc
+++ b/source/x/libpinyin/slack-desc
diff --git a/testing/source/vtown/input-methods/marisa/marisa.SlackBuild b/source/x/marisa/marisa.SlackBuild
index 071802646..e2c19ff98 100755
--- a/testing/source/vtown/input-methods/marisa/marisa.SlackBuild
+++ b/source/x/marisa/marisa.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=marisa
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/input-methods/marisa/slack-desc b/source/x/marisa/slack-desc
index 09d41ac2b..09d41ac2b 100644
--- a/testing/source/vtown/input-methods/marisa/slack-desc
+++ b/source/x/marisa/slack-desc
diff --git a/source/x/motif/motif.SlackBuild b/source/x/motif/motif.SlackBuild
index 99ab20a3a..e7f6f0052 100755
--- a/source/x/motif/motif.SlackBuild
+++ b/source/x/motif/motif.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=motif
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2 -d - | cut -f 1-3 -d .)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -127,6 +127,11 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Include mwm xinitrc
+mkdir -p $PKG/etc/X11/xinit
+zcat $CWD/xinitrc.mwm.gz > $PKG/etc/X11/xinit/xinitrc.mwm
+chmod 0755 $PKG/etc/X11/xinit/xinitrc.mwm
+
 # This conflicts with a perl manpage:
 mv $PKG/usr/man/man3/Shell.3 $PKG/usr/man/man3/omShell.3
 
diff --git a/source/kde/post-install/kde-workspace/xinit/xinitrc.kde b/source/x/motif/xinitrc.mwm
index a33eb06cf..00de7396b 100644
--- a/source/kde/post-install/kde-workspace/xinit/xinitrc.kde
+++ b/source/x/motif/xinitrc.mwm
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
@@ -24,9 +23,11 @@ if [ -f $usermodmap ]; then
     xmodmap $usermodmap
 fi
 
-# Start the window manager:
-if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
-    ck-launch-session startkde
-else
-    startkde
+# Start DBUS session bus:
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+   eval $(dbus-launch --sh-syntax --exit-with-session)
 fi
+
+# Start the window manager:
+exec /usr/bin/mwm
+
diff --git a/source/x/scim-anthy/scim-anthy.SlackBuild b/source/x/scim-anthy/scim-anthy.SlackBuild
deleted file mode 100755
index c8d0e28bf..000000000
--- a/source/x/scim-anthy/scim-anthy.SlackBuild
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:         Eric Hameleers <alien@slackware.com>
-# For:        scim-anthy
-# Descr:      a SCIM IMEngine module for anthy
-# URL:        http://scim-imengine.sourceforge.jp/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-anthy
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-
-zcat $CWD/scim-anthy.gcc43.diff.gz | patch -p1 --verbose || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CXXFLAGS="$SLKCFLAGS -fpermissive -fno-delete-null-pointer-checks -std=gnu++98" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog DIARY INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \+
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-anthy/scim-anthy.gcc43.diff b/source/x/scim-anthy/scim-anthy.gcc43.diff
deleted file mode 100644
index 14606dd7d..000000000
--- a/source/x/scim-anthy/scim-anthy.gcc43.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_kana.cpp scim-anthy-1.2.4/src/scim_anthy_kana.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_kana.cpp	2006-07-13 02:41:51.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_kana.cpp	2009-06-09 20:40:41.000000000 -0500
-@@ -23,6 +23,8 @@
- #include "scim_anthy_default_tables.h"
- #include "scim_anthy_utils.h"
- 
-+#include <cstring>
-+
- using namespace scim_anthy;
- 
- static bool
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_preedit.cpp scim-anthy-1.2.4/src/scim_anthy_preedit.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_preedit.cpp	2006-07-23 20:56:00.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_preedit.cpp	2009-06-09 20:41:03.000000000 -0500
-@@ -26,6 +26,8 @@
- #include "scim_anthy_preedit.h"
- #include "scim_anthy_utils.h"
- 
-+#include <cstring>
-+
- using namespace scim_anthy;
- 
- static ConvRule *get_period_rule              (TypingMethod method,
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_prefs.cpp scim-anthy-1.2.4/src/scim_anthy_prefs.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_prefs.cpp	2006-07-23 20:56:00.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_prefs.cpp	2009-06-09 20:41:40.000000000 -0500
-@@ -23,6 +23,8 @@
- #include "scim_anthy_prefs.h"
- #include "scim_anthy_intl.h"
- 
-+#include <cstring>
-+
- namespace scim_anthy {
- 
- BoolConfigData config_bool_common [] =
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_setup.cpp scim-anthy-1.2.4/src/scim_anthy_setup.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_setup.cpp	2007-05-21 03:22:20.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_setup.cpp	2009-06-09 20:42:01.000000000 -0500
-@@ -30,6 +30,8 @@
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- 
-+#include <cstring>
-+
- #define Uses_SCIM_CONFIG_BASE
- #define Uses_SCIM_EVENT
- #define SCIM_ANTHY_USE_GTK
-diff -u -r scim-anthy-1.2.4.orig/src/scim_anthy_utils.cpp scim-anthy-1.2.4/src/scim_anthy_utils.cpp
---- scim-anthy-1.2.4.orig/src/scim_anthy_utils.cpp	2007-03-28 02:42:10.000000000 -0500
-+++ scim-anthy-1.2.4/src/scim_anthy_utils.cpp	2009-06-09 20:41:22.000000000 -0500
-@@ -24,6 +24,8 @@
- #include "scim_anthy_utils.h"
- #include "scim_anthy_default_tables.h"
- 
-+#include <cstring>
-+
- namespace scim_anthy {
- 
- bool
diff --git a/source/x/scim-anthy/slack-desc b/source/x/scim-anthy/slack-desc
deleted file mode 100644
index 996d185f2..000000000
--- a/source/x/scim-anthy/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-          |-----handy-ruler------------------------------------------------------|
-scim-anthy: scim-anthy (a SCIM IMEngine module for anthy)
-scim-anthy:
-scim-anthy: SCIM is Smart Common Input Method platform, it provides a user
-scim-anthy: friendly and full featured user interface and development platform to
-scim-anthy: make input method developer's lives easier. Anthy is a system for
-scim-anthy: Japanese input method. It converts Hiragana text to Kana Kanji
-scim-anthy: mixed text.
-scim-anthy:
-scim-anthy: Homepage: http://scim-imengine.sourceforge.jp/
-scim-anthy:
-scim-anthy:
diff --git a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.3.patch b/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.3.patch
deleted file mode 100644
index b7698793a..000000000
--- a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up scim-hangul-0.3.2/src/scim_hangul_imengine.cpp.gcc43~ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp
---- scim-hangul-0.3.2/src/scim_hangul_imengine.cpp.gcc43~	2008-01-13 08:01:34.000000000 +0000
-+++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp	2008-01-13 08:01:34.000000000 +0000
-@@ -29,6 +29,7 @@
- #define Uses_SCIM_LOOKUP_TABLE
- #define Uses_SCIM_CONFIG_BASE
- 
-+#include <cstring>
- #ifdef HAVE_CONFIG_H
-   #include <config.h>
- #endif
-diff -up scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp.gcc43~ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp
---- scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp.gcc43~	2008-01-13 08:01:37.000000000 +0000
-+++ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp	2008-01-13 08:01:37.000000000 +0000
-@@ -28,7 +28,8 @@
- 
- #define Uses_SCIM_CONFIG_BASE
- 
-+#include <cstring>
- #include <gtk/gtk.h>
- 
- #ifdef HAVE_CONFIG_H
- 
diff --git a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.7.patch b/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.7.patch
deleted file mode 100644
index 918de9e11..000000000
--- a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/scim_hangul_imengine.cpp b/src/scim_hangul_imengine.cpp
-index 7d70654..d678902 100644
---- a/src/scim_hangul_imengine.cpp
-+++ b/src/scim_hangul_imengine.cpp
-@@ -30,6 +30,7 @@
- #define Uses_SCIM_CONFIG_BASE
- 
- #include <cstring>
-+#include <unistd.h>
- #ifdef HAVE_CONFIG_H
-   #include <config.h>
- #endif
diff --git a/source/x/scim-hangul/scim-hangul-0.4.0+gtk.patch b/source/x/scim-hangul/scim-hangul-0.4.0+gtk.patch
deleted file mode 100644
index bc1fd4b67..000000000
--- a/source/x/scim-hangul/scim-hangul-0.4.0+gtk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/scim_hangul_imengine_setup.cpp.orig	2012-07-08 07:52:07.000000000 -0400
-+++ src/scim_hangul_imengine_setup.cpp	2012-11-02 14:13:14.000000000 -0400
-@@ -346,7 +346,7 @@
-     for (i = 0; i < n; i++) {
- 	const char* name = hangul_ic_get_keyboard_name(i);
- #if GTK_CHECK_VERSION(2, 24, 0)
--	gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combo_box), NULL, name);
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), name);
- #else
- 	gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), name);
- #endif
diff --git a/source/x/scim-hangul/scim-hangul.SlackBuild b/source/x/scim-hangul/scim-hangul.SlackBuild
deleted file mode 100755
index 42edf85b2..000000000
--- a/source/x/scim-hangul/scim-hangul.SlackBuild
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:         Eric Hameleers <alien@slackware.com>
-# For:        scim-hangul
-# Descr:      SCIM IMengine for Hangul
-# URL:        http://www.scim-im.org/projects/imengines
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-hangul
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-
-zcat $CWD/scim-hangul-0.3.2+gcc-4.3.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/scim-hangul-0.3.2+gcc-4.7.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/scim-hangul-0.4.0+gtk.patch.gz | patch -p0 --verbose || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING NEWS README ChangeLog \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \+
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-hangul/slack-desc b/source/x/scim-hangul/slack-desc
deleted file mode 100644
index 51350382c..000000000
--- a/source/x/scim-hangul/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-scim-hangul: scim-hangul (SCIM IMengine for Hangul)
-scim-hangul:
-scim-hangul: Scim-hangul is a SCIM IMEngine module for inputing korean scripts.
-scim-hangul: Scim-hangul is for native speakers, not for foreigners. If you don't
-scim-hangul: want to learn Korean keyboard layout, use scim-tables. This engine
-scim-hangul: supports 2 beolsik, 3 beolsik final, 3 beolsik 390, 3 beolsik,
-scim-hangul: no-shift and etc. You can input Chinese characters (hanja) with F9 key
-scim-hangul: when you a have preedit string.
-scim-hangul:
-scim-hangul: Homepage: http://sourceforge.net/projects/scim
-scim-hangul:
diff --git a/source/x/scim-input-pad/scim-input-pad.SlackBuild b/source/x/scim-input-pad/scim-input-pad.SlackBuild
deleted file mode 100755
index af8a31b82..000000000
--- a/source/x/scim-input-pad/scim-input-pad.SlackBuild
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-
-# Copyright 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-input-pad
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-# Fix location of scim-helper-launcher:
-sed -i -e "s#/usr/lib${LIBDIRSUFFIX}/scim-.*/scim-helper-launcher#$(ls /usr/lib${LIBDIRSUFFIX}/scim-*/scim-helper-launcher)#" $PKG/usr/bin/scim-input-pad
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
-
-# Strip binaries:
-cd $PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-input-pad/slack-desc b/source/x/scim-input-pad/slack-desc
deleted file mode 100644
index cc178761a..000000000
--- a/source/x/scim-input-pad/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-scim-input-pad: scim-input-pad (on-screen input pad for scim)
-scim-input-pad:
-scim-input-pad: This is scim-input-pad, which provides an on-screen input pad to enter
-scim-input-pad: symbols and Chinese characters.
-scim-input-pad:
-scim-input-pad: Homepage: http://sourceforge.net/projects/scim
-scim-input-pad:
-scim-input-pad:
-scim-input-pad:
-scim-input-pad:
-scim-input-pad:
diff --git a/source/x/scim-m17n/scim-m17n.SlackBuild b/source/x/scim-m17n/scim-m17n.SlackBuild
deleted file mode 100755
index f37a76e45..000000000
--- a/source/x/scim-m17n/scim-m17n.SlackBuild
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script 
-# ===========================
-# By:         Eric Hameleers <alien@slackware.com>
-# For:        scim-m17n
-# Descr:      bridge IMengine to support m17n input methods in SCIM
-# URL:        http://scim-im.org/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-m17n
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-find $PKG/usr/doc -type f -exec chmod 644 {} \+
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Compress info pages and remove the package's dir file:
-if [ -d $PKG/usr/info ]; then
-  rm -rf $PKG/usr/info/dir
-  gzip -9f $PKG/usr/info/*.info*
-fi
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-m17n/slack-desc b/source/x/scim-m17n/slack-desc
deleted file mode 100644
index 96b9d5188..000000000
--- a/source/x/scim-m17n/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-         |-----handy-ruler------------------------------------------------------|
-scim-m17n: scim-m17n (bridge IMengine to support m17n input methods in SCIM)
-scim-m17n:
-scim-m17n: SCIM is a developing platform to significantly reduce the difficulty
-scim-m17n: of input method development. scim-m17n is a SCIM IMEngine module
-scim-m17n: which uses the m17n library as the backend.
-scim-m17n:
-scim-m17n: Homepage: http://sourceforge.net/projects/scim
-scim-m17n:
-scim-m17n:
-scim-m17n:
-scim-m17n:
diff --git a/source/x/scim-pinyin/scim-pinyin.SlackBuild b/source/x/scim-pinyin/scim-pinyin.SlackBuild
deleted file mode 100755
index c7b897a58..000000000
--- a/source/x/scim-pinyin/scim-pinyin.SlackBuild
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:        Eric Hameleers <alien@slackware.com>
-# For:       scim-pinyin
-# Descr:     smart pinyin IM engine for scim
-# URL:       http://www.scim-im.org/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-pinyin
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --program-prefix="" \
-  --program-suffix="" \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-pinyin/slack-desc b/source/x/scim-pinyin/slack-desc
deleted file mode 100644
index 32dc733d7..000000000
--- a/source/x/scim-pinyin/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-scim-pinyin: scim-pinyin (smart pinyin IM engine)
-scim-pinyin:
-scim-pinyin: This package provides a smart pinyin IM engine for SCIM. It includes
-scim-pinyin: the plugin modules and the data files to use the smart pinyin input
-scim-pinyin: input method for Chinese.
-scim-pinyin:
-scim-pinyin: Homepage: http://sourceforge.net/projects/scim
-scim-pinyin:
-scim-pinyin:
-scim-pinyin:
-scim-pinyin:
diff --git a/source/x/scim-tables/scim-tables.SlackBuild b/source/x/scim-tables/scim-tables.SlackBuild
deleted file mode 100755
index 5d97b3c6a..000000000
--- a/source/x/scim-tables/scim-tables.SlackBuild
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-# Copyright 2007  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:        Eric Hameleers <alien@slackware.com>
-# For:       scim-tables
-# Descr:     tables IMEngine for scim
-# URL:       http://www.scim-im.org/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim-tables
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-
-./bootstrap
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --disable-static \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
-
-# Compress the man page(s):
-if [ -d $PKG/usr/man ]; then
-  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+
-  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-fi
-
-# Strip binaries:
-cd $PKG
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim-tables/slack-desc b/source/x/scim-tables/slack-desc
deleted file mode 100644
index 963b509a9..000000000
--- a/source/x/scim-tables/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-           |-----handy-ruler------------------------------------------------------|
-scim-tables: scim-tables (tables IMEngine for scim)
-scim-tables:
-scim-tables: This is scim-tables IMEngine, which provides many CJK input methods.
-scim-tables:
-scim-tables: Homepage: http://sourceforge.net/projects/scim
-scim-tables:
-scim-tables:
-scim-tables:
-scim-tables:
-scim-tables:
-scim-tables:
diff --git a/source/x/scim/scim-setup.desktop b/source/x/scim/scim-setup.desktop
deleted file mode 100644
index a236ef291..000000000
--- a/source/x/scim/scim-setup.desktop
+++ /dev/null
@@ -1,28 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=SCIM Input Method Setup
-Name[cs]=Nastavení vstupní metody SCIM
-Name[de]=Einstellungen der SCIM-Eingabemethoden
-Name[fr]=Configuration de la Méthode de Saisie SCIM
-Name[it]=Configurazione del metodo di inserimento SCIM
-Name[ja]=SCIM入力メソッドの設定
-Name[ko]=SCIM 입력기 설정
-Name[pa]=SCIM ਇੰਪੁੱਟ ਢੰਗ ਸੈਟਅੱਪ
-Name[zh_CN]=SCIM 输入法设置
-Name[zh_TW]=SCIM 輸入法設定
-Comment=Setup utility for Smart Common Input Method platform
-Comment[cs]=Nástroj pro nastavení Smart Common Input Method platformy
-Comment[de]=Einrichtungswerkzeug für die Smart Common Input Method-Plattform
-Comment[fr]=Utilitaire de configuration de la plateforme "Smart Common Input Method"
-Comment[it]=Programma di configurazione per il metodo inserimento comune intelligente
-Comment[ja]=Smart Common Input Method platform セットアップユーティリティ
-Comment[ko]=똑똑한 공통 입력 방법 (SCIM)을 위한 설정 프로그램
-Comment[pa]=ਸਮਾਰਟ ਕਾਮਨ ਇੰਪੁੱਟ ਮੈਂਥਸਡ ਪਲੇਟਫਾਰਮ ਲਈ ਸੈਟਅੱਪ ਸਹੂਲਤ
-Comment[zh_CN]=智能通用输入法平台的设置工具
-Comment[zh_TW]=泛用智慧型輸入法平台的設定工具
-Exec=scim-setup
-Icon=/usr/share/pixmaps/scim-setup.png
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Applications;Settings;
diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild
deleted file mode 100755
index 5a44795d7..000000000
--- a/source/x/scim/scim.SlackBuild
+++ /dev/null
@@ -1,261 +0,0 @@
-#!/bin/bash
-
-# Copyright 2006, 2007, 2008  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2018  Patrick J. Volkerding, Sebeka, MN  USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# -----------------------------------------------------------------------------
-#
-# Slackware SlackBuild script
-# ===========================
-# By:        Eric Hameleers <alien@slackware.com>
-# For:       scim
-# Descr:     Smart Common Input Method platform
-# URL:       http://www.scim-im.org/
-#
-# -----------------------------------------------------------------------------
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=scim
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
-    i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *) ARCH=$(uname -m) ;;
-  esac
-  export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z || exit 1
-cd ${PKGNAM}-${VERSION} || exit 1
-
-./bootstrap
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-echo Building ...
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -fpermissive -fno-delete-null-pointer-checks -std=gnu++98" \
-./configure --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-static \
-  --with-gtk-version=2 \
-  --with-qt4-im-module-dir=/usr/lib${LIBDIRSUFFIX}/qt/plugins/inputmethods \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-# Add a profile script that sets up the environment:
-mkdir -p $PKG/etc/profile.d
-
-cat <<EOT > $PKG/etc/profile.d/scim.sh.new
-#!/bin/bash
-
-# SCIM (Smart Common Input Method platform).  This is used to support the
-# entering of text in non-US-English languages.
-
-# For SCIM to work, you need to use a UTF-8 locale.  Make sure it ends on
-# ".UTF-8", not "utf-8"!  As an example, you would need to use en_US.UTF-8
-# for a US locale (export LANG=en_US.UTF-8), not en_US.
-#
-# The locale (LANG variable) is set in /etc/profile.d/lang.sh.
-
-if [ -x /usr/bin/scim ]; then
-  # Enable legacy X applications to use scim:
-  export XMODIFIERS="@im=SCIM"
-  # Let GTK applications like Firefox/Thunderbird use scim as
-  # default immodule:
-  export GTK_IM_MODULE="scim"
-  # Enable Qt/KDE applications to use scim:
-  export QT_IM_MODULE="scim"
-  # Make scim start automatically if the "magic key" Ctrl-Space is pressed:
-  export XIM_PROGRAM="/usr/bin/scim -d"
-fi
-
-# This ensures scim starts when you logon.
-# This will only work if you login through runlevel 4 (graphical login)!!!
-# Better is to have it start through Ctrl-Space like configured higher up ^^.
-#if [ ! \`ls /tmp/scim-socket*\` ]; then
-#  /usr/bin/scim -d
-#fi
-
-EOT
-
-cat <<EOT > $PKG/etc/profile.d/scim.csh.new
-#!/bin/csh
-
-# SCIM (Smart Common Input Method platform).  This is used to support the
-# entering of text in non-US-English languages.
-
-# For SCIM to work, you need to use a UTF-8 locale.  Make sure it ends on
-# ".UTF-8", not "utf-8"!  As an example, you would need to use en_US.UTF-8
-# for a US locale (setenv LANG en_US.UTF-8), not en_US.
-#
-# The locale (LANG variable) is set in /etc/profile.d/lang.csh.
-
-[ -x /usr/bin/scim ]
-if (\$status == 0) then
-  # Enable legacy X applications to use scim:
-  setenv XMODIFIERS "@im=SCIM"
-  # Let GTK applications like Firefox/Thunderbird use scim as
-  # default immodule:
-  setenv GTK_IM_MODULE "scim"
-  # Enable Qt/KDE applications to use scim (does not work for kde4):
-  setenv QT_IM_MODULE "scim"
-  # Make scim start automatically if the "magic key" Ctrl-Space is pressed:
-  setenv XIM_PROGRAM "/usr/bin/scim -d"
-endif
-
-# This ensures scim starts when you logon.
-# This will only work if you login through runlevel 4 (graphical login)!!!
-# Better is to have it start through Ctrl-Space like configured higher up ^^.
-#[ ! \`ls /tmp/scim-socket*\` ]
-#if (\$status == 0) then
-#  /usr/bin/scim -d
-#endif
-
-EOT
-
-chmod 755 $PKG/etc/profile.d/scim.sh.new
-chmod 755 $PKG/etc/profile.d/scim.csh.new
-
-mkdir -p $PKG/usr/share/applications
-cat $CWD/scim.desktop > $PKG/usr/share/applications/scim.desktop
-cat $CWD/scim-setup.desktop > $PKG/usr/share/applications/scim-setup.desktop
-
-# Protect config files from being overwritten:
-mv $PKG/etc/scim/config{,.new}
-mv $PKG/etc/scim/global{,.new}
-
-# Add this to the doinst.sh
-mkdir -p $PKG/install
-cat <<EOINS >> $PKG/install/doinst.sh
-
-# Handle the incoming configuration files:
-config() {
-  for infile in \$1; do
-    NEW="\$infile"
-    OLD="\`dirname \$NEW\`/\`basename \$NEW .new\`"
-    # If there's no config file by that name, mv it over:
-    if [ ! -r \$OLD ]; then
-      mv \$NEW \$OLD
-    elif [ "\`cat \$OLD | md5sum\`" = "\`cat \$NEW | md5sum\`" ]; then
-      # toss the redundant copy
-      rm \$NEW
-    fi
-    # Otherwise, we leave the .new copy for the admin to consider...
-  done
-}
-
-# Prepare the new configuration files
-for file in etc/scim/config.new etc/scim/global.new etc/profile.d/scim.sh.new etc/profile.d/scim.csh.new ; do
-  if [ -e \$(dirname \$file)/\$(basename \$file .new) -a -x \$(dirname \$file)/\$(basename \$file .new) ]; then
-    chmod 755 \$file
-  else
-    chmod 644 \$file
-  fi
-  config \$file
-done
-
-# Run gtk-query-immodules so that "scim" will appear under Imput Method
-# when you right- click your mouse in a text box.
-if [ -x /usr/bin/update-gtk-immodules ]; then
-  /usr/bin/update-gtk-immodules
-fi
-
-EOINS
-
-# Add documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures
-cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-# Install documentation and user manual
-cp -a docs/manual/zh_CN/user-manual.html \
-  $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/
-cp -a docs/manual/zh_CN/figures/*.png \
-   $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures/
-
-# Strip binaries:
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Add a package description:
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
-
diff --git a/source/x/scim/scim.desktop b/source/x/scim/scim.desktop
deleted file mode 100644
index 7aacbcc05..000000000
--- a/source/x/scim/scim.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Comment=Start the Smart Common Input Method platform
-Comment[zh_CN]=
-Encoding=UTF-8
-Exec=scim -d
-GenericName=
-GenericName[zh_CN]=
-Icon=/usr/share/pixmaps/scim-setup.png
-MimeType=
-Name=SCIM (Smart Common Input Method) startup
-Name[zh_CN]=
-Path=
-StartupNotify=true
-Terminal=false
-TerminalOptions=
-Type=Application
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-Categories=Applications;Utility;
diff --git a/source/x/scim/scim.url b/source/x/scim/scim.url
deleted file mode 100644
index 53c5f816d..000000000
--- a/source/x/scim/scim.url
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/scim-im/scim
diff --git a/source/x/scim/slack-desc b/source/x/scim/slack-desc
deleted file mode 100644
index 931c9a30b..000000000
--- a/source/x/scim/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-    |-----handy-ruler------------------------------------------------------|
-scim: scim (Smart Common Input Method platform)
-scim:
-scim: SCIM is an input platform for CJK and other languages. It aims to
-scim: significantly reduce the difficulty of input method development.
-scim:
-scim: See the scim scripts in /etc/profile.d/ for setup info.
-scim:
-scim: Homepage: http://sourceforge.net/projects/scim
-scim:
-scim:
-scim:
diff --git a/testing/source/vtown/input-methods/skkdic/README-skkdic.rh.ja b/source/x/skkdic/README-skkdic.rh.ja
index 843d45fc8..843d45fc8 100644
--- a/testing/source/vtown/input-methods/skkdic/README-skkdic.rh.ja
+++ b/source/x/skkdic/README-skkdic.rh.ja
diff --git a/testing/source/vtown/input-methods/skkdic/skkdic.SlackBuild b/source/x/skkdic/skkdic.SlackBuild
index ef64f436f..9c219ba5f 100755
--- a/testing/source/vtown/input-methods/skkdic/skkdic.SlackBuild
+++ b/source/x/skkdic/skkdic.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=skkdic
 SRCVER=${SRCVER:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
 VERSION=${VERSION:-$(echo $SRCVER | cut -f 1 -d 'T')}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 ARCH=noarch
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/testing/source/vtown/input-methods/skkdic/skkdic.url b/source/x/skkdic/skkdic.url
index c22ca5604..c22ca5604 100644
--- a/testing/source/vtown/input-methods/skkdic/skkdic.url
+++ b/source/x/skkdic/skkdic.url
diff --git a/testing/source/vtown/input-methods/skkdic/slack-desc b/source/x/skkdic/slack-desc
index 4b951f669..4b951f669 100644
--- a/testing/source/vtown/input-methods/skkdic/slack-desc
+++ b/source/x/skkdic/slack-desc
diff --git a/testing/source/vtown/input-methods/skkdic/unannotation.awk b/source/x/skkdic/unannotation.awk
index 221660640..221660640 100644
--- a/testing/source/vtown/input-methods/skkdic/unannotation.awk
+++ b/source/x/skkdic/unannotation.awk
diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm
index f599e28b8..b4de39476 100644
--- a/source/x/x11/build/xdm
+++ b/source/x/x11/build/xdm
@@ -1 +1 @@
-10
+11
diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch
index 37be22286..936bf1ca4 100644
--- a/source/x/x11/patch/xdm.patch
+++ b/source/x/x11/patch/xdm.patch
@@ -4,5 +4,3 @@ zcat $CWD/patch/xdm/xdm-1.1.11-arc4random-include.patch.gz | patch -p1 --verbose
   { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 zcat $CWD/patch/xdm/xdm-1.1.11-setproctitle-include.patch.gz | patch -p1 --verbose || \
   { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xdm/xdm-consolekit.patch.gz | patch -p1 --verbose || \
-  { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xdm/xdm-consolekit.patch b/source/x/x11/patch/xdm/xdm-consolekit.patch
deleted file mode 100644
index fbacd36fc..000000000
--- a/source/x/x11/patch/xdm/xdm-consolekit.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-http://bugs.gentoo.org/360987
-http://projects.archlinux.org/svntogit/packages.git/plain/trunk/xdm-consolekit.patch?h=packages/xorg-xdm
-http://lists.x.org/archives/xorg-devel/2011-February/019615.html
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615020
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -362,6 +362,20 @@
-
- AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
-
-+# ConsoleKit support
-+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
-+	[USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
-+if test x"$USE_CONSOLEKIT" != xno; then
-+	PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
-+		[USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
-+	if test x"$USE_CONSOLEKIT" = xyes; then
-+		AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
-+		XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
-+		XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
-+	fi
-+fi
-+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
-+
- #
- #  XDM
- #
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -66,6 +66,11 @@
- #endif
- #endif /* USE_PAM */
-
-+#ifdef USE_CONSOLEKIT
-+#include <ck-connector.h>
-+#include <dbus/dbus.h>
-+#endif
-+
- #ifdef __SCO__
- #include <prot.h>
- #endif
-@@ -472,6 +477,97 @@
-     }
- }
-
-+#ifdef USE_CONSOLEKIT
-+
-+static CkConnector *connector;
-+
-+static int openCKSession(struct verify_info *verify, struct display *d)
-+{
-+    int ret;
-+    DBusError error;
-+    char  *remote_host_name = "";
-+    dbus_bool_t is_local;
-+    char *display_name = "";
-+    char *display_device = "";
-+    char devtmp[16];
-+
-+    if (!use_consolekit)
-+	return 1;
-+
-+    is_local = d->displayType.location == Local;
-+    if (d->peerlen > 0 && d->peer)
-+	remote_host_name = d->peer;
-+    if (d->name)
-+	display_name = d->name;
-+    /* how can we get the corresponding tty at best...? */
-+    if (d->windowPath) {
-+	display_device = strchr(d->windowPath, ':');
-+	if (display_device && display_device[1])
-+	    display_device++;
-+	else
-+	    display_device = d->windowPath;
-+	snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
-+	display_device = devtmp;
-+    }
-+
-+    connector = ck_connector_new();
-+    if (!connector) {
-+	LogOutOfMem("ck_connector");
-+	return 0;
-+    }
-+
-+    dbus_error_init(&error);
-+    ret = ck_connector_open_session_with_parameters(
-+		connector, &error,
-+		"unix-user", &verify->uid,
-+		"x11-display", &display_name,
-+		"x11-display-device", &display_device,
-+		"remote-host-name", &remote_host_name,
-+		"is-local", &is_local,
-+		NULL);
-+    if (!ret) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+	ck_connector_unref(connector);
-+	connector = NULL;
-+	return 0;
-+    }
-+
-+    verify->userEnviron = setEnv(verify->userEnviron,
-+		"XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
-+    return 1;
-+}
-+
-+static void closeCKSession(void)
-+{
-+    DBusError error;
-+
-+    if (!connector)
-+	return;
-+
-+    dbus_error_init(&error);
-+    if (!ck_connector_close_session(connector, &error)) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit close error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+    }
-+    ck_connector_unref(connector);
-+    connector = NULL;
-+}
-+#else
-+#define openCKSession(v,d)	1
-+#define closeCKSession()
-+#endif
-+
- void
- SessionExit (struct display *d, int status, int removeAuth)
- {
-@@ -486,6 +580,8 @@
-     }
- #endif
-
-+    closeCKSession();
-+
-     /* make sure the server gets reset after the session is over */
-     if (d->serverPid >= 2 && d->resetSignal)
-	kill (d->serverPid, d->resetSignal);
-@@ -568,6 +664,10 @@
- #ifdef USE_PAM
-     if (pamh) pam_open_session(pamh, 0);
- #endif
-+
-+    if (!openCKSession(verify, d))
-+	return 0;
-+
-     switch (pid = fork ()) {
-     case 0:
-	CleanUpChild ();
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -325,6 +325,9 @@
- extern char	*prngdSocket;
- extern int	prngdPort;
- # endif
-+#ifdef USE_CONSOLEKIT
-+extern int	use_consolekit;
-+#endif
-
- extern char	*greeterLib;
- extern char	*willing;
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -68,6 +68,9 @@
- char	*prngdSocket;
- int	prngdPort;
- #endif
-+#ifdef USE_CONSOLEKIT
-+int	use_consolekit;
-+#endif
-
- char	*greeterLib;
- char	*willing;
-@@ -258,6 +261,10 @@
-				"false"} ,
- { "willing",	"Willing",	DM_STRING,	&willing,
-				""} ,
-+#ifdef USE_CONSOLEKIT
-+{ "consoleKit",	"ConsoleKit",	DM_BOOL,	(char **) &use_consolekit,
-+				"true"} ,
-+#endif
- };
-
- # define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
-@@ -440,7 +447,11 @@
- {"-debug",	"*debugLevel",		XrmoptionSepArg,	(caddr_t) NULL },
- {"-xrm",	NULL,			XrmoptionResArg,	(caddr_t) NULL },
- {"-daemon",	".daemonMode",		XrmoptionNoArg,		"true"         },
--{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        }
-+{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        },
-+#ifdef USE_CONSOLEKIT
-+{"-consolekit",	".consoleKit",		XrmoptionNoArg,		"true"  },
-+{"-noconsolekit", ".consoleKit",	XrmoptionNoArg,		"false" }
-+#endif
- };
-
- static int	originalArgc;
---- a/man/xdm.man
-+++ b/man/xdm.man
-@@ -51,6 +51,8 @@
- ] [
- .B \-session
- .I session_program
-+] [
-+.B \-noconsolekit
- ]
- .SH DESCRIPTION
- .I Xdm
-@@ -218,6 +220,10 @@
- .IP "\fB\-xrm\fP \fIresource_specification\fP"
- Allows an arbitrary resource to be specified, as in most
- X Toolkit applications.
-+.IP "\fB\-noconsolekit\fP"
-+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
-+resource.
-+This suppresses the session management using ConsoleKit.
- .SH RESOURCES
- At many stages the actions of
- .I xdm
diff --git a/source/x/x11/post-install/xdm/xdm.pamd b/source/x/x11/post-install/xdm/xdm.pamd
index a3b9decf7..6223e3e95 100644
--- a/source/x/x11/post-install/xdm/xdm.pamd
+++ b/source/x/x11/post-install/xdm/xdm.pamd
@@ -5,5 +5,6 @@ account		include		system-auth
 password	include		system-auth
 session		include		system-auth
 session		required	pam_loginuid.so
-session		optional	pam_ck_connector.so
+-session	optional	pam_ck_connector.so
+-session	optional	pam_elogind.so
 session		include		postlogin
diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild
index 1358688a6..ba0b79360 100755
--- a/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/source/xap/xine-lib/xine-lib.SlackBuild
@@ -26,13 +26,13 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xine-lib
 # Version on the tarball
-VERSION=1.2.10
+VERSION=1.2.11
 # Version used in the source directory to cd into
-DIRVER=1.2.10
+DIRVER=1.2.11
 # Version used for the Slackware package
-PKGVER=1.2.10
+PKGVER=1.2.11
 
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xfce/FTBFSlog b/source/xfce/FTBFSlog
index 522490bf7..50cdd0dbe 100644
--- a/source/xfce/FTBFSlog
+++ b/source/xfce/FTBFSlog
@@ -1,2 +1,2 @@
-Thu Feb  1 01:00:13 UTC 2018
+Sat Dec  5 23:01:14 UTC 2020
   All packages tested and found to compile properly.
diff --git a/testing/source/vtown/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch b/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch
index 631d059d3..631d059d3 100644
--- a/testing/source/vtown/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch
+++ b/source/xfce/Greybird/0001-Fix-GTK3-dark-colors.patch
diff --git a/testing/source/vtown/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch b/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch
index fbf091c9e..fbf091c9e 100644
--- a/testing/source/vtown/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch
+++ b/source/xfce/Greybird/0002-Fix-Thunar-CSD-when-not-focused-Fixes-274.patch
diff --git a/testing/source/vtown/xfce/Greybird/Greybird.SlackBuild b/source/xfce/Greybird/Greybird.SlackBuild
index e6638c03b..1383c1bcf 100755
--- a/testing/source/vtown/xfce/Greybird/Greybird.SlackBuild
+++ b/source/xfce/Greybird/Greybird.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=Greybird
 VERSION=${VERSION:-3.22.12}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/xfce/Greybird/slack-desc b/source/xfce/Greybird/slack-desc
index 8e400d271..8e400d271 100644
--- a/testing/source/vtown/xfce/Greybird/slack-desc
+++ b/source/xfce/Greybird/slack-desc
diff --git a/testing/source/vtown/xfce/elementary-xfce/README b/source/xfce/elementary-xfce/README
index b92d43f3b..b92d43f3b 100644
--- a/testing/source/vtown/xfce/elementary-xfce/README
+++ b/source/xfce/elementary-xfce/README
diff --git a/testing/source/vtown/xfce/elementary-xfce/doinst.sh b/source/xfce/elementary-xfce/doinst.sh
index 320b5363d..320b5363d 100644
--- a/testing/source/vtown/xfce/elementary-xfce/doinst.sh
+++ b/source/xfce/elementary-xfce/doinst.sh
diff --git a/testing/source/vtown/xfce/elementary-xfce/elementary-xfce.SlackBuild b/source/xfce/elementary-xfce/elementary-xfce.SlackBuild
index 6e4203430..b998b3600 100755
--- a/testing/source/vtown/xfce/elementary-xfce/elementary-xfce.SlackBuild
+++ b/source/xfce/elementary-xfce/elementary-xfce.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=elementary-xfce
 VERSION=${VERSION:-0.15.1}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/testing/source/vtown/xfce/elementary-xfce/slack-desc b/source/xfce/elementary-xfce/slack-desc
index db787e611..db787e611 100644
--- a/testing/source/vtown/xfce/elementary-xfce/slack-desc
+++ b/source/xfce/elementary-xfce/slack-desc
diff --git a/source/xfce/exo/exo.SlackBuild b/source/xfce/exo/exo.SlackBuild
index 00f254a87..f87ce2bbf 100755
--- a/source/xfce/exo/exo.SlackBuild
+++ b/source/xfce/exo/exo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2013, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2013, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=exo
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -73,7 +73,7 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
-find . -exec touch {} \+
+#find . -exec touch {} \;
 
 chown -R root:root .
 find . \
@@ -123,7 +123,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/exo/exo.url b/source/xfce/exo/exo.url
index 174a28eff..63b021c28 100644
--- a/source/xfce/exo/exo.url
+++ b/source/xfce/exo/exo.url
@@ -1 +1 @@
-http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.11.tar.bz2
+http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.5.tar.bz2
diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild
index ff9503882..39ea7ce6e 100755
--- a/source/xfce/garcon/garcon.SlackBuild
+++ b/source/xfce/garcon/garcon.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=garcon
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -125,7 +125,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/garcon/garcon.url b/source/xfce/garcon/garcon.url
index 369d7a860..9980ede87 100644
--- a/source/xfce/garcon/garcon.url
+++ b/source/xfce/garcon/garcon.url
@@ -1 +1 @@
-http://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.4.tar.bz2
+https://github.com/xfce-mirror/garcon/releases
diff --git a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild b/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild
deleted file mode 100755
index 979c88b66..000000000
--- a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash
-
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=gtk-xfce-engine
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
-
-# Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
-if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \+ -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \+
-
-# Configure:
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-static \
-  --disable-debug \
-  --build=$ARCH-slackware-linux || exit 1
-
-# Build and install:
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Strip binaries:
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-# Compress and if needed symlink the man pages:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-# We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
-
-# Add a documentation directory.  Not all of these files are expected to be
-# present, but listing them ensures that documentation that might appear and
-# disappear from version to version will not be missed.
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
-cp -a \
-  AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
-  NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
-  $PKG/usr/doc/${PKGNAM}-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/gtk-xfce-engine/slack-desc b/source/xfce/gtk-xfce-engine/slack-desc
deleted file mode 100644
index 74b8d7918..000000000
--- a/source/xfce/gtk-xfce-engine/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-gtk-xfce-engine: gtk-xfce-engine (Xfce Gtk+ engines)
-gtk-xfce-engine:
-gtk-xfce-engine: The GTK-Xfce-Engine package contains several GTK+-2/3 themes and the
-gtk-xfce-engine: applications and libraries needed to display them. This is useful for
-gtk-xfce-engine: customizing the appearance of your Xfce desktop.
-gtk-xfce-engine:
-gtk-xfce-engine:
-gtk-xfce-engine:
-gtk-xfce-engine:
-gtk-xfce-engine:
-gtk-xfce-engine:
diff --git a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild
index 45a1833d9..8626f95ae 100755
--- a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild
+++ b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libxfce4ui
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -126,7 +126,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/libxfce4util/libxfce4util.SlackBuild b/source/xfce/libxfce4util/libxfce4util.SlackBuild
index eb6951c4c..1feb12f5d 100755
--- a/source/xfce/libxfce4util/libxfce4util.SlackBuild
+++ b/source/xfce/libxfce4util/libxfce4util.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libxfce4util
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -124,7 +124,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/testing/source/vtown/xfce/mousepad/doinst.sh b/source/xfce/mousepad/doinst.sh
index 6fb128315..6fb128315 100644
--- a/testing/source/vtown/xfce/mousepad/doinst.sh
+++ b/source/xfce/mousepad/doinst.sh
diff --git a/testing/source/vtown/xfce/mousepad/mousepad.SlackBuild b/source/xfce/mousepad/mousepad.SlackBuild
index 4d4155fe7..a12c17b18 100755
--- a/testing/source/vtown/xfce/mousepad/mousepad.SlackBuild
+++ b/source/xfce/mousepad/mousepad.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mousepad
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/testing/source/vtown/xfce/mousepad/mousepad.url b/source/xfce/mousepad/mousepad.url
index 797da6cce..797da6cce 100644
--- a/testing/source/vtown/xfce/mousepad/mousepad.url
+++ b/source/xfce/mousepad/mousepad.url
diff --git a/testing/source/vtown/xfce/mousepad/slack-desc b/source/xfce/mousepad/slack-desc
index c4d5db24b..c4d5db24b 100644
--- a/testing/source/vtown/xfce/mousepad/slack-desc
+++ b/source/xfce/mousepad/slack-desc
diff --git a/source/xfce/orage/orage.SlackBuild b/source/xfce/orage/orage.SlackBuild
deleted file mode 100755
index 530d269eb..000000000
--- a/source/xfce/orage/orage.SlackBuild
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-# Slackware build script for orage
-
-# Copyright 2010-2014  Robby Workman, Northport, Alabama, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=orage
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
-  exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-zcat $CWD/orage.libical3.diff.gz | patch -p1 --verbose || exit 1
-
-# Yes, libical's pkgconfig file is incomplete, it seems
-CFLAGS="$SLKCFLAGS -I/usr/include/libical" \
-CXXFLAGS="$SLKCFLAGS -I/usr/include/libical" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-debug \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-# Compress and link manpages, if any:
-if [ -d $PKG/usr/man ]; then
-  ( cd $PKG/usr/man
-    for manpagedir in $(find . -type d -name "man*") ; do
-      ( cd $manpagedir
-        for eachpage in $( find . -type l -maxdepth 1) ; do
-          ln -s $( readlink $eachpage ).gz $eachpage.gz
-          rm $eachpage
-        done
-        gzip -9 *.?
-      )
-    done
-  )
-fi
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING* INSTALL NEWS README* TODO \
-  $PKG/usr/doc/$PKGNAM-$VERSION
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/orage/orage.libical3.diff b/source/xfce/orage/orage.libical3.diff
deleted file mode 100644
index af962b367..000000000
--- a/source/xfce/orage/orage.libical3.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -up orage-4.12.1/src/ical-code.c.libical-3.0 orage-4.12.1/src/ical-code.c
---- orage-4.12.1/src/ical-code.c.libical-3.0	2017-11-14 08:41:30.917375493 +0100
-+++ orage-4.12.1/src/ical-code.c	2017-11-14 08:41:56.823375135 +0100
-@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr
-         &&   (strcmp(g_par.local_timezone, "floating") != 0))
-         ctime = icaltime_current_time_with_zone(local_icaltimezone);
-     else { / * use floating time * /
--        ctime.is_utc      = 0;
-         ctime.is_date     = 0;
-         ctime.is_daylight = 0;
-         ctime.zone        = NULL;
-@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a
-  * when counting alarm time. */
-         if (rel == ICAL_RELATED_START) {
-             per.stime.is_date       = 0;
--            per.stime.is_utc        = 1;
-             per.stime.is_daylight   = 0;
-             per.stime.zone          = utc_icaltimezone;
-             per.stime.hour          = 0;
-@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a
-         }
-         else {
-             per.etime.is_date       = 0;
--            per.etime.is_utc        = 1;
-             per.etime.is_daylight   = 0;
-             per.etime.zone          = utc_icaltimezone;
-             per.etime.hour          = 0;
-@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al
- /* HACK: convert to UTC time so that we can use time arithmetic
-  * when counting alarm time. */
-         start_time.is_date       = 0;
--        start_time.is_utc        = 1;
-         start_time.is_daylight   = 0;
-         start_time.zone          = utc_icaltimezone;
-         start_time.hour          = 0;
-@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg
-      */
-     if (icaltime_is_date(per.stime)) {
-         if (local_icaltimezone != utc_icaltimezone) {
--            next_alarm_time.is_utc        = 0;
-             next_alarm_time.is_daylight   = 0;
-             next_alarm_time.zone          = local_icaltimezone;
-         }
-@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n
-          */
-         if (icaltime_is_date(per.stime)) {
-             if (local_icaltimezone != utc_icaltimezone) {
--                next_alarm_time.is_utc        = 0;
-                 next_alarm_time.is_daylight   = 0;
-                 next_alarm_time.zone          = local_icaltimezone;
-             }
-@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop
-          */
-         if (icaltime_is_date(per.stime)) {
-             if (local_icaltimezone != utc_icaltimezone) {
--                next_alarm_time.is_utc        = 0;
-                 next_alarm_time.is_daylight   = 0;
-                 next_alarm_time.zone          = local_icaltimezone;
-             }
diff --git a/source/xfce/orage/slack-desc b/source/xfce/orage/slack-desc
deleted file mode 100644
index 5023eae5b..000000000
--- a/source/xfce/orage/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-     |-----handy-ruler------------------------------------------------------|
-orage: orage (Xfce's calendar)
-orage:
-orage: Orage is a time-managing application for the Xfce desktop environment.
-orage:
-orage:
-orage:
-orage:
-orage:
-orage:
-orage:
-orage:
diff --git a/source/xfce/thunar-volman/slack-desc b/source/xfce/thunar-volman/slack-desc
index 1b8871397..4cfee665b 100644
--- a/source/xfce/thunar-volman/slack-desc
+++ b/source/xfce/thunar-volman/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-             |-----handy-ruler------------------------------------------------|
+             |-----handy-ruler------------------------------------------------------|
 thunar-volman: thunar-volman (Thunar Volume Manager Plugin)
-thunar-volman: 
-thunar-volman: thunar-volman is an extension for the Thunar File Manager, 
-thunar-volman: which enables automatic management of removable drives and 
-thunar-volman: media. 
-thunar-volman: 
-thunar-volman: 
-thunar-volman: 
-thunar-volman: 
-thunar-volman: 
-thunar-volman: 
+thunar-volman:
+thunar-volman: thunar-volman is an extension for the Thunar File Manager, which
+thunar-volman: enables automatic management of removable drives and media. 
+thunar-volman:
+thunar-volman:
+thunar-volman:
+thunar-volman:
+thunar-volman:
+thunar-volman:
+thunar-volman:
diff --git a/source/xfce/thunar-volman/thunar-volman.SlackBuild b/source/xfce/thunar-volman/thunar-volman.SlackBuild
index b00f2bf68..dc0734658 100755
--- a/source/xfce/thunar-volman/thunar-volman.SlackBuild
+++ b/source/xfce/thunar-volman/thunar-volman.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=thunar-volman
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/xfce/thunar-volman/thunar-volman.url b/source/xfce/thunar-volman/thunar-volman.url
deleted file mode 100644
index 51224d39c..000000000
--- a/source/xfce/thunar-volman/thunar-volman.url
+++ /dev/null
@@ -1 +0,0 @@
-http://archive.xfce.org/src/xfce/thunar-volman/0.9/thunar-volman-0.9.5.tar.bz2
diff --git a/source/xfce/thunar/thunar.SlackBuild b/source/xfce/thunar/thunar.SlackBuild
index 7d46bc4fe..a0d457936 100755
--- a/source/xfce/thunar/thunar.SlackBuild
+++ b/source/xfce/thunar/thunar.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=thunar
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
diff --git a/source/xfce/thunar/thunar.url b/source/xfce/thunar/thunar.url
index cbc5614ff..4cc136db0 100644
--- a/source/xfce/thunar/thunar.url
+++ b/source/xfce/thunar/thunar.url
@@ -1 +1 @@
-http://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.16.tar.bz2
+https://archive.xfce.org/src/xfce/thunar/1.8/thunar-1.8.13.tar.bz2
diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild
index e717911e7..7659fb893 100755
--- a/source/xfce/tumbler/tumbler.SlackBuild
+++ b/source/xfce/tumbler/tumbler.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2013, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2013, 2015, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tumbler
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -125,7 +125,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/tumbler/tumbler.url b/source/xfce/tumbler/tumbler.url
index e4acc3764..8cc2fe2bb 100644
--- a/source/xfce/tumbler/tumbler.url
+++ b/source/xfce/tumbler/tumbler.url
@@ -1 +1 @@
-http://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-0.2.9.tar.bz2
+http://archive.xfce.org/src/apps/tumbler/0.2/tumbler-0.2.3.tar.bz2
diff --git a/source/xfce/xfce-build-all.sh b/source/xfce/xfce-build-all.sh
deleted file mode 100755
index 4db2edf96..000000000
--- a/source/xfce/xfce-build-all.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# Copyright 2012, 2015, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Set to 1 if you'd like to install/upgrade package as they are built.
-# This is recommended.
-INST=1
-
-TMP=${TMP:-/tmp}
-
-for package in \
-  xfce4-dev-tools \
-  libxfce4util \
-  xfconf \
-  libxfce4ui \
-  exo \
-  garcon \
-  gtk-xfce-engine \
-  xfce4-panel \
-  thunar \
-  thunar-volman \
-  tumbler \
-  xfce4-appfinder \
-  xfce4-power-manager \
-  xfce4-settings \
-  xfdesktop \
-  xfwm4 \
-  xfce4-session \
-  xfce4-terminal \
-  xfce4-notifyd \
-  orage \
-  xfce4-pulseaudio-plugin \
-  xfce4-clipman-plugin \
-  xfce4-screenshooter \
-  xfce4-systemload-plugin \
-  xfce4-taskmanager \
-  xfce4-weather-plugin \
-  ; do
-  cd $package || exit 1
-  ./${package}.SlackBuild || ( touch /tmp/${package}.failed ; exit 1 ) || exit 1
-  if [ "$INST" = "1" ]; then
-    PACKAGE="$(ls -t $TMP/$(ls ${package}*.xz | rev | cut -f2- -d - | rev)-*txz | head -n 1)"
-    if [ -f $PACKAGE ]; then
-      upgradepkg --install-new --reinstall $PACKAGE
-    else
-      echo "Error:  package to upgrade "$PACKAGE" not found in $TMP"
-      exit 1
-    fi
-  fi
-  cd ..
-done
diff --git a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
index 47af2d4ec..26ffc4e4f 100755
--- a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
+++ b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-appfinder
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -118,7 +118,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
index 4a57e00c8..e2f0f2d31 100755
--- a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
+++ b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-dev-tools
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -118,7 +118,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
index a70a52a7e..df8dda2d8 100755
--- a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
+++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for Xfce4-notifyd
 
 # Copyright 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2010, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -83,7 +83,7 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/xfce \
+  --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
   --enable-debug=no \
diff --git a/testing/source/vtown/xfce/xfce4-panel-profiles/doinst.sh b/source/xfce/xfce4-panel-profiles/doinst.sh
index 4e8ba7071..4e8ba7071 100644
--- a/testing/source/vtown/xfce/xfce4-panel-profiles/doinst.sh
+++ b/source/xfce/xfce4-panel-profiles/doinst.sh
diff --git a/testing/source/vtown/xfce/xfce4-panel-profiles/slack-desc b/source/xfce/xfce4-panel-profiles/slack-desc
index 15d98b284..15d98b284 100644
--- a/testing/source/vtown/xfce/xfce4-panel-profiles/slack-desc
+++ b/source/xfce/xfce4-panel-profiles/slack-desc
diff --git a/testing/source/vtown/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild
index e33f2e341..d2326d423 100755
--- a/testing/source/vtown/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild
+++ b/source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-panel-profiles
 VERSION=${VERSION:-$(echo xfce4-panel-profiles-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -84,6 +84,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Relocate man pages:
+mv $PKG/usr/share/man $PKG/usr
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild
index da610a9bf..e737f273a 100755
--- a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild
+++ b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-panel
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -93,7 +93,6 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --disable-static \
   --disable-debug \
-  --enable-gtk3 \
   --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
@@ -125,7 +124,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-power-manager/slack-desc b/source/xfce/xfce4-power-manager/slack-desc
index 1d3144dc9..0d33da790 100644
--- a/source/xfce/xfce4-power-manager/slack-desc
+++ b/source/xfce/xfce4-power-manager/slack-desc
@@ -5,11 +5,11 @@
 # make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
-                   |-----handy-ruler------------------------------------------------|
+                   |-----handy-ruler------------------------------------------------------|
 xfce4-power-manager: xfce4-power-manager (Power Management Daemon for Xfce)
 xfce4-power-manager:
-xfce4-power-manager: xfce4-power-manager makes power management functions (such as
-xfce4-power-manager: suspend and hibernate) easy inside the Xfce Desktop Environment.
+xfce4-power-manager: xfce4-power-manager makes power management functions (such as suspend
+xfce4-power-manager: and hibernate) easy inside the Xfce Desktop Environment.
 xfce4-power-manager:
 xfce4-power-manager:
 xfce4-power-manager:
diff --git a/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
index 12b55a2a6..b2a764548 100755
--- a/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
+++ b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for xfce4-power-manager
 
 # Copyright 2006-2012  Robby Workman  Northport, Alabama, USA
-# Copyright 2009, 2010, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-power-manager
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url
index b5524c521..4376b0a53 100644
--- a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url
+++ b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url
@@ -1 +1 @@
-http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.2.tar.bz2
+http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.0.tar.bz2
diff --git a/testing/source/vtown/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch b/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
index 8db50475b..8db50475b 100644
--- a/testing/source/vtown/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
+++ b/source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
diff --git a/testing/source/vtown/xfce/xfce4-screensaver/slack-desc b/source/xfce/xfce4-screensaver/slack-desc
index 4c5817e73..4c5817e73 100644
--- a/testing/source/vtown/xfce/xfce4-screensaver/slack-desc
+++ b/source/xfce/xfce4-screensaver/slack-desc
diff --git a/testing/source/vtown/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
index 62966e6d3..22165e39f 100755
--- a/testing/source/vtown/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
+++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-screensaver
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url
index fedac3cb4..4ac1f3abb 100644
--- a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url
+++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url
@@ -1 +1 @@
-http://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.5.tar.bz2
+http://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-1.9.3.tar.bz2
diff --git a/source/xfce/xfce4-session/xfce4-session.SlackBuild b/source/xfce/xfce4-session/xfce4-session.SlackBuild
index 30e951f8b..51578b8e4 100755
--- a/source/xfce/xfce4-session/xfce4-session.SlackBuild
+++ b/source/xfce/xfce4-session/xfce4-session.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2013, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2013, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-session
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -121,7 +121,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
index 540c178f7..290916b5f 100755
--- a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
+++ b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2016, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -80,7 +80,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# Set Greybird (GTK theme) and elementary-xfce (icon theme) as system defaults
 zcat $CWD/xfce4-settings.theme.diff.gz | patch -p1 --verbose || exit 1
+
 zcat $CWD/xfce4-settings.xft.defaults.diff.gz | patch -p1 --verbose || exit 1
 
 # Configure:
@@ -123,7 +125,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfce4-settings/xfce4-settings.theme.diff b/source/xfce/xfce4-settings/xfce4-settings.theme.diff
index 7b18303bd..898887846 100644
--- a/source/xfce/xfce4-settings/xfce4-settings.theme.diff
+++ b/source/xfce/xfce4-settings/xfce4-settings.theme.diff
@@ -7,8 +7,8 @@ diff -Nur xfce4-settings-4.11.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.
    <property name="Net" type="empty">
 -    <property name="ThemeName" type="empty"/>
 -    <property name="IconThemeName" type="empty"/>
-+    <property name="ThemeName" type="string" value="Adwaita"/>
-+    <property name="IconThemeName" type="string" value="Adwaita"/>
++    <property name="ThemeName" type="string" value="Greybird"/>
++    <property name="IconThemeName" type="string" value="elementary-xfce-dark"/>
      <property name="DoubleClickTime" type="int" value="400"/>
      <property name="DoubleClickDistance" type="int" value="5"/>
      <property name="DndDragThreshold" type="int" value="8"/>
diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
index 224c0846e..d960ba4fe 100755
--- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
+++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
@@ -27,8 +27,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-systemload-plugin
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -69,7 +69,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.lz || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
index 021b4b02c..61bc620fe 100755
--- a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
+++ b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for xfce4-terminal
 
 # Copyright 2010-2014  Robby Workman, Northport, Alabama, USA
-# Copyright 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.url b/source/xfce/xfce4-terminal/xfce4-terminal.url
index 400bafb0c..25ecf17de 100644
--- a/source/xfce/xfce4-terminal/xfce4-terminal.url
+++ b/source/xfce/xfce4-terminal/xfce4-terminal.url
@@ -1 +1 @@
-http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.8.tar.bz2
+http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.7.4.tar.bz2
diff --git a/source/xfce/xfce4-weather-plugin/update-met_no-API.patch b/source/xfce/xfce4-weather-plugin/update-met_no-API.patch
deleted file mode 100644
index 3cfe31215..000000000
--- a/source/xfce/xfce4-weather-plugin/update-met_no-API.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 139545eeda3cff72dc7148cd8765a5650575e661 Mon Sep 17 00:00:00 2001
-From: Olivier Duchateau <duchateau.olivier@gmail.com>
-Date: Sun, 22 Dec 2019 19:29:58 +0100
-Subject: [PATCH] Switch to 'locationforecast' product
-
----
- panel-plugin/weather.c | 8 +++++---
- panel-plugin/weather.h | 1 +
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
-index be745b3..7d79566 100644
---- a/panel-plugin/weather.c
-+++ b/panel-plugin/weather.c
-@@ -588,6 +588,7 @@ cb_weather_update(SoupSession *session,
- static gboolean
- update_handler(plugin_data *data)
- {
-+    gchar *api_version = FORECAST_API;
-     gchar *url;
-     gboolean night_time;
-     time_t now_t;
-@@ -653,9 +654,10 @@ update_handler(plugin_data *data)
-         data->weather_update->started = TRUE;
- 
-         /* build url */
--        url = g_strdup_printf("https://api.met.no/weatherapi"
--                              "/locationforecastlts/1.3/?lat=%s&lon=%s&"
--                              "msl=%d",
-+        url = g_strdup_printf("https://api.met.no"
-+                              "/weatherapi/locationforecast/%s/"
-+                              "?lat=%s&lon=%s&msl=%d",
-+                              api_version,
-                               data->lat, data->lon, data->msl);
- 
-         /* start receive thread */
-diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
-index 86629c7..2723fc4 100644
---- a/panel-plugin/weather.h
-+++ b/panel-plugin/weather.h
-@@ -31,6 +31,7 @@
- #define MAX_FORECAST_DAYS 10
- #define DEFAULT_FORECAST_DAYS 5
- #define MAX_SCROLLBOX_LINES 10
-+#define FORECAST_API "1.9"
- 
- G_BEGIN_DECLS
- 
--- 
-2.24.1
-
diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
index 73fab2fc6..073168233 100755
--- a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
+++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfce4-weather-plugin
 
-# Copyright 2006-2012  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2018  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -69,7 +69,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -78,8 +78,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-zcat $CWD/update-met_no-API.patch.gz | patch -p1 --verbose || exit 1
-
 GEONAMES_USERNAME="slackware" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
index 9ee0ef010..f6c688609 100644
--- a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
+++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
@@ -1 +1 @@
-http://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/
+https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/
diff --git a/testing/source/vtown/deps/qt5/doinst.sh b/source/xfce/xfce4-whiskermenu-plugin/doinst.sh
index 3e5691a05..3e5691a05 100644
--- a/testing/source/vtown/deps/qt5/doinst.sh
+++ b/source/xfce/xfce4-whiskermenu-plugin/doinst.sh
diff --git a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/slack-desc b/source/xfce/xfce4-whiskermenu-plugin/slack-desc
index eaef5a40c..eaef5a40c 100644
--- a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/slack-desc
+++ b/source/xfce/xfce4-whiskermenu-plugin/slack-desc
diff --git a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild
index d7bc6c4ea..e9422409b 100755
--- a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild
+++ b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-whiskermenu-plugin
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1_vtown_1}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url
index e8d56c2dc..e8d56c2dc 100644
--- a/testing/source/vtown/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url
+++ b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.url
diff --git a/source/xfce/xfconf/xfconf.SlackBuild b/source/xfce/xfconf/xfconf.SlackBuild
index 30b288441..e99817e67 100755
--- a/source/xfce/xfconf/xfconf.SlackBuild
+++ b/source/xfce/xfconf/xfconf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfconf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -88,6 +88,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --enable-gsettings-backend \
   --disable-static \
   --disable-debug \
   --build=$ARCH-slackware-linux || exit 1
@@ -121,7 +122,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfdesktop/xfdesktop.SlackBuild b/source/xfce/xfdesktop/xfdesktop.SlackBuild
index c6a9c9827..e0648495c 100755
--- a/source/xfce/xfdesktop/xfdesktop.SlackBuild
+++ b/source/xfce/xfdesktop/xfdesktop.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfdesktop
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -70,7 +70,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
@@ -118,7 +118,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and
diff --git a/source/xfce/xfdesktop/xfdesktop.url b/source/xfce/xfdesktop/xfdesktop.url
deleted file mode 100644
index d4f9f65d8..000000000
--- a/source/xfce/xfdesktop/xfdesktop.url
+++ /dev/null
@@ -1 +0,0 @@
-http://archive.xfce.org/src/xfce/xfdesktop/4.12/xfdesktop-4.12.5.tar.bz2
diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild
index f17f2d2e6..bb5fd18f9 100755
--- a/source/xfce/xfwm4/xfwm4.SlackBuild
+++ b/source/xfce/xfwm4/xfwm4.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2012, 2013, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2012, 2013, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -122,7 +122,7 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # We don't want icon caches:
-find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \+
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
 
 # Add a documentation directory.  Not all of these files are expected to be
 # present, but listing them ensures that documentation that might appear and