diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
| commit | 185fa19bbf68a4d4dca534d2b46729207a177f16 (patch) | |
| tree | a8a537b82fda83a0799c2ca9887f212558363aa7 /media-gfx/digikam | |
| parent | c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff) | |
gentoo resync : 11.05.2021
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-7.2.0.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch | 29 |
3 files changed, 33 insertions, 1 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index c7db3f04fa3a..73da2729be69 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,5 +1,6 @@ +AUX digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch 1560 BLAKE2B dd2d9995787593f736f406566131af29573df097801f2c9b9eec12947838bf748c697bf6ab75d69f72359a1783d18fde994b4899861065d4d10dab100e0edf44 SHA512 eb1d1c4bff3dcc7e1d03069591ad8d48a3947ee962757baccf70e2e6c7577f6d52a4ae527af20d88aa24b66c0b1705367f67b7e3da70b19825a57def7371420a DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0 SHA512 df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4 DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B 5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90 SHA512 2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7 EBUILD digikam-7.1.0-r1.ebuild 4000 BLAKE2B ab10f960037cb269d0dd758624e2c263e8697f4c1c9ba8b1d88a4bd1684b364555b6704b765d003eca271626fe352e8dff0fa115154ce6762287ac23905800ad SHA512 2111860137feff79c9812f2aede64069ad4a68c0180063722e43b0c74ce7f3316fb44f59a4820671944f965329409932fe4e0c71fbbee76ce1c6cf2c9d85636a -EBUILD digikam-7.2.0.ebuild 4001 BLAKE2B 64dafd1f1414923d7dabc0549bfb599fb6f9300804073c72b4c354470995e86bc0958424593e14ea30dc77c12b54d2e09659487aca804b17c43c363fb08d8922 SHA512 ce910cfbba0988e6241b83c8cff61e26cef20509f370f728800d62656f05ea149b34212ef34945dab5acc2896070b00c0aa87b90a5ec8f0b685699a57a8a2c17 +EBUILD digikam-7.2.0.ebuild 4064 BLAKE2B cf9e2198102df1c8e8c776be495fc5078e2fa86e633b5620b69980367c2fdeeb15924769e661887e89f8e1d77e76efa460a8bcb8120f05596d03dc67ba089b14 SHA512 ffa8e41e8676433b6ab23fb9d3e9f8117a359900d62849d548ba2bf8e0426efaa436b3598c11514be55367def92858b2a6ed611640e6ffe76b9fe7c8872db3c6 MISC metadata.xml 1097 BLAKE2B 1870f4bef0643db48fa2e6241f25d33c718010556b79bb54339f4ff9a13d7d005cea8e358e83d54ee94860b191969c834b9e5fd8152a17d7a5cc464a6813000e SHA512 25c2fcb533b644cf4aa376518a77f35bab0676c6f8853998f50e1eebbb2de20ca49e02fc110b1d6f55d2502f4e353803f12a2b336b98d85321b891a42ba16ccd diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild b/media-gfx/digikam/digikam-7.2.0.ebuild index c7406e0e9cf7..7024418a1e3a 100644 --- a/media-gfx/digikam/digikam-7.2.0.ebuild +++ b/media-gfx/digikam/digikam-7.2.0.ebuild @@ -108,6 +108,8 @@ RDEPEND="${COMMON_DEPEND} panorama? ( media-gfx/hugin ) " +PATCHES=( "${FILESDIR}"/${P}-qt-5.15.2-after-f8ad329f.patch ) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp ecm_pkg_pretend diff --git a/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch b/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch new file mode 100644 index 000000000000..938cd8a990cd --- /dev/null +++ b/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch @@ -0,0 +1,29 @@ +From 7078ffb91c05e6cd436eaf222541044b98265113 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +Date: Fri, 16 Apr 2021 19:45:05 +0200 +Subject: [PATCH] Fix build after Qt commit + f8ad329f7ee01993c388f78851fc4ac88f5093b4 + +Build fails after this commit when using QT_NO_CAST_FROM_ASCII +--- + .../webservices/mediawiki/backend/mediawiki_queryrevision.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp +index dce0fc9eb5..625d170d5e 100644 +--- a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp ++++ b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp +@@ -299,8 +299,8 @@ void QueryRevision::doWorkProcessReply() + while (count < 2) + { + if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++; +- if (replytmp[i] == QLatin1Char('<')) replytmp[i] = char(255); +- if (replytmp[i] == QLatin1Char('>')) replytmp[i] = char(254); ++ if (replytmp[i] == QLatin1Char('<')) replytmp[i] = QLatin1Char(char(255)); ++ if (replytmp[i] == QLatin1Char('>')) replytmp[i] = QLatin1Char(char(254)); + ++i; + } + } +-- +GitLab + |