import ports/graphics/darktable, thanks ajacoutot@ for review+fixes.

darktable is a virtual lighttable and darkroom for photographers:
it manages your digital negatives in a database and lets you view
them through a zoomable lighttable. It also enables you to develop
raw images and enhance them. It tries to fill the gap between the
many excellent existing free raw converters and image management
tools (such as ufraw or f-spot).

All editing is fully non-destructive and only operates on cached
image buffers for display. The full image is only converted during
export. Raw files, high-dynamic range and standard image formats
such as jpeg are all supported. The core operates completely on
floating point values, so darktable can not only be used for
photography but also for scientifically acquired images or output
of renderers (high dynamic range).
This commit is contained in:
sthen 2010-09-17 21:37:18 +00:00
parent 507b9c2e53
commit cbdcad7738
51 changed files with 1984 additions and 0 deletions

View File

@ -0,0 +1,74 @@
# $OpenBSD: Makefile,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
COMMENT= virtual lighttable and darkroom for photographers
DISTNAME= darktable-0.6
SHARED_ONLY= Yes
CATEGORIES= graphics x11
HOMEPAGE= http://darktable.sourceforge.net/
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += Half Iex IlmImf IlmThread Imath ORBit-2 X11 Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += atk-1.0 c cairo crypto curl dbus-1 dbus-glib-1 eggdbus-1
WANTLIB += exif exiv2 expat fontconfig freetype gcrypt gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gnome-keyring gobject-2.0 gpg-error gphoto2 gphoto2_port
WANTLIB += gthread-2.0 gtk-x11-2.0 idn jpeg lcms ltdl m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs
WANTLIB += pthread sqlite3 ssl stdc++ tiff usb xcb-render-util xcb-render
WANTLIB += xcb xml2 z lensfun
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=darktable/}
MODULES= devel/gconf2 \
devel/gettext \
textproc/intltool
MODGCONF2_SCHEMAS_DIR= darktable
RUN_DEPENDS= ::devel/desktop-file-utils
LIB_DEPENDS= ::databases/sqlite3 \
::devel/libglade2 \
::graphics/exiv2 \
::graphics/lcms \
::graphics/libgphoto2 \
::graphics/lensfun \
::graphics/openexr \
::net/curl \
::x11/gnome/libgnome-keyring
SEPARATE_BUILD= simple
USE_X11= Yes
USE_LIBTOOL= Yes
# make works for most things, except intltool.m4's .schemas rule
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-gegl \
--disable-silent-rules \
--localedir=${TRUEPREFIX}/share/locale
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
LDFLAGS+= -L${LOCALBASE}/lib
# add trailing linefeeds
LF+= control/jobs/camera.h control/jobs/camera_jobs.c control/jobs/camera_jobs.h
LF+= control/jobs/control.h control/jobs/control_jobs.h control/jobs/develop.h
LF+= control/jobs/film.h control/jobs/image_jobs.c control/jobs/film_jobs.h
LF+= gui/iop_history.h control/jobs/develop_jobs.h
pre-patch:
.for i in ${LF}
echo >> ${WRKSRC}/src/$i
.endfor
.include <bsd.port.mk>

View File

@ -0,0 +1,5 @@
MD5 (darktable-0.6.tar.gz) = ZKDEuiAAYFE3ui5XQ07j/g==
RMD160 (darktable-0.6.tar.gz) = fo+89MxOedeCgEUL7CwFkC806Ac=
SHA1 (darktable-0.6.tar.gz) = 0GWGZq2JgLHG4YSbo6IXRgLxplQ=
SHA256 (darktable-0.6.tar.gz) = EHFXf1kKcjoA/K+3VuRaw5UMFN2dEAR/SUYFQBZW13o=
SIZE (darktable-0.6.tar.gz) = 1287269

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
--- configure.orig Thu Sep 16 21:49:49 2010
+++ configure Thu Sep 16 22:16:15 2010
@@ -16971,7 +16971,7 @@ fi
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.22
+ _pkg_min_version=0.21
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
@@ -18856,7 +18856,7 @@ if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}"
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llcms $LIBS"
+LIBS="-llcms -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
--- po/Makefile.in.in.orig Fri Sep 17 14:24:04 2010
+++ po/Makefile.in.in Fri Sep 17 14:24:06 2010
@@ -34,7 +34,7 @@ datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+itlocaledir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_LibRaw_src_libraw_cxx_cpp,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
--- src/LibRaw/src/libraw_cxx.cpp.orig Thu Sep 16 22:19:32 2010
+++ src/LibRaw/src/libraw_cxx.cpp Thu Sep 16 22:22:04 2010
@@ -23,6 +23,7 @@ it under the terms of the one of three licenses as you
#include <float.h>
#include <math.h>
#ifndef WIN32
+#include <sys/types.h>
#include <netinet/in.h>
#else
#include <winsock2.h>

View File

