commit: 858f151780a3ac6cc5d27ace75f9d912f4a9c04f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 15 20:13:18 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 15 23:26:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858f1517
kde-frameworks/kdelibs: Drop 4.14.34 Package-Manager: Portage-2.3.14, Repoman-2.3.6 kde-frameworks/kdelibs/Manifest | 1 - .../kdelibs/files/kdelibs-4.14.34-cmake-3.9.patch | 35 --- .../kdelibs/files/kdelibs-4.14.34-svg.patch | 35 --- kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild | 239 --------------------- 4 files changed, 310 deletions(-) diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest index 1f660056944..3b2a5b5e9b2 100644 --- a/kde-frameworks/kdelibs/Manifest +++ b/kde-frameworks/kdelibs/Manifest @@ -1,2 +1 @@ -DIST kdelibs-4.14.34.tar.xz 11644736 SHA256 777d3433555b3257fe67167723020bb7f0da7b16daeace9910751e4b9bf9bcfb SHA512 57ba1591e6996af79f03e8a3d4d0c278c027ad65c717fcbdb857df68a3df47ddec6b7c34dfd682d590bfa9ed6800974b53ff29aa7ab73522caebc9897cbd81c0 WHIRLPOOL 7c1f318edadb6625acef33891e8fb751dd0c783a05f0e4bb2b77376791c43fbfee20bf8b72aab719bcfd8d271294263f2fc57912fd09edb38589a37d8a01c968 DIST kdelibs-4.14.37.tar.xz 11642272 SHA256 4e9e4a1bf32f28427899b01bf19db01acee974e2e008ca659102a01cc0f3e430 SHA512 b25a845b7c1edae0c66b0a0881801dd3c57febc4cb57186ddddfd32c3253e492b7ff866fb38a10e4fb489233ecee71e80f3a1806f293a29607ea5f68d60ab6e1 WHIRLPOOL 4c0d6cb48d61eac89ad410b0555741809bcbb5adf2f1ecd53763fae04e79dc478104ad05db8dd4fcd43052a63d6b62db0f33e0d845a8d2c9d09f85c92e9233e1 diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.34-cmake-3.9.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.34-cmake-3.9.patch deleted file mode 100644 index 993b5235a7b..00000000000 --- a/kde-frameworks/kdelibs/files/kdelibs-4.14.34-cmake-3.9.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 57eaf65accb8d058644dc8eee7332e0ec0c1952f Mon Sep 17 00:00:00 2001 -From: Heiko Becker <[email protected]> -Date: Thu, 20 Jul 2017 20:12:10 +0200 -Subject: [cmake]: De-duplicate "else" to fix build with cmake-3.9 - -Otherwise it errors out with: -"CMake Error at kdeui/CMakeLists.txt:316 (else): A duplicate ELSE -command was found inside an IF block." -Also adjust the indentation to match the surrounding lines and remove -the arguments from else() and endif(). ---- - kdeui/CMakeLists.txt | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt -index d6ec8b4..cadb52e 100644 ---- a/kdeui/CMakeLists.txt -+++ b/kdeui/CMakeLists.txt -@@ -311,11 +311,9 @@ if (Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) - FIND_LIBRARY(SECURITY_LIBRARY Security) - set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet_mac.cpp util/qosxkeychain.cpp) - add_definitions(-DMAC_USE_OSXKEYCHAIN) --else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) -- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) --else(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) -- set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) --endif(Q_WS_MAC AND MAC_USE_OSXKEYCHAIN) -+else() -+ set(kdeui_LIB_SRCS ${kdeui_LIB_SRCS} util/kwallet.cpp) -+endif() - - if(NOT WINCE) - set(kdeui_LIB_SRCS --- -cgit v0.11.2 diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.34-svg.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.34-svg.patch deleted file mode 100644 index 48e82331dd8..00000000000 --- a/kde-frameworks/kdelibs/files/kdelibs-4.14.34-svg.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 71c3b3f779c815d5b1c0a87e6d09dadefd6b7409 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer <[email protected]> -Date: Tue, 11 Jul 2017 14:25:19 +0200 -Subject: Support SVG too - -Konqueror's about page doesn't show icons if the breeze icon theme is -used. -The reason is that khtml doesn't support SVG images. -This patch is supposed to fix it by allowing to use Qt's support in that -case. - -This is a backport of commit ed5c039f2d1996545b95a24e9bff4264144f9f6d -in khtml - -FIXED-IN: 4.14.35 -CCBUG: 355872 ---- - khtml/imload/decoders/qimageioloader.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/khtml/imload/decoders/qimageioloader.cpp b/khtml/imload/decoders/qimageioloader.cpp -index cecaeaf..7b6025b 100644 ---- a/khtml/imload/decoders/qimageioloader.cpp -+++ b/khtml/imload/decoders/qimageioloader.cpp -@@ -131,7 +131,7 @@ public: - }; - - static const char* const positiveList[] = { -- "BMP", "TIFF", "JP2", "PNM", "EXR", "XBM", "XPM", "ICO", 0 -+ "BMP", "TIFF", "JP2", "PNM", "EXR", "XBM", "XPM", "ICO", "SVG", "SVGZ", 0 - }; - - bool isSupportedFormat(QString format) { --- -cgit v0.11.2 diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild deleted file mode 100644 index 1618705e295..00000000000 --- a/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CPPUNIT_REQUIRED="optional" -DECLARATIVE_REQUIRED="always" -KDE_HANDBOOK="optional" -OPENGL_REQUIRED="optional" -QT3SUPPORT_REQUIRED="true" -SQL_REQUIRED="always" -inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic - -APPS_VERSION="17.04.3" # Don't forget to bump this - -DESCRIPTION="Libraries needed for programs by KDE" -[[ ${KDE_BUILD_TYPE} != live ]] && \ -SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz" - -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k -kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell -cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" - -REQUIRED_USE=" - udisks? ( udev ) - upower? ( udev ) -" - -# needs the kate regression testsuite from svn -RESTRICT="test" - -COMMONDEPEND=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libattica-0.4.2 - dev-libs/libdbusmenu-qt[qt4] - dev-libs/libpcre[unicode] - dev-libs/libxml2 - dev-libs/libxslt - media-libs/fontconfig - media-libs/freetype:2 - media-libs/giflib:= - media-libs/libpng:0= - media-libs/phonon[qt4] - sys-libs/zlib - virtual/jpeg:0 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-misc/shared-mime-info - !kernel_SunOS? ( || ( - sys-libs/libutempter - >=sys-freebsd/freebsd-lib-9.0 - ) ) - acl? ( virtual/acl ) - bzip2? ( app-arch/bzip2 ) - crypt? ( app-crypt/qca:2[qt4] ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper:= ) - kerberos? ( virtual/krb5 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - policykit? ( sys-auth/polkit-qt[qt4] ) - spell? ( app-text/enchant ) - ssl? ( - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) - ) - udev? ( virtual/udev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - nls? ( virtual/libintl ) -" -RDEPEND="${COMMONDEPEND} - !dev-qt/qtphonon - >=app-crypt/gnupg-2.0.11 - app-misc/ca-certificates - kde-frameworks/kdelibs-env:4 - sys-apps/dbus[X] - x11-apps/iceauth - x11-apps/rgb - x11-misc/xdg-utils - udev? ( app-misc/media-player-info ) - udisks? ( sys-fs/udisks:2 ) - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) -" -PDEPEND=" - x11-misc/xdg-utils - handbook? ( kde-apps/khelpcenter:* ) - policykit? ( kde-plasma/polkit-kde-agent ) -" - -PATCHES=( - "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" - "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" - "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" - "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" - "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.9.3-werror.patch" - "${FILESDIR}/${PN}-4.10.0-udisks.patch" - "${FILESDIR}/${PN}-4.14.20-FindQt4.patch" - "${FILESDIR}/${PN}-4.14.22-webkit.patch" - "${FILESDIR}/${P}-svg.patch" - "${FILESDIR}/${P}-cmake-3.9.patch" -) - -src_prepare() { - kde4-base_src_prepare - - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) - sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ - -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." - - if ! use opengl; then - sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \ - plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \ - || die "failed to sed out QT_QTOPENGL_FOUND" - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_HSPELL=OFF - -DWITH_ASPELL=OFF - -DKDE_DEFAULT_HOME=.kde4 - -DKAUTH_BACKEND=POLKITQT-1 - -DWITH_Soprano=OFF - -DWITH_SharedDesktopOntologies=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON - -DBUILD_doc=$(usex handbook) - -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow) - -DHAVE_PPC_ALTIVEC=$(usex altivec) - -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx) - -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse) - -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2) - -DWITH_ACL=$(usex acl) - -DWITH_BZip2=$(usex bzip2) - -DWITH_QCA2=$(usex crypt) - -DWITH_FAM=$(usex fam) - -DWITH_Jasper=$(usex jpeg2k) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_LibLZMA=$(usex lzma) - -DWITH_Libintl=$(usex nls) - -DWITH_OpenEXR=$(usex openexr) - -DWITH_PolkitQt-1=$(usex policykit) - -DWITH_ENCHANT=$(usex spell) - -DWITH_OpenSSL=$(usex ssl) - -DWITH_UDev=$(usex udev) - -DWITH_SOLID_UDISKS2=$(usex udisks) - -DWITH_KDEWEBKIT=OFF - -DWITH_Avahi=$(usex zeroconf) - ) - - use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF ) - - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - # use system certificates - rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die - dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* - fi - - # We don't package it, so don't install headers - rm -r "${ED}"/usr/include/KDE/Nepomuk || die - - einfo Installing environment file. - # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. - echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" - echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" - doenvd "${T}/77kde" -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - elog - elog "To make zeroconf support available in applications make sure that the avahi daemon" - elog "is running." - elog - elog "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" - elog "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" - elog "to include 'mdns', e.g.:" - elog " hosts: files mdns dns" - elog - fi - - kde4-base_pkg_postinst -} - -pkg_prerm() { - # Remove ksycoca4 global database - rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -}
