bijiben: Initial scratch to port bijiben to webkitgtk 4.0

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jun 12 02:02:43 2016 +0200
Changeset:	5346cbf4326f8036e223320cf881c2f69a2d458f

Added Files:
	bijiben/patches/patch-configure
	bijiben/patches/patch-src_libbiji_editor_biji-editor-selection.h
	bijiben/patches/patch-src_libbiji_editor_biji-editor-utils.h
	bijiben/patches/patch-src_libbiji_editor_biji-webkit-editor.c
	bijiben/patches/patch-src_libbiji_editor_biji-webkit-editor.h

Log Message:
bijiben: Initial scratch to port bijiben to webkitgtk 4.0

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

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

diffstat:
 bijiben/patches/patch-configure                    | 85 ++++++++++++++++++++++
 ...atch-src_libbiji_editor_biji-editor-selection.h | 20 +++++
 .../patch-src_libbiji_editor_biji-editor-utils.h   | 13 ++++
 .../patch-src_libbiji_editor_biji-webkit-editor.c  | 13 ++++
 .../patch-src_libbiji_editor_biji-webkit-editor.h  | 13 ++++
 5 files changed, 144 insertions(+)

diffs:
diff --git a/bijiben/patches/patch-configure b/bijiben/patches/patch-configure
new file mode 100644
index 0000000..ac74561
--- /dev/null
+++ b/bijiben/patches/patch-configure
@@ -0,0 +1,85 @@
+$NetBSD$
+
+--- configure.orig	2016-05-09 20:50:29.000000000 +0000
++++ configure
+@@ -14545,7 +14545,7 @@ if test -n "$BIJIBEN_CFLAGS"; then
+                     libxml-2.0
+                     \$sparql_version
+                     uuid
+-                    webkitgtk-3.0\""; } >&5
++                    webkit2gtk-4.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors " libecal-1.2 >= $EDS_REQUIRED_VERSION
+ 		    libedataserver-1.2 >= $EDS_REQUIRED_VERSION
+ 		    libedataserverui-1.2 >= $EDS_REQUIRED_VERSION
+@@ -14557,7 +14557,7 @@ if test -n "$BIJIBEN_CFLAGS"; then
+                     libxml-2.0
+                     $sparql_version
+                     uuid
+-                    webkitgtk-3.0") 2>&5
++                    webkit2gtk-4.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+@@ -14572,7 +14572,7 @@ if test -n "$BIJIBEN_CFLAGS"; then
+                     libxml-2.0
+                     $sparql_version
+                     uuid
+-                    webkitgtk-3.0" 2>/dev/null`
++                    webkit2gtk-4.0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -14595,7 +14595,7 @@ if test -n "$BIJIBEN_LIBS"; then
+                     libxml-2.0
+                     \$sparql_version
+                     uuid
+-                    webkitgtk-3.0\""; } >&5
++                    webkit2gtk-4.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors " libecal-1.2 >= $EDS_REQUIRED_VERSION
+ 		    libedataserver-1.2 >= $EDS_REQUIRED_VERSION
+ 		    libedataserverui-1.2 >= $EDS_REQUIRED_VERSION
+@@ -14607,7 +14607,7 @@ if test -n "$BIJIBEN_LIBS"; then
+                     libxml-2.0
+                     $sparql_version
+                     uuid
+-                    webkitgtk-3.0") 2>&5
++                    webkit2gtk-4.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+@@ -14622,7 +14622,7 @@ if test -n "$BIJIBEN_LIBS"; then
+                     libxml-2.0
+                     $sparql_version
+                     uuid
+-                    webkitgtk-3.0" 2>/dev/null`
++                    webkit2gtk-4.0" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -14654,7 +14654,7 @@ fi
+                     libxml-2.0
+                     $sparql_version
+                     uuid
+-                    webkitgtk-3.0" 2>&1`
++                    webkit2gtk-4.0" 2>&1`
+         else
+ 	        BIJIBEN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libecal-1.2 >= $EDS_REQUIRED_VERSION
+ 		    libedataserver-1.2 >= $EDS_REQUIRED_VERSION
+@@ -14667,7 +14667,7 @@ fi
+                     libxml-2.0
+                     $sparql_version
+                     uuid
+-                    webkitgtk-3.0" 2>&1`
++                    webkit2gtk-4.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$BIJIBEN_PKG_ERRORS" >&5
+@@ -14683,7 +14683,7 @@ fi
+                     libxml-2.0
+                     $sparql_version
+                     uuid
+-                    webkitgtk-3.0) were not met:
++                    webkit2gtk-4.0) were not met:
+ 
+ $BIJIBEN_PKG_ERRORS
+ 
diff --git a/bijiben/patches/patch-src_libbiji_editor_biji-editor-selection.h b/bijiben/patches/patch-src_libbiji_editor_biji-editor-selection.h
new file mode 100644
index 0000000..ea3c3df
--- /dev/null
+++ b/bijiben/patches/patch-src_libbiji_editor_biji-editor-selection.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- src/libbiji/editor/biji-editor-selection.h.orig	2014-10-18 21:26:34.000000000 +0000
++++ src/libbiji/editor/biji-editor-selection.h
+@@ -20,7 +20,7 @@
+ #define E_EDITOR_SELECTION_H
+ 
+ #include <glib-object.h>
+-#include <webkit/webkit.h>
++#include <webkit2/webkit2.h>
+ 
+ /* Standard GObject macros */
+ #define E_TYPE_EDITOR_SELECTION \
+@@ -204,4 +204,4 @@ void			e_editor_selection_wrap_lines	(EE
+ 
+ G_END_DECLS
+ 
+-#endif /* E_EDITOR_SELECTION_H */
+\ No newline at end of file
++#endif /* E_EDITOR_SELECTION_H */
diff --git a/bijiben/patches/patch-src_libbiji_editor_biji-editor-utils.h b/bijiben/patches/patch-src_libbiji_editor_biji-editor-utils.h
new file mode 100644
index 0000000..75fb03e
--- /dev/null
+++ b/bijiben/patches/patch-src_libbiji_editor_biji-editor-utils.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/libbiji/editor/biji-editor-utils.h.orig	2014-10-18 21:26:34.000000000 +0000
++++ src/libbiji/editor/biji-editor-utils.h
+@@ -19,7 +19,7 @@
+ #ifndef E_EDITOR_UTILS_H
+ #define E_EDITOR_UTILS_H
+ 
+-#include <webkit/webkitdom.h>
++#include <webkitdom/webkitdom.h>
+ 
+ WebKitDOMElement * e_editor_dom_node_find_parent_element (WebKitDOMNode *node, const gchar *tagname);
+ 
diff --git a/bijiben/patches/patch-src_libbiji_editor_biji-webkit-editor.c b/bijiben/patches/patch-src_libbiji_editor_biji-webkit-editor.c
new file mode 100644
index 0000000..76ff9b8
--- /dev/null
+++ b/bijiben/patches/patch-src_libbiji_editor_biji-webkit-editor.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/libbiji/editor/biji-webkit-editor.c.orig	2014-10-26 21:06:45.000000000 +0000
++++ src/libbiji/editor/biji-webkit-editor.c
+@@ -47,7 +47,7 @@ struct _BijiWebkitEditorPrivate
+   gulong color_changed;
+   gchar *font_color;
+ 
+-  WebKitWebSettings *settings;
++  WebKitSettings *settings;
+   EEditorSelection *sel;
+   GObject *spell_check;
+ };
diff --git a/bijiben/patches/patch-src_libbiji_editor_biji-webkit-editor.h b/bijiben/patches/patch-src_libbiji_editor_biji-webkit-editor.h
new file mode 100644
index 0000000..9d8f0aa
--- /dev/null
+++ b/bijiben/patches/patch-src_libbiji_editor_biji-webkit-editor.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/libbiji/editor/biji-webkit-editor.h.orig	2014-10-18 21:26:34.000000000 +0000
++++ src/libbiji/editor/biji-webkit-editor.h
+@@ -19,7 +19,7 @@
+ #define _BIJI_WEBKIT_EDITOR_H_
+ 
+ #include <gtk/gtk.h>
+-#include <webkit/webkit.h>
++#include <webkit2/webkit2.h>
+ 
+ #include "../biji-note-obj.h"
+