@ -0,0 +1,33 @@
$OpenBSD: patch-src_common_camera_control_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/common/camera_control.c.orig Fri Aug 27 17:46:31 2010
+++ src/common/camera_control.c Thu Sep 16 23:24:44 2010
@@ -173,7 +173,7 @@ void _camera_process_jobb(const dt_camctl_t *c,const d
const char *fname = _dispatch_request_image_filename(c,fp.name,cam);
if( !fname ) fname=fp.name;
- char *output = g_build_filename(output_path,fname,NULL);
+ char *output = g_build_filename(output_path,fname,(char *)NULL);
int handle = open( output, O_CREAT | O_WRONLY,0666);
gp_file_new_from_fd( &destination , handle );
@@ -474,7 +474,7 @@ void dt_camctl_import(const dt_camctl_t *c,const dt_ca
const char *fname = _dispatch_request_image_filename(c,filename,cam);
if(!fname) fname=filename;
- char *output = g_build_filename(output_path,fname,NULL);
+ char *output = g_build_filename(output_path,fname,(char *)NULL);
// Now we have filenames lets download file and notify listener of image download
CameraFile *destination;
@@ -792,7 +792,7 @@ void _camera_poll_events(const dt_camctl_t *c,const dt
const char *fname = _dispatch_request_image_filename(c,fp->name,cam);
if( !fname ) fname=fp->name;
- char *output = g_build_filename(output_path,fname,NULL);
+ char *output = g_build_filename(output_path,fname,(char *)NULL);
int handle = open( output, O_CREAT | O_WRONLY,0666);
gp_file_new_from_fd( &destination , handle );

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_common_image_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
hunk 1: missing sentinel in function call; pushed upstream
--- src/common/image.c.orig Thu Sep 16 23:45:50 2010
+++ src/common/image.c Thu Sep 16 23:50:00 2010
@@ -495,7 +495,7 @@ int dt_image_import(const int32_t film_id, const char
// select from images; if found => return
gchar *imgfname;
if(film_id > 1) imgfname = g_path_get_basename((const gchar*)filename);
- else imgfname = g_build_filename((const gchar*)filename, NULL);
+ else imgfname = g_build_filename((const gchar*)filename, (char *)NULL);
sqlite3_stmt *stmt;
rc = sqlite3_prepare_v2(darktable.db, "select id from images where film_id = ?1 and filename = ?2", -1, &stmt, NULL);
rc = sqlite3_bind_int (stmt, 1, film_id);
@@ -884,7 +884,7 @@ int dt_image_alloc(dt_image_t *img, dt_image_buffer_t
dt_mipmap_cache_t *cache = darktable.mipmap_cache;
// max memory: user supplied number of bytes, evenly distributed among mip levels.
// clamped between 50MB -- 4GB
-#if defined(__APPLE__) || defined(__MACH__)
+#if defined(__APPLE__) || defined(__MACH__) || defined(__OpenBSD__)
// apple's size_t sucks
size_t max_mem = (size_t)(MAX(52428800, dt_conf_get_int("cache_memory"))/(float)DT_IMAGE_FULL);
#else

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_common_variables_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/common/variables.c.orig Thu Sep 16 23:50:46 2010
+++ src/common/variables.c Thu Sep 16 23:50:52 2010
@@ -150,7 +150,7 @@ gboolean _variable_get_value(dt_variables_params_t *pa
gchar *pictures_folder=NULL;
if(g_get_user_special_dir(G_USER_DIRECTORY_PICTURES) == NULL)
- pictures_folder=g_build_path(G_DIR_SEPARATOR_S,homedir,"Pictures",NULL);
+ pictures_folder=g_build_path(G_DIR_SEPARATOR_S,homedir,"Pictures",(char *)NULL);
else
pictures_folder=g_strdup( g_get_user_special_dir(G_USER_DIRECTORY_PICTURES) );

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_control_control_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/control/control.c.orig Thu Sep 16 23:52:02 2010
+++ src/control/control.c Thu Sep 16 23:52:38 2010
@@ -887,7 +887,7 @@ void dt_ctl_switch_mode_to(dt_ctl_gui_mode_t mode)
dt_control_restore_gui_settings(mode);
GtkWidget *widget = glade_xml_get_widget (darktable.gui->main_window, "view_label");
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", buf, NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", buf, (char *)NULL);
snprintf(buf, 512, _("<span color=\"#7f7f7f\"><big><b>%s mode</b></big></span>"), dt_view_manager_name(darktable.view_manager));
gtk_label_set_label(GTK_LABEL(widget), buf);
dt_conf_set_int ("ui_last/view", mode);
@@ -1345,7 +1345,7 @@ void dt_control_update_recent_films()
gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_START);
gtk_label_set_max_width_chars (label, 30);
- g_object_set(G_OBJECT(widget), "tooltip-text", filename, NULL);
+ g_object_set(G_OBJECT(widget), "tooltip-text", filename, (char *)NULL);
gtk_widget_show(recent_used_film_vbox);
gtk_widget_show(widget);

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-src_control_jobs_camera_jobs_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/control/jobs/camera_jobs.c.orig Thu Sep 16 23:54:08 2010
+++ src/control/jobs/camera_jobs.c Thu Sep 16 23:54:27 2010
@@ -147,12 +147,12 @@ int32_t dt_camera_import_backup_job_run(dt_job_t *job)
{ // Got the mount point lets check for backup folder
gchar *backuppath=NULL;
gchar *rootpath=g_file_get_path(root);
- backuppath=g_build_path(G_DIR_SEPARATOR_S,rootpath,dt_conf_get_string("plugins/capture/backup/foldername"),NULL);
+ backuppath=g_build_path(G_DIR_SEPARATOR_S,rootpath,dt_conf_get_string("plugins/capture/backup/foldername"),(char *)NULL);
g_free(rootpath);
if( g_file_test(backuppath,G_FILE_TEST_EXISTS)==TRUE)
{ // Found a backup storage, lets copy file here..
- gchar *destinationfile=g_build_filename(G_DIR_SEPARATOR_S,backuppath,t->destinationfile,NULL);
+ gchar *destinationfile=g_build_filename(G_DIR_SEPARATOR_S,backuppath,t->destinationfile,(char *)NULL);
if( g_mkdir_with_parents(g_path_get_dirname(destinationfile),0755) >= 0 )
{
gchar *content;
@@ -234,7 +234,7 @@ const char *_camera_import_request_image_filename(cons
const gchar *file = dt_variables_get_result(t->vp);
// Start check if file exist if it does, increase sequence and check again til we know that file doesnt exists..
- gchar *fullfile=g_build_path(G_DIR_SEPARATOR_S,storage,file,NULL);
+ gchar *fullfile=g_build_path(G_DIR_SEPARATOR_S,storage,file,(char *)NULL);
if( g_file_test(fullfile, G_FILE_TEST_EXISTS) == TRUE )
{
do
@@ -242,7 +242,7 @@ const char *_camera_import_request_image_filename(cons
g_free(fullfile);
dt_variables_expand( t->vp, t->filename, TRUE );
file = dt_variables_get_result(t->vp);
- fullfile=g_build_path(G_DIR_SEPARATOR_S,storage,file,NULL);
+ fullfile=g_build_path(G_DIR_SEPARATOR_S,storage,file,(char *)NULL);
} while( g_file_test(fullfile, G_FILE_TEST_EXISTS) == TRUE);
}

View File

@ -0,0 +1,35 @@
$OpenBSD: patch-src_develop_imageop_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/develop/imageop.c.orig Fri Aug 27 17:46:31 2010
+++ src/develop/imageop.c Thu Sep 16 23:55:56 2010
@@ -314,7 +314,7 @@ void dt_iop_gui_off_callback(GtkToggleButton *togglebu
}
char tooltip[512];
snprintf(tooltip, 512, module->enabled ? _("%s is switched on") : _("%s is switched off"), module->name());
- gtk_object_set(GTK_OBJECT(togglebutton), "tooltip-text", tooltip, NULL);
+ gtk_object_set(GTK_OBJECT(togglebutton), "tooltip-text", tooltip, (char *)NULL);
}
static void dt_iop_gui_expander_callback(GObject *object, GParamSpec *param_spec, gpointer user_data)
@@ -409,7 +409,7 @@ GtkWidget *dt_iop_gui_get_expander(dt_iop_module_t *mo
GtkDarktableToggleButton *button = DTGTK_TOGGLEBUTTON(dtgtk_togglebutton_new(dtgtk_cairo_paint_switch,0));
char tooltip[512];
snprintf(tooltip, 512, module->enabled ? _("%s is switched on") : _("%s is switched off"), module->name());
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", tooltip, NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", tooltip, (char *)NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), module->enabled);
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(button), FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "toggled",
@@ -422,8 +422,8 @@ GtkWidget *dt_iop_gui_get_expander(dt_iop_module_t *mo
GtkDarktableButton *presetsbutton = DTGTK_BUTTON(dtgtk_button_new(dtgtk_cairo_paint_presets,0));
gtk_widget_set_size_request(GTK_WIDGET(presetsbutton),13,13);
gtk_widget_set_size_request(GTK_WIDGET(resetbutton),13,13);
- gtk_object_set(GTK_OBJECT(resetbutton), "tooltip-text", _("reset parameters"), NULL);
- gtk_object_set(GTK_OBJECT(presetsbutton), "tooltip-text", _("presets"), NULL);
+ gtk_object_set(GTK_OBJECT(resetbutton), "tooltip-text", _("reset parameters"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(presetsbutton), "tooltip-text", _("presets"), (char *)NULL);
gtk_box_pack_end (GTK_BOX(hbox), GTK_WIDGET(resetbutton), FALSE, FALSE, 0);
gtk_box_pack_end (GTK_BOX(hbox), GTK_WIDGET(presetsbutton), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(hbox), TRUE, TRUE, 0);

View File

@ -0,0 +1,81 @@
$OpenBSD: patch-src_gui_camera_import_dialog_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/gui/camera_import_dialog.c.orig Fri Aug 27 15:01:47 2010
+++ src/gui/camera_import_dialog.c Fri Sep 17 00:03:36 2010
@@ -151,7 +151,7 @@ static void
_update_example(_camera_import_dialog_t *dialog)
{
// create path/filename and execute a expand..
- gchar *path=g_build_path(G_DIR_SEPARATOR_S,dialog->settings.basedirectory->value,dialog->settings.subdirectory->value,"/",NULL);
+ gchar *path=g_build_path(G_DIR_SEPARATOR_S,dialog->settings.basedirectory->value,dialog->settings.subdirectory->value,"/",(char *)NULL);
dt_variables_expand( dialog->vp, path, FALSE);
gchar *ep=g_strdup(dt_variables_get_result(dialog->vp));
dt_variables_expand( dialog->vp, dialog->settings.namepattern->value, TRUE);
@@ -212,14 +212,14 @@ _camera_gconf_widget_t *_camera_import_gconf_widget(_c
gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(gcw->entry),TRUE,TRUE,0);
GtkWidget *button=dtgtk_button_new(dtgtk_cairo_paint_store,0);
- g_object_set(button,"tooltip-text",_("store value as default"),NULL);
+ g_object_set(button,"tooltip-text",_("store value as default"),(char *)NULL);
gtk_widget_set_size_request(button,13,13);
gtk_box_pack_start(GTK_BOX(hbox),button,FALSE,FALSE,0);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (_gcw_store_callback), gcw);
button=dtgtk_button_new(dtgtk_cairo_paint_reset,0);
- g_object_set(button,"tooltip-text",_("reset value to default"),NULL);
+ g_object_set(button,"tooltip-text",_("reset value to default"),(char *)NULL);
gtk_widget_set_size_request(button,13,13);
gtk_box_pack_start(GTK_BOX(hbox),button,FALSE,FALSE,0);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -276,11 +276,11 @@ void _camera_import_dialog_new(_camera_import_dialog_t
GtkTreeView *treeview=GTK_TREE_VIEW(gtk_bin_get_child(GTK_BIN(data->import.treeview)));
GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new( );
- GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes( _("thumbnail") , renderer,"pixbuf",0, NULL);
+ GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes( _("thumbnail") , renderer,"pixbuf",0, (char *)NULL);
gtk_tree_view_append_column( treeview , column);
renderer = gtk_cell_renderer_text_new( );
- column = gtk_tree_view_column_new_with_attributes( _("storage file"), renderer, "text", 1, NULL);
+ column = gtk_tree_view_column_new_with_attributes( _("storage file"), renderer, "text", 1, (char *)NULL);
gtk_tree_view_append_column( treeview , column);
gtk_tree_view_column_set_expand( column, TRUE);
@@ -305,13 +305,13 @@ void _camera_import_dialog_new(_camera_import_dialog_t
gtk_box_pack_start(GTK_BOX(data->settings.page),data->settings.general.delete_originals ,FALSE,FALSE,0);
if( dt_conf_get_bool("plugins/capture/camera/import/delete_originals") ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( data->settings.general.delete_originals ), TRUE);
- g_object_set(data->settings.general.delete_originals ,"tooltip-text",_("check this option if you want to delete images on camera after download to computer"),NULL);
+ g_object_set(data->settings.general.delete_originals ,"tooltip-text",_("check this option if you want to delete images on camera after download to computer"),(char *)NULL);
g_signal_connect (G_OBJECT(data->settings.general.delete_originals), "clicked",G_CALLBACK (_check_button_callback),data);
GtkWidget *hbox=gtk_hbox_new(FALSE,5);
data->settings.general.date_override=gtk_check_button_new_with_label(_("override today's date"));
gtk_box_pack_start(GTK_BOX(hbox),data->settings.general.date_override,FALSE,FALSE,0);
- g_object_set(data->settings.general.date_override,"tooltip-text",_("check this, if you want to override the timestamp used when expanding variables:\n$(YEAR), $(MONTH), $(DAY),\n$(HOUR), $(MINUTE), $(SECONDS)"),NULL);
+ g_object_set(data->settings.general.date_override,"tooltip-text",_("check this, if you want to override the timestamp used when expanding variables:\n$(YEAR), $(MONTH), $(DAY),\n$(HOUR), $(MINUTE), $(SECONDS)"),(char *)NULL);
data->settings.general.date_entry=gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox),data->settings.general.date_entry,TRUE,TRUE,0);
@@ -360,15 +360,15 @@ void _camera_import_dialog_new(_camera_import_dialog_t
data->settings.backup.enable=gtk_check_button_new_with_label(_("enable backup"));
gtk_box_pack_start(GTK_BOX(data->settings.page),data->settings.backup.enable,FALSE,FALSE,0);
- g_object_set(data->settings.backup.enable,"tooltip-text",_("check this option to enable automatic backup of imported images"),NULL);
+ g_object_set(data->settings.backup.enable,"tooltip-text",_("check this option to enable automatic backup of imported images"),(char *)NULL);
data->settings.backup.warn=gtk_check_button_new_with_label(_("warn if no backup destinations are present"));
gtk_box_pack_start(GTK_BOX(data->settings.page),data->settings.backup.warn,FALSE,FALSE,0);
- g_object_set(data->settings.backup.warn,"tooltip-text",_("check this option to get an interactive warning if no backupdestinations are present"),NULL);
+ g_object_set(data->settings.backup.warn,"tooltip-text",_("check this option to get an interactive warning if no backupdestinations are present"),(char *)NULL);
data->settings.backup.foldername=(_camera_import_gconf_widget(data,_("backup foldername"),"plugins/capture/camera/backup/foldername"))->widget;
gtk_box_pack_start(GTK_BOX(data->settings.page),data->settings.backup.foldername,FALSE,FALSE,0);
- g_object_set(data->settings.backup.foldername,"tooltip-text",_("this is the name of folder that indicates a backup destination,\nif such a folder is found in any mounter media it is used as a backup destination."),NULL);
+ g_object_set(data->settings.backup.foldername,"tooltip-text",_("this is the name of folder that indicates a backup destination,\nif such a folder is found in any mounter media it is used as a backup destination."),(char *)NULL);
if( dt_conf_get_bool("plugins/capture/backup/enable") ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( data->settings.backup.enable ), TRUE);
else

View File

@ -0,0 +1,51 @@
$OpenBSD: patch-src_gui_devices_c,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/gui/devices.c.orig Fri Aug 27 15:01:47 2010
+++ src/gui/devices.c Fri Sep 17 00:04:08 2010
@@ -82,7 +82,7 @@ static void import_callback(GtkButton *button,gpointer
if( params->result )
{
// Let's initialize a import job and put it on queue....
- gchar *path = g_build_path(G_DIR_SEPARATOR_S,params->basedirectory,params->subdirectory,NULL);
+ gchar *path = g_build_path(G_DIR_SEPARATOR_S,params->basedirectory,params->subdirectory,(char *)NULL);
dt_job_t j;
dt_camera_import_job_init(&j,params->jobcode,path,params->filenamepattern,params->result,params->camera);
dt_control_add_job(darktable.control, &j);
@@ -124,7 +124,7 @@ void dt_gui_devices_update()
// Add the rescan button
GtkButton *scan=GTK_BUTTON(gtk_button_new_with_label(_("scan for devices")));
- gtk_object_set(GTK_OBJECT(scan), "tooltip-text", _("scan for newly attached devices"), NULL);
+ gtk_object_set(GTK_OBJECT(scan), "tooltip-text", _("scan for newly attached devices"), (char *)NULL);
g_signal_connect (G_OBJECT(scan), "clicked",G_CALLBACK (scan_callback), NULL);
gtk_box_pack_start(GTK_BOX(widget),GTK_WIDGET(scan),TRUE,TRUE,0);
gtk_box_pack_start(GTK_BOX(widget),GTK_WIDGET(gtk_label_new("")),TRUE,TRUE,0);
@@ -147,12 +147,12 @@ void dt_gui_devices_update()
// Set summary if exists for tooltip
if( camera->summary.text !=NULL && strlen(camera->summary.text) >0 )
{
- gtk_object_set(GTK_OBJECT(label), "tooltip-text", camera->summary.text, NULL);
+ gtk_object_set(GTK_OBJECT(label), "tooltip-text", camera->summary.text, (char *)NULL);
}
else
{
sprintf(buffer,_("device \"%s\" connected on port \"%s\"."),camera->model,camera->port);
- gtk_object_set(GTK_OBJECT(label), "tooltip-text", buffer, NULL);
+ gtk_object_set(GTK_OBJECT(label), "tooltip-text", buffer, (char *)NULL);
}
// Add camera action buttons
@@ -178,9 +178,9 @@ void dt_gui_devices_update()
//gtk_widget_set_sensitive(expander,FALSE);
gtk_box_pack_start(GTK_BOX(widget),gtk_label_new(_("no supported devices found")),TRUE,TRUE,0);
- gtk_object_set(GTK_OBJECT(expander), "tooltip-text", _("no supported devices found"), NULL);
+ gtk_object_set(GTK_OBJECT(expander), "tooltip-text", _("no supported devices found"), (char *)NULL);
} else
- gtk_object_set(GTK_OBJECT(expander), "tooltip-text", "", NULL);
+ gtk_object_set(GTK_OBJECT(expander), "tooltip-text", "", (char *)NULL);
gtk_widget_show_all(widget);
}

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_gui_gtk_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/gui/gtk.c.orig Sat Aug 28 17:46:45 2010
+++ src/gui/gtk.c Fri Sep 17 00:04:38 2010
@@ -537,7 +537,7 @@ import_button_clicked (GtkWidget *widget, gpointer use
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, //GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ (char *)NULL);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(filechooser), TRUE);
@@ -575,7 +575,7 @@ import_single_button_clicked (GtkWidget *widget, gpoin
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ (char *)NULL);
char *cp, **extensions, ext[1024];
GtkFileFilter *filter;

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_gui_histogram_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/gui/histogram.c.orig Fri Aug 27 17:46:31 2010
+++ src/gui/histogram.c Fri Sep 17 00:05:07 2010
@@ -30,7 +30,7 @@ void dt_gui_histogram_init(dt_gui_histogram_t *n, GtkW
n->dragging = 0;
n->exposure = NULL;
gtk_object_set(GTK_OBJECT(widget), "tooltip-text",
- _("drag to change exposure,\ndoubleclick resets"), NULL);
+ _("drag to change exposure,\ndoubleclick resets"), (char *)NULL);
g_signal_connect (G_OBJECT (widget), "expose-event",
G_CALLBACK (dt_gui_histogram_expose), n);
g_signal_connect (G_OBJECT (widget), "button-press-event",
@@ -176,12 +176,12 @@ gboolean dt_gui_histogram_motion_notify(GtkWidget *wid
else if(pos < 0.2)
{
n->highlight = 1;
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", _("drag to change black point,\ndoubleclick resets"), NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", _("drag to change black point,\ndoubleclick resets"), (char *)NULL);
}
else
{
n->highlight = 2;
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", _("drag to change exposure,\ndoubleclick resets"), NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", _("drag to change exposure,\ndoubleclick resets"), (char *)NULL);
}
gtk_widget_queue_draw(widget);
}

View File

@ -0,0 +1,42 @@
$OpenBSD: patch-src_gui_iop_history_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/gui/iop_history.c.orig Fri Aug 27 15:01:47 2010
+++ src/gui/iop_history.c Fri Sep 17 00:05:37 2010
@@ -65,7 +65,7 @@ history_button_clicked (GtkWidget *widget, gpointer us
{
GtkToggleButton *b = GTK_TOGGLE_BUTTON( g_list_nth_data (children,i));
if(b != GTK_TOGGLE_BUTTON(widget))
- gtk_object_set(GTK_OBJECT(b), "active", FALSE, NULL);
+ gtk_object_set(GTK_OBJECT(b), "active", FALSE, (char *)NULL);
}
reset = 0;
@@ -83,7 +83,7 @@ dt_gui_iop_history_init ()
GtkWidget *hbody = glade_xml_get_widget (darktable.gui->main_window, "history_expander_body");
GtkWidget *hvbox = gtk_vbox_new (FALSE,0);
GtkWidget *hbutton = gtk_button_new_with_label (_("compress history stack"));
- g_object_set (G_OBJECT (hbutton), "tooltip-text", _("create a minimal history stack which produces the same image"),NULL);
+ g_object_set (G_OBJECT (hbutton), "tooltip-text", _("create a minimal history stack which produces the same image"), (char *)NULL);
gtk_box_pack_start (GTK_BOX (hbody),hvbox,FALSE,FALSE,0);
gtk_box_pack_start (GTK_BOX (hbody),hbutton,FALSE,FALSE,0);
g_signal_connect (G_OBJECT (hbutton), "clicked", G_CALLBACK (history_compress_clicked),(gpointer)0);
@@ -139,7 +139,7 @@ dt_gui_iop_history_add_item (long int num, const gchar
/* */
darktable.gui->reset = 1;
- gtk_object_set(GTK_OBJECT(widget), "active", TRUE, NULL);
+ gtk_object_set(GTK_OBJECT(widget), "active", TRUE, (char *)NULL);
darktable.gui->reset = 0;
return widget;
}
@@ -164,7 +164,7 @@ dt_gui_iop_history_pop_top()
gtk_widget_destroy (GTK_WIDGET (g_list_nth_data (gtk_container_get_children (GTK_CONTAINER (hvbox)), 0)) );
/* activate new top */
- gtk_object_set(GTK_OBJECT (g_list_nth_data (gtk_container_get_children (GTK_CONTAINER (hvbox)), 0)) , "active", TRUE, NULL);
+ gtk_object_set(GTK_OBJECT (g_list_nth_data (gtk_container_get_children (GTK_CONTAINER (hvbox)), 0)) , "active", TRUE, (char *)NULL);
}
void

View File

@ -0,0 +1,48 @@
$OpenBSD: patch-src_gui_metadata_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/gui/metadata.c.orig Fri Aug 27 15:01:47 2010
+++ src/gui/metadata.c Fri Sep 17 00:01:56 2010
@@ -42,27 +42,27 @@ void dt_gui_metadata_update()
dt_image_film_roll(img, lbl, ll);
gtk_label_set_text(GTK_LABEL(widget), lbl);
gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_MIDDLE);
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", lbl, NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", lbl, (char *)NULL);
widget = glade_xml_get_widget (darktable.gui->main_window, "metadata_label_filename");
snprintf(lbl, ll, "%s", img->filename);
gtk_label_set_text(GTK_LABEL(widget), lbl);
gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_MIDDLE);
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->filename, NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->filename, (char *)NULL);
widget = glade_xml_get_widget (darktable.gui->main_window, "metadata_label_model");
snprintf(lbl, ll, "%s", img->exif_model);
gtk_label_set_text(GTK_LABEL(widget), lbl);
gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_MIDDLE);
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->exif_model, NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->exif_model, (char *)NULL);
widget = glade_xml_get_widget (darktable.gui->main_window, "metadata_label_lens");
snprintf(lbl, ll, "%s", img->exif_lens);
gtk_label_set_text(GTK_LABEL(widget), lbl);
gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_MIDDLE);
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->exif_lens, NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->exif_lens, (char *)NULL);
widget = glade_xml_get_widget (darktable.gui->main_window, "metadata_label_maker");
snprintf(lbl, ll, "%s", img->exif_maker);
gtk_label_set_text(GTK_LABEL(widget), lbl);
gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_MIDDLE);
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->exif_maker, NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->exif_maker, (char *)NULL);
widget = glade_xml_get_widget (darktable.gui->main_window, "metadata_label_aperture");
snprintf(lbl, ll, "F/%.1f", img->exif_aperture);
gtk_label_set_text(GTK_LABEL(widget), lbl);
@@ -84,7 +84,7 @@ void dt_gui_metadata_update()
snprintf(lbl, ll, "%s", img->exif_datetime_taken);
gtk_label_set_text(GTK_LABEL(widget), lbl);
gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_MIDDLE);
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->exif_datetime_taken, NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", img->exif_datetime_taken, (char *)NULL);
widget = glade_xml_get_widget (darktable.gui->main_window, "metadata_label_width");
snprintf(lbl, ll, "%d", img->width);
gtk_label_set_text(GTK_LABEL(widget), lbl);

