nonamedotc pushed to thunar-volman (epel7). "- Fix missing icons (#650504)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 4 20:58:41 UTC 2015
>From b6a45a2731bd2de967b495a9796b5ef5c1631345 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sat, 6 Nov 2010 23:16:28 +0100
Subject: - Fix missing icons (#650504)
diff --git a/thunar-volman-0.3.80-icon-naming.patch b/thunar-volman-0.3.80-icon-naming.patch
new file mode 100644
index 0000000..3f31351
--- /dev/null
+++ b/thunar-volman-0.3.80-icon-naming.patch
@@ -0,0 +1,122 @@
+diff -dur thunar-volman-0.3.80.orig/icons/48x48/Makefile.am thunar-volman-0.3.80/icons/48x48/Makefile.am
+--- thunar-volman-0.3.80.orig/icons/48x48/Makefile.am 2008-08-21 13:23:29.000000000 +0200
++++ thunar-volman-0.3.80/icons/48x48/Makefile.am 2010-11-06 23:01:13.697843845 +0100
+@@ -3,8 +3,7 @@
+ iconsdir = $(datadir)/icons/hicolor/48x48/apps
+ icons_DATA = \
+ tvm-burn-cd.png \
+- tvm-dev-pocketpc.png \
+- tvm-dev-tablet.png
++ tvm-dev-pocketpc.png
+
+ EXTRA_DIST = \
+ $(icons_DATA)
+diff -dur thunar-volman-0.3.80.orig/icons/48x48/Makefile.in thunar-volman-0.3.80/icons/48x48/Makefile.in
+--- thunar-volman-0.3.80.orig/icons/48x48/Makefile.in 2008-09-14 00:10:59.000000000 +0200
++++ thunar-volman-0.3.80/icons/48x48/Makefile.in 2010-11-06 23:01:06.962842979 +0100
+@@ -235,8 +235,7 @@
+ iconsdir = $(datadir)/icons/hicolor/48x48/apps
+ icons_DATA = \
+ tvm-burn-cd.png \
+- tvm-dev-pocketpc.png \
+- tvm-dev-tablet.png
++ tvm-dev-pocketpc.png
+
+ EXTRA_DIST = \
+ $(icons_DATA)
+diff -dur thunar-volman-0.3.80.orig/thunar-volman/tvm-preferences-dialog.c thunar-volman-0.3.80/thunar-volman/tvm-preferences-dialog.c
+--- thunar-volman-0.3.80.orig/thunar-volman/tvm-preferences-dialog.c 2008-08-21 13:23:30.000000000 +0200
++++ thunar-volman-0.3.80/thunar-volman/tvm-preferences-dialog.c 2010-11-06 22:57:28.719812524 +0100
+@@ -162,7 +162,7 @@
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("gnome-dev-removable", GTK_ICON_SIZE_DIALOG);
++ image = gtk_image_new_from_icon_name ("media-optical", GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+@@ -264,7 +264,7 @@
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("gnome-dev-cdrom-audio", GTK_ICON_SIZE_DIALOG);
++ image = gtk_image_new_from_icon_name ("media-optical-cd-audio", GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+@@ -296,7 +296,7 @@
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("gnome-dev-cdrom", GTK_ICON_SIZE_DIALOG);
++ image = gtk_image_new_from_icon_name ("media-optical-dvd", GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+@@ -328,7 +328,7 @@
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("gnome-dev-ipod", GTK_ICON_SIZE_DIALOG);
++ image = gtk_image_new_from_icon_name ("multimedia-player", GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+@@ -412,7 +412,7 @@
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("palm-pilot", GTK_ICON_SIZE_DIALOG);
++ image = gtk_image_new_from_icon_name ("pda", GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+@@ -486,7 +486,7 @@
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("gnome-dev-printer", GTK_ICON_SIZE_DIALOG);
++ image = gtk_image_new_from_icon_name ("printer", GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+@@ -528,7 +528,7 @@
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("gnome-dev-keyboard", GTK_ICON_SIZE_DIALOG);
++ image = gtk_image_new_from_icon_name ("input-keyboard", GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+@@ -560,7 +560,7 @@
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("gnome-dev-mouse-optical", GTK_ICON_SIZE_DIALOG);
++ image = gtk_image_new_from_icon_name ("input-mouse", GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+@@ -592,7 +592,7 @@
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ gtk_widget_show (table);
+
+- image = gtk_image_new_from_icon_name ("tvm-dev-tablet", GTK_ICON_SIZE_DIALOG);
++ image = gtk_image_new_from_icon_name ("input-tablet", GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+ gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_show (image);
+diff -dur thunar-volman-0.3.80.orig/thunar-volman-settings.desktop.in.in thunar-volman-0.3.80/thunar-volman-settings.desktop.in.in
+--- thunar-volman-0.3.80.orig/thunar-volman-settings.desktop.in.in 2008-08-21 13:23:31.000000000 +0200
++++ thunar-volman-0.3.80/thunar-volman-settings.desktop.in.in 2010-11-06 22:59:15.297827891 +0100
+@@ -4,7 +4,7 @@
+ _Comment=Configure management of removable drives and media
+ _GenericName=Removable Drives and Media
+ Exec=@libexecdir@/thunar-volman-settings
+-Icon=gnome-dev-removable
++Icon=drive-removable-media
+ Terminal=false
+ StartupNotify=true
+ Type=Application
diff --git a/thunar-volman.spec b/thunar-volman.spec
index a8c7b3d..8809d3d 100644
--- a/thunar-volman.spec
+++ b/thunar-volman.spec
@@ -2,7 +2,7 @@
Name: thunar-volman
Version: 0.3.80
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Automatic management of removable drives and media for the Thunar file manager
Group: User Interface/Desktops
@@ -10,6 +10,8 @@ License: GPLv2+
URL: http://goodies.xfce.org/projects/thunar-plugins/%{name}
Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: thunar-volman-0.3.80-parole.patch
+# Sent upstream at http://bugzilla.xfce.org/show_bug.cgi?id=6786
+Patch1: thunar-volman-0.3.80-icon-naming.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: Thunar-devel >= 0.5.1
@@ -30,7 +32,9 @@ and import the new pictures from the camera into your photo collection.
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1 -b .parole
+%patch1 -p1 -b .icon-naming
+
%build
%configure
@@ -79,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Nov 06 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.80-5
+- Fix missing icons (#650504)
+
* Sun Oct 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.80-4
- Fix the parole patch (#639484)
- Update gtk-icon-cache scriptlets
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/thunar-volman.git/commit/?h=epel7&id=b6a45a2731bd2de967b495a9796b5ef5c1631345
More information about the scm-commits
mailing list