wok-next rev 19896
Fix libzip, xarchiver.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Oct 12 04:21:44 2017 +0300 (2017-10-12) |
| parents | 533d88c4b302 |
| children | b9ff88ab27f7 |
| files | libzip/receipt xarchiver/receipt xarchiver/stuff/patches/series xarchiver/stuff/patches/xarchiver-0.5.3-icons.patch xarchiver/stuff/xarchiver-0.5.3-icons.diff |
line diff
1.1 --- a/libzip/receipt Wed Oct 11 22:07:42 2017 +0200 1.2 +++ b/libzip/receipt Thu Oct 12 04:21:44 2017 +0300 1.3 @@ -18,6 +18,7 @@ 1.4 # Rules to configure and make the package. 1.5 compile_rules() 1.6 { 1.7 + export MKDIRPROG='mkdir -p' 1.8 ./configure $CONFIGURE_ARGS && make && make install 1.9 } 1.10
2.1 --- a/xarchiver/receipt Wed Oct 11 22:07:42 2017 +0200 2.2 +++ b/xarchiver/receipt Thu Oct 12 04:21:44 2017 +0300 2.3 @@ -1,4 +1,4 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="xarchiver" 2.8 VERSION="0.5.4" 2.9 @@ -6,43 +6,29 @@ 2.10 SHORT_DESC="A GTK+ lightweight archive manager" 2.11 MAINTAINER="erjo@slitaz.org" 2.12 LICENSE="GPL2" 2.13 +WEB_SITE="https://wiki.lxde.org/en/Xarchiver" 2.14 + 2.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.16 -WEB_SITE="https://wiki.lxde.org/en/Xarchiver" 2.17 WGET_URL="$SF_MIRROR/xarchiver/$VERSION/$TARBALL" 2.18 2.19 -# binutils for ar; busybox also contains gzip & cpio; rar is get-rar; 2.20 -# gtar is absent 2.21 -SUGGESTED="arj bzip2 binutils gzip lzma xz lzop lha rar cpio zip p7zip-full" 2.22 -DEPENDS="gtk+" 2.23 -BUILD_DEPENDS="gtk+-dev" 2.24 -GENERIC_PIXMAPS="no" 2.25 -GENERIC_MENUS="no" 2.26 +BUILD_DEPENDS="gtk+-dev intltool" 2.27 2.28 -# Rules to configure and make the package. 2.29 -compile_rules() 2.30 -{ 2.31 - patch -p0 < $stuff/xarchiver-0.5.3-icons.diff 2.32 - ./configure \ 2.33 - --prefix=/usr \ 2.34 - --libexecdir=/usr/lib \ 2.35 - $CONFIGURE_ARGS && 2.36 - make && make DESTDIR=$DESTDIR install 2.37 +compile_rules() { 2.38 + ./configure $CONFIGURE_ARGS && make && make install 2.39 + 2.40 + mkdir -p $install/var/www/cgi-bin $install/usr/share/doc/xarchiver/html 2.41 + cp $stuff/xarchiver.cgi $install/var/www/cgi-bin 2.42 + cp $stuff/index.html $install/usr/share/doc/xarchiver/html 2.43 + 2.44 + sed -i 's|multipart/x-zip;||; /Exec/s/.*/& %f/' \ 2.45 + $install/usr/share/applications/xarchiver.desktop 2.46 } 2.47 2.48 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.49 -genpkg_rules() 2.50 -{ 2.51 - mkdir -p $fs/usr/share 2.52 - cp -a $install/usr/bin $fs/usr 2.53 - cp -a $install/usr/lib $fs/usr 2.54 - cp -a $install/usr/share/applications $fs/usr/share 2.55 - cp -a $install/usr/share/icons $fs/usr/share 2.56 - rm -rf $fs/usr/share/icons/hicolor/scalable 2.57 - 2.58 - sed -i '/Encoding/d; /Version/d; /Name\[.*\]=Xarchiver/d; /GenericName/d; s|multipart/x-zip;||; /Exec/s/.*/& %f/' \ 2.59 - $fs/usr/share/applications/xarchiver.desktop 2.60 - 2.61 - mkdir -p $fs/var/www/cgi-bin $fs/usr/share/doc/xarchiver/html 2.62 - cp -a $stuff/xarchiver.cgi $fs/var/www/cgi-bin 2.63 - cp -a $stuff/index.html $fs/usr/share/doc/xarchiver/html 2.64 +genpkg_rules() { 2.65 + copy @std 2.66 + rm -r $fs/usr/share/icons; cook_copy_icons 2.67 + DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango" 2.68 + # binutils for ar; busybox also contains gzip & cpio; rar is get-rar; 2.69 + # gtar is absent 2.70 + SUGGESTED="arj binutils bzip2 cpio gzip lha lzma lzop p7zip-full rar xz zip" 2.71 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/xarchiver/stuff/patches/series Thu Oct 12 04:21:44 2017 +0300 3.3 @@ -0,0 +1,1 @@ 3.4 +xarchiver-0.5.3-icons.patch
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/xarchiver/stuff/patches/xarchiver-0.5.3-icons.patch Thu Oct 12 04:21:44 2017 +0300 4.3 @@ -0,0 +1,136 @@ 4.4 +--- a/src/add_dialog.c 4.5 ++++ b/src/add_dialog.c 4.6 +@@ -180,7 +180,7 @@ 4.7 + GTK_WIDGET_SET_FLAGS (add_dialog->cancel_button, GTK_CAN_DEFAULT); 4.8 + 4.9 + add_dialog->add_button = gtk_button_new(); 4.10 +- add_dialog->add_image = xa_main_window_find_image("xarchiver-add.png", GTK_ICON_SIZE_SMALL_TOOLBAR); 4.11 ++ add_dialog->add_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); 4.12 + add_dialog->add_hbox = gtk_hbox_new(FALSE, 4); 4.13 + add_dialog->add_label = gtk_label_new_with_mnemonic(_("_Add")); 4.14 + 4.15 +--- a/src/extract_dialog.c 4.16 ++++ b/src/extract_dialog.c 4.17 +@@ -167,7 +167,7 @@ 4.18 + GTK_WIDGET_SET_FLAGS (cancel_button,GTK_CAN_DEFAULT); 4.19 + 4.20 + extract_button = gtk_button_new(); 4.21 +- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); 4.22 ++ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); 4.23 + extract_hbox = gtk_hbox_new(FALSE,4); 4.24 + extract_label = gtk_label_new_with_mnemonic(_("_Extract")); 4.25 + 4.26 +@@ -503,7 +503,7 @@ 4.27 + GTK_WIDGET_SET_FLAGS (cancelbutton1,GTK_CAN_DEFAULT); 4.28 + 4.29 + extract_button = gtk_button_new(); 4.30 +- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); 4.31 ++ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); 4.32 + extract_hbox = gtk_hbox_new(FALSE,4); 4.33 + extract_label = gtk_label_new_with_mnemonic(_("_Extract")); 4.34 + 4.35 +--- a/src/interface.c 4.36 ++++ b/src/interface.c 4.37 +@@ -110,7 +110,7 @@ 4.38 + listing_html = gtk_image_menu_item_new_with_mnemonic (_("HTML file")); 4.39 + gtk_widget_show (listing_html); 4.40 + gtk_container_add (GTK_CONTAINER (listing_submenu),listing_html); 4.41 +- tmp_image = xa_main_window_find_image ("xarchiver-html.png",GTK_ICON_SIZE_MENU); 4.42 ++ tmp_image = gtk_image_new_from_icon_name ("browser",GTK_ICON_SIZE_MENU); 4.43 + gtk_widget_show (tmp_image); 4.44 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (listing_html),tmp_image); 4.45 + 4.46 +@@ -171,7 +171,7 @@ 4.47 + gtk_container_add (GTK_CONTAINER (menuitem2_menu),addfile); 4.48 + gtk_widget_add_accelerator (addfile,"activate",accel_group,GDK_d,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); 4.49 + 4.50 +- image2 = xa_main_window_find_image ("xarchiver-add.png",GTK_ICON_SIZE_MENU); 4.51 ++ image2 = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_MENU); 4.52 + gtk_widget_show (image2); 4.53 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (addfile),image2); 4.54 + 4.55 +@@ -181,7 +181,7 @@ 4.56 + gtk_container_add (GTK_CONTAINER (menuitem2_menu),extract_menu); 4.57 + gtk_widget_add_accelerator (extract_menu,"activate",accel_group,GDK_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); 4.58 + 4.59 +- image2 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); 4.60 ++ image2 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); 4.61 + gtk_widget_show (image2); 4.62 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract_menu),image2); 4.63 + 4.64 +@@ -387,7 +387,7 @@ 4.65 + gtk_widget_show (separatortoolitem3); 4.66 + gtk_container_add (GTK_CONTAINER (toolbar1),separatortoolitem3); 4.67 + 4.68 +- tmp_image = xa_main_window_find_image("xarchiver-add.png",GTK_ICON_SIZE_LARGE_TOOLBAR); 4.69 ++ tmp_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); 4.70 + gtk_widget_show (tmp_image); 4.71 + AddFile_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Add")); 4.72 + gtk_widget_set_sensitive (AddFile_button,FALSE); 4.73 +@@ -396,7 +396,7 @@ 4.74 + gtk_container_add (GTK_CONTAINER (toolbar1),AddFile_button); 4.75 + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (AddFile_button),tooltips,_("Add files"),NULL); 4.76 + 4.77 +- tmp_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_LARGE_TOOLBAR); 4.78 ++ tmp_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); 4.79 + gtk_widget_show (tmp_image); 4.80 + Extract_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Extract")); 4.81 + gtk_widget_set_sensitive (Extract_button,FALSE); 4.82 +@@ -863,7 +863,7 @@ 4.83 + gtk_widget_show (extract); 4.84 + gtk_container_add (GTK_CONTAINER (xa_popup_menu),extract); 4.85 + 4.86 +- image9 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); 4.87 ++ image9 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); 4.88 + gtk_widget_show (image9); 4.89 + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract),image9); 4.90 + 4.91 +@@ -1527,7 +1527,7 @@ 4.92 + hbox1 = gtk_hbox_new (FALSE,12); 4.93 + gtk_box_pack_start (GTK_BOX (vbox1),hbox1,TRUE,TRUE,0); 4.94 + 4.95 +- pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); 4.96 ++ pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); 4.97 + icon_pixbuf = gtk_image_new_from_pixbuf(pixbuf); 4.98 + g_object_unref(pixbuf); 4.99 + 4.100 +--- a/src/mime.c 4.101 ++++ b/src/mime.c 4.102 +@@ -41,9 +41,9 @@ 4.103 + else if (strcmp(mime,"audio/mpeg") == 0 || strcmp(mime,"audio/midi") == 0 || strcmp (mime,"audio/mp2") == 0) 4.104 + icon_name = "sound"; 4.105 + else if (strcmp(mime,"application/vnd.ms-excel") == 0 || strcmp(mime,"application/vnd.oasis.opendocument.spreadsheet") == 0) 4.106 +- icon_name = "gnome-mime-application-vnd.ms-excel"; 4.107 ++ icon_name = "application-vnd.ms-excel"; 4.108 + else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0) 4.109 +- icon_name = "gnome-mime-application-vnd.ms-powerpoint"; 4.110 ++ icon_name = "application-vnd.ms-powerpoint"; 4.111 + else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0 4.112 + || strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0 4.113 + || strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0 4.114 +@@ -57,11 +57,11 @@ 4.115 + else if (strcmp(mime,"application/x-cd-image") == 0) 4.116 + icon_name = "application-x-cd-image"; 4.117 + else if (strcmp(mime,"application/x-php") == 0) 4.118 +- icon_name = "gnome-mime-application-x-php"; 4.119 ++ icon_name = "application-x-php"; 4.120 + else if (strcmp(mime,"application/x-perl") == 0 || strcmp (mime,"application/x-csh") == 0 || strcmp (mime,"application/x-shellscript") == 0) 4.121 +- icon_name = "gnome-mime-application-x-perl"; 4.122 ++ icon_name = "text-x-script"; 4.123 + else if (strcmp(mime,"application/x-font-ttf") == 0) 4.124 +- icon_name = "gnome-mime-application-x-font-ttf"; 4.125 ++ icon_name = "font"; 4.126 + return icon_name; 4.127 + } 4.128 + 4.129 +--- a/src/pref_dialog.c 4.130 ++++ b/src/pref_dialog.c 4.131 +@@ -57,7 +57,7 @@ 4.132 + 4.133 + prefs_data->prefs_liststore = gtk_list_store_new (3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_UINT); 4.134 + gtk_list_store_append (prefs_data->prefs_liststore,&iter); 4.135 +- icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); 4.136 ++ icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); 4.137 + gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Archive"),2,0,-1); 4.138 + if(icon_pixbuf != NULL) 4.139 + g_object_unref (icon_pixbuf);
5.1 --- a/xarchiver/stuff/xarchiver-0.5.3-icons.diff Wed Oct 11 22:07:42 2017 +0200 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,136 +0,0 @@ 5.4 ---- src/add_dialog.c.orig 5.5 -+++ src/add_dialog.c 5.6 -@@ -180,7 +180,7 @@ 5.7 - GTK_WIDGET_SET_FLAGS (add_dialog->cancel_button, GTK_CAN_DEFAULT); 5.8 - 5.9 - add_dialog->add_button = gtk_button_new(); 5.10 -- add_dialog->add_image = xa_main_window_find_image("xarchiver-add.png", GTK_ICON_SIZE_SMALL_TOOLBAR); 5.11 -+ add_dialog->add_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); 5.12 - add_dialog->add_hbox = gtk_hbox_new(FALSE, 4); 5.13 - add_dialog->add_label = gtk_label_new_with_mnemonic(_("_Add")); 5.14 - 5.15 ---- src/extract_dialog.c.orig 5.16 -+++ src/extract_dialog.c 5.17 -@@ -167,7 +167,7 @@ 5.18 - GTK_WIDGET_SET_FLAGS (cancel_button,GTK_CAN_DEFAULT); 5.19 - 5.20 - extract_button = gtk_button_new(); 5.21 -- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); 5.22 -+ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); 5.23 - extract_hbox = gtk_hbox_new(FALSE,4); 5.24 - extract_label = gtk_label_new_with_mnemonic(_("_Extract")); 5.25 - 5.26 -@@ -503,7 +503,7 @@ 5.27 - GTK_WIDGET_SET_FLAGS (cancelbutton1,GTK_CAN_DEFAULT); 5.28 - 5.29 - extract_button = gtk_button_new(); 5.30 -- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); 5.31 -+ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); 5.32 - extract_hbox = gtk_hbox_new(FALSE,4); 5.33 - extract_label = gtk_label_new_with_mnemonic(_("_Extract")); 5.34 - 5.35 ---- src/interface.c.orig 5.36 -+++ src/interface.c 5.37 -@@ -110,7 +110,7 @@ 5.38 - listing_html = gtk_image_menu_item_new_with_mnemonic (_("HTML file")); 5.39 - gtk_widget_show (listing_html); 5.40 - gtk_container_add (GTK_CONTAINER (listing_submenu),listing_html); 5.41 -- tmp_image = xa_main_window_find_image ("xarchiver-html.png",GTK_ICON_SIZE_MENU); 5.42 -+ tmp_image = gtk_image_new_from_icon_name ("browser",GTK_ICON_SIZE_MENU); 5.43 - gtk_widget_show (tmp_image); 5.44 - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (listing_html),tmp_image); 5.45 - 5.46 -@@ -171,7 +171,7 @@ 5.47 - gtk_container_add (GTK_CONTAINER (menuitem2_menu),addfile); 5.48 - gtk_widget_add_accelerator (addfile,"activate",accel_group,GDK_d,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); 5.49 - 5.50 -- image2 = xa_main_window_find_image ("xarchiver-add.png",GTK_ICON_SIZE_MENU); 5.51 -+ image2 = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_MENU); 5.52 - gtk_widget_show (image2); 5.53 - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (addfile),image2); 5.54 - 5.55 -@@ -181,7 +181,7 @@ 5.56 - gtk_container_add (GTK_CONTAINER (menuitem2_menu),extract_menu); 5.57 - gtk_widget_add_accelerator (extract_menu,"activate",accel_group,GDK_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); 5.58 - 5.59 -- image2 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); 5.60 -+ image2 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); 5.61 - gtk_widget_show (image2); 5.62 - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract_menu),image2); 5.63 - 5.64 -@@ -387,7 +387,7 @@ 5.65 - gtk_widget_show (separatortoolitem3); 5.66 - gtk_container_add (GTK_CONTAINER (toolbar1),separatortoolitem3); 5.67 - 5.68 -- tmp_image = xa_main_window_find_image("xarchiver-add.png",GTK_ICON_SIZE_LARGE_TOOLBAR); 5.69 -+ tmp_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); 5.70 - gtk_widget_show (tmp_image); 5.71 - AddFile_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Add")); 5.72 - gtk_widget_set_sensitive (AddFile_button,FALSE); 5.73 -@@ -396,7 +396,7 @@ 5.74 - gtk_container_add (GTK_CONTAINER (toolbar1),AddFile_button); 5.75 - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (AddFile_button),tooltips,_("Add files"),NULL); 5.76 - 5.77 -- tmp_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_LARGE_TOOLBAR); 5.78 -+ tmp_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); 5.79 - gtk_widget_show (tmp_image); 5.80 - Extract_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Extract")); 5.81 - gtk_widget_set_sensitive (Extract_button,FALSE); 5.82 -@@ -863,7 +863,7 @@ 5.83 - gtk_widget_show (extract); 5.84 - gtk_container_add (GTK_CONTAINER (xa_popup_menu),extract); 5.85 - 5.86 -- image9 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); 5.87 -+ image9 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); 5.88 - gtk_widget_show (image9); 5.89 - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract),image9); 5.90 - 5.91 -@@ -1527,7 +1527,7 @@ 5.92 - hbox1 = gtk_hbox_new (FALSE,12); 5.93 - gtk_box_pack_start (GTK_BOX (vbox1),hbox1,TRUE,TRUE,0); 5.94 - 5.95 -- pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); 5.96 -+ pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); 5.97 - icon_pixbuf = gtk_image_new_from_pixbuf(pixbuf); 5.98 - g_object_unref(pixbuf); 5.99 - 5.100 ---- src/mime.c.orig 5.101 -+++ src/mime.c 5.102 -@@ -41,9 +41,9 @@ 5.103 - else if (strcmp(mime,"audio/mpeg") == 0 || strcmp(mime,"audio/midi") == 0 || strcmp (mime,"audio/mp2") == 0) 5.104 - icon_name = "sound"; 5.105 - else if (strcmp(mime,"application/vnd.ms-excel") == 0 || strcmp(mime,"application/vnd.oasis.opendocument.spreadsheet") == 0) 5.106 -- icon_name = "gnome-mime-application-vnd.ms-excel"; 5.107 -+ icon_name = "application-vnd.ms-excel"; 5.108 - else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0) 5.109 -- icon_name = "gnome-mime-application-vnd.ms-powerpoint"; 5.110 -+ icon_name = "application-vnd.ms-powerpoint"; 5.111 - else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0 5.112 - || strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0 5.113 - || strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0 5.114 -@@ -57,11 +57,11 @@ 5.115 - else if (strcmp(mime,"application/x-cd-image") == 0) 5.116 - icon_name = "application-x-cd-image"; 5.117 - else if (strcmp(mime,"application/x-php") == 0) 5.118 -- icon_name = "gnome-mime-application-x-php"; 5.119 -+ icon_name = "application-x-php"; 5.120 - else if (strcmp(mime,"application/x-perl") == 0 || strcmp (mime,"application/x-csh") == 0 || strcmp (mime,"application/x-shellscript") == 0) 5.121 -- icon_name = "gnome-mime-application-x-perl"; 5.122 -+ icon_name = "text-x-script"; 5.123 - else if (strcmp(mime,"application/x-font-ttf") == 0) 5.124 -- icon_name = "gnome-mime-application-x-font-ttf"; 5.125 -+ icon_name = "font"; 5.126 - return icon_name; 5.127 - } 5.128 - 5.129 ---- src/pref_dialog.c.orig 5.130 -+++ src/pref_dialog.c 5.131 -@@ -57,7 +57,7 @@ 5.132 - 5.133 - prefs_data->prefs_liststore = gtk_list_store_new (3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_UINT); 5.134 - gtk_list_store_append (prefs_data->prefs_liststore,&iter); 5.135 -- icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); 5.136 -+ icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); 5.137 - gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Archive"),2,0,-1); 5.138 - if(icon_pixbuf != NULL) 5.139 - g_object_unref (icon_pixbuf);