diff options
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kdelibs/Manifest | 7 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch | 22 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild | 264 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.2.2.ebuild | 2 |
5 files changed, 298 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index abce7fc8159..dcb94802f48 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm> + +files/kdelibs-4.2-fixx11h.h.patch, +kdelibs-4.2.1-r4.ebuild, + kdelibs-4.2.2.ebuild: + This time really fixing bug 263823 + *kdelibs-4.2.2 (27 Mar 2009) 27 Mar 2009; Alex Alexander (wired) <alex.alexander@gmail.com> diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 12e558e5e32..8016b24ae3f 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -4,16 +4,19 @@ AUX dist/20_use_dejavu_as_default_font.patch 1543 RMD160 805f4c6e685b8b6598acb1c AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad AUX install-correct-cmake-config.patch 567 RMD160 29f50ccd47d031868fe46627efb2b0815745a877 SHA1 6639760948ebef7ce4ca2aa444fff69b155599a0 SHA256 cd9544f261cda9e40a36adf05c45057216f7b67c0e51c66c833f86dc4c843736 AUX kdelibs-4.1.1-cmake-modules.patch 2905 RMD160 d7043d4153927ab655c4d7630389024983c6b95a SHA1 9d232044bf51f98656a48092082a5aafcb9d4699 SHA256 8836e0c8267054b2dedcf1c879e57bde67ff83c1b824337dec81d96a3d69754e +AUX kdelibs-4.2-fixx11h.h.patch 460 RMD160 153e677156f30d2b308c5344b12989be466e9d2c SHA1 da868fc661ce8ec514d70533b7fe6232151eb653 SHA256 307c78bb8a0056b6773380d55429458df9fd2516608077e9437fb1c0592aa7f5 AUX kdelibs-4.2.0-kded.patch 2435 RMD160 66b98f6b532b2b45a4d7539b95088b473a3fe90d SHA1 89a3845b5ca33038cdbaa7a3a4bc2a12eb53bbc9 SHA256 4addbe384870d8ba2bdcb715b7b0fecc9b956201ba87e1c772e939b63e7cd538 AUX kdelibs-4.2.0-klauncher.patch 2877 RMD160 42432fc21fd08f725b3c0551eb1b2388376dadf5 SHA1 069afec796194d2fbb3b7730077ee10b5d48c6ef SHA256 624d16db755fd1efbc0121a25f3497eb4453212ca2f376f2ad62ba78a30b1d72 AUX kdelibs-4.2.0-knode_crash.patch 404 RMD160 ecb72bd6ef1a111b155780d85a2dde026ffdf2fc SHA1 08aecb72471af440b6e32c3a062fed6e12579004 SHA256 a2e7417cecb55b7fcd706703520233546210fe250e7846df04df911019acffc4 AUX kdelibs-4.2.1-kcatalog.patch 1653 RMD160 068c80e3818051df6ebe14a333b840545e8e67ff SHA1 2c6015e1f1357029b751187e698457daee3c9b59 SHA256 11951b308bd63ad87ec9e8c77579e8f6afbe87cea6f6cbda23b08809d98bf881 AUX kdelibs-4.2.1-kdialog.patch 514 RMD160 59db100560e50c9a42bf4857eea900dbcd8b863f SHA1 c36ec0e8df80e82ae2446b1547fcd917cee71253 SHA256 decc2410a66a785a39bc67aba6cab038d98b6659dcb72241f34e3055cd83e1d5 AUX kdelibs-4.2.1-qt4.5.patch 19805 RMD160 4a266bdbe3d9dcc088f7abbffc2b46714d57208a SHA1 9490015fb83982d0aeac3a1b7918fa4262957782 SHA256 2a3ffd511d25d8a4fc4a8e246e97245a78af7766a33c6baac382568da04dc791 +DIST kdelibs-4.2.1.tar.bz2 10049614 RMD160 8099366677a4d238d8cfa18862f74c4fafa49ef7 SHA1 d2214b9864b64e4a8382a9f593d082c801c58571 SHA256 25ee5be213c4f1ccaf6f19a1a2375c3b23f6e2b4602a45542758e58782a0864d DIST kdelibs-4.2.2.tar.bz2 10051587 RMD160 98227bc896bf484833f48bec5638a4bf38e903c5 SHA1 0517cabd5fb2121897d2029ebf46f12f9373fa64 SHA256 634f4806fde8a9f37341548430bef3c1d7b63e2b722c740c7360d35d7dff3f8f DIST kdelibs-4.2.67.tar.lzma 8402560 RMD160 ade0e15ead2d8f8cd5cc05a319cdb43ceb58b740 SHA1 74e04c462aa646759a0bf908f87b7ebaaeb1ec68 SHA256 9b3ecec821e4742c9bfae111b360c5b05e2ce18193571e65175ea6b5deec2a93 -EBUILD kdelibs-4.2.2.ebuild 6990 RMD160 d363c7c02cbcad93c9f4baa04823ec2743b01490 SHA1 984bebdeffb6bea1ab74729028ab5c4cef93af54 SHA256 a6e070169e0f6a77d46ef520e0176661a8fa831b2bd9072792d3eca3f97a97b5 +EBUILD kdelibs-4.2.1-r4.ebuild 7412 RMD160 bde0242651cd88c82c96bd023982de35a5981531 SHA1 e8b584f031f7aaf05ccd0a91a52e5930ada2e9cb SHA256 3ef89da7793e6c19c5fa7e271a20b51530db0d3e7fba85f89c0a00c63f900238 +EBUILD kdelibs-4.2.2.ebuild 7096 RMD160 97ad3f6cd0afcf3d8018c57965f1ef4c1dda9f17 SHA1 23c565303776e5cd9e7a9fa7429c0b688d7fc510 SHA256 3c3c8a10694021c3b36aa27feac2632d52750ac9b5b2bf444b18ca6da763112b EBUILD kdelibs-4.2.67.ebuild 6534 RMD160 e8dcaf77b531361dfe6460bbb5593fe0ab845237 SHA1 82117e9c689d0c113f8b7802945f7fa8a0806f4b SHA256 4fa7c821cbb7e860576b75a45f147e4ff08b45d7237762b1d2af0baeebee6863 EBUILD kdelibs-9999.ebuild 6523 RMD160 68cee2b60a84ecfded1f800251e2dd8fc2f1954d SHA1 05bef0d05024c7741f5939187d4cd906ea07961c SHA256 4a04adbf95aa2dcccd86682db45ebe63af188221d9a67e4d6688db8bfdb730fb -MISC ChangeLog 13316 RMD160 4e8640a0376a62bb1308583a36d51fbdad53f59e SHA1 9dcadf63094d4df9c0cd13f47997bc38f300d6b9 SHA256 f92d4dbc86ed236625a93dc972332b62f23eca4d8cf9e0ecffa9ceb9a4ed0e02 +MISC ChangeLog 13506 RMD160 1c13856cc54ef54c0e8c60c89c133021baf90ed0 SHA1 d9e24f14b696a62a8b217448fbde79e32fe6fff5 SHA256 f4badf4a0398db76e162e6f2168436cc888c00cdb44a6ce92961ec071dd2467a MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch b/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch new file mode 100644 index 00000000000..0263856e5a4 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch @@ -0,0 +1,22 @@ +--- kdeui/util/fixx11h.h 2009/03/04 21:28:02 935354 ++++ kdeui/util/fixx11h.h 2009/03/27 14:43:00 945494 +@@ -89,11 +89,16 @@ + #ifdef Bool + #ifndef FIXX11H_Bool + #define FIXX11H_Bool +-typedef Bool XBool; +-#undef Bool +-typedef XBool Bool; ++#ifdef _XTYPEDEF_BOOL /* Xdefs.h has typedef'ed Bool already */ ++ #undef Bool ++#else ++ typedef Bool XBool; ++ #undef Bool ++ typedef XBool Bool; ++#endif + #endif + #undef Bool ++#define _XTYPEDEF_BOOL + #endif + // template <--- + diff --git a/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild b/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild new file mode 100644 index 00000000000..855670c07db --- /dev/null +++ b/kde-base/kdelibs/kdelibs-4.2.1-r4.ebuild @@ -0,0 +1,264 @@ +# 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.2.1-r3.ebuild,v 1.2 2009/03/26 21:54:05 jmbsvicetto Exp $ + +EAPI="2" + +CPPUNIT_REQUIRED="optional" +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 ~hppa ~ppc ~ppc64 ~x86" +IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam jpeg2k kerberos +mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf" +LICENSE="LGPL-2.1" +RESTRICT="test" + +COMMONDEPEND=" + >=app-misc/strigi-0.6.3[qt4,dbus] + dev-libs/libpcre + dev-libs/libxml2 + dev-libs/libxslt + >=kde-base/automoc-0.9.87 + media-fonts/dejavu + media-libs/fontconfig + media-libs/freetype:2 + media-libs/giflib + media-libs/jpeg + media-libs/libpng + >=media-sound/phonon-4.3.1[xcb] + sys-apps/dbus[X] + 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 + acl? ( + kernel_linux? ( sys-apps/acl ) + ) + alsa? ( media-libs/alsa-lib[midi] ) + bzip2? ( app-arch/bzip2 ) + fam? ( virtual/fam ) + jpeg2k? ( media-libs/jasper ) + kerberos? ( virtual/krb5 ) + openexr? ( + media-libs/openexr + media-libs/ilmbase + ) + opengl? ( virtual/opengl ) + semantic-desktop? ( >=dev-libs/soprano-2.2.2[dbus] ) + spell? ( + app-dicts/aspell-en + app-text/aspell + app-text/enchant + ) + ssl? ( dev-libs/openssl ) + zeroconf? ( + || ( + net-dns/avahi[mdnsresponder-compat] + !bindist? ( net-misc/mDNSResponder ) + ) + ) +" +DEPEND="${COMMONDEPEND} + doc? ( app-doc/doxygen ) + nls? ( virtual/libintl ) +" +# Blockers added for !kdeprefix? due to packages from old versions, +# removed in the meanwhile +# kde-base/libplasma +# kde-base/knewsticker +# kde-base/kpercentage +# kde-base/ktnef +RDEPEND="${COMMONDEPEND} + !<=kde-base/kdebase-3.5.9-r4 + !<=kde-base/kdebase-startkde-3.5.10 + !<kde-base/kdelibs-3.5.10 + !x11-libs/qt-phonon + !kdeprefix? ( + !kde-base/kitchensync:4.1 + !kde-base/knewsticker:4.1 + !kde-base/kpercentage:4.1 + !kde-base/ktnef:4.1 + !<kde-base/libkworkspace-${PV}[-kdeprefix] + !kde-base/libplasma + !<=kde-misc/kdnssd-avahi-0.1.2:0 + ) + kdeprefix? ( + !<kde-base/libkworkspace-${PV}:${SLOT} + !<=kde-misc/kdnssd-avahi-0.1.2:0 + ) + x11-apps/iceauth + x11-apps/rgb +" + +# upstream patches / dist patches +# {FILESDIR}/${P}-qt4.5.patch is upstream revision 934640 +# and fixes upstream bug 186038 and Gentoo bug 261367 +# ${FILESDIR}/${P}-kcatalog.patch fixes gwenview and other issues on both bugs +# ${FILESDIR}/${P}-kdialog.patch is upstream revision 938657 and fixes the +# systemsettings title issue +# ${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch - see bug 263823 +PATCHES=( + "${FILESDIR}/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch" + "${FILESDIR}/dist/20_use_dejavu_as_default_font.patch" + "${FILESDIR}/dist/23_solid_no_double_build.patch" + "${FILESDIR}/${P}-qt4.5.patch" + "${FILESDIR}/${P}-kcatalog.patch" + "${FILESDIR}/${P}-kdialog.patch" + "${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch" +) + +src_prepare() { + sed -i -e 's/find_package(ACL)/macro_optional_find_package(ACL)/' \ + CMakeLists.txt \ + || die "Failed to make ACL disabled even when present in system." + + kde4-base_src_prepare +} + +src_configure() { + if use zeroconf; then + if has_version net-dns/avahi; then + mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF" + elif has_version net-misc/mDNSResponder; then + mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON" + else + die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." + fi + fi + if use kdeprefix; then + HME=".kde${SLOT}" + else + HME=".kde4" + fi + mycmakeargs="${mycmakeargs} + -DWITH_HSPELL=OFF + -DKDE_DEFAULT_HOME=${HME} + $(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 ACL) + $(cmake-utils_use_with alsa Alsa) + $(cmake-utils_use_with bzip2 BZip2) + $(cmake-utils_use_with fam FAM) + $(cmake-utils_use_with jpeg2k Jasper) + $(cmake-utils_use_with kerberos GSSAPI) + $(cmake-utils_use_with nls Libintl) + $(cmake-utils_use_with openexr OpenEXR) + $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with spell ASPELL) + $(cmake-utils_use_with spell ENCHANT) + $(cmake-utils_use_with ssl OpenSSL) + " + 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 + + 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 + + dodir /etc/env.d + dodir /etc/revdep-rebuild + + # List all the multilib libdirs + local _libdir _libdirs + for _libdir in $(get_all_libdirs); do + _libdirs="${_libdirs}:${PREFIX}/${_libdir}" + done + _libdirs=${_libdirs#:} + + if use kdeprefix; then + cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version +PATH="${PREFIX}/bin" +ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin" +LDPATH="${_libdirs}" +MANPATH="${PREFIX}/share/man" +CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" +#KDE_IS_PRELINKED=1 +XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share" +COLON_SEPARATED="XDG_DATA_DIRS" +EOF + doenvd "${T}"/43kdepaths-${SLOT} + + # make sure 'source /etc/profile' doesn't hose the PATH + dodir /etc/profile.d + cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh +if [ -n "${KDEDIR}" ]; then + export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") + export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") +fi +EOF + + cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}" +SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" +EOF + else # Much simpler for the FHS compliant -kdeprefix install + cat <<-EOF > "${T}"/43kdepaths # number goes down with version +CONFIG_PROTECT="/usr/share/config" +#KDE_IS_PRELINKED=1 +XDG_DATA_DIRS="/usr/share:/usr/local/share" +COLON_SEPARATED="XDG_DATA_DIRS" + EOF + doenvd "${T}"/43kdepaths + fi + # Ensure that the correct permissions are set on ${PREFIX}/share/config + fperms 755 "${PREFIX}"/share/config +} + +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. Make sure also that multicast dns lookups are enabled by editing" + elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" + elog " hosts: files mdns dns" + echo + fi + elog "Your homedir is set to "'${HOME}'"/${HME}" + elog + elog "If you experience weird application behavior (missing texts, etc.) run as root:" + elog "# chmod 755 -R /usr/share/config $PREFIX/share/config" + + kde4-base_pkg_postinst +} + +pkg_postrm() { + fdo-mime_mime_database_update + + kde4-base_pkg_postrm +} diff --git a/kde-base/kdelibs/kdelibs-4.2.2.ebuild b/kde-base/kdelibs/kdelibs-4.2.2.ebuild index 0bc9a56bb10..b7e30a6aa70 100644 --- a/kde-base/kdelibs/kdelibs-4.2.2.ebuild +++ b/kde-base/kdelibs/kdelibs-4.2.2.ebuild @@ -108,10 +108,12 @@ RDEPEND="${COMMONDEPEND} # upstream patches / dist patches # systemsettings title issue +# ${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch - see bug 263823 PATCHES=( "${FILESDIR}/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch" "${FILESDIR}/dist/20_use_dejavu_as_default_font.patch" "${FILESDIR}/dist/23_solid_no_double_build.patch" + "${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch" ) src_prepare() { |