media-sound/mixxx: update pre-2.1.1 patches #7

media-sound/mixxx/Manifest

@@ -11,6 +11,7 @@ AUX mixxx-2.1.0-empty-library-fix-lp1772591.patch 3337 BLAKE2B 3ab3e5f922dfe2fa5
 AUX mixxx-2.1.0-fidlib-thread-safe-and-reentrant-generation-of-filters.patch 35122 BLAKE2B 976c623afc6f62fb5ee5082bcc503b7ca4bf5af160e102257024874e750a681347d6e4b70328a6596c88b261ed02f66ccb7c5897d1cf8174a92e4bb50d1e55c9 SHA512 377e2cd176264849f7de28d48107dca1c41b18a02c610d4f8c1ac824dc6e4c3d8b18363a7a3ae0d585157fed33592ad6cf578148508416b0783bd6b4084aaeb1
 AUX mixxx-2.1.0-fix-cachingreader-compiler-warnings-about-non-trivial-types.patch 7055 BLAKE2B 669038949243674c8b7aaccd0cea4cc6c21644dd4bc2de463800bed71677d4e77cc5b3f5da89d0be3bdc44c847247afbf7b6248a29840aec676916bc8b9bc96f SHA512 45ec03e0d37b72d969fa730348a068df61200bae0a613045d9711637b6abc04608f2b3e7c2d99551dfa24c86846b3426c9f3600518258012e6e4d118f7beb947
 AUX mixxx-2.1.0-fix-clearing-of-replaygain-gain-ratio-in-file-tags.patch 6898 BLAKE2B 7e20e44b0d6646cf410473b3d4c1ca310aa1b9ec8fafb06ee4480a90be7cb6fd3b67ac1a425d98beed03eef22016ad76f127ddcb46c6a7a22237ca93b59826ab SHA512 ecffb8bab5ad1d1f55acc2c3187a4dd10edda22e6708754e76184181808afc3fb014d43544b0a1006c9a439673bb56ab54549a0d95c0a05e709dcaba3600f8cc
+AUX mixxx-2.1.0-fix-crash-when-importing-id3v2-apic-frames.patch 3731 BLAKE2B 7db0372c0e7cbcafc75214b900bc5a0e4e596a50aba7e681937f0de67d7f4b52fa6d65f91381f5a4193c6d5e86518cb01e64aa94080a400bff6fa44c97fa0b38 SHA512 082092491b1aa345df83e3d2e864087a198faf02ba81c64a6681c83e007d8c15e5bd9e1537712c5ff5e2f093443ad78597e7541d9074555b0f9f3f5dab007ee4
 AUX mixxx-2.1.0-fix-crash-when-removing-a-quick-link.patch 3143 BLAKE2B e0562c35c83fcefe50362a5f2359cbca10853a0a4c2285866a5bd48a8ff7d13de066c2a153e86dd657c18fe1a30610f55f8e2ec95a958c9d0cc3a6288064f572 SHA512 94ba8e2e94f6f5ed8152f9499b5334211e812e374a5fafd48b8dc21e9e0b0ae8d6919f6a59fb3bae6c1d86de820ad654be45b0813f896cf4819dfaf2bebedc2d
 AUX mixxx-2.1.0-fix-decoding-of-improperly-encoded-flac-files.patch 8256 BLAKE2B 5fd8a4ddb15449477212f077b7b176ffe30adfbb5521eece8e9fa5e7af17a2247f3f9936841ebfcf271664e1cf8928f71426019e5b8e02ae4972193c4351de21 SHA512 0c44bbd9d8d67b843420de6cafeb3e10f2ed31ff8af424d5e9d219d41f3e465ddee40141530fcba000cb99e4a136850c418dcae5bd73047328c7436635d85071
 AUX mixxx-2.1.0-fix-flac-decoding-and-upgrade-db-schema.patch 15891 BLAKE2B fd032363b07357c1fa16c2376b5f2f5b9580cb9c4534238336fca014f5432e460ba081c20608f22055c4e0799c17fba0f96b7d65a131d193d398ee5ffdda8e95 SHA512 99d3feb6761b8bd58acd7e1e4a8f0d2660b1bc1fb7f1885fb0211ad09dec3b1ab77c4ff0b8054e04313170bc050b0e655e8c90aa3d8301c39189ca6c2e2e4bdd
