Hello community, here is the log from the commit of package kwallet for openSUSE:Factory checked in at 2014-05-14 20:27:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwallet (Old) and /work/SRC/openSUSE:Factory/.kwallet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwallet" Changes: -------- --- /work/SRC/openSUSE:Factory/kwallet/kwallet.changes 2014-04-02 17:22:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwallet.new/kwallet.changes 2014-05-14 20:28:07.000000000 +0200 @@ -1,0 +2,9 @@ +Sun May 4 01:41:25 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 4.99.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta2.php + +------------------------------------------------------------------- Old: ---- kwallet-4.98.0.tar.xz New: ---- kwallet-4.99.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwallet.spec ++++++ --- /var/tmp/diff_new_pack.z9dsb0/_old 2014-05-14 20:28:07.000000000 +0200 +++ /var/tmp/diff_new_pack.z9dsb0/_new 2014-05-14 20:28:07.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Wallet5 Name: kwallet -Version: 4.98.0 +Version: 4.99.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.12 +BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{_kf5_version} BuildRequires: kcoreaddons-devel >= %{_kf5_version} @@ -119,9 +119,8 @@ %doc COPYING* %{_kf5_bindir}/kwalletd5 %{_kf5_servicesdir}/kwalletd5.desktop -%{_kf5_datadir}/kwalletd/ -%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd5.service -%{_kf5_datadir}/kconf_update/ +%{_kf5_notifydir}/ +%{_kf5_sharedir}/dbus-1/services/org.kde.kwalletd5.service %files -n %lname %defattr(-,root,root) ++++++ kwallet-4.98.0.tar.xz -> kwallet-4.99.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/CMakeLists.txt new/kwallet-4.99.0/CMakeLists.txt --- old/kwallet-4.98.0/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/CMakeLists.txt 2014-05-04 21:02:28.000000000 +0200 @@ -1,27 +1,28 @@ cmake_minimum_required(VERSION 2.8.12) -find_package(ECM 0.0.12 REQUIRED NO_MODULE) +project(KWallet) + +find_package(ECM 0.0.13 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) -set(KF5_VERSION "4.98.0") +set(KF5_VERSION "4.99.0") # handled by release scripts +set(KF5_DEP_VERSION "4.99.0") # handled by release scripts include(KDEInstallDirs) include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) include(FeatureSummary) +include(ECMSetupVersion) option(BUILD_KWALLETD "Build the kwallet daemon" ON) -find_package(LibGcrypt 1.5.0 REQUIRED QUIET) -set_package_properties(LibGcrypt PROPERTIES DESCRIPTION "Libgcrypt is a general purpose cryptographic library based on the code from GnuPG." - URL "http://www.gnu.org/software/libgcrypt/"; - TYPE REQUIRED - PURPOSE "kwalletd needs libgcrypt to perform PBKDF2-SHA512 hashing" - ) +find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) +add_definitions(-DTRANSLATION_DOMAIN=\"kwalletd5\") add_subdirectory(src) add_subdirectory(autotests) add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/autotests/KWallet/CMakeLists.txt new/kwallet-4.99.0/autotests/KWallet/CMakeLists.txt --- old/kwallet-4.98.0/autotests/KWallet/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/autotests/KWallet/CMakeLists.txt 2014-05-04 21:02:28.000000000 +0200 @@ -10,6 +10,7 @@ add_executable(${_testname} ${_testname}.cpp) add_test(itemviews-${_testname} ${_testname}) ecm_mark_as_test(${_testname}) + add_test(${_testname} ${_testname}) target_link_libraries(${_testname} Qt5::Test KF5::Wallet) endforeach(_testname) endmacro() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/cmake/FindLibGcrypt.cmake new/kwallet-4.99.0/cmake/FindLibGcrypt.cmake --- old/kwallet-4.98.0/cmake/FindLibGcrypt.cmake 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/cmake/FindLibGcrypt.cmake 2014-05-04 21:02:28.000000000 +0200 @@ -1,61 +1,89 @@ - -# - Try to find the Gcrypt library -# Once run this will define +#.rst +# FindLibGcrypt +# ------------- # -# LIBGCRYPT_FOUND - set if the system has the gcrypt library -# LIBGCRYPT_CFLAGS - the required gcrypt compilation flags -# LIBGCRYPT_LIBRARIES - the linker libraries needed to use the gcrypt library +# Finds the Libgcrypt library. # -# Copyright (c) 2006 Brad Hards <br...@kde.org> +# This will define the following variables: # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# ``LIBGCRYPT_FOUND`` +# True if the requested version of gcrypt was found +# ``LIBGCRYPT_VERSION`` +# The version of gcrypt that was found +# ``LIBGCRYPT_INCLUDE_DIRS`` +# The gcrypt include directories +# ``LIBGCRYPT_LIBRARIES`` +# The linker libraries needed to use the gcrypt library -# libgcrypt is moving to pkg-config, but earlier version don't have it +# Copyright 2014 Nicolás Alvarez <nicolas.alva...@gmail.com> +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +find_program(LIBGCRYPTCONFIG_SCRIPT NAMES libgcrypt-config) +if(LIBGCRYPTCONFIG_SCRIPT) + execute_process( + COMMAND "${LIBGCRYPTCONFIG_SCRIPT}" --prefix + RESULT_VARIABLE CONFIGSCRIPT_RESULT + OUTPUT_VARIABLE PREFIX + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if (CONFIGSCRIPT_RESULT EQUAL 0) + set(LIBGCRYPT_LIB_HINT "${PREFIX}/lib") + set(LIBGCRYPT_INCLUDE_HINT "${PREFIX}/include") + endif() +endif() -if(NOT LibGcrypt_FIND_VERSION) - set(LibGcrypt_FIND_VERSION "1.5.0") +find_library(LIBGCRYPT_LIBRARY + NAMES gcrypt + HINTS ${LIBGCRYPT_LIB_HINT} +) +find_path(LIBGCRYPT_INCLUDE_DIR + NAMES gcrypt.h + HINTS ${LIBGCRYPT_INCLUDE_HINT} +) + +if(LIBGCRYPT_INCLUDE_DIR) + file(STRINGS ${LIBGCRYPT_INCLUDE_DIR}/gcrypt.h GCRYPT_H REGEX "^#define GCRYPT_VERSION ") + string(REGEX REPLACE "^#define GCRYPT_VERSION \"(.*)\".*$" "\\1" LIBGCRYPT_VERSION "${GCRYPT_H}") endif() -#search in typical paths for libgcrypt-config -FIND_PROGRAM(LIBGCRYPTCONFIG_EXECUTABLE NAMES libgcrypt-config) +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(LibGcrypt + FOUND_VAR LIBGCRYPT_FOUND + REQUIRED_VARS LIBGCRYPT_LIBRARY LIBGCRYPT_INCLUDE_DIR + VERSION_VAR LIBGCRYPT_VERSION +) +if(LIBGCRYPT_FOUND) + set(LIBGCRYPT_LIBRARIES ${LIBGCRYPT_LIBRARY}) + set(LIBGCRYPT_INCLUDE_DIRS ${LIBGCRYPT_INCLUDE_DIR}) +endif() -#reset variables -set(LIBGCRYPT_LIBRARIES) -set(LIBGCRYPT_CFLAGS) - -# if libgcrypt-config has been found -IF(LIBGCRYPTCONFIG_EXECUTABLE) - - # workaround for MinGW/MSYS - # CMake can't starts shell scripts on windows so it need to use sh.exe - EXECUTE_PROCESS(COMMAND sh ${LIBGCRYPTCONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE) - EXECUTE_PROCESS(COMMAND sh ${LIBGCRYPTCONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE LIBGCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) - EXECUTE_PROCESS(COMMAND sh ${LIBGCRYPTCONFIG_EXECUTABLE} --version RESULT_VARIABLE _return_VALUEVersion OUTPUT_VARIABLE LIBGCRYPT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) - - IF(NOT LIBGCRYPT_CFLAGS AND NOT _return_VALUE) - SET(LIBGCRYPT_CFLAGS " ") - ENDIF(NOT LIBGCRYPT_CFLAGS AND NOT _return_VALUE) - - IF(LIBGCRYPT_LIBRARIES AND LIBGCRYPT_CFLAGS) - SET(LIBGCRYPT_FOUND TRUE) - ENDIF(LIBGCRYPT_LIBRARIES AND LIBGCRYPT_CFLAGS) - - if(LIBGCRYPT_VERSION VERSION_LESS ${LibGcrypt_FIND_VERSION}) - message(WARNING "libgcrypt found but version is less than required, Found ${LIBGCRYPT_VERSION} Required ${LibGcrypt_FIND_VERSION}") - SET(LIBGCRYPT_FOUND FALSE) - endif() - -ENDIF(LIBGCRYPTCONFIG_EXECUTABLE) - -if (LIBGCRYPT_FOUND) - if (NOT LibGcrypt_FIND_QUIETLY) - message(STATUS "Found libgcrypt: ${LIBGCRYPT_LIBRARIES}") - endif (NOT LibGcrypt_FIND_QUIETLY) -else (LIBGCRYPT_FOUND) - if (LibGcrypt_FIND_REQUIRED) - message(WARNING "Could not find libgcrypt libraries") - endif (LibGcrypt_FIND_REQUIRED) -endif (LIBGCRYPT_FOUND) +mark_as_advanced(LIBGCRYPT_LIBRARY LIBGCRYPT_INCLUDE_DIR) -MARK_AS_ADVANCED(LIBGCRYPT_CFLAGS LIBGCRYPT_LIBRARIES) +include(FeatureSummary) +set_package_properties(LibGcrypt PROPERTIES + DESCRIPTION "A general purpose cryptographic library based on the code from GnuPG." + URL "http://www.gnu.org/software/libgcrypt/"; +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/kwallet.yaml new/kwallet-4.99.0/kwallet.yaml --- old/kwallet-4.98.0/kwallet.yaml 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/kwallet.yaml 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -tier: 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/metainfo.yaml new/kwallet-4.99.0/metainfo.yaml --- old/kwallet-4.98.0/metainfo.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kwallet-4.99.0/metainfo.yaml 2014-05-04 21:02:28.000000000 +0200 @@ -0,0 +1,9 @@ +maintainer: vrusu +description: Secure and unified container for user passwords +tier: 3 +type: solution +platforms: + - name: All +portingAid: false +deprecated: false +release: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/src/api/KWallet/CMakeLists.txt new/kwallet-4.99.0/src/api/KWallet/CMakeLists.txt --- old/kwallet-4.98.0/src/api/KWallet/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/src/api/KWallet/CMakeLists.txt 2014-05-04 21:02:28.000000000 +0200 @@ -1,11 +1,5 @@ -if(NOT kdelibs_SOURCE_DIR) - find_package(KF5Config ${KF5_VERSION} REQUIRED) - find_package(KF5WindowSystem ${KF5_VERSION} REQUIRED) -endif() -include(FeatureSummary) include(GenerateExportHeader) -include(ECMSetupVersion) include(ECMGenerateHeaders) ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWALLET @@ -13,10 +7,6 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5WalletConfigVersion.cmake" SOVERSION 5) -if (APPLE) - find_package(Carbon REQUIRED) -endif () - remove_definitions(-DQT_NO_CAST_TO_ASCII) remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) @@ -44,7 +34,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwallet_version.h - DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel + DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel ) set(HAVE_KSECRETSSERVICE 0) @@ -72,9 +62,10 @@ generate_export_header(KF5Wallet BASE_NAME KWallet) add_library(KF5::Wallet ALIAS KF5Wallet) -target_include_directories(KF5Wallet INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/KWallet>") +target_include_directories(KF5Wallet INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KWallet>") target_link_libraries(KF5Wallet PUBLIC Qt5::Widgets + PRIVATE Qt5::DBus PRIVATE KF5::WindowSystem # KWindowSystem::allowExternalProcessWindowActivation KF5::ConfigCore # used to store the wallet to be used ) @@ -101,13 +92,13 @@ REQUIRED_HEADERS KWallet_HEADERS ) -install(TARGETS KF5Wallet EXPORT KF5WalletTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KF5Wallet EXPORT KF5WalletTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwallet_export.h ${KWallet_HEADERS} - DESTINATION ${INCLUDE_INSTALL_DIR}/KWallet COMPONENT Devel + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KWallet COMPONENT Devel ) include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KWallet LIB_NAME KF5Wallet DEPS "widgets" FILENAME_VAR PRI_FILENAME) +ecm_generate_pri_file(BASE_NAME KWallet LIB_NAME KF5Wallet DEPS "widgets" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KWallet) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/src/api/KWallet/KF5WalletConfig.cmake.in new/kwallet-4.99.0/src/api/KWallet/KF5WalletConfig.cmake.in --- old/kwallet-4.98.0/src/api/KWallet/KF5WalletConfig.cmake.in 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/src/api/KWallet/KF5WalletConfig.cmake.in 2014-05-04 21:02:28.000000000 +0200 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ -find_dependency(KF5Config "@KF5_VERSION@") -find_dependency(KF5WindowSystem "@KF5_VERSION@") +find_dependency(KF5Config "@KF5_DEP_VERSION@") +find_dependency(KF5WindowSystem "@KF5_DEP_VERSION@") find_dependency(Qt5Core @REQUIRED_QT_VERSION@) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/src/api/KWallet/kwallet.cpp new/kwallet-4.99.0/src/api/KWallet/kwallet.cpp --- old/kwallet-4.98.0/src/api/KWallet/kwallet.cpp 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/src/api/KWallet/kwallet.cpp 2014-05-04 21:02:28.000000000 +0200 @@ -26,7 +26,7 @@ #include <QApplication> #include <QtCore/QPointer> #include <QWidget> -#include <QDBusConnection> +#include <QtDBus/QDBusConnection> #include <QDebug> #include <kconfiggroup.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/src/runtime/kwalletd/CMakeLists.txt new/kwallet-4.99.0/src/runtime/kwalletd/CMakeLists.txt --- old/kwallet-4.98.0/src/runtime/kwalletd/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/src/runtime/kwalletd/CMakeLists.txt 2014-05-04 21:02:28.000000000 +0200 @@ -1,14 +1,14 @@ project(kwalletd5) -find_package(KF5Config ${KF5_VERSION} REQUIRED) -find_package(KF5CoreAddons ${KF5_VERSION} REQUIRED) -find_package(KF5DBusAddons ${KF5_VERSION} REQUIRED) -find_package(KF5I18n ${KF5_VERSION} REQUIRED) -find_package(KF5IconThemes ${KF5_VERSION} REQUIRED) -find_package(KF5Notifications ${KF5_VERSION} REQUIRED) -find_package(KF5Service ${KF5_VERSION} REQUIRED) -find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED) -find_package(KF5WindowSystem ${KF5_VERSION} REQUIRED) +find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5Notifications ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) ########### find needed packages ###### find_package(Gpgme) # Called by FindQGpgme, but since we call some gpgme @@ -73,8 +73,10 @@ qt5_add_dbus_adaptor( kwalletd_SRCS ${kwallet_xml} kwalletd.h KWalletD ) -include(ECMDBusAddActivationService) -ecm_dbus_add_activation_service(org.kde.kwalletd5.service.in) +configure_file(org.kde.kwalletd5.service.in + ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kwalletd5.service) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kwalletd5.service + DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) add_executable( kwalletd5 ${kwalletd_SRCS} ) @@ -96,11 +98,10 @@ kde_target_enable_exceptions(kwalletd5 PRIVATE) endif(GPGME_FOUND AND QGPGME_FOUND) -install(TARGETS kwalletd5 ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kwalletd5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### install( FILES kwalletd5.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kwalletd.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kwalletd ) -install( FILES kwallet-4.13.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update) +install( FILES kwalletd.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/src/runtime/kwalletd/backend/CMakeLists.txt new/kwallet-4.99.0/src/runtime/kwalletd/backend/CMakeLists.txt --- old/kwallet-4.98.0/src/runtime/kwalletd/backend/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/src/runtime/kwalletd/backend/CMakeLists.txt 2014-05-04 21:02:28.000000000 +0200 @@ -13,15 +13,20 @@ ########### kwalletbackend ############### find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) -find_package(KF5CoreAddons ${KF5_VERSION} REQUIRED) -find_package(KF5I18n ${KF5_VERSION} REQUIRED) -find_package(KF5Notifications ${KF5_VERSION} REQUIRED) -find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED) - -include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${KF5_INCLUDE_DIRS}) +find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5Notifications ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) + +find_package(LibGcrypt 1.5.0 REQUIRED) +set_package_properties(LibGcrypt PROPERTIES + TYPE REQUIRED + PURPOSE "kwalletd needs libgcrypt to perform PBKDF2-SHA512 hashing" + ) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../api/KWallet) include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../api/KWallet) +include_directories(${LIBGCRYPT_INCLUDE_DIRS}) #remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) remove_definitions(-DQT_NO_CAST_FROM_ASCII) @@ -52,6 +57,6 @@ endif(WIN32 AND NOT WINCE) set_target_properties(kwalletbackend5 PROPERTIES VERSION ${KWALLETBACKEND_VERSION_STRING} SOVERSION ${KWALLETBACKEND_SOVERSION} ) -install(TARGETS kwalletbackend5 ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kwalletbackend5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/src/runtime/kwalletd/backend/kwalletbackend.cc new/kwallet-4.99.0/src/runtime/kwalletd/backend/kwalletbackend.cc --- old/kwallet-4.98.0/src/runtime/kwalletd/backend/kwalletbackend.cc 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/src/runtime/kwalletd/backend/kwalletbackend.cc 2014-05-04 21:02:28.000000000 +0200 @@ -77,7 +77,6 @@ if (isPath) { _path = name; } else { -// KDE4 _path = KGlobal::dirs()->saveLocation("kwallet") + _name + ".kwl"; _path = getSaveLocation() + QDir::separator() + _name + ".kwl"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/src/runtime/kwalletd/kwallet-4.13.upd new/kwallet-4.99.0/src/runtime/kwalletd/kwallet-4.13.upd --- old/kwallet-4.98.0/src/runtime/kwalletd/kwallet-4.13.upd 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/src/runtime/kwalletd/kwallet-4.13.upd 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# We changed the default in 4.13 -Id=kde4.13 -File=kwalletrc -Group=Wallet -RemoveKey=Launch Manager \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/src/runtime/kwalletd/kwalletd.cpp new/kwallet-4.99.0/src/runtime/kwalletd/kwalletd.cpp --- old/kwallet-4.98.0/src/runtime/kwalletd/kwalletd.cpp 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/src/runtime/kwalletd/kwalletd.cpp 2014-05-04 21:02:28.000000000 +0200 @@ -400,8 +400,8 @@ // opening a dialog, that application will be blocked by this dialog. A proper solution would // be to set the second application's window also as a parent for the active dialog, so that // KWin properly handles focus changes and so on, but there's currently no support for multiple -// dialog parents. Hopefully to be done in KDE4, for now just use all kinds of bad hacks to make -// sure the user doesn't overlook the active dialog. +// dialog parents. In the absence of this support, we use all kinds of bad hacks to make +// sure the user doesn't overlook the active dialog. void KWalletD::checkActiveDialog() { if( !activeDialog ) return; @@ -538,9 +538,9 @@ } brandNew = false; // don't use KStdGuiItem::open() here which has trailing ellipsis! -// KDE4 kpd->setButtonGuiItem(KDialog::Ok,KGuiItem( i18n( "&Open" ), "wallet-open")); +// KF5 FIXME what should we use now instead of this: +// kpd->setButtonGuiItem(KDialog::Ok,KGuiItem( i18n( "&Open" ), "wallet-open")); kpd->setWindowTitle(i18n("KDE Wallet Service")); -// KDE4 kpd->setPixmap(KIcon("kwalletmanager").pixmap(KIconLoader::SizeHuge)); kpd->setPixmap( KIconLoader::global()->loadIcon("kwalletmanager", KIconLoader::Desktop, KIconLoader::SizeHuge) ); if (w != KWindowSystem::activeWindow() && w != 0L) { // If the dialog is modal to a minimized window it might not be visible @@ -630,8 +630,8 @@ } } kpd->setWindowTitle(i18n("KDE Wallet Service")); -// KDE4 kpd->setButtonGuiItem(KDialog::Ok,KGuiItem(i18n("C&reate"),"document-new")); -// KDE4 kpd->setPixmap(KIcon("kwalletmanager").pixmap(96, 96)); +// KF5 FIXME what should we use now instead of this: +// kpd->setButtonGuiItem(KDialog::Ok,KGuiItem(i18n("C&reate"),"document-new")); kpd->setPixmap( KIconLoader::global()->loadIcon("kwalletmanager", KIconLoader::Desktop, KIconLoader::SizeHuge) ); while (!b->isOpen()) { setupDialog( kpd, w, appid, modal ); @@ -774,7 +774,6 @@ int KWalletD::deleteWallet(const QString& wallet) { int result = -1; -// KDE4 QString path = KGlobal::dirs()->saveLocation("kwallet") + QDir::separator() + wallet + ".kwl"; QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + wallet + ".kwl"; if (QFile::exists(path)) { @@ -959,14 +958,13 @@ QStringList KWalletD::wallets() const { -// KDE4 QString path = KGlobal::dirs()->saveLocation("kwallet"); QString path = KWallet::Backend::getSaveLocation(); QDir dir(path, "*.kwl"); QStringList rc; dir.setFilter(QDir::Files | QDir::Hidden); - for (auto &fi : dir.entryInfoList()) { + foreach (const QFileInfo &fi, dir.entryInfoList()) { QString fn = fi.fileName(); if (fn.endsWith(QLatin1String(".kwl"))) { fn.truncate(fn.length()-4); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/src/runtime/kwalletd/kwalletd.notifyrc new/kwallet-4.99.0/src/runtime/kwalletd/kwalletd.notifyrc --- old/kwallet-4.98.0/src/runtime/kwalletd/kwalletd.notifyrc 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/src/runtime/kwalletd/kwalletd.notifyrc 2014-05-04 21:02:28.000000000 +0200 @@ -305,6 +305,7 @@ Name[gl]=Fallou a sincronización Name[hu]=A szinkronizálás meghiúsult Name[ia]=Il falleva synchronisar +Name[it]=Sincronizzazione non riuscita Name[kk]=Қадамдастыру жаңылды Name[ko]=동기화 실패 Name[lt]=Sinchronizavimas nepavyko @@ -344,8 +345,9 @@ Comment[gl]=O sistema de carteiras de KDE non conseguiu sincronizar un ficheiro de carteira co disco Comment[hu]=A KDE jelszókezelő rendszer nem tudta szinkronizálni a jelszófájlt a lemezre Comment[ia]=Le sistema de portafolio de KDE (KDE Wallet System) falleva synchronisar un file de portafolio con le disco +Comment[it]=Il sistema portafogli di KDE non è riuscito a sincronizzare un file di portafogli sul disco Comment[kk]=KDE әмиян жүйесінің дискідегі әмиян файлымен қадамдастыру жаңылысы -Comment[ko]=KDE 지갑 시스템에서 지갑 파일을 디스크에 동기화할 수 없음 +Comment[ko]=KDE 지갑 시스템과 디스크의 지갑 상태를 동기화할 수 없음 Comment[nb]=KDE Wallet System klarte ikke å synkronisere en lommebokfil til disk Comment[nds]=Binnen KDE sien Knippsystem lett sik en Knipp nich mit de Datei op de Fastplaat synkroniseren Comment[nl]=Het lukte het KDE portefeuillesysteem niet om een portefeuillebestand naar schijf te synchroniseren diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/tests/KWallet/CMakeLists.txt new/kwallet-4.99.0/tests/KWallet/CMakeLists.txt --- old/kwallet-4.98.0/tests/KWallet/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/tests/KWallet/CMakeLists.txt 2014-05-04 21:02:28.000000000 +0200 @@ -10,7 +10,6 @@ add_executable(${_testname} ${_testname}.cpp) ecm_mark_as_test(${_testname}) target_link_libraries(${_testname} Qt5::Test KF5::Wallet) - add_test(${_testname} ${_testname}) endforeach(_testname) endmacro() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwallet-4.98.0/tests/kwalletd/CMakeLists.txt new/kwallet-4.99.0/tests/kwalletd/CMakeLists.txt --- old/kwallet-4.98.0/tests/kwalletd/CMakeLists.txt 2014-03-29 08:12:43.000000000 +0100 +++ new/kwallet-4.99.0/tests/kwalletd/CMakeLists.txt 2014-05-04 21:02:28.000000000 +0200 @@ -6,10 +6,10 @@ include(ECMMarkAsTest) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) -find_package(KF5CoreAddons ${KF5_VERSION} REQUIRED) -find_package(KF5I18n ${KF5_VERSION} REQUIRED) -find_package(KF5IconThemes ${KF5_VERSION} REQUIRED) -find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED) +find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) +find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) @@ -60,7 +60,6 @@ Qt5::Test KF5::CoreAddons KF5::I18n) - add_test(${_testname} ${_testname}) endforeach(_testname) endmacro() -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
