Date: Thu, 22 Oct 2020 00:26:05 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552912 - in head/sysutils/lxtask: . files Message-ID: <202010220026.09M0Q5Lw093924@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Oct 22 00:26:05 2020 New Revision: 552912 URL: https://svnweb.freebsd.org/changeset/ports/552912 Log: Update 0.1.4 --> 0.1.9 Modified: head/sysutils/lxtask/Makefile (contents, props changed) head/sysutils/lxtask/distinfo (contents, props changed) head/sysutils/lxtask/files/patch-src__main.c (contents, props changed) head/sysutils/lxtask/files/patch-src__types.h (contents, props changed) head/sysutils/lxtask/files/patch-src__xfce-taskmanager-linux.c (contents, props changed) head/sysutils/lxtask/pkg-plist (contents, props changed) Modified: head/sysutils/lxtask/Makefile ============================================================================== --- head/sysutils/lxtask/Makefile Thu Oct 22 00:26:01 2020 (r552911) +++ head/sysutils/lxtask/Makefile Thu Oct 22 00:26:05 2020 (r552912) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= lxtask -PORTVERSION= 0.1.4 -PORTREVISION= 3 +PORTVERSION= 0.1.9 CATEGORIES= sysutils gnome -MASTER_SITES= SF/lxde/LXTask%20%28task%20manager%29/LXTask%20${PORTVERSION}/ +MASTER_SITES= SF/lxde/LXTask%20%28task%20manager%29/LXTask%200.1.x/ MAINTAINER= ports@FreeBSD.org COMMENT= Lightweight desktop-independent task manager @@ -13,7 +12,7 @@ COMMENT= Lightweight desktop-independent task manager LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake gnome iconv pkgconfig +USES= gmake gnome iconv pkgconfig tar:xz USE_GNOME= gtk20 intlhack GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -28,8 +27,8 @@ OPTIONS_SUB= yes NLS_USES= gettext localbase NLS_USES_OFF= gettext-tools -post-patch-NLS-off: - @${REINPLACE_CMD} -e 's|po src|src|' ${WRKSRC}/Makefile.in +# post-patch-NLS-off: +# @${REINPLACE_CMD} -e 's|po src|src|' ${WRKSRC}/Makefile.in post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/sysutils/lxtask/distinfo ============================================================================== --- head/sysutils/lxtask/distinfo Thu Oct 22 00:26:01 2020 (r552911) +++ head/sysutils/lxtask/distinfo Thu Oct 22 00:26:05 2020 (r552912) @@ -1,2 +1,3 @@ -SHA256 (lxtask-0.1.4.tar.gz) = 39110c99e9e56101e25be35628abafd81b1e3ea47e2d8bea45b2cb12c1e3cd61 -SIZE (lxtask-0.1.4.tar.gz) = 241034 +TIMESTAMP = 1603309717 +SHA256 (lxtask-0.1.9.tar.xz) = 41ea88f0adf31a840e4b9d137ca5ea802860d1a117845ba25f3080d74a876433 +SIZE (lxtask-0.1.9.tar.xz) = 138000 Modified: head/sysutils/lxtask/files/patch-src__main.c ============================================================================== --- head/sysutils/lxtask/files/patch-src__main.c Thu Oct 22 00:26:01 2020 (r552911) +++ head/sysutils/lxtask/files/patch-src__main.c Thu Oct 22 00:26:05 2020 (r552912) @@ -1,18 +1,19 @@ ---- src/main.c.orig 2011-06-21 21:50:00 UTC -+++ src/main.c -@@ -56,7 +56,6 @@ guint win_height; - guint refresh_interval; +--- src/main.c.orig 2019-01-13 11:41:23.000000000 -0800 ++++ src/main.c 2020-10-21 12:50:26.931353000 -0700 +@@ -57,8 +57,6 @@ + gint refresh_interval; guint rID; --int PAGE_SIZE; - +-int page_size; +- int main (int argc, char *argv[]) { -@@ -72,7 +71,6 @@ int main (int argc, char *argv[]) + +@@ -73,7 +71,6 @@ #endif gtk_init (&argc, &argv); -- PAGE_SIZE=sysconf(_SC_PAGESIZE)>>10; +- page_size=sysconf(_SC_PAGESIZE)>>10; own_uid = getuid(); config_file = g_build_filename(g_get_user_config_dir(), "lxtask.conf", NULL); Modified: head/sysutils/lxtask/files/patch-src__types.h ============================================================================== --- head/sysutils/lxtask/files/patch-src__types.h Thu Oct 22 00:26:01 2020 (r552911) +++ head/sysutils/lxtask/files/patch-src__types.h Thu Oct 22 00:26:05 2020 (r552912) @@ -1,9 +1,9 @@ ---- src/types.h.orig 2011-06-21 21:50:00 UTC -+++ src/types.h -@@ -79,6 +79,4 @@ extern guint win_height; +--- src/types.h.orig 2019-01-13 11:41:23.000000000 -0800 ++++ src/types.h 2020-10-21 12:52:03.313788000 -0700 +@@ -80,6 +80,4 @@ const gchar *custom_signal_0; const gchar *custom_signal_1; --extern int PAGE_SIZE; +-extern int page_size; - #endif Modified: head/sysutils/lxtask/files/patch-src__xfce-taskmanager-linux.c ============================================================================== --- head/sysutils/lxtask/files/patch-src__xfce-taskmanager-linux.c Thu Oct 22 00:26:01 2020 (r552911) +++ head/sysutils/lxtask/files/patch-src__xfce-taskmanager-linux.c Thu Oct 22 00:26:05 2020 (r552912) @@ -1,87 +1,56 @@ ---- src/xfce-taskmanager-linux.c.orig 2011-06-21 21:50:00 UTC -+++ src/xfce-taskmanager-linux.c -@@ -29,6 +29,7 @@ - #include <glib/gprintf.h> +--- src/xfce-taskmanager-linux.c.orig 2019-01-13 13:25:38.000000000 -0800 ++++ src/xfce-taskmanager-linux.c 2020-10-21 12:58:00.556146000 -0700 +@@ -30,6 +30,8 @@ #include "xfce-taskmanager-linux.h" + /* #include <sys/sysinfo.h> */ -+#define PAGE_SIZE ( sysconf(_SC_PAGESIZE) ) - - #if 1 - void get_task_details(gint pid,struct task *task) -@@ -40,7 +41,7 @@ void get_task_details(gint pid,struct ta ++#define page_size ( sysconf(_SC_PAGESIZE) ) ++ + void get_task_details(pid_t pid,struct task *task) + { + int fd; +@@ -41,7 +43,7 @@ task->checked=FALSE; - task->size=0; + task->size=0; -- sprintf(line,"/proc/%d/statm",pid); -+ sprintf(line,"/compat/linux/proc/%d/statm",pid); +- sprintf(line,"/proc/%d/statm",(int)pid); ++ sprintf(line,"/compat/linux/proc/%d/statm",(int)pid); fd=open(line,O_RDONLY); if(fd==-1) return; - read(fd,line,256); -@@ -50,7 +51,7 @@ void get_task_details(gint pid,struct ta - task->size*=PAGE_SIZE; - task->rss*=PAGE_SIZE; + ret = read(fd,line,255); +@@ -57,7 +59,7 @@ + task->size = t_size * page_size; + task->rss = t_rss * page_size; -- sprintf(line,"/proc/%d/stat",pid); -+ sprintf(line,"/compat/linux/proc/%d/stat",pid); +- sprintf(line,"/proc/%d/stat",(gint)pid); ++ sprintf(line,"/compat/linux/proc/%d/stat",(gint)pid); fd=open(line,O_RDONLY); if(fd!=-1) { -@@ -136,8 +137,8 @@ struct task get_task_details(gint pid) - gchar filename[255]; - gchar cmdline_filename[255]; +@@ -98,7 +100,7 @@ + if(show_full_path) + { + FILE *fp; +- sprintf(line,"/proc/%d/cmdline",(int)pid); ++ sprintf(line,"/compat/linux/proc/%d/cmdline",(int)pid); + fp=fopen(line,"r"); + if(fp) + { +@@ -124,7 +126,7 @@ + else if(len>=15) + { + FILE *fp; +- sprintf(line,"/proc/%d/cmdline",(int)pid); ++ sprintf(line,"/compat/linux/proc/%d/cmdline",(int)pid); + fp=fopen(line,"r"); + if(fp) + { +@@ -169,7 +171,7 @@ + task->time_percentage = 0; + task->ppid = ppid; -- sprintf(filename, "/proc/%i/stat", pid); -- sprintf(cmdline_filename, "/proc/%i/cmdline", pid); -+ sprintf(filename, "/compat/linux/proc/%i/stat", pid); -+ sprintf(cmdline_filename, "/compat/linux/proc/%i/cmdline", pid); - - stat(filename, &status); - -@@ -253,9 +254,9 @@ GArray *get_task_list(void) - GArray *task_list; - int count=0; - -- if((dir = opendir("/proc/")) == NULL) -+ if((dir = opendir("/compat/linux/proc/")) == NULL) - { -- fprintf(stderr, "Error: couldn't load the /proc directory\n"); -+ fprintf(stderr, "Error: couldn't load the /compat/linux/proc directory\n"); - return NULL; - } - -@@ -295,7 +296,7 @@ GArray *get_task_list(void) - - - task_list = g_array_new(FALSE, FALSE, sizeof (struct task)); -- n=scandir("/proc",&namelist,proc_filter,0); -+ n=scandir("/compat/linux/proc",&namelist,proc_filter,0); - if(n<0) return task_list; - - g_array_set_size(task_list,n); -@@ -318,7 +319,7 @@ GArray *get_task_list(void) - - gboolean get_cpu_usage_from_proc(system_status *sys_stat) - { -- const gchar *file_name = "/proc/stat"; -+ const gchar *file_name = "/compat/linux/proc/stat"; - FILE *file; - - if ( sys_stat->valid_proc_reading == TRUE ) { -@@ -359,7 +360,7 @@ gboolean get_system_status (system_statu - int reach; - static int cpu_count; - -- file = fopen ("/proc/meminfo", "r"); -+ file = fopen ("/compat/linux/proc/meminfo", "r"); - if(!file) return FALSE; - reach=0; - while (fgets (buffer, 100, file) != NULL) -@@ -378,7 +379,7 @@ gboolean get_system_status (system_statu - - if(!cpu_count) - { -- file = fopen ("/proc/cpuinfo", "r"); -+ file = fopen ("/compat/linux/proc/cpuinfo", "r"); - if(!file) return FALSE; - while (fgets (buffer, 100, file) != NULL) - { +- sprintf(line,"/proc/%d/task",(int)pid); ++ sprintf(line,"/compat/linux/proc/%d/task",(int)pid); + /* SF bug #843: /proc/%d/stat owned by UID instead of EUID */ + if (stat(line,&st) < 0) + fstat(fd,&st); Modified: head/sysutils/lxtask/pkg-plist ============================================================================== --- head/sysutils/lxtask/pkg-plist Thu Oct 22 00:26:01 2020 (r552911) +++ head/sysutils/lxtask/pkg-plist Thu Oct 22 00:26:05 2020 (r552912) @@ -1,4 +1,5 @@ bin/lxtask +man/man1/lxtask.1.gz share/applications/lxtask.desktop %%NLS%%share/locale/af/LC_MESSAGES/lxtask.mo %%NLS%%share/locale/ar/LC_MESSAGES/lxtask.mo @@ -47,3 +48,21 @@ share/applications/lxtask.desktop %%NLS%%share/locale/vi/LC_MESSAGES/lxtask.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/lxtask.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/ast/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/be/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/bn/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/fo/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/is/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/kk/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/lg/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/lv/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/pa/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/ro/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/sq/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/sr@latin/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/te/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/th/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/tt_RU/LC_MESSAGES/lxtask.mo +%%NLS%%share/locale/ug/LC_MESSAGES/lxtask.mo +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010220026.09M0Q5Lw093924>