From b5de8449daf5f7a38dc585791ce1a39e76525029 Mon Sep 17 00:00:00 2001
From: Lemures Lemniscati <lemures.lemniscati@gmail.com>
Date: Tue, 3 Aug 2021 22:57:37 +0900
Subject: [PATCH] A bug-fix in the upstream

Fix the issue #185 in the upstream: https://github.com/fukuchi/libqrencode/issues/185
cf. the pull-request #186: https://github.com/fukuchi/libqrencode/pull/186
---
 4.1.1-fix-max_data_size.patch | 35 +++++++++++++++++++++++++++++++++++
 qrencode.cygport              | 17 +++++++----------
 2 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 4.1.1-fix-max_data_size.patch

diff --git a/4.1.1-fix-max_data_size.patch b/4.1.1-fix-max_data_size.patch
new file mode 100644
index 0000000..58c0bd6
--- /dev/null
+++ b/4.1.1-fix-max_data_size.patch
@@ -0,0 +1,35 @@
+From ec7f4af217105a835a363ac52f3fa358cbd35a34 Mon Sep 17 00:00:00 2001
+From: Lemures Lemniscati <lemures.lemniscati@gmail.com>
+Date: Tue, 3 Aug 2021 07:42:28 +0900
+Subject: [PATCH] Fix MAX_DATA_SIZE, in case 16 symbols are needed by
+ structured appending
+
+Fix a bug introduced in the commit 3e629c7
+---
+ qrenc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/qrenc.c b/qrenc.c
+index c09c4ab..6e589e8 100644
+--- a/qrenc.c
++++ b/qrenc.c
+@@ -32,6 +32,7 @@
+ #endif
+ 
+ #include "qrencode.h"
++#include "qrinput.h"
+ 
+ #define INCHES_PER_METER (100.0/2.54)
+ 
+@@ -237,7 +238,7 @@ static int color_set(unsigned char color[4], const char *value)
+ 	return 0;
+ }
+ 
+-#define MAX_DATA_SIZE (7090 * 2) /* timed by the safty factor 2 */
++#define MAX_DATA_SIZE (7089 * MAX_STRUCTURED_SYMBOLS + 1) /* an upper bound (cf. the specification) */
+ static unsigned char data_buffer[MAX_DATA_SIZE];
+ static unsigned char *readFile(FILE *fp, int *length)
+ {
+-- 
+2.32.0
+
diff --git a/qrencode.cygport b/qrencode.cygport
index a768e01..ec195ad 100644
--- a/qrencode.cygport
+++ b/qrencode.cygport
@@ -1,15 +1,18 @@
 NAME="qrencode"
 VERSION=4.1.1
-RELEASE=1
+RELEASE=2
 CATEGORY="Libs"
 SUMMARY="QR Code symbol library"
 DESCRIPTION="Libqrencode is a C library for encoding data in a QR Code
 symbol, a kind of 2D symbology that can be scanned by handy terminals
 such as a mobile phone with CCD. The capacity of QR Code is up to 7000
 digits or 4000 characters, and is highly robust."
-HOMEPAGE="https://fukuchi.org/works/qrencode/index.en.html"
+HOMEPAGE="https://fukuchi.org/works/qrencode/index.html.en"
 SRC_URI="https://fukuchi.org/works/qrencode/${NAME}-${VERSION}.tar.bz2"
-PATCH_URI="3.1.1-no-undefined.patch"
+PATCH_URI="
+  3.1.1-no-undefined.patch
+  4.1.1-fix-max_data_size.patch
+"
 
 DEPEND="pkgconfig(libpng)"
 
@@ -24,7 +27,7 @@ BUILD_REQUIRES="\
 "
 
 ################################
-## ABI for inkscape
+## ABI
 ABI=4
 
 ################################
@@ -41,8 +44,6 @@ printf -v "${THIS_VN}_CONTENTS" "%s" "\
   usr/bin/*.exe \
   usr/share/ \
 "
-printf -v "${THIS_VN}_REQUIRES" "%s" "\
-"
 
 ################################
 # Runtime
@@ -54,8 +55,6 @@ printf -v "${THIS_VN}_SUMMARY"  "%s" "${SUMMARY% *} (runtime)"
 printf -v "${THIS_VN}_CONTENTS" "%s" "\
   usr/bin/*.dll \
 "
-printf -v "${THIS_VN}_REQUIRES" "%s" "\
-"
 
 ###############################
 # Devel
@@ -68,8 +67,6 @@ printf -v "${THIS_VN}_CONTENTS" "%s" "\
   usr/include/ \
   usr/lib/ \
 "
-printf -v "${THIS_VN}_REQUIRES" "%s" "\
-"
 
 ###############################
 CYGCONF_ARGS="--with-tests"