diff --git a/.gitignore b/.gitignore index addd02a..1cb3cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ -/lxtask-*.tar.xz -/lxtask-*.tar.gz +lxtask-0.1.3.tar.gz +/lxtask-0.1.4.tar.gz +/lxtask-0.1.6.tar.xz +/lxtask-0.1.7.tar.xz +/lxtask-0.1.8.tar.xz +/lxtask-20190301T2144.tar.gz +/lxtask-0.1.9.tar.xz diff --git a/0001-SF-889-Make-priority-change-work.patch b/0001-SF-889-Make-priority-change-work.patch new file mode 100644 index 0000000..ebfa9b3 --- /dev/null +++ b/0001-SF-889-Make-priority-change-work.patch @@ -0,0 +1,43 @@ +From 5aa3dd3fec932016d2b88f0bdb4a719adfb8142e Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Wed, 3 Jan 2018 21:41:24 +0900 +Subject: [PATCH] [SF#889] Make priority change work + +To get pid number from GTK selection, column id must be set to COLUMN_PID. +Also, to redirect g_spawn_command_line_sync() result to /dev/null using +shell-style redirect, shell command must be used, otherwise such redirection +is regarded as command's arguments. +--- + src/callbacks.c | 2 +- + src/xfce-taskmanager-linux.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/callbacks.c b/src/callbacks.c +index dfaff57..315852e 100644 +--- a/src/callbacks.c ++++ b/src/callbacks.c +@@ -103,7 +103,7 @@ void handle_prio_menu(GtkWidget *widget, gchar *prio) + + if(gtk_tree_selection_get_selected(selection, &model, &iter)) + { +- gtk_tree_model_get(model, &iter, 1, &task_id, -1); ++ gtk_tree_model_get(model, &iter, COLUMN_PID, &task_id, -1); + + set_priority_to_task(atoi(task_id), atoi(prio)); + refresh_task_list(); +diff --git a/src/xfce-taskmanager-linux.c b/src/xfce-taskmanager-linux.c +index 36656fb..dd490c1 100644 +--- a/src/xfce-taskmanager-linux.c ++++ b/src/xfce-taskmanager-linux.c +@@ -306,7 +306,7 @@ void set_priority_to_task(gint task_id, gint prio) + { + int status = 0; + gchar command[128] = ""; +- g_sprintf(command, "renice %d %d > /dev/null", prio, task_id); ++ g_sprintf(command, "sh -c \"renice %d %d > /dev/null\"", prio, task_id); + + if( ! g_spawn_command_line_sync(command, NULL, NULL, &status, NULL) ||status ) + show_error(_("Couldn't set priority %d to the task with ID %d"), prio, task_id); +-- +2.14.3 + diff --git a/0012-Shows-Use-memory-as-free-command-line.patch b/0012-Shows-Use-memory-as-free-command-line.patch new file mode 100644 index 0000000..eccba0b --- /dev/null +++ b/0012-Shows-Use-memory-as-free-command-line.patch @@ -0,0 +1,45 @@ +From db2e2ca12a790f235f84d0cf50e1c4cfcb6f2377 Mon Sep 17 00:00:00 2001 +From: Carles Pina i Estany +Date: Sun, 6 Jan 2019 22:45:18 +0000 +Subject: [PATCH 12/12] Shows "Use memory" as 'free' command line. + +'free' command line utility counts SReclaimable as not used. Now lxtask +does the same. +--- + src/xfce-taskmanager-linux.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/xfce-taskmanager-linux.c b/src/xfce-taskmanager-linux.c +index dd490c1..2b2a186 100644 +--- a/src/xfce-taskmanager-linux.c ++++ b/src/xfce-taskmanager-linux.c +@@ -263,6 +263,11 @@ gboolean get_system_status (system_status *sys_stat) + file = fopen ("/proc/meminfo", "r"); + if(!file) return FALSE; + reach=0; ++ ++ /* Same approach as 'free' from procps-3.3.12: mem_cached ++ * is Cached+SReclaimable (see proc/sysinfo.c line 707 */ ++ sys_stat->mem_cached = 0; ++ + while (fgets (buffer, 100, file) != NULL) + { + if(!strncmp(buffer,"MemTotal:",9)) +@@ -270,10 +275,12 @@ gboolean get_system_status (system_status *sys_stat) + else if(!strncmp(buffer,"MemFree:",8)) + sys_stat->mem_free=atoi(buffer+9),reach++; + else if(!strncmp(buffer,"Cached:",7)) +- sys_stat->mem_cached=atoi(buffer+8),reach++; ++ sys_stat->mem_cached+=atoi(buffer+8),reach++; ++ else if(!strncmp(buffer,"SReclaimable:", 13)) ++ sys_stat->mem_cached+=atoi(buffer+14),reach++; + else if(!strncmp(buffer,"Buffers:",8)) + sys_stat->mem_buffered=atoi(buffer+9),reach++; +- if(reach==4) break; ++ if(reach==5) break; + } + fclose (file); + +-- +2.20.1 + diff --git a/create-lxtask-git-bare-tarball.sh b/create-lxtask-git-bare-tarball.sh deleted file mode 100644 index 0c50d00..0000000 --- a/create-lxtask-git-bare-tarball.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -x -set -e - -REPONAME=lxtask -GITURL=https://github.com/lxde/${REPONAME}.git - -DATE=$(date '+%Y%m%d') -TIME=$(date '+%H%M') - -TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz - -PWDDIR=$(pwd) -TMPDIR=$(mktemp -d /var/tmp/libfm-XXXXXX) -pushd $TMPDIR - -git clone --mirror $GITURL - -pushd ${REPONAME}.git/ -git log --format=fuller | head -n 12 -popd - -tar czf ${TARNAME} ${REPONAME}.git/ - -cp -p ${TARNAME} $PWDDIR -popd -rm -rf $TMPDIR diff --git a/lxtask.spec b/lxtask.spec index 8cd0c25..c95d9cf 100644 --- a/lxtask.spec +++ b/lxtask.spec @@ -1,61 +1,55 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=445140 -%global use_release 0 -%global use_gitbare 1 +%global use_release 1 +%global use_gitbare 0 %if 0%{?use_gitbare} < 1 # force -%global use_release 1 +%global use_release 1 %endif -%global git_version %{nil} -%global git_ver_rpm %{nil} -%global git_builddir %{nil} - %if 0%{?use_gitbare} -%global gittardate 20250327 -%global gittartime 1511 -%define use_gitcommit_as_rel 0 - -%global gitbaredate 20250325 -%global git_rev 33d3f23801089589e3e866fd43c4c96fd0b9d325 -%global git_short %(echo %{git_rev} | cut -c-8) -%global git_version %{gitbaredate}git%{git_short} +%global gittardate 20190301 +%global gittartime 2144 +%global gitbaredate 20190224 +%global git_rev db6017ff991f298b7a362ce5acbdd4d84cf40b18 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version D%{gitbaredate}git%{git_short} %endif -%if 0%{?use_gitcommit_as_rel} -%global git_ver_rpm ^%{git_version} -%global git_builddir -%{git_version} +%global mainrel 1 + +%if 0%{?use_release} >= 1 +%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%endif +%if 0%{?use_gitbare} >= 1 +%global fedorarel %{mainrel}.%{git_version} %endif +Name: lxtask +Version: 0.1.9 +Release: %{fedorarel}%{?dist} +Summary: Lightweight and desktop independent task manager -%global main_version 0.1.12 - -Name: lxtask -Version: %{main_version}%{git_ver_rpm} -Release: 2%{?dist} -Summary: Lightweight and desktop independent task manager - -# SPDX confirmed -License: GPL-2.0-or-later -URL: http://lxde.sourceforge.net/ +License: GPLv2+ +URL: http://lxde.sourceforge.net/ %if 0%{?use_gitbare} Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz %endif %if 0%{?use_release} -Source0: https://github.com/lxde/%{name}/archive/%{main_version}/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.xz %endif -Source100: create-lxtask-git-bare-tarball.sh -BuildRequires: make -BuildRequires: gcc -BuildRequires: git -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: intltool -BuildRequires: automake -BuildRequires: libtool +BuildRequires: gcc +BuildRequires: git +BuildRequires: pkgconfig(gtk+-2.0) > 2.6 +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: intltool +%if 0%{?use_gitbare} +BuildRequires: automake +BuildRequires: libtool +%endif %description @@ -67,28 +61,17 @@ totally desktop independent and only requires pure gtk+. %prep %if 0%{?use_release} -%setup -q -n %{name}-%{main_version}%{git_builddir} +%setup -q %{?git_version:-n %{name}-%{version}-%{?git_version}} git init %endif %if 0%{?use_gitbare} -%setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0 +%setup -q -c -T -a 0 git clone ./%{name}.git/ cd %{name} -git checkout -b %{main_version}-fedora %{git_rev} - -# Restore timestamps -set +x -echo "Restore timestamps" -git ls-tree -r --name-only HEAD | while read f -do - unixtime=$(git log -n 1 --pretty='%ct' -- $f) - touch -d "@${unixtime}" $f -done -set -x - +git checkout -b %{version}-fedora %{git_rev} cp -a [A-Z]* .. %endif @@ -100,17 +83,14 @@ git add . git commit -m "base" -q %endif - %build %if 0%{?use_gitbare} cd %{name} +bash autogen.sh %endif -bash autogen.sh -%configure \ - --enable-gtk3 \ - %{nil} -%make_build +%configure +make %{?_smp_mflags} %install @@ -118,12 +98,15 @@ bash autogen.sh cd %{name} %endif -%make_install +make install DESTDIR=%{buildroot} INSTALL="install -p" desktop-file-install \ - --delete-original \ - --dir=%{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/%{name}.desktop + %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) + --vendor fedora \ + %endif + --delete-original \ + --dir=%{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/%{name}.desktop %if 0%{?use_gitbare} cd .. @@ -132,10 +115,7 @@ cd .. %find_lang %{name} %files -f %{name}.lang -%doc AUTHORS -%doc ChangeLog -%doc README -%doc TODO +%doc AUTHORS ChangeLog README TODO %license COPYING %{_bindir}/%{name} %{_datadir}/applications/*%{name}.desktop @@ -143,73 +123,6 @@ cd .. %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 0.1.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Mar 27 2025 Mamoru TASAKA - 0.1.12-1 -- 0.1.12 - -* Fri Jan 17 2025 Fedora Release Engineering - 0.1.11^20240905git6aaa2949-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Oct 02 2024 Mamoru TASAKA - 0.1.11^20240905git6aaa2949-1 -- Update to the latest git - -* Fri Aug 30 2024 Mamoru TASAKA - 0.1.11^20240828git67c04303-1 -- Update to the latest git - -* Sun Aug 25 2024 Mamoru TASAKA - 0.1.11^20240823git0113fe4e-1 -- Update to the latest git - -* Thu Aug 15 2024 Mamoru TASAKA - 0.1.11-1 -- 0.1.11 - -* Thu Jul 18 2024 Fedora Release Engineering - 0.1.10^20230802git5c0d3456-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.1.10^20230802git5c0d3456-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.1.10^20230802git5c0d3456-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Aug 14 2023 Mamoru TASAKA - 0.1.10^20230802git5c0d3456-1 -- Update to the latest git -- Switch to GTK3 - -* Thu Jul 20 2023 Fedora Release Engineering - 0.1.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.1.10-1.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.1.10-1.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.1.10-1.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.1.10-1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.1.10-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Oct 28 2020 Mamoru TASAKA - 0.1.10-1 -- 0.1.10 - -* Tue Jul 28 2020 Fedora Release Engineering - 0.1.9-2.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.1.9-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 24 2020 Mamoru TASAKA - 0.1.9-2 -- Apply upstream track proposal patch for gcc10 -fno-common - -* Thu Jul 25 2019 Fedora Release Engineering - 0.1.9-1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Sat Mar 2 2019 Mamoru TASAKA - 0.1.9-1 - 0.1.9 formal release diff --git a/sources b/sources index d81a4d9..c98d4e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lxtask-20250327T1511.tar.gz) = db3ceab603eedb7272880e99ccd084928ff5c418a8d06c4ad48a68b8113294e109d85f089156acf90107397968f7395b2485a5952a7dc64eeaf4f99663a62712 +SHA512 (lxtask-0.1.9.tar.xz) = 21a28a86180e2c0d11f591707fe4333cb78224316d6c33e581f5a38a36baf619e22c426f58a6e4eaaa5701119b909a956691fc00ef47dff140443148f2941f4d