Attachment #110705 for bug #151895

View | Details | Raw Unified | Return to bug 151895
Collapse All | Expand All

Lines 6-12 Link Here

(-)evilvte.new/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= evilvte	8	PORTNAME= evilvte
9	PORTVERSION= 0.4.6	9	PORTVERSION= 0.4.7.1
10	CATEGORIES= x11 gnome	10	CATEGORIES= x11 gnome
11	MASTER_SITES= http://www.calno.com/${PORTNAME}/ \	11	MASTER_SITES= http://www.calno.com/${PORTNAME}/ \
12	LOCAL/glarkin	12	LOCAL/glarkin
Lines 39-45 Link Here
39		39
40	post-patch:	40	post-patch:
41	# disable man page installation	41	# disable man page installation
42	@${REINPLACE_CMD} -e '29,30 d' ${WRKSRC}/Makefile	42	@${REINPLACE_CMD} -e '37,38 d' ${WRKSRC}/Makefile
		43	@${REINPLACE_CMD} -e '/^make/ s/make/gmake/' ${WRKSRC}/src/process.sh
43	.if defined(EVILVTE_CONF)	44	.if defined(EVILVTE_CONF)
44	@${ECHO_MSG} "creating config.h from ${EVILVTE_CONF}"	45	@${ECHO_MSG} "creating config.h from ${EVILVTE_CONF}"
45	@${CP} ${EVILVTE_CONF} ${WRKSRC}/src/config.h	46	@${CP} ${EVILVTE_CONF} ${WRKSRC}/src/config.h

Lines 1-3 Link Here

(-)evilvte.new/distinfo (-3 / +2 lines)
1	MD5 (evilvte-0.4.6.tar.gz) = 323155af3f511b0acc0a526c0d5cce1f	1	SHA256 (evilvte-0.4.7.1.tar.gz) = a47ad312fde918a7064f37a933a66eeb8c252190224d06a8b804911ad5cdacf0
2	SHA256 (evilvte-0.4.6.tar.gz) = 08f2836ba45ffbb8af4102cc9033cda2e1e7790714175ea1d5befcf8aa2e2cf1	2	SIZE (evilvte-0.4.7.1.tar.gz) = 39142
3	SIZE (evilvte-0.4.6.tar.gz) = 38170




--- src/evilvte.c.orig	2010-04-06 07:35:41.000000000 +0200
+++ src/evilvte.c	2010-04-23 02:01:06.000000000 +0200
@@ -930,7 +930,6 @@
 #endif
 #if WINDOW_TITLE_DYNAMIC
   gtk_window_set_title(GTK_WINDOW(main_window), vte_terminal_get_window_title(VTE_TERMINAL(term->vte)));
-  gtk_window_set_icon_name(GTK_WINDOW(main_window), vte_terminal_get_icon_title(VTE_TERMINAL(term->vte)));
 #endif
 }
 #endif
