uzbl-git: Remove WebKit1 support.

[Mateusz Poszwa <old4%o2.pl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Wed Mar 9 20:38:49 2016 +0100
Changeset:	67085340a66afebfe40a0c953c84fc41f30793f8

Modified Files:
	uzbl-git/Makefile
	uzbl-git/TODO
	uzbl-git/distinfo
Added Files:
	uzbl-git/patches/patch-src_gui.c
Removed Files:
	uzbl-git/patches/patch-examples_config_config

Log Message:
uzbl-git: Remove WebKit1 support.

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

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

diffstat:
 uzbl-git/Makefile                             | 13 +------------
 uzbl-git/TODO                                 |  7 +++----
 uzbl-git/distinfo                             |  2 +-
 uzbl-git/patches/patch-examples_config_config | 15 ---------------
 uzbl-git/patches/patch-src_gui.c              | 12 ++++++++++++
 5 files changed, 17 insertions(+), 32 deletions(-)

diffs:
diff --git a/uzbl-git/Makefile b/uzbl-git/Makefile
index 62e29ac..8bfa290 100644
--- a/uzbl-git/Makefile
+++ b/uzbl-git/Makefile
@@ -31,24 +31,13 @@ REPLACE_PYTHON+=	examples/data/scripts/per-site-settings.py
 REPLACE_PYTHON+=	examples/data/scripts/scheme.py
 .include "../../lang/python/application.mk"
 
-post-install:
-	${RM} ${DESTDIR}/${PREFIX}/share/uzbl/examples/config/config.orig
-
 # for uzbl-browser
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 # for uzbl-tabbed with GTK+ 2
 #DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 
-## TODO: make an option for webkit version
-##.include "../../www/webkit-gtk/buildlink3.mk"
-## or
-# TODO: make an option for GTK version
-#.include "../../www/webkit24-gtk/buildlink3.mk"
-# or
-.include "../../www/webkit24-gtk3/buildlink3.mk"
-
+.include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
-
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../wip/mk/git-package.mk"
diff --git a/uzbl-git/TODO b/uzbl-git/TODO
index a897b46..ac514a5 100644
--- a/uzbl-git/TODO
+++ b/uzbl-git/TODO
@@ -1,5 +1,4 @@
-Add convert to WebKit2 (it is going to be the only supported version after 0.9)
-Add option for GTK+ version
 Add options or separate packages for uzbl-browser and uzbl-tabbed
-Resolve Python version conflict for uzbl-tabbed with GTK+ 2
-Add missing dependencies for uzbl-tabbed with GTK+ 3
+Add option for GTK+ version for uzbl-tabbed:
+ Resolve Python version conflict for uzbl-tabbed with GTK+ 2
+ Add missing dependencies for uzbl-tabbed with GTK+ 3
diff --git a/uzbl-git/distinfo b/uzbl-git/distinfo
index 70bcf52..c38952a 100644
--- a/uzbl-git/distinfo
+++ b/uzbl-git/distinfo
@@ -1,3 +1,3 @@
 $NetBSD$
 
-SHA1 (patch-examples_config_config) = 56ac5901dc93086ba5bf0167df21e90c4fa995fc
+SHA1 (patch-src_gui.c) = 2a5805f40fff5bcf6641665f04ecc28ec9fab1e5
diff --git a/uzbl-git/patches/patch-examples_config_config b/uzbl-git/patches/patch-examples_config_config
deleted file mode 100644
index 9417d67..0000000
--- a/uzbl-git/patches/patch-examples_config_config
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Change the default path to certificates file.
-
---- examples/config/config.orig	2016-02-11 20:59:51.000000000 +0000
-+++ examples/config/config
-@@ -523,7 +523,7 @@ set default_mode command
- # === SSL related configuration ==============================================
- 
- # Set it to certificates store of your distribution, or your own CAfile.
--set ssl_ca_file /etc/ssl/certs/ca-bundle.crt
-+set ssl_ca_file /etc/ssl/certs/ca-certificates.crt
- set ssl_policy fail
- # Command to toggle ssl_policy value:
- @cbind  !ssl = chain 'toggle ssl_policy fail ignore' 'reload'
diff --git a/uzbl-git/patches/patch-src_gui.c b/uzbl-git/patches/patch-src_gui.c
new file mode 100644
index 0000000..346a04e
--- /dev/null
+++ b/uzbl-git/patches/patch-src_gui.c
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/gui.c.orig	2016-03-09 18:02:53.000000000 +0000
++++ src/gui.c
+@@ -227,6 +227,7 @@ static gboolean
+ tls_error_cb (WebKitWebView *view, GTlsCertificate *cert, GTlsCertificateFlags flags, const gchar *host, gpointer data);
+ static gboolean
+ tls_error_cb (WebKitWebView *view, WebKitCertificateInfo *info, const gchar *host, gpointer data);
++#endif
+ /* UI events */
+ static GtkWidget *
+ create_cb (WebKitWebView *view, gpointer data);