ports/161529: x11/stjerm: Updates to 0.15; fixes --toggle

[Zhihao Yuan]

>Number:         161529
>Category:       ports
>Synopsis:       x11/stjerm: Updates to 0.15; fixes --toggle
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 12 23:20:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Zhihao Yuan
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
Northern Illinois University
>Environment:
System: FreeBSD elitebook.hp 8.2-STABLE FreeBSD 8.2-STABLE #9 r225739: Sat Sep 24 04:14:17 CDT 2011 lichray at compaq.yuetime:/usr/obj/home/lichray/devel/freebsd-stable/sys/HOUKAGO amd64


	
>Description:
	
	stjerm is updated to 0.15 at 19 Jul 2011.
>How-To-Repeat:
	
>Fix:

	
	1. Fixes --toggle option by replacing the call pidof to pgrep;
	2. Upstream made a wrong assumption for vte 0.26, rollback it.

--- stjerm-0.15.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/stjerm.orig/Makefile /usr/ports/x11/stjerm/Makefile
--- /usr/ports/x11/stjerm.orig/Makefile	2011-05-12 20:08:40.000000000 -0500
+++ /usr/ports/x11/stjerm/Makefile	2011-10-12 16:43:10.102624101 -0500
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stjerm
-PORTVERSION=	0.14
+PORTVERSION=	0.15
 CATEGORIES=	x11
 MASTER_SITES=	http://stjerm-terminal.googlecode.com/files/
 
diff -ruN --exclude=CVS /usr/ports/x11/stjerm.orig/distinfo /usr/ports/x11/stjerm/distinfo
--- /usr/ports/x11/stjerm.orig/distinfo	2011-05-12 20:08:40.000000000 -0500
+++ /usr/ports/x11/stjerm/distinfo	2011-10-12 16:43:39.483232483 -0500
@@ -1,2 +1,2 @@
-SHA256 (stjerm-0.14.tar.gz) = 1c2f121c0f81a6ca70c9baf9d9f2e65637015f927709d6290d896b13370b3249
-SIZE (stjerm-0.14.tar.gz) = 28545
+SHA256 (stjerm-0.15.tar.gz) = c1b17dbd95ba7a40c86dbd7bc409a90ce79eb8e3b0e49bd1c741866e1d99c263
+SIZE (stjerm-0.15.tar.gz) = 29155
diff -ruN --exclude=CVS /usr/ports/x11/stjerm.orig/files/patch-src_config.c /usr/ports/x11/stjerm/files/patch-src_config.c
--- /usr/ports/x11/stjerm.orig/files/patch-src_config.c	2011-05-12 20:08:41.000000000 -0500
+++ /usr/ports/x11/stjerm/files/patch-src_config.c	2011-10-12 17:06:28.699506571 -0500
@@ -1,6 +1,18 @@
---- src/config.c.orig	2011-03-25 16:35:40.389707429 -0500
-+++ src/config.c	2011-03-25 16:41:20.529584111 -0500
-@@ -546,7 +546,7 @@ void conf_init(void)
+--- src/config.c.orig	2011-07-19 16:52:33.000000000 -0500
++++ src/config.c	2011-10-12 17:05:50.164711868 -0500
+@@ -146,7 +146,11 @@ pid_t get_stjerm_pid(void)
+     char buffer[100];
+     char **list;
+     int i = 0;
++#ifdef __FreeBSD__
++    FILE *p = popen("pgrep stjerm", "r");
++#else
+     FILE *p = popen("pidof stjerm", "r");
++#endif
+     
+     if(p == NULL)
+     {
+@@ -552,7 +556,7 @@ void conf_init(void)
          exit(1);
      }
  
diff -ruN --exclude=CVS /usr/ports/x11/stjerm.orig/files/patch-src_mainwindow.c /usr/ports/x11/stjerm/files/patch-src_mainwindow.c
--- /usr/ports/x11/stjerm.orig/files/patch-src_mainwindow.c	1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/x11/stjerm/files/patch-src_mainwindow.c	2011-10-12 17:26:58.895892321 -0500
@@ -0,0 +1,11 @@
+--- src/mainwindow.c~	2011-07-19 16:52:33.000000000 -0500
++++ src/mainwindow.c	2011-10-12 17:26:33.324269165 -0500
+@@ -322,7 +322,7 @@ void mainwindow_create_tab(void)
+     }
+ 
+     char buffer [100];
+-    sprintf(buffer, "%s %d", conf_get_term_name(), activetab + 1);
++    sprintf(buffer, "%s %d", conf_get_term_name(), tabcount);
+     GtkLabel* tmp_label = GTK_LABEL(gtk_label_new(buffer));
+ 
+     if(conf_get_opacity() < 100)
diff -ruN --exclude=CVS /usr/ports/x11/stjerm.orig/files/patch-src_term.c /usr/ports/x11/stjerm/files/patch-src_term.c
--- /usr/ports/x11/stjerm.orig/files/patch-src_term.c	1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/x11/stjerm/files/patch-src_term.c	2011-10-12 17:18:00.852712755 -0500
@@ -0,0 +1,11 @@
+--- src/term.c~	2011-07-19 16:52:33.000000000 -0500
++++ src/term.c	2011-10-12 17:17:37.148128623 -0500
+@@ -230,7 +230,7 @@ static void term_app_request(VteTerminal
+ 
+ static void term_fork_command(VteTerminal *term, char *cmd)
+ {
+-    #if VTE_CHECK_VERSION(0,25,0)
++    #if 0
+     char **argv = NULL;
+     
+     g_shell_parse_argv(cmd, NULL, &argv, NULL);
--- stjerm-0.15.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: