diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-06-13 22:36:52 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2025-08-25 17:27:10 +0900 |
| commit | 93006671b42a702bc0c663eea3968a377eb65c94 (patch) | |
| tree | a0ea51a49be956ef7a705332d806753a70cdde6c /gnu | |
| parent | fb3e1ab79a5c95d5245417ccfd73d0d76e954507 (diff) | |
gnu: soci: Apply patch to resolve a bug in liblinphone.
* gnu/packages/patches/soci-mysql-ddl-types.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/databases.scm (soci) [source]: Apply it.
Change-Id: I3840850c650d614f65ee398f948cea6206b03641
Fixes: https://issues.guix.gnu.org/47641
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/databases.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/soci-mysql-ddl-types.patch | 15 |
3 files changed, 18 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 445420bb134..333867ce039 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2080,6 +2080,7 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-pango-matrix_declarations.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/smalltalk-multiplication-overflow.patch \ + %D%/packages/patches/soci-mysql-ddl-types.patch \ %D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/strace-readlink-tests.patch \ %D%/packages/patches/sunxi-tools-remove-sys-io.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 31692bab35a..a8196648f6e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5803,7 +5803,8 @@ The drivers officially supported by @code{libdbi} are: (file-name (git-file-name name version)) (sha256 (base32 - "12aq7pama96l2c1kmfkclb4bvrsxs9a8ppgk5gmzw45w2lg35i0y")))) + "12aq7pama96l2c1kmfkclb4bvrsxs9a8ppgk5gmzw45w2lg35i0y")) + (patches (search-patches "soci-mysql-ddl-types.patch")))) (build-system cmake-build-system) (propagated-inputs ;; Headers of soci has include-references to headers of these inputs. diff --git a/gnu/packages/patches/soci-mysql-ddl-types.patch b/gnu/packages/patches/soci-mysql-ddl-types.patch new file mode 100644 index 00000000000..e92fb117d16 --- /dev/null +++ b/gnu/packages/patches/soci-mysql-ddl-types.patch @@ -0,0 +1,15 @@ +Description: Add two unusual column type entries to make liblinphone work +Author: Dennis Filder <d.filder@web.de> +Bug-Debian: https://bugs.debian.org/984534 +Last-Update: 2021-03-10 +--- a/src/backends/sqlite3/statement.cpp ++++ b/src/backends/sqlite3/statement.cpp +@@ -440,6 +440,8 @@ + m["mediumint"] = dt_integer; + m["smallint"] = dt_integer; + m["tinyint"] = dt_integer; ++ m["tinyintunsigned"] = dt_integer; ++ m["intunsigned"] = dt_integer; + + // dt_long_long + m["bigint"] = dt_long_long; |