Gentoo Archives: gentoo-commits

From: "Samuli Suominen (drac)" <drac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/rawstudio/files: rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch rawstudio-0.6-desktop-entry.patch
Date: Sat, 03 May 2008 08:48:48
Message-Id: E1JsDQE-0003yc-0M@stork.gentoo.org
1 drac 08/05/03 08:48:46
2
3 Added:
4 rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch
5 Removed: rawstudio-0.6-desktop-entry.patch
6 Log:
7 Version bump wrt #220016. Patching .desktop file to respect latest specification. Fixing icondir from /usr/share/icons to /usr/share/pixmaps.
8 (Portage version: 2.1.5_rc6)
9
10 Revision Changes Path
11 1.1 media-gfx/rawstudio/files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/rawstudio/files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/rawstudio/files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch?rev=1.1&content-type=text/plain
15
16 Index: rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch
17 ===================================================================
18 diff -ur rawstudio-1.0.orig/pixmaps/Makefile.in rawstudio-1.0/pixmaps/Makefile.in
19 --- rawstudio-1.0.orig/pixmaps/Makefile.in 2008-04-19 02:30:28.000000000 +0300
20 +++ rawstudio-1.0/pixmaps/Makefile.in 2008-05-03 11:40:35.000000000 +0300
21 @@ -162,7 +162,7 @@
22 target_alias = @target_alias@
23 top_builddir = @top_builddir@
24 top_srcdir = @top_srcdir@
25 -icondir = $(datadir)/icons
26 +icondir = $(datadir)/pixmaps
27 icon_DATA = rawstudio.png
28 rawstudiodir = $(datadir)/pixmaps/rawstudio
29 rawstudio_DATA = overlay_deleted.png \
30 diff -ur rawstudio-1.0.orig/rawstudio.desktop rawstudio-1.0/rawstudio.desktop
31 --- rawstudio-1.0.orig/rawstudio.desktop 2008-04-19 02:14:50.000000000 +0300
32 +++ rawstudio-1.0/rawstudio.desktop 2008-05-03 11:37:43.000000000 +0300
33 @@ -1,7 +1,7 @@
34 [Desktop Entry]
35 Version=1.0
36 Type=Application
37 -Categories=Application;Graphics;Photography;GTK;
38 +Categories=Graphics;Photography;GTK;
39 Name=Rawstudio
40 Name[it]=Rawstudio
41 Name[pl]=Rawstudio
42 @@ -16,6 +16,6 @@
43 Comment[ru]=Свободная программа для проявки цифровых негативов
44 Exec=rawstudio %F
45 StartupNotify=true
46 -Icon=rawstudio.png
47 +Icon=rawstudio
48 MimeType=image/x-dcraw;
49
50 diff -ur rawstudio-1.0.orig/src/gtk-interface.c rawstudio-1.0/src/gtk-interface.c
51 --- rawstudio-1.0.orig/src/gtk-interface.c 2008-04-19 02:51:40.000000000 +0300
52 +++ rawstudio-1.0/src/gtk-interface.c 2008-05-03 11:41:11.000000000 +0300
53 @@ -985,7 +985,7 @@
54 GdkColor bgcolor = {0, 0, 0, 0 };
55 GString *window_title = g_string_new(_("Rawstudio"));
56
57 - gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png", NULL);
58 + gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE ".png", NULL);
59 rs->window = gui_window_make(rs);
60 gtk_widget_show(rs->window);
61
62 diff -ur rawstudio-1.0.orig/src/rawstudio.c rawstudio-1.0/src/rawstudio.c
63 --- rawstudio-1.0.orig/src/rawstudio.c 2008-04-19 02:14:49.000000000 +0300
64 +++ rawstudio-1.0/src/rawstudio.c 2008-05-03 11:40:55.000000000 +0300
65 @@ -929,7 +929,7 @@
66 check_install()
67 {
68 #define TEST_FILE_ACCESS(path) do { if (g_access(path, R_OK)!=0) g_debug("Cannot access %s\n", path);} while (0)
69 - TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png");
70 + TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE ".png");
71 TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority1.png");
72 TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority2.png");
73 TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority3.png");
74
75
76
77 --
78 gentoo-commits@l.g.o mailing list