@@ -20,14 +21,18 @@ AUX mixxx-2.1.0-fix-latenight-group-fx-buttons-in-deck.patch 7213 BLAKE2B 363c23
 AUX mixxx-2.1.0-fix-memory-leak-when-loading-cover-art.patch 1473 BLAKE2B 4f7e59a8f97e36ecc073a2e6755dd44560a96f5f72217034a8ba2cd14f6790ab5d136ed54e2d4c87a2d039143c5804a9f8a9e476045433ab70367e973abdf145 SHA512 555d86b6793dbd4fb09c0c36bb69e31dd7cdceb99b1cdf9362349c6f25a93e3c0a078c4958a2bb3ad9d6329573d84e3ed913a5826a42444b0ec0902310e5cf3e
 AUX mixxx-2.1.0-fix-navigation-usability-issues-in-sidebar-tree.patch 15383 BLAKE2B 484df59087aaa09ca4cdfd61bb9236e1d07e9d7bb0d7be0e1bf576e1e546b3a8b10e9aadacb81336d01681612d920cfa28d809ceafc6f2d85a9cde724427b724 SHA512 4a817e0002d99812a092a808587f35adc849b8da8238e420ea7290e1900813374402d526bdabe0d260bf04b39c06051c64db2a41d0b7114c2381955cfb3abf57
 AUX mixxx-2.1.0-fix-s4-mk2-for-windows.patch 2065 BLAKE2B aa36275f3e0fdb08c73408941f7374f5818890d0de119a6992a811f58c5da76ad45d47c5a2e5668eca47131eca12f565b4016c7b8510fb35f6ad03cd429cc0c8 SHA512 196ff5a3769a31b8b1fb264b8a3de1eccdd10c3764a4dd2c4c411ab3d886cd232601b86b119b375c0a08141f86afd8551a4315610cfd39459c3b0cb806246f6e
+AUX mixxx-2.1.0-fix-some-log-levels-and-reduce-debug-log-spam.patch 43318 BLAKE2B 1afc339ee473c52e05f10104e44ba0460058115fb052b57496fc9eb9859a5bf74dcd49848bb5f9c7399da58463a0987516d0d21ec3ac1a5fd5d60637f83c955d SHA512 9599cb7da27244b3abf3e5bc01f1e89ca2c441639ce979ed3946404b023b9b1dbdec22d4a1e4481e6d2637d8e3f4f141e1ea21264eb3a9b80f0ec684d07623cf
 AUX mixxx-2.1.0-fix-spinback-inertia-effect-partial-revert-of-2b612c2.patch 1151 BLAKE2B a49e171ca017e3b36b7271859093e77bedd038dc42085330babc39a675549b708fa8b2a9b0774a44fa6cc0abbfcddad57173e75d7ce3d163828bfa6e727a1a6c SHA512 1bcda1e863337f9e330fb04ecdee1b0600093bad069bc0d48b3ac4e0c456471319bb42a0f5e9aa8b42bc1e88db81795063290733c57a1dff60f4750e55a206de
 AUX mixxx-2.1.0-fix-unresponsive-scrolling-through-crates-and-playlists-using-encoder.patch 10554 BLAKE2B fedfdb247f55ac438635a527e30b132386e95f40143c26b581f6929a45126b7d97a4ea98d84582a6dded002afa623a7fac3a0f1e2e03499e592967df0fbe7646 SHA512 18b3d51f5c341e412f9fae2bb596ef569906e628ea5102d35864f299be2c2f21853833964b0566f4c3c6a964ee52627eb6ec0982ebc3d4151b3e6210765504e1
