rpms/kdenetwork/F-9 kdenetwork-4.1.4-system-libgadu.patch, NONE, 1.1 kdenetwork.spec, 1.159, 1.160

Kevin Kofler kkofler at fedoraproject.org
Mon Jan 12 18:40:55 UTC 2009


Author: kkofler

Update of /cvs/pkgs/rpms/kdenetwork/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13259/F-9

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.1.4-system-libgadu.patch 
Log Message:
* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
- build against system libgadu (trivial patch backported from 4.3)

kdenetwork-4.1.4-system-libgadu.patch:

--- NEW FILE kdenetwork-4.1.4-system-libgadu.patch ---
diff -Nur kdenetwork-4.1.4/cmake/modules/FindLibgadu.cmake kdenetwork-4.1.4-system-libgadu/cmake/modules/FindLibgadu.cmake
--- kdenetwork-4.1.4/cmake/modules/FindLibgadu.cmake	1970-01-01 01:00:00.000000000 +0100
+++ kdenetwork-4.1.4-system-libgadu/cmake/modules/FindLibgadu.cmake	2009-01-12 19:27:37.000000000 +0100
@@ -0,0 +1,72 @@
+# - Try to find libgadu (Gadu Gadu protocol support library)
+# Once done this will define
+#
+#  LIBGADU_FOUND - system has LIBGADU
+#  LIBGADU_INCLUDE_DIR - the LIBGADU include directory
+#  LIBGADU_LIBRARIES - the libraries needed to use LIBGADU
+#  LIBGADU_DEFINITIONS - Compiler switches required for using LIBGADU
+#
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+
+# Copyright (c) 2008, Maciej Mrozowski, <reavertm at poczta.fm>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include (FindLibraryWithDebug)
+
+if (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    # in cache already
+    set (LIBGADU_FOUND TRUE)
+
+else (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+
+    if (NOT WIN32)
+
+        find_package (PkgConfig)
+        pkg_check_modules (PC_LIBGADU libgadu)
+
+        # If pkgconfig found libgadu, get the full path to the library using find_library()
+        # but only in the path reported by pkgconfig.
+        # Otherwise do a normal search.
+        if (PC_LIBGADU_FOUND)
+
+            set (LIBGADU_DEFINITIONS ${PC_LIBGADU_CFLAGS})
+
+            if (PC_LIBGADU_INCLUDE_DIRS)
+                set (LIBGADU_INCLUDE_DIR ${PC_LIBGADU_INCLUDE_DIRS})
+            else (PC_LIBGADU_INCLUDE_DIRS)
+                find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+            endif (PC_LIBGADU_INCLUDE_DIRS)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu
+                PATHS
+                ${PC_LIBGADU_LIBDIR}
+                NO_DEFAULT_PATH
+            )
+
+        else (PC_LIBGADU_FOUND)
+
+            find_library (LIBGADU_LIBRARIES NAMES gadu)
+            find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+        endif (PC_LIBGADU_FOUND)
+
+    else (NOT WIN32)
+
+        find_library_with_debug (LIBGADU_LIBRARIES
+            WIN32_DEBUG_POSTFIX d
+            NAMES gadu
+        )
+        find_path (LIBGADU_INCLUDE_DIR libgadu.h PATH_SUFFIXES libgadu)
+
+    endif (NOT WIN32)
+
+    include (FindPackageHandleStandardArgs)
+    find_package_handle_standard_args (LIBGADU DEFAULT_MSG LIBGADU_LIBRARIES LIBGADU_INCLUDE_DIR)
+
+    mark_as_advanced (LIBGADU_INCLUDE_DIR LIBGADU_LIBRARIES)
+
+endif (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
diff -Nur kdenetwork-4.1.4/kopete/CMakeLists.txt kdenetwork-4.1.4-system-libgadu/kopete/CMakeLists.txt
--- kdenetwork-4.1.4/kopete/CMakeLists.txt	2008-03-13 09:16:02.000000000 +0100
+++ kdenetwork-4.1.4-system-libgadu/kopete/CMakeLists.txt	2009-01-12 19:27:37.000000000 +0100
@@ -29,6 +29,10 @@
 macro_bool_to_01(LIBOTR_FOUND HAVE_LIBOTR)
 macro_log_feature(LIBOTR_FOUND "libotr" "A library to encrypt messages with Off-the-Record encryption" "http://www.cypherpunks.ca/otr" FALSE "3.1.0" "Required for the Kopete otr plugin.")
 
+macro_optional_find_package(Libgadu)
+macro_bool_to_01(LIBGADU_FOUND HAVE_LIBGADU)
+macro_log_feature(LIBGADU_FOUND "libgadu" "A library providing support for Gadu-Gadu protocol" "http://toxygen.net/libgadu/" FALSE "1.8.0" "Required for Kopete Gadu-Gadu protocol")
+
 check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H)
 check_include_files(stdint.h HAVE_STDINT_H)
 check_include_files(inttypes.h HAVE_INTTYPES_H)
diff -Nur kdenetwork-4.1.4/kopete/protocols/CMakeLists.txt kdenetwork-4.1.4-system-libgadu/kopete/protocols/CMakeLists.txt
--- kdenetwork-4.1.4/kopete/protocols/CMakeLists.txt	2008-05-29 13:19:54.000000000 +0200
+++ kdenetwork-4.1.4-system-libgadu/kopete/protocols/CMakeLists.txt	2009-01-12 19:27:37.000000000 +0100
@@ -1,6 +1,3 @@
-macro_optional_find_package(OpenSSL)
-macro_log_feature(OPENSSL_FOUND "OpenSSL" "A toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols" "http://openssl.org" FALSE "" "Required for the Kopete Gadu-Gadu protocol.")
-
 # On Solaris, some of the name resolution functions are in libnsl;
 # this needs to be linked in if found. Copied from kdelibs.
 check_library_exists(nsl gethostbyname "" HAVE_NSL_LIBRARY)
@@ -40,9 +37,9 @@
   if(WITH_winpopup)
     add_subdirectory( winpopup )
   endif(WITH_winpopup)
-  if(WITH_gadu AND OPENSSL_FOUND)
+  if(WITH_gadu AND LIBGADU_FOUND)
 	add_subdirectory( gadu )
-  endif(WITH_gadu AND OPENSSL_FOUND)
+  endif(WITH_gadu AND LIBGADU_FOUND)
   if(WITH_sms)
     add_subdirectory( sms )
   endif(WITH_sms)
diff -Nur kdenetwork-4.1.4/kopete/protocols/gadu/CMakeLists.txt kdenetwork-4.1.4-system-libgadu/kopete/protocols/gadu/CMakeLists.txt
--- kdenetwork-4.1.4/kopete/protocols/gadu/CMakeLists.txt	2008-08-28 10:08:01.000000000 +0200
+++ kdenetwork-4.1.4-system-libgadu/kopete/protocols/gadu/CMakeLists.txt	2009-01-12 19:27:37.000000000 +0100
@@ -3,11 +3,8 @@
 KDE4_NO_ENABLE_FINAL(kopete)
 
 add_subdirectory( icons ) 
-add_subdirectory( libgadu )
 
-include_directories( ${KOPETE_INCLUDES} 
-${CMAKE_CURRENT_SOURCE_DIR}/libgadu/ 
-${CMAKE_CURRENT_BINARY_DIR}/libgadu/ 
+include_directories( ${KOPETE_INCLUDES} ${LIBGADU_INCLUDE_DIRS} }
 )
 
 
@@ -46,7 +43,7 @@
 kde4_add_plugin(kopete_gadu ${kopete_gadu_PART_SRCS})
 
 
-target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} gadu_kopete kopete )
+target_link_libraries(kopete_gadu ${KDE4_KIO_LIBS} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${LIBGADU_LIBRARIES} kopete )
 
 install(TARGETS kopete_gadu  DESTINATION ${PLUGIN_INSTALL_DIR})
 


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-9/kdenetwork.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kdenetwork.spec	9 Jan 2009 10:38:40 -0000	1.159
+++ kdenetwork.spec	12 Jan 2009 18:40:24 -0000	1.160
@@ -5,13 +5,17 @@
 Name: kdenetwork
 Epoch: 7
 Version: 4.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0: kdenetwork-4.1.3-handle-enc-message.patch 
