Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Jul 2018 07:45:23 +0000 (UTC)
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r474717 - in head/security/qtkeychain: . files
Message-ID:  <201807160745.w6G7jNGQ026901@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arrowd
Date: Mon Jul 16 07:45:23 2018
New Revision: 474717
URL: https://svnweb.freebsd.org/changeset/ports/474717

Log:
  security/qtkeychain: Update to latest 0.9.0.
  
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16271

Added:
  head/security/qtkeychain/files/patch-keychain__unix.cpp   (contents, props changed)
Modified:
  head/security/qtkeychain/Makefile
  head/security/qtkeychain/distinfo
  head/security/qtkeychain/files/patch-CMakeLists.txt

Modified: head/security/qtkeychain/Makefile
==============================================================================
--- head/security/qtkeychain/Makefile	Mon Jul 16 05:28:42 2018	(r474716)
+++ head/security/qtkeychain/Makefile	Mon Jul 16 07:45:23 2018	(r474717)
@@ -2,12 +2,11 @@
 
 PORTNAME=	qtkeychain
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.0
-PORTREVISION=	1
+DISTVERSION=	0.9.0
 CATEGORIES=	security
 PKGNAMESUFFIX=	-${FLAVOR}
 
-MAINTAINER=	6yearold@gmail.com
+MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Platform independent Qt API for storing passwords
 
 LICENSE=	BSD2CLAUSE

Modified: head/security/qtkeychain/distinfo
==============================================================================
--- head/security/qtkeychain/distinfo	Mon Jul 16 05:28:42 2018	(r474716)
+++ head/security/qtkeychain/distinfo	Mon Jul 16 07:45:23 2018	(r474717)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492678876
-SHA256 (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = b492f603197538bc04b2714105b1ab2b327a9a98d400d53d9a7cb70edd2db12f
-SIZE (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = 34686
+TIMESTAMP = 1531587033
+SHA256 (frankosterfeld-qtkeychain-v0.9.0_GH0.tar.gz) = 0935e5eb67fbed0b2db5e74ea8cbd667c6be6eed3767f212eac6ac318ab8a6fc
+SIZE (frankosterfeld-qtkeychain-v0.9.0_GH0.tar.gz) = 35614

Modified: head/security/qtkeychain/files/patch-CMakeLists.txt
==============================================================================
--- head/security/qtkeychain/files/patch-CMakeLists.txt	Mon Jul 16 05:28:42 2018	(r474716)
+++ head/security/qtkeychain/files/patch-CMakeLists.txt	Mon Jul 16 07:45:23 2018	(r474717)
@@ -1,23 +1,13 @@
---- CMakeLists.txt.orig	2017-04-19 13:09:34 UTC
+--- CMakeLists.txt.orig 2018-07-14 18:01:07 UTC
 +++ CMakeLists.txt
-@@ -38,7 +38,7 @@ if( NOT BUILD_WITH_QT4 )
-     find_package(Qt5Core QUIET)
- endif()
- 
--if (Qt5Core_FOUND)
-+if (NOT BUILD_WITH_QT4)
-   set(QTKEYCHAIN_VERSION_INFIX 5)
- 
-   if(UNIX AND NOT APPLE AND NOT ANDROID)
-@@ -249,8 +249,9 @@ ecm_generate_pri_file(BASE_NAME Qt${QTKE
+@@ -257,7 +257,9 @@ ecm_generate_pri_file(BASE_NAME Qt${QTKEYCHAIN_VERSION
    INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}
    FILENAME_VAR pri_filename)
  
--install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
--
-+if( NOT BUILD_WITH_QT4 )
-+  install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
++if(NOT BUILD_WITH_QT4)
+ install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
 +endif()
  
+ 
  install(EXPORT Qt${QTKEYCHAIN_VERSION_INFIX}KeychainLibraryDepends
-     DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Qt${QTKEYCHAIN_VERSION_INFIX}Keychain"
+

Added: head/security/qtkeychain/files/patch-keychain__unix.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/qtkeychain/files/patch-keychain__unix.cpp	Mon Jul 16 07:45:23 2018	(r474717)
@@ -0,0 +1,11 @@
+--- keychain_unix.cpp.orig      2018-07-14 17:48:08 UTC
++++ keychain_unix.cpp
+@@ -91,7 +91,7 @@ static bool isKwallet5Available()
+     // a wallet can be opened.
+
+     iface.setTimeout(500);
+-    QDBusMessage reply = iface.call(QStringLiteral("networkWallet"));
++    QDBusMessage reply = iface.call(QLatin1String("networkWallet"));
+     return reply.type() == QDBusMessage::ReplyMessage;
+ }
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807160745.w6G7jNGQ026901>