Skip to contentSkip to conversation

json-c: bump version to json-c-0.12-20140410

PATCH New Sagaert Johan 2 participants 2 messages Apr 15, 2015 – Apr 16, 2015

lore
Share & tools
lore

Sagaert Johan

author
#0 lore raw

PATCH v3 1/1 json-c: bump version to json-c-0.12-20140410

Also;
-removed upstream patch
-added patch to remove -Werror from make flags

Signed-off-by Sagaert Johan <[email protected]>

---
V2->V3
no hash for git checkouts
add comment to AUTORECONF line.
---
V1->V2
Remove the -Werror from make flags

---
 .../0001-don-t-threat-warnings-as-errors.patch     | 21 +++++++++++
 package/json-c/0001-no-reentrant.patch             | 44 ----------------------
 package/json-c/json-c.mk                           |  4 +-
 3 files changed, 24 insertions(+), 45 deletions(-)
 create mode 100644 package/json-c/0001-don-t-threat-warnings-as-errors.patch
 delete mode 100644 package/json-c/0001-no-reentrant.patch
package/json-c/0001-don-t-threat-warnings-as-errors.patch new file +21 -0
new file mode 100644
index 0000000..f18bf92
@@ -0,0 +1,21 @@
+From e81a30a35107643323950ef6803eddebecb33344 Mon Sep 17 00:00:00 2001
+From: Sagaert Johan <[email protected]>
+Date: Wed, 15 Apr 2015 00:40:46 +0200
+Subject: [PATCH 1/1] don't threat warnings as errors
+
+Signed-off-by: Sagaert Johan <[email protected]>
+---
+ Makefile.am.inc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am.inc b/Makefile.am.inc
+index fec591b..61db1d2 100644
+--- a/Makefile.am.inc
++++ b/Makefile.am.inc
+@@ -1,2 +1,2 @@
+-AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+ 
+-- 
+2.3.3
+
package/json-c/0001-no-reentrant.patch deleted +0 -44

44 lines not on this page · raw message

package/json-c/json-c.mk +3 -1
index b8212ca..35243f1 100644
@@ -4,11 +4,13 @@
 #
 ################################################################################
 
-JSON_C_VERSION = json-c-0.11-20130402
+JSON_C_VERSION = json-c-0.12-20140410
 JSON_C_SITE = $(call github,json-c,json-c,$(JSON_C_VERSION))
 JSON_C_INSTALL_STAGING = YES
 JSON_C_MAKE = $(MAKE1)
 JSON_C_CONF_OPTS = --disable-oldname-compat
+# AUTORECONF is needed because of Makefile.am.inc patch.
+JSON_C_AUTORECONF = YES
 JSON_C_LICENSE = MIT
 JSON_C_LICENSE_FILES = COPYING
Signature · 1 line
2.3.3
Applied
#1 lore raw

PATCH v3 1/1 json-c: bump version to json-c-0.12-20140410

Dear Sagaert Johan,

Quoted 12 lines · Sagaert Johan

Also;
-removed upstream patch
-added patch to remove -Werror from make flags

Signed-off-by Sagaert Johan <[email protected]>

---
V2->V3
no hash for git checkouts
add comment to AUTORECONF line.
---
V1->V2
Remove the -Werror from make flags

Quoted 7 lines
---
 .../0001-don-t-threat-warnings-as-errors.patch     | 21 +++++++++++
 package/json-c/0001-no-reentrant.patch             | 44 ----------------------
 package/json-c/json-c.mk                           |  4 +-
 3 files changed, 24 insertions(+), 45 deletions(-)
 create mode 100644 package/json-c/0001-don-t-threat-warnings-as-errors.patch
 delete mode 100644 package/json-c/0001-no-reentrant.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com