network/qTox: Updated for version 20150516.

Signed-off-by: Mario Preksavec <mario@slackware.hr>

7 files changed, 5 insertions, 97 deletions

diff --git a/network/qTox/patches/load_friend_name_with_history.diff b/network/qTox/patches/load_friend_name_with_history.diff
deleted file mode 100644
index 33dd69d115..0000000000
--- a/network/qTox/patches/load_friend_name_with_history.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN qTox-3223707.orig/src/friend.cpp qTox-3223707/src/friend.cpp
---- qTox-3223707.orig/src/friend.cpp	2015-04-05 22:37:15.000000000 +0200
-+++ qTox-3223707/src/friend.cpp	2015-04-16 05:55:03.531187202 +0200
-@@ -40,6 +40,11 @@
-         chatForm->loadHistory(QDateTime::currentDateTime().addDays(-7), true);
-         widget->historyLoaded = true;
-     }
-+    if (Settings::getInstance().getEnableLogging())
-+    {
-+        chatForm->loadHistory(QDateTime::currentDateTime().addDays(-7), true);
-+        widget->historyLoaded = true;
-+    }
- }
- 
- Friend::~Friend()
-diff -urN qTox-3223707.orig/src/widget/form/genericchatform.cpp qTox-3223707/src/widget/form/genericchatform.cpp
---- qTox-3223707.orig/src/widget/form/genericchatform.cpp	2015-04-05 22:37:15.000000000 +0200
-+++ qTox-3223707/src/widget/form/genericchatform.cpp	2015-04-16 05:57:01.339540592 +0200
-@@ -374,6 +374,15 @@
-                 return res;
-         }
-     }
-+    // try load alias from settings
-+    QString lastTry = Settings::getInstance().getFriendAlias(id);
-+    if (!lastTry.isEmpty())
-+        return lastTry;
-+
-+    // try load name from tox
-+    lastTry = Core::getInstance()->getPeerName(id);
-+    if (!lastTry.isEmpty())
-+        return lastTry;
- 
-     return QString();
- }
diff --git a/network/qTox/patches/remove_statusnotifier_dependency.diff b/network/qTox/patches/remove_statusnotifier_dependency.diff
deleted file mode 100644
index b8ccefcee3..0000000000
--- a/network/qTox/patches/remove_statusnotifier_dependency.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- qTox-3223707/src/widget/systemtrayicon.cpp.orig	2015-04-05 22:37:15.000000000 +0200
-+++ qTox-3223707/src/widget/systemtrayicon.cpp	2015-04-16 02:22:08.955184668 +0200
-@@ -230,8 +233,8 @@
-             g_signal_connect(item, "activate", G_CALLBACK(callback), a);
-             gtk_widget_show(item);
-         }
--        void (*callbackMenu)(StatusNotifier*, gint, gint, gpointer) =
--                [](StatusNotifier*, gint, gint, gpointer data)
-+        void (*callbackMenu)(GtkMenu*, gint, gint, gpointer) =
-+                [](GtkMenu*, gint, gint, gpointer data)
-         {
-             gtk_widget_show_all(((SystemTrayIcon*)data)->gtkMenu);
-             gtk_menu_popup(GTK_MENU(((SystemTrayIcon*)data)->gtkMenu), 0, 0, 0, 0, 3, gtk_get_current_event_time());
diff --git a/network/qTox/patches/remove_theme_group_minimum_size.diff b/network/qTox/patches/remove_theme_group_minimum_size.diff
deleted file mode 100644
index fd84b34dd1..0000000000
--- a/network/qTox/patches/remove_theme_group_minimum_size.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- qTox-3223707/src/widget/form/settings/generalsettings.ui.orig	2015-04-05 22:37:15.000000000 +0200
-+++ qTox-3223707/src/widget/form/settings/generalsettings.ui	2015-04-16 05:22:17.389288167 +0200
-@@ -406,12 +406,6 @@
-        </item>
-        <item>
-         <widget class="QGroupBox" name="themeGroup">
--         <property name="minimumSize">
--          <size>
--           <width>0</width>
--           <height>232</height>
--          </size>
--         </property>
-          <property name="title">
-           <string>Theme</string>
-          </property>
diff --git a/network/qTox/patches/unhide_faux_offline_setting.diff b/network/qTox/patches/unhide_faux_offline_setting.diff
deleted file mode 100644
index 9a1857d4b7..0000000000
--- a/network/qTox/patches/unhide_faux_offline_setting.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- qTox-3223707/src/widget/form/settings/generalsettings.ui.orig	2015-04-05 22:37:15.000000000 +0200
-+++ qTox-3223707/src/widget/form/settings/generalsettings.ui	2015-04-15 23:41:44.130802413 +0200
-@@ -391,7 +391,7 @@
-             </property>
-            </widget>
-           </item>
--          <item row="2" column="1">
-+          <item row="2" column="2">
-            <widget class="QCheckBox" name="cbGroupchatPosition">
-             <property name="toolTip">
-              <string comment="toolTip for groupchat positioning">If checked, groupchats will be placed at the top of the friends list, otherwise, they'll be placed below online friends.</string>
diff --git a/network/qTox/patches/use_desktop_fallback_variable.diff b/network/qTox/patches/use_desktop_fallback_variable.diff
deleted file mode 100644
index 6176029e8c..0000000000
--- a/network/qTox/patches/use_desktop_fallback_variable.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- qTox-3223707/src/widget/systemtrayicon.cpp.orig	2015-04-05 22:37:15.000000000 +0200
-+++ qTox-3223707/src/widget/systemtrayicon.cpp	2015-04-16 02:22:08.955184668 +0200
-@@ -9,6 +9,9 @@
- SystemTrayIcon::SystemTrayIcon()
- {
-     QString desktop = getenv("XDG_CURRENT_DESKTOP");
-+    if (desktop.isEmpty()) {
-+        desktop = getenv("DESKTOP_SESSION");
-+    }
-     desktop = desktop.toLower();
-     if (false);
-     #ifdef ENABLE_SYSTRAY_UNITY_BACKEND
diff --git a/network/qTox/qTox.SlackBuild b/network/qTox/qTox.SlackBuild
index c8e1e7ada5..2bc21148bf 100644
--- a/network/qTox/qTox.SlackBuild
+++ b/network/qTox/qTox.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qTox
-VERSION=${VERSION:-20150427}
+VERSION=${VERSION:-20150516}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,13 +69,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix some things
-patch -p1 < $CWD/patches/unhide_faux_offline_setting.diff
-patch -p1 < $CWD/patches/use_desktop_fallback_variable.diff
-patch -p1 < $CWD/patches/remove_statusnotifier_dependency.diff
-patch -p1 < $CWD/patches/remove_theme_group_minimum_size.diff
-patch -p1 < $CWD/patches/load_friend_name_with_history.diff
-
 # Prevent multilib interference
 if [ "$ARCH" = "x86_64" ]; then
   sed -i '/\/usr\/lib\/glib-2.0\/include/d' qtox.pro
@@ -97,7 +90,7 @@ install -D -m0644 -oroot -groot img/icons/qtox-64x64.png \
   $PKG/usr/share/icons/hicolor/64x64/apps/qtox.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a NURUPOWILLSUEME $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/qTox/qTox.info b/network/qTox/qTox.info
index da7aecd488..a6a41838db 100644
--- a/network/qTox/qTox.info
+++ b/network/qTox/qTox.info
@@ -1,8 +1,8 @@
 PRGNAM="qTox"
-VERSION="20150427"
+VERSION="20150516"
 HOMEPAGE="https://github.com/tux3/qTox"
-DOWNLOAD="http://mirror.slackware.hr/sources/qTox/qTox-20150427.tar.bz2"
-MD5SUM="e53db72940c035df624d26c53f1e49d1"
+DOWNLOAD="http://mirror.slackware.hr/sources/qTox/qTox-20150516.tar.bz2"
+MD5SUM="75adbb7d903de27b77d612ab994efff2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="toxcore libfilteraudio qt5 opencv qrencode libxkbcommon"