diff options
| author | root <root@rshg054.dnsready.net> | 2012-11-22 02:31:09 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-11-22 02:31:09 -0800 |
| commit | 38ea2e71952c00f18230ed0e691532aadff4e2c1 (patch) | |
| tree | bc1c7cfd697773062d53a0a23b35afdb0fc775c2 /kde-unstable/kdepim/fix-build.patch | |
| parent | f48f6c82e23a3bacb8a0952c2d2cf9af1e6bf42d (diff) | |
Thu Nov 22 02:27:52 PST 2012
Diffstat (limited to 'kde-unstable/kdepim/fix-build.patch')
| -rw-r--r-- | kde-unstable/kdepim/fix-build.patch | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/kde-unstable/kdepim/fix-build.patch b/kde-unstable/kdepim/fix-build.patch index b42046677..7060e814f 100644 --- a/kde-unstable/kdepim/fix-build.patch +++ b/kde-unstable/kdepim/fix-build.patch @@ -1,32 +1,11 @@ -From: Allen Winter <winter@kde.org> -Date: Thu, 31 May 2012 16:58:07 +0000 -Subject: Revert last: Remove X11 requirement -X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=26f9d62b9a9b4bfa736b342903d16dc0d8739d98 ---- -Revert last: Remove X11 requirement - -CCMAIL: djarvie@kde.org -David, without explicit linking to X11 libs, I get an unresolved -symbol for XSetWMHints ---- - - ---- 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) +--- kdepim-4.9.0/kleopatra/CMakeLists.txt~ 2012-07-30 08:06:15.031181647 +0000 ++++ kdepim-4.9.0/kleopatra/CMakeLists.txt 2012-07-30 08:07:13.594082584 +0000 +@@ -365,7 +365,7 @@ + endif(KDEPIM_MOBILE_UI) - + add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 ) +- ++add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED ) + + kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png") + kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS} ) |