diff options
| -rw-r--r-- | CMakeLists.txt | 95 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 34 | ||||
| -rw-r--r-- | config.h.cmake | 12 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | src/main.cpp | 58 |
6 files changed, 180 insertions, 53 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ae2326..5f3ec8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,42 +1,81 @@ -project(polkit-kde-agent-1) +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -find_package(KDE4 REQUIRED) +cmake_minimum_required( VERSION 2.8.12 ) -set(POLKITQT-1_MIN_VERSION "0.99.0") -find_package(PolkitQt-1 REQUIRED) -include_directories(${KDE4_INCLUDES} - ${POLKITQT-1_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}) +#### general package setup -set(policykit_SRCS - policykitkde.cpp - policykitlistener.cpp - main.cpp - AuthDialog.cpp -) +project( polkit-agent-tde ) +set( VERSION R14.1.0 ) -qt4_add_dbus_adaptor(policykit_SRCS org.kde.Polkit1AuthAgent.xml policykitlistener.h PolicyKitListener) -kde4_add_ui_files(policykit_SRCS AuthDialog.ui authdetails.ui) +#### include essential cmake modules -kde4_add_executable(polkit-kde-authentication-agent-1 ${policykit_SRCS}) +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckSymbolExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) -target_link_libraries(polkit-kde-authentication-agent-1 - ${KDE4_TDEUI_LIBS} - ${POLKITQT-1_LIBRARIES} -) -configure_file(polkit-kde-authentication-agent-1.desktop.in ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop) +#### include our cmake modules -install(TARGETS polkit-kde-authentication-agent-1 DESTINATION ${LIBEXEC_INSTALL_DIR}) +include( TDEMacros ) -install(FILES ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop DESTINATION ${AUTOSTART_INSTALL_DIR}) -install(FILES policykit1-kde.notifyrc DESTINATION ${DATA_INSTALL_DIR}/policykit1-kde) +##### setup install paths -include(MacroOptionalAddSubdirectory) -macro_optional_add_subdirectory( po ) +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_DOC "Build documentation" ${BUILD_ALL} ) +#option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) + + +##### 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 ) + + +##### other data ################################ + +#tde_conditional_add_project_docs( BUILD_DOC ) +#tde_conditional_add_project_translations( BUILD_TRANSLATIONS ) + + +##### 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..3a4e77f --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,34 @@ +########################################### +# # +# 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 polkit-tqt + +pkg_search_module( POLKIT_TQT polkit-tqt ) +if( NOT POLKIT_TQT_FOUND ) + tde_message_fatal( "polkit-tqt is required, but was not found on your system" ) +endif( ) + diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..67860c5 --- /dev/null +++ b/config.h.cmake @@ -0,0 +1,12 @@ +#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@ + +/* Defined if you don't have either the XTest headers or + the xcb-util-keysyms headers */ +#cmakedefine NO_XTEST_EXTENSION 1 diff --git a/debian/changelog b/debian/changelog index e2b9ddd..434ce69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ polkit-agent-tde (0.99.1-2) unstable; urgency=low * Port to TDE and package renaming - * Initial release for TDE + * Initial release for TDE -- Michele Calgaro <michele.calgaro@yahoo.it> Sun, 19 Dec 2021 18:12:00 +0900 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..0f1b794 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,32 @@ +################################################# +# +# (C) 2021 Michele Calgaro +# Michele (DOT) Calgaro (AT) yahoo.it +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + + +include_directories( + ${CMAKE_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TQT_INCLUDE_DIRS} + ${TDE_INCLUDE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### executables ######################### + +tde_add_executable( polkit-agent-tde AUTOMOC + SOURCES main.cpp + LINK tdecore-shared tdeui-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/src/main.cpp b/src/main.cpp index 414275d..11a62c5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -/* This file is part of the KDE project +/* This file is part of the TDE project Copyright (C) 2009 Jaroslav Reznik <jreznik@redhat.com> This program is free software; you can redistribute it and/or @@ -18,31 +18,41 @@ */ -#include <TDECmdLineArgs> -#include <TDEAboutData> -#include <TDELocale> -#include <TDECrash> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdelocale.h> -#include "policykitkde.h" +#include <tqpushbutton.h> +#include <tdeapplication.h> +//#include "policykitkde.h" int main(int argc, char *argv[]) { - TDEAboutData aboutData("Polkit1AuthAgent", "polkit-kde-authentication-agent-1", ki18n("PolicyKit1-KDE"), "0.99.0", - ki18n("PolicyKit1-KDE"), TDEAboutData::License_GPL, - ki18n("(c) 2009 Red Hat, Inc.")); - aboutData.addAuthor(ki18n("Jaroslav Reznik"), ki18n("Maintainer"), "jreznik@redhat.com"); - aboutData.setProductName("policykit-kde/polkit-kde-authentication-agent-1"); - - TDECmdLineArgs::init(argc, argv, &aboutData); - - if (!PolicyKitKDE::start()) { - tqWarning("PolicyKitKDE is already running!\n"); - return 0; - } - - TDECrash::setFlags(TDECrash::AutoRestart); - - PolicyKitKDE agent; - agent.disableSessionManagement(); - agent.exec(); + TDEAboutData aboutData("polkit-agent-tde", I18N_NOOP("Polkit-Agent-TDE"), "0.99.1", + I18N_NOOP("A Polkit authentication agent for TDE"), TDEAboutData::License_GPL, + I18N_NOOP("(c) 2009 Red Hat, Inc.")); + aboutData.addAuthor(I18N_NOOP("Jaroslav Reznik"), I18N_NOOP("Maintainer"), "jreznik@redhat.com"); + aboutData.setProductName("policykit-agent-tde"); + + TDECmdLineArgs::init(argc, argv, &aboutData); + TDEApplication app; + TQPushButton *pbQuit = new TQPushButton("Quit", 0); + app.setMainWidget(pbQuit); + app.connect(&app, TQT_SIGNAL(lastWindowClosed()), TQT_SLOT(quit())); + app.connect(pbQuit, TQT_SIGNAL(clicked()), &app, TQT_SLOT(quit())); + pbQuit->show(); + return app.exec(); + + /* + if (!PolicyKitKDE::start()) { + tqWarning("PolicyKitKDE is already running!\n"); + return 0; + } + + TDECrash::setFlags(TDECrash::AutoRestart); + + PolicyKitKDE agent; + agent.disableSessionManagement(); + agent.exec(); + */ } |