+AUX mixxx-2.1.0-library-improvements-for-all-skins-fix-lp1772202-in-tango.patch 252028 BLAKE2B b74c8052548f7c65bf15300fefa998d619ab82ec073d162e7d6f856a3ea1626f6882c57f2e12cf9981e031390ee7aa476f349c1f33a8cad5c1ca68a2609e2dd3 SHA512 95442eb5cd8699d3e00d22baa76d4d41209f632a9fce04612dcf9fba598f00567546162f6375cdbd8922e8a61fc91c137847b166f1a8ced8fdb47eb4f8a92e17
 AUX mixxx-2.1.0-optimize-flac-decoding.patch 9430 BLAKE2B f3d0b707f69332f94db54416fc9a9a6374302853daa8fb3046048e66f25259081f9bbe46c1dc8620076904a7f1a57abf051be0db3af02378ac9df06dc353f765 SHA512 5d244f8fe606eab6c6bea64439a520ada568dd2681d05fcdbdd1abebabf5bc74eecf3aa67765f4d2d78295a9a87c9ca7746cfc59cfd5db1a4b8a085f36b95cd6
 AUX mixxx-2.1.0-pioneer-ddj-sx-mapping-bugfixes.patch 11255 BLAKE2B 9e15935f3fcfe9e26c04960496998450ee15cf8eb7b98e0439064caf9653617b94e0bf4c93f13ee49d169accabe662f9f8ca2abea05559b91d7f5362225de1c9 SHA512 f4774fe4884d339f2929468551b2f248200f3dc1c31c436070c8a439d18cf524aab0dd7ca990595e0c88ddd70e1e71dee025a641df6d240724fec94f2087ebd0
 AUX mixxx-2.1.0-qt5-2.1.patch 20604 BLAKE2B 97b0145e68de1622020b52f08b9160fd23a7d9e42469201e40d93779eba903c496728a517ba274468de572a7714cfb0353859e76a380002219c39deb3fd23943 SHA512 8856aaa2d3c870a684d3e78deea2e162b00c96e3d64405615066430984525abcb71cc07c9f1dc0cdd18161ebb1aff8c1ebe223d21c3f3c4d3e92f3c38da3ffab
 AUX mixxx-2.1.0-reduce-log-spam-from-soundsourceproxy.patch 1791 BLAKE2B 84f51305c1054bc1ac50e59abf1fbad01f07dd316592fb6fdcbe268d19d19400c9a99e54ec74674c73632b8e443f25168f262eaa02e221204d0c3eb9320f3609 SHA512 d58f42be3b711df919e50ed2e665f95f63b265c6571e5b8109f2c7977f823d0360c8bd5e0618912d4c0d15a92a8ee673320fbd23c9fc2d75bd3a78aea0f9558b
 AUX mixxx-2.1.0-swap-default-values-for-temp-perm-ratechanges.patch 1534 BLAKE2B 30e2c7fe396919fcdfba7102f360e307e2104bfa6480ec5615bc1482f2e496f99435d745468621f6ff7ae15e0e4857fd6db692061cf5d7b19b0bc7672b889aea SHA512 e0c6365f26313935b503de36edb9ed247333e892352645d5379659bc7a53761b7b24d1a162dee38cb776e17f5e8741d5235713d47f5812975169395bb4d00f05
+AUX mixxx-2.1.0-try-to-fix-appstream-config-and-desktop-icon.patch 6964 BLAKE2B 360f71de43a63e19d052b46acfbd7437656fdf76325d17cae25509d409266263ae0dfb10b75f67c70a2f68d90c523a83bd052d772a28412dd9b40c76fdf8dac6 SHA512 20f45cfcd25cc11b1a39be58671f9a5162643247a3cd5e4dbf98620eebd2f8e79d2df454c932118ec630c20cdf8ec9dc9b54e15b9bcb20ae80683f3ecf25bc7c
 AUX mixxx-2.1.0-update-american-audio-vms4-preset-for-mixxx-v2.1.x.patch 26106 BLAKE2B e08dcc0a1572dcd1d6909644e2704e4b2c2f9646e0c96da6e0631bbebca4b680b490f13f20a5de5761ee826c77a53577ab24b5ba2d3627124bb4a93a4c54ef27 SHA512 5866243851348abfcb59db7d60932c523af62227d15df845517a283c1d579b358271ca22a1062a7df144f6c43ba9bdfc1c06eac41ea8b2ca23ae2493ca481322
 AUX mixxx-2.1.0-use-an-in-memory-database-to-speed-up-library-tests.patch 3086 BLAKE2B d2cb0b7992cdb07b1ba2accde1d272cd3f75adf8bd3bb2450ad9203db5d7978c9b29dbf6e278a2a1f1fb8fb84f28b23f276f0f999b3e5d77c272b91716dcc9f1 SHA512 a6fefbc80f8facc8cd0bf501858b4dadb6ebe4bf476dc97273ad7e97ae2c0840ca9bd6b0b3aaa34caa837b967ee7fa12635c7c2957241ca6aff5a26531b6e25f
