[arch-commits] Commit in kdenetwork/kde-unstable (2 files)

[Andrea Scarpino]

    Date: Tuesday, December 14, 2010 @ 13:16:19
  Author: andrea
Revision: 103099

fix libvncserver detection

Added:
  kdenetwork/kde-unstable/fix-libvncserver-detection.patch
Modified:
  kdenetwork/kde-unstable/PKGBUILD

----------------------------------+
 PKGBUILD                         |    9 ++++++---
 fix-libvncserver-detection.patch |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-14 17:21:06 UTC (rev 103098)
+++ PKGBUILD	2010-12-14 18:16:19 UTC (rev 103099)
@@ -11,7 +11,7 @@
          'kdenetwork-krdc'
          'kdenetwork-krfb')
 pkgver=4.5.85
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -21,14 +21,17 @@
 	'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
 	'telepathy-qt4' 'docbook-xsl' 'libktorrent' 'kwebkitpart')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'fix-kget-libktorrent.patch')
+        'fix-kget-libktorrent.patch'
+        'fix-libvncserver-detection.patch')
 sha1sums=('4c2570b918a3fb6f3f86b55647123e79c03e8b20'
-        'c5d467fc450ff70da69eca5567f25348e242765e')
+        'c5d467fc450ff70da69eca5567f25348e242765e'
+        'df4688ebda2799420dd65171eb4198be5adac134')
 
 build() {
     # Already fixed upstream
     cd ${srcdir}/${pkgbase}-${pkgver}
     patch -Np0 -i ${srcdir}/fix-kget-libktorrent.patch
+    patch -Np0 -i ${srcdir}/fix-libvncserver-detection.patch
 
 	cd ${srcdir}
 	mkdir build

Added: fix-libvncserver-detection.patch
===================================================================
--- fix-libvncserver-detection.patch	                        (rev 0)
+++ fix-libvncserver-detection.patch	2010-12-14 18:16:19 UTC (rev 103099)
@@ -0,0 +1,24 @@
+Index: krdc/CMakeLists.txt
+===================================================================
+--- krdc/CMakeLists.txt	(revision 1203716)
++++ krdc/CMakeLists.txt	(revision 1203717)
+@@ -27,9 +27,6 @@
+     add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
+     include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+ 
+-    macro_optional_find_package(LibVNCServer)
+-    macro_log_feature(LIBVNCSERVER_FOUND "libvncserver" "VNC Server library" "http://libvncserver.sourceforge.net/" FALSE "0.9" "Needed to build Krfb and VNC support in Krdc")
+-
+     # NX support is not ready for KDE 4.2; disabled (uwolfer)
+     # macro_optional_find_package(LibNXCL)
+     # macro_log_feature(LIBNXCL_FOUND "libnxcl" "NX X compression client library" "http://svn.berlios.de/svnroot/repos/freenx/trunk/freenx-client/nxcl/" FALSE "1.0" "Needed to build Krdc with NX support")
+@@ -48,6 +45,9 @@
+ 
+ endif(NOT INSIDE_KDENETWORK)
+ 
++macro_optional_find_package(LibVNCServer)
++macro_log_feature(LIBVNCSERVER_FOUND "libvncserver" "VNC Server library" "http://libvncserver.sourceforge.net/" FALSE "0.9" "Needed to build Krfb and VNC support in Krdc")
++
+ include_directories(
+     ${CMAKE_CURRENT_SOURCE_DIR}
+     ${CMAKE_CURRENT_SOURCE_DIR}/core/