diff options
| author |   Eric Hameleers <alien@slackware.com> | 2014-12-22 15:09:16 +0100 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2014-12-22 15:09:16 +0100 |
| commit | 8d7dd4892e8aa73ce7c3ea73f48a5274e48f5428 (patch) | |
| tree | f3e3dc663a60572cf6a7feb61af560b83ac81221 /kde/patch/kdepim | |
| parent | eb82fdc2eafc3d1b5f837fcda2c4903106d9d79a (diff) | |
| download | ktown-8d7dd4892e8aa73ce7c3ea73f48a5274e48f5428.tar.gz ktown-8d7dd4892e8aa73ce7c3ea73f48a5274e48f5428.tar.xz | |
KDE 4.9.5 for Slackware 14.0 (02jan2013)4.9.5
Diffstat (limited to '')
| -rw-r--r-- | kde/patch/kdepim.patch | 3 | ||||
| -rw-r--r-- | kde/patch/kdepim/kdepim-4.8.80_x11libs.patch | 30 |
2 files changed, 33 insertions, 0 deletions
diff --git a/kde/patch/kdepim.patch b/kde/patch/kdepim.patch index 1934e35..516270d 100644 --- a/kde/patch/kdepim.patch +++ b/kde/patch/kdepim.patch @@ -9,3 +9,6 @@ cat $CWD/patch/kdepim/kdepim-4.5.85-install-headers.patch | patch -p1 --verbose # (it got included in the tarball _just_ before the release) #cat $CWD/patch/kdepim/kdepim-4.8.1_bug_258551.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Build fix for 4.8.80 but does nnot seem to be needed on Slackware: +#cat $CWD/patch/kdepim/kdepim-4.8.80_x11libs.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch b/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch new file mode 100644 index 0000000..f87d8f4 --- /dev/null +++ b/kde/patch/kdepim/kdepim-4.8.80_x11libs.patch @@ -0,0 +1,30 @@ +commit 26f9d62b9a9b4bfa736b342903d16dc0d8739d98 +Author: Allen Winter <winter@kde.org> +Date: Thu May 31 12:58:07 2012 -0400 + + Revert last: Remove X11 requirement + + CCMAIL: djarvie@kde.org + David, without explicit linking to X11 libs, I get an unresolved + symbol for XSetWMHints + +diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt +index 9efb9a1..97e69a8 100644 +--- a/kalarm/CMakeLists.txt ++++ b/kalarm/CMakeLists.txt +@@ -202,6 +202,7 @@ if(KALARM_USE_AKONADI) + kdepim + ${KDE4_KCMUTILS_LIBS} + ${KDE4_PHONON_LIBS} ++ ${X11_X11_LIB} + ) + else(KALARM_USE_AKONADI) + target_link_libraries(kalarm_bin +@@ -220,6 +221,7 @@ else(KALARM_USE_AKONADI) + kdepim + ${KDE4_KCMUTILS_LIBS} + ${KDE4_PHONON_LIBS} ++ ${X11_X11_LIB} + ) + endif(KALARM_USE_AKONADI) + |