[Frugalware-git] frugalware-current: gfpm-1.2.0-2-i686

[Priyank]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21d5a1973fc1b7c7d8c5b3ce47e2d004fa7e3c69

commit 21d5a1973fc1b7c7d8c5b3ce47e2d004fa7e3c69
Author: Priyank <priyank at frugalware.org>
Date:   Sat Mar 14 12:22:01 2009 +0530

gfpm-1.2.0-2-i686
* Backport a patch from git to fix #3679

diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild
index 738e820..c1223f6 100644
--- a/source/xapps/gfpm/FrugalBuild
+++ b/source/xapps/gfpm/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gfpm
pkgver=1.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="Graphical Frugalware Package Manager"
url="http://ftp.frugalware.org/pub/other/gfpm"
depends=('glib2' 'gtk+2>=2.14.7' 'libglade' 'pacman-g2>=3.7.3' 'frugalwareutils>=0.8.7')
@@ -14,8 +14,8 @@ archs=('i686' 'x86_64' 'ppc')
_F_gnome_iconcache="y"
Finclude gnome-scriptlet
up2date="lynx -dump $url | Flasttar"
-source=($url/$pkgname-$pkgver.tar.gz)
-signatures=(${source[0]}.asc)
+source=($url/$pkgname-$pkgver.tar.gz $pkgname-$pkgver-mark_for_reinstall.diff)
+signatures=(${source[0]}.asc '')

build()
{
diff --git a/source/xapps/gfpm/gfpm-1.2.0-mark_for_reinstall.diff b/source/xapps/gfpm/gfpm-1.2.0-mark_for_reinstall.diff
new file mode 100644
index 0000000..c93e7ff
--- /dev/null
+++ b/source/xapps/gfpm/gfpm-1.2.0-mark_for_reinstall.diff
@@ -0,0 +1,66 @@
+diff -Naur gfpm-1.2.0/src/gfpm-interface.c gfpm-1.2.0.new/src/gfpm-interface.c
+--- gfpm-1.2.0/src/gfpm-interface.c	2009-03-11 22:27:38.000000000 +0530
++++ gfpm-1.2.0.new/src/gfpm-interface.c	2009-03-14 12:14:02.000000000 +0530
+@@ -119,6 +119,7 @@
+ static void cb_gfpm_mark_for_reinstall (GtkButton *button, gpointer data);
+ static void cb_gfpm_mark_for_removal (GtkButton *button, gpointer data);
+ static void cb_gfpm_mark_for_upgrade (GtkButton *button, gpointer data);
++static void cb_gfpm_reinstall (GtkButton *button, gpointer data);
+ static gint gfpm_trans_prepare (PM_LIST *list);
+ static gint gfpm_trans_commit (PM_LIST **list);
+
+@@ -208,7 +209,6 @@
+ 	GtkListStore		*store = NULL;
+ 	GtkTreeViewColumn	*column = NULL;
+ 	GtkCellRenderer		*renderer = NULL;
+-	GList			*columns = NULL;
+
+ 	if (gfpm_config_get_value_bool("show_compressed_size"))
+ 	{
+@@ -280,7 +280,7 @@
+ 	gtk_tree_view_column_set_resizable (column, FALSE);
+ 	gtk_tree_view_column_set_sort_column_id (column, COL_PKG_SIZE_COMPRESSED);
+ 	gtk_tree_view_append_column (GTK_TREE_VIEW(gfpm_pkgs_tvw), column);
+-	gfpm_compressed_size_col = column;
++	gfpm_compressed_size_col = (GtkWidget*) column;
+ 	gfpm_pkgs_show_compressed_size (show_compressed);
+
+ 	renderer = gtk_cell_renderer_text_new ();
+@@ -291,7 +291,7 @@
+ 	gtk_tree_view_column_set_resizable (column, FALSE);
+ //	gtk_tree_view_column_set_sort_column_id (column, (show_compressed)?6:5);
+ 	gtk_tree_view_append_column (GTK_TREE_VIEW(gfpm_pkgs_tvw), column);
+-	gfpm_uncompressed_size_col = column;
++	gfpm_uncompressed_size_col = (GtkWidget*) column;
+ 	gfpm_pkgs_show_uncompressed_size (show_uncompressed);
+
+ 	gtk_tree_view_set_model (GTK_TREE_VIEW(gfpm_pkgs_tvw), GTK_TREE_MODEL(store));
+@@ -1638,6 +1638,13 @@
+ 		menu_item = gtk_image_menu_item_new_with_label (_("Reinstall package"));
+ 		image = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
+ 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(menu_item), image);
++		g_signal_connect (G_OBJECT(menu_item), "activate", G_CALLBACK(cb_gfpm_reinstall), (gpointer)pkgname);
++		gtk_menu_shell_append (GTK_MENU_SHELL(menu), menu_item);
++		gtk_widget_show (menu_item);
++
++		menu_item = gtk_image_menu_item_new_with_label (_("Mark for re-installation"));
++		image = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
++		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(menu_item), image);
+ 		g_signal_connect (G_OBJECT(menu_item), "activate", G_CALLBACK(cb_gfpm_mark_for_reinstall), (gpointer)pkgname);
+ 		gtk_menu_shell_append (GTK_MENU_SHELL(menu), menu_item);
+ 		gtk_widget_show (menu_item);
+@@ -1675,6 +1682,14 @@
+ static void
+ cb_gfpm_mark_for_reinstall (GtkButton *button, gpointer data)
+ {
++	gfpm_package_list_add (GFPM_INSTALL_LIST, (char*)data);
++
++	return;
++}
++
++static void
++cb_gfpm_reinstall (GtkButton *button, gpointer data)
++{
+ 	GfpmList *temp = NULL;
+
+ 	temp = install_list;