Hello community, here is the log from the commit of package qtkeychain-qt5 for openSUSE:Factory checked in at 2019-06-18 14:58:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtkeychain-qt5 (Old) and /work/SRC/openSUSE:Factory/.qtkeychain-qt5.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtkeychain-qt5" Tue Jun 18 14:58:58 2019 rev:7 rq:710433 version:0.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qtkeychain-qt5/qtkeychain-qt5.changes 2018-11-12 09:46:44.140708315 +0100 +++ /work/SRC/openSUSE:Factory/.qtkeychain-qt5.new.4811/qtkeychain-qt5.changes 2019-06-18 14:59:05.189305770 +0200 @@ -1,0 +2,8 @@ +Mon Jun 17 09:28:34 UTC 2019 - Fabian Vogt <[email protected]> + +- Add fixes from git master: + * 0001-On-Unix-systems-shared-libraries-have-a-abi-version.patch + * 0002-Detect-XFCE-desktop-correctly.patch + * 0003-Generate-Qt-5.12.1-compatible-qt_Qt5Keychain.pri.patch (boo#1130608) + +------------------------------------------------------------------- New: ---- 0001-On-Unix-systems-shared-libraries-have-a-abi-version.patch 0002-Detect-XFCE-desktop-correctly.patch 0003-Generate-Qt-5.12.1-compatible-qt_Qt5Keychain.pri.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtkeychain-qt5.spec ++++++ --- /var/tmp/diff_new_pack.iXCBfW/_old 2019-06-18 14:59:05.773305480 +0200 +++ /var/tmp/diff_new_pack.iXCBfW/_new 2019-06-18 14:59:05.773305480 +0200 @@ -1,7 +1,7 @@ # # spec file for package qtkeychain-qt5 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,10 @@ URL: https://github.com/frankosterfeld/qtkeychain Source: https://github.com/frankosterfeld/qtkeychain/archive/v%{version}.tar.gz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch1: 0001-On-Unix-systems-shared-libraries-have-a-abi-version.patch +Patch2: 0002-Detect-XFCE-desktop-correctly.patch +Patch3: 0003-Generate-Qt-5.12.1-compatible-qt_Qt5Keychain.pri.patch BuildRequires: cmake BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) @@ -55,7 +59,7 @@ %lang_package -n %{lname} %prep -%setup -q -n qtkeychain-%{version} +%autosetup -p1 -n qtkeychain-%{version} %build %cmake -DBUILD_WITH_QT4=OFF .. ++++++ 0001-On-Unix-systems-shared-libraries-have-a-abi-version.patch ++++++ >From 22981a654bb65c2c8b8914c21900840d72124027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <[email protected]> Date: Sun, 17 Feb 2019 10:50:15 +0100 Subject: [PATCH 1/3] On Unix systems shared libraries have a abi version. The ABI Version is the Interface version of that library on a users system the ABI Version less so file is not installed. Also we normally need to recompile the code against a new ABI Version of libsecret. This fix make it possible to use qtkeychain in a Ubunut/Debian system. --- libsecret.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsecret.cpp b/libsecret.cpp index b76f4c5..aed91a0 100644 --- a/libsecret.cpp +++ b/libsecret.cpp @@ -305,7 +305,7 @@ bool LibSecretKeyring::deletePassword(const QString &key, const QString &service } LibSecretKeyring::LibSecretKeyring() - : QLibrary("secret-1") + : QLibrary(QStringLiteral("secret-1"), 0) { #ifdef HAVE_LIBSECRET if (load()) { -- 2.21.0 ++++++ 0002-Detect-XFCE-desktop-correctly.patch ++++++ >From dd1beff10a53e4fe1afd18b5373e36805920e9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <[email protected]> Date: Sun, 17 Feb 2019 10:56:24 +0100 Subject: [PATCH 2/3] Detect XFCE desktop correctly. --- keychain_unix.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keychain_unix.cpp b/keychain_unix.cpp index 30b26c3..958927a 100644 --- a/keychain_unix.cpp +++ b/keychain_unix.cpp @@ -54,6 +54,8 @@ static DesktopEnvironment detectDesktopEnvironment() { return DesktopEnv_Unity; } else if ( xdgCurrentDesktop == "KDE" ) { return getKdeVersion(); + } else if ( xdgCurrentDesktop == "XFCE" ) { + return DesktopEnv_Xfce; } QByteArray desktopSession = qgetenv("DESKTOP_SESSION"); -- 2.21.0 ++++++ 0003-Generate-Qt-5.12.1-compatible-qt_Qt5Keychain.pri.patch ++++++ >From b338aa240d3893f6ffc27573686c08246531e881 Mon Sep 17 00:00:00 2001 From: Sergey Ilinykh <[email protected]> Date: Thu, 28 Mar 2019 14:47:37 +0300 Subject: [PATCH 3/3] Generate Qt 5.12.1+ compatible qt_Qt5Keychain.pri As mentioned in https://github.com/frankosterfeld/qtkeychain/issues/141 --- cmake/Modules/ECMGeneratePriFile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Modules/ECMGeneratePriFile.cmake b/cmake/Modules/ECMGeneratePriFile.cmake index a64fa62..8e00c10 100644 --- a/cmake/Modules/ECMGeneratePriFile.cmake +++ b/cmake/Modules/ECMGeneratePriFile.cmake @@ -187,6 +187,7 @@ QT.${PRI_TARGET_BASENAME}.MAJOR_VERSION = ${PROJECT_VERSION_MAJOR} QT.${PRI_TARGET_BASENAME}.MINOR_VERSION = ${PROJECT_VERSION_MINOR} QT.${PRI_TARGET_BASENAME}.PATCH_VERSION = ${PROJECT_VERSION_PATCH} QT.${PRI_TARGET_BASENAME}.name = ${PRI_TARGET_LIBNAME} +QT.${PRI_TARGET_BASENAME}.module = ${PRI_TARGET_LIBNAME} QT.${PRI_TARGET_BASENAME}.defines = ${PRI_TARGET_DEFINES} QT.${PRI_TARGET_BASENAME}.includes = ${PRI_TARGET_INCLUDES} QT.${PRI_TARGET_BASENAME}.private_includes = -- 2.21.0
