Prefer pkg-config for gpgme and gpg-error detection.

Use LARGEFILES_DEFINITIONS instead of hard-coded _FILE_OFFSET_BITS=64.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 29a136eee1)

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

CMakeL10n.txt

@@ -0,0 +1,27 @@
+#################################################
+#
+#  (C) 2018 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### set directory for POT files ###############
+
+set( POT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../tde-i18n/template/messages/tdepim" )
+
+
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories()

CMakeLists.txt

@@ -9,14 +9,13 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 3.1 )
 
 
 ##### general package setup #####################
 
 project( tdepim )
 set( PACKAGE tdepim )
-set( VERSION R14.0.0 )
 
 
 ##### include essential cmake modules ###########
@@ -27,14 +26,20 @@ include( CheckTypeSize )
 include( CheckCSourceCompiles )
 include( CheckCXXSourceCompiles )
 include( CheckLibraryExists )
+include( CheckSymbolExists )
+enable_testing( )
 
 
 ##### include our cmake modules #################
 
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEMacros )
 
 
+##### set version number ########################
+
+tde_set_project_version( )
+
+
 ##### setup install paths #######################
 
 include( TDESetupPaths )
@@ -43,13 +48,42 @@ tde_setup_paths( )
 
 ##### add apidox targets ############
 
-add_custom_target(apidox
-  COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/qt3/doc/html"
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
+if( "${CMAKE_VERSION}" VERSION_LESS "3.1" )
+  set( CMAKE_ENV "env" )
+else()
+  set( CMAKE_ENV "${CMAKE_COMMAND};-E;env" )
+endif()
 
-add_custom_target(install-apidox
-  COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}"
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
+add_custom_target( apidox
+  COMMAND ${CMAKE_ENV}
+    "QTDOCDIR=/usr/share/tqt3/doc/html"
+    "DOXDATA=${HTML_INSTALL_DIR}/en/common"
+    ${CMAKE_SOURCE_DIR}/admin/doxygen.sh
+    --no-modulename
+    ${CMAKE_SOURCE_DIR}
+  COMMAND
+    find ${CMAKE_BINARY_DIR}/apidocs -name '*.html' |
+    xargs -r sed -i 's|${CMAKE_BINARY_DIR}/apidocs|${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs|g'
+  COMMAND
+    find ${CMAKE_BINARY_DIR}/apidocs -name '*.tag' |
+    xargs -r sed -i 's|${CMAKE_SOURCE_DIR}/|${PROJECT_NAME}/|g'
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+
+add_custom_target( install-apidox
+  COMMAND ${CMAKE_COMMAND} -E echo Apidox installed in ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs
+)
+
+install( CODE "
+  if( EXISTS ${CMAKE_BINARY_DIR}/apidocs )
+    file(
+      INSTALL ${CMAKE_BINARY_DIR}/apidocs/
+      DESTINATION ${HTML_INSTALL_DIR}/en/${PROJECT_NAME}-apidocs
+      PATTERN doxygen_sqlite3.db EXCLUDE
+      PATTERN installdox-slow EXCLUDE
+    )
+  endif()"
+)
 
 
 ##### optional stuff ############################
@@ -179,8 +213,8 @@ add_definitions(
 )
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
-set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
 
 
 ##### activate dependencies #####################

ConfigureChecks.cmake

@@ -11,22 +11,23 @@
 
 tde_setup_architecture_flags( )
 
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO )
+check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO )
+
 ##### check for gcc visibility support #########
-# FIXME
-# This should check for [T]Qt3 visibility support
 
 if( WITH_GCC_VISIBILITY )
-  if( NOT UNIX )
-    tde_message_fatal(FATAL_ERROR "\ngcc visibility support was requested, but your system is not *NIX" )
-  endif( NOT UNIX )
-  set( __KDE_HAVE_GCC_VISIBILITY 1 )
-  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
+  tde_setup_gcc_visibility( )
 endif( )
 
 
-if( BUILD_LIBTDEPIM OR BUILD_KMAIL )
-  option( TDEPIM_NEW_DISTRLISTS "Define if you want to use the new distribution lists" ON )
+if( BUILD_KMAIL )
+  check_include_file( "byteswap.h" HAVE_BYTESWAP_H )
 endif( )
 
 
@@ -54,110 +55,103 @@ if( BUILD_KMOBILE )
 endif( )
 
 
-if( BUILD_KANDY OR (BUILD_KMOBILE AND NOT HAVE_BAUDBOY_H) )
-  check_include_file( "lockdev.h" HAVE_LOCKDEV_H )
-  if( HAVE_LOCKDEV_H )
-    check_library_exists( lockdev dev_unlock "" HAVE_LOCKDEV )
-    if( HAVE_LOCKDEV )
-      set( LOCKDEV_LIBRARY lockdev CACHE INTERNAL "" FORCE )
-    endif( )
-  endif( )
-endif( )
-
-
 if( WITH_GNOKII AND (BUILD_KADDRESSBOOK OR BUILD_KMOBILE) )
   pkg_search_module( GNOKII gnokii )
   if( NOT GNOKII_FOUND )
     tde_message_fatal( "gnokii are requested, but was not found on your system" )
