wok-6.x rev 16771

Up: xarchiver (0.5.3) and patch it to use icons instead of pixmaps.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jun 20 04:30:32 2014 +0300 (2014-06-20)
parents f18af4c8752a
children 3b67429fe7eb
files xarchiver/description.txt xarchiver/receipt xarchiver/stuff/xarchiver-0.5.3-icons.diff
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/xarchiver/description.txt	Fri Jun 20 04:30:32 2014 +0300
     1.3 @@ -0,0 +1,4 @@
     1.4 +Xarchiver is a GTK+2 only frontend to 7z, zip, rar, tar, bzip2, gzip, arj, lha,
     1.5 +rpm and deb (open and extract only). Xarchiver allows you to create,add, extract
     1.6 +and delete files in the above formats. 7z, zip, rar, arj password protected
     1.7 +archives are supported.
     2.1 --- a/xarchiver/receipt	Fri Jun 20 00:27:57 2014 +0300
     2.2 +++ b/xarchiver/receipt	Fri Jun 20 04:30:32 2014 +0300
     2.3 @@ -1,22 +1,24 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="xarchiver"
     2.7 -VERSION="0.5.2"
     2.8 +VERSION="0.5.3"
     2.9  CATEGORY="x-window"
    2.10 -SHORT_DESC="Archive manager for thunar"
    2.11 +SHORT_DESC="A GTK+ lightweight archive manager"
    2.12  MAINTAINER="erjo@slitaz.org"
    2.13  LICENSE="GPL2"
    2.14  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.15  WEB_SITE="http://xarchiver.sourceforge.net/"
    2.16 -WGET_URL="http://downloads.sourceforge.net/project/xarchiver/xarchiver/$VERSION/$TARBALL"
    2.17 +WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
    2.18  
    2.19 -DEPENDS="gtk+ tar"
    2.20 +# binutils for ar; busybox also contains gzip & cpio; rar is get-rar; gtar is absent
    2.21 +SUGGESTED="arj bzip2 binutils gzip lzma xz lzop lha rar cpio zip p7zip-full xdg-utils"
    2.22 +DEPENDS="gtk+"
    2.23  BUILD_DEPENDS="gtk+-dev"
    2.24  
    2.25  # Rules to configure and make the package.
    2.26  compile_rules()
    2.27  {
    2.28 -	cd $src
    2.29 +	patch -p0 < $stuff/xarchiver-0.5.3-icons.diff
    2.30  	./configure \
    2.31  		--prefix=/usr \
    2.32  		--libexecdir=/usr/lib \
    2.33 @@ -27,15 +29,13 @@
    2.34  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.35  genpkg_rules()
    2.36  {
    2.37 -	mkdir -p $fs/usr/share/locale
    2.38 +	mkdir -p $fs/usr/share
    2.39  	cp -a $install/usr/bin $fs/usr
    2.40  	cp -a $install/usr/lib $fs/usr
    2.41 -	cp -a $install/usr/share/pixmaps $fs/usr/share
    2.42 -	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
    2.43  	cp -a $install/usr/share/applications $fs/usr/share
    2.44  	cp -a $install/usr/share/icons $fs/usr/share
    2.45 -	
    2.46 -	chmod 755 $fs/usr/lib/thunar-archive-plugin/*
    2.47  	rm -rf $fs/usr/share/icons/hicolor/scalable
    2.48 +
    2.49 +	sed -i '/Encoding/d;/Version/d;/Name\[.*\]=Xarchiver/d;/GenericName/d;/Exec/s/.*/& %f/' \
    2.50 +		$fs/usr/share/applications/xarchiver.desktop
    2.51  }
    2.52 -
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/xarchiver/stuff/xarchiver-0.5.3-icons.diff	Fri Jun 20 04:30:32 2014 +0300
     3.3 @@ -0,0 +1,136 @@
     3.4 +--- src/add_dialog.c.orig
     3.5 ++++ src/add_dialog.c
     3.6 +@@ -180,7 +180,7 @@
     3.7 + 	GTK_WIDGET_SET_FLAGS (add_dialog->cancel_button, GTK_CAN_DEFAULT);
     3.8 + 
     3.9 + 	add_dialog->add_button = gtk_button_new();
    3.10 +-	add_dialog->add_image = xa_main_window_find_image("xarchiver-add.png", GTK_ICON_SIZE_SMALL_TOOLBAR);
    3.11 ++	add_dialog->add_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_SMALL_TOOLBAR);
    3.12 + 	add_dialog->add_hbox = gtk_hbox_new(FALSE, 4);
    3.13 + 	add_dialog->add_label = gtk_label_new_with_mnemonic(_("_Add"));
    3.14 + 
    3.15 +--- src/extract_dialog.c.orig
    3.16 ++++ src/extract_dialog.c
    3.17 +@@ -167,7 +167,7 @@
    3.18 + 	GTK_WIDGET_SET_FLAGS (cancel_button,GTK_CAN_DEFAULT);
    3.19 + 
    3.20 + 	extract_button = gtk_button_new();
    3.21 +-	extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR);
    3.22 ++	extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR);
    3.23 + 	extract_hbox = gtk_hbox_new(FALSE,4);
    3.24 + 	extract_label = gtk_label_new_with_mnemonic(_("_Extract"));
    3.25 + 
    3.26 +@@ -503,7 +503,7 @@
    3.27 + 	GTK_WIDGET_SET_FLAGS (cancelbutton1,GTK_CAN_DEFAULT);
    3.28 + 	
    3.29 + 	extract_button = gtk_button_new();
    3.30 +-	extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR);
    3.31 ++	extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR);
    3.32 + 	extract_hbox = gtk_hbox_new(FALSE,4);
    3.33 + 	extract_label = gtk_label_new_with_mnemonic(_("_Extract"));
    3.34 + 
    3.35 +--- src/interface.c.orig
    3.36 ++++ src/interface.c
    3.37 +@@ -110,7 +110,7 @@
    3.38 + 	listing_html = gtk_image_menu_item_new_with_mnemonic (_("HTML file"));
    3.39 + 	gtk_widget_show (listing_html);
    3.40 + 	gtk_container_add (GTK_CONTAINER (listing_submenu),listing_html);
    3.41 +-	tmp_image =  xa_main_window_find_image ("xarchiver-html.png",GTK_ICON_SIZE_MENU);
    3.42 ++	tmp_image = gtk_image_new_from_icon_name ("browser",GTK_ICON_SIZE_MENU);
    3.43 + 	gtk_widget_show (tmp_image);
    3.44 + 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (listing_html),tmp_image);
    3.45 + 	
    3.46 +@@ -171,7 +171,7 @@
    3.47 + 	gtk_container_add (GTK_CONTAINER (menuitem2_menu),addfile);
    3.48 + 	gtk_widget_add_accelerator (addfile,"activate",accel_group,GDK_d,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
    3.49 + 
    3.50 +-	image2 = xa_main_window_find_image ("xarchiver-add.png",GTK_ICON_SIZE_MENU);
    3.51 ++	image2 = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_MENU);
    3.52 + 	gtk_widget_show (image2);
    3.53 + 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (addfile),image2);
    3.54 + 
    3.55 +@@ -181,7 +181,7 @@
    3.56 + 	gtk_container_add (GTK_CONTAINER (menuitem2_menu),extract_menu);
    3.57 + 	gtk_widget_add_accelerator (extract_menu,"activate",accel_group,GDK_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE);
    3.58 + 
    3.59 +-	image2 =  xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU);
    3.60 ++	image2 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU);
    3.61 + 	gtk_widget_show (image2);
    3.62 + 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract_menu),image2);
    3.63 + 
    3.64 +@@ -387,7 +387,7 @@
    3.65 + 	gtk_widget_show (separatortoolitem3);
    3.66 + 	gtk_container_add (GTK_CONTAINER (toolbar1),separatortoolitem3);
    3.67 + 
    3.68 +-	tmp_image = xa_main_window_find_image("xarchiver-add.png",GTK_ICON_SIZE_LARGE_TOOLBAR);
    3.69 ++	tmp_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_LARGE_TOOLBAR);
    3.70 + 	gtk_widget_show (tmp_image);
    3.71 + 	AddFile_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Add"));
    3.72 + 	gtk_widget_set_sensitive (AddFile_button,FALSE);
    3.73 +@@ -396,7 +396,7 @@
    3.74 + 	gtk_container_add (GTK_CONTAINER (toolbar1),AddFile_button);
    3.75 + 	gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (AddFile_button),tooltips,_("Add files"),NULL);
    3.76 + 
    3.77 +-	tmp_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_LARGE_TOOLBAR);
    3.78 ++	tmp_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_LARGE_TOOLBAR);
    3.79 + 	gtk_widget_show (tmp_image);
    3.80 + 	Extract_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Extract"));
    3.81 + 	gtk_widget_set_sensitive (Extract_button,FALSE);
    3.82 +@@ -863,7 +863,7 @@
    3.83 + 	gtk_widget_show (extract);
    3.84 + 	gtk_container_add (GTK_CONTAINER (xa_popup_menu),extract);
    3.85 + 
    3.86 +-	image9 =  xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU);
    3.87 ++	image9 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU);
    3.88 + 	gtk_widget_show (image9);
    3.89 + 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract),image9);
    3.90 + 
    3.91 +@@ -1527,7 +1527,7 @@
    3.92 + 	hbox1 = gtk_hbox_new (FALSE,12);
    3.93 + 	gtk_box_pack_start (GTK_BOX (vbox1),hbox1,TRUE,TRUE,0);
    3.94 + 
    3.95 +-	pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL);
    3.96 ++	pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL);
    3.97 + 	icon_pixbuf = gtk_image_new_from_pixbuf(pixbuf);
    3.98 + 	g_object_unref(pixbuf);
    3.99 + 
   3.100 +--- src/mime.c.orig
   3.101 ++++ src/mime.c
   3.102 +@@ -41,9 +41,9 @@
   3.103 + 	else if (strcmp(mime,"audio/mpeg") == 0 || strcmp(mime,"audio/midi") == 0 || strcmp (mime,"audio/mp2") == 0)
   3.104 + 		icon_name = "sound";
   3.105 + 	else if (strcmp(mime,"application/vnd.ms-excel") == 0 || strcmp(mime,"application/vnd.oasis.opendocument.spreadsheet") == 0)
   3.106 +-		icon_name = "gnome-mime-application-vnd.ms-excel";
   3.107 ++		icon_name = "application-vnd.ms-excel";
   3.108 + 	else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0)
   3.109 +-		icon_name = "gnome-mime-application-vnd.ms-powerpoint";
   3.110 ++		icon_name = "application-vnd.ms-powerpoint";
   3.111 + 	else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0
   3.112 + 		|| strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0
   3.113 + 		|| strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0
   3.114 +@@ -57,11 +57,11 @@
   3.115 + 	else if (strcmp(mime,"application/x-cd-image") == 0)
   3.116 + 		icon_name = "application-x-cd-image";
   3.117 + 	else if (strcmp(mime,"application/x-php") == 0)
   3.118 +-		icon_name = "gnome-mime-application-x-php";
   3.119 ++		icon_name = "application-x-php";
   3.120 + 	else if (strcmp(mime,"application/x-perl") == 0 || strcmp (mime,"application/x-csh") == 0 || strcmp (mime,"application/x-shellscript") == 0)
   3.121 +-		icon_name = "gnome-mime-application-x-perl";
   3.122 ++		icon_name = "text-x-script";
   3.123 + 	else if (strcmp(mime,"application/x-font-ttf") == 0)
   3.124 +-		icon_name = "gnome-mime-application-x-font-ttf";
   3.125 ++		icon_name = "font";
   3.126 + 	return icon_name;		
   3.127 + }
   3.128 + 
   3.129 +--- src/pref_dialog.c.orig
   3.130 ++++ src/pref_dialog.c
   3.131 +@@ -57,7 +57,7 @@
   3.132 + 
   3.133 + 	prefs_data->prefs_liststore = gtk_list_store_new (3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_UINT);
   3.134 + 	gtk_list_store_append (prefs_data->prefs_liststore,&iter);
   3.135 +-	icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL);
   3.136 ++	icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL);
   3.137 + 	gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Archive"),2,0,-1);
   3.138 + 	if(icon_pixbuf != NULL)
   3.139 + 		g_object_unref (icon_pixbuf);