Commits

Anonymous committed 00c0087

Terminal fix encoding menu issue

  • Participants
  • Parent commits 0f377c1

Comments (0)

Files changed (2)

var/vabs/Terminal/src/Terminal.SlackBuild

 # AUTHORS = 
 
 NAME="Terminal"            #Enter package Name!
-VERSION=${VERSION:-"0.6.1"}      #Enter package Version!
+VERSION=${VERSION:-"0.6.2"}      #Enter package Version!
+BASEVER=$(echo $VERSION | cut -f 1-2 -d .)
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"rbistolfi"}   #Enter your Name!
-LINK=${LINK:-"http://archive.xfce.org/src/apps/xfce4-terminal/0.6/xfce4-terminal-0.6.1.tar.bz2"}  #Enter URL for package here!
-#LINK=${LINK:-"http://archive.xfce.org/src/apps/terminal/0.4/$NAME-$VERSION.tar.bz2"}  #Enter URL for package here!
+LINK=${LINK:-"http://archive.xfce.org/src/apps/xfce4-terminal/$BASEVER/xfce4-terminal-$VERSION.tar.bz2"}  #Enter URL for package here!
 
 
 #SYSTEM VARIABLES
 #----------------------------------------------------------------------------
-BUILDNUM=${BUILDNUM:-"2"}
+BUILDNUM=${BUILDNUM:-"1"}
 VL_VERSION=${VL_VERSION:-"$(ls /var/log/packages/|grep vlconfig2|cut -d "-" -f4|cut -c 2-5)"}
 BUILD=${BUILD:-"$BUILDNUM""$VL_VERSION"}
 ARCH=${ARCH:-"$(uname -m)"}
 # your patches use the -p1 strip option!
 #-----------------------------------------------------
 for i in $CWD/patches/*;do
-  patch -p1 <$i
+  patch -p1 <$i --verbose
   mkdir -p $PKG/usr/doc/$NAME-$VERSION/patches/
   cp $i $PKG/usr/doc/$NAME-$VERSION/patches/
 done

var/vabs/Terminal/src/patches/terminal-fix-encoding.patch

+diff -drupN xfce4-terminal-0.6.2/terminal/terminal-encoding-action.c xfce4-terminal-fixencoding-0.6.2/terminal/terminal-encoding-action.c
+--- xfce4-terminal-0.6.2/terminal/terminal-encoding-action.c	2013-05-05 13:59:59.000000000 -0500
++++ xfce4-terminal-fixencoding-0.6.2/terminal/terminal-encoding-action.c	2013-10-27 07:42:55.000000000 -0500
+@@ -253,7 +253,7 @@ terminal_encoding_action_menu_shown (Gtk
+   /* action to reset to the default */
+   default_label = g_strdup_printf (_("Default (%s)"), default_charset);
+   item = gtk_radio_menu_item_new_with_label (groups, default_label);
+-  groups = g_slist_prepend (groups, item);
++  groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), found);
+   g_signal_connect (G_OBJECT (item), "activate",
+@@ -267,7 +267,6 @@ terminal_encoding_action_menu_shown (Gtk
+       /* category item */
+       item = gtk_menu_item_new_with_label (_(terminal_encodings_names[n]));
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+-      groups = g_slist_prepend (groups, item);
+       gtk_widget_show (item);
+ 
+       submenu = gtk_menu_new ();
+@@ -281,7 +280,7 @@ terminal_encoding_action_menu_shown (Gtk
+             break;
+ 
+           item2 = gtk_radio_menu_item_new_with_label (groups, charset);
+-          groups = g_slist_prepend (groups, item2);
++          groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2));
+           gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2);
+           g_object_set_qdata (G_OBJECT (item2), encoding_action_quark, (gchar *) charset);
+           gtk_widget_show (item2);
+@@ -304,7 +303,7 @@ terminal_encoding_action_menu_shown (Gtk
+     {
+       /* add an action with the unknown charset */
+       item2 = gtk_radio_menu_item_new_with_label (groups, action->current);
+-      groups = g_slist_prepend (groups, item2);
++      groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2));
+       g_object_set_qdata_full (G_OBJECT (item2), encoding_action_quark,
+                                g_strdup (action->current), g_free);
+       gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2);