summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-04-04 23:02:09 +0200
committer Eric Hameleers <alien@slackware.com>2018-04-04 23:02:09 +0200
commit355d515c5c03f55f38464eac2565c9a08a7a8551 (patch)
treeb81af9cd95c1e37580ea527bb5dba567ec70009c
parent6c265e3c613eb8c801e216c018d164d5be7a2f7d (diff)
downloadktown-355d515c5c03f55f38464eac2565c9a08a7a8551.tar.gz
ktown-355d515c5c03f55f38464eac2565c9a08a7a8551.tar.xz
Recompilation required after icu4c and poppler ABI breakage
-rwxr-xr-xdeps/poppler/poppler.SlackBuild7
-rw-r--r--deps/poppler/poppler.splashpath.h.revert.diff42
-rwxr-xr-xdeps/qt5-webkit/qt5-webkit.SlackBuild2
-rwxr-xr-xdeps/qt5/qt5.SlackBuild2
-rwxr-xr-xdeps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-logger/telepathy-logger.SlackBuild2
-rwxr-xr-xdeps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild4
-rw-r--r--kde/build/calligra1
-rw-r--r--kde/build/kdevelop1
-rw-r--r--kde/build/kfilemetadata51
-rw-r--r--kde/build/kile1
-rw-r--r--kde/build/konsole1
-rw-r--r--kde/build/okular1
-rw-r--r--kde/build/plasma5-nm1
-rw-r--r--kde/patch/konsole.patch4
-rw-r--r--kde/patch/konsole/konsole.term.is.konsole.patch24
17 files changed, 89 insertions, 9 deletions
diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild
index b94e80a..b416bba 100755
--- a/deps/poppler/poppler.SlackBuild
+++ b/deps/poppler/poppler.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2017 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# Modified 2016, 2017 by Eric Hameleers <alien@slackware.com>
PKGNAM=poppler
-VERSION=${VERSION:-0.62.0}
+VERSION=${VERSION:-0.63.0}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
@@ -75,6 +75,9 @@ cd ${PKGNAM}-$VERSION || exit 1
# things that depend on it:
cat $CWD/poppler.remove.qt4.frontend.diff | patch -p1 -R --verbose || exit 1
+# Revert a change to SplashPath.h (in 0.63.0) that breaks compiling the qt4 frontend:
+cat $CWD/poppler.splashpath.h.revert.diff | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/deps/poppler/poppler.splashpath.h.revert.diff b/deps/poppler/poppler.splashpath.h.revert.diff
new file mode 100644
index 0000000..6408606
--- /dev/null
+++ b/deps/poppler/poppler.splashpath.h.revert.diff
@@ -0,0 +1,42 @@
+--- ./splash/SplashPath.h.orig 2018-03-18 13:23:49.000000000 -0500
++++ ./splash/SplashPath.h 2017-12-03 13:25:06.000000000 -0600
+@@ -4,20 +4,6 @@
+ //
+ //========================================================================
+
+-//========================================================================
+-//
+-// Modified under the Poppler project - http://poppler.freedesktop.org
+-//
+-// All changes made under the Poppler project to this file are licensed
+-// under GPL version 2 or later
+-//
+-// Copyright (C) 2018 Albert Astals Cid <aacid@kde.org>
+-//
+-// To see a description of the changes please see the Changelog file that
+-// came with your tarball or type make ChangeLog if you are building from git
+-//
+-//========================================================================
+-
+ #ifndef SPLASHPATH_H
+ #define SPLASHPATH_H
+
+@@ -76,9 +62,6 @@
+
+ ~SplashPath();
+
+- SplashPath(const SplashPath&) = delete;
+- SplashPath& operator=(const SplashPath&) = delete;
+-
+ // Append <path> to <this>.
+ void append(SplashPath *path);
+
+@@ -133,6 +116,8 @@
+
+ friend class SplashXPath;
+ friend class Splash;
++ // this is a temporary hack, until we read FreeType paths directly
++ friend class ArthurOutputDev;
+ };
+
+ #endif
diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild
index e15a7d4..721b79d 100755
--- a/deps/qt5-webkit/qt5-webkit.SlackBuild
+++ b/deps/qt5-webkit/qt5-webkit.SlackBuild
@@ -26,7 +26,7 @@
PKGNAM=qt5-webkit
VERSION=${VERSION:-5.9.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index a94224c..e70e42a 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -57,7 +57,7 @@
PKGNAM=qt5
VERSION=${VERSION:-5.9.4}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
PKGSRC=$(echo $VERSION |cut -d- -f1)
PKGVER=$(echo $VERSION |tr - _)
diff --git a/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild b/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild
index aa28c26..06f04f4 100755
--- a/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild
+++ b/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=libaccounts-glib
VERSION=${VERSION:-"1.23"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild b/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild
index 7c2526d..b2977cf 100755
--- a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild
+++ b/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild
@@ -24,7 +24,7 @@
PKGNAM=telepathy-gabble
VERSION=${VERSION:-"0.18.4"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild b/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild
index 8457a66..013b627 100755
--- a/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild
+++ b/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild
@@ -26,7 +26,7 @@
PKGNAM=telepathy-logger
VERSION=${VERSION:-0.8.2}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild b/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild
index 9dc1529..9fb5b5d 100755
--- a/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild
+++ b/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -24,7 +24,7 @@
PKGNAM=telepathy-mission-control
VERSION=${VERSION:-"5.16.4"}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/kde/build/calligra b/kde/build/calligra
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/kde/build/calligra
@@ -0,0 +1 @@
+3
diff --git a/kde/build/kdevelop b/kde/build/kdevelop
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/kdevelop
@@ -0,0 +1 @@
+2
diff --git a/kde/build/kfilemetadata5 b/kde/build/kfilemetadata5
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/kfilemetadata5
@@ -0,0 +1 @@
+2
diff --git a/kde/build/kile b/kde/build/kile
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/kile
@@ -0,0 +1 @@
+2
diff --git a/kde/build/konsole b/kde/build/konsole
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/konsole
@@ -0,0 +1 @@
+2
diff --git a/kde/build/okular b/kde/build/okular
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/okular
@@ -0,0 +1 @@
+2
diff --git a/kde/build/plasma5-nm b/kde/build/plasma5-nm
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/plasma5-nm
@@ -0,0 +1 @@
+2
diff --git a/kde/patch/konsole.patch b/kde/patch/konsole.patch
new file mode 100644
index 0000000..7a39bb3
--- /dev/null
+++ b/kde/patch/konsole.patch
@@ -0,0 +1,4 @@
+# Set TERM to 'konsole' instead of the default 'xterm-256color'
+# to prevent garbled text under certain conditions:
+cat $CWD/patch/konsole/konsole.term.is.konsole.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/konsole/konsole.term.is.konsole.patch b/kde/patch/konsole/konsole.term.is.konsole.patch
new file mode 100644
index 0000000..443b9f1
--- /dev/null
+++ b/kde/patch/konsole/konsole.term.is.konsole.patch
@@ -0,0 +1,24 @@
+diff -uar konsole-17.12.3.orig/src/Profile.cpp konsole-17.12.3/src/Profile.cpp
+--- konsole-17.12.3.orig/src/Profile.cpp 2018-03-01 23:54:01.000000000 +0100
++++ konsole-17.12.3/src/Profile.cpp 2018-04-03 21:17:11.897873304 +0200
+@@ -157,7 +157,7 @@
+ // See Pty.cpp on why Arguments is populated
+ setProperty(Arguments, QStringList() << QString::fromUtf8(qgetenv("SHELL")));
+ setProperty(Icon, QStringLiteral("utilities-terminal"));
+- setProperty(Environment, QStringList() << QStringLiteral("TERM=xterm-256color") << QStringLiteral("COLORTERM=truecolor"));
++ setProperty(Environment, QStringList() << QStringLiteral("TERM=konsole") << QStringLiteral("COLORTERM=truecolor"));
+ setProperty(LocalTabTitleFormat, QStringLiteral("%d : %n"));
+ setProperty(RemoteTabTitleFormat, QStringLiteral("(%u) %H"));
+ setProperty(ShowTerminalSizeHint, true);
+diff -uar konsole-17.12.3.orig/src/Pty.cpp konsole-17.12.3/src/Pty.cpp
+--- konsole-17.12.3.orig/src/Pty.cpp 2018-03-01 23:54:01.000000000 +0100
++++ konsole-17.12.3/src/Pty.cpp 2018-04-03 21:18:18.898007801 +0200
+@@ -229,7 +229,7 @@
+
+ // extra safeguard to make sure $TERM is always set
+ if (!isTermEnvAdded) {
+- setEnv(QStringLiteral("TERM"), QStringLiteral("xterm-256color"));
++ setEnv(QStringLiteral("TERM"), QStringLiteral("konsole"));
+ }
+ }
+