diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-office/kexi | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'app-office/kexi')
| -rw-r--r-- | app-office/kexi/Manifest | 3 | ||||
| -rw-r--r-- | app-office/kexi/files/kexi-3.2.0-glib-2.68.patch | 40 | ||||
| -rw-r--r-- | app-office/kexi/kexi-3.2.0-r1.ebuild | 3 |
3 files changed, 44 insertions, 2 deletions
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest index 3f2b94f22bb0..4f2585825513 100644 --- a/app-office/kexi/Manifest +++ b/app-office/kexi/Manifest @@ -1,5 +1,6 @@ +AUX kexi-3.2.0-glib-2.68.patch 1223 BLAKE2B 354fbb183b30bf678eb0b896fee5ae607bf873b915245a9765738b2ef07bf4fd1838c869287de365d544aec25bbce97f2a4320a620e1e49d36d4f9320f14c624 SHA512 e9a75f4f7aaf93fc1bc6d08705d1e3389b5e24611aa5f903c033ad55824ac912f1d6cb31674c2af8c097b91e4007c7b62de82305f061be447f119004ccce98bc AUX kexi-3.2.0-missing-header.patch 739 BLAKE2B da09cf24f4852222040112a7774bd5d0463f85d52d52c352b453f4d0502085a0faa67ae3ae8fd44102c2fa3b8840525929e53c9ad1a05acfb5c23747cdbb6d91 SHA512 14779c27e47d7e3c0f3f8de917deae8fed7b38673bcc5ec53fa0ca7c89c354a3601af80c6fe17ab3231f633852c47c0dcd2858834cee79a961fc3d02a1043fa1 AUX kexi-3.2.0-postgresql-9.12.patch 1094 BLAKE2B ac9ba4ff8f5c29ae8ebdcfa6820ed8663aa0f13a9fb55f4eff85265fa3d76a3e33e6c1000400a7a21721e9f45ba58006dbb97c312fd4b96f9d0e9e49dfd88690 SHA512 cfde38090e163ff441477c7f8262629589c9ab49c2687eefe7e0a107f4d70fd447cc35e1031612a6ce970e3b3ec3b9394f13e6e2876c29614cb43ba0b9fc9fbd DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93 -EBUILD kexi-3.2.0-r1.ebuild 2554 BLAKE2B 607d40d761327326f5b173eb24f7402e6cf5173fe30c6bddada15ca7946db67cf56e8dcd6834ddbf10152916d8a2e88d0a415cbcba580c17f5ddc80e6603710b SHA512 3f39794984eef1c458e0e89829b5c1c934f96b6683af28ffc343a1f1beefc0470613b9f910fbbe064dc947868dfda253b0b566079763b43d2fc1bf855758113b +EBUILD kexi-3.2.0-r1.ebuild 2603 BLAKE2B bfb4377c5404f13dd0be73c09476c42dae650eefe81c84ab97d152ce9292e9ed2d6064c090747c09a6a01d523156a01938b0c3251fdd1ffa3e0b22b373fa6512 SHA512 43cd659391a563cd4b536736501cd8979c9f36a3634eb45f6418511e28be1fe1a8ce2d60abeec8eb7e9ee67d2847c4389312c8911ed622bb983a1cc1e0b8a601 MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f diff --git a/app-office/kexi/files/kexi-3.2.0-glib-2.68.patch b/app-office/kexi/files/kexi-3.2.0-glib-2.68.patch new file mode 100644 index 000000000000..66f7c78d5b18 --- /dev/null +++ b/app-office/kexi/files/kexi-3.2.0-glib-2.68.patch @@ -0,0 +1,40 @@ +From 73d3fa8e7a1028c89b20c74f6444a76a722d8041 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heiko.becker@kde.org> +Date: Sun, 18 Apr 2021 11:47:30 +0200 +Subject: [PATCH] Include <glib.h> outside of the extern block + +This fixes the build with glib >= 2.68. It's caused by [1] and glib +upstream did not want to include a workaround because the fixes +downstream seem trivial [2][3]. + +[1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715 +[2] https://gitlab.gnome.org/GNOME/glib/-/issues/2331 +[3] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1935 +--- + src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h +index 31f48c171..56276e2d6 100644 +--- a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h ++++ b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h +@@ -18,6 +18,8 @@ + #ifndef _mdbtools_h_ + #define _mdbtools_h_ + ++#include <glib.h> ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -32,7 +34,6 @@ + #endif + #include <ctype.h> + #include <string.h> +-#include <glib.h> + + #ifdef HAVE_ICONV + #include <iconv.h> +-- +GitLab + diff --git a/app-office/kexi/kexi-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild index 8daa08bfed19..9732672ee1a9 100644 --- a/app-office/kexi/kexi-3.2.0-r1.ebuild +++ b/app-office/kexi/kexi-3.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -67,6 +67,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-missing-header.patch "${FILESDIR}"/${P}-postgresql-9.12.patch + "${FILESDIR}"/${P}-glib-2.68.patch # bug 784974 ) src_prepare() { |