View File

@ -0,0 +1,107 @@
$OpenBSD: patch-src_gui_presets_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/gui/presets.c.orig Fri Aug 27 15:01:47 2010
+++ src/gui/presets.c Fri Sep 17 00:01:57 2010
@@ -201,16 +201,16 @@ edit_preset (const char *name_in, dt_iop_module_t *mod
g->name = GTK_ENTRY(gtk_entry_new());
gtk_entry_set_text(g->name, name);
gtk_box_pack_start(box, GTK_WIDGET(g->name), FALSE, FALSE, 0);
- gtk_object_set(GTK_OBJECT(g->name), "tooltip-text", _("name of the preset"), NULL);
+ gtk_object_set(GTK_OBJECT(g->name), "tooltip-text", _("name of the preset"), (char *)NULL);
g->description = GTK_ENTRY(gtk_entry_new());
gtk_box_pack_start(box, GTK_WIDGET(g->description), FALSE, FALSE, 0);
- gtk_object_set(GTK_OBJECT(g->description), "tooltip-text", _("description or further information"), NULL);
+ gtk_object_set(GTK_OBJECT(g->description), "tooltip-text", _("description or further information"), (char *)NULL);
g->autoapply = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("auto apply this preset to matching images")));
gtk_box_pack_start(box, GTK_WIDGET(g->autoapply), FALSE, FALSE, 0);
g->filter = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("only show this preset for matching images")));
- gtk_object_set(GTK_OBJECT(g->filter), "tooltip-text", _("be very careful with this option. this might be the last time you see your preset."), NULL);
+ gtk_object_set(GTK_OBJECT(g->filter), "tooltip-text", _("be very careful with this option. this might be the last time you see your preset."), (char *)NULL);
gtk_box_pack_start(box, GTK_WIDGET(g->filter), FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(g->autoapply), "toggled", G_CALLBACK(check_buttons_activated), g);
g_signal_connect(G_OBJECT(g->filter), "toggled", G_CALLBACK(check_buttons_activated), g);
@@ -225,21 +225,21 @@ edit_preset (const char *name_in, dt_iop_module_t *mod
// model, maker, lens
g->model = GTK_ENTRY(gtk_entry_new());
- gtk_object_set(GTK_OBJECT(g->model), "tooltip-text", _("string to match model (use % as wildcard)"), NULL);
+ gtk_object_set(GTK_OBJECT(g->model), "tooltip-text", _("string to match model (use % as wildcard)"), (char *)NULL);
label = gtk_label_new(_("model"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start(vbox2, label, FALSE, FALSE, 0);
gtk_box_pack_start(vbox3, GTK_WIDGET(g->model), FALSE, FALSE, 0);
gtk_box_pack_start(vbox4, gtk_label_new(""), FALSE, FALSE, 0);
g->maker = GTK_ENTRY(gtk_entry_new());
- gtk_object_set(GTK_OBJECT(g->maker), "tooltip-text", _("string to match maker (use % as wildcard)"), NULL);
+ gtk_object_set(GTK_OBJECT(g->maker), "tooltip-text", _("string to match maker (use % as wildcard)"), (char *)NULL);
label = gtk_label_new(_("maker"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start(vbox2, label, FALSE, FALSE, 0);
gtk_box_pack_start(vbox3, GTK_WIDGET(g->maker), FALSE, FALSE, 0);
gtk_box_pack_start(vbox4, gtk_label_new(""), FALSE, FALSE, 0);
g->lens = GTK_ENTRY(gtk_entry_new());
- gtk_object_set(GTK_OBJECT(g->lens), "tooltip-text", _("string to match lens (use % as wildcard)"), NULL);
+ gtk_object_set(GTK_OBJECT(g->lens), "tooltip-text", _("string to match lens (use % as wildcard)"), (char *)NULL);
label = gtk_label_new(_("lens"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start(vbox2, label, FALSE, FALSE, 0);
@@ -251,11 +251,11 @@ edit_preset (const char *name_in, dt_iop_module_t *mod
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start(vbox2, label, FALSE, FALSE, 0);
g->iso_min = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(0, 51200, 100));
- gtk_object_set(GTK_OBJECT(g->iso_min), "tooltip-text", _("minimum iso value"), NULL);
+ gtk_object_set(GTK_OBJECT(g->iso_min), "tooltip-text", _("minimum iso value"), (char *)NULL);
gtk_spin_button_set_digits(g->iso_min, 0);
gtk_box_pack_start(vbox3, GTK_WIDGET(g->iso_min), FALSE, FALSE, 0);
g->iso_max = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(0, 51200, 100));
- gtk_object_set(GTK_OBJECT(g->iso_max), "tooltip-text", _("maximum iso value"), NULL);
+ gtk_object_set(GTK_OBJECT(g->iso_max), "tooltip-text", _("maximum iso value"), (char *)NULL);
gtk_spin_button_set_digits(g->iso_max, 0);
gtk_box_pack_start(vbox4, GTK_WIDGET(g->iso_max), FALSE, FALSE, 0);
@@ -265,8 +265,8 @@ edit_preset (const char *name_in, dt_iop_module_t *mod
gtk_box_pack_start(vbox2, label, FALSE, FALSE, 0);
g->exposure_min = GTK_COMBO_BOX(gtk_combo_box_new_text());
g->exposure_max = GTK_COMBO_BOX(gtk_combo_box_new_text());
- gtk_object_set(GTK_OBJECT(g->exposure_min), "tooltip-text", _("minimum exposure time"), NULL);
- gtk_object_set(GTK_OBJECT(g->exposure_max), "tooltip-text", _("maximum exposure time"), NULL);
+ gtk_object_set(GTK_OBJECT(g->exposure_min), "tooltip-text", _("minimum exposure time"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->exposure_max), "tooltip-text", _("maximum exposure time"), (char *)NULL);
for(int k=0;k<dt_gui_presets_exposure_value_cnt;k++)
gtk_combo_box_append_text(g->exposure_min, dt_gui_presets_exposure_value_str[k]);
for(int k=0;k<dt_gui_presets_exposure_value_cnt;k++)
@@ -280,8 +280,8 @@ edit_preset (const char *name_in, dt_iop_module_t *mod
gtk_box_pack_start(vbox2, label, FALSE, FALSE, 0);
g->aperture_min = GTK_COMBO_BOX(gtk_combo_box_new_text());
g->aperture_max = GTK_COMBO_BOX(gtk_combo_box_new_text());
- gtk_object_set(GTK_OBJECT(g->aperture_min), "tooltip-text", _("minimum aperture value"), NULL);
- gtk_object_set(GTK_OBJECT(g->aperture_max), "tooltip-text", _("maximum aperture value"), NULL);
+ gtk_object_set(GTK_OBJECT(g->aperture_min), "tooltip-text", _("minimum aperture value"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->aperture_max), "tooltip-text", _("maximum aperture value"), (char *)NULL);
for(int k=0;k<dt_gui_presets_aperture_value_cnt;k++)
gtk_combo_box_append_text(g->aperture_min, dt_gui_presets_aperture_value_str[k]);
for(int k=0;k<dt_gui_presets_aperture_value_cnt;k++)
@@ -297,8 +297,8 @@ edit_preset (const char *name_in, dt_iop_module_t *mod
gtk_spin_button_set_digits(g->focal_length_min, 0);
gtk_box_pack_start(vbox3, GTK_WIDGET(g->focal_length_min), FALSE, FALSE, 0);
g->focal_length_max = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(0, 1000, 10));
- gtk_object_set(GTK_OBJECT(g->focal_length_min), "tooltip-text", _("minimum focal length"), NULL);
- gtk_object_set(GTK_OBJECT(g->focal_length_max), "tooltip-text", _("maximum focal length"), NULL);
+ gtk_object_set(GTK_OBJECT(g->focal_length_min), "tooltip-text", _("minimum focal length"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->focal_length_max), "tooltip-text", _("maximum focal length"), (char *)NULL);
gtk_spin_button_set_digits(g->focal_length_max, 0);
gtk_box_pack_start(vbox4, GTK_WIDGET(g->focal_length_max), FALSE, FALSE, 0);
@@ -508,7 +508,7 @@ dt_gui_presets_popup_menu_show_internal(dt_dev_operati
}
if(module) g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(menuitem_pick_preset), module);
else if(pick_callback) g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(pick_callback), callback_data);
- gtk_object_set(GTK_OBJECT(mi), "tooltip-text", sqlite3_column_text(stmt, 3), NULL);
+ gtk_object_set(GTK_OBJECT(mi), "tooltip-text", sqlite3_column_text(stmt, 3), (char *)NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
cnt ++;
}

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-src_imageio_storage_disk_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/imageio/storage/disk.c.orig Sat Aug 28 20:47:45 2010
+++ src/imageio/storage/disk.c Thu Sep 16 23:18:57 2010
@@ -65,7 +65,7 @@ button_clicked (GtkWidget *widget, dt_imageio_module_s
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ (char *)NULL);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(filechooser), FALSE);
gchar *old = g_strdup(gtk_entry_get_text(d->entry));
@@ -116,10 +116,10 @@ gui_init (dt_imageio_module_storage_t *self)
"$(PICTURES_FOLDER) - pictures folder\n"
"$(HOME_FOLDER) - home folder\n"
"$(DESKTOP_FOLDER) - desktop folder"
- ), NULL);
+ ), (char *)NULL);
widget = dtgtk_button_new(dtgtk_cairo_paint_directory, 0);
gtk_widget_set_size_request(widget, 18, 18);
- gtk_object_set(GTK_OBJECT(widget), "tooltip-text", _("select directory"), NULL);
+ gtk_object_set(GTK_OBJECT(widget), "tooltip-text", _("select directory"), (char *)NULL);
gtk_box_pack_start(GTK_BOX(self->widget), widget, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(button_clicked), self);
}

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_imageio_storage_email_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/imageio/storage/email.c.orig Thu Sep 16 23:23:12 2010
+++ src/imageio/storage/email.c Thu Sep 16 23:23:20 2010
@@ -94,7 +94,7 @@ store (dt_imageio_module_data_t *sdata, const int imgi
const gchar * filename = g_basename( dirname );
strcpy( g_strrstr( filename,".")+1, format->extension(fdata));
- attachment->file = g_build_filename( g_get_tmp_dir(), filename,NULL );
+ attachment->file = g_build_filename( g_get_tmp_dir(), filename,(char *)NULL );
dt_imageio_export(img, attachment->file, format, fdata);
dt_image_cache_release(img, 'r');

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_imageio_storage_picasa_c,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/imageio/storage/picasa.c.orig Thu Sep 16 23:23:45 2010
+++ src/imageio/storage/picasa.c Thu Sep 16 23:19:26 2010
@@ -698,13 +698,13 @@ gui_init (dt_imageio_module_storage_t *self)
while(it)
{
GtkCellRendererText *tr = GTK_CELL_RENDERER_TEXT(it->data);
- gtk_object_set(GTK_OBJECT(tr), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL);
+ gtk_object_set(GTK_OBJECT(tr), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, (char *)NULL);
it = g_list_next(it);
}
g_list_free(renderers);
ui->dtbutton1 = DTGTK_BUTTON( dtgtk_button_new(dtgtk_cairo_paint_refresh,0) );
- gtk_object_set(GTK_OBJECT(ui->dtbutton1), "tooltip-text", _("refresh album list"), NULL);
+ gtk_object_set(GTK_OBJECT(ui->dtbutton1), "tooltip-text", _("refresh album list"), (char *)NULL);
gtk_widget_set_sensitive( GTK_WIDGET(ui->comboBox1), FALSE);
gtk_combo_box_set_row_separator_func(ui->comboBox1,combobox_separator,ui->comboBox1,NULL);
gtk_box_pack_start(GTK_BOX(albumlist), GTK_WIDGET(ui->comboBox1), TRUE, TRUE, 0);

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_iop_bilateral_cc,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/bilateral.cc.orig Thu Sep 16 22:37:56 2010
+++ src/iop/bilateral.cc Thu Sep 16 22:38:04 2010
@@ -290,11 +290,11 @@ void gui_init(dt_iop_module_t *self)
g->scale3 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR, 0.0001, .1, 0.001, p->sigma[2], 4));
g->scale4 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR, 0.0001, .1, 0.001, p->sigma[3], 4));
g->scale5 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR, 0.0001, .1, 0.001, p->sigma[4], 4));
- gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("spatial extent of the gaussian"), NULL);
- // gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _(""), NULL);
- gtk_object_set(GTK_OBJECT(g->scale3), "tooltip-text", _("how much to blur red"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale4), "tooltip-text", _("how much to blur green"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale5), "tooltip-text", _("how much to blur blue"), NULL);
+ gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("spatial extent of the gaussian"), (char *)NULL);
+ // gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _(""), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale3), "tooltip-text", _("how much to blur red"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale4), "tooltip-text", _("how much to blur green"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale5), "tooltip-text", _("how much to blur blue"), (char *)NULL);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale1), TRUE, TRUE, 0);
// gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale2), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale3), TRUE, TRUE, 0);

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_iop_channelmixer_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/channelmixer.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/channelmixer.c Thu Sep 16 22:38:04 2010
@@ -388,7 +388,7 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(self->widget), GTK_WIDGET(hbox), TRUE, TRUE, 5);
- // gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the highlight threshold"), NULL);
+ // gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the highlight threshold"), (char *)NULL);
g_signal_connect (G_OBJECT (g->scale1), "value-changed",
G_CALLBACK (red_callback), self);

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_iop_clahe_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/clahe.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/clahe.c Thu Sep 16 22:38:04 2010
@@ -379,8 +379,8 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale1), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale2), TRUE, TRUE, 0);
- gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("size of features to preserve"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("strength of the effect"), NULL);
+ gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("size of features to preserve"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("strength of the effect"), (char *)NULL);
g_signal_connect (G_OBJECT (g->scale1), "value-changed",
G_CALLBACK (radius_callback), self);

