From 923da0cc790a3495ca7c072e8f28f918e03b4ef3 Mon Sep 17 00:00:00 2001
From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Sun, 6 Nov 2016 11:03:36 +0100
Subject: [PATCH] xap/uzbl:  Upgraded to uzbl-0.9.1icp1.

---
 ...ocal.diff => uzbl-0.9.1-incenp-local.diff} |  4 +-
 ...228-incenp.diff => uzbl-0.9.1-incenp.diff} | 53 ++++++-------------
 xap/uzbl/uzbl.SlackBuild                      | 13 ++---
 3 files changed, 26 insertions(+), 44 deletions(-)
 rename xap/uzbl/{uzbl-20160228-incenp-local.diff => uzbl-0.9.1-incenp-local.diff} (99%)
 rename xap/uzbl/{uzbl-20160228-incenp.diff => uzbl-0.9.1-incenp.diff} (97%)

diff --git a/xap/uzbl/uzbl-20160228-incenp-local.diff b/xap/uzbl/uzbl-0.9.1-incenp-local.diff
similarity index 99%
rename from xap/uzbl/uzbl-20160228-incenp-local.diff
rename to xap/uzbl/uzbl-0.9.1-incenp-local.diff
index b986667c..7f3c26c5 100644
--- a/xap/uzbl/uzbl-20160228-incenp-local.diff
+++ b/xap/uzbl/uzbl-0.9.1-incenp-local.diff
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index 0b6f7af..2a5d083 100644
+index 87fee74..3255631 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -303,6 +303,14 @@ install-uzbl-browser: uzbl-browser install-dirs install-uzbl-core install-event-
+@@ -280,6 +280,14 @@ install-uzbl-browser: uzbl-browser install-dirs install-uzbl-core install-event-
  install-uzbl-tabbed: install-dirs
  	$(INSTALL) -m755 bin/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
  
diff --git a/xap/uzbl/uzbl-20160228-incenp.diff b/xap/uzbl/uzbl-0.9.1-incenp.diff
similarity index 97%
rename from xap/uzbl/uzbl-20160228-incenp.diff
rename to xap/uzbl/uzbl-0.9.1-incenp.diff
index c5169b3f..7779a9c6 100644
--- a/xap/uzbl/uzbl-20160228-incenp.diff
+++ b/xap/uzbl/uzbl-0.9.1-incenp.diff
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index 6ce211f..0b6f7af 100644
+index 6dfc5ae..87fee74 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -97,6 +97,7 @@ SOURCES := \
+@@ -67,6 +67,7 @@ SOURCES := \
      inspector.c \
      io.c \
      js.c \
@@ -10,7 +10,7 @@ index 6ce211f..0b6f7af 100644
      requests.c \
      scheme.c \
      status-bar.c \
-@@ -114,6 +115,7 @@ HEADERS := \
+@@ -87,6 +88,7 @@ HEADERS := \
      inspector.h \
      io.h \
      js.h \
@@ -19,10 +19,10 @@ index 6ce211f..0b6f7af 100644
      menu.h \
      scheme.h \
 diff --git a/README.md b/README.md
-index df2a3ad..5051638 100644
+index c154c17..98832f8 100644
 --- a/README.md
 +++ b/README.md
-@@ -1418,6 +1418,11 @@ uzbl itself and will be emitted based on what is happening within uzbl-core.
+@@ -1293,6 +1293,11 @@ uzbl itself and will be emitted based on what is happening within uzbl-core.
    - Sent when a request has been sent to the server.
  * `REQUEST_FINISHED <URI>`
    - Sent when a request has completed.
@@ -90,10 +90,10 @@ index aac76e1..627ef93 100644
      call (CLOSE_NOTIFICATION),  \
      /* Must be last entry. */   \
 diff --git a/src/gui.c b/src/gui.c
-index 2fefabc..6001024 100644
+index 3e2d2b2..33efbba 100644
 --- a/src/gui.c
 +++ b/src/gui.c