+Patch0: kdenetwork-4.1.3-handle-enc-message.patch
+# build Kopete against the system libgadu (backported from 4.3)
+# http://websvn.kde.org/?view=rev&revision=909144
+# http://websvn.kde.org/?view=rev&revision=909145
+Patch100: kdenetwork-4.1.4-system-libgadu.patch
 
 # upstream patches
 
@@ -30,6 +34,7 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: kdebase-workspace-devel >= %{version}
+BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
 BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
@@ -92,6 +97,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .handle-enc-message
+%patch100 -p1 -b .system-libgadu
+rm -rf kopete/protocols/gadu/libgadu/
 
 %build
 mkdir -p %{_target_platform}
@@ -166,14 +173,17 @@
 
 
 %changelog
+* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
+- build against system libgadu (trivial patch backported from 4.3)
+
 * Fri Jan  9 2009 Lukáš Tinkl <ltinkl at redhat.com> 4.1.4-1
 - KDE 4.1.4
 
-* Thu Dec 11 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
+* Wed Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
 - fix kopete jabber protocol encrypted message handling (#473412)
 
-* Wed Nov  5 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
 
 * Mon Oct 20 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.2-3
 - fix kopete crashes on logout (kdebug:172011), in the account editor




More information about the fedora-extras-commits mailing list