@@ -939,7 +938,7 @@
 int menu_popup(GtkWidget *widget, GdkEventButton *event)
 {
 #ifdef MATCH_STRING_EXEC
-  if (event->button == 1) {
+  if (event->button == 2) {
     int tag = -1;
 #if TAB
     current_tab = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
@@ -948,11 +947,12 @@
     matched_url = vte_terminal_match_check(VTE_TERMINAL(term->vte), event->x / vte_terminal_get_char_width(VTE_TERMINAL(term->vte)), event->y / vte_terminal_get_char_height(VTE_TERMINAL(term->vte)), &tag);
     if (matched_url != NULL) {
       char new_window_str[256];
-      g_snprintf(new_window_str, sizeof(new_window_str), "%s %s &", MATCH_STRING_EXEC, matched_url);
+      g_snprintf(new_window_str, sizeof(new_window_str), "%s '%s' &", MATCH_STRING_EXEC, matched_url);
       system(new_window_str);
       matched_url = NULL;
+      return TRUE;
     }
-    return TRUE;
+    return FALSE;
   }
 #endif
 
@@ -2318,7 +2318,7 @@
 void do_match_open()
 {
   char new_window_str[256];
-  g_snprintf(new_window_str, sizeof(new_window_str), "%s %s &", MENU_MATCH_STRING_EXEC, matched_url);
+  g_snprintf(new_window_str, sizeof(new_window_str), "%s '%s' &", MENU_MATCH_STRING_EXEC, matched_url);
   system(new_window_str);
   matched_url = NULL;
 }
@@ -2699,7 +2699,6 @@
 #endif
 #if WINDOW_TITLE_DYNAMIC
   gtk_window_set_title(GTK_WINDOW(main_window), vte_terminal_get_window_title(VTE_TERMINAL(term->vte)));
-  gtk_window_set_icon_name(GTK_WINDOW(main_window), vte_terminal_get_icon_title(VTE_TERMINAL(term->vte)));
 #endif
 }
 




--- src/process.sh.orig	2010-10-06 08:19:31.000000000 +0200
+++ src/process.sh	2010-11-02 21:09:49.000000000 +0200
@@ -19,11 +19,11 @@
 grep ^#define src/config.o > $CONFFILE
 rm -f $1 src/evilvte.o
 
-MENU_DEFAULT_ENCODING=`grep   MENU_ENCODING_LIST src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | grep 'Default Encoding'`
-MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | grep '"' | wc -l`
-TOGGLE_BG_ORDER_SIZE=`grep    TOGGLE_BG_ORDER    src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | grep '"' | wc -l`
-MENU_CUSTOM_SIZE=`grep        MENU_CUSTOM        src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | grep '"' | wc -l`
-UPPER_PROGRAM_NAME=`grep      PROGRAM_NAME       src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | cut -d '"' -f 2 | sed 's/\b\(.\)/\u\1/'`
+MENU_DEFAULT_ENCODING=`grep   MENU_ENCODING_LIST src/custom.h | tr '\t' ' ' | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | grep 'Default Encoding'`
+MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr '\t,' ' \n' | grep '"' | wc -l`
+TOGGLE_BG_ORDER_SIZE=`grep    TOGGLE_BG_ORDER    src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr '\t,' ' \n' | grep '"' | wc -l`
+MENU_CUSTOM_SIZE=`grep        MENU_CUSTOM        src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | tr '\t,' ' \n' | grep '"' | wc -l`
+UPPER_PROGRAM_NAME=`grep      PROGRAM_NAME       src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1 | cut -d '"' -f 2 | tr '[:lower:]' '[:upper:]'`
 [ "$MENU_DEFAULT_ENCODING" != "" ]    && echo \#define MENU_DEFAULT_ENCODING   1                        >> $CONFFILE
 [ "$MENU_ENCODING_LIST_SIZE" != "0" ] && echo \#define MENU_ENCODING_LIST_SIZE $MENU_ENCODING_LIST_SIZE >> $CONFFILE
 [ "$TOGGLE_BG_ORDER_SIZE" != "0" ]    && echo \#define TOGGLE_BG_ORDER_SIZE    $TOGGLE_BG_ORDER_SIZE    >> $CONFFILE
@@ -52,7 +52,7 @@
 [ "$TOGGLE_BG_NO_BACKGROUND" != "" ] && echo \#define TOGGLE_BG_NO_BACKGROUND 1 >> $CONFFILE
 [ "$TOGGLE_BG_OPACITY" != "" ]       && echo \#define TOGGLE_BG_OPACITY       1 >> $CONFFILE
 
-MENU_CUSTOM_DEFINE=`grep MENU_CUSTOM src/custom.h | sed -e 's/\t/ /g' -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1`
+MENU_CUSTOM_DEFINE=`grep MENU_CUSTOM src/custom.h | sed -e 's/^\( \)*//g' | grep -v ^\/\/ | tail -n 1`
 
 MENU_COPY=`echo $MENU_CUSTOM_DEFINE | grep Copy`
 [ "$MENU_COPY" != "" ] && echo \#define MENU_COPY 1 >> $CONFFILE

Return to bug 151895

Lines 1-51 Link Here

(-)evilvte.new/files/patch-evilvte.c (-51 lines)
1	--- src/evilvte.c.orig 2010-04-06 07:35:41.000000000 +0200
2	+++ src/evilvte.c 2010-04-23 02:01:06.000000000 +0200
3	@@ -930,7 +930,6 @@
4	#endif
5	#if WINDOW_TITLE_DYNAMIC
6	gtk_window_set_title(GTK_WINDOW(main_window), vte_terminal_get_window_title(VTE_TERMINAL(term->vte)));
7	- gtk_window_set_icon_name(GTK_WINDOW(main_window), vte_terminal_get_icon_title(VTE_TERMINAL(term->vte)));
8	#endif
9	}
10	#endif
11	@@ -939,7 +938,7 @@
12	int menu_popup(GtkWidget widget, GdkEventButton event)
13	{
14	#ifdef MATCH_STRING_EXEC
15	- if (event->button == 1) {
16	+ if (event->button == 2) {
17	int tag = -1;
18	#if TAB
19	current_tab = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)));
20	@@ -948,11 +947,12 @@
21	matched_url = vte_terminal_match_check(VTE_TERMINAL(term->vte), event->x / vte_terminal_get_char_width(VTE_TERMINAL(term->vte)), event->y / vte_terminal_get_char_height(VTE_TERMINAL(term->vte)), &tag);
22	if (matched_url != NULL) {
23	char new_window_str[256];
24	- g_snprintf(new_window_str, sizeof(new_window_str), "%s %s &", MATCH_STRING_EXEC, matched_url);
25	+ g_snprintf(new_window_str, sizeof(new_window_str), "%s '%s' &", MATCH_STRING_EXEC, matched_url);
26	system(new_window_str);
27	matched_url = NULL;
28	+ return TRUE;
29	}
30	- return TRUE;
31	+ return FALSE;
32	}
33	#endif
34
35	@@ -2318,7 +2318,7 @@
36	void do_match_open()
37	{
38	char new_window_str[256];
39	- g_snprintf(new_window_str, sizeof(new_window_str), "%s %s &", MENU_MATCH_STRING_EXEC, matched_url);
40	+ g_snprintf(new_window_str, sizeof(new_window_str), "%s '%s' &", MENU_MATCH_STRING_EXEC, matched_url);
41	system(new_window_str);
42	matched_url = NULL;
43	}
44	@@ -2699,7 +2699,6 @@
45	#endif
46	#if WINDOW_TITLE_DYNAMIC
47	gtk_window_set_title(GTK_WINDOW(main_window), vte_terminal_get_window_title(VTE_TERMINAL(term->vte)));
48	- gtk_window_set_icon_name(GTK_WINDOW(main_window), vte_terminal_get_icon_title(VTE_TERMINAL(term->vte)));
49	#endif
50	}
51

