Attachment 184734 Details for Bug 218772 – Patch

[patch] Patch

qtkeychain.patch (text/plain), 3.20 KB, created by Gleb Popov on 2017-07-26 15:21:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Popov

Created: 2017-07-26 15:21:01 UTC

Size: 3.20 KB

patch

obsolete

>diff -ruN /usr/ports/security/qtkeychain-qt5/distinfo ./distinfo
>--- /usr/ports/security/qtkeychain-qt5/distinfo	2016-07-29 01:27:20.000000000 +0300
>+++ ./distinfo	2017-04-20 12:01:16.507993000 +0300
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1469621401
>-SHA256 (frankosterfeld-qtkeychain-v0.7.0_GH0.tar.gz) = 9f9afaae8e909391d7fc932bac95e38befaac5b2eb49f6623a8efec60a2e6a3a
>-SIZE (frankosterfeld-qtkeychain-v0.7.0_GH0.tar.gz) = 18913
>+TIMESTAMP = 1492678876
>+SHA256 (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = b492f603197538bc04b2714105b1ab2b327a9a98d400d53d9a7cb70edd2db12f
>+SIZE (frankosterfeld-qtkeychain-v0.8.0_GH0.tar.gz) = 34686
>diff -ruN /usr/ports/security/qtkeychain-qt5/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt
>--- /usr/ports/security/qtkeychain-qt5/files/patch-CMakeLists.txt	1970-01-01 03:00:00.000000000 +0300
>+++ ./files/patch-CMakeLists.txt	2017-07-26 18:08:17.513736000 +0300
>@@ -0,0 +1,23 @@
>+--- CMakeLists.txt.orig	2017-04-19 13:09:34 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
>+   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})
>++endif()
>+ 
>+ install(EXPORT Qt${QTKEYCHAIN_VERSION_INFIX}KeychainLibraryDepends
>+     DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Qt${QTKEYCHAIN_VERSION_INFIX}Keychain"
>diff -ruN /usr/ports/security/qtkeychain-qt5/Makefile ./Makefile
>--- /usr/ports/security/qtkeychain-qt5/Makefile	2016-07-29 01:27:20.000000000 +0300
>+++ ./Makefile	2017-07-26 18:14:26.853646000 +0300
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/security/qtkeychain-qt5/Makefile 419227 2016-07-28 22:27:20Z pawel $
> 
> PORTNAME=	qtkeychain
>-PORTVERSION=	0.7.0
>+PORTVERSION=	0.8.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	security
> PKGNAMESUFFIX?=	-qt5
>@@ -17,16 +17,15 @@
> 
> USES=		cmake
> USE_LDCONFIG=	yes
>+USE_KDE=	ecm
> PLIST_SUB+=	VERSION=${PORTVERSION}
> 
> .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
>-CONFLICTS_INSTALL=	qtkeychain-qt5-[0-9]*
> CMAKE_ARGS+=	-DBUILD_WITH_QT4=YES
> USE_QT4=	corelib dbus linguisttools_build moc_build rcc_build qmake_build
> PLIST=		${PKGDIR}/pkg-plist.qt4
> PLIST_SUB+=	PLIST_QT_PREFIX_UPCASE=Qt PLIST_QT_PREFIX=qt
> .else
>-CONFLICTS_INSTALL=	qtkeychain-qt4-[0-9]*
> USE_QT5=	core dbus linguisttools_build buildtools_build qmake_build
> PLIST=		${PKGDIR}/pkg-plist.qt5
> PLIST_SUB+=	PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5
>diff -ruN /usr/ports/security/qtkeychain-qt5/pkg-plist.qt5 ./pkg-plist.qt5
>--- /usr/ports/security/qtkeychain-qt5/pkg-plist.qt5	2016-07-29 01:27:20.000000000 +0300
>+++ ./pkg-plist.qt5	2017-04-20 12:04:30.005363000 +0300
>@@ -1,5 +1,6 @@
> include/qt5keychain/keychain.h
> include/qt5keychain/qkeychain_export.h
>+%%QT_MKSPECDIR%%/modules/qt_Qt5Keychain.pri
> lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake
> lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake
> lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake

Flags:

arrowd: maintainer-approval+

Actions: View | Diff

Attachments on bug 218772: 181932 | 184734