* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: kdelibs-4.3.4.ebuild ChangeLog
@ 2009-12-22 23:50 Jonathan Callen (abcd)
0 siblings, 0 replies; only message in thread
From: Jonathan Callen (abcd) @ 2009-12-22 23:50 UTC (permalink / raw
To: gentoo-commits
abcd 09/12/22 23:50:11
Modified: kdelibs-4.3.4.ebuild ChangeLog
Log:
Pull in changes from overlay and patches for prefix support
(Portage version: -svn/cvs/Linux i686)
Revision Changes Path
1.5 kde-base/kdelibs/kdelibs-4.3.4.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.4.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.4.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.4.ebuild?r1=1.4&r2=1.5
Index: kdelibs-4.3.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdelibs-4.3.4.ebuild 4 Dec 2009 17:51:54 -0000 1.4
+++ kdelibs-4.3.4.ebuild 22 Dec 2009 23:50:11 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.4.ebuild,v 1.4 2009/12/04 17:51:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.4.ebuild,v 1.5 2009/12/22 23:50:11 abcd Exp $
EAPI="2"
@@ -31,25 +31,31 @@
media-libs/giflib
media-libs/jpeg
media-libs/libpng
- >=media-sound/phonon-4.3.49[xcb]
- sys-apps/dbus[X]
- sys-libs/libutempter
sys-libs/zlib
- 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
>=x11-misc/shared-mime-info-0.60
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
+ aqua? (
+ >=media-sound/phonon-4.3.49
+ sys-apps/dbus
+ )
+ !aqua? (
+ >=media-sound/phonon-4.3.49[xcb]
+ sys-apps/dbus[X]
+ 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 )
@@ -81,9 +87,11 @@
!<=kde-misc/kdnssd-avahi-0.1.2:0
!x11-libs/qt-phonon
>=app-crypt/gnupg-2.0.11
- x11-apps/iceauth
- x11-apps/rgb
- >=x11-misc/xdg-utils-1.0.2-r3
+ !aqua? (
+ x11-apps/iceauth
+ x11-apps/rgb
+ >=x11-misc/xdg-utils-1.0.2-r3
+ )
"
PDEPEND="
$(add_kdebase_dep kde-env)
@@ -107,6 +115,11 @@
"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
"${FILESDIR}/dist/23_solid_no_double_build.patch"
+ "${FILESDIR}/${PN}-4.3.1-module-suffix.patch"
+ "${FILESDIR}/${PN}-4.3.1-macos-unbundle.patch"
+ "${FILESDIR}/${PN}-4.3.3-klauncher_kdeinit.patch"
+ "${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch"
+ "${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch"
)
src_prepare() {
@@ -123,26 +136,68 @@
# kde-base/libknotificationitem for now
sed -e "/macro_optional_add_subdirectory( experimental )/ s:^:#:" \
-i CMakeLists.txt || die "Failed to sed-out experimental."
+
+ 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.1-kdeui_util_kkeyserver_mac.patch
+
+ # Workaround the problem with
+ # USING_FORK_WITHOUT_EXEC_IS_NOT_SUPPORTED_BY_FILE_MANAGER
+ #epatch "${FILESDIR}/${PN}-4.3.1-macos-kinit-fork.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="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
+ mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
elif has_version net-misc/mDNSResponder; then
- mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
+ 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="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=OFF"
+ mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
fi
if use kdeprefix; then
HME=".kde${SLOT}"
else
HME=".kde4"
fi
- mycmakeargs="${mycmakeargs}
+ mycmakeargs+=(
-DWITH_HSPELL=OFF
-DKDE_DEFAULT_HOME=${HME}
$(cmake-utils_use_build handbook doc)
@@ -165,7 +220,7 @@
$(cmake-utils_use_with spell ASPELL)
$(cmake-utils_use_with spell ENCHANT)
$(cmake-utils_use_with ssl OpenSSL)
- "
+ )
kde4-base_src_configure
}
@@ -189,10 +244,30 @@
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"
@@ -204,19 +279,23 @@
einfo " hosts: files mdns dns"
echo
fi
- elog "Your homedir is set to "'${HOME}'"/${HME}"
- elog
- local config_path="${ROOT}usr/share/config"
- [[ ${PREFIX} != "${ROOT}usr" ]] && config_path+=" ${PREFIX}/share/config"
- elog "If you experience weird application behavior (missing texts, etc.) run as root:"
- elog "# chmod go+rX -R ${config_path}"
+
+ elog "Your homedir is set to \${HOME}/${HME}"
+ echo
+
+ if ! has_version sys-apps/hal; then
+ echo
+ ewarn "You need sys-apps/hal for new device notifications, power management and any"
+ ewarn "other hardware related functionalities to work."
+ echo
+ fi
kde4-base_pkg_postinst
}
pkg_prerm() {
# Remove ksycoca4 global database
- rm -f "${PREFIX}"/share/kde4/services/ksycoca4
+ rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
}
pkg_postrm() {
1.657 kde-base/kdelibs/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.657&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.657&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.656&r2=1.657
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -r1.656 -r1.657
--- ChangeLog 11 Dec 2009 17:10:28 -0000 1.656
+++ ChangeLog 22 Dec 2009 23:50:11 -0000 1.657
@@ -1,6 +1,19 @@
# ChangeLog for kde-base/kdelibs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.656 2009/12/11 17:10:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.657 2009/12/22 23:50:11 abcd Exp $
+
+ 22 Dec 2009; Jonathan Callen <abcd@gentoo.org>
+ +files/kdelibs-4.3.1-kdeui_util_kkeyserver_mac.patch,
+ +files/kdelibs-4.3.1-macos-kinit-fork.patch,
+ +files/kdelibs-4.3.1-macos-unbundle.patch,
+ +files/kdelibs-4.3.1-module-suffix.patch,
+ +files/kdelibs-4.3.2-solaris-fileunix.patch,
+ +files/kdelibs-4.3.2-solaris-getgrouplist.patch,
+ +files/kdelibs-4.3.2-solaris-ksyscoca.patch,
+ +files/kdelibs-4.3.3-klauncher_kdeinit.patch,
+ +files/kdelibs-4.3.3-klauncher_kioslave.patch,
+ +files/kdelibs-4.3.3-klauncher_mac.patch, kdelibs-4.3.4.ebuild:
+ Pull in changes from overlay and patches for prefix support
11 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
-kdelibs-4.3.3-r2.ebuild:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-12-22 23:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-22 23:50 [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: kdelibs-4.3.4.ebuild ChangeLog Jonathan Callen (abcd)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox