diff options
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 |
commit | da1be5a21ba06235b67a999f696ec66e35dc17a1 (patch) | |
tree | 6df637d821a6ac0ad65f8caaf967ea2a6956a862 /deps/poppler | |
parent | b1b35d20ce6b70330b23a9d056dcb44b58795bd6 (diff) | |
download | ktown-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/poppler')
-rwxr-xr-x | deps/poppler/poppler.SlackBuild | 4 | ||||
-rw-r--r-- | deps/poppler/poppler.mocversiongrep.patch | 28 | ||||
-rw-r--r-- | deps/poppler/poppler.mocversiongrep.patch.gz | bin | 532 -> 0 bytes |
3 files changed, 30 insertions, 2 deletions
diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild index 0ad28a4..e36953a 100755 --- a/deps/poppler/poppler.SlackBuild +++ b/deps/poppler/poppler.SlackBuild @@ -22,7 +22,7 @@ PKGNAM=poppler -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-0.24.3} BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -82,7 +82,7 @@ tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 # Properly detect Qt5: -zcat $CWD/poppler.mocversiongrep.patch.gz | patch -p1 --verbose || exit 1 +cat $CWD/poppler.mocversiongrep.patch | patch -p1 --verbose || exit 1 chown -R root:root . find . \ diff --git a/deps/poppler/poppler.mocversiongrep.patch b/deps/poppler/poppler.mocversiongrep.patch new file mode 100644 index 0000000..1343f8f --- /dev/null +++ b/deps/poppler/poppler.mocversiongrep.patch @@ -0,0 +1,28 @@ +diff -up poppler-0.24.2/configure.ac.mocversiongrep poppler-0.24.2/configure.ac +--- poppler-0.24.2/configure.ac.mocversiongrep 2013-10-18 09:51:24.223114884 -0500 ++++ poppler-0.24.2/configure.ac 2013-10-18 09:54:33.408681067 -0500 +@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; the + AC_CHECK_TOOL(MOCQT5, moc) + AC_MSG_CHECKING([for Qt5 moc]) + mocversion=`$MOCQT5 -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5"` ++ mocversiongrep=`echo $mocversion | grep " 5\."` + if test x"$mocversiongrep" != x"$mocversion"; then + AC_MSG_RESULT([no]) + # moc was not the qt5 one, try with moc-qt5 + AC_CHECK_TOOL(MOCQT52, moc-qt5) + AC_MSG_CHECKING([for Qt5 moc-qt5]) + mocversion=`$MOCQT52 -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5"` ++ mocversiongrep=`echo $mocversion | grep " 5\."` + if test x"$mocversiongrep" != x"$mocversion"; then + AC_CHECK_TOOL(QTCHOOSER, qtchooser) + AC_MSG_CHECKING([for qtchooser]) + qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` + mocversion=`$qt5tooldir/moc -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5"` ++ mocversiongrep=`echo $mocversion | grep " 5\."` + if test x"$mocversiongrep" != x"$mocversion"; then + # no valid moc found + enable_poppler_qt5=no; + diff --git a/deps/poppler/poppler.mocversiongrep.patch.gz b/deps/poppler/poppler.mocversiongrep.patch.gz Binary files differdeleted file mode 100644 index c478695..0000000 --- a/deps/poppler/poppler.mocversiongrep.patch.gz +++ /dev/null |