[kdepim] link libX11 for kalarm
Jaroslav Reznik
jreznik at fedoraproject.org
Sun Jun 3 20:12:25 UTC 2012
commit 249513820217124e880cfebb9294e7f0d3069e8e
Author: Jaroslav Reznik <jreznik at redhat.com>
Date: Sun Jun 3 13:12:27 2012 +0200
link libX11 for kalarm
kdepim-4.8.80-link-x11.patch | 19 +++++++++++++++++++
kdepim.spec | 3 +++
2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/kdepim-4.8.80-link-x11.patch b/kdepim-4.8.80-link-x11.patch
new file mode 100644
index 0000000..6d8b568
--- /dev/null
+++ b/kdepim-4.8.80-link-x11.patch
@@ -0,0 +1,19 @@
+diff -up kdepim-4.8.80/kalarm/CMakeLists.txt.link-x11 kdepim-4.8.80/kalarm/CMakeLists.txt
+--- kdepim-4.8.80/kalarm/CMakeLists.txt.link-x11 2012-05-31 09:45:10.000000000 +0200
++++ kdepim-4.8.80/kalarm/CMakeLists.txt 2012-06-03 13:08:04.586607658 +0200
+@@ -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)
+
diff --git a/kdepim.spec b/kdepim.spec
index 8e2d9e1..4e2a307 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -20,6 +20,8 @@ Patch0: kdepim-4.5.85-install-headers.patch
# fix KMail migration (kde#283563)
Patch2: kdepim-4.7.2-kmail-migration.patch
+# link libX11 DSO, upstreamable
+Patch3: kdepim-4.8.80-link-x11.patch
# upstream patches
@@ -94,6 +96,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%patch0 -p1 -b .install-headers
%patch2 -p1 -b .kmail-migration
+%patch3 -p1 -b .link-x11
%build
More information about the scm-commits
mailing list