diff options
author | Johannes Huber <johu@gentoo.org> | 2015-03-08 20:40:43 +0100 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2015-03-08 20:40:43 +0100 |
commit | 06d5991c024840f8560e8973dc9b71eeda265b83 (patch) | |
tree | 89e9a5445edf74348f446a7eecbd3f4c73435f49 /kde-base/kdelibs | |
parent | [eclass] Introduce ECM_MINIMAL. (diff) | |
download | kde-06d5991c024840f8560e8973dc9b71eeda265b83.tar.gz kde-06d5991c024840f8560e8973dc9b71eeda265b83.tar.bz2 kde-06d5991c024840f8560e8973dc9b71eeda265b83.zip |
[kde-base/kdelibs] Revision bump adds upstream patch to fix bic
Package-Manager: portage-2.2.18
Diffstat (limited to 'kde-base/kdelibs')
-rw-r--r-- | kde-base/kdelibs/Manifest | 1 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.15.6-fix-bic.patch | 47 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.14.6-r1.ebuild (renamed from kde-base/kdelibs/kdelibs-4.14.5.ebuild) | 1 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-4.14.6.ebuild | 306 |
4 files changed, 48 insertions, 307 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 6b62b482cf..4b65f434f5 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,2 +1 @@ -DIST kdelibs-4.14.5.tar.xz 11628064 SHA256 f5b942ffefb6a64667f94e00960a134ea6d4a7827088550d507fa0bf83813fca SHA512 fbcdc16f9bbe312d970d11f210a1f874f45c97b1354287283bd15a468388e82d91805b12ce87f3487b75517bbff74b332a4b6796ee79be35e15bd2d36952a0e6 WHIRLPOOL 147f159d3a0addd59b5d17ffc9edba99ba21c7cd9a160357428992c2a2829f1f819e13b0a3ef8c608830f474dc1817f1418c6f2c283a9daffc3b91a12ae80423 DIST kdelibs-4.14.6.tar.xz 11642796 SHA256 b313419f4ecd759155862532713763904f405a5307897a2479420eb097b0bd98 SHA512 0a2db7fe63b5a3bf2bcc85d7573f778f593b362adab1d1a9193ed04cae53615a67643e53b487a0776df0bcf55e8f956ebdf9a909bb863c6d1b8e0a70e94247ed WHIRLPOOL 420ca0b1369e30b8da05363117c094c0cf63c59eb28bbaae317b95829ca59f14296e294c32d58028f7ec6690dd0ef01f5b734fa22615a778a6de4b50cd4d7085 diff --git a/kde-base/kdelibs/files/kdelibs-4.15.6-fix-bic.patch b/kde-base/kdelibs/files/kdelibs-4.15.6-fix-bic.patch new file mode 100644 index 0000000000..585ce51274 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.15.6-fix-bic.patch @@ -0,0 +1,47 @@ +diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h +index 087f697..b269213 100644 +--- a/khtml/dom/dom_string.h ++++ b/khtml/dom/dom_string.h +@@ -124,10 +124,23 @@ public: + bool endsWith(const DOMString& str) const; + bool startsWith(const DOMString& str) const; + +- // http://www.w3.org/TR/html/infrastructure.html#urls ++ /** ++ * Return a parsed url. ++ * Used to parse SRC url attribute, ++ * see http://www.w3.org/TR/html/infrastructure.html#urls ++ * ++ * @since 4.14.6 ++ */ + DOMString parsedUrl() const; + + /** ++ * @deprecated, use parsedUrl() ++ */ ++#ifndef KDE_NO_DEPRECATED ++ KDE_DEPRECATED DOMString trimSpaces() const; ++#endif ++ ++ /** + * @internal get a handle to the imlementation of the DOMString + * Use at own risk!!! + */ +diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp +index a3c4abd..4da676b 100644 +--- a/khtml/dom/dom_string.cpp ++++ b/khtml/dom/dom_string.cpp +@@ -336,6 +336,13 @@ DOMString DOMString::parsedUrl() const + return out; + } + ++#ifndef KDE_NO_DEPRECATED ++DOMString DOMString::trimSpaces() const ++{ ++ return parsedUrl(); ++} ++#endif ++ + // ------------------------------------------------------------------------ + + bool DOM::strcasecmp( const DOMString &as, const DOMString &bs ) diff --git a/kde-base/kdelibs/kdelibs-4.14.5.ebuild b/kde-base/kdelibs/kdelibs-4.14.6-r1.ebuild index e75ff9f6e7..8ca2f8fa93 100644 --- a/kde-base/kdelibs/kdelibs-4.14.5.ebuild +++ b/kde-base/kdelibs/kdelibs-4.14.6-r1.ebuild @@ -140,6 +140,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.8.1-norpath.patch" "${FILESDIR}/${PN}-4.9.3-werror.patch" "${FILESDIR}/${PN}-4.10.0-udisks.patch" + "${FILESDIR}/${PN}-4.15.6-fix-bic.patch" ) pkg_pretend() { diff --git a/kde-base/kdelibs/kdelibs-4.14.6.ebuild b/kde-base/kdelibs/kdelibs-4.14.6.ebuild deleted file mode 100644 index e75ff9f6e7..0000000000 --- a/kde-base/kdelibs/kdelibs-4.14.6.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -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 lzma cpu_flags_x86_mmx nepomuk 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 ) - nepomuk? ( - >=dev-libs/shared-desktop-ontologies-0.11.0 - >=dev-libs/soprano-2.9.0[dbus,raptor,redland] - ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - policykit? ( >=sys-auth/polkit-qt-0.103.0 ) - spell? ( app-text/enchant ) - ssl? ( 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_kdebase_dep kfmclient '' 4.14.3) - x11-misc/xdg-utils - ) - handbook? ( - || ( - $(add_kdebase_dep khelpcenter '' 4.14.3) - kde-plasma/khelpcenter:5[compat(+)] - ) - ) - nepomuk? ( - $(add_kdebase_dep nepomuk-core '' 4.14.3) - $(add_kdebase_dep nepomuk-widgets '' 4.14.3) - ) - 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" -) - -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 - $(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 nepomuk Soprano) - $(cmake-utils_use_with nepomuk SharedDesktopOntologies) - $(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 -} |