View File

@ -0,0 +1,74 @@
$OpenBSD: patch-src_iop_clipping_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/clipping.c.orig Thu Sep 16 22:31:51 2010
+++ src/iop/clipping.c Thu Sep 16 22:38:04 2010
@@ -653,15 +653,15 @@ void gui_init(struct dt_iop_module_t *self)
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->vflip), 4, 6, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect (G_OBJECT (g->hflip), "toggled", G_CALLBACK(toggled_callback), self);
g_signal_connect (G_OBJECT (g->vflip), "toggled", G_CALLBACK(toggled_callback), self);
- gtk_object_set (GTK_OBJECT(g->hflip), "tooltip-text", _("flip image vertically"), NULL);
- gtk_object_set (GTK_OBJECT(g->vflip), "tooltip-text", _("flip image horizontally"), NULL);
+ gtk_object_set (GTK_OBJECT(g->hflip), "tooltip-text", _("flip image vertically"), (char *)NULL);
+ gtk_object_set (GTK_OBJECT(g->vflip), "tooltip-text", _("flip image horizontally"), (char *)NULL);
g->label5 = GTK_LABEL(gtk_label_new(_("angle")));
gtk_misc_set_alignment(GTK_MISC(g->label5), 0.0, 0.5);
g->scale5 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR, -180.0, 180.0, 0.25, p->angle, 2));
g_signal_connect (G_OBJECT (g->scale5), "value-changed",
G_CALLBACK (angle_callback), self);
- gtk_object_set (GTK_OBJECT(g->scale5), "tooltip-text", _("right-click and drag a line on the image to drag a straight line"), NULL);
+ gtk_object_set (GTK_OBJECT(g->scale5), "tooltip-text", _("right-click and drag a line on the image to drag a straight line"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->label5), 0, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->scale5), 2, 6, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -700,7 +700,7 @@ void gui_init(struct dt_iop_module_t *self)
gtk_combo_box_set_active(g->aspect_presets, act);
g_signal_connect (G_OBJECT (g->aspect_presets), "changed",
G_CALLBACK (aspect_presets_changed), self);
- gtk_object_set(GTK_OBJECT(g->aspect_presets), "tooltip-text", _("set the aspect ratio (w/h)\npress ctrl-x to swap sides"), NULL);
+ gtk_object_set(GTK_OBJECT(g->aspect_presets), "tooltip-text", _("set the aspect ratio (w/h)\npress ctrl-x to swap sides"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->aspect_presets), 2, 6, 4, 5, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -717,7 +717,7 @@ void gui_init(struct dt_iop_module_t *self)
gtk_combo_box_append_text(g->guide_lines, _("golden mean"));
gtk_combo_box_set_active(g->guide_lines, GUIDE_NONE);
gtk_object_set (GTK_OBJECT(g->guide_lines), "tooltip-text", _("with this option, you can display guide lines "
- "to help compose your photograph."), NULL);
+ "to help compose your photograph."), (char *)NULL);
g_signal_connect (G_OBJECT (g->guide_lines), "changed",
G_CALLBACK (guides_presets_changed), self);
label = gtk_label_new(_("type"));
@@ -733,24 +733,24 @@ void gui_init(struct dt_iop_module_t *self)
g->flipVerGoldenGuide = DTGTK_TOGGLEBUTTON(dtgtk_togglebutton_new(dtgtk_cairo_paint_flip,0));
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->flipHorGoldenGuide), 2, 4, 7, 8, GTK_EXPAND|GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->flipVerGoldenGuide), 4, 6, 7, 8, GTK_EXPAND|GTK_FILL, 0, 0, 0);
- gtk_object_set (GTK_OBJECT(g->flipHorGoldenGuide), "tooltip-text", _("flip guides vertically"), NULL);
- gtk_object_set (GTK_OBJECT(g->flipVerGoldenGuide), "tooltip-text", _("flip guides horizontally"), NULL);
+ gtk_object_set (GTK_OBJECT(g->flipHorGoldenGuide), "tooltip-text", _("flip guides vertically"), (char *)NULL);
+ gtk_object_set (GTK_OBJECT(g->flipVerGoldenGuide), "tooltip-text", _("flip guides horizontally"), (char *)NULL);
/*-------------------------------------------*/
g->goldenSectionBox = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("golden sections")));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->goldenSectionBox), TRUE);
- gtk_object_set (GTK_OBJECT(g->goldenSectionBox), "tooltip-text", _("enable this option to show golden sections."), NULL);
+ gtk_object_set (GTK_OBJECT(g->goldenSectionBox), "tooltip-text", _("enable this option to show golden sections."), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->goldenSectionBox), 0, 3, 8, 9, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g->goldenSpiralSectionBox = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("spiral sections")));
- gtk_object_set (GTK_OBJECT(g->goldenSpiralSectionBox), "tooltip-text", _("enable this option to show golden spiral sections."), NULL);
+ gtk_object_set (GTK_OBJECT(g->goldenSpiralSectionBox), "tooltip-text", _("enable this option to show golden spiral sections."), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->goldenSpiralSectionBox), 3, 6, 8, 9, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g->goldenSpiralBox = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("golden spiral")));
- gtk_object_set (GTK_OBJECT(g->goldenSpiralBox), "tooltip-text", _("enable this option to show a golden spiral guide."), NULL);
+ gtk_object_set (GTK_OBJECT(g->goldenSpiralBox), "tooltip-text", _("enable this option to show a golden spiral guide."), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->goldenSpiralBox), 0, 3, 9, 10, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g->goldenTriangleBox = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("golden triangles")));
- gtk_object_set (GTK_OBJECT(g->goldenTriangleBox), "tooltip-text", _("enable this option to show golden triangles."), NULL);
+ gtk_object_set (GTK_OBJECT(g->goldenTriangleBox), "tooltip-text", _("enable this option to show golden triangles."), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->goldenTriangleBox), 3, 6, 9, 10, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect (G_OBJECT (g->flipHorGoldenGuide), "toggled", G_CALLBACK (guides_button_changed), self);

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_iop_colorin_c,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/colorin.c.orig Thu Sep 16 22:30:38 2010
+++ src/iop/colorin.c Thu Sep 16 22:38:04 2010
@@ -474,9 +474,9 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->cbox2), TRUE, TRUE, 0);
char tooltip[1024];
- gtk_object_set(GTK_OBJECT(g->cbox1), "tooltip-text", _("rendering intent"), NULL);
+ gtk_object_set(GTK_OBJECT(g->cbox1), "tooltip-text", _("rendering intent"), (char *)NULL);
snprintf(tooltip, 1024, _("icc profiles in %s/color/in"), datadir);
- gtk_object_set(GTK_OBJECT(g->cbox2), "tooltip-text", tooltip, NULL);
+ gtk_object_set(GTK_OBJECT(g->cbox2), "tooltip-text", tooltip, (char *)NULL);
g_signal_connect (G_OBJECT (g->cbox1), "changed",
G_CALLBACK (intent_changed),

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_iop_colorout_c,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/colorout.c.orig Thu Sep 16 22:31:09 2010
+++ src/iop/colorout.c Thu Sep 16 22:38:04 2010
@@ -481,11 +481,11 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->cbox3), TRUE, TRUE, 0);
char tooltip[1024];
- gtk_object_set(GTK_OBJECT(g->cbox1), "tooltip-text", _("rendering intent"), NULL);
+ gtk_object_set(GTK_OBJECT(g->cbox1), "tooltip-text", _("rendering intent"), (char *)NULL);
snprintf(tooltip, 1024, _("icc profiles in %s/color/out"), datadir);
- gtk_object_set(GTK_OBJECT(g->cbox2), "tooltip-text", tooltip, NULL);
+ gtk_object_set(GTK_OBJECT(g->cbox2), "tooltip-text", tooltip, (char *)NULL);
snprintf(tooltip, 1024, _("display icc profiles in %s/color/out"), datadir);
- gtk_object_set(GTK_OBJECT(g->cbox3), "tooltip-text", tooltip, NULL);
+ gtk_object_set(GTK_OBJECT(g->cbox3), "tooltip-text", tooltip, (char *)NULL);
g_signal_connect (G_OBJECT (g->cbox1), "changed",
G_CALLBACK (intent_changed),

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_iop_colortransfer_c,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/colortransfer.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/colortransfer.c Thu Sep 16 22:38:04 2010
@@ -606,17 +606,17 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(self->widget), GTK_WIDGET(box), TRUE, TRUE, 0);
GtkWidget *button;
g->spinbutton = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(1, MAXN, 1));
- gtk_object_set(GTK_OBJECT(g->spinbutton), "tooltip-text", _("number of clusters to find in image"), NULL);
+ gtk_object_set(GTK_OBJECT(g->spinbutton), "tooltip-text", _("number of clusters to find in image"), (char *)NULL);
gtk_box_pack_start(box, GTK_WIDGET(g->spinbutton), FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(g->spinbutton), "value-changed", G_CALLBACK(spinbutton_changed), (gpointer)self);
button = gtk_button_new_with_label(_("acquire"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("analyze this image"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("analyze this image"), (char *)NULL);
gtk_box_pack_start(box, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(acquire_button_pressed), (gpointer)self);
g->apply_button = gtk_button_new_with_label(_("apply"));
- gtk_object_set(GTK_OBJECT(g->apply_button), "tooltip-text", _("apply previously analyzed image look to this image"), NULL);
+ gtk_object_set(GTK_OBJECT(g->apply_button), "tooltip-text", _("apply previously analyzed image look to this image"), (char *)NULL);
gtk_box_pack_start(box, g->apply_button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(g->apply_button), "clicked", G_CALLBACK(apply_button_pressed), (gpointer)self);
FILE *f = fopen("/tmp/dt_colortransfer_loaded", "rb");

View File

@ -0,0 +1,33 @@
$OpenBSD: patch-src_iop_exposure_c,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/exposure.c.orig Thu Sep 16 22:29:41 2010
+++ src/iop/exposure.c Thu Sep 16 22:38:04 2010
@@ -310,14 +310,14 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(g->vbox1), GTK_WIDGET(g->label2), TRUE, TRUE, 0);
// gtk_box_pack_start(GTK_BOX(g->vbox1), GTK_WIDGET(g->label3), TRUE, TRUE, 0);
g->scale1 = DTGTK_SLIDER(dtgtk_slider_new_with_range( DARKTABLE_SLIDER_VALUE, -.5, 1.0, .001,p->black,3));
- gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("adjust the black level"), NULL);
+ gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("adjust the black level"), (char *)NULL);
g->scale2 = DTGTK_SLIDER(dtgtk_slider_new_with_range( DARKTABLE_SLIDER_VALUE, -9.0, 9.0, .02, p->exposure,3));
- gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("adjust the exposure correction [ev]"), NULL);
+ gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("adjust the exposure correction [ev]"), (char *)NULL);
// g->scale3 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_VALUE,0.0, 2.0, .005, p->gain,3));
- // gtk_object_set(GTK_OBJECT(g->scale3), "tooltip-text", _("leave black and white,\nbut compress brighter\nvalues (non-linear)"), NULL);
+ // gtk_object_set(GTK_OBJECT(g->scale3), "tooltip-text", _("leave black and white,\nbut compress brighter\nvalues (non-linear)"), (char *)NULL);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale1), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale2), TRUE, TRUE, 0);
// gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale3), TRUE, TRUE, 0);
@@ -325,7 +325,7 @@ void gui_init(struct dt_iop_module_t *self)
g->autoexp = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("auto")));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->autoexp), FALSE);
g->autoexpp = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_VALUE,0.0, 0.2, .001, 0.01,3));
- gtk_object_set(GTK_OBJECT(g->autoexpp), "tooltip-text", _("percentage of bright values clipped out"), NULL);
+ gtk_object_set(GTK_OBJECT(g->autoexpp), "tooltip-text", _("percentage of bright values clipped out"), (char *)NULL);
gtk_widget_set_sensitive(GTK_WIDGET(g->autoexpp), FALSE);
gtk_box_pack_start(GTK_BOX(g->vbox1), GTK_WIDGET(g->autoexp), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->autoexpp), TRUE, TRUE, 0);

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_iop_grain_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/grain.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/grain.c Thu Sep 16 22:38:04 2010
@@ -518,8 +518,8 @@ void gui_init(struct dt_iop_module_t *self)
dtgtk_slider_set_format_type(g->scale2,DARKTABLE_SLIDER_FORMAT_PERCENT);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale1), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale2), TRUE, TRUE, 0);
- gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the grain size (~iso of the film)"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("the strength of applied grain"), NULL);
+ gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the grain size (~iso of the film)"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("the strength of applied grain"), (char *)NULL);
g_signal_connect (G_OBJECT (g->combo1), "changed",
G_CALLBACK (channel_changed), self);

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-src_iop_highlights_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/highlights.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/highlights.c Thu Sep 16 22:38:04 2010
@@ -323,7 +323,7 @@ void gui_init(struct dt_iop_module_t *self)
g->mode = GTK_COMBO_BOX(gtk_combo_box_new_text());
gtk_combo_box_append_text(g->mode, _("clip highlights"));
gtk_combo_box_append_text(g->mode, _("reconstruct in LCh"));
- gtk_object_set(GTK_OBJECT(g->mode), "tooltip-text", _("highlight reconstruction method"), NULL);
+ gtk_object_set(GTK_OBJECT(g->mode), "tooltip-text", _("highlight reconstruction method"), (char *)NULL);
gtk_box_pack_start(hbox, GTK_WIDGET(g->mode), TRUE, TRUE, 0);
hbox = GTK_BOX(gtk_hbox_new(FALSE, 5));
@@ -345,9 +345,9 @@ void gui_init(struct dt_iop_module_t *self)
g->blendL = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR,0.0, 1.0, 0.01, p->blendL, 3));
g->blendC = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR,0.0, 1.0, 0.01, p->blendC, 3));
g->blendh = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR,0.0, 1.0, 0.01, p->blendh, 3));
- gtk_object_set(GTK_OBJECT(g->blendL), "tooltip-text", _("blend lightness (0 is same as clipping)"), NULL);
- gtk_object_set(GTK_OBJECT(g->blendC), "tooltip-text", _("blend colorness (0 is same as clipping)"), NULL);
- gtk_object_set(GTK_OBJECT(g->blendh), "tooltip-text", _("blend hue (0 is same as clipping)"), NULL);
+ gtk_object_set(GTK_OBJECT(g->blendL), "tooltip-text", _("blend lightness (0 is same as clipping)"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->blendC), "tooltip-text", _("blend colorness (0 is same as clipping)"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->blendh), "tooltip-text", _("blend hue (0 is same as clipping)"), (char *)NULL);
gtk_box_pack_start(vbox2, GTK_WIDGET(g->blendL), TRUE, TRUE, 0);
gtk_box_pack_start(vbox2, GTK_WIDGET(g->blendC), TRUE, TRUE, 0);
gtk_box_pack_start(vbox2, GTK_WIDGET(g->blendh), TRUE, TRUE, 0);

View File

@ -0,0 +1,98 @@
$OpenBSD: patch-src_iop_lens_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/lens.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/lens.c Thu Sep 16 22:42:35 2010
@@ -446,7 +446,7 @@ static GtkComboBoxEntry *combo_entry_text (
gtk_table_attach (GTK_TABLE (container), combo, x+1, x+2, y, y+1, 0, 0, 2, 0);
else if (GTK_IS_BOX (container))
gtk_box_pack_start (GTK_BOX (container), combo, TRUE, TRUE, 2);
- gtk_object_set(GTK_OBJECT(combo), "tooltip-text", tip, NULL);
+ gtk_object_set(GTK_OBJECT(combo), "tooltip-text", tip, (char *)NULL);
return GTK_COMBO_BOX_ENTRY (combo);
}
@@ -637,7 +637,7 @@ static void camera_set (dt_iop_module_t *self, const l
if (!cam)
{
gtk_entry_set_text(GTK_ENTRY(g->camera_model), "");
- gtk_object_set(GTK_OBJECT(g->camera_model), "tooltip-text", "", NULL);
+ gtk_object_set(GTK_OBJECT(g->camera_model), "tooltip-text", "", (char *)NULL);
return;
}
@@ -666,7 +666,7 @@ static void camera_set (dt_iop_module_t *self, const l
"crop factor:\t%.1f"),
maker, model, _variant,
cam->Mount, cam->CropFactor);
- gtk_object_set(GTK_OBJECT(g->camera_model), "tooltip-text", fm, NULL);
+ gtk_object_set(GTK_OBJECT(g->camera_model), "tooltip-text", fm, (char *)NULL);
g_free (fm);
}
@@ -861,7 +861,7 @@ static void lens_set (dt_iop_module_t *self, const lfL
if (!lens)
{
gtk_entry_set_text(GTK_ENTRY(g->lens_model), "");
- gtk_object_set(GTK_OBJECT(g->lens_model), "tooltip-text", "", NULL);
+ gtk_object_set(GTK_OBJECT(g->lens_model), "tooltip-text", "", (char *)NULL);
return;
}
@@ -910,7 +910,7 @@ static void lens_set (dt_iop_module_t *self, const lfL
maker ? maker : "?", model ? model : "?",
focal, aperture, lens->CropFactor,
lf_get_lens_type_desc (lens->Type, NULL), mounts);
- gtk_object_set(GTK_OBJECT(g->lens_model), "tooltip-text", fm, NULL);
+ gtk_object_set(GTK_OBJECT(g->lens_model), "tooltip-text", fm, (char *)NULL);
g_free (fm);
/* Create the focal/aperture/distance combo boxes */
@@ -1152,7 +1152,7 @@ void gui_init(struct dt_iop_module_t *self)
button = gtk_button_new_with_label(_("cam"));
gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("search for camera using a pattern\n"
- "format: [maker, ][model]"), NULL);
+ "format: [maker, ][model]"), (char *)NULL);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (camera_search_clicked), self);
gtk_table_attach(GTK_TABLE(self->widget), button, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
@@ -1166,7 +1166,7 @@ void gui_init(struct dt_iop_module_t *self)
button = gtk_button_new_with_label(_("lens"));
gtk_object_set(GTK_OBJECT(button), "tooltip-text",
_("search for lens using a pattern\n"
- "format: [maker, ][model]"), NULL);
+ "format: [maker, ][model]"), (char *)NULL);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (lens_search_clicked), self);
gtk_table_attach(GTK_TABLE(self->widget), button, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
@@ -1197,7 +1197,7 @@ void gui_init(struct dt_iop_module_t *self)
g->target_geom = GTK_COMBO_BOX(gtk_combo_box_new_text());
gtk_object_set(GTK_OBJECT(g->target_geom), "tooltip-text",
- _("target geometry"), NULL);
+ _("target geometry"), (char *)NULL);
gtk_combo_box_append_text(g->target_geom, _("rectilinear"));
gtk_combo_box_append_text(g->target_geom, _("fish-eye"));
gtk_combo_box_append_text(g->target_geom, _("panoramic"));
@@ -1228,7 +1228,7 @@ void gui_init(struct dt_iop_module_t *self)
// reverse direction
g->reverse = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("reverse")));
- gtk_object_set(GTK_OBJECT(g->reverse), "tooltip-text", _("apply distortions instead of correcting them"), NULL);
+ gtk_object_set(GTK_OBJECT(g->reverse), "tooltip-text", _("apply distortions instead of correcting them"), (char *)NULL);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->reverse), p->inverse);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->reverse), 1, 3, 4, 5, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect (G_OBJECT (g->reverse), "toggled",
@@ -1247,8 +1247,8 @@ void gui_init(struct dt_iop_module_t *self)
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->tca_b), 1, 3, 6, 7, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect (G_OBJECT (g->tca_r), "value-changed", G_CALLBACK (tca_changed), self);
g_signal_connect (G_OBJECT (g->tca_b), "value-changed", G_CALLBACK (tca_changed), self);
- gtk_object_set(GTK_OBJECT(g->tca_r), "tooltip-text", _("override transversal chromatic aberration correction for red channel\nleave at 1.0 for defaults"), NULL);
- gtk_object_set(GTK_OBJECT(g->tca_b), "tooltip-text", _("override transversal chromatic aberration correction for blue channel\nleave at 1.0 for defaults"), NULL);
+ gtk_object_set(GTK_OBJECT(g->tca_r), "tooltip-text", _("override transversal chromatic aberration correction for red channel\nleave at 1.0 for defaults"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->tca_b), "tooltip-text", _("override transversal chromatic aberration correction for blue channel\nleave at 1.0 for defaults"), (char *)NULL);
}

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_iop_monochrome_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/monochrome.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/monochrome.c Thu Sep 16 22:38:04 2010
@@ -301,7 +301,7 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(self->widget), asp, TRUE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(asp), GTK_WIDGET(g->area));
gtk_drawing_area_size(g->area, 258, 258);
- gtk_object_set(GTK_OBJECT(g->area), "tooltip-text", _("drag and scroll\nto adjust the virtual\ncolor filter"), NULL);
+ gtk_object_set(GTK_OBJECT(g->area), "tooltip-text", _("drag and scroll\nto adjust the virtual\ncolor filter"), (char *)NULL);
gtk_widget_add_events(GTK_WIDGET(g->area), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK);
g_signal_connect (G_OBJECT (g->area), "expose-event",

View File

@ -0,0 +1,82 @@
$OpenBSD: patch-src_iop_rawimport_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/rawimport.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/rawimport.c Thu Sep 16 22:38:04 2010
@@ -423,7 +423,7 @@ void gui_init(struct dt_iop_module_t *self)
label = gtk_label_new(_("median passes"));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
g->med_passes = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(0, 31, 1));
- gtk_object_set(GTK_OBJECT(g->med_passes), "tooltip-text", _("number of 3x3 median filter passes\non R-G and B-G after demosaicing"), NULL);
+ gtk_object_set(GTK_OBJECT(g->med_passes), "tooltip-text", _("number of 3x3 median filter passes\non R-G and B-G after demosaicing"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), label, 0, 3, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->med_passes), 4, 7, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -443,23 +443,23 @@ void gui_init(struct dt_iop_module_t *self)
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->demosaic_method), 4, 7, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g->pre_median = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("hot pixels")));
- gtk_object_set(GTK_OBJECT(g->pre_median), "tooltip-text", _("median filter before demosaicing"), NULL);
+ gtk_object_set(GTK_OBJECT(g->pre_median), "tooltip-text", _("median filter before demosaicing"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->pre_median), 4, 7, 3, 4, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g->greeneq = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("green equilibration")));
- gtk_object_set(GTK_OBJECT(g->greeneq), "tooltip-text", _("work around unequal green channels in some mid-range\ncameras, e.g. canon eos 400d"), NULL);
+ gtk_object_set(GTK_OBJECT(g->greeneq), "tooltip-text", _("work around unequal green channels in some mid-range\ncameras, e.g. canon eos 400d"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->greeneq), 4, 7, 4, 5, GTK_EXPAND|GTK_FILL, 0, 0, 0);
// GtkCheckButton *dcb_enhance;
g->dcb_enhance = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("dcb enhance")));
- gtk_object_set(GTK_OBJECT(g->dcb_enhance), "tooltip-text", _("turns off the default image refinement if edges are jagged or you prefer softer demosaicing."), NULL);
+ gtk_object_set(GTK_OBJECT(g->dcb_enhance), "tooltip-text", _("turns off the default image refinement if edges are jagged or you prefer softer demosaicing."), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->dcb_enhance), 4, 7, 6, 7, GTK_EXPAND|GTK_FILL, 0, 0, 0);
// GtkSpinButton *iterations_dcb;
g->dcb_iterat = gtk_label_new(_("dcb iterations"));
gtk_misc_set_alignment(GTK_MISC(g->dcb_iterat), 0.0, 0.5);
g->iterations_dcb = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(0, 31, 1)); // not enough room for number more then 4
- gtk_object_set(GTK_OBJECT(g->iterations_dcb), "tooltip-text", _("number of DCB correction routines passes(the default is zero)\nthis helps if you see lots of wrong interpolation directions, just remember that it may produce new artifacts\nusually 0 or 1 should work fine, in some situations even 10 is not enough."), NULL);
+ gtk_object_set(GTK_OBJECT(g->iterations_dcb), "tooltip-text", _("number of DCB correction routines passes(the default is zero)\nthis helps if you see lots of wrong interpolation directions, just remember that it may produce new artifacts\nusually 0 or 1 should work fine, in some situations even 10 is not enough."), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->dcb_iterat), 0, 3, 7, 8, GTK_EXPAND|GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->iterations_dcb), 4, 7, 7, 8, GTK_EXPAND|GTK_FILL, 0, 0, 0);
@@ -470,32 +470,32 @@ void gui_init(struct dt_iop_module_t *self)
gtk_combo_box_append_text(g->noiserd_fbdd, C_("fbdd noise", "none"));
gtk_combo_box_append_text(g->noiserd_fbdd, _("luma"));
gtk_combo_box_append_text(g->noiserd_fbdd, _("luma+chroma"));
- gtk_object_set(GTK_OBJECT(g->noiserd_fbdd), "tooltip-text", _("fbdd turns on pre-demosaicing luma (and optionally chroma) noise reduction"), NULL);
+ gtk_object_set(GTK_OBJECT(g->noiserd_fbdd), "tooltip-text", _("fbdd turns on pre-demosaicing luma (and optionally chroma) noise reduction"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->fbdd_noise), 0, 3, 8, 9, GTK_EXPAND|GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->noiserd_fbdd), 4, 7, 8, 9, GTK_EXPAND|GTK_FILL, 0, 0, 0);
// GtkCheckButton *vcd_eeci_refine;
g->vcd_eeci_refine = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("vcd enhance")));
- gtk_object_set(GTK_OBJECT(g->vcd_eeci_refine), "tooltip-text", _("refine interpolated pixels"), NULL);
+ gtk_object_set(GTK_OBJECT(g->vcd_eeci_refine), "tooltip-text", _("refine interpolated pixels"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->vcd_eeci_refine), 4, 7, 6, 7, GTK_EXPAND|GTK_FILL, 0, 0, 0);
// GtkSpinButton *vcd_es_med_passes;
g->vcd_enhance_lab = gtk_label_new(_("edge median passes"));
gtk_misc_set_alignment(GTK_MISC(g->vcd_enhance_lab), 0.0, 0.5);
g->vcd_es_med_passes = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(0, 31, 1)); // not enough room for more then 4
- gtk_object_set(GTK_OBJECT(g->vcd_es_med_passes), "tooltip-text", _("number of passes an edge-sensitive median filter to differential color planes"), NULL);
+ gtk_object_set(GTK_OBJECT(g->vcd_es_med_passes), "tooltip-text", _("number of passes an edge-sensitive median filter to differential color planes"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->vcd_enhance_lab), 0, 3, 7, 8, GTK_EXPAND|GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->vcd_es_med_passes), 4, 7, 7, 8, GTK_EXPAND|GTK_FILL, 0, 0, 0);
//GtkCheckButton *amaze_ca_correct;
g->amaze_ca_correct = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("ca autocorrect")));
- gtk_object_set(GTK_OBJECT(g->amaze_ca_correct), "tooltip-text", _("artificial ca autocorrection from AMaZE"), NULL);
+ gtk_object_set(GTK_OBJECT(g->amaze_ca_correct), "tooltip-text", _("artificial ca autocorrection from AMaZE"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(g->amaze_ca_correct), 4, 7, 6, 7, GTK_EXPAND|GTK_FILL, 0, 0, 0);
GtkWidget *reset = gtk_button_new_with_label(_("reset"));
- gtk_object_set(GTK_OBJECT(reset), "tooltip-text", _("reset raw loading parameters\nto darktable's defaults"), NULL);
+ gtk_object_set(GTK_OBJECT(reset), "tooltip-text", _("reset raw loading parameters\nto darktable's defaults"), (char *)NULL);
GtkWidget *reload = gtk_button_new_with_label(_("re-import"));
- gtk_object_set(GTK_OBJECT(reload), "tooltip-text", _("trigger re-import of the raw image"), NULL);
+ gtk_object_set(GTK_OBJECT(reload), "tooltip-text", _("trigger re-import of the raw image"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(reset), 0, 3, 10, 11, GTK_EXPAND|GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(reload), 4, 7, 10, 11, GTK_EXPAND|GTK_FILL, 0, 0, 0);

View File

@ -0,0 +1,45 @@
$OpenBSD: patch-src_iop_splittoning_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/splittoning.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/splittoning.c Thu Sep 16 22:38:04 2010
@@ -461,11 +461,11 @@ void gui_init(struct dt_iop_module_t *self)
dtgtk_gradient_slider_set_stop(g->gslider1,0.664,(GdkColor){0,0,0,lightness});
dtgtk_gradient_slider_set_stop(g->gslider1,0.83,(GdkColor){0,lightness,0,lightness});
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->gslider1), TRUE, TRUE, 0);
- gtk_object_set(GTK_OBJECT(g->gslider1), "tooltip-text", _("select the hue tone for shadows"), NULL);
+ gtk_object_set(GTK_OBJECT(g->gslider1), "tooltip-text", _("select the hue tone for shadows"), (char *)NULL);
g->gslider2=DTGTK_GRADIENT_SLIDER(dtgtk_gradient_slider_new_with_color((GdkColor){0,lightness,lightness,lightness},(GdkColor){0,lightness,lightness,lightness}));
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->gslider2), TRUE, TRUE, 0);
- gtk_object_set(GTK_OBJECT(g->gslider2), "tooltip-text", _("select the saturation shadow tone"), NULL);
+ gtk_object_set(GTK_OBJECT(g->gslider2), "tooltip-text", _("select the saturation shadow tone"), (char *)NULL);
// Highlights
gtk_box_pack_start(GTK_BOX(self->widget), GTK_WIDGET(dtgtk_label_new(_("highlights"),DARKTABLE_LABEL_TAB|DARKTABLE_LABEL_ALIGN_RIGHT)), FALSE, FALSE, 5);
@@ -496,11 +496,11 @@ void gui_init(struct dt_iop_module_t *self)
dtgtk_gradient_slider_set_stop(g->gslider3,0.664,(GdkColor){0,0,0,lightness});
dtgtk_gradient_slider_set_stop(g->gslider3,0.83,(GdkColor){0,lightness,0,lightness});
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->gslider3), TRUE, TRUE, 0);
- gtk_object_set(GTK_OBJECT(g->gslider3), "tooltip-text", _("select the hue tone for highlights"), NULL);
+ gtk_object_set(GTK_OBJECT(g->gslider3), "tooltip-text", _("select the hue tone for highlights"), (char *)NULL);
g->gslider4=DTGTK_GRADIENT_SLIDER(dtgtk_gradient_slider_new_with_color((GdkColor){0,lightness,lightness,lightness},(GdkColor){0,lightness,lightness,lightness}));
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->gslider4), TRUE, TRUE, 0);
- gtk_object_set(GTK_OBJECT(g->gslider4), "tooltip-text", _("select the saturation highlights tone"), NULL);
+ gtk_object_set(GTK_OBJECT(g->gslider4), "tooltip-text", _("select the saturation highlights tone"), (char *)NULL);
// Additional paramters
hbox=GTK_WIDGET(gtk_hbox_new(FALSE, 0));
@@ -526,8 +526,8 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale2), TRUE, TRUE, 0);
- gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the balance of center of splittoning"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("compress the effect on highlighs/shadows and\npreserve midtones"), NULL);
+ gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the balance of center of splittoning"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("compress the effect on highlighs/shadows and\npreserve midtones"), (char *)NULL);
g_signal_connect (G_OBJECT (g->gslider1), "value-changed",
G_CALLBACK (hue_callback), self);

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_iop_temperature_c,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/temperature.c.orig Thu Sep 16 22:26:36 2010
+++ src/iop/temperature.c Thu Sep 16 22:38:04 2010
@@ -399,7 +399,7 @@ void gui_init (struct dt_iop_module_t *self)
gtk_spin_button_set_value (g->finetune, 0);
gtk_spin_button_set_digits(g->finetune, 0);
gtk_box_pack_start(hbox, GTK_WIDGET(g->finetune), FALSE, FALSE, 0);
- gtk_object_set(GTK_OBJECT(g->finetune), "tooltip-text", _("fine tune white balance preset"), NULL);
+ gtk_object_set(GTK_OBJECT(g->finetune), "tooltip-text", _("fine tune white balance preset"), (char *)NULL);
self->gui_update(self);

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_iop_velvia_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/velvia.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/velvia.c Thu Sep 16 22:38:04 2010
@@ -230,9 +230,9 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale1), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale2), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale3), TRUE, TRUE, 0);
- gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the amount of saturation to apply"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("the vibrance amount"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale3), "tooltip-text", _("how much to spare highlights and shadows"), NULL);
+ gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the amount of saturation to apply"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("the vibrance amount"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale3), "tooltip-text", _("how much to spare highlights and shadows"), (char *)NULL);
g_signal_connect (G_OBJECT (g->scale1), "value-changed",
G_CALLBACK (saturation_callback), self);

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_iop_vignette_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/iop/vignette.c.orig Thu Sep 16 22:37:56 2010
+++ src/iop/vignette.c Thu Sep 16 22:38:04 2010
@@ -369,13 +369,13 @@ void gui_init(struct dt_iop_module_t *self)
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale4), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->togglebutton1), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->togglebutton2), TRUE, TRUE, 0);
- gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the radii scale of vignette for start of fall-off"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale5), "tooltip-text", _("the radii scale of vignette for end of fall-off"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("strength of effect"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale3), "tooltip-text", _("uniformity of vignette"), NULL);
- gtk_object_set(GTK_OBJECT(g->scale4), "tooltip-text", _("brightness/saturation ratio\nof the result,\n-1 - only brightness\n 0 - 50/50 mix of brightness and saturation\n+1 - only saturation"), NULL);
- gtk_object_set(GTK_OBJECT(g->togglebutton1), "tooltip-text", _("inverts effect of saturation..."), NULL);
- gtk_object_set(GTK_OBJECT(g->togglebutton2), "tooltip-text", _("inverts effect of fall-off, default is dark fall-off..."), NULL);
+ gtk_object_set(GTK_OBJECT(g->scale1), "tooltip-text", _("the radii scale of vignette for start of fall-off"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale5), "tooltip-text", _("the radii scale of vignette for end of fall-off"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale2), "tooltip-text", _("strength of effect"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale3), "tooltip-text", _("uniformity of vignette"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->scale4), "tooltip-text", _("brightness/saturation ratio\nof the result,\n-1 - only brightness\n 0 - 50/50 mix of brightness and saturation\n+1 - only saturation"), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->togglebutton1), "tooltip-text", _("inverts effect of saturation..."), (char *)NULL);
+ gtk_object_set(GTK_OBJECT(g->togglebutton2), "tooltip-text", _("inverts effect of fall-off, default is dark fall-off..."), (char *)NULL);
dtgtk_slider_set_format_type(DTGTK_SLIDER(g->scale1),DARKTABLE_SLIDER_FORMAT_PERCENT);
dtgtk_slider_set_format_type(DTGTK_SLIDER(g->scale2),DARKTABLE_SLIDER_FORMAT_PERCENT);

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_libs_camera_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/libs/camera.c.orig Fri Aug 27 15:01:48 2010
+++ src/libs/camera.c Thu Sep 16 23:17:23 2010
@@ -110,7 +110,7 @@ dt_lib_camera_property_t *_lib_property_add_new(dt_lib
prop->values=GTK_COMBO_BOX(gtk_combo_box_new_text());
prop->osd=DTGTK_TOGGLEBUTTON(dtgtk_togglebutton_new(dtgtk_cairo_paint_eye,0));
- gtk_object_set (GTK_OBJECT(prop->osd), "tooltip-text", _("toggle view property in center view"), NULL);
+ gtk_object_set (GTK_OBJECT(prop->osd), "tooltip-text", _("toggle view property in center view"), (char *)NULL);
do
{
gtk_combo_box_append_text(prop->values, value);
@@ -346,10 +346,10 @@ gui_init (dt_lib_module_t *self)
lib->gui.button1=gtk_button_new_with_label(_("capture image(s)"));
gtk_box_pack_start(GTK_BOX(self->widget), GTK_WIDGET(lib->gui.button1), FALSE, FALSE, 5);
- gtk_object_set (GTK_OBJECT(lib->gui.tb1), "tooltip-text", _("toggle delayed capture mode"), NULL);
- gtk_object_set (GTK_OBJECT( lib->gui.tb2), "tooltip-text", _("toggle sequenced capture mode"), NULL);
- gtk_object_set (GTK_OBJECT( lib->gui.sb1), "tooltip-text", _("the count of seconds before actually doing a capture"), NULL);
- gtk_object_set (GTK_OBJECT( lib->gui.sb2), "tooltip-text", _("the amount of images to capture in a sequence,\nyou can use this in conjuction with delayed mode to create stop-motion sequences."), NULL);
+ gtk_object_set (GTK_OBJECT(lib->gui.tb1), "tooltip-text", _("toggle delayed capture mode"), (char *)NULL);
+ gtk_object_set (GTK_OBJECT( lib->gui.tb2), "tooltip-text", _("toggle sequenced capture mode"), (char *)NULL);
+ gtk_object_set (GTK_OBJECT( lib->gui.sb1), "tooltip-text", _("the count of seconds before actually doing a capture"), (char *)NULL);
+ gtk_object_set (GTK_OBJECT( lib->gui.sb2), "tooltip-text", _("the amount of images to capture in a sequence,\nyou can use this in conjuction with delayed mode to create stop-motion sequences."), (char *)NULL);
g_signal_connect(G_OBJECT(lib->gui.tb1), "clicked", G_CALLBACK(_toggle_capture_mode_clicked), lib);
g_signal_connect(G_OBJECT(lib->gui.tb2), "clicked", G_CALLBACK(_toggle_capture_mode_clicked), lib);

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_libs_collect_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/libs/collect.c.orig Fri Aug 27 17:46:31 2010
+++ src/libs/collect.c Thu Sep 16 23:16:38 2010
@@ -275,7 +275,7 @@ gui_init (dt_lib_module_t *self)
gtk_box_pack_start(box, w, FALSE, FALSE, 0);
w = gtk_combo_box_entry_new_text();
d->text = GTK_COMBO_BOX_ENTRY(w);
- gtk_object_set(GTK_OBJECT(d->text), "tooltip-text", _("type your query, use `%' as wildcard"), NULL);
+ gtk_object_set(GTK_OBJECT(d->text), "tooltip-text", _("type your query, use `%' as wildcard"), (char *)NULL);
gchar *text = dt_conf_get_string("plugins/lighttable/collect/string");
if(text)
{
@@ -302,7 +302,7 @@ gui_init (dt_lib_module_t *self)
gtk_tree_view_column_add_attribute(col, renderer, "text", DT_LIB_COLLECT_COL_TEXT);
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(view), GTK_SELECTION_SINGLE);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(liststore));
- gtk_object_set(GTK_OBJECT(view), "tooltip-text", _("doubleclick to select"), NULL);
+ gtk_object_set(GTK_OBJECT(view), "tooltip-text", _("doubleclick to select"), (char *)NULL);
g_signal_connect(G_OBJECT (view), "row-activated", G_CALLBACK (row_activated), d);
entry_key_press (NULL, NULL, d);
}

