summaryrefslogtreecommitdiffstats
path: root/deps/harfbuzz
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-01-09 00:06:49 +0100
committer Eric Hameleers <alien@slackware.com>2015-01-09 00:06:49 +0100
commitda1be5a21ba06235b67a999f696ec66e35dc17a1 (patch)
tree6df637d821a6ac0ad65f8caaf967ea2a6956a862 /deps/harfbuzz
parentb1b35d20ce6b70330b23a9d056dcb44b58795bd6 (diff)
downloadktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.gz
ktown-da1be5a21ba06235b67a999f696ec66e35dc17a1.tar.xz
Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0.
KDE 5_1501 ========== This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0, Plasma 5.1.2 and Applications 14.12.0. Note that there is still a lot of KDE 4 stuff in here, which is necessary to support all the Applications that have not yet been ported to KDE Frameworks 5. The Applications 15.04 (march 2015) release should offer a lot more KF5 ports. Preliminary build procedure (not verified 100% yet): ---------------------------------------------------- - (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-* - build all the deps using "updates.SlackBuild" script in the "deps/" directory - note that extra-cmake-modules is required here as well as when building the frameworks, so I just copied it from frameworks to deps. - logoff/login to activate Qt5 profile script. - removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and its compilation will fail as a result - build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k depim extragear" - installpkg akonadi-qt5 - build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui ld frameworks plasma plasma-extra polkit-kde applications" - build kdei ============================================================================== Eric Hameleers / alien at slackware dot com / 09-jan-2015
Diffstat (limited to 'deps/harfbuzz')
-rwxr-xr-xdeps/harfbuzz/harfbuzz.SlackBuild6
-rw-r--r--deps/harfbuzz/harfbuzz_unbreak_abi.patch81
-rw-r--r--deps/harfbuzz/harfbuzz_unbreak_abi.patch.gzbin607 -> 0 bytes
3 files changed, 84 insertions, 3 deletions
diff --git a/deps/harfbuzz/harfbuzz.SlackBuild b/deps/harfbuzz/harfbuzz.SlackBuild
index d6bcc22..0564d22 100755
--- a/deps/harfbuzz/harfbuzz.SlackBuild
+++ b/deps/harfbuzz/harfbuzz.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2013, 2014 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2013, 2014, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PKGNAM=harfbuzz
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-0.9.37}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
@@ -69,7 +69,7 @@ cd $PKGNAM-$VERSION || exit 1
# Apply a patch (borrowed from debian) which 'unbreaks' the ABI breakage
# caused by moving the ICU functionality into a separate backend library.
-zcat $CWD/harfbuzz_unbreak_abi.patch.gz | patch -p1 --verbose || exit 1
+cat $CWD/harfbuzz_unbreak_abi.patch | patch -p1 --verbose || exit 1
chown -R root:root .
find . \
diff --git a/deps/harfbuzz/harfbuzz_unbreak_abi.patch b/deps/harfbuzz/harfbuzz_unbreak_abi.patch
new file mode 100644
index 0000000..05497f3
--- /dev/null
+++ b/deps/harfbuzz/harfbuzz_unbreak_abi.patch
@@ -0,0 +1,81 @@
+Description: Re-add hb_version_check to unbreak API/ABI
+ This patch should be removed on the next API/ABI break by upstream.
+Author: ???? ???????? (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>
+Bug-Debian: http://bugs.debian.org/755094
+Forwarded: not-needed
+
+--- a/src/hb-common.cc
++++ b/src/hb-common.cc
+@@ -587,3 +587,23 @@
+ {
+ return HB_VERSION_ATLEAST (major, minor, micro);
+ }
++
++/**
++ * hb_version_check:
++ * @major:
++ * @minor:
++ * @micro:
++ *
++ *
++ *
++ * Return value:
++ *
++ * Since: 1.0
++ **/
++hb_bool_t
++hb_version_check (unsigned int major,
++ unsigned int minor,
++ unsigned int micro)
++{
++ return HB_VERSION_CHECK (major, minor, micro);
++}
+--- a/src/hb-version.h
++++ b/src/hb-version.h
+@@ -45,6 +45,9 @@
+ #define HB_VERSION_ATLEAST(major,minor,micro) \
+ ((major)*10000+(minor)*100+(micro) <= \
+ HB_VERSION_MAJOR*10000+HB_VERSION_MINOR*100+HB_VERSION_MICRO)
++#define HB_VERSION_CHECK(major,minor,micro) \
++ ((major)*10000+(minor)*100+(micro) >= \
++ HB_VERSION_MAJOR*10000+HB_VERSION_MINOR*100+HB_VERSION_MICRO)
+
+
+ void
+@@ -60,6 +63,11 @@
+ unsigned int minor,
+ unsigned int micro);
+
++hb_bool_t
++hb_version_check (unsigned int major,
++ unsigned int minor,
++ unsigned int micro);
++
+
+ HB_END_DECLS
+
+--- a/src/hb-version.h.in
++++ b/src/hb-version.h.in
+@@ -45,6 +45,10 @@
+ #define HB_VERSION_ATLEAST(major,minor,micro) \
+ ((major)*10000+(minor)*100+(micro) <= \
+ HB_VERSION_MAJOR*10000+HB_VERSION_MINOR*100+HB_VERSION_MICRO)
++#define HB_VERSION_CHECK(major,minor,micro) \
++ ((major)*10000+(minor)*100+(micro) >= \
++ HB_VERSION_MAJOR*10000+HB_VERSION_MINOR*100+HB_VERSION_MICRO)
++
+
+
+ void
+@@ -60,6 +64,11 @@
+ unsigned int minor,
+ unsigned int micro);
+
++hb_bool_t
++hb_version_check (unsigned int major,
++ unsigned int minor,
++ unsigned int micro);
++
+
+ HB_END_DECLS
+
diff --git a/deps/harfbuzz/harfbuzz_unbreak_abi.patch.gz b/deps/harfbuzz/harfbuzz_unbreak_abi.patch.gz
deleted file mode 100644
index 029aaae..0000000
--- a/deps/harfbuzz/harfbuzz_unbreak_abi.patch.gz
+++ /dev/null
Binary files differ