mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
kde-base/kdelibs: Version bump 4.14.17
Package-Manager: portage-2.2.28
This commit is contained in:
Johannes Huber
@@ -1,4 +1,3 @@
|
||||
DIST kdelibs-4.14.14.tar.xz 11631016 SHA256 63199b12957211b5ba0250b82da1d8ebc84cd5e55df287ea588cc69745c0b614 SHA512 93e6bb918449df51bc39b7b952e9487f77759616ebdae1f6f244e3a6dd7a60ee49ca2cf21eca7bc90226b7a7b9669096717ceefbc2af43cc96291f849dfe3791 WHIRLPOOL 603652472b0e813cf101d41b55afc7ed1b373f7cb7b5757cac2713615481483c1f8618968673cad5e79d5e42af505acb5bf932f29bfd142b4d9cf2616e8655d8
|
||||
DIST kdelibs-4.14.15.tar.xz 11633836 SHA256 479ddc9cab1c6c615456bebd0f09a2710f76273157e99c11c8f3e902e3b22819 SHA512 a50dcf8bd06024efe4c4e62a7822cd4e20820452812e1a41961d32b8b8dd2ae52346220830a5ab2ebf6f7a99071852fa21f8dca6e4ba6ddb872b5023b7b2d6df WHIRLPOOL 067aac20c9cca4a3acf06daeed4c15214f8579b8475a45ec4ceeabfce5c0caa7256d847a9dd417680cca30cdd3edd49c826cb11f1c7a2bc67ab2f4d8220edcdb
|
||||
DIST kdelibs-4.14.16.tar.xz 11633476 SHA256 7bf6b930c49952dceb1a090c20bf567f4385a2bbc0069a4393608b2a79e6b3aa SHA512 882df4ce0a2f77fdc2fddbeae401c961c639b12ee2f198c2afd458eb7bcb41268924033b348fc1ef187f273783b92ae05a87422def3751d4003836bda9b153bd WHIRLPOOL 96e45ac474e4c79bf031047fdb6fe74066ae95cfaf13484498632cfcfd18409ffe46e13b3e72403d2d53fc24e78008f55061c146fbdb5631a80b4ae759e6bebf
|
||||
DIST kdelibs-4.14.17.tar.xz 11634968 SHA256 e64510badfb8ec4238cfd391cb06cd8777774fa1d7ca2591be1d3e2b8ba4a0a4 SHA512 a8835f09edac5faeefba088c96a2bd380f9e9d356eacc0173de8f9dfdeeb2a1baed8f60fd22a6ddb762ff41a5152deca91fc0c9bb5d2c3348c23a9116c084396 WHIRLPOOL 29204abfadce0e2f8aa2bf9594523f5bddd6295dfede19bd33803189ba5de05a72096d23141f7bb78145327cc5b18963866e658eeffe15aebc45b24220f6a89d
|
||||
DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e WHIRLPOOL 6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
From: Alex Merry <alex.merry@kde.org>
|
||||
Date: Tue, 15 Dec 2015 19:26:47 +0000
|
||||
Subject: Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4"
|
||||
X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a02df05e4bd083f98147c86f88da2f818fc6c9f4
|
||||
---
|
||||
Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4"
|
||||
|
||||
This reverts commit 4f7ea2f770cf062ef22293fbb21a086f3e0cbfcb.
|
||||
|
||||
This change seems to be causing more problems than it fixes - it's
|
||||
probably just too big of a behaviour change for kdelibs. Which means
|
||||
that akregator will probably keep randomly crashing, but the alternative
|
||||
seems to be various other applications consistently crashing at exit.
|
||||
|
||||
If we can fix those applications (Kopete in particular), we can consider
|
||||
re-applying this afterwards.
|
||||
|
||||
BUG: 355275
|
||||
---
|
||||
|
||||
|
||||
--- a/kparts/part.cpp
|
||||
+++ b/kparts/part.cpp
|
||||
@@ -350,7 +350,7 @@
|
||||
d->m_widget = 0;
|
||||
if (d->m_autoDeletePart) {
|
||||
kDebug(1000) << "deleting part" << objectName();
|
||||
- this->deleteLater();
|
||||
+ delete this; // ouch, this should probably be deleteLater()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
--- a/kparts/tests/parttest.cpp
|
||||
+++ b/kparts/tests/parttest.cpp
|
||||
@@ -48,7 +48,6 @@
|
||||
KParts::Part* part = new TestPart(0, 0);
|
||||
QPointer<KParts::Part> partPointer(part);
|
||||
delete part->widget();
|
||||
- QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
|
||||
QVERIFY(partPointer.isNull());
|
||||
}
|
||||
|
||||
@@ -58,7 +57,6 @@
|
||||
QPointer<KParts::Part> partPointer(part);
|
||||
QPointer<QWidget> widgetPointer(part->widget());
|
||||
delete part;
|
||||
- QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
|
||||
QVERIFY(widgetPointer.isNull());
|
||||
}
|
||||
|
||||
|
||||
@@ -1,303 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
CMAKE_MIN_VERSION="3.3.1-r1"
|
||||
CPPUNIT_REQUIRED="optional"
|
||||
DECLARATIVE_REQUIRED="always"
|
||||
OPENGL_REQUIRED="optional"
|
||||
KDE_HANDBOOK="optional"
|
||||
inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
|
||||
|
||||
EGIT_BRANCH="KDE/4.14"
|
||||
|
||||
DESCRIPTION="KDE libraries needed by all KDE programs"
|
||||
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
LICENSE="LGPL-2.1"
|
||||
IUSE="cpu_flags_x86_3dnow acl alsa 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-misc/strigi-0.7.7
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-text/docbook-xsl-stylesheets
|
||||
>=dev-libs/libattica-0.4.2
|
||||
>=dev-libs/libdbusmenu-qt-0.3.2[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-misc/shared-mime-info-0.60
|
||||
acl? ( virtual/acl )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
!aqua? (
|
||||
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
|
||||
!kernel_SunOS? (
|
||||
|| (
|
||||
sys-libs/libutempter
|
||||
>=sys-freebsd/freebsd-lib-9.0
|
||||
)
|
||||
)
|
||||
)
|
||||
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-0.103.0[qt4(+)] )
|
||||
spell? ( app-text/enchant )
|
||||
ssl? (
|
||||
libressl? ( dev-libs/libressl )
|
||||
!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
|
||||
!<=kde-base/plasma-workspace-4.7.1:4
|
||||
!<=kde-base/kcontrol-4.4.50:4
|
||||
>=app-crypt/gnupg-2.0.11
|
||||
app-misc/ca-certificates
|
||||
$(add_kdebase_dep kde-env '' 4.14.3)
|
||||
sys-apps/dbus[X]
|
||||
!aqua? (
|
||||
udisks? ( sys-fs/udisks:2 )
|
||||
x11-apps/iceauth
|
||||
x11-apps/rgb
|
||||
>=x11-misc/xdg-utils-1.0.2-r3
|
||||
upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
|
||||
)
|
||||
udev? ( app-misc/media-player-info )
|
||||
"
|
||||
PDEPEND="
|
||||
$(add_kdebase_dep katepart '' 4.14.3)
|
||||
|| (
|
||||
$(add_kdeapps_dep kfmclient '' 4.14.3)
|
||||
x11-misc/xdg-utils
|
||||
)
|
||||
handbook? (
|
||||
|| (
|
||||
$(add_kdebase_dep khelpcenter '' 4.14.3)
|
||||
kde-plasma/khelpcenter:5[compat(+)]
|
||||
)
|
||||
)
|
||||
policykit? ( || (
|
||||
>=sys-auth/polkit-kde-agent-0.99
|
||||
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.13-FindQt4.patch"
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
[[ $(gcc-major-version) -lt 4 ]] || \
|
||||
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
|
||||
&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
|
||||
fi
|
||||
}
|
||||
|
||||
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 aqua; then
|
||||
sed -i -e \
|
||||
"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
|
||||
cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
|
||||
|
||||
#if [[ ${CHOST} == *-darwin8 ]]; then
|
||||
sed -i -e \
|
||||
"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
|
||||
cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
|
||||
#fi
|
||||
|
||||
# solid/solid/backends/iokit doesn't properly link, so disable it.
|
||||
sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
|
||||
|| die "disabling solid/solid/backends/iokit failed"
|
||||
sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
|
||||
|| die "disabling solid/solid/backends/iokit failed"
|
||||
|
||||
# There's no fdatasync on OSX and the check fails to detect that.
|
||||
sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
|
||||
|| die "disabling fdatasync failed"
|
||||
|
||||
# Fix nameser include to nameser8_compat
|
||||
sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
|
||||
|| die "fixing nameser include failed"
|
||||
append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
|
||||
|
||||
# Try to fix kkeyserver_mac
|
||||
epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DWITH_HSPELL=OFF
|
||||
-DWITH_ASPELL=OFF
|
||||
-DWITH_DNSSD=OFF
|
||||
-DKDE_DEFAULT_HOME=.kde4
|
||||
-DKAUTH_BACKEND=POLKITQT-1
|
||||
-DBUILD_libkactivities=OFF
|
||||
-DWITH_Soprano=OFF
|
||||
-DWITH_SharedDesktopOntologies=OFF
|
||||
$(cmake-utils_use_build handbook doc)
|
||||
$(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
|
||||
$(cmake-utils_use_has altivec PPC_ALTIVEC)
|
||||
$(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
|
||||
$(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
|
||||
$(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
|
||||
$(cmake-utils_use_with acl)
|
||||
$(cmake-utils_use_with alsa)
|
||||
$(cmake-utils_use_with bzip2 BZip2)
|
||||
$(cmake-utils_use_with crypt QCA2)
|
||||
$(cmake-utils_use_with fam)
|
||||
$(cmake-utils_use_with jpeg2k Jasper)
|
||||
$(cmake-utils_use_with kerberos GSSAPI)
|
||||
$(cmake-utils_use_with lzma LibLZMA)
|
||||
$(cmake-utils_use_with nls Libintl)
|
||||
$(cmake-utils_use_with openexr OpenEXR)
|
||||
$(cmake-utils_use_with opengl OpenGL)
|
||||
$(cmake-utils_use_with policykit PolkitQt-1)
|
||||
$(cmake-utils_use_with spell ENCHANT)
|
||||
$(cmake-utils_use_with ssl OpenSSL)
|
||||
$(cmake-utils_use_with udev UDev)
|
||||
$(cmake-utils_use_with udisks SOLID_UDISKS2)
|
||||
$(cmake-utils_use_with zeroconf Avahi)
|
||||
)
|
||||
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
|
||||
|
||||
if use aqua; then
|
||||
einfo "fixing ${PN} plugins"
|
||||
|
||||
local _PV=${PV:0:3}.0
|
||||
local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
|
||||
|
||||
install_name_tool -id \
|
||||
"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
|
||||
"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
|
||||
|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
|
||||
|
||||
einfo "fixing ${PN} cmake detection files"
|
||||
#sed -i -e \
|
||||
# "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
|
||||
echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
|
||||
"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
|
||||
|| die "failed fixing FindXKB.cmake"
|
||||
fi
|
||||
|
||||
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
|
||||
echo
|
||||
elog "To make zeroconf support available in KDE make sure that the avahi daemon"
|
||||
elog "is running."
|
||||
echo
|
||||
einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
|
||||
einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
|
||||
einfo "to include 'mdns', e.g.:"
|
||||
einfo " hosts: files mdns dns"
|
||||
echo
|
||||
fi
|
||||
|
||||
kde4-base_pkg_postinst
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# Remove ksycoca4 global database
|
||||
rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_mime_database_update
|
||||
|
||||
kde4-base_pkg_postrm
|
||||
}
|
||||
@@ -137,7 +137,6 @@ PATCHES=(
|
||||
"${FILESDIR}/${PN}-4.9.3-werror.patch"
|
||||
"${FILESDIR}/${PN}-4.10.0-udisks.patch"
|
||||
"${FILESDIR}/${PN}-4.14.13-FindQt4.patch"
|
||||
"${FILESDIR}/${PN}-4.14.15-revert.patch"
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
Reference in New Issue
Block a user