[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdebase/workspace
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2009-07-12 20:01:03
Message-ID: 1247428863.907715.30903.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 995473 by aacid:

Backport 992187 + 991943 + 992182 as asked by Andriy Rysin
Fixes bug 199740
CCMAIL: arysin@gmail.com


 M  +10 -31    cmake/modules/FindLibXKlavier.cmake  
 M  +7 -4      kcontrol/kxkb/CMakeLists.txt  
 M  +5 -1      kcontrol/kxkb/xklavier_adaptor.cpp  


--- branches/KDE/4.3/kdebase/workspace/cmake/modules/FindLibXKlavier.cmake \
#995472:995473 @@ -2,49 +2,28 @@
 # Once done this will define
 #
 #  LIBXKLAVIER_FOUND - system has LibXKlavier
-#  LIBXKLAVIER_LIBRARIES - the libraries needed to use LibXKlavier
-#  LIBXKLAVIER_DEFINITIONS - Compiler switches required for using LibXKlavier
+#  LIBXKLAVIER_LDFLAGS - the libraries needed to use LibXKlavier
+#  LIBXKLAVIER_CFLAGS - Compiler switches required for using LibXKlavier
+#  LIBXKLAVIER_VERSION - Version of LibXKlavier
 
-if (LIBXKLAVIER_DEFINITIONS AND LIBXKLAVIER_LIBRARIES)
+if (LIBXKLAVIER_CFLAGS AND LIBXKLAVIER_LDFLAGS)
 
     # in cache already
     SET(LIBXKLAVIER_FOUND TRUE)
-  
-else (LIBXKLAVIER_DEFINITIONS AND LIBXKLAVIER_LIBRARIES)
 
+else (LIBXKLAVIER_CFLAGS AND LIBXKLAVIER_LDFLAGS)
+
     IF (NOT WIN32)
         # use pkg-config to get the directories and then use these values
         # in the FIND_PATH() and FIND_LIBRARY() calls
         INCLUDE(UsePkgConfig)
-        PKGCONFIG(libxklavier _LibXKlavierIncDir _LibXKlavierLinkDir \
_LibXKlavierLinkFlags _LibXKlavierCflags)  
-	if(_LibXKlavierLinkFlags)
-		# find again pkg-config, to query it about libxklavier version
-		FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config )
-
-		# query pkg-config asking for a libxklavier >= 3.0
-		EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=3.0 libxklavier \
                RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-		if(_return_VALUE STREQUAL "0")
-        		set(LIBXKLAVIER_DEFINITIONS ${_LibXKlavierCflags})
-		endif(_return_VALUE STREQUAL "0")
-	endif(_LibXKlavierLinkFlags)
-
+	pkg_check_modules(LIBXKLAVIER libxklavier>=3.0)
     ENDIF (NOT WIN32)
 
-#    FIND_PATH(LIBXKLAVIER_INCLUDE_DIR libxklavier/xklavier.h
-#      PATHS
-#      ${_LibXKlavierIncDir}
-#      PATH_SUFFIXES libxklavier
-#    )
-
-    FIND_LIBRARY(LIBXKLAVIER_LIBRARIES NAMES xklavier libxklavier
-      PATHS
-      ${_LibXKlavierLinkDir}
-    )
-
     include(FindPackageHandleStandardArgs)
-    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXKlavier DEFAULT_MSG \
LIBXKLAVIER_DEFINITIONS LIBXKLAVIER_LIBRARIES ) +    \
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXKlavier DEFAULT_MSG LIBXKLAVIER_CFLAGS \
LIBXKLAVIER_LDFLAGS)  
-    MARK_AS_ADVANCED(LIBXKLAVIER_DEFINITIONS LIBXKLAVIER_LIBRARIES)
+    MARK_AS_ADVANCED(LIBXKLAVIER_CFLAGS LIBXKLAVIER_LDFLAGS LIBXKLAVIER_VERSION)
 
-endif (LIBXKLAVIER_DEFINITIONS AND LIBXKLAVIER_LIBRARIES)
+endif (LIBXKLAVIER_CFLAGS AND LIBXKLAVIER_LDFLAGS)
--- branches/KDE/4.3/kdebase/workspace/kcontrol/kxkb/CMakeLists.txt #995472:995473
@@ -14,12 +14,15 @@
   if(LIBXKLAVIER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND)
     SET(HAVE_XKLAVIER TRUE)
 
-    SET(CMAKE_REQUIRED_DEFINITIONS ${LIBXKLAVIER_DEFINITIONS})
-    SET(CMAKE_REQUIRED_LIBRARIES ${LIBXKLAVIER_LIBRARIES})
+    SET(CMAKE_REQUIRED_DEFINITIONS ${LIBXKLAVIER_CFLAGS})
+    SET(CMAKE_REQUIRED_LIBRARIES ${LIBXKLAVIER_LDFLAGS})
 
     SET(XKB_SUPPORT_SRC xklavier_adaptor.cpp)
-    SET(XKB_SUPPORT_LIB ${LIBXKLAVIER_LIBRARIES} ${GOBJECT_LIBRARIES})
-    ADD_DEFINITIONS(-DHAVE_XKLAVIER=1 ${LIBXKLAVIER_DEFINITIONS} ${_LibGLIB2Cflags})
+    SET(XKB_SUPPORT_LIB ${LIBXKLAVIER_LDFLAGS} ${GOBJECT_LIBRARIES})
+    string(SUBSTRING ${LIBXKLAVIER_VERSION} 0 1 LIBXKLAVIER_VERSION_MAJOR)
+    string(SUBSTRING ${LIBXKLAVIER_VERSION} 2 1 LIBXKLAVIER_VERSION_MINOR)
+    SET(LIBXKLAVIER_VERSION_NUM \
${LIBXKLAVIER_VERSION_MAJOR}${LIBXKLAVIER_VERSION_MINOR}) +    \
ADD_DEFINITIONS(-DHAVE_XKLAVIER=1 ${LIBXKLAVIER_CFLAGS} ${_LibGLIB2Cflags} \
-DLIBXKLAVIER_VERSION=${LIBXKLAVIER_VERSION_NUM})  \
include_directories(${GLIB2_INCLUDE_DIR})  
   else(LIBXKLAVIER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND)
--- branches/KDE/4.3/kdebase/workspace/kcontrol/kxkb/xklavier_adaptor.cpp \
#995472:995473 @@ -222,7 +222,11 @@
     kDebug() << "Xklavier initialized";
     priv->config = xkl_config_registry_get_instance(priv->engine);
 
-    xkl_config_registry_load(priv->config);
+#if LIBXKLAVIER_VERSION >= 40
+	xkl_config_registry_load(priv->config, false);
+#else
+	xkl_config_registry_load(priv->config);
+#endif
 	
     void *userData = priv;
 


[prev in list] [next in list] [prev in thread] [next in thread]