FreeBSD Bugzilla – Attachment 154648 Details for
Bug 198785
[PATCH] Update security/qtkeychain and deskutils/mirall.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
owncloud-client.qtkeychain.patch (text/plain), 23.95 KB, created by
Gleb Popov
on 2015-03-22 08:27:34 UTC
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Gleb Popov
Created:
2015-03-22 08:27:34 UTC
Size:
23.95 KB
patch
obsolete
>diff -ruN /usr/ports/deskutils/mirall/Makefile deskutils/owncloud-client/Makefile >--- /usr/ports/deskutils/mirall/Makefile 2015-02-27 19:03:22.000000000 +0300 >+++ deskutils/owncloud-client/Makefile 2015-03-22 01:18:32.039180381 +0300 >@@ -1,45 +1,51 @@ > # Created by: Mathieu Arnold >-# $FreeBSD: head/deskutils/mirall/Makefile 380097 2015-02-27 16:03:22Z amdmi3 $ >+# $FreeBSD: head/deskutils/mirall/Makefile 349156 2014-03-25 16:27:25Z mat $ > >-PORTNAME= mirall >-PORTVERSION= 1.7.1 >+PORTNAME= owncloud-client >+PORTVERSION= 1.8.0 > CATEGORIES= deskutils > MASTER_SITES= http://download.owncloud.com/desktop/stable/ >+DISTNAME= owncloudclient-${PORTVERSION} > >-MAINTAINER= ports@FreeBSD.org >-COMMENT= Qt based sync client for OwnCloud >+MAINTAINER= 6yearold@gmail.com >+COMMENT= OwnCloud Desktop Syncing Client > > LICENSE= GPLv2 > >+# TODO: remove neon dependency when Qt will be at 5.4 > LIB_DEPENDS= libinotify.so:${PORTSDIR}/devel/libinotify \ >- libqtkeychain.so:${PORTSDIR}/security/qtkeychain \ >+ libqt5keychain.so:${PORTSDIR}/security/qtkeychain \ > libneon.so:${PORTSDIR}/www/neon > >-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 pkgconfig gmake compiler:c++11-lang tar:bzip2 >+USE_QT5= buildtools_build core dbus gui linguist_build network qmake_build webkit xml > 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:BOOLEAN=OFF > USE_LDCONFIG= yes > INSTALLS_ICONS= yes > >-CFLAGS+= -I${WRKSRC}/csync/src/httpbf/src -I${LOCALBASE}/include >-LDFLAGS+= -L${LOCALBASE}/lib >+ALL_TARGET= all > >-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 >- >-post-patch: >- @${REINPLACE_CMD} -e \ >- 's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt >+LDFLAGS+=-L/usr/local/lib > >-pre-configure: >- @(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample) >+DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx >+DOCS_USE= TEX=dvipsk:build,latex:build >+DOCS_CMAKE_ON= WITH_DOC=ON >+DOCS_ALL_TARGET= doc-html doc-pdf >+ >+PLIST_SUB+= VERSION=${PORTVERSION} >+ >+.include <bsd.port.options.mk> >+ >+post-install: >+.if ${PORT_OPTIONS:MDOCS} >+ @${MKDIR} ${STAGEDIR}${DOCSDIR} >+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/html >+ ${INSTALL_DATA} ${INSTALL_WRKSRC}/doc/latex/ownCloudClientManual.pdf ${STAGEDIR}${DOCSDIR} >+ (cd ${INSTALL_WRKSRC}/doc/html/unthemed && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html) >+.endif >+ ${MV} ${STAGEDIR}${PREFIX}/etc/ownCloud/sync-exclude.lst ${STAGEDIR}${PREFIX}/etc/ownCloud/sync-exclude.lst.sample > > .include <bsd.port.mk> >diff -ruN /usr/ports/deskutils/mirall/distinfo deskutils/owncloud-client/distinfo >--- /usr/ports/deskutils/mirall/distinfo 2015-02-09 23:34:17.000000000 +0300 >+++ deskutils/owncloud-client/distinfo 2015-03-19 22:20:37.946773752 +0300 >@@ -1,2 +1,2 @@ >-SHA256 (mirall-1.7.1.tar.bz2) = ce1bc5784eb42d3f510c6d012d0ad86eefbab99f54f4e8653f546d2c4fda2f59 >-SIZE (mirall-1.7.1.tar.bz2) = 12668153 >+SHA256 (owncloudclient-1.8.0.tar.bz2) = 192bec5fe4b60c40d3a5d60abe224a1029af653ce445515290f3f1bb7967b0bd >+SIZE (owncloudclient-1.8.0.tar.bz2) = 13556481 >diff -ruN /usr/ports/deskutils/mirall/files/patch-src__libsync__syncjournaldb.cpp deskutils/owncloud-client/files/patch-src__libsync__syncjournaldb.cpp >--- /usr/ports/deskutils/mirall/files/patch-src__libsync__syncjournaldb.cpp 1970-01-01 04:00:00.000000000 +0400 >+++ deskutils/owncloud-client/files/patch-src__libsync__syncjournaldb.cpp 2015-03-21 20:05:42.997473551 +0300 >@@ -0,0 +1,10 @@ >+--- src/libsync/syncjournaldb.cpp_ 2015-03-21 20:03:56.762485751 +0300 >++++ src/libsync/syncjournaldb.cpp 2015-03-21 20:04:06.734482271 +0300 >+@@ -18,6 +18,7 @@ >+ #include "ownsql.h" >+ >+ #include <inttypes.h> >++#include <time.h> >+ >+ #include "syncjournaldb.h" >+ #include "syncjournalfilerecord.h" >diff -ruN /usr/ports/deskutils/mirall/files/patch-src__mirall__accountsettings.cpp deskutils/owncloud-client/files/patch-src__mirall__accountsettings.cpp >--- /usr/ports/deskutils/mirall/files/patch-src__mirall__accountsettings.cpp 2015-02-09 23:34:17.000000000 +0300 >+++ deskutils/owncloud-client/files/patch-src__mirall__accountsettings.cpp 1970-01-01 04:00:00.000000000 +0400 >@@ -1,12 +0,0 @@ >---- src/mirall/accountsettings.cpp.orig >-+++ src/mirall/accountsettings.cpp >-@@ -29,7 +29,8 @@ >- #include "selectivesyncdialog.h" >- #include "creds/abstractcredentials.h" >- >--#include <math.h> >-+#include <climits> >-+#include <cmath> >- >- #include <QDebug> >- #include <QDesktopServices> >diff -ruN /usr/ports/deskutils/mirall/files/patch-src__mirall__generalsettings.cpp deskutils/owncloud-client/files/patch-src__mirall__generalsettings.cpp >--- /usr/ports/deskutils/mirall/files/patch-src__mirall__generalsettings.cpp 2014-06-18 11:43:24.000000000 +0400 >+++ deskutils/owncloud-client/files/patch-src__mirall__generalsettings.cpp 1970-01-01 04:00:00.000000000 +0400 >@@ -1,23 +0,0 @@ >---- src/mirall/generalsettings.cpp.orig >-+++ src/mirall/generalsettings.cpp >-@@ -76,6 +76,7 @@ >- >- void GeneralSettings::slotUpdateInfo() >- { >-+#if 0 >- if (OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance())) >- { >- connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection); >-@@ -84,9 +85,12 @@ >- _ui->updateStateLabel->setText(updater->statusString()); >- _ui->restartButton->setVisible(updater->downloadState() == OCUpdater::DownloadComplete); >- } else { >-+#endif >- // can't have those infos from sparkle currently >- _ui->updatesGroupBox->setVisible(false); >-+#if 0 >- } >-+#endif >- } >- >- void GeneralSettings::saveMiscSettings() >diff -ruN /usr/ports/deskutils/mirall/files/patch-src__mirall__mirallconfigfile.cpp deskutils/owncloud-client/files/patch-src__mirall__mirallconfigfile.cpp >--- /usr/ports/deskutils/mirall/files/patch-src__mirall__mirallconfigfile.cpp 2014-06-18 11:43:24.000000000 +0400 >+++ deskutils/owncloud-client/files/patch-src__mirall__mirallconfigfile.cpp 1970-01-01 04:00:00.000000000 +0400 >@@ -1,25 +0,0 @@ >---- src/mirall/mirallconfigfile.cpp.orig >-+++ src/mirall/mirallconfigfile.cpp >-@@ -359,11 +359,22 @@ >- QString con( connection ); >- if( connection.isEmpty() ) con = defaultConnection(); >- >-+#if 0 >- QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false); >-+#else >-+ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true); >-+#endif >- fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback); >- >- QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback); >-+#if 0 >- return value.toBool(); >-+#else >-+ if ( !value.toBool() ) >-+ qDebug() << "FreeBSD package disabled the UpdateCheck mechanism."; >-+ >-+ return true; >-+#endif >- } >- >- void MirallConfigFile::setSkipUpdateCheck( bool skip, const QString& connection ) >diff -ruN /usr/ports/deskutils/mirall/files/patch-src__mirall__owncloudgui.cpp deskutils/owncloud-client/files/patch-src__mirall__owncloudgui.cpp >--- /usr/ports/deskutils/mirall/files/patch-src__mirall__owncloudgui.cpp 2015-02-09 23:34:17.000000000 +0300 >+++ deskutils/owncloud-client/files/patch-src__mirall__owncloudgui.cpp 1970-01-01 04:00:00.000000000 +0400 >@@ -1,11 +0,0 @@ >---- src/mirall/owncloudgui.cpp.orig >-+++ src/mirall/owncloudgui.cpp >-@@ -31,6 +31,8 @@ >- #include "openfilemanager.h" >- #include "creds/abstractcredentials.h" >- >-+#include <climits> >-+ >- #include <QDesktopServices> >- #include <QMessageBox> >- #include <QSignalMapper> >diff -ruN /usr/ports/deskutils/mirall/files/patch-src__mirall__syncjournalfilerecord.h deskutils/owncloud-client/files/patch-src__mirall__syncjournalfilerecord.h >--- /usr/ports/deskutils/mirall/files/patch-src__mirall__syncjournalfilerecord.h 2014-01-09 22:54:47.000000000 +0400 >+++ deskutils/owncloud-client/files/patch-src__mirall__syncjournalfilerecord.h 2015-03-21 20:09:35.019460551 +0300 >@@ -1,10 +1,10 @@ >---- ./src/mirall/syncjournalfilerecord.h.orig 2014-01-09 19:53:32.000000000 +0100 >-+++ ./src/mirall/syncjournalfilerecord.h 2014-01-09 19:53:44.000000000 +0100 >-@@ -14,6 +14,7 @@ >- #ifndef SYNCJOURNALFILERECORD_H >- #define SYNCJOURNALFILERECORD_H >+--- src/libsync/syncjournalfilerecord.h.orig 2014-09-27 11:26:18 UTC >++++ src/libsync/syncjournalfilerecord.h >+@@ -16,6 +16,7 @@ > >-+#include <time.h> > #include <QString> > #include <QDateTime> >++#include <time.h> >+ >+ namespace Mirall { > >diff -ruN /usr/ports/deskutils/mirall/pkg-descr deskutils/owncloud-client/pkg-descr >--- /usr/ports/deskutils/mirall/pkg-descr 2014-06-18 11:43:24.000000000 +0400 >+++ deskutils/owncloud-client/pkg-descr 2015-03-22 00:35:28.949358543 +0300 >@@ -1,4 +1,4 @@ >-Mirall 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/mirall >+WWW: https://github.com/owncloud/client >diff -ruN /usr/ports/deskutils/mirall/pkg-plist deskutils/owncloud-client/pkg-plist >--- /usr/ports/deskutils/mirall/pkg-plist 2015-02-09 23:34:17.000000000 +0300 >+++ deskutils/owncloud-client/pkg-plist 2015-03-22 00:35:56.794357303 +0300 >@@ -5,7 +5,7 @@ > include/owncloudsync/creds/abstractcredentials.h > include/owncloudsync/creds/httpcredentials.h > include/owncloudsync/mirall/account.h >-include/owncloudsync/mirall/mirallconfigfile.h >+include/owncloudsync/mirall/configfile.h > include/owncloudsync/mirall/networkjobs.h > include/owncloudsync/mirall/progressdispatcher.h > include/owncloudsync/mirall/syncengine.h >@@ -15,144 +15,11 @@ > lib/libhttpbf.a > lib/libowncloudsync.so > lib/libowncloudsync.so.0 >-lib/libowncloudsync.so.1.7.1 >+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/client_setup_wizard_components.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client_setup_wizard_install_finish.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client_setup_wizard_install_progress.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client_setup_wizard_location.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/client_setup_wizard_main.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/folderwizard_local.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/folderwizard_remote.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/icon-error.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/icon-information.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/icon-offline.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/icon-paused.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/icon-syncing.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/icon.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/ignored_files_editor.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/log_output_window.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/menu.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/oc_client_download_options.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/oc_client_windows_download.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/oc_website.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/save_log_file.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/security_warning_windows.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/settings_account.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/settings_activity.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/settings_general.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/settings_network.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/wizard_overview.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/wizard_url.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_images/wizard_user.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/accountsetup.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/advancedusage.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/architecture.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/autoupdate.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/building.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/conffile.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/faq.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/glossary.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/index.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/installing-linux.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/installing-macosx.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/installing-windows.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/installing.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/introduction.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/navigating.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/options.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/owncloud.1.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/owncloudcmd.1.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/owncloudcmd.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/troubleshooting.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_sources/visualtour.txt >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/ajax-loader.gif >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/basic.css >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment-bright.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment-close.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/comment.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/default.css >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/doctools.js >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/down-pressed.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/down.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/file.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/jquery.js >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/minus.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/plus.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/pygments.css >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/searchtools.js >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/sidebar.js >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/underscore.js >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/up-pressed.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/up.png >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/_static/websupport.js >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/accountsetup.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/advancedusage.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/architecture.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/autoupdate.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/building.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/conffile.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/faq.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/genindex.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/glossary.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/index.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/installing-linux.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/installing-macosx.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/installing-windows.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/installing.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/introduction.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/navigating.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/objects.inv >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/options.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/owncloud.1.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/owncloudcmd.1.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/owncloudcmd.html >-%%PORTDOCS%%%%DOCSDIR%%/html/unthemed/search.html >-%%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/fncychap.sty >-%%PORTDOCS%%%%DOCSDIR%%/latex/folderwizard_local.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/folderwizard_remote.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/icon-error.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/icon-information.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/icon-offline.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/icon-paused.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/icon-syncing.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/icon.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/ignored_files_editor.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/log_output_window.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/logo-blue.pdf >-%%PORTDOCS%%%%DOCSDIR%%/latex/menu.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/ownCloudClientManual.aux >-%%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 >-%%PORTDOCS%%%%DOCSDIR%%/latex/python.ist >-%%PORTDOCS%%%%DOCSDIR%%/latex/save_log_file.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/settings_account.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/settings_activity.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/settings_general.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/settings_network.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/sphinx.sty >-%%PORTDOCS%%%%DOCSDIR%%/latex/sphinxhowto.cls >-%%PORTDOCS%%%%DOCSDIR%%/latex/sphinxmanual.cls >-%%PORTDOCS%%%%DOCSDIR%%/latex/tabulary.sty >-%%PORTDOCS%%%%DOCSDIR%%/latex/wizard_overview.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/wizard_url.png >-%%PORTDOCS%%%%DOCSDIR%%/latex/wizard_user.png > share/icons/hicolor/128x128/apps/ownCloud_error.png > share/icons/hicolor/128x128/apps/ownCloud_error_shared.png > share/icons/hicolor/128x128/apps/ownCloud_ok.png >@@ -179,6 +46,7 @@ > share/icons/hicolor/256x256/apps/ownCloud_sync_shared.png > share/icons/hicolor/256x256/apps/ownCloud_warn.png > share/icons/hicolor/256x256/apps/ownCloud_warn_shared.png >+share/icons/hicolor/256x256/apps/owncloud.png > share/icons/hicolor/32x32/apps/ownCloud_error.png > share/icons/hicolor/32x32/apps/ownCloud_error_shared.png > share/icons/hicolor/32x32/apps/ownCloud_ok.png >@@ -197,6 +65,7 @@ > share/icons/hicolor/48x48/apps/ownCloud_warn.png > share/icons/hicolor/48x48/apps/ownCloud_warn_shared.png > share/icons/hicolor/48x48/apps/owncloud.png >+share/icons/hicolor/512x512/apps/owncloud.png > share/icons/hicolor/64x64/apps/ownCloud_error.png > share/icons/hicolor/64x64/apps/ownCloud_error_shared.png > share/icons/hicolor/64x64/apps/ownCloud_ok.png >@@ -215,33 +84,34 @@ > share/icons/hicolor/72x72/apps/ownCloud_warn.png > share/icons/hicolor/72x72/apps/ownCloud_warn_shared.png > share/nautilus-python/extensions/syncstate.py >-share/owncloud/i18n/mirall_TW.qm >-share/owncloud/i18n/mirall_ca.qm >-share/owncloud/i18n/mirall_cs.qm >-share/owncloud/i18n/mirall_de.qm >-share/owncloud/i18n/mirall_el.qm >-share/owncloud/i18n/mirall_en.qm >-share/owncloud/i18n/mirall_es.qm >-share/owncloud/i18n/mirall_es_AR.qm >-share/owncloud/i18n/mirall_et.qm >-share/owncloud/i18n/mirall_eu.qm >-share/owncloud/i18n/mirall_fa.qm >-share/owncloud/i18n/mirall_fi.qm >-share/owncloud/i18n/mirall_fr.qm >-share/owncloud/i18n/mirall_gl.qm >-share/owncloud/i18n/mirall_hu.qm >-share/owncloud/i18n/mirall_it.qm >-share/owncloud/i18n/mirall_ja.qm >-share/owncloud/i18n/mirall_nl.qm >-share/owncloud/i18n/mirall_pl.qm >-share/owncloud/i18n/mirall_pt.qm >-share/owncloud/i18n/mirall_pt_BR.qm >-share/owncloud/i18n/mirall_ru.qm >-share/owncloud/i18n/mirall_sk.qm >-share/owncloud/i18n/mirall_sl.qm >-share/owncloud/i18n/mirall_sv.qm >-share/owncloud/i18n/mirall_th.qm >-share/owncloud/i18n/mirall_tr.qm >-share/owncloud/i18n/mirall_uk.qm >-share/owncloud/i18n/mirall_zh_CN.qm >-share/owncloud/i18n/mirall_zh_TW.qm >+share/owncloud/i18n/client_TW.qm >+share/owncloud/i18n/client_ca.qm >+share/owncloud/i18n/client_cs.qm >+share/owncloud/i18n/client_de.qm >+share/owncloud/i18n/client_el.qm >+share/owncloud/i18n/client_en.qm >+share/owncloud/i18n/client_es.qm >+share/owncloud/i18n/client_es_AR.qm >+share/owncloud/i18n/client_et.qm >+share/owncloud/i18n/client_eu.qm >+share/owncloud/i18n/client_fa.qm >+share/owncloud/i18n/client_fi.qm >+share/owncloud/i18n/client_fr.qm >+share/owncloud/i18n/client_gl.qm >+share/owncloud/i18n/client_hu.qm >+share/owncloud/i18n/client_it.qm >+share/owncloud/i18n/client_ja.qm >+share/owncloud/i18n/client_nl.qm >+share/owncloud/i18n/client_pl.qm >+share/owncloud/i18n/client_pt.qm >+share/owncloud/i18n/client_pt_BR.qm >+share/owncloud/i18n/client_ru.qm >+share/owncloud/i18n/client_sk.qm >+share/owncloud/i18n/client_sl.qm >+share/owncloud/i18n/client_sv.qm >+share/owncloud/i18n/client_th.qm >+share/owncloud/i18n/client_tr.qm >+share/owncloud/i18n/client_uk.qm >+share/owncloud/i18n/client_zh_CN.qm >+share/owncloud/i18n/client_zh_TW.qm >+%%PORTDOCS%%@dir %%DOCSDIR%% >\ No newline at end of file >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 00:43:15.753325942 +0300 >@@ -1,24 +1,23 @@ >-# $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 >+USE_QT5= core dbus linguisttools_build buildtools_build > 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 00:51:35.391298422 +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%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 198785
:
154648
|
154657
|
157044