File xarchiver-0.5.3-honor-docdir.patch of Package xarchiver

Overview Repositories Revisions Requests Users Attributes Meta

File xarchiver-0.5.3-honor-docdir.patch of Package xarchiver (Revision 309012e67bc9163aa98bc3e575325be2)

Currently displaying revision 309012e67bc9163aa98bc3e575325be2 , Show latest

--- xarchiver-0.5.3/doc/Makefile.am	2008-11-03 07:49:50.000000000 +0100
+++ xarchiver-0.5.3-new/doc/Makefile.am	2014-08-03 00:57:06.399956008 +0200
@@ -1,4 +1,4 @@
-DOCDIR = $(DESTDIR)$(datadir)/doc/@PACKAGE@
+DOCDIR = $(DESTDIR)$(docdir)
 HTML_FILES = \
 	html/ch01.html \
 	html/ch01s02.html \
@@ -67,10 +67,3 @@
 	    $(INSTALL_DATA) $(srcdir)/$$file $(DOCDIR)/html/images/$$basefile; \
 	  fi \
 	done
-	$(INSTALL_DATA) $(top_srcdir)/README $(DOCDIR)
-	$(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DOCDIR)
-	$(INSTALL_DATA) $(top_srcdir)/NEWS $(DOCDIR)
-	$(INSTALL_DATA) $(top_srcdir)/COPYING $(DOCDIR)
-	$(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DOCDIR)
-	$(INSTALL_DATA) $(top_srcdir)/TODO $(DOCDIR)
-
--- xarchiver-0.5.3/src/window.c	2014-02-09 16:49:07.000000000 +0100
+++ xarchiver-0.5.3-new/src/window.c	2014-08-03 00:57:49.173369265 +0200
@@ -52,13 +52,13 @@
 		{
 			if (xa_main_window == NULL)
 				goto error;
-			if ((WEXITSTATUS (status) == 1 && archive->type == XARCHIVETYPE_ZIP) || 
+			if ((WEXITSTATUS (status) == 1 && archive->type == XARCHIVETYPE_ZIP) ||
 				(WEXITSTATUS (status) == 6 && archive->type == XARCHIVETYPE_ARJ) ||
 				(WEXITSTATUS (status) == 1 && is_tar_compressed(archive->type)))
 				goto there;
 			if ( ! gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->store_output)))
 			{
-				response = xa_show_message_dialog(GTK_WINDOW(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("An error occurred!"),_("Please check the 'Store archiver output' option to see it."));	
+				response = xa_show_message_dialog(GTK_WINDOW(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("An error occurred!"),_("Please check the 'Store archiver output' option to see it."));
 				return;
 			}
 			if (xa_main_window)
@@ -134,7 +134,7 @@
 	GtkTextBuffer *textbuffer;
 	GtkTextIter iter;
 	gint current_page,idx = -1;
-	
+
 	if (_archive == NULL)
 	{
 		current_page = gtk_notebook_get_current_page(notebook);
@@ -173,7 +173,7 @@
 
 	vbox = gtk_vbox_new (FALSE,6);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox),5);
-	
+
 	if (_archive->create_image)
 	{
 		_archive->create_image = FALSE;
@@ -317,7 +317,7 @@
 			response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,msg,("Archive format is not recognized!"));
 		else
 			response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,msg,g_strerror(errno));
-	
+
 		g_free (utf8_path);
 		g_free (msg);
 		g_free (path);
@@ -329,7 +329,7 @@
 	if (type == XARCHIVETYPE_RAR)
 		ext = "rar";
 	else if (type == XARCHIVETYPE_RAR5)
-		ext = "rar5";		
+		ext = "rar5";
 	else if (type == XARCHIVETYPE_7ZIP)
 		ext = "7z";
 	else if (type == XARCHIVETYPE_ARJ)
@@ -458,7 +458,7 @@
 		g_free (current_open_directory);
 
 	current_open_directory = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(save));
-	
+
 	if (response == GTK_RESPONSE_ACCEPT)
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(save));
 	gtk_widget_destroy (save);
@@ -532,7 +532,7 @@
 			g_fprintf(stream,_("<th>Files:</th>"));
 			g_fprintf(stream,_("<th>Compressed:</th>"));
 			g_fprintf(stream,"</th></tr>");
-			
+
 		}
 		xa_print_entry_in_file(archive[idx]->root_entry,idx,0,stream,bp);
 		if (bp)
@@ -637,7 +637,7 @@
 	idx = xa_find_archive_index (i);
 	if (idx > -1 && archive[idx]->child_pid)
 		return;
-	
+
 	g_list_free ( Suffix);
 	g_list_free ( Name);
 
@@ -657,10 +657,10 @@
 	xa_prefs_save_options (prefs_window,config_file);
 	gtk_widget_destroy(prefs_window->dialog1);
 	g_free(prefs_window);
-	
+
 	gtk_widget_destroy (extract_window->dialog1);
 	g_free(extract_window);
-	
+
 	gtk_widget_destroy (add_window->dialog1);
 	g_free(add_window);
 
@@ -704,7 +704,7 @@
 				if (archive[id]->type == XARCHIVETYPE_TAR || is_tar_compressed(archive[id]->type))
 					goto one_file;
 				else
