From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 23 00:10:04 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 250D8106566B for ; Fri, 23 Apr 2010 00:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EDE128FC1A for ; Fri, 23 Apr 2010 00:10:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o3N0A3rW078551 for ; Fri, 23 Apr 2010 00:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o3N0A3SK078550; Fri, 23 Apr 2010 00:10:03 GMT (envelope-from gnats) Date: Fri, 23 Apr 2010 00:10:03 GMT Message-Id: <201004230010.o3N0A3SK078550@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Aragon Gouveia Cc: Subject: Re: ports/145681: [patch] x11/evilvte version upgrade 0.4.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Aragon Gouveia List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2010 00:10:04 -0000 The following reply was made to PR ports/145681; it has been noted by GNATS. From: Aragon Gouveia To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/145681: [patch] x11/evilvte version upgrade 0.4.6 Date: Fri, 23 Apr 2010 02:08:11 +0200 This is a multi-part message in MIME format. --------------060301060100030404040809 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Since my initial patch I've found some bugs in the new version which I've patched and reported upstream. I'd like to include these patches with the port. Please ignore my initial patch and use patch attached here to upgrade this port instead. Thanks. --------------060301060100030404040809 Content-Type: text/plain; name="evilvte.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="evilvte.txt" diff -uNr evilvte.orig/Makefile evilvte/Makefile --- evilvte.orig/Makefile 2010-04-13 23:33:42.000000000 +0200 +++ evilvte/Makefile 2010-04-21 23:47:12.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= evilvte -PORTVERSION= 0.4.5 -PORTREVISION= 2 +PORTVERSION= 0.4.6 CATEGORIES= x11 gnome MASTER_SITES= http://www.calno.com/${PORTNAME}/ \ LOCAL/glarkin @@ -16,6 +15,8 @@ COMMENT= A VTE based, super lightweight terminal emulator USE_GMAKE= yes +HAS_CONFIGURE= yes +ALL_TARGET= evilvte USE_GNOME= vte MAN1= evilvte.1 showvte.1 @@ -31,8 +32,8 @@ .endif post-patch: - # disable man page installation - @${REINPLACE_CMD} -e '53,54 d' ${WRKSRC}/Makefile +# disable man page installation + @${REINPLACE_CMD} -e '29,30 d' ${WRKSRC}/Makefile .if defined(EVILVTE_CONF) @${ECHO_MSG} "creating config.h from ${EVILVTE_CONF}" @${CP} ${EVILVTE_CONF} ${WRKSRC}/src/config.h diff -uNr evilvte.orig/distinfo evilvte/distinfo --- evilvte.orig/distinfo 2010-04-13 23:33:42.000000000 +0200 +++ evilvte/distinfo 2010-04-21 23:47:12.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (evilvte-0.4.5.tar.gz) = 3193ea2fce163a8a99ce876c4e9b2d28 -SHA256 (evilvte-0.4.5.tar.gz) = c9dccc8e59cfd58fccd6fb88fb07070f2722b755ab7e18f7717533342f49f60f -SIZE (evilvte-0.4.5.tar.gz) = 37088 +MD5 (evilvte-0.4.6.tar.gz) = 323155af3f511b0acc0a526c0d5cce1f +SHA256 (evilvte-0.4.6.tar.gz) = 08f2836ba45ffbb8af4102cc9033cda2e1e7790714175ea1d5befcf8aa2e2cf1 +SIZE (evilvte-0.4.6.tar.gz) = 38170 diff -uNr evilvte.orig/files/patch-evilvte.c evilvte/files/patch-evilvte.c --- evilvte.orig/files/patch-evilvte.c 1970-01-01 02:00:00.000000000 +0200 +++ evilvte/files/patch-evilvte.c 2010-04-23 02:02:02.000000000 +0200 @@ -0,0 +1,51 @@ +--- 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 + } + diff -uNr evilvte.orig/files/patch-src-process.sh evilvte/files/patch-src-process.sh --- evilvte.orig/files/patch-src-process.sh 1970-01-01 02:00:00.000000000 +0200 +++ evilvte/files/patch-src-process.sh 2010-04-21 23:47:12.000000000 +0200 @@ -0,0 +1,14 @@ +--- src/process.sh.orig 2010-04-06 07:35:41.000000000 +0200 ++++ src/process.sh 2010-04-14 01:05:42.000000000 +0200 +@@ -24,9 +24,9 @@ + echo \#define MENU_DEFAULT_ENCODING 1 >> $NEWCONFFILE + fi + +-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` ++MENU_ENCODING_LIST_SIZE=`grep MENU_ENCODING_LIST src/custom.h | tr -s ' ' ' ' | sed 's/^ //' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | wc -l` + 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` +-MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h | tr -s ' ' ' ' | sed 's/^ //' | grep -v ^\/\/ | tail -n 1 | sed 's/,/\n/g' | wc -l` ++MENU_CUSTOM_SIZE=`grep MENU_CUSTOM src/custom.h | tr -s ' ' ' ' | sed 's/^ //' | grep -v ^\/\/ | tail -n 1 | tr ',' '\n' | wc -l` + echo \#define MENU_ENCODING_LIST_SIZE $MENU_ENCODING_LIST_SIZE >> $NEWCONFFILE + echo \#define TOGGLE_BG_ORDER_SIZE $TOGGLE_BG_ORDER_SIZE | grep -v ' 0$' >> $NEWCONFFILE + echo \#define MENU_CUSTOM_SIZE $MENU_CUSTOM_SIZE >> $NEWCONFFILE diff -uNr evilvte.orig/pkg-plist evilvte/pkg-plist --- evilvte.orig/pkg-plist 2010-04-13 23:33:42.000000000 +0200 +++ evilvte/pkg-plist 2010-04-21 23:47:12.000000000 +0200 @@ -2,5 +2,6 @@ bin/showvte share/applications/evilvte.desktop share/pixmaps/evilvte.png -share/pixmaps/evilvte.xpm +share/gnome-control-center/default-apps/evilvte.xml @dirrmtry share/applications +@dirrmtry share/gnome-control-center/default-apps --------------060301060100030404040809--