Hello community, here is the log from the commit of package libqca-qt5 for openSUSE:Factory checked in at 2015-10-03 20:30:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqca-qt5 (Old) and /work/SRC/openSUSE:Factory/.libqca-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqca-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/libqca-qt5/libqca-qt5.changes 2015-02-16 22:12:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqca-qt5.new/libqca-qt5.changes 2015-10-03 20:30:13.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Oct 3 09:21:25 UTC 2015 - [email protected] + +- Update to 2.1.1 + * No changelog provided +- Drop Use-Q_SLOTS-Q_SIGNALS.patch and 0001-Add-missing-QIODevice-include.patch + +------------------------------------------------------------------- +Sat Sep 26 14:13:08 UTC 2015 - [email protected] + +- Added Use-Q_SLOTS-Q_SIGNALS.patch from upstream: allow building + without QT_NO_KEYWORDS define + +------------------------------------------------------------------- Old: ---- 0001-Add-missing-QIODevice-include.patch qca-qt5-2.1.0.3.tar.xz New: ---- qca-2.1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca-qt5.spec ++++++ --- /var/tmp/diff_new_pack.jgMhHz/_old 2015-10-03 20:30:14.000000000 +0200 +++ /var/tmp/diff_new_pack.jgMhHz/_new 2015-10-03 20:30:14.000000000 +0200 @@ -18,19 +18,17 @@ %define _so 2 Name: libqca-qt5 -Version: 2.1.0.3 +Version: 2.1.1 Release: 0 Summary: Qt Cryptographic Architecture 2 License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://delta.affinix.com/qca/ -Source: http://download.kde.org/stable/qca-qt5/%{version}/src/qca-qt5-%{version}.tar.xz +Source: http://download.kde.org/stable/qca/%{version}/src/qca-%{version}.tar.xz Source1: baselibs.conf Source99: libqca-qt5-rpmlintrc # PATCH-FIX-OPENSUSE ansi.diff -- rh#1182200. drop ansi flags in order to compile with latest gcrypt Patch0: ansi.diff -# PATCH-FIX-UPSTREAM 0001-Add-missing-QIODevice-include.patch -- Fix build with Qt 5.5 -Patch1: 0001-Add-missing-QIODevice-include.patch BuildRequires: ca-certificates BuildRequires: cmake >= 2.8.12 BuildRequires: cyrus-sasl-devel @@ -86,9 +84,8 @@ SASL support. %prep -%setup -q -n qca-qt5-%{version} +%setup -q -n qca-%{version} %patch0 -p1 -%patch1 -p1 %build %cmake \ ++++++ qca-qt5-2.1.0.3.tar.xz -> qca-2.1.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-qt5-2.1.0.3/CMakeLists.txt new/qca-2.1.1/CMakeLists.txt --- old/qca-qt5-2.1.0.3/CMakeLists.txt 2015-01-13 17:22:06.000000000 +0100 +++ new/qca-2.1.1/CMakeLists.txt 2015-10-02 11:39:21.000000000 +0200 @@ -12,7 +12,7 @@ set(QCA_LIB_MAJOR_VERSION "2") set(QCA_LIB_MINOR_VERSION "1") -set(QCA_LIB_PATCH_VERSION "0") +set(QCA_LIB_PATCH_VERSION "1") # Do not automatically link Qt executables to qtmain target on Windows. # QCA exucatables use console mode only. Not need to link against @@ -272,7 +272,7 @@ endif() if (APPLE) - find_package(Carbon REQUIRED) + find_package(CoreFoundation REQUIRED) set(CMAKE_INSTALL_NAME_DIR ${QCA_LIBRARY_INSTALL_DIR}) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) endif (APPLE) @@ -282,13 +282,13 @@ if( WIN32 ) # USE BUILTIN else ( WIN32 ) - if ( ENV{QC_CERTSTORE_PATH} ) - if(EXISTS ENV{QC_CERTSTORE_PATH}) + if ( DEFINED ENV{QC_CERTSTORE_PATH} ) + if(EXISTS $ENV{QC_CERTSTORE_PATH}) set( qca_CERTSTORE $ENV{QC_CERTSTORE_PATH}) - else(EXISTS ENV{QC_CERTSTORE_PATH}) + else(EXISTS $ENV{QC_CERTSTORE_PATH}) # path to try - endif(EXISTS ENV{QC_CERTSTORE_PATH}) - else( ENV{QC_CERTSTORE_PATH} ) + endif(EXISTS $ENV{QC_CERTSTORE_PATH}) + else( DEFINED ENV{QC_CERTSTORE_PATH} ) set( toTry "/etc/ssl/certs/ca-certificates.crt" "/usr/share/ssl/cert.pem" @@ -302,7 +302,7 @@ set( qca_CERTSTORE ${_current_try}) endif(EXISTS ${_current_try}) endforeach (_current_try) - endif( ENV{QC_CERTSTORE_PATH} ) + endif( DEFINED ENV{QC_CERTSTORE_PATH} ) endif(WIN32) if (qca_CERTSTORE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-qt5-2.1.0.3/cmake/modules/FindCarbon.cmake new/qca-2.1.1/cmake/modules/FindCarbon.cmake --- old/qca-qt5-2.1.0.3/cmake/modules/FindCarbon.cmake 2015-01-13 17:22:06.000000000 +0100 +++ new/qca-2.1.1/cmake/modules/FindCarbon.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -# Copyright (c) 2006, Benjamin Reed, <[email protected]> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -INCLUDE(CMakeFindFrameworks) - -CMAKE_FIND_FRAMEWORKS(Carbon) - -if (Carbon_FRAMEWORKS) - set(CARBON_LIBRARY "-framework Carbon" CACHE FILEPATH "Carbon framework" FORCE) - set(CARBON_FOUND 1) -endif (Carbon_FRAMEWORKS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-qt5-2.1.0.3/include/QtCrypto/qca_basic.h new/qca-2.1.1/include/QtCrypto/qca_basic.h --- old/qca-qt5-2.1.0.3/include/QtCrypto/qca_basic.h 2015-01-13 17:22:06.000000000 +0100 +++ new/qca-2.1.1/include/QtCrypto/qca_basic.h 2015-10-02 11:39:21.000000000 +0200 @@ -35,6 +35,8 @@ #include "qca_core.h" +#include <QIODevice> + // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4 does // not have. It is needed if the headers are built with QT_NO_CAST_FROM_ASCII. // Defining it here as QString::fromUtf8 for convenience. @@ -595,7 +597,7 @@ CFB, ///< operate in %Cipher FeedBack mode ECB, ///< operate in Electronic Code Book mode OFB, ///< operate in Output FeedBack Mode - CTR, ///< operate in CounTer Mode + CTR ///< operate in CounTer Mode }; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-qt5-2.1.0.3/include/QtCrypto/qca_safetimer.h new/qca-2.1.1/include/QtCrypto/qca_safetimer.h --- old/qca-qt5-2.1.0.3/include/QtCrypto/qca_safetimer.h 2015-01-13 17:22:06.000000000 +0100 +++ new/qca-2.1.1/include/QtCrypto/qca_safetimer.h 2015-10-02 11:39:21.000000000 +0200 @@ -44,12 +44,12 @@ void setSingleShot(bool singleShot); int timerId() const; -public slots: +public Q_SLOTS: void start(int msec); void start(); void stop(); -signals: +Q_SIGNALS: void timeout(); protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-qt5-2.1.0.3/src/CMakeLists.txt new/qca-2.1.1/src/CMakeLists.txt --- old/qca-qt5-2.1.0.3/src/CMakeLists.txt 2015-01-13 17:22:06.000000000 +0100 +++ new/qca-2.1.1/src/CMakeLists.txt 2015-10-02 11:39:21.000000000 +0200 @@ -148,8 +148,8 @@ endif(WIN32) if(APPLE) - set(CARBON_LIBRARY_SECURITY "-framework Security") - TARGET_LINK_LIBRARIES(${QCA_LIB_NAME} ${CARBON_LIBRARY} ${CARBON_LIBRARY_SECURITY}) + set(COREFOUNDATION_LIBRARY_SECURITY "-framework Security") + TARGET_LINK_LIBRARIES(${QCA_LIB_NAME} ${COREFOUNDATION_LIBRARY} ${COREFOUNDATION_LIBRARY_SECURITY}) endif(APPLE) if(NOT ANDROID) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qca-qt5-2.1.0.3/src/qca_systemstore_mac.cpp new/qca-2.1.1/src/qca_systemstore_mac.cpp --- old/qca-qt5-2.1.0.3/src/qca_systemstore_mac.cpp 2015-01-13 17:22:06.000000000 +0100 +++ new/qca-2.1.1/src/qca_systemstore_mac.cpp 2015-10-02 11:39:21.000000000 +0200 @@ -20,7 +20,6 @@ #include "qca_systemstore.h" -#include <Carbon/Carbon.h> #include <Security/SecTrust.h> #include <Security/SecCertificate.h>
