Commit d1f169bf authored by José Mª. Fernández's avatar José Mª. Fernández

File cleanup

parent 0f8bbdab
GNU gold linker says 'undefined reference to g_thread_init' and fails.
http://bugs.gentoo.org/424505
--- configure.in
+++ configure.in
@@ -83,7 +83,7 @@
fi
AC_SUBST(LIBTIFF)
-pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
+pkg_modules="gthread-2.0 gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
$(datadir)/icons/ is reserved for freedesktop.org specification compatible themes with index.theme file,
use $(datadir)/pixmaps/ instead
http://bugs.gentoo.org/389397
--- pixmaps/Makefile.am
+++ pixmaps/Makefile.am
@@ -1,6 +1,3 @@
-icondir = $(datadir)/icons
-icon_DATA = rawstudio.png
-
rawstudiodir = $(datadir)/pixmaps/rawstudio
rawstudio_DATA = overlay_deleted.png \
overlay_priority1.png \
@@ -18,7 +15,8 @@ rawstudio_DATA = overlay_deleted.png \
cursor-rotate.png \
tool-color-picker.png \
tool-crop.png \
- tool-rotate.png
+ tool-rotate.png \
+ rawstudio.png
-EXTRA_DIST = $(icon_DATA) $(rawstudio_DATA) artwork.license
+EXTRA_DIST = $(rawstudio_DATA) artwork.license
--- src/gtk-interface.c
+++ src/gtk-interface.c
@@ -1393,7 +1393,7 @@ gui_init(int argc, char **argv, RS_BLOB *rs)
GtkWidget *valuefield[3];
- gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
+ gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
rs->window = gui_window_make(rs);
gtk_widget_show(rs->window);
--- src/rs-store.c
+++ src/rs-store.c
@@ -1174,7 +1174,7 @@ rs_store_load_file(RSStore *store, gchar *fullname)
/* Global default icon */
if (!icon_default)
- icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
+ icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
/* Add file to store */
gdk_threads_enter();
--- librawstudio/rs-utils.c
+++ librawstudio/rs-utils.c
@@ -603,7 +603,7 @@ void
check_install(void)
{
#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 G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png");
TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority1.png");
TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority2.png");
TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority3.png");
--- rawstudio.desktop
+++ rawstudio.desktop
@@ -25,6 +25,5 @@
Comment[sv]=Läs, bearbeta och konvertera råbilder från digitalkameror
Exec=rawstudio %F
StartupNotify=true
-Icon=rawstudio
+Icon=/usr/share/pixmaps/rawstudio/rawstudio.png
MimeType=image/x-dcraw;
-
--- plugins/output-pngfile/output-pngfile.c
+++ plugins/output-pngfile/output-pngfile.c
@@ -23,6 +23,7 @@
#include <gettext.h>
#include "config.h"
#include <png.h>
+#include <zlib.h>
#define RS_TYPE_PNGFILE (rs_pngfile_type)
#define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
@@ -198,7 +199,7 @@
rs_icc_profile_get_data(profile, &data, &data_length);
// FIXME: Insert correct profile name
- png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length);
+ png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, (png_const_bytep)data, data_length);
if (pngfile->save16bit)
png_set_gAMA(png_ptr, info_ptr, 1.0);
}
--- plugins/load-gdk/exiv2-colorspace.cpp
+++ plugins/load-gdk/exiv2-colorspace.cpp
@@ -125,11 +125,11 @@
int compression_type;
/* Extract embedded ICC profile */
- if (info_ptr->valid & PNG_INFO_iCCP)
+ if (png_get_valid(png_ptr, info_ptr, TRUE) & PNG_INFO_iCCP)
{
png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
(png_charpp) &icc_profile_title, &compression_type,
- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
+ (png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size);
if (retval != 0)
{
RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
$(datadir)/icons/ is reserved for freedesktop.org specification compatible themes with index.theme file,
use $(datadir)/pixmaps/ instead
http://bugs.gentoo.org/389397
--- pixmaps/Makefile.am
+++ pixmaps/Makefile.am
@@ -1,6 +1,3 @@
-icondir = $(datadir)/icons
-icon_DATA = rawstudio.png
-
rawstudiodir = $(datadir)/pixmaps/rawstudio
rawstudio_DATA = overlay_deleted.png \
overlay_priority1.png \
@@ -18,7 +15,8 @@ rawstudio_DATA = overlay_deleted.png \
cursor-rotate.png \
tool-color-picker.png \
tool-crop.png \
- tool-rotate.png
+ tool-rotate.png \
+ rawstudio.png
-EXTRA_DIST = $(icon_DATA) $(rawstudio_DATA) artwork.license
+EXTRA_DIST = $(rawstudio_DATA) artwork.license
--- src/gtk-interface.c
+++ src/gtk-interface.c
@@ -1393,7 +1393,7 @@ gui_init(int argc, char **argv, RS_BLOB *rs)
GtkWidget *valuefield[3];
- gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
+ gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
rs->window = gui_window_make(rs);
gtk_widget_show(rs->window);
--- src/rs-store.c
+++ src/rs-store.c
@@ -1174,7 +1174,7 @@ rs_store_load_file(RSStore *store, gchar *fullname)
/* Global default icon */
if (!icon_default)
- icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
+ icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
/* Add file to store */
gdk_threads_enter();
--- librawstudio/rs-utils.c
+++ librawstudio/rs-utils.c
@@ -603,7 +603,7 @@ void
check_install(void)
{
#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 G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S PACKAGE ".png");
TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority1.png");
TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority2.png");
TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority3.png");
--- rawstudio.desktop
+++ rawstudio.desktop
@@ -25,6 +25,5 @@
Comment[sv]=Läs, bearbeta och konvertera råbilder från digitalkameror
Exec=rawstudio %F
StartupNotify=true
-Icon=rawstudio
+Icon=/usr/share/pixmaps/rawstudio/rawstudio.png
MimeType=image/x-dcraw;
-
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment