From 1e707dfc9849a6a919981f58a63d65dce5867907 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 2 Aug 2021 15:27:17 +0200 Subject: [PATCH] 1.70 bump --- .gitignore | 1 + ...ecation-warning-of-sqlite_unicode-as.patch | 29 ------------------- perl-DBD-SQLite.spec | 11 ++++--- sources | 2 +- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 0001-Silence-the-deprecation-warning-of-sqlite_unicode-as.patch diff --git a/.gitignore b/.gitignore index 6d37921..2defa78 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ DBD-SQLite-1.29.tar.gz /DBD-SQLite-1.64.tar.gz /DBD-SQLite-1.66.tar.gz /DBD-SQLite-1.68.tar.gz +/DBD-SQLite-1.70.tar.gz diff --git a/0001-Silence-the-deprecation-warning-of-sqlite_unicode-as.patch b/0001-Silence-the-deprecation-warning-of-sqlite_unicode-as.patch deleted file mode 100644 index 7d05090..0000000 --- a/0001-Silence-the-deprecation-warning-of-sqlite_unicode-as.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6e7986e8d410cb25ded2ab958108170dc3835038 Mon Sep 17 00:00:00 2001 -From: Kenichi Ishigaki -Date: Fri, 30 Jul 2021 06:05:13 +0900 -Subject: [PATCH] Silence the deprecation warning of sqlite_unicode as it's so - widely used - ---- - dbdimp.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/dbdimp.c b/dbdimp.c -index a8361ac..6dbff60 100644 ---- a/dbdimp.c -+++ b/dbdimp.c -@@ -857,7 +857,10 @@ sqlite_db_STORE_attrib(SV *dbh, imp_dbh_t *imp_dbh, SV *keysv, SV *valuesv) - } - - if (strEQ(key, "sqlite_unicode") || strEQ(key, "unicode")) { -- _warn_deprecated_if_possible(key, "sqlite_string_mode"); -+ if (strEQ(key, "unicode")) { -+ /* it's too early to warn the deprecation of sqlite_unicode as it's widely used */ -+ _warn_deprecated_if_possible(key, "sqlite_string_mode"); -+ } - #if PERL_UNICODE_DOES_NOT_WORK_WELL - sqlite_trace(dbh, imp_dbh, 3, form("Unicode support is disabled for this version of perl.")); - imp_dbh->string_mode = DBD_SQLITE_STRING_MODE_PV; --- -2.32.0 - diff --git a/perl-DBD-SQLite.spec b/perl-DBD-SQLite.spec index f9a180b..67f52f7 100644 --- a/perl-DBD-SQLite.spec +++ b/perl-DBD-SQLite.spec @@ -2,8 +2,8 @@ %bcond_without perl_DBD_SQLite_enables_optional_test Name: perl-DBD-SQLite -Version: 1.68 -Release: 2%{?dist} +Version: 1.70 +Release: 1%{?dist} Summary: SQLite DBI Driver # lib/DBD/SQLite.pm: GPL+ or Artistic # LICENSE: GPL+ or Artistic @@ -21,9 +21,6 @@ Patch0: perl-DBD-SQLite-bz543982.patch Patch1: DBD-SQLite-1.62-Remove-bundled-source-extentions.patch # Adapt tests to unbundled Test::FailWarnings Patch2: DBD-SQLite-1.64-Unbundle-Test-FailWarnings.patch -# Backport removal of sqlite_unicode deprecation warning -# https://github.com/DBD-SQLite/DBD-SQLite/commit/6e7986e -Patch3: 0001-Silence-the-deprecation-warning-of-sqlite_unicode-as.patch # if sqlite >= 3.6.0 then # perl-DBD-SQLite uses the external library # else @@ -89,7 +86,6 @@ SQLite. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Remove bundled sqlite libraries (BZ#1059154) # System libraries will be used rm sqlite* @@ -123,6 +119,9 @@ make test %{_mandir}/man3/*.3pm* %changelog +* Mon Aug 02 2021 Jitka Plesnikova - 1.70-1 +- 1.70 bump + * Thu Jul 29 2021 Adam Williamson - 1.68-2 - (backport) disable sqlite_unicode deprecation warning as it's widely used diff --git a/sources b/sources index 357f994..df425a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (DBD-SQLite-1.68.tar.gz) = 83d7d19404949900bcc8464bf7786893bb53fdc04dbdee2f31f7bf4564dfc2bcf4218190460e34e5bf5633d1d958b729be7c7b5e6b539cdad6e732529d042372 +SHA512 (DBD-SQLite-1.70.tar.gz) = 163d53a8a214202a39b346ae023f9d10255c69dde537bc764a4ef312b62ef7b02ae1400e6c1a59d0483fd98abba6c36939214c13f5d9b3a2727c41753ba59060