-				{	
+				{
 					list = g_slist_prepend (list,xa_build_full_path_name_from_entry(entry,archive[id]));
 					xa_fill_list_with_recursed_entries(entry->child,&list);
 				}
@@ -1412,7 +1412,7 @@
     t = g_strdup_printf ( "%d",archive[idx]->nr_of_files);
     gtk_label_set_text(GTK_LABEL(number_of_files_data),t);
     g_free (t);
-    
+
     if (archive[idx]->has_passwd)
     	gtk_label_set_text(GTK_LABEL(encrypted_data),_("Yes"));
 	else
@@ -1647,7 +1647,7 @@
     GtkTreeIter       iter;
     GList            *row_list;
 	XEntry *entry;
-	
+
 	gtk_drag_source_set_icon_name (archive->treeview,"xarchiver");
     selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (archive->treeview));
 
@@ -1848,7 +1848,7 @@
 
 	current_page = gtk_notebook_get_current_page(notebook);
 	idx = xa_find_archive_index (current_page);
-	
+
 	gtk_tree_model_get (model,iter,archive[idx]->nc+1,&entry,-1);
 	if (entry->is_dir)
 		xa_fill_list_with_recursed_entries(entry->child,data);
@@ -1974,7 +1974,7 @@
 
 void xa_show_help (GtkMenuItem *menuitem,gpointer user_data)
 {
-	gchar *uri = g_strconcat ("file://",DATADIR,"/doc/",PACKAGE,"/html/index.html",NULL);
+	gchar *uri = g_strconcat ("file://",DOCDIR,"/html/index.html",NULL);
 	xa_activate_link (NULL,uri,NULL);
 	g_free (uri);
 }
@@ -2091,7 +2091,7 @@
 	result = xa_create_temp_directory(archive[idx]);
 	tmp = g_strconcat(archive[idx]->tmp,"/xa_tmp_file",NULL);
 	gtk_widget_destroy(comment_dialog);
-	
+
 	if (archive[idx]->comment == NULL)
 	{
 		archive[idx]->comment = g_string_new("");
@@ -2110,16 +2110,16 @@
 		case XARCHIVETYPE_ARJ:
 		command = g_strconcat ("arj c ",archive[idx]->escaped_path," -z",tmp,NULL);
 		break;
-			
+
 		case XARCHIVETYPE_RAR:
 		case XARCHIVETYPE_RAR5:
 		command = g_strconcat ("rar c ",archive[idx]->escaped_path," -z",tmp,NULL);
 		break;
-			
+
 		case XARCHIVETYPE_ZIP:
 		command = g_strconcat ("sh -c \"zip ",archive[idx]->escaped_path," -z <",tmp,"\"",NULL);
 		break;
-			
+
 		default:
 		command = NULL;
 		break;
@@ -2289,7 +2289,7 @@
 				gtk_widget_set_sensitive(view,TRUE);
 			}
 			gtk_widget_set_sensitive(rrename,TRUE);
-			
+
 		}
 		clipboard = gtk_clipboard_get(XA_CLIPBOARD);
 		clipboard_selection = gtk_clipboard_wait_for_contents(clipboard,XA_INFO_LIST);
@@ -2325,14 +2325,14 @@
 	XAClipboard *data = NULL;
 
 	data = g_new0(XAClipboard,1);
-	
+
 	return data;
 }
 
 void xa_clipboard_cut(GtkMenuItem* item,gpointer data)
 {
 	gint idx,current_page;
-	
+
 	current_page = gtk_notebook_get_current_page (notebook);
 	idx = xa_find_archive_index (current_page);
 
@@ -2390,7 +2390,7 @@
 	gboolean result = FALSE;
 	gboolean overwrite;
 	GtkTreeSelection *selection;
-	GtkTargetEntry targets[] = 
+	GtkTargetEntry targets[] =
 	{
 		{ "application/xarchiver-info-list",0,1 }
 	};
@@ -2682,7 +2682,7 @@
 	while (list_of_files);
 	xa_create_open_with_dialog(entry->filename,names->str,nr);
 	g_slist_foreach(list_of_files,(GFunc)g_free,NULL);
-	g_slist_free(list_of_files);	
+	g_slist_free(list_of_files);
 }
 
 void xa_view_from_popupmenu(GtkMenuItem *item,gpointer data)
--- xarchiver-0.5.3/src/Makefile.am	2008-09-23 08:39:50.000000000 +0200
+++ xarchiver-0.5.3-new/src/Makefile.am	2014-08-03 01:07:36.977306080 +0200
@@ -34,7 +34,8 @@
 	@GLIB_CFLAGS@ \
 	-DDATADIR=\"$(datadir)\" \
 	-DSRCDIR=\"$(top_srcdir)\" \
-	-DLOCALEDIR=\"$(localedir)\"
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DDOCDIR=\"$(docdir)\"
 
 xarchiver_LDADD = \
 	$(top_builddir)/src/xdgmime/libxdgmime.la \

Places

File xarchiver-0.5.3-honor-docdir.patch of Package xarchiver (Revision 309012e67bc9163aa98bc3e575325be2)

Places