+  else( )
+    tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${GNOKII_INCLUDE_DIRS}" )
+    check_include_file( "gnokii.h" HAVE_GNOKII_H )
+    tde_restore( CMAKE_REQUIRED_INCLUDES )
   endif( )
 endif( )
 
 
-if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT )
+if( (BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOOK OR BUILD_KONTACT) AND NOT HAVE_GPGME_0_4_BRANCH )
 
-  if( NOT HAVE_GPGME_0_4_BRANCH )
-    message( STATUS "checking for 'gpgme'" )
-  endif( )
+  message( STATUS "checking for 'gpgme'" )
 
-  # find gpgme-config
-  find_program( GPGME_EXECUTABLE NAMES gpgme-config )
-  if( NOT GPGME_EXECUTABLE )
-    tde_message_fatal( "gpgme-config was NOT found.\n gpgme library is installed?" )
-  endif( )
+  # check for gpgme
+  pkg_search_module( GPGME gpgme )
+  if( NOT GPGME_FOUND )
 
-  # find gpg-error-config
-  find_program( GPG_ERR_EXECUTABLE NAMES gpg-error-config )
-  if( NOT GPG_ERR_EXECUTABLE )
-    tde_message_fatal( "gpg-error-config was NOT found.\n gpg-error library is installed?" )
-  endif( )
+    # find gpgme-config
+    find_program( GPGME_EXECUTABLE NAMES gpgme-config )
+    if( NOT GPGME_EXECUTABLE )
+      tde_message_fatal( "gpgme-config was NOT found.\n gpgme library is installed?" )
+    endif( )
 
