- Update ChoqoK to 1.3 release

6 files changed, 12 insertions, 90 deletions

diff --git a/www/choqok/Makefile b/www/choqok/Makefile
index 6f8193d58e15..dec0d6555171 100644
--- a/www/choqok/Makefile
+++ b/www/choqok/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	choqok
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	www kde
 MASTER_SITES=	SF/${PORTNAME}/Choqok/
 
diff --git a/www/choqok/distinfo b/www/choqok/distinfo
index 0bcb8ed54766..f4818f61f06e 100644
--- a/www/choqok/distinfo
+++ b/www/choqok/distinfo
@@ -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
diff --git a/www/choqok/files/patch-git-09b83146c682a0d467cff1be4236660554bd9ca1 b/www/choqok/files/patch-git-09b83146c682a0d467cff1be4236660554bd9ca1
deleted file mode 100644
index e319dcc61039..000000000000
--- a/www/choqok/files/patch-git-09b83146c682a0d467cff1be4236660554bd9ca1
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Andrey Esin <gmlastik@gmail.com>
-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&amp;a=commitdiff&amp;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<Choqok::UI::TimelineWidget *>(timelinesTabWidget()->widget(index));
--    if(stw->isClosable())
--        d->btnCloseSearch->setEnabled(true);
--    else
--        d->btnCloseSearch->setEnabled(false);
-+  if ( index > -1 ) {
-+      Choqok::UI::TimelineWidget *stw =
-+              qobject_cast<Choqok::UI::TimelineWidget *>(timelinesTabWidget()->widget(index));
-+      if(stw->isClosable())
-+          d->btnCloseSearch->setEnabled(true);
-+      else
-+          d->btnCloseSearch->setEnabled(false);
-+  }
- }
- 
- void TwitterApiMicroBlogWidget::slotCloseCurrentSearch()
-
diff --git a/www/choqok/files/patch-git-112d643271d27614bd7585e2f3f281a0edeac474 b/www/choqok/files/patch-git-112d643271d27614bd7585e2f3f281a0edeac474
deleted file mode 100644
index 362a7dcccb4c..000000000000
--- a/www/choqok/files/patch-git-112d643271d27614bd7585e2f3f281a0edeac474
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Andrey Esin <gmlastik@gmail.com>
-Date: Mon, 02 May 2011 12:32:12 +0000
-Subject: BUG:272220
-X-Git-Url: http://quickgit.kde.org/?p=choqok.git&amp;a=commitdiff&amp;h=112d643271d27614bd7585e2f3f281a0edeac474
----
-BUG:272220
-Add ability to recognize nicks with underscore.
----
-
-
---- ./microblogs/laconica/laconicapostwidget.cpp
-+++ ./microblogs/laconica/laconicapostwidget.cpp
-@@ -40,7 +40,7 @@
- #include <choqoktools.h>
- 
- 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-_]\\.)?)";
-
diff --git a/www/choqok/files/patch-git-7e15e0aa07d0f906842fd81ec244e908c31fe146 b/www/choqok/files/patch-git-7e15e0aa07d0f906842fd81ec244e908c31fe146
deleted file mode 100644
index a842959d7301..000000000000
--- a/www/choqok/files/patch-git-7e15e0aa07d0f906842fd81ec244e908c31fe146
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Mehrdad Momeny <mehrdad.momeny@gmail.com>
-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&amp;a=commitdiff&amp;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();;
-         }
-     }
- 
-
diff --git a/www/choqok/pkg-plist b/www/choqok/pkg-plist
index 728a972084d5..299dfb611893 100644
--- a/www/choqok/pkg-plist
+++ b/www/choqok/pkg-plist
@@ -7,6 +7,7 @@ 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
@@ -60,7 +61,6 @@ 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
@@ -76,28 +76,26 @@ 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
@@ -113,11 +111,11 @@ 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
@@ -200,6 +198,7 @@ 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
@@ -215,15 +214,12 @@ 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
@@ -234,6 +230,7 @@ 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
@@ -266,8 +263,10 @@ 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