packages: kde4-kdenetwork/kde4-kdenetwork-FindLibgadu.patch, kde4-kdenetwor...

Fri Jul 31 22:37:47 CEST 2009

Author: arekm                        Date: Fri Jul 31 20:37:46 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- from DEVEL

---- Files affected:
packages/kde4-kdenetwork:
   kde4-kdenetwork-FindLibgadu.patch (1.2 -> 1.3) 
packages/kde4-kdenetwork:
   kde4-kdenetwork-libknotification.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/kde4-kdenetwork/kde4-kdenetwork-FindLibgadu.patch
diff -u /dev/null packages/kde4-kdenetwork/kde4-kdenetwork-FindLibgadu.patch:1.3

--- /dev/null	Fri Jul 31 22:37:47 2009
+++ packages/kde4-kdenetwork/kde4-kdenetwork-FindLibgadu.patch	Fri Jul 31 22:37:41 2009
@@ -0,0 +1,48 @@
+--- kopete/cmake/modules/FindLibgadu.cmake	2009-06-17 22:08:12.000000000 +0200
++++ kopete/cmake/modules/FindLibgadu.cmake-new	2009-07-04 16:49:57.586710508 +0200
+@@ -23,32 +23,18 @@
+         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_path (LIBGADU_INCLUDE_DIR libgadu.h
++		PATHS
++	    	/usr/include	
++		)
+ 
+             find_library (LIBGADU_LIBRARIES NAMES gadu
+                 PATHS
+-                ${PC_LIBGADU_LIBDIR}
++		/usr/lib64
++		/usr/lib
+                 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
+@@ -89,4 +75,4 @@
+ 
+     endif (NOT WIN32)
+ 
+-endif (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)
+\ Brak znaku nowej linii na koñcu pliku
++endif (LIBGADU_INCLUDE_DIR AND LIBGADU_LIBRARIES)

================================================================
Index: packages/kde4-kdenetwork/kde4-kdenetwork-libknotification.patch
diff -u /dev/null packages/kde4-kdenetwork/kde4-kdenetwork-libknotification.patch:1.3
--- /dev/null	Fri Jul 31 22:37:47 2009
+++ packages/kde4-kdenetwork/kde4-kdenetwork-libknotification.patch	Fri Jul 31 22:37:45 2009
@@ -0,0 +1,94 @@
+diff -urN kget-4.2.87.old/cmake/modules/FindLibKNotificationItem-1.cmake kget-4.2.87/cmake/modules/FindLibKNotificationItem-1.cmake
+--- kget-4.2.87.old/cmake/modules/FindLibKNotificationItem-1.cmake	2009-05-19 16:06:49.000000000 +0400
++++ kget-4.2.87/cmake/modules/FindLibKNotificationItem-1.cmake	1970-01-01 03:00:00.000000000 +0300
+@@ -1,37 +0,0 @@
+-# - Find libknotification-1 library
+-# Find the libknotification-1. This is an experimental library which is not 
+-# supposed to stay source- or binary compatible, it may even go away in the future again.
+-#
+-# This module defines
+-#  LIBKNOTIFICATIONITEM-1_FOUND - whether the libkonitification-1 library was found
+-#  LIBKNOTIFICATIONITEM-1_LIBRARIES - the libknotification-1 library
+-#  LIBKNOTIFICATIONITEM-1_INCLUDE_DIR - the include path of the libknotification-1 library
+-
+-
+-
+-find_library (LIBKNOTIFICATIONITEM-1_LIBRARY
+-  NAMES
+-  knotificationitem-1
+-  HINTS
+-  ${LIB_INSTALL_DIR}
+-  ${KDE4_LIB_DIR}
+-)
+-
+-set(LIBKNOTIFICATIONITEM-1_LIBRARIES  ${LIBKNOTIFICATIONITEM-1_LIBRARY})
+-
+-find_path (LIBKNOTIFICATIONITEM-1_INCLUDE_DIR
+-  NAMES
+-  knotificationitem.h
+-  PATH_SUFFIXES
+-  knotificationitem-1
+-  HINTS
+-  ${INCLUDE_INSTALL_DIR}
+-  ${KDE4_INCLUDE_DIR}
+-)
+-
+-
+-
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(LibKNotificationItem-1  DEFAULT_MSG  LIBKNOTIFICATIONITEM-1_LIBRARY LIBKNOTIFICATIONITEM-1_INCLUDE_DIR)
+-
+-mark_as_advanced(LIBKNOTIFICATIONITEM-1_INCLUDE_DIR LIBKNOTIFICATIONITEM-1_LIBRARY)
+diff -urN kget-4.2.87.old/cmake/modules/FindLibKNotificationItem-1_New.cmake kget-4.2.87/cmake/modules/FindLibKNotificationItem-1_New.cmake
+--- kget-4.2.87.old/cmake/modules/FindLibKNotificationItem-1_New.cmake	1970-01-01 03:00:00.000000000 +0300
++++ kget-4.2.87/cmake/modules/FindLibKNotificationItem-1_New.cmake	2009-05-19 16:06:49.000000000 +0400
+@@ -0,0 +1,37 @@
++# - Find libknotification-1 library
++# Find the libknotification-1. This is an experimental library which is not 
++# supposed to stay source- or binary compatible, it may even go away in the future again.
++#
++# This module defines
++#  LIBKNOTIFICATIONITEM-1_FOUND - whether the libkonitification-1 library was found
++#  LIBKNOTIFICATIONITEM-1_LIBRARIES - the libknotification-1 library
++#  LIBKNOTIFICATIONITEM-1_INCLUDE_DIR - the include path of the libknotification-1 library
++
++
++
++find_library (LIBKNOTIFICATIONITEM-1_LIBRARY
++  NAMES
++  knotificationitem-1
++  HINTS
++  ${LIB_INSTALL_DIR}
++  ${KDE4_LIB_DIR}
++)
++
++set(LIBKNOTIFICATIONITEM-1_LIBRARIES  ${LIBKNOTIFICATIONITEM-1_LIBRARY})
++
++find_path (LIBKNOTIFICATIONITEM-1_INCLUDE_DIR
++  NAMES
++  knotificationitem.h
++  PATH_SUFFIXES
++  knotificationitem-1
++  HINTS
++  ${INCLUDE_INSTALL_DIR}
++  ${KDE4_INCLUDE_DIR}
++)
++
++
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(LibKNotificationItem-1  DEFAULT_MSG  LIBKNOTIFICATIONITEM-1_LIBRARY LIBKNOTIFICATIONITEM-1_INCLUDE_DIR)
++
++mark_as_advanced(LIBKNOTIFICATIONITEM-1_INCLUDE_DIR LIBKNOTIFICATIONITEM-1_LIBRARY)
+diff -urN kget-4.2.87.old/CMakeLists.txt kget-4.2.87/CMakeLists.txt
+--- kget-4.2.87.old/CMakeLists.txt	2009-05-21 20:15:55.000000000 +0400
++++ kget-4.2.87/CMakeLists.txt	2009-05-21 20:16:29.932032646 +0400
+@@ -46,7 +46,7 @@
+ macro_optional_find_package(JPEG)
+ macro_log_feature(JPEG_FOUND "libjpeg" "Development library for JPEG formatted image files" "http://www.ijg.org/" FALSE "" "Provides JPEG images in Krdc.")
+ 
+-macro_optional_find_package(LibKNotificationItem-1)
++macro_optional_find_package(LibKNotificationItem-1_New)
+ macro_log_feature(LIBKNOTIFICATIONITEM-1_FOUND "libknotificationitem" "The KDE4 implementation of the experimental next-gen systray protocol" "" FALSE "" "Provides enhanced systray in KGet.")
+ 
+ macro_optional_find_package(Soprano)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdenetwork/kde4-kdenetwork-FindLibgadu.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdenetwork/kde4-kdenetwork-libknotification.patch?r1=1.2&r2=1.3&f=u

