From 4de5d695b1ffb382a957196d5302e240631e3db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 30 Jan 2020 11:21:25 +0000
Subject: [PATCH] tidy up patch

---
 0001-fix-detecting-qrcodegen.patch | 26 ++++++++++++++++++++++++++
 fix-detecting-qrcodegen.patch      | 24 ------------------------
 libreoffice.spec                   |  2 +-
 3 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 0001-fix-detecting-qrcodegen.patch
 delete mode 100644 fix-detecting-qrcodegen.patch

diff --git a/0001-fix-detecting-qrcodegen.patch b/0001-fix-detecting-qrcodegen.patch
new file mode 100644
index 0000000..faf1d6d
--- /dev/null
+++ b/0001-fix-detecting-qrcodegen.patch
@@ -0,0 +1,26 @@
+From f36e1ba5d000bd7d06d40205668f2b53b238ccba Mon Sep 17 00:00:00 2001
+From: Thierry Vignaud <thierry.vignaud@gmail.com>
+Date: Thu, 30 Jan 2020 11:19:20 +0000
+Subject: [PATCH] fix detecting qrcodegen
+
+Change-Id: Ib945b57420083489273cefc5655eb50932b5a3f8
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d4a737aeaeb1..a3ac0d4b866f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10255,7 +10255,7 @@ if test "$with_system_qrcodegen" = "yes"; then
+     AC_MSG_RESULT([external])
+     SYSTEM_QRCODEGEN=TRUE
+     AC_LANG_PUSH([C++])
+-    AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [],
++    AC_CHECK_HEADER(qrcodegencpp/QrCode.hpp, [],
+         [AC_MSG_ERROR(qrcodegen headers not found.)], [#include <stdexcept>])
+     AC_CHECK_LIB([qrcodegencpp], [main], [:],
+         [ AC_MSG_ERROR(qrcodegen C++ library not found.) ], [])
+-- 
+2.23.0
+
diff --git a/fix-detecting-qrcodegen.patch b/fix-detecting-qrcodegen.patch
deleted file mode 100644
index 6da4ff7..0000000
--- a/fix-detecting-qrcodegen.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up ./configure.ac.tv ./configure.ac
---- ./configure.ac.tv	2020-01-30 11:51:51.332400167 +0100
-+++ ./configure.ac	2020-01-30 11:51:56.775508000 +0100
-@@ -10034,7 +10034,7 @@ if test "$with_system_qrcodegen" = "yes"
-     AC_MSG_RESULT([external])
-     SYSTEM_QRCODEGEN=TRUE
-     AC_LANG_PUSH([C++])
--    AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [],
-+    AC_CHECK_HEADER(qrcodegencpp/QrCode.hpp, [],
-         [AC_MSG_ERROR(qrcodegen headers not found.)], [#include <stdexcept>])
-     AC_CHECK_LIB([qrcodegencpp], [main], [:],
-         [ AC_MSG_ERROR(qrcodegen C++ library not found.) ], [])
-diff -up ./configure.tv ./configure
---- ./configure.tv	2020-01-30 11:51:53.173436638 +0100
-+++ ./configure	2020-01-30 11:52:06.101692758 +0100
-@@ -33732,7 +33732,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--    ac_fn_cxx_check_header_compile "$LINENO" "qrcodegen/QrCode.hpp" "ac_cv_header_qrcodegen_QrCode_hpp" "#include <stdexcept>
-+    ac_fn_cxx_check_header_compile "$LINENO" "qrcodegencpp/QrCode.hpp" "ac_cv_header_qrcodegen_QrCode_hpp" "#include <stdexcept>
- "
- if test "x$ac_cv_header_qrcodegen_QrCode_hpp" = xyes; then :
- 
diff --git a/libreoffice.spec b/libreoffice.spec
index 857ec3a..b1d52eb 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -243,7 +243,7 @@ Patch0: 0001-don-t-suppress-crashes.patch
 Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
 # backported
 Patch2: 0001-replace-boost-bimap-in-sdext-pdfimport.patch
-Patch3: fix-detecting-qrcodegen.patch
+Patch3: 0001-fix-detecting-qrcodegen.patch
 
 %if 0%{?rhel}
 # not upstreamed