Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=188f8da36c572cd5c55dd67a597564c9ee63545c
commit 188f8da36c572cd5c55dd67a597564c9ee63545c Author: Priyank <priy...@frugalware.org> Date: Sun Mar 15 01:41:25 2009 +0530 gfpm-1.2.1-1-i686 * Bugfix version bump * Closes #3431, #3452, #3669, #3679, #3683, #3684 diff --git a/source/xapps/gfpm/FrugalBuild b/source/xapps/gfpm/FrugalBuild index bf5c6f6..2445431 100644 --- a/source/xapps/gfpm/FrugalBuild +++ b/source/xapps/gfpm/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=gfpm -pkgver=1.2.0 -pkgrel=3 +pkgver=1.2.1 +pkgrel=1 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,10 +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 \ - $pkgname-$pkgver-mark_for_reinstall.diff \ - $pkgname-$pkgver-progress_fix.diff) -signatures=(${source[0]}.asc '' '') +source=($url/$pkgname-$pkgver.tar.gz) +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 deleted file mode 100644 index c93e7ff..0000000 --- a/source/xapps/gfpm/gfpm-1.2.0-mark_for_reinstall.diff +++ /dev/null @@ -1,66 +0,0 @@ -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; diff --git a/source/xapps/gfpm/gfpm-1.2.0-progress_fix.diff b/source/xapps/gfpm/gfpm-1.2.0-progress_fix.diff deleted file mode 100644 index 0fc66f9..0000000 --- a/source/xapps/gfpm/gfpm-1.2.0-progress_fix.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur gfpm-1.2.0/src/gfpm-progress.c gfpm-1.2.0.new/src/gfpm-progress.c ---- gfpm-1.2.0/src/gfpm-progress.c 2009-03-11 22:27:38.000000000 +0530 -+++ gfpm-1.2.0.new/src/gfpm-progress.c 2009-03-14 19:22:41.000000000 +0530 -@@ -286,6 +286,10 @@ - gfpm_progress_set_sub_text (sub_text); - g_free (sub_text); - } -+ /* set percentage */ -+ char text[6]; -+ snprintf (text, sizeof(text), "%d %%", percent); -+ gtk_progress_bar_set_text (progressbar, text); - gtk_progress_bar_set_fraction (progressbar, (float)percent/100); - g_free (main_text); - while (gtk_events_pending()) _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
