diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-08 12:23:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-08 12:23:13 +0000 |
| commit | 28aa365d9e63a4d9afd6a209a18cdc0596eb4b5d (patch) | |
| tree | 6fbedce6df37ed68072166fd4f103d173ee223a0 /media-gfx/rawstudio/files | |
| parent | Mask X USE flag on FreeBSD due to missing keywords (diff) | |
| download | gentoo-2-28aa365d9e63a4d9afd6a209a18cdc0596eb4b5d.tar.gz gentoo-2-28aa365d9e63a4d9afd6a209a18cdc0596eb4b5d.tar.bz2 gentoo-2-28aa365d9e63a4d9afd6a209a18cdc0596eb4b5d.zip | |
amd64 stable wrt #297531
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/rawstudio/files')
| -rw-r--r-- | media-gfx/rawstudio/files/rawstudio-1.1-desktop-entry-and-pixmaps-directory.patch | 36 | ||||
| -rw-r--r-- | media-gfx/rawstudio/files/rawstudio-1.1.1-exiv2-0.18.patch | 22 |
2 files changed, 0 insertions, 58 deletions
diff --git a/media-gfx/rawstudio/files/rawstudio-1.1-desktop-entry-and-pixmaps-directory.patch b/media-gfx/rawstudio/files/rawstudio-1.1-desktop-entry-and-pixmaps-directory.patch deleted file mode 100644 index 9096b39ed368..000000000000 --- a/media-gfx/rawstudio/files/rawstudio-1.1-desktop-entry-and-pixmaps-directory.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru rawstudio-1.1.orig/pixmaps/Makefile.in rawstudio-1.1/pixmaps/Makefile.in ---- rawstudio-1.1.orig/pixmaps/Makefile.in 2008-09-21 13:53:24.000000000 +0200 -+++ rawstudio-1.1/pixmaps/Makefile.in 2008-09-21 13:53:46.000000000 +0200 -@@ -162,7 +162,7 @@ - target_alias = @target_alias@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --icondir = $(datadir)/icons -+icondir = $(datadir)/pixmaps - icon_DATA = rawstudio.png - rawstudiodir = $(datadir)/pixmaps/rawstudio - rawstudio_DATA = overlay_deleted.png \ -diff -ru rawstudio-1.1.orig/src/gtk-interface.c rawstudio-1.1/src/gtk-interface.c ---- rawstudio-1.1.orig/src/gtk-interface.c 2008-09-21 13:53:24.000000000 +0200 -+++ rawstudio-1.1/src/gtk-interface.c 2008-09-21 13:55:05.000000000 +0200 -@@ -904,7 +904,7 @@ - GdkColor bgcolor = {0, 0, 0, 0 }; - GString *window_title = g_string_new(_("Rawstudio")); - -- gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png", NULL); -+ gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE ".png", NULL); - rs->window = gui_window_make(rs); - gtk_widget_show(rs->window); - -diff -ru rawstudio-1.1.orig/src/rawstudio.c rawstudio-1.1/src/rawstudio.c ---- rawstudio-1.1.orig/src/rawstudio.c 2008-09-21 13:53:24.000000000 +0200 -+++ rawstudio-1.1/src/rawstudio.c 2008-09-21 13:56:07.000000000 +0200 -@@ -1005,7 +1005,7 @@ - check_install() - { - #define TEST_FILE_ACCESS(path) do { if (g_access(path, R_OK)!=0) g_debug("Cannot access %s\n", path);} while (0) -- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png"); -+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE ".png"); - TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority1.png"); - TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority2.png"); - TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/overlay_priority3.png"); diff --git a/media-gfx/rawstudio/files/rawstudio-1.1.1-exiv2-0.18.patch b/media-gfx/rawstudio/files/rawstudio-1.1.1-exiv2-0.18.patch deleted file mode 100644 index a063174691a1..000000000000 --- a/media-gfx/rawstudio/files/rawstudio-1.1.1-exiv2-0.18.patch +++ /dev/null @@ -1,22 +0,0 @@ -In Exiv2 v.0.18 the Nikon maker EXIF tag was renamed from NEFThumbnailSize to -RawImageCenter. This makes rawstudio crash when exporting RAW images. - -http://bugzilla.rawstudio.org/show_bug.cgi?id=258 - -diff -Naur rawstudio.orig/src/rs-exif.cc rawstudio/src/rs-exif.cc ---- rawstudio.orig/src/rs-exif.cc 2009-01-10 19:30:36.262484000 +0100 -+++ rawstudio/src/rs-exif.cc 2009-03-26 19:14:56.277628371 +0100 -@@ -58,7 +58,12 @@ - #if EXIV2_TEST_VERSION(0,13,0) - "Exif.Nikon3.Preview", - #endif -- "Exif.Nikon3.NEFThumbnailSize", -+ -+#if EXIV2_TEST_VERSION(0,18,0) -+ "Exif.Nikon3.RawImageCenter", -+#else -+ "Exif.Nikon3.NEFThumbnailSize", -+#endif - - #if EXIV2_TEST_VERSION(0,17,91) - "Exif.NikonPreview.JPEGInterchangeFormat", |