[krfb] 4.13.97
Rex Dieter
rdieter at fedoraproject.org
Wed Aug 6 14:07:17 UTC 2014
commit 7e50591d694f64a124d3fa31ee8f0ffd436d07ca
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Aug 6 09:07:15 2014 -0500
4.13.97
.gitignore | 2 +-
krfb-unbundle_libvncserver.patch | 36 ++++++++++++++++++------------------
krfb.spec | 7 +++++--
sources | 2 +-
4 files changed, 25 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd315d9..4a31220 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/krfb-4.13.3.tar.xz
+/krfb-4.13.97.tar.xz
diff --git a/krfb-unbundle_libvncserver.patch b/krfb-unbundle_libvncserver.patch
index 2bc8ead..4f726cd 100644
--- a/krfb-unbundle_libvncserver.patch
+++ b/krfb-unbundle_libvncserver.patch
@@ -1,6 +1,6 @@
-diff -up krfb-4.13.3/CMakeLists.txt.unbundle_libvncserver krfb-4.13.3/CMakeLists.txt
---- krfb-4.13.3/CMakeLists.txt.unbundle_libvncserver 2014-01-06 21:51:44.000000000 -0600
-+++ krfb-4.13.3/CMakeLists.txt 2014-08-03 19:35:37.970707309 -0500
+diff -up krfb-4.13.97/CMakeLists.txt.unbundle_libvncserver krfb-4.13.97/CMakeLists.txt
+--- krfb-4.13.97/CMakeLists.txt.unbundle_libvncserver 2014-04-15 16:12:33.000000000 -0500
++++ krfb-4.13.97/CMakeLists.txt 2014-08-06 09:05:39.058624646 -0500
@@ -26,6 +26,9 @@ if(NOT INSIDE_KDENETWORK)
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
endif(NOT INSIDE_KDENETWORK)
@@ -8,10 +8,10 @@ diff -up krfb-4.13.3/CMakeLists.txt.unbundle_libvncserver krfb-4.13.3/CMakeLists
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+find_package(LibVNCServer REQUIRED)
+
- macro_optional_find_package(TelepathyQt4)
- macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.9" "Needed to build Telepathy Tubes support.")
-
-@@ -35,8 +38,6 @@ macro_bool_to_01(X11_XShm_FOUND HAVE_XSH
+ set(IS_KTP_INTERNAL_MODULE TRUE)
+ set(CMAKE_MODULE_PATH
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
+@@ -44,8 +47,6 @@ macro_bool_to_01(X11_XShm_FOUND HAVE_XSH
include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb"
"${CMAKE_CURRENT_SOURCE_DIR}/krfb"
"${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui"
@@ -20,7 +20,7 @@ diff -up krfb-4.13.3/CMakeLists.txt.unbundle_libvncserver krfb-4.13.3/CMakeLists
)
if(Q_WS_X11)
-@@ -45,9 +46,8 @@ if(Q_WS_X11)
+@@ -54,9 +55,8 @@ if(Q_WS_X11)
endif(NOT X11_XTest_FOUND)
endif(Q_WS_X11)
@@ -31,9 +31,9 @@ diff -up krfb-4.13.3/CMakeLists.txt.unbundle_libvncserver krfb-4.13.3/CMakeLists
add_subdirectory(doc)
if (NOT INSIDE_KDENETWORK)
-diff -up krfb-4.13.3/cmake/modules/FindLibVNCServer.cmake.unbundle_libvncserver krfb-4.13.3/cmake/modules/FindLibVNCServer.cmake
---- krfb-4.13.3/cmake/modules/FindLibVNCServer.cmake.unbundle_libvncserver 2014-08-03 19:35:27.987812554 -0500
-+++ krfb-4.13.3/cmake/modules/FindLibVNCServer.cmake 2014-08-03 19:35:27.987812554 -0500
+diff -up krfb-4.13.97/cmake/modules/FindLibVNCServer.cmake.unbundle_libvncserver krfb-4.13.97/cmake/modules/FindLibVNCServer.cmake
+--- krfb-4.13.97/cmake/modules/FindLibVNCServer.cmake.unbundle_libvncserver 2014-08-06 09:04:40.532236267 -0500
++++ krfb-4.13.97/cmake/modules/FindLibVNCServer.cmake 2014-08-06 09:04:40.532236267 -0500
@@ -0,0 +1,41 @@
+# cmake macro to test LIBVNCSERVER LIB
+
@@ -77,9 +77,9 @@ diff -up krfb-4.13.3/cmake/modules/FindLibVNCServer.cmake.unbundle_libvncserver
+
+MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES)
\ No newline at end of file
-diff -up krfb-4.13.3/krfb/CMakeLists.txt.unbundle_libvncserver krfb-4.13.3/krfb/CMakeLists.txt
---- krfb-4.13.3/krfb/CMakeLists.txt.unbundle_libvncserver 2014-01-06 21:51:44.000000000 -0600
-+++ krfb-4.13.3/krfb/CMakeLists.txt 2014-08-03 19:35:27.987812554 -0500
+diff -up krfb-4.13.97/krfb/CMakeLists.txt.unbundle_libvncserver krfb-4.13.97/krfb/CMakeLists.txt
+--- krfb-4.13.97/krfb/CMakeLists.txt.unbundle_libvncserver 2014-04-15 16:12:33.000000000 -0500
++++ krfb-4.13.97/krfb/CMakeLists.txt 2014-08-06 09:04:40.533236257 -0500
@@ -20,6 +20,7 @@ target_link_libraries (krfbprivate
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
@@ -88,7 +88,7 @@ diff -up krfb-4.13.3/krfb/CMakeLists.txt.unbundle_libvncserver krfb-4.13.3/krfb/
)
set_target_properties (krfbprivate PROPERTIES
-@@ -104,6 +105,7 @@ target_link_libraries (krfb
+@@ -103,6 +104,7 @@ target_link_libraries (krfb
${QT_QTNETWORK_LIBRARY}
${KDE4_KDNSSD_LIBS}
${KDE4_KDEUI_LIBS}
@@ -96,9 +96,9 @@ diff -up krfb-4.13.3/krfb/CMakeLists.txt.unbundle_libvncserver krfb-4.13.3/krfb/
)
if(TelepathyQt4_FOUND)
-diff -up krfb-4.13.3/krfb/rfb.h.unbundle_libvncserver krfb-4.13.3/krfb/rfb.h
---- krfb-4.13.3/krfb/rfb.h.unbundle_libvncserver 2014-01-06 21:51:44.000000000 -0600
-+++ krfb-4.13.3/krfb/rfb.h 2014-08-03 19:35:27.987812554 -0500
+diff -up krfb-4.13.97/krfb/rfb.h.unbundle_libvncserver krfb-4.13.97/krfb/rfb.h
+--- krfb-4.13.97/krfb/rfb.h.unbundle_libvncserver 2014-04-15 16:12:33.000000000 -0500
++++ krfb-4.13.97/krfb/rfb.h 2014-08-06 09:04:40.533236257 -0500
@@ -6,7 +6,7 @@
#ifndef KRFB_RFB_H
#define KRFB_RFB_H
diff --git a/krfb.spec b/krfb.spec
index 69f6188..d7f7b47 100644
--- a/krfb.spec
+++ b/krfb.spec
@@ -1,8 +1,8 @@
Name: krfb
Summary: Desktop sharing
-Version: 4.13.3
-Release: 4%{?dist}
+Version: 4.13.97
+Release: 1%{?dist}
License: GPLv2+ and GFDL
URL: https://projects.kde.org/projects/kde/kdenetwork/%{name}
@@ -129,6 +129,9 @@ fi
%changelog
+* Tue Aug 05 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.13.97-1
+- 4.13.97
+
* Mon Aug 04 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.3-4
- fix system_libvncserver (f21+), else use system minilzo
diff --git a/sources b/sources
index 9fef3d2..ee1ca17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a440d4e909c93be2f8b5c75784568c6 krfb-4.13.3.tar.xz
+b02399720841f636d1008cc84d894451 krfb-4.13.97.tar.xz
More information about the scm-commits
mailing list