diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-01 03:04:39 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-01 03:04:39 +0000 |
commit | 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch) | |
tree | 844bea44d85dc7218f54970af1c42cc9d55c3f1a /media-gfx/digikam | |
parent | 89c6c06b8c42107dd231687a1012354e7d3039fc (diff) |
gentoo resync : 01.12.2017
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r-- | media-gfx/digikam/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-5.7.0-r1.ebuild (renamed from media-gfx/digikam/digikam-5.7.0.ebuild) | 2 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch | 32 |
3 files changed, 37 insertions, 2 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index a9099d452a59..0d9f74fde61b 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,7 @@ AUX digikam-5.5.0-cmake-3.9.patch 7298 BLAKE2B d4c9085b9d65977dad1932cbd57f132c8aee844827d28dd74b4ab3ce8dea199ce959306f56064f5abe0a6acaad11c2c45f3932444bda79bb72520ab68c240320 SHA512 0a0f33f8b288fc98b95397ff615ab747bb78e35f8b6ed517e814dfebd32dd3f626f0c232d5b45a69bf80c4b548b72932fb376ce2308b0786b196e7fcdeda9b19 +AUX digikam-5.7.0-qt-5.9.3.patch 1137 BLAKE2B bf369d28083de46d11444eea8ddd35ccc1aa8d052bcd48d8da04a14737d404238717cc70eec7681931f46a455f2e1b441fd1851d3df12d19d8f5653fcc9b2847 SHA512 bfd453d6f4212dfd3e2402d0bba73f9498c04264a7199119fe117a9af834aa95bd12ac8cb2df8be063a8120bbfe159d52f96229692ac7258c4128909dbbffe61 DIST digikam-5.5.0.tar.xz 129499600 SHA256 df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252 SHA512 3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344 WHIRLPOOL e67b444975ad37e939b2f62bba949bcafb41eee2975470daa02e4ffdd62c6c792b6656edf4811daead52fdc1bf064951fbec7b687192e5d5ee542d5d706140be -DIST digikam-5.7.0.tar.xz 123315064 SHA256 3605ffb5b6e8fbd6b725e5075f74f505d7edee7531789c2882d11df2d20150f5 SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4 WHIRLPOOL b452919ce9bcf8ccc8434586ace23b96b68b76f49d7229d418b2dc5883e9646c79fb99ecd660d732b8d96efc3a49b70d218756b09a3f16ef9f7f2b174679be70 +DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4 EBUILD digikam-5.5.0.ebuild 4754 BLAKE2B 15740067a8a2da70baa564d5dbac7af3998c65975dc48938b67c52326ff500fecc35e6d1a7cdaa7e2b75cefca3ab0354d1c45a742b65a6e9bc2f428f6b60dfeb SHA512 19dd72651406bb4f3a899aa2e4e4ea6c650c5b33963bd9c437510c355349baeea89a91e7394868d57f3b73cf24433833428076cf574429dc9224c2799a08ed19 -EBUILD digikam-5.7.0.ebuild 4808 BLAKE2B d041011b2dc676d3ee25cca0345c0faa5c90aec564578d2fa0d0d1ac04e40293312d27313c7674efbf35fddf983bb1923f6693652a5283baae5056d73c3753b2 SHA512 da8fd9cbf5c4100856bd5c0dd161cc1e3dfc1aac6e33807e863a4c35ab14fb037bfc7b8da4cbdfeaf2ea22d803588225def5277fb5d87021f0a89c8609a45de5 +EBUILD digikam-5.7.0-r1.ebuild 4855 BLAKE2B 7f3d5e6002b3daccee31f1c7ab7fe9a57824bdf4f31d50b4319b07e71c5ecbd476f6c6140b84497b4fbc8fa5cfa707d358b0afa69a0883dc9689018e4726321e SHA512 c6836145cc5cc8b69b66da9494ef0d7101a7fd4c9df1779d1bd2a296ae14f9da88384a7fb58e79c56c53d8c731b1b027145e858b6b919642cfb7bdeada0d5954 MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab diff --git a/media-gfx/digikam/digikam-5.7.0.ebuild b/media-gfx/digikam/digikam-5.7.0-r1.ebuild index f5836f87eb1a..62c259e566c2 100644 --- a/media-gfx/digikam/digikam-5.7.0.ebuild +++ b/media-gfx/digikam/digikam-5.7.0-r1.ebuild @@ -106,6 +106,8 @@ RDEPEND="${COMMON_DEPEND} RESTRICT=test # bug 366505 +PATCHES=( "${FILESDIR}/${P}-qt-5.9.3.patch" ) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp kde5_pkg_pretend diff --git a/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch new file mode 100644 index 000000000000..7001850cd9c4 --- /dev/null +++ b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch @@ -0,0 +1,32 @@ +From 855ba5b7d4bc6337234720a72ea824ddd3b32e5b Mon Sep 17 00:00:00 2001 +From: Maik Qualmann <metzpinguin@gmail.com> +Date: Tue, 28 Nov 2017 21:29:00 +0100 +Subject: try to fix the Qt-5.9.3 empty album problem CCBUGS: 387373 + +* asturm: Fix build w/ Qt-5.7 +--- + libs/database/coredb/coredburl.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/libs/database/coredb/coredburl.cpp b/libs/database/coredb/coredburl.cpp +index 2c0d0eb..b1bdf71 100644 +--- a/libs/database/coredb/coredburl.cpp ++++ b/libs/database/coredb/coredburl.cpp +@@ -88,8 +88,13 @@ CoreDbUrl CoreDbUrl::fromAlbumAndName(const QString& name, + const DbEngineParameters& parameters) + { + CoreDbUrl url; ++ QString path(album); + url.setScheme(QLatin1String("digikamalbums")); +- url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name); ++ ++ if (path != QLatin1String("/")) ++ path += QLatin1Char('/'); ++ ++ url.setPath(path + name); + + QUrlQuery q(url); + q.addQueryItem(QLatin1String("albumRoot"), albumRoot.adjusted(QUrl::StripTrailingSlash).toLocalFile()); +-- +cgit v0.11.2 + |