Hi, pls find attached patch to make gcc happy.
kind regards
Wolfgang
...
-- Lua support: System library not found (to use darktable's version use
-DDONT_USE_INTERNAL_LUA=Off)
...
/home/goetz/repos/darktable/src/libs/import.c: In function ‘reset_child’:
/home/goetz/repos/darktable/src/libs/import.c:388:3: error: implicit
declaration of function ‘dt_lua_do_chunk_async’
[-Werror=implicit-function-declaration]
dt_lua_do_chunk_async(dt_lua_widget_trigger_callback,
^
/home/goetz/repos/darktable/src/libs/import.c:388:25: error:
‘dt_lua_widget_trigger_callback’ undeclared (first use in this function)
dt_lua_do_chunk_async(dt_lua_widget_trigger_callback,
^
/home/goetz/repos/darktable/src/libs/import.c:388:25: note: each undeclared
identifier is reported only once for each function it appears in
/home/goetz/repos/darktable/src/libs/import.c:389:7: error:
‘LUA_ASYNC_TYPENAME’ undeclared (first use in this function)
LUA_ASYNC_TYPENAME,"lua_widget",child, // the GtkWidget is an alias for
the lua_widget
^
/home/goetz/repos/darktable/src/libs/import.c:391:7: error: ‘LUA_ASYNC_DONE’
undeclared (first use in this function)
LUA_ASYNC_DONE);
^
/home/goetz/repos/darktable/src/libs/import.c: In function
‘_lib_import_get_extra_widget’:
/home/goetz/repos/darktable/src/libs/import.c:397:20: error: unused variable
‘d’ [-Werror=unused-variable]
dt_lib_import_t *d = (dt_lib_import_t *)self->data;
^
/home/goetz/repos/darktable/src/libs/import.c: In function
‘_lib_import_folder_callback’:
/home/goetz/repos/darktable/src/libs/import.c:855:20: error: unused variable
‘d’ [-Werror=unused-variable]
dt_lib_import_t *d = (dt_lib_import_t *)self->data;
^
/home/goetz/repos/darktable/src/libs/import.c: At top level:
/home/goetz/repos/darktable/src/libs/import.c:386:13: error: ‘reset_child’
defined but not used [-Werror=unused-function]
static void reset_child(GtkWidget* child, gpointer user_data)
^
cc1: all warnings being treated as errors
src/libs/CMakeFiles/import.dir/build.make:54: recipe for target
'src/libs/CMakeFiles/import.dir/import.c.o' failed
make[2]: *** [src/libs/CMakeFiles/import.dir/import.c.o] Error 1
CMakeFiles/Makefile2:2064: recipe for target
'src/libs/CMakeFiles/import.dir/all' failed
make[1]: *** [src/libs/CMakeFiles/import.dir/all] Error 2
diff --git a/src/libs/import.c b/src/libs/import.c
index 585860d..13fc4e0 100644
--- a/src/libs/import.c
+++ b/src/libs/import.c
@@ -383,6 +383,7 @@ static void _lib_import_presets_changed(GtkWidget *widget, dt_lib_import_metadat
}
}
+#ifdef USE_LUA
static void reset_child(GtkWidget* child, gpointer user_data)
{
dt_lua_do_chunk_async(dt_lua_widget_trigger_callback,
@@ -390,11 +391,10 @@ static void reset_child(GtkWidget* child, gpointer user_data)
LUA_ASYNC_TYPENAME,"const char*","reset",
LUA_ASYNC_DONE);
}
-
+#endif
static GtkWidget *_lib_import_get_extra_widget(dt_lib_module_t *self,dt_lib_import_metadata_t *data, gboolean import_folder)
{
- dt_lib_import_t *d = (dt_lib_import_t *)self->data;
// add extra lines to 'extra'. don't forget to destroy the widgets later.
GtkWidget *expander = gtk_expander_new(_("import options"));
gtk_expander_set_expanded(GTK_EXPANDER(expander), dt_conf_get_bool("ui_last/import_options_expanded"));
@@ -852,7 +852,6 @@ static void _lib_import_single_image_callback(GtkWidget *widget, gpointer user_d
static void _lib_import_folder_callback(GtkWidget *widget, gpointer user_data)
{
dt_lib_module_t* self= (dt_lib_module_t*) user_data;
- dt_lib_import_t *d = (dt_lib_import_t *)self->data;
GtkWidget *win = dt_ui_main_window(darktable.gui->ui);
GtkWidget *filechooser = gtk_file_chooser_dialog_new(
_("import film"), GTK_WINDOW(win), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, _("_Cancel"),
pgpxaazstzc8a.pgp
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Monitor 25 network devices or servers for free with OpManager! OpManager is web-based network management software that monitors network devices and physical & virtual servers, alerts via email & sms for fault. Monitor 25 devices for free with no restriction. Download now http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________ darktable-devel mailing list darktable-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/darktable-devel
