From 273474986c16f98aa5ffde0393a68b2637d7531c Mon Sep 17 00:00:00 2001
From: Tim Harder <radhermit@gmail.com>
Date: Tue, 30 Apr 2013 01:15:04 -0700
Subject: Fix compile with >=json-c-0.11

---
 config.mk         | 12 +++++++++++-
 src/util/Makefile |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/config.mk b/config.mk
index ee37bb26..0dee4cc0 100644
--- a/config.mk
+++ b/config.mk
@@ -103,8 +103,18 @@ else
 $(error Cannot find $(GNUTLS))
 endif
 
+# >=json-c-0.11 renamed its library, pc file, and include dir
+# first check for >=0.11, if it doesn't exist check for <0.11
+ifeq ($(shell pkg-config --exists json-c && echo 1), 1)
+JSONC=json-c
+else
 ifeq ($(shell pkg-config --exists json && echo 1), 1)
-LIBS+=$(GNUTLS)
+JSONC=json
+endif
+endif
+
+ifdef JSONC
+LIBS+=$(JSONC)
 else
 $(error Cannot find json-c)
 endif
diff --git a/src/util/Makefile b/src/util/Makefile
index 6bc16dbe..05a4b0cf 100644
--- a/src/util/Makefile
+++ b/src/util/Makefile
@@ -14,7 +14,7 @@ HSTS_PRELOAD=$(BASE_DIR)/$(SRCDIR)/hsts_preload.h
 TRANSPORT_SECURITY_JSON=transport_security_state_static.json
 TRANSPORT_SECURITY_CERTS=transport_security_state_static.certs
 
-LIBS=glib-2.0 gnutls json
+LIBS=glib-2.0 gnutls $(JSONC)
 CFLAGS+=$(shell pkg-config --cflags $(LIBS))
 LDFLAGS=$(shell pkg-config --libs $(LIBS))
 
-- 
cgit v1.2.3


From e7cdaaeb06374d1b9eb04842340d62f73a9b4be1 Mon Sep 17 00:00:00 2001
From: portix <portix@gmx.net>
Date: Thu, 6 Jun 2013 19:23:02 +0200
Subject: Dummy

---
 scripts/lib/dwb.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/lib/dwb.js b/scripts/lib/dwb.js
index 56bb81d6..b779bad9 100644
--- a/scripts/lib/dwb.js
+++ b/scripts/lib/dwb.js
@@ -912,4 +912,5 @@
         });
     }
 })();
+
 Object.preventExtensions(this);
-- 
cgit v1.2.3