Date: Sun, 5 Apr 2020 20:14:47 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530834 - in head/www/choqok: . files Message-ID: <202004052014.035KEltp019188@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Sun Apr 5 20:14:47 2020 New Revision: 530834 URL: https://svnweb.freebsd.org/changeset/ports/530834 Log: www/choqok: update to 1.7.0 release Please welcome the long-waited ChoqoK 1.7.0 release! Also, incorporate latest patches from KDE/choqok git repository to resolve build errors and work with twitter conversations Added: head/www/choqok/files/patch-choqok_config_behavior_behaviorconfig.cpp (contents, props changed) head/www/choqok/files/patch-choqok_config_plugins_choqokpluginconfig.cpp (contents, props changed) head/www/choqok/files/patch-choqok_systrayicon.cpp (contents, props changed) head/www/choqok/files/patch-helperlibs_gnusocialapihelper_gnusocialapimicroblog.cpp (contents, props changed) head/www/choqok/files/patch-helperlibs_twitterapihelper_twitterapimicroblogwidget.cpp (contents, props changed) head/www/choqok/files/patch-libchoqok_ui_microblogwidget.cpp (contents, props changed) head/www/choqok/files/patch-microblogs_twitter_twittermicroblog.cpp (contents, props changed) Deleted: head/www/choqok/files/patch-gentoo-kf5-5.61-headers head/www/choqok/files/patch-kf5-5.61-headers Modified: head/www/choqok/Makefile head/www/choqok/distinfo head/www/choqok/files/patch-CMakeLists.txt (contents, props changed) head/www/choqok/files/patch-cmake__modules__DBusMacros.cmake head/www/choqok/pkg-plist Modified: head/www/choqok/Makefile ============================================================================== --- head/www/choqok/Makefile Sun Apr 5 20:12:26 2020 (r530833) +++ head/www/choqok/Makefile Sun Apr 5 20:14:47 2020 (r530834) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= choqok -DISTVERSION= 1.6.0 -PORTREVISION= 9 +DISTVERSION= 1.7.0 +PORTREVISION= 0 CATEGORIES= www kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION:R}/src DIST_SUBDIR= KDE/${PORTNAME} @@ -21,10 +21,10 @@ USES= cmake compiler:c++11-lib gettext kde:5 pkgconfi USE_KDE= attica auth bookmarks codecs completion config configwidgets \ coreaddons doctools ecm emoticons globalaccel guiaddons i18n \ itemviews jobwidgets kcmutils kdewebkit kio notifications \ - notifyconfig parts service solid sonnet textwidgets wallet \ - widgetsaddons xmlgui \ + notifyconfig parts purpose service solid sonnet textwidgets \ + wallet widgetsaddons xmlgui \ kded_run -USE_QT= concurrent core dbus gui network widgets xml \ +USE_QT= concurrent core dbus gui network networkauth webkit widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes Modified: head/www/choqok/distinfo ============================================================================== --- head/www/choqok/distinfo Sun Apr 5 20:12:26 2020 (r530833) +++ head/www/choqok/distinfo Sun Apr 5 20:14:47 2020 (r530834) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483011953 -SHA256 (KDE/choqok/choqok-1.6.0.tar.xz) = 8a7527067b3694ad16faafac754cfd5f1e5f5fd1547f066d8f14fbcf8327310f -SIZE (KDE/choqok/choqok-1.6.0.tar.xz) = 1170748 +TIMESTAMP = 1586113290 +SHA256 (KDE/choqok/choqok-1.7.0.tar.xz) = 26600d95f152c3e04881efb7fb3eb07b5c52fa6ffee838690f28b45defb4a47e +SIZE (KDE/choqok/choqok-1.7.0.tar.xz) = 1202092 Modified: head/www/choqok/files/patch-CMakeLists.txt ============================================================================== --- head/www/choqok/files/patch-CMakeLists.txt Sun Apr 5 20:12:26 2020 (r530833) +++ head/www/choqok/files/patch-CMakeLists.txt Sun Apr 5 20:14:47 2020 (r530834) @@ -1,9 +1,10 @@ ---- CMakeLists.txt.orig 2017-01-24 21:41:36 UTC +--- CMakeLists.txt.orig 2020-02-05 11:49:51 UTC +++ CMakeLists.txt -@@ -41,6 +41,7 @@ find_package(KF5 REQUIRED +@@ -45,6 +45,8 @@ find_package(KF5 COMPONENTS Purpose) + #option(QTINDICATE_DISABLE "Disable support for notifications via indicator") find_package(Qca-qt5 REQUIRED) - find_package(QtOAuth 2.0.1 REQUIRED) ++find_package(QtOAuth 2.0.1 REQUIRED) +include_directories(${QTOAUTH_INCLUDE_DIR}) #if(NOT QTINDICATE_DISABLE) Added: head/www/choqok/files/patch-choqok_config_behavior_behaviorconfig.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/choqok/files/patch-choqok_config_behavior_behaviorconfig.cpp Sun Apr 5 20:14:47 2020 (r530834) @@ -0,0 +1,14 @@ +--- choqok/config/behavior/behaviorconfig.cpp.orig 2020-02-05 11:49:13 UTC ++++ choqok/config/behavior/behaviorconfig.cpp +@@ -95,9 +95,9 @@ BehaviorConfig::BehaviorConfig(QWidget *parent, const + d->mBehaviorTabCtl->addTab(d->proxyModule, proxyInfo.moduleName()); + + connect(d->mPrfsShorten, (void (BehaviorConfig_Shorten::*)(bool))&BehaviorConfig_Shorten::changed, +- this, (void (KCModule::*)())&KCModule::changed); ++ this, &BehaviorConfig::markAsChanged); + connect(d->proxyModule, (void (KCModuleProxy::*)(KCModuleProxy*))&KCModuleProxy::changed, +- this, (void (KCModule::*)())&KCModule::changed); ++ this, &BehaviorConfig::markAsChanged); + + load(); + Added: head/www/choqok/files/patch-choqok_config_plugins_choqokpluginconfig.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/choqok/files/patch-choqok_config_plugins_choqokpluginconfig.cpp Sun Apr 5 20:14:47 2020 (r530834) @@ -0,0 +1,12 @@ +--- choqok/config/plugins/choqokpluginconfig.cpp.orig 2020-02-05 11:49:13 UTC ++++ choqok/config/plugins/choqokpluginconfig.cpp +@@ -46,8 +46,7 @@ ChoqokPluginConfig::ChoqokPluginConfig(QWidget *parent + mainLayout->setMargin(0); + mainLayout->addWidget(m_pluginSelector); + +- connect(m_pluginSelector, &KPluginSelector::changed, this, +- (void (KCModule::*)())&KCModule::changed); ++ connect(m_pluginSelector, &KPluginSelector::changed, this, &ChoqokPluginConfig::markAsChanged); + connect(m_pluginSelector, &KPluginSelector::configCommitted, + this, &ChoqokPluginConfig::reparseConfiguration); + Added: head/www/choqok/files/patch-choqok_systrayicon.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/choqok/files/patch-choqok_systrayicon.cpp Sun Apr 5 20:14:47 2020 (r530834) @@ -0,0 +1,11 @@ +--- choqok/systrayicon.cpp.orig 2020-02-05 11:49:13 UTC ++++ choqok/systrayicon.cpp +@@ -81,7 +81,7 @@ void SysTrayIcon::updateUnreadCount(int changeOfUnread + + auto pointSize = f.pointSizeF(); + QFontMetrics fm(f); +- int w = fm.width(countStr); ++ int w = fm.horizontalAdvance(countStr); + if (w > (oldWidth - 2)) { + pointSize *= float(oldWidth - 2) / float(w); + f.setPointSizeF(pointSize); Modified: head/www/choqok/files/patch-cmake__modules__DBusMacros.cmake ============================================================================== --- head/www/choqok/files/patch-cmake__modules__DBusMacros.cmake Sun Apr 5 20:12:26 2020 (r530833) +++ head/www/choqok/files/patch-cmake__modules__DBusMacros.cmake Sun Apr 5 20:14:47 2020 (r530834) @@ -1,6 +1,6 @@ ---- ./cmake/modules/DBusMacros.cmake.bak 2010-12-15 19:50:32.015441170 +1000 -+++ ./cmake/modules/DBusMacros.cmake 2010-12-15 19:52:27.213438681 +1000 -@@ -26,6 +26,6 @@ +--- cmake/modules/DBusMacros.cmake.orig 2020-02-05 11:49:13 UTC ++++ cmake/modules/DBusMacros.cmake +@@ -26,6 +26,6 @@ macro(dbus_add_activation_service _sources) string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i}) set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file}) configure_file(${_service_file} ${_target}) Added: head/www/choqok/files/patch-helperlibs_gnusocialapihelper_gnusocialapimicroblog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/choqok/files/patch-helperlibs_gnusocialapihelper_gnusocialapimicroblog.cpp Sun Apr 5 20:14:47 2020 (r530834) @@ -0,0 +1,8 @@ +--- helperlibs/gnusocialapihelper/gnusocialapimicroblog.cpp.orig 2020-02-05 11:49:13 UTC ++++ helperlibs/gnusocialapihelper/gnusocialapimicroblog.cpp +@@ -417,5 +417,3 @@ void GNUSocialApiMicroBlog::slotFetchConversation(KJob + } + } + } +- +-#include "gnusocialapimicroblog.moc" Added: head/www/choqok/files/patch-helperlibs_twitterapihelper_twitterapimicroblogwidget.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/choqok/files/patch-helperlibs_twitterapihelper_twitterapimicroblogwidget.cpp Sun Apr 5 20:14:47 2020 (r530834) @@ -0,0 +1,11 @@ +--- helperlibs/twitterapihelper/twitterapimicroblogwidget.cpp.orig 2020-02-05 11:49:13 UTC ++++ helperlibs/twitterapihelper/twitterapimicroblogwidget.cpp +@@ -67,7 +67,7 @@ QIcon addTextToIcon(const QIcon &icon, const QString & + font.setBold(true); + painter.setFont(font); + +- int textWidth = painter.fontMetrics().width(text); ++ int textWidth = painter.fontMetrics().horizontalAdvance(text); + QRect rct(0 , 0 , textWidth , result_size.height() / 2); + + painter.setRenderHint(QPainter::Antialiasing); Added: head/www/choqok/files/patch-libchoqok_ui_microblogwidget.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/choqok/files/patch-libchoqok_ui_microblogwidget.cpp Sun Apr 5 20:14:47 2020 (r530834) @@ -0,0 +1,11 @@ +--- libchoqok/ui/microblogwidget.cpp.orig 2020-02-05 11:49:13 UTC ++++ libchoqok/ui/microblogwidget.cpp +@@ -65,7 +65,7 @@ QIcon addNumToIcon(const QIcon &big , int number , con + painter.setFont(font); + + QString numberStr = QString::number(number); +- int textWidth = painter.fontMetrics().width(numberStr) + 6; ++ int textWidth = painter.fontMetrics().horizontalAdvance(numberStr) + 6; + + if (textWidth < result_size.width() / 2) { + textWidth = result_size.width() / 2; Added: head/www/choqok/files/patch-microblogs_twitter_twittermicroblog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/choqok/files/patch-microblogs_twitter_twittermicroblog.cpp Sun Apr 5 20:14:47 2020 (r530834) @@ -0,0 +1,32 @@ +--- microblogs/twitter/twittermicroblog.cpp.orig 2020-02-05 11:49:13 UTC ++++ microblogs/twitter/twittermicroblog.cpp +@@ -473,7 +473,11 @@ Choqok::Post *TwitterMicroBlog::readPost(Choqok::Accou + } + + //postId is changed, regenerate link url +- post->link = postUrl(account, post->author.userName, post->postId); ++ if (!post->repeatedPostId.isEmpty()) { ++ post->link = postUrl(account, post->author.userName, post->repeatedPostId); ++ } else { ++ post->link = postUrl(account, post->author.userName, post->postId); ++ } + + QVariantMap userMap = var[QLatin1String("user")].toMap(); + post->author.userId = userMap[QLatin1String("id_str")].toString(); +@@ -491,7 +495,6 @@ void TwitterMicroBlog::fetchPost(Choqok::Account *theA + QUrl url = account->apiUrl(); + url.setPath(url.path() + QStringLiteral("/statuses/show/%1.json").arg(post->postId)); + +- QUrl tmpUrl(url); + QUrlQuery urlQuery; + urlQuery.addQueryItem(QLatin1String("tweet_mode"), QLatin1String("extended")); + url.setQuery(urlQuery); +@@ -506,7 +509,7 @@ void TwitterMicroBlog::fetchPost(Choqok::Account *theA + } + job->addMetaData(QStringLiteral("customHTTPHeader"), + QStringLiteral("Authorization: ") + +- QLatin1String(authorizationHeader(account, tmpUrl, QNetworkAccessManager::GetOperation))); ++ QLatin1String(authorizationHeader(account, url, QNetworkAccessManager::GetOperation))); + mFetchPostMap[ job ] = post; + mJobsAccount[ job ] = theAccount; + connect(job, &KIO::StoredTransferJob::result, this, &TwitterMicroBlog::slotFetchPost); Modified: head/www/choqok/pkg-plist ============================================================================== --- head/www/choqok/pkg-plist Sun Apr 5 20:12:26 2020 (r530833) +++ head/www/choqok/pkg-plist Sun Apr 5 20:14:47 2020 (r530834) @@ -39,6 +39,8 @@ include/choqok/twitterapihelper/twitterapicomposerwidg include/choqok/twitterapihelper/twitterapidmessagedialog.h include/choqok/twitterapihelper/twitterapimicroblog.h include/choqok/twitterapihelper/twitterapimicroblogwidget.h +include/choqok/twitterapihelper/twitterapioauth.h +include/choqok/twitterapihelper/twitterapioauthreplyhandler.h include/choqok/twitterapihelper/twitterapipostwidget.h include/choqok/twitterapihelper/twitterapisearch.h include/choqok/twitterapihelper/twitterapisearchdialog.h @@ -69,6 +71,7 @@ lib/libtwitterapihelper.so.1.3.0 %%QT_PLUGINDIR%%/choqok_imstatus.so %%QT_PLUGINDIR%%/choqok_is_gd.so %%QT_PLUGINDIR%%/choqok_laconica.so +%%QT_PLUGINDIR%%/choqok_mastodon.so %%QT_PLUGINDIR%%/choqok_mobypicture.so %%QT_PLUGINDIR%%/choqok_nowlistening.so %%QT_PLUGINDIR%%/choqok_ocs.so @@ -100,6 +103,7 @@ lib/libtwitterapihelper.so.1.3.0 %%QT_PLUGINDIR%%/kcm_choqok_twitgoo.so %%QT_PLUGINDIR%%/kcm_choqok_yourls.so %%QT_PLUGINDIR%%/kf5/parts/konqchoqokplugin.so +%%QT_PLUGINDIR%%/kf5/purpose/purposeplugin.so share/applications/org.kde.choqok.desktop %%DATADIR%%/images/splash_screen.png share/cmake/modules/FindChoqok.cmake @@ -144,71 +148,76 @@ share/doc/HTML/sv/choqok/index.cache.bz2 share/doc/HTML/sv/choqok/index.docbook share/doc/HTML/uk/choqok/index.cache.bz2 share/doc/HTML/uk/choqok/index.docbook +share/icons/hicolor/128x128/apps/mastodon_microblog.png share/icons/hicolor/128x128/apps/pumpio_microblog.png share/icons/hicolor/16x16/actions/retweet.png -share/icons/hicolor/16x16/apps/choqok.png share/icons/hicolor/16x16/apps/choqok_offline.png +share/icons/hicolor/16x16/apps/choqok.png share/icons/hicolor/16x16/apps/flickr_uploader.png share/icons/hicolor/16x16/apps/friendica_microblog.png share/icons/hicolor/16x16/apps/imageshack_uploader.png share/icons/hicolor/16x16/apps/laconica_microblog.png +share/icons/hicolor/16x16/apps/mastodon_microblog.png share/icons/hicolor/16x16/apps/mobypicture_uploader.png share/icons/hicolor/16x16/apps/ocs_microblog.png share/icons/hicolor/16x16/apps/posterous_uploader.png share/icons/hicolor/16x16/apps/pumpio_microblog.png share/icons/hicolor/16x16/apps/twitgoo_uploader.png share/icons/hicolor/16x16/apps/twitter_microblog.png -share/icons/hicolor/22x22/apps/choqok.png share/icons/hicolor/22x22/apps/choqok_offline.png +share/icons/hicolor/22x22/apps/choqok.png share/icons/hicolor/22x22/apps/flickr_uploader.png share/icons/hicolor/22x22/apps/friendica_microblog.png share/icons/hicolor/22x22/apps/imageshack_uploader.png share/icons/hicolor/22x22/apps/laconica_microblog.png +share/icons/hicolor/22x22/apps/mastodon_microblog.png share/icons/hicolor/22x22/apps/mobypicture_uploader.png share/icons/hicolor/22x22/apps/ocs_microblog.png share/icons/hicolor/22x22/apps/posterous_uploader.png share/icons/hicolor/22x22/apps/pumpio_microblog.png share/icons/hicolor/22x22/apps/twitter_microblog.png -share/icons/hicolor/32x32/apps/choqok.png share/icons/hicolor/32x32/apps/choqok_offline.png +share/icons/hicolor/32x32/apps/choqok.png share/icons/hicolor/32x32/apps/flickr_uploader.png share/icons/hicolor/32x32/apps/friendica_microblog.png share/icons/hicolor/32x32/apps/imageshack_uploader.png share/icons/hicolor/32x32/apps/laconica_microblog.png +share/icons/hicolor/32x32/apps/mastodon_microblog.png share/icons/hicolor/32x32/apps/mobypicture_uploader.png share/icons/hicolor/32x32/apps/ocs_microblog.png share/icons/hicolor/32x32/apps/posterous_uploader.png share/icons/hicolor/32x32/apps/pumpio_microblog.png share/icons/hicolor/32x32/apps/twitgoo_uploader.png share/icons/hicolor/32x32/apps/twitter_microblog.png -share/icons/hicolor/48x48/apps/choqok.png share/icons/hicolor/48x48/apps/choqok_offline.png +share/icons/hicolor/48x48/apps/choqok.png share/icons/hicolor/48x48/apps/flickr_uploader.png share/icons/hicolor/48x48/apps/friendica_microblog.png share/icons/hicolor/48x48/apps/imageshack_uploader.png share/icons/hicolor/48x48/apps/laconica_microblog.png +share/icons/hicolor/48x48/apps/mastodon_microblog.png share/icons/hicolor/48x48/apps/mobypicture_uploader.png share/icons/hicolor/48x48/apps/ocs_microblog.png share/icons/hicolor/48x48/apps/posterous_uploader.png share/icons/hicolor/48x48/apps/pumpio_microblog.png share/icons/hicolor/48x48/apps/twitgoo_uploader.png share/icons/hicolor/48x48/apps/twitter_microblog.png -share/icons/hicolor/64x64/apps/choqok.png share/icons/hicolor/64x64/apps/choqok_offline.png +share/icons/hicolor/64x64/apps/choqok.png share/icons/hicolor/64x64/apps/flickr_uploader.png share/icons/hicolor/64x64/apps/friendica_microblog.png share/icons/hicolor/64x64/apps/imageshack_uploader.png share/icons/hicolor/64x64/apps/laconica_microblog.png +share/icons/hicolor/64x64/apps/mastodon_microblog.png share/icons/hicolor/64x64/apps/mobypicture_uploader.png share/icons/hicolor/64x64/apps/ocs_microblog.png share/icons/hicolor/64x64/apps/posterous_uploader.png share/icons/hicolor/64x64/apps/pumpio_microblog.png share/icons/hicolor/64x64/apps/twitgoo_uploader.png -share/icons/hicolor/scalable/apps/choqok.svgz share/icons/hicolor/scalable/apps/choqok_offline.svgz -share/knotifications5/choqok/choqok.notifyrc +share/icons/hicolor/scalable/apps/choqok.svgz +share/knotifications5/choqok.notifyrc share/kservices5/ServiceMenus/choqok_share.desktop -share/kservices5/ServiceMenus/choqok_upload.desktop share/kservices5/choqok_accountsconfig.desktop share/kservices5/choqok_appearanceconfig.desktop share/kservices5/choqok_behaviorconfig.desktop @@ -226,6 +235,7 @@ share/kservices5/choqok_imstatus_config.desktop share/kservices5/choqok_is_gd.desktop share/kservices5/choqok_is_gd_config.desktop share/kservices5/choqok_laconica.desktop +share/kservices5/choqok_mastodon.desktop share/kservices5/choqok_mobypicture.desktop share/kservices5/choqok_mobypicture_config.desktop share/kservices5/choqok_notify.desktop @@ -261,7 +271,6 @@ share/kxmlgui5/choqok_quickfilter/quickfilterui.rc share/kxmlgui5/choqok_searchaction/searchactionui.rc share/kxmlgui5/konqchoqokplugin/konqchoqok.rc share/locale/ar/LC_MESSAGES/choqok.mo -share/locale/ast/LC_MESSAGES/choqok.mo share/locale/bg/LC_MESSAGES/choqok.mo share/locale/bs/LC_MESSAGES/choqok.mo share/locale/ca/LC_MESSAGES/choqok.mo @@ -282,7 +291,6 @@ share/locale/gl/LC_MESSAGES/choqok.mo share/locale/hr/LC_MESSAGES/choqok.mo share/locale/hu/LC_MESSAGES/choqok.mo share/locale/ia/LC_MESSAGES/choqok.mo -share/locale/is/LC_MESSAGES/choqok.mo share/locale/it/LC_MESSAGES/choqok.mo share/locale/ja/LC_MESSAGES/choqok.mo share/locale/km/LC_MESSAGES/choqok.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004052014.035KEltp019188>