Lines 1-14 Link Here

(-)evilvte.new/files/patch-src-process.sh (-13 / +27 lines)
1	--- src/process.sh.orig 2010-04-06 07:35:41.000000000 +0200	1	--- src/process.sh.orig 2010-10-06 08:19:31.000000000 +0200
2	+++ src/process.sh 2010-04-14 01:05:42.000000000 +0200	2	+++ src/process.sh 2010-11-02 21:09:49.000000000 +0200
3	@@ -24,9 +24,9 @@	3	@@ -19,11 +19,11 @@
4	echo \#define MENU_DEFAULT_ENCODING 1 >> $NEWCONFFILE	4	grep ^#define src/config.o > $CONFFILE
5	fi	5	rm -f $1 src/evilvte.o
6		6
7	-MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h \| tr -s ' ' ' ' \| sed 's/^ //' \| grep -v ^\/\/ \| tail -n 1 \| sed 's/,/\n/g' \| wc -l`	7	-MENU_DEFAULT_ENCODING=`grep MENU_ENCODING_LIST src/custom.h \| sed -e 's/\t/ /g' -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| grep 'Default Encoding'`
8	+MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h \| tr -s ' ' ' ' \| sed 's/^ //' \| grep -v ^\/\/ \| tail -n 1 \| tr ',' '\n' \| wc -l`	8	-MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h \| sed -e 's/\t/ /g' -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| tr ',' '\n' \| grep '"' \| wc -l`
9	TOGGLE_BG_ORDER_SIZE=`grep TOGGLE_BG_ORDER src/custom.h \| tr -s ' ' ' ' \| sed 's/^ //' \| grep -v ^\/\/ \| tail -n 1 \| sed 's/,/\n/g' \| wc -l`	9	-TOGGLE_BG_ORDER_SIZE=`grep TOGGLE_BG_ORDER src/custom.h \| sed -e 's/\t/ /g' -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| tr ',' '\n' \| grep '"' \| wc -l`
10	-MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h \| tr -s ' ' ' ' \| sed 's/^ //' \| grep -v ^\/\/ \| tail -n 1 \| sed 's/,/\n/g' \| wc -l`	10	-MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h \| sed -e 's/\t/ /g' -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| tr ',' '\n' \| grep '"' \| wc -l`
11	+MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h \| tr -s ' ' ' ' \| sed 's/^ //' \| grep -v ^\/\/ \| tail -n 1 \| tr ',' '\n' \| wc -l`	11	-UPPER_PROGRAM_NAME=`grep PROGRAM_NAME src/custom.h \| sed -e 's/\t/ /g' -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| cut -d '"' -f 2 \| sed 's/\b\(.\)/\u\1/'`
12	echo \#define MENU_ENCODING_LIST_SIZE $MENU_ENCODING_LIST_SIZE >> $NEWCONFFILE	12	+MENU_DEFAULT_ENCODING=`grep MENU_ENCODING_LIST src/custom.h \| tr '\t' ' ' \| sed -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| grep 'Default Encoding'`
13	echo \#define TOGGLE_BG_ORDER_SIZE $TOGGLE_BG_ORDER_SIZE \| grep -v ' 0$' >> $NEWCONFFILE	13	+MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h \| sed -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| tr '\t,' ' \n' \| grep '"' \| wc -l`
14	echo \#define MENU_CUSTOM_SIZE $MENU_CUSTOM_SIZE >> $NEWCONFFILE	14	+TOGGLE_BG_ORDER_SIZE=`grep TOGGLE_BG_ORDER src/custom.h \| sed -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| tr '\t,' ' \n' \| grep '"' \| wc -l`
		15	+MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h \| sed -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| tr '\t,' ' \n' \| grep '"' \| wc -l`
		16	+UPPER_PROGRAM_NAME=`grep PROGRAM_NAME src/custom.h \| sed -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1 \| cut -d '"' -f 2 \| tr '[:lower:]' '[:upper:]'`
		17	[ "$MENU_DEFAULT_ENCODING" != "" ] && echo \#define MENU_DEFAULT_ENCODING 1 >> $CONFFILE
		18	[ "$MENU_ENCODING_LIST_SIZE" != "0" ] && echo \#define MENU_ENCODING_LIST_SIZE $MENU_ENCODING_LIST_SIZE >> $CONFFILE
		19	[ "$TOGGLE_BG_ORDER_SIZE" != "0" ] && echo \#define TOGGLE_BG_ORDER_SIZE $TOGGLE_BG_ORDER_SIZE >> $CONFFILE
		20	@@ -52,7 +52,7 @@
		21	[ "$TOGGLE_BG_NO_BACKGROUND" != "" ] && echo \#define TOGGLE_BG_NO_BACKGROUND 1 >> $CONFFILE
		22	[ "$TOGGLE_BG_OPACITY" != "" ] && echo \#define TOGGLE_BG_OPACITY 1 >> $CONFFILE
		23
		24	-MENU_CUSTOM_DEFINE=`grep MENU_CUSTOM src/custom.h \| sed -e 's/\t/ /g' -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1`
		25	+MENU_CUSTOM_DEFINE=`grep MENU_CUSTOM src/custom.h \| sed -e 's/^\( \)*//g' \| grep -v ^\/\/ \| tail -n 1`
		26
		27	MENU_COPY=`echo $MENU_CUSTOM_DEFINE \| grep Copy`
		28	[ "$MENU_COPY" != "" ] && echo \#define MENU_COPY 1 >> $CONFFILE