-  macro( __run_gpgme_config  __type __var )
-    execute_process(
-      COMMAND ${GPGME_EXECUTABLE} --${__type}
-      OUTPUT_VARIABLE ${__var}
-      RESULT_VARIABLE __result
-      OUTPUT_STRIP_TRAILING_WHITESPACE )
-    if( _result )
-      tde_message_fatal( "Unable to run ${GPGME_EXECUTABLE}!\n gpgme library incorrectly installed?\n Path to gpgme-config incorrect?" )
+    macro( __run_gpgme_config  __type __var )
+      execute_process(
+        COMMAND ${GPGME_EXECUTABLE} --${__type}
+        OUTPUT_VARIABLE ${__var}
+        RESULT_VARIABLE __result
+        OUTPUT_STRIP_TRAILING_WHITESPACE )
+      if( _result )
+        tde_message_fatal( "Unable to run ${GPGME_EXECUTABLE}!\n gpgme library incorrectly installed?\n Path to gpgme-config incorrect?" )
+      endif( )
+    endmacro( )
+
+    __run_gpgme_config( version GPGME_VERSION )
+    __run_gpgme_config( cflags GPGME_INCLUDE_DIRS )
+    __run_gpgme_config( libs GPGME_LIBRARIES )
+
+    if( GPGME_INCLUDE_DIRS )
+      string( REGEX REPLACE "(^| +)-I" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" )
     endif( )
-  endmacro( )
-
-  macro( __run_gpgerr_config  __type __var )
-    execute_process(
-      COMMAND ${GPG_ERR_EXECUTABLE} --${__type}
-      OUTPUT_VARIABLE ${__var}
-      RESULT_VARIABLE __result
-      OUTPUT_STRIP_TRAILING_WHITESPACE )
-    if( _result )
-      tde_message_fatal( "Unable to run ${GPG_ERR_EXECUTABLE}!\n gpg-error library incorrectly installed?\n Path to gpgme-config are incorrect?" )
+    if( GPGME_LIBRARIES )
+      string( REGEX REPLACE "(^| +)-l" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" )
     endif( )
-  endmacro( )
 
-  __run_gpgme_config( version GPGME_VERSION )
-  __run_gpgme_config( cflags GPGME_INCLUDE_DIRS )
-  __run_gpgme_config( libs GPGME_LIBRARIES )
+  endif()
 
-  __run_gpgerr_config( version GPGERR_VERSION )
-  __run_gpgerr_config( cflags GPGERR_INCLUDE_DIRS )
-  __run_gpgerr_config( libs GPGERR_LIBRARIES )
+  # check for gpg-error
+  pkg_search_module( GPGERR gpg-error )
+  if( NOT GPGERR_FOUND )
 
-  # cleanup
-  if( GPGME_INCLUDE_DIRS )
-    string( REGEX REPLACE "(^| )-I" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" )
-  endif( )
-  if( GPGME_LIBRARIES )
-    string( REGEX REPLACE "(^| )-l" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" )
-  endif( )
-  if( GPGERR_INCLUDE_DIRS )
-    string( REGEX REPLACE "(^| )-I" ";" GPGERR_INCLUDE_DIRS "${GPGERR_INCLUDE_DIRS}" )
-  endif( )
-  if( GPGERR_LIBRARIES )
-    string( REGEX REPLACE "(^| )-l" ";" GPGERR_LIBRARIES "${GPGERR_LIBRARIES}" )
-  endif( )
-  set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS} ${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE )
-  set( GPGME_LIBRARIES "${GPGME_LIBRARIES} ${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE )
-  string( REGEX REPLACE " ;" ";" GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" )
-  string( REGEX REPLACE " ;" ";" GPGME_LIBRARIES "${GPGME_LIBRARIES}" )
-  set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE )
-  set( GPGME_LIBRARIES "${GPGME_LIBRARIES}" CACHE INTERNAL "" FORCE )
+    # find gpg-error-config
+    find_program( GPG_ERR_EXECUTABLE NAMES gpgrt-config gpg-error-config )
+    if( NOT GPG_ERR_EXECUTABLE )
+      tde_message_fatal( "gpgrt-config or gpg-error-config was NOT found.\n gpg-error library is installed?" )
+    endif( )
 
-  # assuming that all newer system have gpgme >= 0.4
-  set( HAVE_GPGME_0_4_BRANCH 1 CACHE INTERNAL "" )
+    macro( __run_gpgerr_config  __type __var )
+      execute_process(
+        COMMAND ${GPG_ERR_EXECUTABLE} --${__type}
+        OUTPUT_VARIABLE ${__var}
+        RESULT_VARIABLE __result
+        OUTPUT_STRIP_TRAILING_WHITESPACE )
+      if( _result )
+        tde_message_fatal( "Unable to run ${GPG_ERR_EXECUTABLE}!\n gpg-error library incorrectly installed?\n Path to gpgme-config are incorrect?" )
+      endif( )
+    endmacro( )
+
+    __run_gpgerr_config( version GPGERR_VERSION )
+    __run_gpgerr_config( cflags GPGERR_INCLUDE_DIRS )
+    __run_gpgerr_config( libs GPGERR_LIBRARIES )
+
+    if( GPGERR_INCLUDE_DIRS )
+      string( REGEX REPLACE "(^| +)-I" ";" GPGERR_INCLUDE_DIRS "${GPGERR_INCLUDE_DIRS}" )
+    endif( )
+    if( GPGERR_LIBRARIES )
+      string( REGEX REPLACE "(^| +)-l" ";" GPGERR_LIBRARIES "${GPGERR_LIBRARIES}" )
+    endif( )
 
-  # NOTE: assume we have largefile support (need for gpgme)
-  # FIXME: to be sure, we must check it
-  add_definitions( -D_FILE_OFFSET_BITS=64 )
+  endif()
 
-  if( NOT HAVE_GPGME_0_4_BRANCH )
-    message( STATUS "  found 'gpgme', version ${GPGME_VERSION}" )
-  endif( )
+  # assuming that all newer system have gpgme >= 0.4
+  set( GPGME_INCLUDE_DIRS "${GPGME_INCLUDE_DIRS};${GPGERR_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE )
+  set( GPGME_LIBRARIES "${GPGME_LIBRARIES};${GPGERR_LIBRARIES}" CACHE INTERNAL "" FORCE )
+  set( HAVE_GPGME_0_4_BRANCH 1 CACHE INTERNAL "" )
+  message( STATUS "  found 'gpgme', version ${GPGME_VERSION}" )
 
   # check for various GPGME features
   tde_save( CMAKE_CXX_FLAGS )
+  tde_save( CMAKE_REQUIRED_INCLUDES )
   tde_save( CMAKE_REQUIRED_LIBRARIES )
   string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
-  # See FIXME above regarding -D_FILE_OFFSET_BITS=64
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GPGME_INCLUDE_DIRS} -D_FILE_OFFSET_BITS=64")
+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LARGEFILES_DEFINITIONS}")
+  set( CMAKE_REQUIRED_INCLUDES "${GPGME_INCLUDE_DIRS}")
   set( CMAKE_REQUIRED_LIBRARIES "${GPGME_LIBRARIES}")
 
   # check for GPGME_KEYLIST_MODE_VALIDATE
@@ -216,21 +210,30 @@ if( BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOO
 
   # done checking for GPGME features
   tde_restore( CMAKE_CXX_FLAGS )
+  tde_restore( CMAKE_REQUIRED_INCLUDES )
   tde_restore( CMAKE_REQUIRED_LIBRARIES )
 
 endif( )
 
 
 if( BUILD_KARM AND WITH_XSCREENSAVER )
-  check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
-  if( HAVE_XSSLIB )
-    pkg_search_module( XSS xscrnsaver )
-  else( )
-    check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
+  pkg_search_module( XSS xscrnsaver )
+
+  if( XSS_FOUND )
+    tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${XSS_INCLUDE_DIRS}" )
+    check_library_exists( Xss XScreenSaverQueryInfo "${XSS_LIBRARY_DIRS}" HAVE_XSSLIB )
+    tde_restore( CMAKE_REQUIRED_INCLUDES )
+  else( XSS_FOUND )
+    check_library_exists( Xss XScreenSaverQueryInfo "" HAVE_XSSLIB )
+  endif( XSS_FOUND )
+
+  if( NOT HAVE_XSSLIB )
+    check_library_exists( Xext XScreenSaverQueryInfo "$(XEXT_LIBRARY_DIRS}" HAVE_XSSLIB )
     if( HAVE_XSSLIB )
       pkg_search_module( XSS xext )
     endif( )
   endif( )
+
   check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )
   if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
     set( HAVE_LIBXSS 1 )
@@ -239,6 +242,25 @@ if( BUILD_KARM AND WITH_XSCREENSAVER )
   endif( )
 endif( )
 
+if( BUILD_TDERESOURCES AND WITH_GROUPWISE )
+  check_symbol_exists( strrchr "string.h" HAVE_STRRCHR )
+  check_symbol_exists( strtod "stdlib.h" HAVE_STRTOD )
+  check_symbol_exists( sscanf "stdio.h" HAVE_SSCANF )
+  check_symbol_exists( strtol "stdlib.h" HAVE_STRTOL )
+  check_symbol_exists( strtoul "stdlib.h" HAVE_STRTOUL )
+  check_symbol_exists( strtoll "stdlib.h" HAVE_STRTOLL )
+  check_symbol_exists( strtoull "stdlib.h" HAVE_STRTOULL )
+  check_symbol_exists( gettimeofday "sys/time.h" HAVE_GETTIMEOFDAY )
+  check_include_file( "sys/timeb.h" HAVE_SYS_TIMEB_H )
+  check_symbol_exists( ftime "sys/timeb.h" HAVE_FTIME )
+  check_symbol_exists( rand_r "stdlib.h" HAVE_RAND_R )
+  check_symbol_exists( gmtime_r "time.h" HAVE_GMTIME_R )
+  check_symbol_exists( localtime_r "time.h" HAVE_LOCALTIME_R )
+  check_symbol_exists( timegm "time.h" HAVE_TIMEGM )
+  check_symbol_exists( wctomb "stdlib.h" HAVE_WCTOMB )
+  check_symbol_exists( mbtowc "stdlib.h" HAVE_MBTOWC )
+  check_symbol_exists( isnan "math.h" HAVE_ISNAN )
+endif ( )
 
 # required stuff
 find_package( TQt )

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

akregator/CMakeL10n.txt

@@ -0,0 +1,3 @@
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )

akregator/README

@@ -5,16 +5,16 @@ A Feed Reader for KDE.
 
 Join developer mailing list: <akregator-devel@lists.sourceforge.net>
 
-If you wish to discuss any problems or features before posting them on bugs.kde.org
+If you wish to discuss any problems or features before posting them on bugs.trinitydesktop.org
 you can subscribe to <akregator-users@lists.sourceforge.net>
 
-Please notice that we ask you to post your bugs and wishes to bugs.kde.org not only
+Please notice that we ask you to post your bugs and wishes to bugs.trinitydesktop.org not only
 because this is official KDE bug tracker, but because this helps us keep an eye on
 demand of the community and not forget to implement needed things ;)
 
 Also please do not abuse bug tracker functionality by submitting duplicate items.
 Check the existing bugs first (for example using power user tool available at
-<http://bugs.kde.org/buglist.cgi?product=akregator>). If you find something very close
+<http://bugs.trinitydesktop.org/buglist.cgi?product=akregator>). If you find something very close
 to your request, just add a comment and vote for the bug (there's a little vote link on the
 bug summary pane).
 

akregator/akregator.lsm

@@ -1,14 +0,0 @@
-Begin4
-Title:          akregator
-Version:        R14.0.0
-Entered-date:   2010-05-10
-Description:    Feed reader aggregator
-Keywords:       rss atom aggregation syndication feed articles TDE Qt
-Author:         Stanislav Karchebny <Stanislav.Karchebny@kdemail.net>
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://akregator.sourceforge.net/
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End

akregator/src/CMakeL10n.txt

@@ -0,0 +1,15 @@
+##### create translation templates ##############
+
+tde_l10n_create_template( "akregator" )
+
+tde_l10n_create_template(