[arch-commits] Commit in lxtask/trunk (4 files)

[Balló György]

    Date: Tuesday, September 23, 2014 @ 15:42:27
  Author: bgyorgy
Revision: 119471

upgpkg: lxtask 0.1.5-1

Update to version 0.1.5

Modified:
  lxtask/trunk/PKGBUILD
  lxtask/trunk/fix-integer-overflow.patch
Deleted:
  lxtask/trunk/fix-cpu-count.patch
  lxtask/trunk/fix-sort-by-user.patch

----------------------------+
 PKGBUILD                   |   20 ++++++++------------
 fix-cpu-count.patch        |   18 ------------------
 fix-integer-overflow.patch |   21 ---------------------
 fix-sort-by-user.patch     |   19 -------------------
 4 files changed, 8 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-23 13:07:08 UTC (rev 119470)
+++ PKGBUILD	2014-09-23 13:42:27 UTC (rev 119471)
@@ -5,8 +5,8 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
 
 pkgname=lxtask
-pkgver=0.1.4
-pkgrel=5
+pkgver=0.1.5
+pkgrel=1
 pkgdesc='Task manager of the LXDE Desktop'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -14,20 +14,16 @@
 groups=('lxde')
 depends=('gtk2')
 makedepends=('intltool')
-source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
-        fix-integer-overflow.patch
-        fix-sort-by-user.patch
-        fix-cpu-count.patch)
-md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f'
-         '0d4d325bd20dc7dcf2489bf78f18efb5'
-         'ecb4b04fac25c7533b8760696b742330'
-         'd18064be20c653274e31a73426e06abb')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz
+        fix-integer-overflow.patch)
+md5sums=('c8b1e9df8cbe41c07ebc3830d4386324'
+         'd505170197a070a11b67798ebb5519ac')
 
 prepare() {
   cd $pkgname-$pkgver
+
+  # Fix integer overflow on shorting by memory
   patch -Np1 -i ../fix-integer-overflow.patch
-  patch -Np1 -i ../fix-sort-by-user.patch
-  patch -Np1 -i ../fix-cpu-count.patch
 }
 
 build() {

Deleted: fix-cpu-count.patch
===================================================================
--- fix-cpu-count.patch	2014-09-23 13:07:08 UTC (rev 119470)
+++ fix-cpu-count.patch	2014-09-23 13:42:27 UTC (rev 119471)
@@ -1,18 +0,0 @@
-commit 963dea395cc58eae940b85e242f0d84fb7d2eaa5
-Author: dgod <dgod.osa at gmail.com>
-Date:   Mon Apr 22 19:08:58 2013 +0800
-
-    Patch that resolves -1% CPU for processes on armhf
-
-diff --git a/src/xfce-taskmanager-linux.c b/src/xfce-taskmanager-linux.c
-index 116fec1..1267dfc 100644
---- a/src/xfce-taskmanager-linux.c
-+++ b/src/xfce-taskmanager-linux.c
-@@ -267,6 +267,7 @@ gboolean get_system_status (system_status *sys_stat)
-             }
-         }
-         fclose (file);
-+        if(!cpu_count) cpu_count++; /* cpu_count should be at least 1 */
-     }
-     sys_stat->cpu_count=cpu_count;
-     return TRUE;

Modified: fix-integer-overflow.patch
===================================================================
--- fix-integer-overflow.patch	2014-09-23 13:07:08 UTC (rev 119470)
+++ fix-integer-overflow.patch	2014-09-23 13:42:27 UTC (rev 119471)
@@ -1,28 +1,7 @@
-commit 2dbcf129cd830bc3b50a2e040f862026eb1d9ab7
-Author: dgod <dgod.osa at gmail.com>
-Date:   Sun Feb 12 17:32:14 2012 +0800
-
-    fix integer overflow in memory show
-
-    Extended by Arch Linux to fix sort tasks by memory.
-
 diff --git a/src/interface.c b/src/interface.c
 index 52c6727..62e89ff 100644
 --- a/src/interface.c
 +++ b/src/interface.c
-@@ -430,10 +430,10 @@ void fill_list_item(gint i, GtkTreeIter *iter)
-         gtk_tree_store_set(GTK_TREE_STORE(list_store), iter, COLUMN_STATE, task->state, -1);
- 
-         /* size */
--        gtk_tree_store_set(GTK_TREE_STORE(list_store), iter, COLUMN_MEM, size_to_string(buf, task->size * 1024), -1);
-+        gtk_tree_store_set(GTK_TREE_STORE(list_store), iter, COLUMN_MEM, size_to_string(buf, ((guint64)task->size)*1024), -1);
- 
-         /* rss */
--        gtk_tree_store_set(GTK_TREE_STORE(list_store), iter, COLUMN_RSS, size_to_string(buf, task->rss*1024), -1);
-+        gtk_tree_store_set(GTK_TREE_STORE(list_store), iter, COLUMN_RSS, size_to_string(buf, ((guint64)task->rss)*1024), -1);
- 
-         gtk_tree_store_set(GTK_TREE_STORE(list_store), iter, COLUMN_UNAME, task->uname, -1);
-         sprintf(buf,"%0d%%", (guint)task->time_percentage);
 @@ -545,10 +545,10 @@ gint compare_size_list_item(GtkTreeModel *model, GtkTreeIter *iter1, GtkTreeIter
      gtk_tree_model_get(model, iter1, column, &s1, -1);
      gtk_tree_model_get(model, iter2, column, &s2, -1);

Deleted: fix-sort-by-user.patch
===================================================================
--- fix-sort-by-user.patch	2014-09-23 13:07:08 UTC (rev 119470)
+++ fix-sort-by-user.patch	2014-09-23 13:42:27 UTC (rev 119471)
@@ -1,19 +0,0 @@
-commit 02fb78fb4f1e46b5176f45e2c221da6e52e9d014
-Author: dgod <dgod.osa at gmail.com>
-Date:   Wed Oct 31 20:31:48 2012 +0800
-
-    fix sort tasks by clicking the User Name
-
-diff --git a/src/interface.c b/src/interface.c
-index 45cf256..1f98351 100644
---- a/src/interface.c
-+++ b/src/interface.c
-@@ -195,7 +195,7 @@ void create_list_store(void)
-     column = gtk_tree_view_column_new_with_attributes(_("User"), cell_renderer, "text", COLUMN_UNAME, NULL);
-     gtk_tree_view_column_set_resizable(column, TRUE);
-     gtk_tree_view_column_set_sort_column_id(column, COLUMN_UNAME);
--    gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(list_store), COLUMN_UNAME, compare_int_list_item, (void *)COLUMN_UNAME, NULL);
-+    gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(list_store), COLUMN_UNAME, compare_string_list_item, (void *)COLUMN_UNAME, NULL);
-     gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
- 
-     cell_renderer = gtk_cell_renderer_text_new();