# HG changeset patch # User Aleksej Bobylev # Date 1507771304 -10800 # Node ID bd4c82b1d1de40e2220dde8d8738bfa8693aa549 # Parent 533d88c4b302eedb9f568343edc99a8c6b0f0eb5 Fix libzip, xarchiver. diff -r 533d88c4b302 -r bd4c82b1d1de libzip/receipt --- a/libzip/receipt Wed Oct 11 22:07:42 2017 +0200 +++ b/libzip/receipt Thu Oct 12 04:21:44 2017 +0300 @@ -18,6 +18,7 @@ # Rules to configure and make the package. compile_rules() { + export MKDIRPROG='mkdir -p' ./configure $CONFIGURE_ARGS && make && make install } diff -r 533d88c4b302 -r bd4c82b1d1de xarchiver/receipt --- a/xarchiver/receipt Wed Oct 11 22:07:42 2017 +0200 +++ b/xarchiver/receipt Thu Oct 12 04:21:44 2017 +0300 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="xarchiver" VERSION="0.5.4" @@ -6,43 +6,29 @@ SHORT_DESC="A GTK+ lightweight archive manager" MAINTAINER="erjo@slitaz.org" LICENSE="GPL2" +WEB_SITE="https://wiki.lxde.org/en/Xarchiver" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="https://wiki.lxde.org/en/Xarchiver" WGET_URL="$SF_MIRROR/xarchiver/$VERSION/$TARBALL" -# binutils for ar; busybox also contains gzip & cpio; rar is get-rar; -# gtar is absent -SUGGESTED="arj bzip2 binutils gzip lzma xz lzop lha rar cpio zip p7zip-full" -DEPENDS="gtk+" -BUILD_DEPENDS="gtk+-dev" -GENERIC_PIXMAPS="no" -GENERIC_MENUS="no" +BUILD_DEPENDS="gtk+-dev intltool" -# Rules to configure and make the package. -compile_rules() -{ - patch -p0 < $stuff/xarchiver-0.5.3-icons.diff - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - $CONFIGURE_ARGS && - make && make DESTDIR=$DESTDIR install +compile_rules() { + ./configure $CONFIGURE_ARGS && make && make install + + mkdir -p $install/var/www/cgi-bin $install/usr/share/doc/xarchiver/html + cp $stuff/xarchiver.cgi $install/var/www/cgi-bin + cp $stuff/index.html $install/usr/share/doc/xarchiver/html + + sed -i 's|multipart/x-zip;||; /Exec/s/.*/& %f/' \ + $install/usr/share/applications/xarchiver.desktop } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr - cp -a $install/usr/share/applications $fs/usr/share - cp -a $install/usr/share/icons $fs/usr/share - rm -rf $fs/usr/share/icons/hicolor/scalable - - sed -i '/Encoding/d; /Version/d; /Name\[.*\]=Xarchiver/d; /GenericName/d; s|multipart/x-zip;||; /Exec/s/.*/& %f/' \ - $fs/usr/share/applications/xarchiver.desktop - - mkdir -p $fs/var/www/cgi-bin $fs/usr/share/doc/xarchiver/html - cp -a $stuff/xarchiver.cgi $fs/var/www/cgi-bin - cp -a $stuff/index.html $fs/usr/share/doc/xarchiver/html +genpkg_rules() { + copy @std + rm -r $fs/usr/share/icons; cook_copy_icons + DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango" + # binutils for ar; busybox also contains gzip & cpio; rar is get-rar; + # gtar is absent + SUGGESTED="arj binutils bzip2 cpio gzip lha lzma lzop p7zip-full rar xz zip" } diff -r 533d88c4b302 -r bd4c82b1d1de xarchiver/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xarchiver/stuff/patches/series Thu Oct 12 04:21:44 2017 +0300 @@ -0,0 +1,1 @@ +xarchiver-0.5.3-icons.patch diff -r 533d88c4b302 -r bd4c82b1d1de xarchiver/stuff/patches/xarchiver-0.5.3-icons.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xarchiver/stuff/patches/xarchiver-0.5.3-icons.patch Thu Oct 12 04:21:44 2017 +0300 @@ -0,0 +1,136 @@ +--- a/src/add_dialog.c ++++ b/src/add_dialog.c +@@ -180,7 +180,7 @@ + GTK_WIDGET_SET_FLAGS (add_dialog->cancel_button, GTK_CAN_DEFAULT); + + add_dialog->add_button = gtk_button_new(); +- add_dialog->add_image = xa_main_window_find_image("xarchiver-add.png", GTK_ICON_SIZE_SMALL_TOOLBAR); ++ add_dialog->add_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); + add_dialog->add_hbox = gtk_hbox_new(FALSE, 4); + add_dialog->add_label = gtk_label_new_with_mnemonic(_("_Add")); + +--- a/src/extract_dialog.c ++++ b/src/extract_dialog.c +@@ -167,7 +167,7 @@ + GTK_WIDGET_SET_FLAGS (cancel_button,GTK_CAN_DEFAULT); + + extract_button = gtk_button_new(); +- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); ++ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); + extract_hbox = gtk_hbox_new(FALSE,4); + extract_label = gtk_label_new_with_mnemonic(_("_Extract")); + +@@ -503,7 +503,7 @@ + GTK_WIDGET_SET_FLAGS (cancelbutton1,GTK_CAN_DEFAULT); + + extract_button = gtk_button_new(); +- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); ++ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); + extract_hbox = gtk_hbox_new(FALSE,4); + extract_label = gtk_label_new_with_mnemonic(_("_Extract")); + +--- a/src/interface.c ++++ b/src/interface.c +@@ -110,7 +110,7 @@ + listing_html = gtk_image_menu_item_new_with_mnemonic (_("HTML file")); + gtk_widget_show (listing_html); + gtk_container_add (GTK_CONTAINER (listing_submenu),listing_html); +- tmp_image = xa_main_window_find_image ("xarchiver-html.png",GTK_ICON_SIZE_MENU); ++ tmp_image = gtk_image_new_from_icon_name ("browser",GTK_ICON_SIZE_MENU); + gtk_widget_show (tmp_image); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (listing_html),tmp_image); + +@@ -171,7 +171,7 @@ + gtk_container_add (GTK_CONTAINER (menuitem2_menu),addfile); + gtk_widget_add_accelerator (addfile,"activate",accel_group,GDK_d,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + +- image2 = xa_main_window_find_image ("xarchiver-add.png",GTK_ICON_SIZE_MENU); ++ image2 = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_MENU); + gtk_widget_show (image2); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (addfile),image2); + +@@ -181,7 +181,7 @@ + gtk_container_add (GTK_CONTAINER (menuitem2_menu),extract_menu); + gtk_widget_add_accelerator (extract_menu,"activate",accel_group,GDK_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); + +- image2 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); ++ image2 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); + gtk_widget_show (image2); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract_menu),image2); + +@@ -387,7 +387,7 @@ + gtk_widget_show (separatortoolitem3); + gtk_container_add (GTK_CONTAINER (toolbar1),separatortoolitem3); + +- tmp_image = xa_main_window_find_image("xarchiver-add.png",GTK_ICON_SIZE_LARGE_TOOLBAR); ++ tmp_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_widget_show (tmp_image); + AddFile_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Add")); + gtk_widget_set_sensitive (AddFile_button,FALSE); +@@ -396,7 +396,7 @@ + gtk_container_add (GTK_CONTAINER (toolbar1),AddFile_button); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (AddFile_button),tooltips,_("Add files"),NULL); + +- tmp_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_LARGE_TOOLBAR); ++ tmp_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_widget_show (tmp_image); + Extract_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Extract")); + gtk_widget_set_sensitive (Extract_button,FALSE); +@@ -863,7 +863,7 @@ + gtk_widget_show (extract); + gtk_container_add (GTK_CONTAINER (xa_popup_menu),extract); + +- image9 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); ++ image9 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); + gtk_widget_show (image9); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract),image9); + +@@ -1527,7 +1527,7 @@ + hbox1 = gtk_hbox_new (FALSE,12); + gtk_box_pack_start (GTK_BOX (vbox1),hbox1,TRUE,TRUE,0); + +- pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); ++ pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); + icon_pixbuf = gtk_image_new_from_pixbuf(pixbuf); + g_object_unref(pixbuf); + +--- a/src/mime.c ++++ b/src/mime.c +@@ -41,9 +41,9 @@ + else if (strcmp(mime,"audio/mpeg") == 0 || strcmp(mime,"audio/midi") == 0 || strcmp (mime,"audio/mp2") == 0) + icon_name = "sound"; + else if (strcmp(mime,"application/vnd.ms-excel") == 0 || strcmp(mime,"application/vnd.oasis.opendocument.spreadsheet") == 0) +- icon_name = "gnome-mime-application-vnd.ms-excel"; ++ icon_name = "application-vnd.ms-excel"; + else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0) +- icon_name = "gnome-mime-application-vnd.ms-powerpoint"; ++ icon_name = "application-vnd.ms-powerpoint"; + else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0 + || strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0 + || strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0 +@@ -57,11 +57,11 @@ + else if (strcmp(mime,"application/x-cd-image") == 0) + icon_name = "application-x-cd-image"; + else if (strcmp(mime,"application/x-php") == 0) +- icon_name = "gnome-mime-application-x-php"; ++ icon_name = "application-x-php"; + else if (strcmp(mime,"application/x-perl") == 0 || strcmp (mime,"application/x-csh") == 0 || strcmp (mime,"application/x-shellscript") == 0) +- icon_name = "gnome-mime-application-x-perl"; ++ icon_name = "text-x-script"; + else if (strcmp(mime,"application/x-font-ttf") == 0) +- icon_name = "gnome-mime-application-x-font-ttf"; ++ icon_name = "font"; + return icon_name; + } + +--- a/src/pref_dialog.c ++++ b/src/pref_dialog.c +@@ -57,7 +57,7 @@ + + prefs_data->prefs_liststore = gtk_list_store_new (3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_UINT); + gtk_list_store_append (prefs_data->prefs_liststore,&iter); +- icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); ++ icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); + gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Archive"),2,0,-1); + if(icon_pixbuf != NULL) + g_object_unref (icon_pixbuf); diff -r 533d88c4b302 -r bd4c82b1d1de xarchiver/stuff/xarchiver-0.5.3-icons.diff --- a/xarchiver/stuff/xarchiver-0.5.3-icons.diff Wed Oct 11 22:07:42 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,136 +0,0 @@ ---- src/add_dialog.c.orig -+++ src/add_dialog.c -@@ -180,7 +180,7 @@ - GTK_WIDGET_SET_FLAGS (add_dialog->cancel_button, GTK_CAN_DEFAULT); - - add_dialog->add_button = gtk_button_new(); -- add_dialog->add_image = xa_main_window_find_image("xarchiver-add.png", GTK_ICON_SIZE_SMALL_TOOLBAR); -+ add_dialog->add_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); - add_dialog->add_hbox = gtk_hbox_new(FALSE, 4); - add_dialog->add_label = gtk_label_new_with_mnemonic(_("_Add")); - ---- src/extract_dialog.c.orig -+++ src/extract_dialog.c -@@ -167,7 +167,7 @@ - GTK_WIDGET_SET_FLAGS (cancel_button,GTK_CAN_DEFAULT); - - extract_button = gtk_button_new(); -- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); -+ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); - extract_hbox = gtk_hbox_new(FALSE,4); - extract_label = gtk_label_new_with_mnemonic(_("_Extract")); - -@@ -503,7 +503,7 @@ - GTK_WIDGET_SET_FLAGS (cancelbutton1,GTK_CAN_DEFAULT); - - extract_button = gtk_button_new(); -- extract_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_SMALL_TOOLBAR); -+ extract_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_SMALL_TOOLBAR); - extract_hbox = gtk_hbox_new(FALSE,4); - extract_label = gtk_label_new_with_mnemonic(_("_Extract")); - ---- src/interface.c.orig -+++ src/interface.c -@@ -110,7 +110,7 @@ - listing_html = gtk_image_menu_item_new_with_mnemonic (_("HTML file")); - gtk_widget_show (listing_html); - gtk_container_add (GTK_CONTAINER (listing_submenu),listing_html); -- tmp_image = xa_main_window_find_image ("xarchiver-html.png",GTK_ICON_SIZE_MENU); -+ tmp_image = gtk_image_new_from_icon_name ("browser",GTK_ICON_SIZE_MENU); - gtk_widget_show (tmp_image); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (listing_html),tmp_image); - -@@ -171,7 +171,7 @@ - gtk_container_add (GTK_CONTAINER (menuitem2_menu),addfile); - gtk_widget_add_accelerator (addfile,"activate",accel_group,GDK_d,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); - -- image2 = xa_main_window_find_image ("xarchiver-add.png",GTK_ICON_SIZE_MENU); -+ image2 = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_MENU); - gtk_widget_show (image2); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (addfile),image2); - -@@ -181,7 +181,7 @@ - gtk_container_add (GTK_CONTAINER (menuitem2_menu),extract_menu); - gtk_widget_add_accelerator (extract_menu,"activate",accel_group,GDK_e,GDK_CONTROL_MASK,GTK_ACCEL_VISIBLE); - -- image2 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); -+ image2 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); - gtk_widget_show (image2); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract_menu),image2); - -@@ -387,7 +387,7 @@ - gtk_widget_show (separatortoolitem3); - gtk_container_add (GTK_CONTAINER (toolbar1),separatortoolitem3); - -- tmp_image = xa_main_window_find_image("xarchiver-add.png",GTK_ICON_SIZE_LARGE_TOOLBAR); -+ tmp_image = gtk_image_new_from_icon_name ("add-files-to-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_widget_show (tmp_image); - AddFile_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Add")); - gtk_widget_set_sensitive (AddFile_button,FALSE); -@@ -396,7 +396,7 @@ - gtk_container_add (GTK_CONTAINER (toolbar1),AddFile_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (AddFile_button),tooltips,_("Add files"),NULL); - -- tmp_image = xa_main_window_find_image("xarchiver-extract.png",GTK_ICON_SIZE_LARGE_TOOLBAR); -+ tmp_image = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_widget_show (tmp_image); - Extract_button = (GtkWidget*) gtk_tool_button_new (tmp_image,_("Extract")); - gtk_widget_set_sensitive (Extract_button,FALSE); -@@ -863,7 +863,7 @@ - gtk_widget_show (extract); - gtk_container_add (GTK_CONTAINER (xa_popup_menu),extract); - -- image9 = xa_main_window_find_image ("xarchiver-extract.png",GTK_ICON_SIZE_MENU); -+ image9 = gtk_image_new_from_icon_name ("extract-archive",GTK_ICON_SIZE_MENU); - gtk_widget_show (image9); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract),image9); - -@@ -1527,7 +1527,7 @@ - hbox1 = gtk_hbox_new (FALSE,12); - gtk_box_pack_start (GTK_BOX (vbox1),hbox1,TRUE,TRUE,0); - -- pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); -+ pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); - icon_pixbuf = gtk_image_new_from_pixbuf(pixbuf); - g_object_unref(pixbuf); - ---- src/mime.c.orig -+++ src/mime.c -@@ -41,9 +41,9 @@ - else if (strcmp(mime,"audio/mpeg") == 0 || strcmp(mime,"audio/midi") == 0 || strcmp (mime,"audio/mp2") == 0) - icon_name = "sound"; - else if (strcmp(mime,"application/vnd.ms-excel") == 0 || strcmp(mime,"application/vnd.oasis.opendocument.spreadsheet") == 0) -- icon_name = "gnome-mime-application-vnd.ms-excel"; -+ icon_name = "application-vnd.ms-excel"; - else if (strcmp(mime,"application/vnd.ms-powerpoint") == 0 || strcmp (mime,"application/vnd.oasis.opendocument.presentation") == 0) -- icon_name = "gnome-mime-application-vnd.ms-powerpoint"; -+ icon_name = "application-vnd.ms-powerpoint"; - else if (strcmp(mime,"application/zip") == 0 || strcmp(mime,"application/x-rar") == 0 || strcmp(mime,"application/x-tar") == 0 - || strcmp(mime,"application/x-7z-compressed") == 0 || strcmp(mime,"application/x-bzip-compressed-tar") == 0 - || strcmp (mime,"application/x-compressed-tar") == 0 || strcmp (mime,"application/x-lha") == 0 -@@ -57,11 +57,11 @@ - else if (strcmp(mime,"application/x-cd-image") == 0) - icon_name = "application-x-cd-image"; - else if (strcmp(mime,"application/x-php") == 0) -- icon_name = "gnome-mime-application-x-php"; -+ icon_name = "application-x-php"; - else if (strcmp(mime,"application/x-perl") == 0 || strcmp (mime,"application/x-csh") == 0 || strcmp (mime,"application/x-shellscript") == 0) -- icon_name = "gnome-mime-application-x-perl"; -+ icon_name = "text-x-script"; - else if (strcmp(mime,"application/x-font-ttf") == 0) -- icon_name = "gnome-mime-application-x-font-ttf"; -+ icon_name = "font"; - return icon_name; - } - ---- src/pref_dialog.c.orig -+++ src/pref_dialog.c -@@ -57,7 +57,7 @@ - - prefs_data->prefs_liststore = gtk_list_store_new (3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_UINT); - gtk_list_store_append (prefs_data->prefs_liststore,&iter); -- icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"gnome-mime-application-zip",40,0,NULL); -+ icon_pixbuf = gtk_icon_theme_load_icon(icon_theme,"application-zip",40,0,NULL); - gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Archive"),2,0,-1); - if(icon_pixbuf != NULL) - g_object_unref (icon_pixbuf);