Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdelibs

CMakeLists.txt

@@ -679,6 +679,12 @@ if( WITH_XCOMPOSITE )
   else( WITH_XCOMPOSITE )
     tde_message_fatal( "xcomposite support was requested, but xcomposite was not found on your system" )
   endif( XCOMPOSITE_FOUND )
+
+  # xext (tderandr, tdestyles/keramik, tdeui)
+  pkg_search_module( XEXT xext )
+  if( NOT XEXT_FOUND )
+    tde_message_fatal( "xext is required for xcomposite support, but was not found on your system" )
+  endif( )
 endif( WITH_XCOMPOSITE )
 
 

dcop/dcopclient.cpp

@@ -717,7 +717,11 @@ bool DCOPClient::isSuspended() const
 // Check whether the remote end is owned by the same user.
 static bool peerIsUs(int sockfd)
 {
+#if defined(__OpenBSD__)
+    struct sockpeercred cred;
+#else
     struct ucred cred;
+#endif
     socklen_t siz = sizeof(cred);
     if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &cred, &siz) != 0)
         return false;

tderandr/CMakeLists.txt

@@ -43,6 +43,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.95
-  LINK tdeui-shared ${XRANDR_LIBRARIES} Xext
+  LINK tdeui-shared ${XRANDR_LIBRARIES} ${XEXT_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )

tdestyles/keramik/CMakeLists.txt

@@ -65,6 +65,6 @@ set_source_files_properties( pixmaploader.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdefx-shared Xext
+  LINK tdefx-shared ${XEXT_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
 )

tdeui/CMakeLists.txt

@@ -148,7 +148,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 14.0.0
-  LINK tdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES}
+  LINK tdecore-shared ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${XEXT_LIBRARIES}
   DEPENDENCIES dcopidl
   DESTINATION ${LIB_INSTALL_DIR}
 )