gentoo resync : 12.01.2019

3 files changed, 3 insertions, 100 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 5f4c10b1108d..64461a086954 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,7 +1,6 @@
-AUX dolphin-18.04.1-flto.patch 3061 BLAKE2B d24d99f9cebd2979d6e0b6c8edb30b552601ba502937313395dae35e9c21c2ec6b1978eaf949cb87c5846ea6a12fe535b4fc849b3d7547c6c95c5b75c0cfc2d9 SHA512 7af21ea15381a460b08c02d5dee0bc1702a2a30c0b86b2b8f1b937783a199fb3b3cc1f76ee827ac15ca934d0e975ad2e702053369477afa35990423abe7e9d63
 AUX dolphin-18.08.3-kcrash-init.patch 1741 BLAKE2B f569dfc4fc07790b1c69697b2259b6cf13e4bd7ff0d98be5e3b09a8bf0d404f86fdfee001349c8631b8c74c5ba1a73bf6573b130a5d8bf30241560d2dc6a6eef SHA512 34393a2285647ee8e33eebccc2bb563e5ea5298252c88ece505389bceae58ecc953e5daec3ca5f05cf7838f39375474ef97e4b54ec120d0396cd7e3cc5ac0d7b
 DIST dolphin-18.08.3.tar.xz 4859384 BLAKE2B 60361ce997e0e4734fe953f988774dbe28aef9dcb7c2837c3860cfad5f56345d4d635f1478ce42a1649a6d5bd0d3838f722c95a747e1c77f17828d0d38b0ab29 SHA512 f3017ecb67009292972876f27ade398699622cd4253e608d78b9c8dd7693bce2a1d742af5f51885b28c1765496b31f83ac25fda40ba330821b460622adc7ad7c
-DIST dolphin-18.12.0.tar.xz 4865672 BLAKE2B 9459f58ab2a04e61a10d1ea7b8b90544246ea179c795e7b119486b60e5446c9f151298a3ed7d5a22dd2a110c9a292e2fe6481b36906981d2e5a329a61eea7583 SHA512 3adf07f4e58cabb91083080f0942d2d8018ec76d391869481de716c1afb6a0fa63e2bb13f94c31f70a7c1cb0d375444fb1ddc44af2522092108795db1b017b15
+DIST dolphin-18.12.1.tar.xz 4865868 BLAKE2B 9f93d6d9607d296ad1452ba2bfb3285ca1b97d9b9b0e02ae5abc04da0f4279051559720591bbd74e8c0249d2b4c5814746814fb5d0deda6a75e9db2dbfc9827a SHA512 5975c594051f9bcc860026075631bb14ea920069826c1f1994b10dbf606b0474e552324ecf0bdd252deb83c9245e3f1af80502fd122806be41fc37851b96ef3c
 EBUILD dolphin-18.08.3.ebuild 2277 BLAKE2B 447bd4a6809cf09a627eb3ae837df58088e6c396cc62e49c0daccf621e96b20210fb91d440ad222861fa17fccecac302769c7a7fcb0969dab208905ca9e841e7 SHA512 0bc9f70ab9a9be684b7b78d9d43d6996a3dd56242768d4acdcdb287e30cd92830ba31e5a01329040312ef213b0a8a42359a9d43bffe9830626e76021444f38bd
-EBUILD dolphin-18.12.0.ebuild 2164 BLAKE2B 0d32ee7e0eb96a2269798176c5c44fa73c6b30de95f3aacf7b894139ea12f14fd72de99402f78568233d2c45b88d01eddd64ad2af42b2eec2b5f3558f5b451f9 SHA512 23153f2ff12d087e161b5997f338a7a40e25ac7fe32af7705de6464f8628a73de9648270c9983a73a46b2862df2482f670804a595030f363684398309685444f
+EBUILD dolphin-18.12.1.ebuild 2164 BLAKE2B 06717c68e5f22723c4e392edca26c31812119056817d47197f81da4abe37232079b411ad9b565cd028451baffd8eaeeae187c1e2043410b04a61403bb279d40c SHA512 7a8ef3b1b9c33c16059111d90c411f7d69d8b1b354a133e0c8f9c3dad0b7fede53105c10a469ddb805adbf5c112da57a65eeb894e5a1b29bf384d5cd944fc3c8
 MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169
diff --git a/kde-apps/dolphin/dolphin-18.12.0.ebuild b/kde-apps/dolphin/dolphin-18.12.1.ebuild
index 9ec0f8f669a8..f9dd43686941 100644
--- a/kde-apps/dolphin/dolphin-18.12.0.ebuild
+++ b/kde-apps/dolphin/dolphin-18.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch b/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
deleted file mode 100644
index 8edef6b36013..000000000000
--- a/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From b607091c3982f6b84732fcf0c23c1c3f0054f203 Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Fri, 18 May 2018 22:43:25 +0200
-Subject: [PATCH 1/2] Remove main.cpp from dolphinstatic_SRCS
-
-Summary:
-The file main.cpp is already in dolphin_SRCS and doesn't
-belong in dolphinstatic_SRCS.
-
-Normally the duplicate object is simply ignored, but with
-link time optimization (LTO), linking dolphin can fail.
-Apparently, the compiler tries to inline inline kdemain()
-in this case. That is undesirable anyway and it ultimately
-fails because the DBusInterface definition is not available:
-
-.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
-<artificial>:(.text+0x2583): undefined reference to `vtable for DBusInterface'
-.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
-<artificial>:(.text+0x5aa3): undefined reference to `vtable for DBusInterface'
-.../ccHEv6cl.ltrans0.ltrans.o: In function `kdemain':
-<artificial>:(.text+0x7686): undefined reference to `DBusInterface::DBusInterface()'
-<artificial>:(.text+0x7b64): undefined reference to `vtable for DBusInterface'
-collect2: error: ld returned 1 exit status
-
-See also <https://bugs.gentoo.org/655710>.
-
-Reviewers: #dolphin, elvisangelaccio
-
-Reviewed By: elvisangelaccio
-
-Subscribers: elvisangelaccio, asturmlechner, kfm-devel
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D12929
----
- src/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 263b3ff0c..e8fe719a4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -207,7 +207,6 @@ set(dolphinstatic_SRCS
-     dolphintabwidget.cpp
-     trash/dolphintrash.cpp
-     filterbar/filterbar.cpp
--    main.cpp
-     panels/information/filemetadataconfigurationdialog.cpp
-     panels/information/informationpanel.cpp
-     panels/information/informationpanelcontent.cpp
--- 
-2.17.0
-
-
-From 8e6f4eecd318041d2e4e6386d1660742dd4ddd89 Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Fri, 18 May 2018 22:44:52 +0200
-Subject: [PATCH 2/2] Make target_link_libraries for kdeinit_dolphin PRIVATE
-
-Summary:
-There is no need to add all of kdeinit_dolphin's
-dependencies (including the static archive) when
-linking dolphin; kdemain is the only needed symbol.
-Mark the link libraries PRIVATE to simplify the
-link command for dolphin.
-
-Reviewers: #dolphin, elvisangelaccio
-
-Reviewed By: elvisangelaccio
-
-Subscribers: asturmlechner, kfm-devel
-
-Tags: #dolphin
-
-Differential Revision: https://phabricator.kde.org/D12931
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e8fe719a4..beaa0ec50 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -299,7 +299,7 @@ ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
- kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
- 
- 
--target_link_libraries(kdeinit_dolphin
-+target_link_libraries(kdeinit_dolphin PRIVATE
-     dolphinstatic
-     dolphinprivate
- )
--- 
-2.17.0
-