+AUX mixxx-2.1.0-use-new-link-to-updated-2-1-feedback-form.patch 1091 BLAKE2B 49cd235c8bde044e9394f8b2b651714c793edcefd8a381954e3fa6e788e8277eab2370afe7d5523f8d6b0eb47277173fd757182f9b21a20e408bdb8931fd2f00 SHA512 c344991a8dbcf473ef368d5d6296fb598450d36cc22051669e496b35fdd7feb90c15dcf2c2ca53cf341e3b07b946f2f926b23fef10cba448d5eb5dadc29f8448
 DIST mixxx-2.1.0-src.tar.gz 34835250 BLAKE2B 7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567 SHA512 d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
-EBUILD mixxx-2.1.0.ebuild 4663 BLAKE2B 7041f834fc0ebd35223734bb9cb48518ade04722522d6edc3391071c9dcb5ea3c99a3d541e27eedf15d19629e859c03978b917abafa180860f97006560353bb3 SHA512 df2ca290915d317a3a7d6e6cc46d408120b68b176d4a616c350e79a171c74c83c1643f5a8ec6585422737a7346204450ed56878780ad5a44ba7e2957ea3185c2
+EBUILD mixxx-2.1.0.ebuild 5463 BLAKE2B 099ec82f92155580e8d2e4232a0a0cfb3f88f521c820087983a02b59910763ed402945ef5943dce93b48ea849d1dc5c277870d7ac49367535594aa559e44dec1 SHA512 466ee536bf0f5b57fbf602615524ff266c77fec67c649389f747139058e903bb51626f873f452b71728792a8af925e59edb3fa16ac3749b0ca0bb8b5b33f4e5f

media-sound/mixxx/files/mixxx-2.1.0-fix-crash-when-importing-id3v2-apic-frames.patch

