From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- net-misc/smb4k/Manifest | 7 +-- net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch | 25 +++++++++ net-misc/smb4k/smb4k-3.0.2.ebuild | 72 ------------------------- net-misc/smb4k/smb4k-3.0.3.ebuild | 2 +- net-misc/smb4k/smb4k-3.0.4.ebuild | 74 ++++++++++++++++++++++++++ 5 files changed, 104 insertions(+), 76 deletions(-) create mode 100644 net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch delete mode 100644 net-misc/smb4k/smb4k-3.0.2.ebuild create mode 100644 net-misc/smb4k/smb4k-3.0.4.ebuild (limited to 'net-misc/smb4k') diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest index 8a4202eb686d..459b340dee2a 100644 --- a/net-misc/smb4k/Manifest +++ b/net-misc/smb4k/Manifest @@ -1,5 +1,6 @@ -DIST smb4k-3.0.2.tar.xz 3824972 BLAKE2B 6f15bac77840669b9f9a6640e35f5b36b76653946bcef9d268452fd813c796480594b40744cf86ec5d79307294fb2f9592dc71013576efcb6c8fc607599778b9 SHA512 b60d50732ba84bae9e58f90ec18bb0fe59185814ec92e4f8adc1e699cfce61019f919fbdac2555b365c495ab1720f62b35b95c063f0c7c9466dc31487b8cb564 +AUX smb4k-3.0.4-qt-5.15.patch 689 BLAKE2B 1c7d40e8dcbdc9b41380640b648860852bb8381b2f45d61a7d221f4ad7966c1e12f7cefb9c0a9bffc7a691ab97222f44f6fae587828c2bda7e395399c4fdef5d SHA512 f2f60e30991b24f68a9a84160ba935db4d20719e515cbb47eaf0576a3303bf1b549c1dd740cbb3a283eb03781820adef09199a1b9cf23f60c0b880483209ebd6 DIST smb4k-3.0.3.tar.xz 3823612 BLAKE2B caebad4d818bbc99365541dbf9152bce17e55ba64cda6d23f663c326229d7d14246c6f385adf33a90f16ea206a9286220018810af2d7ca7f9f1f93fc571e1d7c SHA512 c517344c997aabac8158e0f2b51482adde6033ef13c3320b34a4de3462cbb3541068fb7cf90e73d39e7be3ca3f55c3a55a5804b1d1b277d9ec48e3ea06cb7181 -EBUILD smb4k-3.0.2.ebuild 1886 BLAKE2B e3db0902dea23a31824f963850c243693aea932d8804a0f92126b072e790595e5d41e9a1b226c88fce83e0975e97c9b5183df8a69db9bb91caaed96672f280bb SHA512 76fd0d9aa5695751ef1fa43ad6add6613e515dc85e9537507fb2d0c313b66df0ce3544e2776b573fe20cc77ecca4e5685e1ca8c3cd5295dbaf81d6a8686d09ea -EBUILD smb4k-3.0.3.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01 +DIST smb4k-3.0.4.tar.xz 3824508 BLAKE2B 98d9e66a577e40e734421cf46d72ebf010fa1d2161d411dbd5382af8fd84f2578a086f0425e576508aed0ed549940cf4b7f688c527f42218dd781006d2460204 SHA512 bd3b53f6f8e9ee3dd6fc8c0ab31b877fc89a887837b7bd91eef410b6dff81960ada872bada074638c8b7d204c638564a70568e87cc874e146508241e071665a3 +EBUILD smb4k-3.0.3.ebuild 1886 BLAKE2B e3db0902dea23a31824f963850c243693aea932d8804a0f92126b072e790595e5d41e9a1b226c88fce83e0975e97c9b5183df8a69db9bb91caaed96672f280bb SHA512 76fd0d9aa5695751ef1fa43ad6add6613e515dc85e9537507fb2d0c313b66df0ce3544e2776b573fe20cc77ecca4e5685e1ca8c3cd5295dbaf81d6a8686d09ea +EBUILD smb4k-3.0.4.ebuild 1934 BLAKE2B 4d708e0dab6867a4ad79e6f091352fd1fd0fdc70d1a22c97e2fca8a2e2eabee35e7bc7f4e0e892e1c023442c87c66e17932c45613284389711f45983c9112ba3 SHA512 8f0194fbb6816fe8c7cfc8bcb631c51cf386a258a46645f520249657f3638f40e86a1e213957f9cf9d35026f8530812f720aaa346e8dd34530b47e0f0567f86c MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711 diff --git a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch b/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch new file mode 100644 index 000000000000..8948e30dfa12 --- /dev/null +++ b/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch @@ -0,0 +1,25 @@ +From 009ebe0224f7e236837741a1b35f0c572024e8b3 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 21 Apr 2020 10:27:28 +0200 +Subject: [PATCH] Fix build with Qt-5.15 (missing header) + +Signed-off-by: Andreas Sturmlechner +--- + smb4k/smb4ktooltip.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/smb4k/smb4ktooltip.cpp b/smb4k/smb4ktooltip.cpp +index de07a1d..b1064f7 100644 +--- a/smb4k/smb4ktooltip.cpp ++++ b/smb4k/smb4ktooltip.cpp +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.26.1 + diff --git a/net-misc/smb4k/smb4k-3.0.2.ebuild b/net-misc/smb4k/smb4k-3.0.2.ebuild deleted file mode 100644 index 169b71b8637d..000000000000 --- a/net-misc/smb4k/smb4k-3.0.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Advanced network neighborhood browser" -HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k -https://sourceforge.net/p/smb4k/home/Home/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="plasma" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qttest-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - net-fs/samba[cups] -" -RDEPEND="${DEPEND} - plasma? ( - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - ) -" - -src_configure() { - local mycmakeargs=( - -DINSTALL_PLASMOID=$(usex plasma) - ) - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - elog "Users of Samba 4.7 and above please note that for the time being," - elog "the following setting has to be added to or changed in the [global]" - elog "section of the smb.conf file:" - elog - elog "[global]" - elog "client max protocol = NT1" -} diff --git a/net-misc/smb4k/smb4k-3.0.3.ebuild b/net-misc/smb4k/smb4k-3.0.3.ebuild index a7ff9e7f655d..169b71b8637d 100644 --- a/net-misc/smb4k/smb4k-3.0.3.ebuild +++ b/net-misc/smb4k/smb4k-3.0.3.ebuild @@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="GPL-2" diff --git a/net-misc/smb4k/smb4k-3.0.4.ebuild b/net-misc/smb4k/smb4k-3.0.4.ebuild new file mode 100644 index 000000000000..3786a642748c --- /dev/null +++ b/net-misc/smb4k/smb4k-3.0.4.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Advanced network neighborhood browser" +HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k +https://sourceforge.net/p/smb4k/home/Home/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="5" +IUSE="plasma" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qttest-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + net-fs/samba[cups] +" +RDEPEND="${DEPEND} + plasma? ( + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + ) +" + +PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) + +src_configure() { + local mycmakeargs=( + -DINSTALL_PLASMOID=$(usex plasma) + ) + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + elog "Users of Samba 4.7 and above please note that for the time being," + elog "the following setting has to be added to or changed in the [global]" + elog "section of the smb.conf file:" + elog + elog "[global]" + elog "client max protocol = NT1" +} -- cgit v1.2.3