diff options
Diffstat (limited to 'kde-base/kdelibs')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 10 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch | 106 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch | 26 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch | 51 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.6.0.ebuild | 311 |
5 files changed, 503 insertions, 1 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index fc1b3efaf471..2b424fe42e37 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.715 2011/01/25 10:04:40 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.716 2011/01/26 20:28:53 alexxy Exp $ + +*kdelibs-4.6.0 (26 Jan 2011) + + 26 Jan 2011; Alexey Shvetsov <alexxy@gentoo.org> + +files/kdelibs-4.5.73-module-suffix.patch, + +files/kdelibs-4.5.74-klauncher_mac.patch, + +files/kdelibs-4.5.90-mimetypes.patch, +kdelibs-4.6.0.ebuild: + Version bump KDE SC 4.6.0 25 Jan 2011; Markos Chandras <hwoarang@gentoo.org> kdelibs-4.4.5-r2.ebuild: Stable on amd64 wrt bug #352491 diff --git a/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch b/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch new file mode 100644 index 000000000000..1b517d9e94a4 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.5.73-module-suffix.patch @@ -0,0 +1,106 @@ +diff -purN kdelibs-4.3.80.orig/config.h.cmake kdelibs-4.3.80/config.h.cmake +--- kdelibs-4.3.80.orig/config.h.cmake 2009-10-26 05:15:52.000000000 -0400 ++++ kdelibs-4.3.80/config.h.cmake 2009-12-14 16:56:15.667194286 -0500 +@@ -12,6 +12,7 @@ + #define kde_socklen_t socklen_t + + #define KDELIBSUFF "${KDELIBSUFF}" ++#define KDE_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}" + + /****************************/ + +diff -purN kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp kdelibs-4.3.80/kdecore/util/klibloader.cpp +--- kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp 2008-05-21 07:09:15.000000000 -0400 ++++ kdelibs-4.3.80/kdecore/util/klibloader.cpp 2009-12-14 16:56:15.668194094 -0500 +@@ -57,7 +57,7 @@ KLibLoader::~KLibLoader() + { + } + +-extern QString makeLibName( const QString &libname ); ++extern QString makeLibName( const QString &libname, const QString &type ); + + extern QString findLibrary(const QString &name, const KComponentData &cData); + +diff -purN kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp kdelibs-4.3.80/kdecore/util/klibrary.cpp +--- kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp 2009-10-02 10:55:11.000000000 -0400 ++++ kdelibs-4.3.80/kdecore/util/klibrary.cpp 2009-12-14 16:57:24.317056608 -0500 +@@ -27,7 +27,7 @@ + #include <kpluginfactory.h> + #include <kdebug.h> + +-extern QString makeLibName( const QString &libname ); ++extern QString makeLibName( const QString &libname, const QString &type ); + extern QString findLibraryInternal(const QString &name, const KComponentData &cData); + + int kLibraryDebugArea() { +diff -purN kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp kdelibs-4.3.80/kdecore/util/kpluginloader.cpp +--- kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp 2009-10-15 12:35:55.000000000 -0400 ++++ kdelibs-4.3.80/kdecore/util/kpluginloader.cpp 2009-12-14 16:57:58.533877037 -0500 +@@ -27,6 +27,8 @@ + #include "klibrary.h" + #include <kdebug.h> + ++#include <config.h> ++ + #include <QtCore/QLibrary> + #include <QtCore/QDir> + #include <QtCore/QFileInfo> +@@ -54,26 +54,38 @@ + KLibrary *lib; + }; + +-inline QString makeLibName( const QString &libname ) ++inline QString makeLibName( const QString &libname, const QString &type ) + { + #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) + if (!libname.endsWith(".dll")) + return libname + ".dll"; + return libname; +-#else ++#else // Q_OS_WIN + int pos = libname.lastIndexOf(QLatin1Char('/')); + if (pos < 0) + pos = 0; + if (libname.indexOf(QLatin1Char('.'), pos) < 0) { +- const char* const extList[] = { ".so", ".dylib", ".bundle", ".sl" }; ++#ifdef Q_OS_MAC ++ // Libraries are always .dylib ++ if (type.compare("lib") == 0) { ++ return libname + ".dylib"; ++ } ++ // Modules mostly go .bundle but we'll use CMake smartness ++ else { ++ return libname + KDE_MODULE_SUFFIX; ++ } ++#else // Q_OS_MAC ++ // Prefer the value specified by cmake for the target, fall back to standard ++ const char* const extList[] = { KDE_MODULE_SUFFIX, ".so", ".sl" }; + for (uint i = 0; i < sizeof(extList) / sizeof(*extList); ++i) { + const QString lib = libname + QString::fromLatin1(extList[i]); + if (QLibrary::isLibrary(lib)) + return lib; + } ++#endif // Q_OS_MAC + } + return libname; +-#endif ++#endif // Q_OS_WIN + } + + #ifdef Q_OS_WIN +@@ -82,12 +94,13 @@ + + QString findLibraryInternal(const QString &name, const KComponentData &cData) + { +- // Convert name to a valid platform libname +- QString libname = makeLibName(name); + QFileInfo fileinfo(name); + bool hasPrefix = fileinfo.fileName().startsWith(QLatin1String("lib")); + bool kdeinit = fileinfo.fileName().startsWith(QLatin1String("libkdeinit4_")); + ++ // Convert name to a valid platform libname depending on requested type. ++ QString libname = makeLibName(name, kdeinit ? "lib" : "module"); ++ + if (hasPrefix && !kdeinit) + kDebug(kLibraryDebugArea()) << "plugins should not have a 'lib' prefix:" << libname; + #ifdef Q_CC_MSVC diff --git a/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch b/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch new file mode 100644 index 000000000000..b9869a836d8d --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.5.74-klauncher_mac.patch @@ -0,0 +1,26 @@ +--- kinit/klauncher.cpp.orig 2010-11-06 23:35:26.000000000 +0300 ++++ kinit/klauncher.cpp 2010-11-07 02:45:19.000000000 +0300 +@@ -1151,6 +1151,12 @@ + kDebug(7016) << "KLauncher: launching new slave " << name << " with protocol=" << protocol + << " args=" << arg_list << endl; + ++#ifdef Q_WS_MAC ++ arg_list.prepend(KLibLoader::findLibrary(name)); ++ name = KStandardDirs::locate("exe", QString::fromLatin1("kioslave")); ++ arg_list.prepend(name); ++#endif ++ + #ifdef Q_OS_UNIX + if (mSlaveDebug == arg1) + { +@@ -1161,8 +1167,10 @@ + } + if (mSlaveValgrind == arg1) + { ++#ifdef Q_WS_MAC + arg_list.prepend(::findLibrary(name, KGlobal::mainComponent())); + arg_list.prepend(KStandardDirs::locate("exe", QString::fromLatin1("kioslave"))); ++#endif + name = QString::fromLatin1("valgrind"); + if (!mSlaveValgrindSkin.isEmpty()) { + arg_list.prepend(QLatin1String("--tool=") + mSlaveValgrindSkin); diff --git a/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch new file mode 100644 index 000000000000..508812306a8f --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.5.90-mimetypes.patch @@ -0,0 +1,51 @@ +diff -ur kdelibs-4.5.90.orig/mimetypes/kde.xml kdelibs-4.5.90/mimetypes/kde.xml +--- kdelibs-4.5.90.orig/mimetypes/kde.xml 2010-12-22 10:56:01.000000000 +0100 ++++ kdelibs-4.5.90/mimetypes/kde.xml 2010-12-23 11:31:53.000000000 +0100 +@@ -178,34 +178,6 @@ + <glob pattern="*.abc"/> + </mime-type> + +- <!-- all/ fake mime types --> +- <mime-type type="all/all"> +- <comment>all files and folders</comment> +- </mime-type> +- <mime-type type="all/allfiles"> +- <comment>all files</comment> +- </mime-type> +- +- <!-- uri/ fake mime types --> +- <mime-type type="uri/mms"> +- <comment>mms: URIs</comment> +- </mime-type> +- <mime-type type="uri/mmst"> +- <comment>mmst: URIs</comment> +- </mime-type> +- <mime-type type="uri/mmsu"> +- <comment>mmsu: URIs</comment> +- </mime-type> +- <mime-type type="uri/pnm"> +- <comment>pnm: URIs</comment> +- </mime-type> +- <mime-type type="uri/rtspt"> +- <comment>rtspt: URIs</comment> +- </mime-type> +- <mime-type type="uri/rtspu"> +- <comment>rtspu: URIs</comment> +- </mime-type> +- + <mime-type type="application/vnd.kde.fontspackage"> + <sub-class-of type="application/zip"/> + <comment>fonts package</comment> +@@ -346,12 +318,6 @@ + <glob pattern="*.icq"/> + </mime-type> + +- <mime-type type="interface/x-winamp-skin"> +- <sub-class-of type="application/zip"/> +- <comment>compressed Winamp skin</comment> +- <glob pattern="*.wsz"/> +- </mime-type> +- + <mime-type type="video/x-ms-wmp"> <!-- fdo #19671, rejected because "not a file type, only a plugin type" --> + <comment>Microsoft Media Format</comment> + <sub-class-of type="video/x-ms-wmv"/>
\ No newline at end of file diff --git a/kde-base/kdelibs/kdelibs-4.6.0.ebuild b/kde-base/kdelibs/kdelibs-4.6.0.ebuild new file mode 100644 index 000000000000..d5a4771b7505 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-4.6.0.ebuild @@ -0,0 +1,311 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.0.ebuild,v 1.1 2011/01/26 20:28:53 alexxy Exp $ + +EAPI="3" + +CPPUNIT_REQUIRED="optional" +DECLARATIVE_REQUIRED="always" +OPENGL_REQUIRED="optional" +WEBKIT_REQUIRED="always" +inherit kde4-base fdo-mime + +DESCRIPTION="KDE libraries needed by all KDE programs." +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1" +IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos +lzma mmx nls openexr policykit semantic-desktop spell sse sse2 ssl +udev zeroconf" + +# needs the kate regression testsuite from svn +RESTRICT="test" + +COMMONDEPEND=" + app-crypt/qca:2 + >=app-misc/strigi-0.6.3 + >=dev-libs/libattica-0.1.90 + >=dev-libs/libdbusmenu-qt-0.3.2 + dev-libs/libpcre[unicode] + dev-libs/libxml2 + dev-libs/libxslt + media-libs/fontconfig + media-libs/freetype:2 + media-libs/giflib + >=media-libs/libpng-1.4 + >=media-sound/phonon-4.4.3 + sys-libs/zlib + virtual/jpeg + >=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/libXtst + !kernel_SunOS? ( sys-libs/libutempter ) + ) + bzip2? ( app-arch/bzip2 ) + fam? ( virtual/fam ) + jpeg2k? ( media-libs/jasper ) + kerberos? ( virtual/krb5 ) + lzma? ( app-arch/xz-utils ) + openexr? ( + media-libs/openexr + media-libs/ilmbase + ) + policykit? ( >=sys-auth/polkit-qt-0.99 ) + semantic-desktop? ( + >=dev-libs/shared-desktop-ontologies-0.5 + >=dev-libs/soprano-2.5.63_pre[dbus,raptor,redland] + ) + spell? ( app-text/enchant ) + ssl? ( dev-libs/openssl ) + udev? ( sys-fs/udev ) + zeroconf? ( + || ( + net-dns/avahi[mdnsresponder-compat] + !bindist? ( net-misc/mDNSResponder ) + ) + ) +" +DEPEND="${COMMONDEPEND} + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xsl-stylesheets + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +RDEPEND="${COMMONDEPEND} + !dev-libs/conversion + !dev-libs/kunitconversion + !x11-libs/qt-phonon + !<=kde-misc/kdnssd-avahi-0.1.2:0 + !<=kde-misc/knetworkmanager-4.4.0_p20100820 + >=app-crypt/gnupg-2.0.11 + app-misc/ca-certificates + $(add_kdebase_dep kde-env) + !aqua? ( + sys-fs/udisks + sys-power/upower + x11-apps/iceauth + x11-apps/rgb + >=x11-misc/xdg-utils-1.0.2-r3 + ) +" +PDEPEND=" + handbook? ( $(add_kdebase_dep khelpcenter) ) + policykit? ( + >=kde-misc/polkit-kde-kcmodules-0.98_pre20101127 + >=sys-auth/polkit-kde-agent-0.99 + ) + semantic-desktop? ( $(add_kdebase_dep nepomuk) ) +" + +# Blockers added due to packages from old versions, removed in the meanwhile +# as well as for file collisions +add_blocker libknotificationitem +add_blocker libkworkspace '<4.3.66' +add_blocker kcontrol '<4.5.80' +# @since 4.4 - kpilot is gone (blocker added to help upgrades) +add_blocker kpilot +# Block some old versions of KDE-3.5 packages that don't work well with KDE-4 +add_blocker kdebase 0 3.5.9-r4:3.5 +add_blocker kdebase-startkde 0 3.5.10:3.5 +add_blocker kdelibs 0 '<3.5.10:3.5' +# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75 +add_blocker plasma-workspace '<4.3.75' + +PATCHES=( + "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch" + "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" +# "${FILESDIR}/${PN}-4.5.73-module-suffix.patch" - FIXME what is this and why is it needed? +# "${FILESDIR}/${PN}-4.4.66-macos-unbundle.patch" - FIXME needs to be ported, also see above +# "${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" - FIXME is this really needed? if so, please upstream it +# "${FILESDIR}/${PN}-4.5.74-klauncher_mac.patch" - FIXME read above + "${FILESDIR}/${PN}-4.5.90-mimetypes.patch" + "${FILESDIR}/${PN}-4.4.90-xslt.patch" +) + +src_prepare() { + kde4-base_src_prepare + + # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work) + local menu_prefix="kde-${SLOT}-" + sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \ + -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." + sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|g" \ + -i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp 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 + + if [[ ${CHOST} == *-solaris* ]] ; then + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-ksyscoca.patch" + # getgrouplist not in solaris libc + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-getgrouplist.patch" + # solaris has no d_type element in dir_ent + epatch "${FILESDIR}/kdelibs-4.3.2-solaris-fileunix.patch" + fi +} + +src_configure() { + if use zeroconf; then + if has_version net-dns/avahi; then + mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF) + elif has_version net-misc/mDNSResponder; then + mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON) + else + die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." + fi + else + mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF) + fi + if use kdeprefix; then + HME=".kde${SLOT}" + else + HME=".kde4" + fi + mycmakeargs+=( + -DWITH_HSPELL=OFF + -DWITH_ASPELL=OFF + -DKDE_DEFAULT_HOME=${HME} + -DKAUTH_BACKEND=POLKITQT-1 + $(cmake-utils_use_build handbook doc) + $(cmake-utils_use_has 3dnow X86_3DNOW) + $(cmake-utils_use_has altivec PPC_ALTIVEC) + $(cmake-utils_use_has mmx X86_MMX) + $(cmake-utils_use_has sse X86_SSE) + $(cmake-utils_use_has sse2 X86_SSE2) + $(cmake-utils_use_with acl) + $(cmake-utils_use_with alsa) + $(cmake-utils_use_with bzip2 BZip2) + $(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 semantic-desktop Soprano) + $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) + $(cmake-utils_use_with spell ENCHANT) + $(cmake-utils_use_with ssl OpenSSL) + $(cmake-utils_use_with udev UDev) + ) + 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}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die + dosym /etc/ssl/certs/ca-certificates.crt \ + "${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die + + 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/* || die "Install phase of KDE4 API Documentation failed" + fi + + if use aqua; then + einfo "fixing ${PN} plugins" + + local _PV=${PV:0:3}.0 + local _dir=${EKDEDIR}/$(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}"/${KDEDIR}/share/apps/cmake/modules/FindXKB.cmake \ + || die "failed fixing FindXKB.cmake" + fi +} + +pkg_postinst() { + fdo-mime_mime_database_update + + if use zeroconf; then + echo + elog "To make zeroconf support available in KDE make sure that the 'mdnsd' 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 + + elog "Your homedir is set to \${HOME}/${HME}" + echo + + 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 +} |