View File

@ -0,0 +1,36 @@
$OpenBSD: patch-src_libs_colorlabels_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/libs/colorlabels.c.orig Fri Aug 27 17:46:31 2010
+++ src/libs/colorlabels.c Thu Sep 16 23:17:00 2010
@@ -66,12 +66,12 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
button = gtk_button_new_with_label(C_("color label", "red"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("toggle red label\nof selected images (ctrl-1)"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("toggle red label\nof selected images (ctrl-1)"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)0);
button = gtk_button_new_with_label(C_("color label", "yellow"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("toggle yellow label\nof selected images (ctrl-2)"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("toggle yellow label\nof selected images (ctrl-2)"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)1);
@@ -79,12 +79,12 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
button = gtk_button_new_with_label(C_("color label", "green"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("toggle green label\nof selected images (ctrl-3)"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("toggle green label\nof selected images (ctrl-3)"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)2);
button = gtk_button_new_with_label(_("clear"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("clear all labels of selected images"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("clear all labels of selected images"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)3);

View File

@ -0,0 +1,54 @@
$OpenBSD: patch-src_libs_copy_history_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/libs/copy_history.c.orig Thu Sep 16 23:00:01 2010
+++ src/libs/copy_history.c Thu Sep 16 23:00:45 2010
@@ -59,7 +59,7 @@ load_button_clicked (GtkWidget *widget, dt_lib_module_
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ (char *)NULL);
GtkFileFilter *filter;
filter = GTK_FILE_FILTER(gtk_file_filter_new());
@@ -253,11 +253,11 @@ gui_init (dt_lib_module_t *self)
GtkBox *hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
GtkWidget *copy = gtk_button_new_with_label(_("copy"));
dt_gui_key_accel_register(GDK_CONTROL_MASK, GDK_c, key_accel_copy_callback, (void *)self);
- gtk_object_set(GTK_OBJECT(copy), "tooltip-text", _("copy history stack of\nfirst selected image (ctrl-c)"), NULL);
+ gtk_object_set(GTK_OBJECT(copy), "tooltip-text", _("copy history stack of\nfirst selected image (ctrl-c)"), (char *)NULL);
gtk_box_pack_start(hbox, copy, TRUE, TRUE, 0);
GtkWidget *delete = gtk_button_new_with_label(_("discard"));
- gtk_object_set(GTK_OBJECT(delete), "tooltip-text", _("discard history stack of\nall selected images"), NULL);
+ gtk_object_set(GTK_OBJECT(delete), "tooltip-text", _("discard history stack of\nall selected images"), (char *)NULL);
gtk_box_pack_start(hbox, delete, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(self->widget), GTK_WIDGET(hbox), TRUE, TRUE, 0);
@@ -266,13 +266,13 @@ gui_init (dt_lib_module_t *self)
d->pastemode = GTK_COMBO_BOX(gtk_combo_box_new_text());
gtk_combo_box_append_text(d->pastemode, _("append"));
gtk_combo_box_append_text(d->pastemode, _("overwrite"));
- gtk_object_set(GTK_OBJECT(d->pastemode), "tooltip-text", _("how to handle existing history"), NULL);
+ gtk_object_set(GTK_OBJECT(d->pastemode), "tooltip-text", _("how to handle existing history"), (char *)NULL);
gtk_box_pack_start(hbox, GTK_WIDGET(d->pastemode), TRUE, TRUE, 0);
gtk_combo_box_set_active(d->pastemode, dt_conf_get_int("plugins/lighttable/copy_history/pastemode"));
d->paste = GTK_BUTTON(gtk_button_new_with_label(_("paste")));
dt_gui_key_accel_register(GDK_CONTROL_MASK, GDK_v, key_accel_paste_callback, (void *)self);
- gtk_object_set(GTK_OBJECT(d->paste), "tooltip-text", _("paste history stack to\nall selected images (ctrl-v)"), NULL);
+ gtk_object_set(GTK_OBJECT(d->paste), "tooltip-text", _("paste history stack to\nall selected images (ctrl-v)"), (char *)NULL);
d->imageid = -1;
gtk_widget_set_sensitive(GTK_WIDGET(d->paste), FALSE);
gtk_box_pack_start(hbox, GTK_WIDGET(d->paste), TRUE, TRUE, 0);
@@ -281,7 +281,7 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
GtkWidget *loadbutton = gtk_button_new_with_label(_("load dt file"));
- gtk_object_set(GTK_OBJECT(loadbutton), "tooltip-text", _("open a dt sidecar file\nand apply it to selected images"), NULL);
+ gtk_object_set(GTK_OBJECT(loadbutton), "tooltip-text", _("open a dt sidecar file\nand apply it to selected images"), (char *)NULL);
gtk_box_pack_start(hbox, loadbutton, TRUE, TRUE, 0);
gtk_box_pack_start(hbox, gtk_label_new(""), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(self->widget), GTK_WIDGET(hbox), TRUE, TRUE, 0);

View File

@ -0,0 +1,45 @@
$OpenBSD: patch-src_libs_export_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/libs/export.c.orig Thu Sep 16 22:54:48 2010
+++ src/libs/export.c Thu Sep 16 22:55:26 2010
@@ -405,9 +405,9 @@ gui_init (dt_lib_module_t *self)
gtk_table_set_row_spacing(GTK_TABLE(self->widget), 5, 20);
gtk_table_attach(GTK_TABLE(self->widget), label, 0, 2, 6, 7, GTK_EXPAND|GTK_FILL, 0, 0, 0);
d->width = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(0, 10000, 1));
- gtk_object_set(GTK_OBJECT(d->width), "tooltip-text", _("maximum output width\nset to 0 for no scaling"), NULL);
+ gtk_object_set(GTK_OBJECT(d->width), "tooltip-text", _("maximum output width\nset to 0 for no scaling"), (char *)NULL);
d->height = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(0, 10000, 1));
- gtk_object_set(GTK_OBJECT(d->height), "tooltip-text", _("maximum output height\nset to 0 for no scaling"), NULL);
+ gtk_object_set(GTK_OBJECT(d->height), "tooltip-text", _("maximum output height\nset to 0 for no scaling"), (char *)NULL);
gtk_widget_add_events(GTK_WIDGET(d->width), GDK_FOCUS_CHANGE_MASK);
g_signal_connect (G_OBJECT (d->width), "focus-in-event", G_CALLBACK(focus_in), NULL);
@@ -512,7 +512,7 @@ gui_init (dt_lib_module_t *self)
while(it)
{
GtkCellRendererText *tr = GTK_CELL_RENDERER_TEXT(it->data);
- gtk_object_set(GTK_OBJECT(tr), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL);
+ gtk_object_set(GTK_OBJECT(tr), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, (char *)NULL);
it = g_list_next(it);
}
g_list_free(renderers);
@@ -520,7 +520,7 @@ gui_init (dt_lib_module_t *self)
gtk_combo_box_set_active(d->profile, 0);
char tooltip[1024];
snprintf(tooltip, 1024, _("output icc profiles in %s/color/out"), datadir);
- gtk_object_set(GTK_OBJECT(d->profile), "tooltip-text", tooltip, NULL);
+ gtk_object_set(GTK_OBJECT(d->profile), "tooltip-text", tooltip, (char *)NULL);
g_signal_connect (G_OBJECT (d->intent), "changed",
G_CALLBACK (intent_changed),
(gpointer)d);
@@ -529,7 +529,7 @@ gui_init (dt_lib_module_t *self)
(gpointer)d);
GtkButton *button = GTK_BUTTON(gtk_button_new_with_label(_("export")));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("export with current settings (ctrl-e)"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("export with current settings (ctrl-e)"), (char *)NULL);
gtk_table_attach(GTK_TABLE(self->widget), GTK_WIDGET(button), 1, 2, 10, 11, GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect (G_OBJECT (button), "clicked",

View File

@ -0,0 +1,36 @@
$OpenBSD: patch-src_libs_image_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/libs/image.c.orig Thu Sep 16 23:01:06 2010
+++ src/libs/image.c Thu Sep 16 23:01:21 2010
@@ -75,12 +75,12 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
button = gtk_button_new_with_label(_("remove"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("remove from the collection"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("remove from the collection"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)0);
button = gtk_button_new_with_label(_("delete"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("physically delete from disk"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("physically delete from disk"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)1);
@@ -88,12 +88,12 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
button = gtk_button_new_with_label(_("write dt files"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("write history stack and tags to sidecar files"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("write history stack and tags to sidecar files"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)2);
button = gtk_button_new_with_label(_("duplicate"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("add a duplicate to the collection"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("add a duplicate to the collection"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)3);

View File

@ -0,0 +1,45 @@
$OpenBSD: patch-src_libs_lib_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/libs/lib.c.orig Fri Aug 27 17:46:31 2010
+++ src/libs/lib.c Fri Sep 17 00:06:30 2010
@@ -132,11 +132,11 @@ edit_preset (const char *name_in, dt_lib_module_info_t
g->name = GTK_ENTRY(gtk_entry_new());
gtk_entry_set_text(g->name, name);
gtk_box_pack_start(box, GTK_WIDGET(g->name), FALSE, FALSE, 0);
- gtk_object_set(GTK_OBJECT(g->name), "tooltip-text", _("name of the preset"), NULL);
+ gtk_object_set(GTK_OBJECT(g->name), "tooltip-text", _("name of the preset"), (char *)NULL);
g->description = GTK_ENTRY(gtk_entry_new());
gtk_box_pack_start(box, GTK_WIDGET(g->description), FALSE, FALSE, 0);
- gtk_object_set(GTK_OBJECT(g->description), "tooltip-text", _("description or further information"), NULL);
+ gtk_object_set(GTK_OBJECT(g->description), "tooltip-text", _("description or further information"), (char *)NULL);
sqlite3_stmt *stmt;
sqlite3_prepare_v2(darktable.db, "select description from presets where name = ?1 and operation = ?2", -1, &stmt, NULL);
@@ -285,7 +285,7 @@ dt_lib_presets_popup_menu_show(dt_lib_module_info_t *m
mi = gtk_menu_item_new_with_label((const char *)sqlite3_column_text(stmt, 0));
}
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(pick_callback), minfo);
- gtk_object_set(GTK_OBJECT(mi), "tooltip-text", sqlite3_column_text(stmt, 3), NULL);
+ gtk_object_set(GTK_OBJECT(mi), "tooltip-text", sqlite3_column_text(stmt, 3), (char *)NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
cnt ++;
}
@@ -493,13 +493,13 @@ dt_lib_gui_get_expander (dt_lib_module_t *module)
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(module->expander), TRUE, TRUE, 0);
GtkDarktableButton *resetbutton = DTGTK_BUTTON(dtgtk_button_new(dtgtk_cairo_paint_reset,0));
gtk_widget_set_size_request(GTK_WIDGET(resetbutton),13,13);
- gtk_object_set(GTK_OBJECT(resetbutton), "tooltip-text", _("reset parameters"), NULL);
+ gtk_object_set(GTK_OBJECT(resetbutton), "tooltip-text", _("reset parameters"), (char *)NULL);
gtk_box_pack_end (GTK_BOX(hbox), GTK_WIDGET(resetbutton), FALSE, FALSE, 0);
if(module->get_params)
{
GtkDarktableButton *presetsbutton = DTGTK_BUTTON(dtgtk_button_new(dtgtk_cairo_paint_presets,0));
gtk_widget_set_size_request(GTK_WIDGET(presetsbutton),13,13);
- gtk_object_set(GTK_OBJECT(presetsbutton), "tooltip-text", _("presets"), NULL);
+ gtk_object_set(GTK_OBJECT(presetsbutton), "tooltip-text", _("presets"), (char *)NULL);
gtk_box_pack_end (GTK_BOX(hbox), GTK_WIDGET(presetsbutton), FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (presetsbutton), "clicked", G_CALLBACK (popup_callback), module);
}

View File

@ -0,0 +1,47 @@
$OpenBSD: patch-src_libs_select_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/libs/select.c.orig Sat Aug 28 16:02:56 2010
+++ src/libs/select.c Thu Sep 16 23:16:06 2010
@@ -116,13 +116,13 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
button = gtk_button_new_with_label(_("select all"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("select all images in current collection (ctrl-a)"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("select all images in current collection (ctrl-a)"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
dt_gui_key_accel_register(GDK_CONTROL_MASK, GDK_a, key_accel_callback, (void *)0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)0);
button = gtk_button_new_with_label(_("select none"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("clear selection (ctrl-shift-a)"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("clear selection (ctrl-shift-a)"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
dt_gui_key_accel_register(GDK_CONTROL_MASK|GDK_SHIFT_MASK, GDK_A, key_accel_callback, (void *)1);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)1);
@@ -131,13 +131,13 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
button = gtk_button_new_with_label(_("invert selection"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("select unselected images\nin current collection (ctrl-!)"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("select unselected images\nin current collection (ctrl-!)"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
dt_gui_key_accel_register(GDK_CONTROL_MASK|GDK_SHIFT_MASK, GDK_exclam, key_accel_callback, (void *)2);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)2);
button = gtk_button_new_with_label(_("select film roll"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("select all images which are in the same\nfilm roll as the selected images"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("select all images which are in the same\nfilm roll as the selected images"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)3);
@@ -145,7 +145,7 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
button = gtk_button_new_with_label(_("select untouched"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("select untouched images in\ncurrent collection"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("select untouched images in\ncurrent collection"), (char *)NULL);
gtk_box_pack_start(hbox, button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(button_clicked), (gpointer)4);
// Just a filler, remove if a new button is added

View File

@ -0,0 +1,65 @@
$OpenBSD: patch-src_libs_tagging_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/libs/tagging.c.orig Fri Aug 27 17:46:31 2010
+++ src/libs/tagging.c Thu Sep 16 23:04:34 2010
@@ -310,7 +310,7 @@ gui_init (dt_lib_module_t *self)
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(d->current),
GTK_SELECTION_SINGLE);
gtk_tree_view_set_model(d->current, GTK_TREE_MODEL(liststore));
- gtk_object_set(GTK_OBJECT(d->current), "tooltip-text", _("attached tags,\ndoubleclick to detach"), NULL);
+ gtk_object_set(GTK_OBJECT(d->current), "tooltip-text", _("attached tags,\ndoubleclick to detach"), (char *)NULL);
g_signal_connect(G_OBJECT (d->current), "row-activated", G_CALLBACK (detach_activated), (gpointer)self);
gtk_container_add(GTK_CONTAINER(w), GTK_WIDGET(d->current));
@@ -318,13 +318,13 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
button = gtk_button_new_with_label(_("attach"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("attach tag to all selected images"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("attach tag to all selected images"), (char *)NULL);
gtk_box_pack_start(hbox, button, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (button), "clicked",
G_CALLBACK (attach_button_clicked), (gpointer)self);
button = gtk_button_new_with_label(_("detach"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("detach tag from all selected images"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("detach tag from all selected images"), (char *)NULL);
g_signal_connect(G_OBJECT (button), "clicked",
G_CALLBACK (detach_button_clicked), (gpointer)self);
gtk_box_pack_start(hbox, button, FALSE, TRUE, 0);
@@ -337,7 +337,7 @@ gui_init (dt_lib_module_t *self)
// text entry and new button
w = gtk_entry_new();
- gtk_object_set(GTK_OBJECT(w), "tooltip-text", _("enter tag name"), NULL);
+ gtk_object_set(GTK_OBJECT(w), "tooltip-text", _("enter tag name"), (char *)NULL);
gtk_box_pack_start(box, w, TRUE, TRUE, 0);
gtk_widget_add_events(GTK_WIDGET(w), GDK_KEY_RELEASE_MASK);
// g_signal_connect(G_OBJECT(w), "key-release-event",
@@ -362,7 +362,7 @@ gui_init (dt_lib_module_t *self)
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(d->related),
GTK_SELECTION_SINGLE);
gtk_tree_view_set_model(d->related, GTK_TREE_MODEL(liststore));
- gtk_object_set(GTK_OBJECT(d->related), "tooltip-text", _("related tags,\ndoubleclick to attach"), NULL);
+ gtk_object_set(GTK_OBJECT(d->related), "tooltip-text", _("related tags,\ndoubleclick to attach"), (char *)NULL);
g_signal_connect(G_OBJECT (d->related), "row-activated", G_CALLBACK (attach_activated), (gpointer)self);
gtk_container_add(GTK_CONTAINER(w), GTK_WIDGET(d->related));
@@ -370,13 +370,13 @@ gui_init (dt_lib_module_t *self)
hbox = GTK_BOX(gtk_hbox_new(TRUE, 5));
button = gtk_button_new_with_label(_("new"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("create a new tag with the\nname you entered"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("create a new tag with the\nname you entered"), (char *)NULL);
gtk_box_pack_start(hbox, button, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (button), "clicked",
G_CALLBACK (new_button_clicked), (gpointer)self);
button = gtk_button_new_with_label(_("delete"));
- gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("delete selected tag"), NULL);
+ gtk_object_set(GTK_OBJECT(button), "tooltip-text", _("delete selected tag"), (char *)NULL);
gtk_box_pack_start(hbox, button, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT (button), "clicked",
G_CALLBACK (delete_button_clicked), (gpointer)self);

View File

@ -0,0 +1,33 @@
$OpenBSD: patch-src_views_capture_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/views/capture.c.orig Fri Aug 27 17:46:31 2010
+++ src/views/capture.c Thu Sep 16 22:54:05 2010
@@ -168,7 +168,7 @@ const gchar *dt_capture_view_get_session_filename(cons
const gchar *file = dt_variables_get_result(cv->vp);
// Start check if file exist if it does, increase sequence and check again til we know that file doesnt exists..
- gchar *fullfile=g_build_path(G_DIR_SEPARATOR_S,storage,file,NULL);
+ gchar *fullfile=g_build_path(G_DIR_SEPARATOR_S,storage,file,(char *)NULL);
if( g_file_test(fullfile, G_FILE_TEST_EXISTS) == TRUE )
{
do
@@ -176,7 +176,7 @@ const gchar *dt_capture_view_get_session_filename(cons
g_free(fullfile);
dt_variables_expand( cv->vp, cv->filenamepattern, TRUE );
file = dt_variables_get_result(cv->vp);
- fullfile=g_build_path(G_DIR_SEPARATOR_S,storage,file,NULL);
+ fullfile=g_build_path(G_DIR_SEPARATOR_S,storage,file,(char *)NULL);
} while( g_file_test(fullfile, G_FILE_TEST_EXISTS) == TRUE);
}
@@ -210,7 +210,7 @@ void dt_capture_view_set_jobcode(const dt_view_t *view
dt_variables_reset_sequence (cv->vp);
// Construct the direectory for filmroll...
- cv->path = g_build_path(G_DIR_SEPARATOR_S,cv->basedirectory,cv->subdirectory,NULL);
+ cv->path = g_build_path(G_DIR_SEPARATOR_S,cv->basedirectory,cv->subdirectory,(char *)NULL);
dt_variables_expand( cv->vp, cv->path, FALSE );
sprintf(cv->film->dirname,"%s",dt_variables_get_result(cv->vp));

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_views_darkroom_c,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
missing sentinel in function call; pushed upstream
--- src/views/darkroom.c.orig Thu Sep 16 22:43:56 2010
+++ src/views/darkroom.c Thu Sep 16 22:43:56 2010
@@ -267,7 +267,7 @@ static void module_show_callback(GtkToggleButton *togg
gtk_expander_set_expanded(module->expander, FALSE);
snprintf(option, 512, _("show %s"), module->name());
}
- gtk_object_set(GTK_OBJECT(module->showhide), "tooltip-text", option, NULL);
+ gtk_object_set(GTK_OBJECT(module->showhide), "tooltip-text", option, (char *)NULL);
}
@@ -367,7 +367,7 @@ dt_dev_change_image(dt_develop_t *dev, dt_image_t *ima
GtkWidget *exp = GTK_WIDGET(module->expander);
GtkWidget *shh = GTK_WIDGET(module->showhide);
GtkWidget *parent = NULL;
- g_object_get(G_OBJECT(module->widget), "parent", &parent, NULL);
+ g_object_get(G_OBJECT(module->widget), "parent", &parent, (char *)NULL);
// re-init and re-gui_init
module->gui_cleanup(module);
module->cleanup(module);

View File

@ -0,0 +1,14 @@
darktable is a virtual lighttable and darkroom for photographers:
it manages your digital negatives in a database and lets you view
them through a zoomable lighttable. It also enables you to develop
raw images and enhance them. It tries to fill the gap between the
many excellent existing free raw converters and image management
tools (such as ufraw or f-spot).
All editing is fully non-destructive and only operates on cached
image buffers for display. The full image is only converted during
export. Raw files, high-dynamic range and standard image formats
such as jpeg are all supported. The core operates completely on
floating point values, so darktable can not only be used for
photography but also for scientifically acquired images or output
of renderers (high dynamic range).

View File

@ -0,0 +1,216 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/09/17 21:37:19 sthen Exp $
@bin bin/darktable
lib/darktable/
@comment lib/darktable/libdarktable.a
@comment lib/darktable/libdarktable.la
lib/darktable/libdarktable.so
lib/darktable/plugins/
lib/darktable/plugins/imageio/
lib/darktable/plugins/imageio/format/
@comment lib/darktable/plugins/imageio/format/libexr.a
@comment lib/darktable/plugins/imageio/format/libexr.la
lib/darktable/plugins/imageio/format/libexr.so
@comment lib/darktable/plugins/imageio/format/libjpeg.a
@comment lib/darktable/plugins/imageio/format/libjpeg.la
lib/darktable/plugins/imageio/format/libjpeg.so
@comment lib/darktable/plugins/imageio/format/libpfm.a
@comment lib/darktable/plugins/imageio/format/libpfm.la
lib/darktable/plugins/imageio/format/libpfm.so
@comment lib/darktable/plugins/imageio/format/libpng.a
@comment lib/darktable/plugins/imageio/format/libpng.la
lib/darktable/plugins/imageio/format/libpng.so
@comment lib/darktable/plugins/imageio/format/libppm.a
@comment lib/darktable/plugins/imageio/format/libppm.la
lib/darktable/plugins/imageio/format/libppm.so
@comment lib/darktable/plugins/imageio/format/libtiff.a
@comment lib/darktable/plugins/imageio/format/libtiff.la
lib/darktable/plugins/imageio/format/libtiff.so
lib/darktable/plugins/imageio/storage/
@comment lib/darktable/plugins/imageio/storage/libdisk.a
@comment lib/darktable/plugins/imageio/storage/libdisk.la
lib/darktable/plugins/imageio/storage/libdisk.so
@comment lib/darktable/plugins/imageio/storage/libemail.a
@comment lib/darktable/plugins/imageio/storage/libemail.la
lib/darktable/plugins/imageio/storage/libemail.so
@comment lib/darktable/plugins/imageio/storage/libpicasa.a
@comment lib/darktable/plugins/imageio/storage/libpicasa.la
lib/darktable/plugins/imageio/storage/libpicasa.so
@comment lib/darktable/plugins/libbasecurve.a
@comment lib/darktable/plugins/libbasecurve.la
lib/darktable/plugins/libbasecurve.so
@comment lib/darktable/plugins/libbilateral.a
@comment lib/darktable/plugins/libbilateral.la
lib/darktable/plugins/libbilateral.so
@comment lib/darktable/plugins/libchannelmixer.a
@comment lib/darktable/plugins/libchannelmixer.la
lib/darktable/plugins/libchannelmixer.so
@comment lib/darktable/plugins/libclahe.a
@comment lib/darktable/plugins/libclahe.la
lib/darktable/plugins/libclahe.so
@comment lib/darktable/plugins/libclipping.a
@comment lib/darktable/plugins/libclipping.la
lib/darktable/plugins/libclipping.so
@comment lib/darktable/plugins/libcolorcorrection.a
@comment lib/darktable/plugins/libcolorcorrection.la
lib/darktable/plugins/libcolorcorrection.so
@comment lib/darktable/plugins/libcolorin.a
@comment lib/darktable/plugins/libcolorin.la
lib/darktable/plugins/libcolorin.so
@comment lib/darktable/plugins/libcolorout.a
@comment lib/darktable/plugins/libcolorout.la
lib/darktable/plugins/libcolorout.so
@comment lib/darktable/plugins/libcolortransfer.a
@comment lib/darktable/plugins/libcolortransfer.la
lib/darktable/plugins/libcolortransfer.so
@comment lib/darktable/plugins/libcolorzones.a
@comment lib/darktable/plugins/libcolorzones.la
lib/darktable/plugins/libcolorzones.so
@comment lib/darktable/plugins/libequalizer.a
@comment lib/darktable/plugins/libequalizer.la
lib/darktable/plugins/libequalizer.so
@comment lib/darktable/plugins/libexposure.a
@comment lib/darktable/plugins/libexposure.la
lib/darktable/plugins/libexposure.so
@comment lib/darktable/plugins/libgamma.a
@comment lib/darktable/plugins/libgamma.la
lib/darktable/plugins/libgamma.so
@comment lib/darktable/plugins/libgrain.a
@comment lib/darktable/plugins/libgrain.la
lib/darktable/plugins/libgrain.so
@comment lib/darktable/plugins/libhighlights.a
@comment lib/darktable/plugins/libhighlights.la
lib/darktable/plugins/libhighlights.so
@comment lib/darktable/plugins/liblens.a
@comment lib/darktable/plugins/liblens.la
lib/darktable/plugins/liblens.so
@comment lib/darktable/plugins/libmonochrome.a
@comment lib/darktable/plugins/libmonochrome.la
lib/darktable/plugins/libmonochrome.so
@comment lib/darktable/plugins/libprofile_gamma.a
@comment lib/darktable/plugins/libprofile_gamma.la
lib/darktable/plugins/libprofile_gamma.so
@comment lib/darktable/plugins/librawimport.a
@comment lib/darktable/plugins/librawimport.la
lib/darktable/plugins/librawimport.so
@comment lib/darktable/plugins/libsharpen.a
@comment lib/darktable/plugins/libsharpen.la
lib/darktable/plugins/libsharpen.so
@comment lib/darktable/plugins/libsplittoning.a
@comment lib/darktable/plugins/libsplittoning.la
lib/darktable/plugins/libsplittoning.so
@comment lib/darktable/plugins/libtemperature.a
@comment lib/darktable/plugins/libtemperature.la
lib/darktable/plugins/libtemperature.so
@comment lib/darktable/plugins/libtonecurve.a
@comment lib/darktable/plugins/libtonecurve.la
lib/darktable/plugins/libtonecurve.so
@comment lib/darktable/plugins/libvelvia.a
@comment lib/darktable/plugins/libvelvia.la
lib/darktable/plugins/libvelvia.so
@comment lib/darktable/plugins/libvignette.a
@comment lib/darktable/plugins/libvignette.la
lib/darktable/plugins/libvignette.so
lib/darktable/plugins/lighttable/
@comment lib/darktable/plugins/lighttable/libcamera.a
@comment lib/darktable/plugins/lighttable/libcamera.la
lib/darktable/plugins/lighttable/libcamera.so
@comment lib/darktable/plugins/lighttable/libcapture.a
@comment lib/darktable/plugins/lighttable/libcapture.la
lib/darktable/plugins/lighttable/libcapture.so
@comment lib/darktable/plugins/lighttable/libcollect.a
@comment lib/darktable/plugins/lighttable/libcollect.la
lib/darktable/plugins/lighttable/libcollect.so
@comment lib/darktable/plugins/lighttable/libcolorlabels.a
@comment lib/darktable/plugins/lighttable/libcolorlabels.la
lib/darktable/plugins/lighttable/libcolorlabels.so
@comment lib/darktable/plugins/lighttable/libcopy_history.a
@comment lib/darktable/plugins/lighttable/libcopy_history.la
lib/darktable/plugins/lighttable/libcopy_history.so
@comment lib/darktable/plugins/lighttable/libexport.a
@comment lib/darktable/plugins/lighttable/libexport.la
lib/darktable/plugins/lighttable/libexport.so
@comment lib/darktable/plugins/lighttable/libimage.a
@comment lib/darktable/plugins/lighttable/libimage.la
lib/darktable/plugins/lighttable/libimage.so
@comment lib/darktable/plugins/lighttable/libselect.a
@comment lib/darktable/plugins/lighttable/libselect.la
lib/darktable/plugins/lighttable/libselect.so
@comment lib/darktable/plugins/lighttable/libtagging.a
@comment lib/darktable/plugins/lighttable/libtagging.la
lib/darktable/plugins/lighttable/libtagging.so
lib/darktable/views/
@comment lib/darktable/views/libcapture.a
@comment lib/darktable/views/libcapture.la
lib/darktable/views/libcapture.so
@comment lib/darktable/views/libdarkroom.a
@comment lib/darktable/views/libdarkroom.la
lib/darktable/views/libdarkroom.so
@comment lib/darktable/views/libfilmstrip.a
@comment lib/darktable/views/libfilmstrip.la
lib/darktable/views/libfilmstrip.so
@comment lib/darktable/views/liblighttable.a
@comment lib/darktable/views/liblighttable.la
lib/darktable/views/liblighttable.so
@man man/man1/darktable.1
share/applications/darktable.desktop
share/darktable/
share/darktable/color/
share/darktable/color/in/
share/darktable/color/out/
share/darktable/darktable.glade
share/darktable/darktable.gtkrc
share/darktable/pixmaps/
share/darktable/pixmaps/plugins/
share/darktable/pixmaps/plugins/darkroom/
share/darktable/pixmaps/plugins/darkroom/basecurve.png
share/darktable/pixmaps/plugins/darkroom/bilateral.png
share/darktable/pixmaps/plugins/darkroom/channelmixer.png
share/darktable/pixmaps/plugins/darkroom/clahe.png
share/darktable/pixmaps/plugins/darkroom/clipping.png
share/darktable/pixmaps/plugins/darkroom/colorcorrection.png
share/darktable/pixmaps/plugins/darkroom/colorin.png
share/darktable/pixmaps/plugins/darkroom/colorout.png
share/darktable/pixmaps/plugins/darkroom/colortransfer.png
share/darktable/pixmaps/plugins/darkroom/colorzones.png
share/darktable/pixmaps/plugins/darkroom/equalizer.png
share/darktable/pixmaps/plugins/darkroom/exposure.png
share/darktable/pixmaps/plugins/darkroom/grain.png
share/darktable/pixmaps/plugins/darkroom/highlights.png
share/darktable/pixmaps/plugins/darkroom/lens.png
share/darktable/pixmaps/plugins/darkroom/monochrome.png
share/darktable/pixmaps/plugins/darkroom/profile_gamma.png
share/darktable/pixmaps/plugins/darkroom/rawimport.png
share/darktable/pixmaps/plugins/darkroom/sharpen.png
share/darktable/pixmaps/plugins/darkroom/splittoning.png
share/darktable/pixmaps/plugins/darkroom/temperature.png
share/darktable/pixmaps/plugins/darkroom/template.png
share/darktable/pixmaps/plugins/darkroom/tonecurve.png
share/darktable/pixmaps/plugins/darkroom/velvia.png
share/darktable/pixmaps/plugins/darkroom/vignette.png
share/doc/darktable/
share/doc/darktable/AUTHORS
share/doc/darktable/LICENSE
share/doc/darktable/README
share/doc/darktable/TRANSLATORS
share/icons/hicolor/16x16/apps/darktable.png
share/icons/hicolor/22x22/apps/darktable.png
share/icons/hicolor/32x32/apps/darktable.png
share/icons/hicolor/48x48/apps/darktable.png
share/icons/hicolor/64x64/apps/darktable.png
share/icons/hicolor/scalable/apps/darktable.svg
share/locale/de/LC_MESSAGES/darktable.mo
share/locale/es/LC_MESSAGES/darktable.mo
share/locale/fi/LC_MESSAGES/darktable.mo
share/locale/fr/LC_MESSAGES/darktable.mo
share/locale/gl/LC_MESSAGES/darktable.mo
share/locale/nl/LC_MESSAGES/darktable.mo
share/locale/ru/LC_MESSAGES/darktable.mo
share/locale/sv/LC_MESSAGES/darktable.mo
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/darktable.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database