File one.patch of Package kcmldapmanager

Overview Repositories Revisions Requests Users Attributes Meta

File one.patch of Package kcmldapmanager (Revision 6455c2376f04b66b346486d19c248dc0)

Currently displaying revision 6455c2376f04b66b346486d19c248dc0 , Show latest

From 922d3cdd719e00dc2f8e3f697a922e6926b4e9bc Mon Sep 17 00:00:00 2001
From: gregory guy <g-gregory@gmx.fr>
Date: Fri, 15 Mar 2019 10:58:02 +0100
Subject: conversion to the cmake building system

Signed-off-by: gregory guy <g-gregory@gmx.fr>
(cherry picked from commit 67025db14ed3496a7977682e1c5c282e630abc4e)

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..8e9bb4c
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,83 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8 )
+
+
+#### general package setup
+
+project( kcmldapmanager )
+set( VERSION R14.0.7 )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF                                          )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON                             )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+
+
+##### user defined options #######
+
+set( KDE_CONFDIR "/etc/trinity" CACHE STRING "Path for the config system" )
+set( AVAILABLE_SHELLS /bin/bash /bin/sh /bin/dash /bin/rbash /usr/bin/screen CACHE STRING "Available shells" )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( src     )
+add_subdirectory( cmdline )
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) 
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
new file mode 100644
index 0000000..f9c5917
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,45 @@
+###########################################
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 3   #
+#                                         #
+###########################################
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+  tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
+
+
+##### check for ldap
+
+find_library( HAVE_LIBLDAP ldap )
+if( HAVE_LIBLDAP )
+   set( LDAP_LIBRARIES "ldap" )
+  else()
+   tde_message_fatal( "ldap is required, but was not found on your system" )
+endif( HAVE_LIBLDAP )
+
+
+##### check for tdeldap
+
+find_library( HAVE_LIBTDELDAP tdeldap )
+if( HAVE_LIBTDELDAP )
+   set( TDELDAP_LIBRARIES "tdeldap" )
+  else()
+   tde_message_fatal( "libtdeldap is required, but was not found on your system" )
+endif( )
diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt
new file mode 100644
index 0000000..567f381
--- /dev/null
+++ b/cmdline/CMakeLists.txt
@@ -0,0 +1,31 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}/tde
+  ${KRB5_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tdeldapmanager (executable)
+
+tde_add_executable( tdeldapmanager AUTOMOC
+
+  SOURCES
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     ${TDELDAP_LIBRARIES}
+     ${KRB5_LIBRARIES}
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/cmdline/main.cpp b/cmdline/main.cpp
index 6a30762..dc22642 100644
--- a/cmdline/main.cpp
+++ b/cmdline/main.cpp
@@ -38,9 +38,9 @@
 
 #include <libtdeldap.h>
 
-// FIXME
-// Connect this to CMake/Automake
+#ifndef KDE_CONFDIR
 #define KDE_CONFDIR "/etc/trinity"
+#endif
 
 static const char description[] =
 	I18N_NOOP("TDE utility for managing a Kerberos realm");
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..8416c73
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,14 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
+
+/* Path for the config system */
+#cmakedefine KDE_CONFDIR "@KDE_CONFDIR@"
+
+/* Available shells */
+#cmakedefine AVAILABLE_SHELLS "@AVAILABLE_SHELLS@"
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644
index 0000000..ad36a01
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1,5 @@
+file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+
+if( _srcs )
+    tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} )
+endif( )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..61fc2de
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,46 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}/tde
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kcm_ldapmanager (kpart)
+
+tde_add_kpart( kcm_ldapmanager AUTOMOC
+
+  SOURCES
+        ldapconfigbase.ui
+        userconfigbase.ui
+        groupconfigbase.ui
+        machineconfigbase.ui
+        serviceconfigbase.ui
+        ldapmgr.cpp
+        userconfigdlg.cpp
+        groupconfigdlg.cpp
+        machineconfigdlg.cpp
+        serviceconfigdlg.cpp
+  LINK
+     tdeio-shared
+     tdeui-shared
+     ${LDAP_LIBRARIES}
+     ${TDELDAP_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES ldapmanager.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
diff --git a/src/groupconfigdlg.h b/src/groupconfigdlg.h
index dc51337..1c70d58 100644
--- a/src/groupconfigdlg.h
+++ b/src/groupconfigdlg.h
@@ -23,7 +23,7 @@
 
 #include <kdialogbase.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "groupconfigbase.h"
 
 class GroupConfigDialog : public KDialogBase
diff --git a/src/ldapmgr.cpp b/src/ldapmgr.cpp
index 3d7e581..0702ee7 100644
--- a/src/ldapmgr.cpp
+++ b/src/ldapmgr.cpp
@@ -44,16 +44,16 @@
 
 #include "ldapmgr.h"
 
-#include "libtdeldap.h"
-#include "ldappasswddlg.h"
+#include <libtdeldap.h>
+#include <ldappasswddlg.h>
 #include "userconfigdlg.h"
 #include "groupconfigdlg.h"
 #include "machineconfigdlg.h"
 #include "serviceconfigdlg.h"
 
-// FIXME
-// Connect this to CMake/Automake
+#ifndef KDE_CONFDIR
 #define KDE_CONFDIR "/etc/trinity"
+#endif
 
 typedef KGenericFactory<LDAPConfig, TQWidget> LDAPConfigFactory;
 
@@ -921,3 +921,5 @@ TQString LDAPConfig::quickHelp() const
 {
 	return i18n("This module manages users, groups, and machines in LDAP realms.");
 }
+
+#include "ldapmgr.moc"
diff --git a/src/ldapmgr.h b/src/ldapmgr.h
index 48fe954..c3ef9b0 100644
--- a/src/ldapmgr.h
+++ b/src/ldapmgr.h
@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "ldapconfigbase.h"
 
 class KSimpleConfig;
diff --git a/src/machineconfigdlg.h b/src/machineconfigdlg.h
index 25f2554..68c2b3d 100644
--- a/src/machineconfigdlg.h
+++ b/src/machineconfigdlg.h
@@ -23,7 +23,7 @@
 
 #include <kdialogbase.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "machineconfigbase.h"
 
 class MachineConfigDialog : public KDialogBase
diff --git a/src/serviceconfigdlg.h b/src/serviceconfigdlg.h
index 5ebf5a1..85736bd 100644
--- a/src/serviceconfigdlg.h
+++ b/src/serviceconfigdlg.h
@@ -23,7 +23,7 @@
 
 #include <kdialogbase.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "serviceconfigbase.h"
 
 class ServiceConfigDialog : public KDialogBase
diff --git a/src/userconfigdlg.h b/src/userconfigdlg.h
index de5be1c..8e0c0d9 100644
--- a/src/userconfigdlg.h
+++ b/src/userconfigdlg.h
@@ -23,10 +23,12 @@
 
 #include <kdialogbase.h>
 
-#include "libtdeldap.h"
+#include <libtdeldap.h>
 #include "userconfigbase.h"
 
+#ifndef AVAILABLE_SHELLS
 #define AVAILABLE_SHELLS "/bin/bash /bin/sh /bin/dash /bin/rbash /usr/bin/screen"
+#endif
 
 class UserConfigDialog : public KDialogBase
 {
From c4f1ebc31d29027d8723fc8850acb4bc63645372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 31 Mar 2019 12:55:21 +0200
Subject: Added controlled conversions to char* instead of automatic ascii
 conversions.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

diff --git a/cmdline/main.cpp b/cmdline/main.cpp
index dc22642..d196ce8 100644
--- a/cmdline/main.cpp
+++ b/cmdline/main.cpp
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
 				}
 				TQTextStream stream(&passFile);
 				credentials.username = args->getOption("adminusername");
-				credentials.password = stream.readLine();
+				credentials.password = stream.readLine().utf8();
 				passFile.close();
 			}
 			else {

Places

File one.patch of Package kcmldapmanager (Revision 6455c2376f04b66b346486d19c248dc0)

Places