@@ -0,0 +1,84 @@
+From 8b408749a1efb7a9dba5bed6fec8a2af1023589c Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uklotz@mixxx.org>
+Date: Sat, 2 Jun 2018 17:23:57 +0200
+Subject: [PATCH] Fix crash when importing ID3v2 APIC frames with unexpected
+ type
+
+---
+ src/track/trackmetadatataglib.cpp | 49 ++++++++++++++++++++++++++-------------
+ 1 file changed, 33 insertions(+), 16 deletions(-)
+
+diff --git a/src/track/trackmetadatataglib.cpp b/src/track/trackmetadatataglib.cpp
+index 2615ae5bb6..ebbf120946 100644
+--- a/src/track/trackmetadatataglib.cpp
++++ b/src/track/trackmetadatataglib.cpp
+@@ -876,6 +876,23 @@ QImage importCoverImageFromVorbisCommentPictureList(
+     return QImage();
+ }
+ 
++template<typename T>
++const T* downcastID3v2Frame(TagLib::ID3v2::Frame* frame) {
++    DEBUG_ASSERT(frame);
++    // We need to use a safe dynamic_cast at runtime instead of an unsafe
++    // static_cast at compile time to detect unexpected frame subtypes!
++    // See also: https://bugs.launchpad.net/mixxx/+bug/1774790
++    const T* downcastFrame = dynamic_cast<T*>(frame);
++    VERIFY_OR_DEBUG_ASSERT(downcastFrame) {
++        // This should only happen when reading corrupt or malformed files
++        kLogger.warning()
++                << "Unexpected ID3v2"
++                << frame->frameID().data()
++                << "frame type";
++    }
++    return downcastFrame;
++}
++
+ void importCoverImageFromID3v2Tag(QImage* pCoverArt, const TagLib::ID3v2::Tag& tag) {
+     if (!pCoverArt) {
+         return; // nothing to do
+@@ -891,10 +908,9 @@ void importCoverImageFromID3v2Tag(QImage* pCoverArt, const TagLib::ID3v2::Tag& t
+     const TagLib::ID3v2::FrameList pFrames = iterAPIC->second;
+     for (const auto coverArtType: kPreferredID3v2PictureTypes) {
+         for (const auto pFrame: pFrames) {
+-            const TagLib::ID3v2::AttachedPictureFrame* pApicFrame =
+-                    static_cast<const TagLib::ID3v2::AttachedPictureFrame*>(pFrame);
+-            DEBUG_ASSERT(pApicFrame); // trust TagLib
+-            if (pApicFrame->type() == coverArtType) {
++            const auto* pApicFrame =
++                    downcastID3v2Frame<TagLib::ID3v2::AttachedPictureFrame>(pFrame);
++            if (pApicFrame && (pApicFrame->type() == coverArtType)) {
+                 QImage image(loadImageFromID3v2PictureFrame(*pApicFrame));
+                 if (image.isNull()) {
+                     kLogger.warning()
+@@ -911,18 +927,19 @@ void importCoverImageFromID3v2Tag(QImage* pCoverArt, const TagLib::ID3v2::Tag& t
+ 
+     // Fallback: No best match -> Simply select the 1st loadable image
+     for (const auto pFrame: pFrames) {
+-        const TagLib::ID3v2::AttachedPictureFrame* pApicFrame =
+-                static_cast<const TagLib::ID3v2::AttachedPictureFrame*>(pFrame);
+-        DEBUG_ASSERT(pApicFrame); // trust TagLib
+-        const QImage image(loadImageFromID3v2PictureFrame(*pApicFrame));
+-        if (image.isNull()) {
+-            kLogger.warning()
+-                    << "Failed to load image from ID3v2 APIC frame of type"
+-                    << pApicFrame->type();
+-            continue;
+-        } else {
+-            *pCoverArt = image;
+-            return; // success
++        const auto* pApicFrame =
++                downcastID3v2Frame<TagLib::ID3v2::AttachedPictureFrame>(pFrame);
++        if (pApicFrame) {
++            const QImage image(loadImageFromID3v2PictureFrame(*pApicFrame));
++            if (image.isNull()) {
++                kLogger.warning()
++                        << "Failed to load image from ID3v2 APIC frame of type"
++                        << pApicFrame->type();
++                continue;
++            } else {
++                *pCoverArt = image;
++                return; // success
++            }
+         }
+     }
+ }

media-sound/mixxx/files/mixxx-2.1.0-try-to-fix-appstream-config-and-desktop-icon.patch

@@ -0,0 +1,125 @@
+From dbe259e21ab3c65c3af149bb0cb152f2be31f522 Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uklotz@mixxx.org>
+Date: Sun, 27 May 2018 18:19:24 +0200
+Subject: [PATCH 1/2] Update <id> and <launchable> tags according to AppStream
+ spec v0.12
+
+---
+ res/linux/mixxx.appdata.xml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/res/linux/mixxx.appdata.xml b/res/linux/mixxx.appdata.xml
+index 85498fc973..d2366c3170 100644
+--- a/res/linux/mixxx.appdata.xml
++++ b/res/linux/mixxx.appdata.xml
+@@ -1,7 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Author 2014 Tuukka Pasanen <pasanen.tuukka@gmail.com> -->
+ <component>
+-  <id type="desktop">mixxx.desktop</id>
++  <id>org.mixxx.Mixxx</id>
++  <launchable type="desktop-id">mixxx.desktop</launchable>
+   <metadata_license>CC-BY-SA-3.0</metadata_license>
+   <project_license>GPL-2.0</project_license>
+   <name>Mixxx DJ Software</name>
+
+From e56c4880874f33bd004f0164ccb7d11a182f88f0 Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uklotz@mixxx.org>
+Date: Sun, 27 May 2018 18:21:02 +0200
+Subject: [PATCH 2/2] Re-generate desktop icon with 64x64px instead of 48x48px
+
+The AppStream spec demands at least 64x64px.
+---
+ res/images/mixxx-icon.png | Bin 1577 -> 2655 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+diff --git a/res/images/mixxx-icon.png b/res/images/mixxx-icon.png
+index ab6b55a9d42a58152f8584faaf511e2172a7287b..5cb42785a781f9303a079a71e09429e3edf2c038 100644
+GIT binary patch
+literal 2655
+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
+N002ovPDHLkV1gOS+eQEY
+
+literal 1577
+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
+bHX;82VmiZiqTq-!00000NkvXXu0mjf58U6r
+

media-sound/mixxx/files/mixxx-2.1.0-use-new-link-to-updated-2-1-feedback-form.patch

@@ -0,0 +1,24 @@
+From bd9084d2d592bf34980e88428b7d1af40fce6b55 Mon Sep 17 00:00:00 2001
+From: "S.Brandt" <s.brandt@mixxx.org>
+Date: Sun, 22 Apr 2018 16:34:19 +0200
+Subject: [PATCH] In ``Help --> Send Us Feedback``, use new link to updated 2.1
+ feedback form.
+
+---
+ src/defs_urls.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/defs_urls.h b/src/defs_urls.h
+index 993ad91d35..29b377d980 100644
+--- a/src/defs_urls.h
++++ b/src/defs_urls.h
+@@ -19,8 +19,8 @@
+ 
+ #define MIXXX_WEBSITE_URL       "https://www.mixxx.org"
+ #define MIXXX_SUPPORT_URL       "https://www.mixxx.org/support/"
+-#define MIXXX_FEEDBACK_URL      "https://docs.google.com/forms/d/14pLA_aeK0TZUgpfEa6uVLknRX2CBPBPf99gHNHkYgUc/viewform"
+ #define MIXXX_TRANSLATION_URL   "https://www.transifex.com/projects/p/mixxxdj/"
++#define MIXXX_FEEDBACK_URL      "https://goo.gl/forms/IHf3JK7Q9DXmExXc2"
+ #define MIXXX_MANUAL_URL        "https://mixxx.org/manual/2.1"
+ #define MIXXX_SHORTCUTS_URL     "https://mixxx.org/manual/2.1/chapters/appendix.html#keyboard-mapping-table"
+ #define MIXXX_MANUAL_FILENAME   "Mixxx-Manual.pdf"

media-sound/mixxx/mixxx-2.1.0.ebuild

@@ -59,6 +59,7 @@ DEPEND="
 	virtual/pkgconfig
 	dev-qt/qttest:5
 	dev-qt/qtxmlpatterns:5
+	dev-vcs/git
 "
 
 PATCHES=(
@@ -92,6 +93,11 @@ PATCHES=(
 	"${FILESDIR}"/${P}-qt5-2.1.patch
 	"${FILESDIR}"/${P}-update-american-audio-vms4-preset-for-mixxx-v2.1.x.patch
 	"${FILESDIR}"/${P}-empty-library-fix-lp1772591.patch
+	#"${FILESDIR}"/${P}-try-to-fix-appstream-config-and-desktop-icon.patch
+	"${FILESDIR}"/${P}-use-new-link-to-updated-2-1-feedback-form.patch
+	#"${FILESDIR}"/${P}-library-improvements-for-all-skins-fix-lp1772202-in-tango.patch
+	"${FILESDIR}"/${P}-fix-crash-when-importing-id3v2-apic-frames.patch
+	"${FILESDIR}"/${P}-fix-some-log-levels-and-reduce-debug-log-spam.patch
 	"${FILESDIR}"/${P}-beatsync-fix.patch
 )
 
@@ -102,6 +108,11 @@ src_prepare() {
 	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
 
 	default
+
+	einfo "Applying ${P}-try-to-fix-appstream-config-and-desktop-icon.patch ..."
+	git apply --ignore-whitespace -p1 < "${FILESDIR}"/${P}-try-to-fix-appstream-config-and-desktop-icon.patch 2>/dev/null
+	einfo "Applying ${P}-library-improvements-for-all-skins-fix-lp1772202-in-tango.patch ..."
+	git apply --ignore-whitespace -p1 < "${FILESDIR}"/${P}-library-improvements-for-all-skins-fix-lp1772202-in-tango.patch 2>/dev/null
 }
 
 src_configure() {