File libgpiod-fix-with-catch2-3.x.patch of Package libgpiod

Overview Repositories Revisions Requests Users Attributes Meta

File libgpiod-fix-with-catch2-3.x.patch of Package libgpiod

diff -purN libgpiod-1.6.3.orig/bindings/cxx/examples/Makefile.am libgpiod-1.6.3/bindings/cxx/examples/Makefile.am
--- libgpiod-1.6.3.orig/bindings/cxx/examples/Makefile.am	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/bindings/cxx/examples/Makefile.am	2022-10-07 11:08:55.508495378 +0200
@@ -7,7 +7,7 @@
 #
 
 AM_CPPFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include
-AM_CPPFLAGS += -Wall -Wextra -g -std=gnu++11
+AM_CPPFLAGS += -Wall -Wextra -g -std=gnu++14
 AM_LDFLAGS = -lgpiodcxx -L$(top_builddir)/bindings/cxx/
 
 noinst_PROGRAMS =				\
diff -purN libgpiod-1.6.3.orig/bindings/cxx/Makefile.am libgpiod-1.6.3/bindings/cxx/Makefile.am
--- libgpiod-1.6.3.orig/bindings/cxx/Makefile.am	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/bindings/cxx/Makefile.am	2022-10-07 11:08:55.504495340 +0200
@@ -8,7 +8,7 @@
 
 lib_LTLIBRARIES = libgpiodcxx.la
 libgpiodcxx_la_SOURCES = chip.cpp iter.cpp line.cpp line_bulk.cpp
-libgpiodcxx_la_CPPFLAGS = -Wall -Wextra -g -std=gnu++11
+libgpiodcxx_la_CPPFLAGS = -Wall -Wextra -g -std=gnu++14
 libgpiodcxx_la_CPPFLAGS += -fvisibility=hidden -I$(top_srcdir)/include/
 libgpiodcxx_la_LDFLAGS = -version-info $(subst .,:,$(ABI_CXX_VERSION))
 libgpiodcxx_la_LDFLAGS += -lgpiod -L$(top_builddir)/lib
diff -purN libgpiod-1.6.3.orig/bindings/cxx/tests/gpiod-cxx-test-main.cpp libgpiod-1.6.3/bindings/cxx/tests/gpiod-cxx-test-main.cpp
--- libgpiod-1.6.3.orig/bindings/cxx/tests/gpiod-cxx-test-main.cpp	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/bindings/cxx/tests/gpiod-cxx-test-main.cpp	2022-10-07 11:11:22.889851081 +0200
@@ -5,5 +5,4 @@
  * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com>
  */
 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
diff -purN libgpiod-1.6.3.orig/bindings/cxx/tests/Makefile.am libgpiod-1.6.3/bindings/cxx/tests/Makefile.am
--- libgpiod-1.6.3.orig/bindings/cxx/tests/Makefile.am	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/bindings/cxx/tests/Makefile.am	2022-10-07 11:08:56.392503511 +0200
@@ -8,10 +8,10 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/tests/mockup/
-AM_CPPFLAGS += -Wall -Wextra -g -std=gnu++11 $(CATCH2_CFLAGS)
+AM_CPPFLAGS += -Wall -Wextra -g -std=gnu++14 $(CATCH2_CFLAGS)
 AM_LDFLAGS = -lgpiodcxx -L$(top_builddir)/bindings/cxx/
 AM_LDFLAGS += -lgpiomockup -L$(top_builddir)/tests/mockup/
-AM_LDFLAGS += -pthread
+AM_LDFLAGS += -pthread -lCatch2Main -lCatch2
 
 bin_PROGRAMS = gpiod-cxx-test
 
diff -purN libgpiod-1.6.3.orig/bindings/cxx/tests/tests-chip.cpp libgpiod-1.6.3/bindings/cxx/tests/tests-chip.cpp
--- libgpiod-1.6.3.orig/bindings/cxx/tests/tests-chip.cpp	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/bindings/cxx/tests/tests-chip.cpp	2022-10-07 11:08:55.484495157 +0200
@@ -5,7 +5,7 @@
  * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com>
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <gpiod.hpp>
 
 #include "gpio-mockup.hpp"
diff -purN libgpiod-1.6.3.orig/bindings/cxx/tests/tests-event.cpp libgpiod-1.6.3/bindings/cxx/tests/tests-event.cpp
--- libgpiod-1.6.3.orig/bindings/cxx/tests/tests-event.cpp	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/bindings/cxx/tests/tests-event.cpp	2022-10-07 11:08:55.488495194 +0200
@@ -5,7 +5,7 @@
  * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com>
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <gpiod.hpp>
 #include <poll.h>
 #include <thread>
diff -purN libgpiod-1.6.3.orig/bindings/cxx/tests/tests-iter.cpp libgpiod-1.6.3/bindings/cxx/tests/tests-iter.cpp
--- libgpiod-1.6.3.orig/bindings/cxx/tests/tests-iter.cpp	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/bindings/cxx/tests/tests-iter.cpp	2022-10-07 11:08:55.488495194 +0200
@@ -5,7 +5,7 @@
  * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com>
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <gpiod.hpp>
 
 #include "gpio-mockup.hpp"
diff -purN libgpiod-1.6.3.orig/bindings/cxx/tests/tests-line.cpp libgpiod-1.6.3/bindings/cxx/tests/tests-line.cpp
--- libgpiod-1.6.3.orig/bindings/cxx/tests/tests-line.cpp	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/bindings/cxx/tests/tests-line.cpp	2022-10-07 11:08:55.492495230 +0200
@@ -5,7 +5,7 @@
  * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com>
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <gpiod.hpp>
 
 #include "gpio-mockup.hpp"
diff -purN libgpiod-1.6.3.orig/configure.ac libgpiod-1.6.3/configure.ac
--- libgpiod-1.6.3.orig/configure.ac	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/configure.ac	2022-10-07 11:08:55.500495304 +0200
@@ -175,7 +175,7 @@ if test "x$with_bindings_cxx" = xtrue
 then
 	AC_LIBTOOL_CXX
 	# This needs autoconf-archive
-	AX_CXX_COMPILE_STDCXX_11([ext], [mandatory])
+	AX_CXX_COMPILE_STDCXX_14([ext], [mandatory])
 
 	if test "x$with_tests" = xtrue
 	then
diff -purN libgpiod-1.6.3.orig/tests/Makefile.am libgpiod-1.6.3/tests/Makefile.am
--- libgpiod-1.6.3.orig/tests/Makefile.am	2021-03-22 13:28:50.000000000 +0100
+++ libgpiod-1.6.3/tests/Makefile.am	2022-10-07 11:08:55.512495414 +0200
@@ -12,7 +12,7 @@ AM_CFLAGS = -I$(top_srcdir)/include/ -I$
 AM_CFLAGS += -include $(top_builddir)/config.h
 AM_CFLAGS += -Wall -Wextra -g -std=gnu89 $(GLIB_CFLAGS)
 AM_CFLAGS += -DG_LOG_DOMAIN=\"gpiod-test\"
-AM_LDFLAGS = -pthread
+AM_LDFLAGS = -pthread -lCatch2
 LDADD = $(top_builddir)/lib/libgpiod.la
 LDADD += $(top_builddir)/tests/mockup/libgpiomockup.la
 LDADD += $(GLIB_LIBS)

Places

File libgpiod-fix-with-catch2-3.x.patch of Package libgpiod

Places