Attachment 157044 Details for Bug 198785 – Updated patch

[patch] Updated patch

owncloud-client.qtkeychain.patch (text/plain), 8.94 KB, created by Gleb Popov on 2015-05-22 15:45:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Popov

Created: 2015-05-22 15:45:42 UTC

Size: 8.94 KB

patch

obsolete

>diff -ruN /usr/ports/deskutils/owncloudclient/Makefile deskutils/owncloudclient/Makefile
>--- /usr/ports/deskutils/owncloudclient/Makefile	2015-04-04 03:25:25.000000000 +0300
>+++ deskutils/owncloudclient/Makefile	2015-05-22 18:37:40.324868477 +0300
>@@ -7,35 +7,32 @@
> MASTER_SITES=	http://download.owncloud.com/desktop/stable/
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Qt based sync client for OwnCloud
>+COMMENT=	OwnCloud Desktop Syncing Client
> 
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify \
>-		libqtkeychain.so:${PORTSDIR}/security/qtkeychain \
>-		libneon.so:${PORTSDIR}/www/neon
>+		libqt5keychain.so:${PORTSDIR}/security/qtkeychain
> 
>-USES=		cmake:outsource compiler:c++11-lib gmake pkgconfig tar:bzip2
>-USE_QT4=	corelib dbus gui network qtestlib webkit xml \
>-		linguisttools_build moc_build qmake_build rcc_build uic_build \
>-		sql-sqlite3_run
>+USES=           cmake:outsource compiler:c++11-lib gmake pkgconfig tar:bzip2
>+USE_QT5=	buildtools_build core dbus gui linguist_build  network qmake_build  webkit xml
> USE_OPENSSL=	yes
> USE_SQLITE=	3
>-CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=ON \
>-		-DCMAKE_INSTALL_MANDIR:STRING=man \
>-		-DWITH_STACK_PROTECTOR:BOOL=OFF
>+CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=OFF \
>+		-DCMAKE_INSTALL_MANDIR:STRING=man
> USE_LDCONFIG=	yes
> INSTALLS_ICONS=	yes
> 
>-CFLAGS+=	-I${WRKSRC}/csync/src/httpbf/src -I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE=		DOCS
>+OPTIONS_DEFINE=	DOCS
> 
> DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
> DOCS_USE=		tex=dvipsk:build,latex:build
> DOCS_CMAKE_ON=		-DWITH_DOC:BOOL=ON
> 
>+PLIST_SUB=	VERSION=${PORTVERSION}
>+
> .include <bsd.port.options.mk>
> 
> .if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000015
>diff -ruN /usr/ports/deskutils/owncloudclient/pkg-descr deskutils/owncloudclient/pkg-descr
>--- /usr/ports/deskutils/owncloudclient/pkg-descr	2015-04-04 03:25:25.000000000 +0300
>+++ deskutils/owncloudclient/pkg-descr	2015-05-22 18:04:59.000000000 +0300
>@@ -1,4 +1,4 @@
>-Owncloudclient is a tool to synchronize files from ownCloud Server with your
>-computer. It uses OCSync as its syncing backend.
>+The ownCloud Desktop Client is a tool to synchronize files
>+from ownCloud Server with your computer.
> 
> WWW: https://github.com/owncloud/client
>diff -ruN /usr/ports/deskutils/owncloudclient/pkg-plist deskutils/owncloudclient/pkg-plist
>--- /usr/ports/deskutils/owncloudclient/pkg-plist	2015-04-04 03:25:25.000000000 +0300
>+++ deskutils/owncloudclient/pkg-plist	2015-05-22 18:39:17.977862557 +0300
>@@ -1,7 +1,6 @@
> bin/owncloud
> bin/owncloudcmd
> @sample etc/ownCloud/sync-exclude.lst.sample
>-include/httpbf.h
> include/owncloudsync/creds/abstractcredentials.h
> include/owncloudsync/creds/httpcredentials.h
> include/owncloudsync/mirall/account.h
>@@ -12,17 +11,15 @@
> include/owncloudsync/mirall/syncfileitem.h
> include/owncloudsync/mirall/syncjournaldb.h
> include/owncloudsync/mirall/syncresult.h
>-lib/libhttpbf.a
> lib/libowncloudsync.so
> lib/libowncloudsync.so.0
>-lib/libowncloudsync.so.1.8.0
>+lib/libowncloudsync.so.%%VERSION%%
> lib/owncloud/libocsync.so
> lib/owncloud/libocsync.so.0
> lib/owncloud/libocsync.so.0.2.1
> %%PORTDOCS%%man/man1/owncloud.1.gz
> %%PORTDOCS%%man/man1/owncloudcmd.1.gz
> share/applications/owncloud.desktop
>-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/.buildinfo
> %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client1.png
> %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client10.png
> %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client11.png
>@@ -108,7 +105,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/searchindex.js
> %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/troubleshooting.html
> %%PORTDOCS%%%%DOCSDIR%%/html/unthemed/visualtour.html
>-%%PORTDOCS%%%%DOCSDIR%%/latex/Makefile
> %%PORTDOCS%%%%DOCSDIR%%/latex/client1.png
> %%PORTDOCS%%%%DOCSDIR%%/latex/client10.png
> %%PORTDOCS%%%%DOCSDIR%%/latex/client11.png
>@@ -137,8 +133,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.idx
> %%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.ilg
> %%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.ind
>-%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.log
>-%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.out
> %%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.pdf
> %%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.tex
> %%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.toc
>diff -ruN /usr/ports/security/qtkeychain/Makefile security/qtkeychain/Makefile
>--- /usr/ports/security/qtkeychain/Makefile	2014-12-10 17:04:23.000000000 +0300
>+++ security/qtkeychain/Makefile	2015-03-22 15:21:54.840001031 +0300
>@@ -1,24 +1,32 @@
>-# $FreeBSD: head/security/qtkeychain/Makefile 374458 2014-12-10 14:04:23Z feld $
>+# $FreeBSD: head/security/qtkeychain/Makefile 347647 2014-03-09 15:02:17Z miwi $
> 
> PORTNAME=	qtkeychain
>-PORTVERSION=	0.1.0
>+PORTVERSION=	0.4.0
> CATEGORIES=	security
> 
> MAINTAINER=	6yearold@gmail.com
> COMMENT=	Platform independent Qt API for storing passwords
> 
> LICENSE=	BSD2CLAUSE
>-LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	frankosterfeld
> GH_TAGNAME=	v${PORTVERSION}
>-GH_COMMIT=	bb32e45
>+GH_COMMIT=	1416233
> 
>-CONFIGURE_ENV=	HOME=${WRKDIR}/.home
>-
>-USES=	cmake
>-USE_QT4=	corelib dbus moc_build qmake_build rcc_build
>+USES=		cmake
>+.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4"
>+CONFLICTS_INSTALL=	qtkeychain-[0-9]*
>+CMAKE_ARGS+=	-DBUILD_WITH_QT4=YES
>+USE_QT4=	corelib dbus linguisttools_build moc_build rcc_build
>+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
>+PLIST_SUB+=     PLIST_QT_PREFIX_UPCASE=Qt5 PLIST_QT_PREFIX=qt5
>+.endif
> USE_LDCONFIG=	yes
> 
>+PLIST_SUB+=	VERSION=${PORTVERSION}
>+
> .include <bsd.port.mk>
>diff -ruN /usr/ports/security/qtkeychain/distinfo security/qtkeychain/distinfo
>--- /usr/ports/security/qtkeychain/distinfo	2013-04-17 10:06:24.000000000 +0400
>+++ security/qtkeychain/distinfo	2014-09-27 15:28:49.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (qtkeychain-0.1.0.tar.gz) = cf4fa0e9063d6df54c191e361566f5b6e5d3a5867fc0d9ab96954af393c939ef
>-SIZE (qtkeychain-0.1.0.tar.gz) = 12834
>+SHA256 (qtkeychain-0.4.0.tar.gz) = 2b32a51ad0ace679d83f229e54f4410d704b9c98ff90ac9903b73fed1939ca32
>+SIZE (qtkeychain-0.4.0.tar.gz) = 18236
>diff -ruN /usr/ports/security/qtkeychain/files/patch-auto_ptr.h security/qtkeychain/files/patch-auto_ptr.h
>--- /usr/ports/security/qtkeychain/files/patch-auto_ptr.h	2013-04-17 10:06:24.000000000 +0400
>+++ security/qtkeychain/files/patch-auto_ptr.h	1970-01-01 04:00:00.000000000 +0400
>@@ -1,11 +0,0 @@
>---- _keychain_dbus.cpp	2013-03-25 20:32:44.801564594 +0400
>-+++ keychain_dbus.cpp	2013-03-25 20:32:49.811561714 +0400
>-@@ -10,7 +10,7 @@
>- 
>- #include <QSettings>
>- 
>--#include <auto_ptr.h>
>-+#include <memory>
>- 
>- using namespace QKeychain;
>- 
>diff -ruN /usr/ports/security/qtkeychain/pkg-plist security/qtkeychain/pkg-plist
>--- /usr/ports/security/qtkeychain/pkg-plist	2013-04-19 02:20:09.000000000 +0400
>+++ security/qtkeychain/pkg-plist	2015-03-22 18:09:37.075309306 +0300
>@@ -1,12 +1,15 @@
>-include/qtkeychain/keychain.h
>-include/qtkeychain/qkeychain_export.h
>-lib/cmake/QtKeychain/QtKeychainConfig.cmake
>-lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
>-lib/cmake/QtKeychain/QtKeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
>-lib/cmake/QtKeychain/QtKeychainLibraryDepends.cmake
>-lib/libqtkeychain.so
>-lib/libqtkeychain.so.0
>-lib/libqtkeychain.so.0.1.0
>-@dirrm lib/cmake/QtKeychain
>-@dirrmtry lib/cmake
>-@dirrm include/qtkeychain
>+include/qt5keychain/keychain.h
>+include/qt5keychain/qkeychain_export.h
>+lib/cmake/Qt5Keychain/Qt5KeychainConfig.cmake
>+lib/cmake/Qt5Keychain/Qt5KeychainConfigVersion.cmake
>+lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/Qt5Keychain/Qt5KeychainLibraryDepends.cmake
>+lib/libqt5keychain.so
>+lib/libqt5keychain.so.0
>+lib/libqt5keychain.so.%%VERSION%%
>+%%QT_L10NDIR%%/qtkeychain_de.qm
>+%%QT_L10NDIR%%/qtkeychain_ro.qm
>+@dirrm include/qt5keychain
>+@dirrm lib/cmake/Qt5Keychain
>+@dirrmtry %%QT_L10NDIR%%
>+@dirrmtry %%QT_DATADIR%%
>diff -ruN /var/empty/Makefile security/qtkeychain-qt4/Makefile
>--- /var/empty/Makefile	1970-01-01 04:00:00.000000000 +0400
>+++ security/qtkeychain-qt4/Makefile	2015-03-22 18:14:16.825290026 +0300
>@@ -0,0 +1,8 @@
>+# $FreeBSD$
>+
>+PKGNAMESUFFIX=	-qt4
>+
>+MASTERDIR=	${.CURDIR}/../qtkeychain
>+PLIST=		${.CURDIR}/pkg-plist
>+
>+.include "${MASTERDIR}/Makefile"
>diff -ruN /var/empty/pkg-plist security/qtkeychain-qt4/pkg-plist
>--- /var/empty/pkg-plist	1970-01-01 04:00:00.000000000 +0400
>+++ security/qtkeychain-qt4/pkg-plist	2015-03-22 18:08:21.000000000 +0300
>@@ -0,0 +1,15 @@
>+include/qtkeychain/keychain.h
>+include/qtkeychain/qkeychain_export.h
>+lib/cmake/QtKeychain/QtKeychainConfig.cmake
>+lib/cmake/QtKeychain/QtKeychainConfigVersion.cmake
>+lib/cmake/QtKeychain/QtKeychainLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/QtKeychain/QtKeychainLibraryDepends.cmake
>+lib/libqtkeychain.so
>+lib/libqtkeychain.so.0
>+lib/libqtkeychain.so.%%VERSION%%
>+%%QT_L10NDIR%%/qtkeychain_de.qm
>+%%QT_L10NDIR%%/qtkeychain_ro.qm
>+@dirrm include/qtkeychain
>+@dirrm lib/cmake/QtKeychain
>+@dirrmtry %%QT_L10NDIR%%
>+@dirrmtry %%QT_DATADIR%%

Actions: View | Diff

Attachments on bug 198785: 154648 | 154657 | 157044