caja: Fix build on Darwin.

[youri <youri%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Sat Apr 9 12:10:44 2016 +0200
Changeset:	959b4efee8a6c2df8be3d0b207f5010b5d7cd784

Modified Files:
	caja/distinfo
Added Files:
	caja/patches/patch-eel_eel-background.c
	caja/patches/patch-libcaja-private_caja-global-preferences.c
	caja/patches/patch-libcaja-private_caja-global-preferences.h
	caja/patches/patch-src_caja-file-management-properties.h

Log Message:
caja: Fix build on Darwin.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=959b4efee8a6c2df8be3d0b207f5010b5d7cd784

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 caja/distinfo                                      |  4 +++
 caja/patches/patch-eel_eel-background.c            | 15 +++++++++
 ...patch-libcaja-private_caja-global-preferences.c | 24 +++++++++++++++
 ...patch-libcaja-private_caja-global-preferences.h | 36 ++++++++++++++++++++++
 .../patch-src_caja-file-management-properties.h    | 13 ++++++++
 5 files changed, 92 insertions(+)

diffs:
diff --git a/caja/distinfo b/caja/distinfo
index 377f099..2dbb67b 100644
--- a/caja/distinfo
+++ b/caja/distinfo
@@ -4,3 +4,7 @@ SHA1 (caja-1.12.6.tar.xz) = 8e69164061fb8d21d2f887d1321b94d5225abe02
 RMD160 (caja-1.12.6.tar.xz) = b4104dbbd418f127d78ae2ba87026c4c8c09c7c9
 SHA512 (caja-1.12.6.tar.xz) = 9b4bbc9f856380e4a296b46aee1941b3c590de18550dbb19d64ca885c790296173bbce0bcd5f1562fdf01ca772f16dca8e17706cd434debfec8c6196fefa59a1
 Size (caja-1.12.6.tar.xz) = 3646336 bytes
+SHA1 (patch-eel_eel-background.c) = 9d0ed0d9f3c9004f6d9024837538cc26cdb410da
+SHA1 (patch-libcaja-private_caja-global-preferences.c) = 122d62430cf57e274f1e561783ca0f69d0de7d56
+SHA1 (patch-libcaja-private_caja-global-preferences.h) = edac3dc74ad737ed9e5347e8eb5eb83866dcaadf
+SHA1 (patch-src_caja-file-management-properties.h) = 4529eb0c91c39c1d1b1983da23074adfeb28c1a8
diff --git a/caja/patches/patch-eel_eel-background.c b/caja/patches/patch-eel_eel-background.c
new file mode 100644
index 0000000..01441c4
--- /dev/null
+++ b/caja/patches/patch-eel_eel-background.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix build on Darwin.
+
+--- eel/eel-background.c.orig	2015-07-16 07:11:15.000000000 +0000
++++ eel/eel-background.c
+@@ -450,6 +450,8 @@ set_root_surface (EelBackground *self,
+         mate_bg_set_surface_as_root (screen, self->details->bg_surface);
+ }
+ 
++GSettings *mate_background_preferences;
++
+ static void
+ init_fade (EelBackground *self)
+ {
diff --git a/caja/patches/patch-libcaja-private_caja-global-preferences.c b/caja/patches/patch-libcaja-private_caja-global-preferences.c
new file mode 100644
index 0000000..4247d09
--- /dev/null
+++ b/caja/patches/patch-libcaja-private_caja-global-preferences.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fix build on Darwin.
+
+--- libcaja-private/caja-global-preferences.c.orig	2015-07-16 07:11:15.000000000 +0000
++++ libcaja-private/caja-global-preferences.c
+@@ -62,6 +62,17 @@ caja_global_preferences_get_default_fold
+     return g_strdup (viewer_iid);
+ }
+ 
++GSettings *caja_preferences;
++GSettings *caja_compact_view_preferences;
++GSettings *caja_desktop_preferences;
++GSettings *caja_extension_preferences;
++GSettings *caja_icon_view_preferences;
++GSettings *caja_list_view_preferences;
++GSettings *caja_media_preferences;
++GSettings *caja_tree_sidebar_preferences;
++GSettings *caja_window_state;
++GSettings *mate_lockdown_preferences;
++
+ void
+ caja_global_preferences_init (void)
+ {
diff --git a/caja/patches/patch-libcaja-private_caja-global-preferences.h b/caja/patches/patch-libcaja-private_caja-global-preferences.h
new file mode 100644
index 0000000..bcc694d
--- /dev/null
+++ b/caja/patches/patch-libcaja-private_caja-global-preferences.h
@@ -0,0 +1,36 @@
+$NetBSD$
+
+Fix build on Darwin.
+
+--- libcaja-private/caja-global-preferences.h.orig	2015-07-16 07:11:15.000000000 +0000
++++ libcaja-private/caja-global-preferences.h
+@@ -208,18 +208,18 @@ typedef enum
+ void caja_global_preferences_init                      (void);
+ char *caja_global_preferences_get_default_folder_viewer_preference_as_iid (void);
+ 
+-GSettings *caja_preferences;
+-GSettings *caja_media_preferences;
+-GSettings *caja_window_state;
+-GSettings *caja_icon_view_preferences;
+-GSettings *caja_desktop_preferences;
+-GSettings *caja_tree_sidebar_preferences;
+-GSettings *caja_compact_view_preferences;
+-GSettings *caja_list_view_preferences;
+-GSettings *caja_extension_preferences;
++extern GSettings *caja_preferences;
++extern GSettings *caja_media_preferences;
++extern GSettings *caja_window_state;
++extern GSettings *caja_icon_view_preferences;
++extern GSettings *caja_desktop_preferences;
++extern GSettings *caja_tree_sidebar_preferences;
++extern GSettings *caja_compact_view_preferences;
++extern GSettings *caja_list_view_preferences;
++extern GSettings *caja_extension_preferences;
+ 
+-GSettings *mate_background_preferences;
+-GSettings *mate_lockdown_preferences;
++extern GSettings *mate_background_preferences;
++extern GSettings *mate_lockdown_preferences;
+ 
+ G_END_DECLS
+ 
diff --git a/caja/patches/patch-src_caja-file-management-properties.h b/caja/patches/patch-src_caja-file-management-properties.h
new file mode 100644
index 0000000..bd9bf15
--- /dev/null
+++ b/caja/patches/patch-src_caja-file-management-properties.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+Fix build on Darwin.
+
+--- src/caja-file-management-properties.h.orig	2015-07-16 07:11:15.000000000 +0000
++++ src/caja-file-management-properties.h
+@@ -38,4 +38,6 @@ extern "C" {
+ }
+ #endif
+ 
++GSettings *caja_preferences;
++
+ #endif /* CAJA_FILE_MANAGEMENT_PROPERTIES_H */