[packages/gnokii] - build fix for mysql 8, release 9
qboosh
qboosh at pld-linux.org
Tue Jun 23 21:55:28 CEST 2026
commit 1018567a818908277214beea6dbf6ae39dcc4043
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Jun 23 21:55:58 2026 +0200
- build fix for mysql 8, release 9
gnokii-mysql.patch | 13 +++++++++++++
gnokii.spec | 14 +++++++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/gnokii.spec b/gnokii.spec
index f2963e6..9671ad3 100644
--- a/gnokii.spec
+++ b/gnokii.spec
@@ -14,7 +14,7 @@ Summary: Linux/Unix tool suite for mobile phones
Summary(pl.UTF-8): Linuksowy/uniksowy zestaw narzędzi dla telefonów komórkowych
Name: gnokii
Version: 0.6.31
-Release: 8
+Release: 9
Epoch: 1
License: GPL v2+
Group: Applications/Communications
@@ -28,14 +28,16 @@ Patch0: %{name}-pld.patch
Patch1: no-inline.patch
Patch2: %{name}-gcc7.patch
Patch3: %{name}-codeset.patch
+Patch4: %{name}-mysql.patch
URL: http://www.gnokii.org/
BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: automake >= 1:1.8
%{?with_bluetooth:BuildRequires: bluez-libs-devel >= 2.8-2}
BuildRequires: flex
BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 2.0
BuildRequires: gtk+2-devel >= 2.0
-BuildRequires: intltool
+BuildRequires: intltool >= 0.35.0
%{?with_ical:BuildRequires: libical-devel}
BuildRequires: libtool
%{?with_usb:BuildRequires: libusb-compat-devel}
@@ -185,13 +187,19 @@ Wtyczka obsługi plików dla gnokii-smsd.
%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
+%patch -P4 -p1
%build
+%{__gettextize}
+%{__intltoolize}
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
+%if "%{_ver_ge %{cc_version} 14}" == "1"
+CFLAGS="%{rpmcflags} -std=gnu17"
+%endif
%configure \
--enable-security \
%{!?with_x11:--with-xgnokiidir=%{_prefix}} \
diff --git a/gnokii-mysql.patch b/gnokii-mysql.patch
new file mode 100644
index 0000000..886c7a5
--- /dev/null
+++ b/gnokii-mysql.patch
@@ -0,0 +1,13 @@
+--- gnokii-0.6.31/smsd/mysql.c.orig 2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/smsd/mysql.c 2026-06-23 20:39:54.253766890 +0200
+@@ -49,7 +49,9 @@ GNOKII_API void DB_Bye (void)
+
+ static gint Connect (const DBConfig connect, MYSQL *mysql)
+ {
+-#if MYSQL_VERSION_ID >= 50013
++#if MYSQL_VERSION_ID >= 80000
++ bool reconnect = 1;
++#elif MYSQL_VERSION_ID >= 50013
+ my_bool reconnect = 1;
+ #endif
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnokii.git/commitdiff/1018567a818908277214beea6dbf6ae39dcc4043
More information about the pld-cvs-commit
mailing list