-@@ -818,6 +818,8 @@ struct _UzblGui {
+@@ -622,10 +622,11 @@ static gboolean
  request_decision (const gchar *uri, gpointer data);
  static void
  send_load_status (WebKitLoadStatus status, const gchar *uri);
@@ -102,17 +102,11 @@ index 2fefabc..6001024 100644
  static gboolean
  send_load_error (const gchar *uri, GError *err);
  
-@@ -910,6 +912,9 @@ struct _UzblGui {
-     const gchar *uri = webkit_web_view_get_uri (view);
- 
-     send_load_status (event, uri);
-+
-+    if (event == WEBKIT_LOAD_COMMITTED)
-+        send_tls_status (view);
- }
- 
+-
  gboolean
-@@ -1179,6 +1184,9 @@ struct _UzblGui {
+ navigation_decision_cb (WebKitWebView *view, WebKitWebFrame *frame,
+         WebKitNetworkRequest *request, WebKitWebNavigationAction *navigation_action,
+@@ -752,6 +753,9 @@ load_status_change_cb (WebKitWebView *view, GParamSpec param_spec, gpointer data
      const gchar *uri = webkit_web_view_get_uri (view);
  
      send_load_status (status, uri);
@@ -122,7 +116,7 @@ index 2fefabc..6001024 100644
  }
  
  gboolean
-@@ -2234,6 +2242,90 @@ struct _UzblGui {
+@@ -1426,6 +1430,77 @@ send_load_error (const gchar *uri, GError *err)
      return FALSE;
  }
  
@@ -136,14 +130,6 @@ index 2fefabc..6001024 100644
 +    GTlsCertificate *cert;
 +    GTlsCertificateFlags flags;
 +
-+#ifdef USE_WEBKIT2
-+    SoupURI *uri;
-+
-+    uri = soup_uri_new (webkit_web_view_get_uri (view));
-+    host = soup_uri_get_host (uri);
-+
-+    use_tls = webkit_web_view_get_tls_info (view, &cert, &flags);
-+#else
 +    WebKitWebFrame *frame;
 +    WebKitNetworkResponse *response;
 +
@@ -157,7 +143,6 @@ index 2fefabc..6001024 100644
 +            use_tls = soup_message_get_https_status (message, &cert, &flags);
 +        }
 +    }
-+#endif
 +
 +    if (use_tls) {
 +
@@ -204,15 +189,11 @@ index 2fefabc..6001024 100644
 +
 +    if (pem_chain)
 +        g_string_free(pem_chain, TRUE);
-+
-+#ifdef USE_WEBKIT2
-+    soup_uri_free (uri);
-+#endif
 +}
 +
- #ifdef USE_WEBKIT2
- #if WEBKIT_CHECK_VERSION (2, 1, 4)
- void
+ gboolean
+ mime_decision (WebKitWebPolicyDecision *decision, const gchar *mime_type, const gchar *disposition)
+ {
 diff --git a/src/proxy-resolver.c b/src/proxy-resolver.c
 new file mode 100644
 index 0000000..4e065cc
@@ -404,7 +385,7 @@ index 0000000..cf2a809
 +
 +#endif /* !ICP20100103_PROXY_RESOLVER_H */
 diff --git a/src/soup.c b/src/soup.c
-index 6f209d5..d6f39cd 100644
+index 9d048d3..542da36 100644
 --- a/src/soup.c
 +++ b/src/soup.c
 @@ -8,6 +8,7 @@
@@ -415,7 +396,7 @@ index 6f209d5..d6f39cd 100644
  
  static void
  request_queued_cb (SoupSession *session,
-@@ -32,6 +33,9 @@
+@@ -40,6 +41,9 @@ uzbl_soup_init (SoupSession *session)
      soup_session_add_feature (session,
          SOUP_SESSION_FEATURE (uzbl.net.soup_cookie_jar));
  
diff --git a/xap/uzbl/uzbl.SlackBuild b/xap/uzbl/uzbl.SlackBuild
index 3bb1af8a..c973874d 100755
--- a/xap/uzbl/uzbl.SlackBuild
+++ b/xap/uzbl/uzbl.SlackBuild
@@ -30,10 +30,11 @@
 
 # Source package infos
 NAMESRC=${NAMESRC:-uzbl}
-VERSION=${VERSION:-20160228}
+VERSION=${VERSION:-0.9.1}
+PATCH=${PATCH:-icp1}
 ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
 REPOS=${REPOS:-git://github.com/uzbl/uzbl.git}
-REVISION=${REVISION:-ea2d72ea7be7fbdadd3840d602d5f86ce9c1b748}
+REVISION=${REVISION:-981a45e848c779a3f7b49ce157e3f6df2f561099}
 
 # Build infos
 NAMEPKG=${NAMEPKG:-uzbl}
@@ -87,14 +88,14 @@ cd $TMP
 echo "Building $ARCHIVE..."
 tar xf $CWD/$ARCHIVE
 cd $NAMESRC-$VERSION
-patch -p 1 < $CWD/uzbl-20160228-incenp.diff
-patch -p 1 < $CWD/uzbl-20160228-incenp-local.diff
+patch -p 1 < $CWD/uzbl-0.9.1-incenp.diff
+patch -p 1 < $CWD/uzbl-0.9.1-incenp-local.diff
 CFLAGS=$CPUOPT \
 CXXFLAGS=$CPUOPT \
 make \
   DESTDIR=$PKG \
   PREFIX=/usr \
-  DOCDIR=$PKG/usr/doc/$NAMESRC-$VERSION \
+  DOCDIR=$PKG/usr/doc/$NAMESRC-$VERSION$PATCH \
   MANDIR=$PKG/usr/man \
   ENABLE_WEBKIT2=no \
   install-uzbl-incenp
@@ -112,7 +113,7 @@ cd $PKG
 mkdir -p $OUT
 PACKAGING="
 chown root:root . -R
-/sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSION-$ARCH-$BUILD.$EXT
+/sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSION$PATCH-$ARCH-$BUILD.$EXT
 rm -rf $PKG
 rm -rf $TMP/$NAMESRC-$VERSION
 "