Index: head/www/choqok/Makefile =================================================================== --- head/www/choqok/Makefile (revision 296956) +++ head/www/choqok/Makefile (revision 296957) @@ -1,34 +1,33 @@ # New ports collection makefile for: Choqok # Date created: 15 Sep 2009 # Whom: Alexey Dokuchaev # # $FreeBSD$ # PORTNAME= choqok -PORTVERSION= 1.1 -PORTREVISION= 1 +PORTVERSION= 1.3 CATEGORIES= www kde MASTER_SITES= SF/${PORTNAME}/Choqok/ MAINTAINER= kde@FreeBSD.org COMMENT= KDE micro-blogging client LICENSE= GPLv3 LIB_DEPENDS= qjson.0:${PORTSDIR}/devel/qjson \ qoauth.1:${PORTSDIR}/net/qoauth #BUILD_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/kwebkitpart.so:${PORTSDIR}/www/kwebkitpart #RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/kwebkitpart.so:${PORTSDIR}/www/kwebkitpart USE_GETTEXT= yes USE_KDE4= kdehier kdelibs kdeprefix automoc4 USE_QT_VER= 4 QT_COMPONENTS= gui imageformats_run network \ moc_build qmake_build rcc_build uic_build USE_BZIP2= yes USE_CMAKE= yes USE_LDCONFIG= yes .include Property changes on: head/www/choqok/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/www/choqok/distinfo =================================================================== --- head/www/choqok/distinfo (revision 296956) +++ head/www/choqok/distinfo (revision 296957) @@ -1,2 +1,2 @@ -SHA256 (choqok-1.1.tar.bz2) = f9b3016a3e7dba1c5f894e3c453292333c49ee535a14c013f1331b20be519ff2 -SIZE (choqok-1.1.tar.bz2) = 917476 +SHA256 (choqok-1.3.tar.bz2) = 73a8448b060248df3d8f83c1cf27a7c4c44f59c37960fbcc5af098de1772c2fe +SIZE (choqok-1.3.tar.bz2) = 1033762 Property changes on: head/www/choqok/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/www/choqok/files/patch-git-09b83146c682a0d467cff1be4236660554bd9ca1 =================================================================== --- head/www/choqok/files/patch-git-09b83146c682a0d467cff1be4236660554bd9ca1 (revision 296956) +++ head/www/choqok/files/patch-git-09b83146c682a0d467cff1be4236660554bd9ca1 (nonexistent) @@ -1,33 +0,0 @@ -From: Andrey Esin -Date: Thu, 07 Apr 2011 09:01:02 +0000 -Subject: Prevent crash, when noone message line enabled in account options. -X-Git-Url: http://quickgit.kde.org/?p=choqok.git&a=commitdiff&h=09b83146c682a0d467cff1be4236660554bd9ca1 ---- -Prevent crash, when noone message line enabled in account options. ---- - - ---- ./helperlibs/twitterapihelper/twitterapimicroblogwidget.cpp -+++ ./helperlibs/twitterapihelper/twitterapimicroblogwidget.cpp -@@ -138,12 +138,14 @@ TwitterApiSearchTimelineWidget* TwitterA - - void TwitterApiMicroBlogWidget::slotCurrentTimelineChanged(int index) - { -- Choqok::UI::TimelineWidget *stw = -- qobject_cast(timelinesTabWidget()->widget(index)); -- if(stw->isClosable()) -- d->btnCloseSearch->setEnabled(true); -- else -- d->btnCloseSearch->setEnabled(false); -+ if ( index > -1 ) { -+ Choqok::UI::TimelineWidget *stw = -+ qobject_cast(timelinesTabWidget()->widget(index)); -+ if(stw->isClosable()) -+ d->btnCloseSearch->setEnabled(true); -+ else -+ d->btnCloseSearch->setEnabled(false); -+ } - } - - void TwitterApiMicroBlogWidget::slotCloseCurrentSearch() - Property changes on: head/www/choqok/files/patch-git-09b83146c682a0d467cff1be4236660554bd9ca1 ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/choqok/files/patch-git-7e15e0aa07d0f906842fd81ec244e908c31fe146 =================================================================== --- head/www/choqok/files/patch-git-7e15e0aa07d0f906842fd81ec244e908c31fe146 (revision 296956) +++ head/www/choqok/files/patch-git-7e15e0aa07d0f906842fd81ec244e908c31fe146 (nonexistent) @@ -1,21 +0,0 @@ -From: Mehrdad Momeny -Date: Fri, 08 Apr 2011 07:52:33 +0000 -Subject: BUG:270377 Choqok 1.1 always chrashes upon closing with a segmentation fault -X-Git-Url: http://quickgit.kde.org/?p=choqok.git&a=commitdiff&h=7e15e0aa07d0f906842fd81ec244e908c31fe146 ---- -BUG:270377 Choqok 1.1 always chrashes upon closing with a segmentation fault ---- - - ---- ./libchoqok/pluginmanager.cpp -+++ ./libchoqok/pluginmanager.cpp -@@ -67,7 +67,7 @@ public: - Plugin *plugin = it.value(); - loadedPlugins.remove(info); - plugin->disconnect(&instance, SLOT(slotPluginDestroyed(QObject*))); -- delete plugin; -+ plugin->deleteLater();; - } - } - - Property changes on: head/www/choqok/files/patch-git-7e15e0aa07d0f906842fd81ec244e908c31fe146 ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/choqok/files/patch-git-112d643271d27614bd7585e2f3f281a0edeac474 =================================================================== --- head/www/choqok/files/patch-git-112d643271d27614bd7585e2f3f281a0edeac474 (revision 296956) +++ head/www/choqok/files/patch-git-112d643271d27614bd7585e2f3f281a0edeac474 (nonexistent) @@ -1,22 +0,0 @@ -From: Andrey Esin -Date: Mon, 02 May 2011 12:32:12 +0000 -Subject: BUG:272220 -X-Git-Url: http://quickgit.kde.org/?p=choqok.git&a=commitdiff&h=112d643271d27614bd7585e2f3f281a0edeac474 ---- -BUG:272220 -Add ability to recognize nicks with underscore. ---- - - ---- ./microblogs/laconica/laconicapostwidget.cpp -+++ ./microblogs/laconica/laconicapostwidget.cpp -@@ -40,7 +40,7 @@ - #include - - const QRegExp LaconicaPostWidget::mGroupRegExp( "([\\s]|^)!([a-z0-9]+){1,64}", Qt::CaseInsensitive ); --const QRegExp LaconicaPostWidget::mLaconicaUserRegExp( "([\\s\\W]|^)@([a-z0-9]+){1,64}(?!(@))", Qt::CaseInsensitive ); -+const QRegExp LaconicaPostWidget::mLaconicaUserRegExp( "([\\s\\W]|^)@([a-z0-9_]+){1,64}(?!(@))", Qt::CaseInsensitive ); - const QRegExp LaconicaPostWidget::mLaconicaHashRegExp( "([\\s]|^)#([\\w_\\.\\-]+)", Qt::CaseInsensitive ); - - const QString subdomains = "(([a-z0-9-_]\\.)?)"; - Property changes on: head/www/choqok/files/patch-git-112d643271d27614bd7585e2f3f281a0edeac474 ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/choqok/pkg-plist =================================================================== --- head/www/choqok/pkg-plist (revision 296956) +++ head/www/choqok/pkg-plist (revision 296957) @@ -1,284 +1,283 @@ bin/choqok include/choqok/account.h include/choqok/accountmanager.h include/choqok/application.h include/choqok/choqok_export.h include/choqok/choqokappearancesettings.h include/choqok/choqokbehaviorsettings.h include/choqok/choqokid.h include/choqok/choqokmainwindow.h +include/choqok/choqoktabbar.h include/choqok/choqoktextedit.h include/choqok/choqoktools.h include/choqok/choqoktypes.h include/choqok/choqokuiglobal.h include/choqok/composerwidget.h include/choqok/dbushandler.h include/choqok/editaccountwidget.h include/choqok/mediamanager.h include/choqok/microblog.h include/choqok/microblogwidget.h include/choqok/notifymanager.h include/choqok/passwordmanager.h include/choqok/plugin.h include/choqok/pluginmanager.h include/choqok/postwidget.h include/choqok/quickpost.h include/choqok/shortener.h include/choqok/shortenmanager.h include/choqok/textbrowser.h include/choqok/timelinewidget.h include/choqok/twitterapihelper/twitterapiaccount.h include/choqok/twitterapihelper/twitterapicomposerwidget.h include/choqok/twitterapihelper/twitterapidmessagedialog.h include/choqok/twitterapihelper/twitterapimicroblog.h include/choqok/twitterapihelper/twitterapimicroblogwidget.h include/choqok/twitterapihelper/twitterapipostwidget.h include/choqok/twitterapihelper/twitterapisearch.h include/choqok/twitterapihelper/twitterapisearchdialog.h include/choqok/twitterapihelper/twitterapisearchtimelinewidget.h include/choqok/twitterapihelper/twitterapishowthread.h include/choqok/twitterapihelper/twitterapitextedit.h include/choqok/twitterapihelper/twitterapitimelinewidget.h include/choqok/twitterapihelper/twitterapiwhoiswidget.h include/choqok/uploader.h include/choqok/uploadmediadialog.h lib/kde4/choqok_bit_ly.so lib/kde4/choqok_filter.so lib/kde4/choqok_flickr.so lib/kde4/choqok_goo_gl.so lib/kde4/choqok_imagepreview.so lib/kde4/choqok_imageshack.so lib/kde4/choqok_imstatus.so lib/kde4/choqok_is_gd.so lib/kde4/choqok_laconica.so lib/kde4/choqok_mobypicture.so lib/kde4/choqok_nowlistening.so lib/kde4/choqok_ocs.so lib/kde4/choqok_posterous.so lib/kde4/choqok_quickfilter.so lib/kde4/choqok_searchaction.so lib/kde4/choqok_three_ly.so lib/kde4/choqok_tighturl.so lib/kde4/choqok_tinyarro_ws.so -lib/kde4/choqok_translator.so lib/kde4/choqok_twitgoo.so lib/kde4/choqok_twitpic.so lib/kde4/choqok_twitter.so lib/kde4/choqok_untiny.so lib/kde4/choqok_ur1_ca.so lib/kde4/choqok_ur_ly.so lib/kde4/choqok_urls_io.so lib/kde4/choqok_videopreview.so lib/kde4/choqok_yourls.so lib/kde4/kcm_choqok_accountsconfig.so lib/kde4/kcm_choqok_appearanceconfig.so lib/kde4/kcm_choqok_behaviorconfig.so lib/kde4/kcm_choqok_bit_ly.so lib/kde4/kcm_choqok_flickr.so lib/kde4/kcm_choqok_imstatus.so +lib/kde4/kcm_choqok_is_gd.so lib/kde4/kcm_choqok_mobypicture.so lib/kde4/kcm_choqok_nowlistening.so lib/kde4/kcm_choqok_pluginconfig.so lib/kde4/kcm_choqok_posterous.so lib/kde4/kcm_choqok_tinyarro_ws.so -lib/kde4/kcm_choqok_translator.so lib/kde4/kcm_choqok_twitgoo.so lib/kde4/kcm_choqok_twitpic.so -lib/kde4/kcm_choqok_untiny.so lib/kde4/kcm_choqok_yourls.so lib/kde4/konqchoqokplugin.so lib/libchoqok.so lib/libchoqok.so.1 -lib/libchoqok.so.1.1.0 +lib/libchoqok.so.1.3.0 lib/libtwitterapihelper.so lib/libtwitterapihelper.so.1 -lib/libtwitterapihelper.so.1.0.1 +lib/libtwitterapihelper.so.1.2.0 share/applications/kde4/choqok.desktop share/apps/choqok/choqok.notifyrc share/apps/choqok/choqokui.rc share/apps/choqok/images/splash_screen.png -share/apps/choqok/languagecodes share/apps/choqok_filter/filterui.rc share/apps/choqok_nowlistening/nowlisteningui.rc share/apps/choqok_quickfilter/quickfilterui.rc share/apps/choqok_searchaction/searchactionui.rc share/apps/cmake/modules/FindChoqok.cmake share/apps/cmake/modules/FindQtOAuth.cmake share/apps/khtml/kpartplugins/konqchoqok.desktop share/apps/khtml/kpartplugins/konqchoqok.rc @comment share/apps/kwebkitpart/kpartplugins/konqchoqok.desktop @comment share/apps/kwebkitpart/kpartplugins/konqchoqok.rc share/config.kcfg/bit_ly_settings.kcfg share/config.kcfg/choqokappearancesettings.kcfg share/config.kcfg/choqokbehaviorsettings.kcfg share/config.kcfg/flickrsettings.kcfg share/config.kcfg/imstatussettings.kcfg +share/config.kcfg/is_gd_settings.kcfg share/config.kcfg/mobypicturesettings.kcfg share/config.kcfg/nowlisteningsettings.kcfg share/config.kcfg/posteroussettings.kcfg share/config.kcfg/tinyarro_ws_settings.kcfg -share/config.kcfg/translatorsettings.kcfg share/config.kcfg/twitgoosettings.kcfg share/config.kcfg/twitpicsettings.kcfg share/config.kcfg/untinysettings.kcfg share/config.kcfg/yourlssettings.kcfg share/dbus-1/services/org.kde.choqok.service share/doc/HTML/en/choqok/add_account.png share/doc/HTML/en/choqok/choqok.png share/doc/HTML/en/choqok/choqok_quick.png share/doc/HTML/en/choqok/choqok_search.png share/doc/HTML/en/choqok/common share/doc/HTML/en/choqok/index.cache.bz2 share/doc/HTML/en/choqok/index.docbook share/icons/hicolor/128x128/apps/choqok.png share/icons/hicolor/128x128/apps/choqok_offline.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/flickr_uploader.png share/icons/hicolor/16x16/apps/imageshack_uploader.png share/icons/hicolor/16x16/apps/laconica_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/twitgoo_uploader.png share/icons/hicolor/16x16/apps/twitpic_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/flickr_uploader.png share/icons/hicolor/22x22/apps/imageshack_uploader.png share/icons/hicolor/22x22/apps/laconica_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/twitgoo_uploader.png share/icons/hicolor/22x22/apps/twitpic_uploader.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/flickr_uploader.png share/icons/hicolor/32x32/apps/imageshack_uploader.png share/icons/hicolor/32x32/apps/laconica_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/twitgoo_uploader.png share/icons/hicolor/32x32/apps/twitpic_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/flickr_uploader.png share/icons/hicolor/48x48/apps/imageshack_uploader.png share/icons/hicolor/48x48/apps/laconica_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/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/flickr_uploader.png share/icons/hicolor/64x64/apps/imageshack_uploader.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/twitgoo_uploader.png share/kde4/services/ServiceMenus/choqok_share.desktop share/kde4/services/ServiceMenus/choqok_upload.desktop share/kde4/services/choqok_accountsconfig.desktop share/kde4/services/choqok_appearanceconfig.desktop share/kde4/services/choqok_behaviorconfig.desktop share/kde4/services/choqok_bit_ly.desktop share/kde4/services/choqok_bit_ly_config.desktop share/kde4/services/choqok_filter.desktop share/kde4/services/choqok_flickr.desktop share/kde4/services/choqok_flickr_config.desktop share/kde4/services/choqok_goo_gl.desktop share/kde4/services/choqok_imagepreview.desktop share/kde4/services/choqok_imageshack.desktop share/kde4/services/choqok_imstatus.desktop share/kde4/services/choqok_imstatus_config.desktop share/kde4/services/choqok_is_gd.desktop +share/kde4/services/choqok_is_gd_config.desktop share/kde4/services/choqok_laconica.desktop share/kde4/services/choqok_mobypicture.desktop share/kde4/services/choqok_mobypicture_config.desktop share/kde4/services/choqok_nowlistening.desktop share/kde4/services/choqok_nowlistening_config.desktop share/kde4/services/choqok_ocs.desktop share/kde4/services/choqok_pluginconfig.desktop share/kde4/services/choqok_posterous.desktop share/kde4/services/choqok_posterous_config.desktop share/kde4/services/choqok_quickfilter.desktop share/kde4/services/choqok_searchaction.desktop share/kde4/services/choqok_three_ly.desktop share/kde4/services/choqok_tighturl.desktop share/kde4/services/choqok_tinyarro_ws.desktop share/kde4/services/choqok_tinyarro_ws_config.desktop -share/kde4/services/choqok_translator.desktop -share/kde4/services/choqok_translator_config.desktop share/kde4/services/choqok_twitgoo.desktop share/kde4/services/choqok_twitgoo_config.desktop share/kde4/services/choqok_twitpic.desktop share/kde4/services/choqok_twitpic_config.desktop share/kde4/services/choqok_twitter.desktop share/kde4/services/choqok_untiny.desktop -share/kde4/services/choqok_untiny_config.desktop share/kde4/services/choqok_ur1_ca.desktop share/kde4/services/choqok_ur_ly.desktop share/kde4/services/choqok_urls_io.desktop share/kde4/services/choqok_videopreview.desktop share/kde4/services/choqok_yourls.desktop share/kde4/services/choqok_yourls_config.desktop share/kde4/servicetypes/choqokplugin.desktop share/kde4/servicetypes/choqokshortenerplugin.desktop share/kde4/servicetypes/choqokuploaderplugin.desktop share/locale/bg/LC_MESSAGES/choqok.mo +share/locale/bs/LC_MESSAGES/choqok.mo share/locale/ca/LC_MESSAGES/choqok.mo share/locale/ca@valencia/LC_MESSAGES/choqok.mo share/locale/cs/LC_MESSAGES/choqok.mo share/locale/da/LC_MESSAGES/choqok.mo share/locale/de/LC_MESSAGES/choqok.mo share/locale/el/LC_MESSAGES/choqok.mo share/locale/en_GB/LC_MESSAGES/choqok.mo share/locale/eo/LC_MESSAGES/choqok.mo share/locale/es/LC_MESSAGES/choqok.mo share/locale/et/LC_MESSAGES/choqok.mo share/locale/fa/LC_MESSAGES/choqok.mo share/locale/fi/LC_MESSAGES/choqok.mo share/locale/fr/LC_MESSAGES/choqok.mo share/locale/ga/LC_MESSAGES/choqok.mo share/locale/gl/LC_MESSAGES/choqok.mo share/locale/hr/LC_MESSAGES/choqok.mo share/locale/hu/LC_MESSAGES/choqok.mo share/locale/is/LC_MESSAGES/choqok.mo share/locale/ja/LC_MESSAGES/choqok.mo share/locale/km/LC_MESSAGES/choqok.mo share/locale/lt/LC_MESSAGES/choqok.mo share/locale/ms/LC_MESSAGES/choqok.mo share/locale/nb/LC_MESSAGES/choqok.mo share/locale/nds/LC_MESSAGES/choqok.mo share/locale/nl/LC_MESSAGES/choqok.mo share/locale/pa/LC_MESSAGES/choqok.mo share/locale/pl/LC_MESSAGES/choqok.mo share/locale/pt/LC_MESSAGES/choqok.mo share/locale/pt_BR/LC_MESSAGES/choqok.mo share/locale/ro/LC_MESSAGES/choqok.mo share/locale/ru/LC_MESSAGES/choqok.mo share/locale/sk/LC_MESSAGES/choqok.mo +share/locale/sq/LC_MESSAGES/choqok.mo share/locale/sv/LC_MESSAGES/choqok.mo share/locale/tr/LC_MESSAGES/choqok.mo +share/locale/ug/LC_MESSAGES/choqok.mo share/locale/uk/LC_MESSAGES/choqok.mo share/locale/zh_CN/LC_MESSAGES/choqok.mo share/locale/zh_TW/LC_MESSAGES/choqok.mo @dirrm share/doc/HTML/en/choqok @comment @dirrmtry share/apps/kwebkitpart/kpartplugins @comment @dirrmtry share/apps/kwebkitpart @dirrm share/apps/choqok_searchaction @dirrm share/apps/choqok_quickfilter @dirrm share/apps/choqok_nowlistening @dirrm share/apps/choqok_filter @dirrm share/apps/choqok/images @dirrm share/apps/choqok @dirrm include/choqok/twitterapihelper @dirrm include/choqok Property changes on: head/www/choqok/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property