Notification time stamped 2021-12-31 11:17:35 UTC
From 1963202853c6dfcb70814ca6bbd41a83fe4ba307 Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser(a)online.de>
Date: Dec 31 2021 11:17:28 +0000
Subject: Update to 1.2.0
---
diff --git a/vdr-epg2vdr-2.5.4.patch b/vdr-epg2vdr-2.5.4.patch
deleted file mode 100644
index 68c7dc3..0000000
--- a/vdr-epg2vdr-2.5.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 931aabe..3260efd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -49,8 +49,8 @@ TMPDIR ?= /tmp
-
- ### The compiler options:
-
--export CFLAGS += $(call PKGCFG,cflags)
--export CXXFLAGS += $(call PKGCFG,cxxflags)
-+export CFLAGS += $(call PKGCFG,cflags) -DDEPRECATED_SKIN_SETITEMEVENT=1
-+export CXXFLAGS += $(call PKGCFG,cxxflags) -DDEPRECATED_SKIN_SETITEMEVENT=1
-
- ### The version number of VDR's plugin API:
diff --git a/vdr-epg2vdr-epg.patch b/vdr-epg2vdr-epg.patch
deleted file mode 100644
index 1849a77..0000000
--- a/vdr-epg2vdr-epg.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vdr-plugin-epg2vdr-1.1.115/lib/common.c.old 2020-08-17 08:18:50.747982757 +0200
-+++ vdr-plugin-epg2vdr-1.1.115/lib/common.c 2020-08-17 08:20:25.802976151 +0200
-@@ -379,6 +379,7 @@
-
- toUpper(pattern);
- removeWord(pattern, " TEIL ");
-+ removeWord(pattern, "(TEIL ");
- removeWord(pattern, " FOLGE ");
- removeCharsExcept(pattern, notignore);
- }
diff --git a/vdr-epg2vdr-gcc10-include.patch b/vdr-epg2vdr-gcc10-include.patch
deleted file mode 100644
index edf507f..0000000
--- a/vdr-epg2vdr-gcc10-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nrup a/service.h b/service.h
---- a/service.h 2018-10-15 12:42:08.000000000 -0600
-+++ b/service.h 2019-09-23 10:15:16.089840039 -0600
-@@ -13,6 +13,7 @@
-
- #include <list>
- #include <map>
-+#include <string>
-
- //***************************************************************************
- // Timer - Skin Interface
diff --git a/vdr-epg2vdr-mariadb-fix-build.patch b/vdr-epg2vdr-mariadb-fix-build.patch
deleted file mode 100644
index 72d868b..0000000
--- a/vdr-epg2vdr-mariadb-fix-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur vdr-plugin-epg2vdr-1.1.73-ORIG/lib/db.c vdr-plugin-epg2vdr-1.1.73/lib/db.c
---- vdr-plugin-epg2vdr-1.1.73-ORIG/lib/db.c 2017-07-14 17:23:56.366839376 +0200
-+++ vdr-plugin-epg2vdr-1.1.73/lib/db.c 2017-07-14 17:59:34.634451604 +0200
-@@ -1379,11 +1379,19 @@
-
- if (error == CR_SERVER_LOST ||
- error == CR_SERVER_GONE_ERROR ||
-+// for compatibility with newer versions of MariaDB library
-+#ifdef CR_INVALID_CONN_HANDLE
- error == CR_INVALID_CONN_HANDLE ||
-+#endif
- error == CR_COMMANDS_OUT_OF_SYNC ||
- error == CR_SERVER_LOST_EXTENDED ||
- error == CR_STMT_CLOSED ||
-+// for compatibility with newer versions of MariaDB library
-+#ifdef CR_CONN_UNKNOW_PROTOCOL
- error == CR_CONN_UNKNOW_PROTOCOL ||
-+#else
-+ error == CR_CONN_UNKNOWN_PROTOCOL ||
-+#endif
- error == CR_UNSUPPORTED_PARAM_TYPE ||
- error == CR_NO_PREPARE_STMT ||
- error == CR_SERVER_HANDSHAKE_ERR ||
diff --git a/vdr-epg2vdr-py38.patch b/vdr-epg2vdr-py38.patch
deleted file mode 100644
index 799703a..0000000
--- a/vdr-epg2vdr-py38.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1403938..d772309 100644
---- a/Makefile
-+++ b/Makefile
-@@ -72,6 +72,10 @@ LIBS += $(shell pkg-config --libs uuid)
- LIBS += $(shell pkg-config --libs tinyxml2)
- LIBS += $(shell mysql_config --libs_r) $(shell python-config --libs) $(shell pkg-config
--libs jansson)
-
-+ifeq ($(shell python -c 'import sys; sys.exit(0) if sys.version_info[:2] < (3,8)
else print(1)'), 1)
-+ LIBS += $(shell python-config --embed)
-+endif
-+
- EPG2VDR_DATA_DIR = "/var/cache/vdr"
-
- ifdef WITH_GTFT
https://src.fedoraproject.org/rpms/vdr-epg2vdr/c/1963202853c6dfcb70814ca6...