| 1 |
commit: 2ccd18a48509a82256d1422336accaaa9c61884f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 14 19:27:20 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 14 19:29:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ccd18a4 |
| 7 |
|
| 8 |
kde-frameworks/kdelibs: Drop 4.14.36 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.11, Repoman-2.3.3 |
| 11 |
|
| 12 |
kde-frameworks/kdelibs/Manifest | 1 - |
| 13 |
.../kdelibs/files/kdelibs-4.14.35-enchant2.patch | 33 --- |
| 14 |
kde-frameworks/kdelibs/kdelibs-4.14.36.ebuild | 249 --------------------- |
| 15 |
3 files changed, 283 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-frameworks/kdelibs/Manifest b/kde-frameworks/kdelibs/Manifest |
| 18 |
index ea2fc1581b2..1f660056944 100644 |
| 19 |
--- a/kde-frameworks/kdelibs/Manifest |
| 20 |
+++ b/kde-frameworks/kdelibs/Manifest |
| 21 |
@@ -1,3 +1,2 @@ |
| 22 |
DIST kdelibs-4.14.34.tar.xz 11644736 SHA256 777d3433555b3257fe67167723020bb7f0da7b16daeace9910751e4b9bf9bcfb SHA512 57ba1591e6996af79f03e8a3d4d0c278c027ad65c717fcbdb857df68a3df47ddec6b7c34dfd682d590bfa9ed6800974b53ff29aa7ab73522caebc9897cbd81c0 WHIRLPOOL 7c1f318edadb6625acef33891e8fb751dd0c783a05f0e4bb2b77376791c43fbfee20bf8b72aab719bcfd8d271294263f2fc57912fd09edb38589a37d8a01c968 |
| 23 |
-DIST kdelibs-4.14.36.tar.xz 11644668 SHA256 e129d228afdcd72b68eec0e440899f284e1e48bf54f798ec5369c5b75676a523 SHA512 8578160d204c358c96623f6c233623ea8589aa3ae623b1c6b9f7bd8e687e1e7cdff390602d871195c92bfbe11862cc4a88f2d058450b60b647cd339575349c64 WHIRLPOOL cad8e9c68c3a27d118a38e8c0b63ba5c73e7f4ec5e0b68d0d4be27552cc3fd34078049a1402f02c5880ffe185944c9c092671c9720ec3a60263168444819cc4a |
| 24 |
DIST kdelibs-4.14.37.tar.xz 11642272 SHA256 4e9e4a1bf32f28427899b01bf19db01acee974e2e008ca659102a01cc0f3e430 SHA512 b25a845b7c1edae0c66b0a0881801dd3c57febc4cb57186ddddfd32c3253e492b7ff866fb38a10e4fb489233ecee71e80f3a1806f293a29607ea5f68d60ab6e1 WHIRLPOOL 4c0d6cb48d61eac89ad410b0555741809bcbb5adf2f1ecd53763fae04e79dc478104ad05db8dd4fcd43052a63d6b62db0f33e0d845a8d2c9d09f85c92e9233e1 |
| 25 |
|
| 26 |
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-enchant2.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.35-enchant2.patch |
| 27 |
deleted file mode 100644 |
| 28 |
index 85be2d1ad2b..00000000000 |
| 29 |
--- a/kde-frameworks/kdelibs/files/kdelibs-4.14.35-enchant2.patch |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,33 +0,0 @@ |
| 32 |
-From 668ef94b2b861f7ec4aa20941bcb6493bc4367be Mon Sep 17 00:00:00 2001 |
| 33 |
-From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com> |
| 34 |
-Date: Sat, 9 Sep 2017 19:39:14 +0200 |
| 35 |
-Subject: Fix build with >=enchant-2 |
| 36 |
- |
| 37 |
-Summary: Forwarding a user-contributed patch. |
| 38 |
- |
| 39 |
-Reviewers: aacid |
| 40 |
- |
| 41 |
-Reviewed By: aacid |
| 42 |
- |
| 43 |
-Differential Revision: https://phabricator.kde.org/D7748 |
| 44 |
---- |
| 45 |
- sonnet/plugins/enchant/enchantdict.cpp | 3 +-- |
| 46 |
- 1 file changed, 1 insertion(+), 2 deletions(-) |
| 47 |
- |
| 48 |
-diff --git a/sonnet/plugins/enchant/enchantdict.cpp b/sonnet/plugins/enchant/enchantdict.cpp |
| 49 |
-index 52f7fad..80e40fc 100644 |
| 50 |
---- a/sonnet/plugins/enchant/enchantdict.cpp |
| 51 |
-+++ b/sonnet/plugins/enchant/enchantdict.cpp |
| 52 |
-@@ -82,8 +82,7 @@ bool QSpellEnchantDict::storeReplacement(const QString &bad, |
| 53 |
- |
| 54 |
- bool QSpellEnchantDict::addToPersonal(const QString &word) |
| 55 |
- { |
| 56 |
-- enchant_dict_add_to_pwl(m_dict, word.toUtf8(), |
| 57 |
-- word.toUtf8().length()); |
| 58 |
-+ enchant_dict_add(m_dict, word.toUtf8(), word.toUtf8().length()); |
| 59 |
- return true; |
| 60 |
- } |
| 61 |
- |
| 62 |
--- |
| 63 |
-cgit v0.11.2 |
| 64 |
- |
| 65 |
|
| 66 |
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.36.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.36.ebuild |
| 67 |
deleted file mode 100644 |
| 68 |
index bae657f99bd..00000000000 |
| 69 |
--- a/kde-frameworks/kdelibs/kdelibs-4.14.36.ebuild |
| 70 |
+++ /dev/null |
| 71 |
@@ -1,249 +0,0 @@ |
| 72 |
-# Copyright 1999-2017 Gentoo Foundation |
| 73 |
-# Distributed under the terms of the GNU General Public License v2 |
| 74 |
- |
| 75 |
-EAPI=6 |
| 76 |
- |
| 77 |
-CPPUNIT_REQUIRED="optional" |
| 78 |
-DECLARATIVE_REQUIRED="always" |
| 79 |
-KDE_HANDBOOK="optional" |
| 80 |
-OPENGL_REQUIRED="optional" |
| 81 |
-WEBKIT_REQUIRED="optional" |
| 82 |
-inherit kde4-base toolchain-funcs flag-o-matic xdg-utils |
| 83 |
- |
| 84 |
-APPS_VERSION="17.08.1" # Don't forget to bump this |
| 85 |
- |
| 86 |
-DESCRIPTION="Libraries needed for programs by KDE" |
| 87 |
-[[ ${KDE_BUILD_TYPE} != live ]] && \ |
| 88 |
-SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz" |
| 89 |
- |
| 90 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
| 91 |
-LICENSE="LGPL-2.1" |
| 92 |
-IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam jpeg2k kerberos |
| 93 |
-libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support |
| 94 |
-spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" |
| 95 |
- |
| 96 |
-REQUIRED_USE=" |
| 97 |
- opengl? ( plasma ) |
| 98 |
- udisks? ( udev ) |
| 99 |
- upower? ( udev ) |
| 100 |
-" |
| 101 |
- |
| 102 |
-# needs the kate regression testsuite from svn |
| 103 |
-RESTRICT="test" |
| 104 |
- |
| 105 |
-COMMONDEPEND=" |
| 106 |
- app-text/docbook-xml-dtd:4.2 |
| 107 |
- app-text/docbook-xsl-stylesheets |
| 108 |
- >=dev-libs/libattica-0.4.2 |
| 109 |
- dev-libs/libdbusmenu-qt[qt4] |
| 110 |
- dev-libs/libpcre[unicode] |
| 111 |
- dev-libs/libxml2 |
| 112 |
- dev-libs/libxslt |
| 113 |
- >=dev-qt/qtcore-${QT_MINIMAL}:4[qt3support?] |
| 114 |
- media-libs/fontconfig |
| 115 |
- media-libs/freetype:2 |
| 116 |
- media-libs/giflib:= |
| 117 |
- media-libs/libpng:0= |
| 118 |
- media-libs/phonon[qt4] |
| 119 |
- sys-libs/zlib |
| 120 |
- virtual/jpeg:0 |
| 121 |
- x11-libs/libICE |
| 122 |
- x11-libs/libSM |
| 123 |
- x11-libs/libX11 |
| 124 |
- x11-libs/libXau |
| 125 |
- x11-libs/libXcursor |
| 126 |
- x11-libs/libXdmcp |
| 127 |
- x11-libs/libXext |
| 128 |
- x11-libs/libXfixes |
| 129 |
- x11-libs/libXft |
| 130 |
- x11-libs/libXpm |
| 131 |
- x11-libs/libXrender |
| 132 |
- x11-libs/libXScrnSaver |
| 133 |
- x11-libs/libXtst |
| 134 |
- x11-misc/shared-mime-info |
| 135 |
- !kernel_SunOS? ( || ( |
| 136 |
- sys-libs/libutempter |
| 137 |
- >=sys-freebsd/freebsd-lib-9.0 |
| 138 |
- ) ) |
| 139 |
- acl? ( virtual/acl ) |
| 140 |
- bzip2? ( app-arch/bzip2 ) |
| 141 |
- fam? ( virtual/fam ) |
| 142 |
- jpeg2k? ( media-libs/jasper:= ) |
| 143 |
- kerberos? ( virtual/krb5 ) |
| 144 |
- openexr? ( |
| 145 |
- media-libs/openexr:= |
| 146 |
- media-libs/ilmbase:= |
| 147 |
- ) |
| 148 |
- plasma? ( |
| 149 |
- app-crypt/qca:2[qt4] |
| 150 |
- >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support?] |
| 151 |
- ) |
| 152 |
- policykit? ( sys-auth/polkit-qt[qt4] ) |
| 153 |
- spell? ( app-text/enchant:= ) |
| 154 |
- ssl? ( |
| 155 |
- libressl? ( dev-libs/libressl:0= ) |
| 156 |
- !libressl? ( dev-libs/openssl:0= ) |
| 157 |
- ) |
| 158 |
- udev? ( virtual/udev ) |
| 159 |
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
| 160 |
-" |
| 161 |
-DEPEND="${COMMONDEPEND} |
| 162 |
- doc? ( app-doc/doxygen ) |
| 163 |
- nls? ( virtual/libintl ) |
| 164 |
-" |
| 165 |
-RDEPEND="${COMMONDEPEND} |
| 166 |
- !dev-qt/qtphonon |
| 167 |
- >=app-crypt/gnupg-2.0.11 |
| 168 |
- app-misc/ca-certificates |
| 169 |
- kde-frameworks/kdelibs-env:4 |
| 170 |
- sys-apps/dbus[X] |
| 171 |
- x11-apps/iceauth |
| 172 |
- x11-apps/rgb |
| 173 |
- x11-misc/xdg-utils |
| 174 |
- plasma? ( !sci-libs/plasma ) |
| 175 |
- udev? ( app-misc/media-player-info ) |
| 176 |
- udisks? ( sys-fs/udisks:2 ) |
| 177 |
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) |
| 178 |
-" |
| 179 |
-PDEPEND=" |
| 180 |
- x11-misc/xdg-utils |
| 181 |
- handbook? ( kde-apps/khelpcenter:* ) |
| 182 |
- policykit? ( kde-plasma/polkit-kde-agent ) |
| 183 |
-" |
| 184 |
- |
| 185 |
-PATCHES=( |
| 186 |
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" |
| 187 |
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |
| 188 |
- "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" |
| 189 |
- "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" |
| 190 |
- "${FILESDIR}/${PN}-4.4.90-xslt.patch" |
| 191 |
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" |
| 192 |
- "${FILESDIR}/${PN}-4.8.1-norpath.patch" |
| 193 |
- "${FILESDIR}/${PN}-4.9.3-werror.patch" |
| 194 |
- "${FILESDIR}/${PN}-4.10.0-udisks.patch" |
| 195 |
- "${FILESDIR}/${PN}-4.14.20-FindQt4.patch" |
| 196 |
- "${FILESDIR}/${PN}-4.14.22-webkit.patch" |
| 197 |
- "${FILESDIR}/${PN}-4.14.35-3dnow.patch" |
| 198 |
- "${FILESDIR}/${PN}-4.14.35-kde3support.patch" |
| 199 |
- "${FILESDIR}/${PN}-4.14.35-plasma4.patch" |
| 200 |
- # upstream: |
| 201 |
- "${FILESDIR}/${PN}-4.14.35-enchant2.patch" |
| 202 |
-) |
| 203 |
- |
| 204 |
-src_prepare() { |
| 205 |
- kde4-base_src_prepare |
| 206 |
- |
| 207 |
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) |
| 208 |
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ |
| 209 |
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." |
| 210 |
- |
| 211 |
- if ! use opengl; then |
| 212 |
- sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \ |
| 213 |
- plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \ |
| 214 |
- || die "failed to sed out QT_QTOPENGL_FOUND" |
| 215 |
- fi |
| 216 |
-} |
| 217 |
- |
| 218 |
-src_configure() { |
| 219 |
- local mycmakeargs=( |
| 220 |
- -DWITH_HSPELL=OFF |
| 221 |
- -DWITH_ASPELL=OFF |
| 222 |
- -DKDE_DEFAULT_HOME=.kde4 |
| 223 |
- -DKAUTH_BACKEND=POLKITQT-1 |
| 224 |
- -DWITH_Soprano=OFF |
| 225 |
- -DWITH_SharedDesktopOntologies=OFF |
| 226 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Strigi=ON |
| 227 |
- -DBUILD_doc=$(usex handbook) |
| 228 |
- -DHAVE_X86_3DNOW=$(usex cpu_flags_x86_3dnow) |
| 229 |
- -DHAVE_PPC_ALTIVEC=$(usex altivec) |
| 230 |
- -DHAVE_X86_MMX=$(usex cpu_flags_x86_mmx) |
| 231 |
- -DHAVE_X86_SSE=$(usex cpu_flags_x86_sse) |
| 232 |
- -DHAVE_X86_SSE2=$(usex cpu_flags_x86_sse2) |
| 233 |
- -DWITH_ACL=$(usex acl) |
| 234 |
- -DWITH_BZip2=$(usex bzip2) |
| 235 |
- -DWITH_FAM=$(usex fam) |
| 236 |
- -DWITH_Jasper=$(usex jpeg2k) |
| 237 |
- -DWITH_GSSAPI=$(usex kerberos) |
| 238 |
- -DWITH_LibLZMA=$(usex lzma) |
| 239 |
- -DWITH_Libintl=$(usex nls) |
| 240 |
- -DWITH_OpenEXR=$(usex openexr) |
| 241 |
- -DWITH_PLASMA4SUPPORT=$(usex plasma) |
| 242 |
- -DWITH_QCA2=$(usex plasma) |
| 243 |
- -DWITH_PolkitQt-1=$(usex policykit) |
| 244 |
- -DWITH_KDE3SUPPORT=$(usex qt3support) |
| 245 |
- -DWITH_ENCHANT=$(usex spell) |
| 246 |
- -DWITH_OpenSSL=$(usex ssl) |
| 247 |
- -DWITH_UDev=$(usex udev) |
| 248 |
- -DWITH_SOLID_UDISKS2=$(usex udisks) |
| 249 |
- -DWITH_KDEWEBKIT=$(usex webkit) |
| 250 |
- -DWITH_Avahi=$(usex zeroconf) |
| 251 |
- ) |
| 252 |
- |
| 253 |
- use zeroconf || mycmakeargs+=( -DWITH_DNSSD=OFF ) |
| 254 |
- |
| 255 |
- kde4-base_src_configure |
| 256 |
-} |
| 257 |
- |
| 258 |
-src_compile() { |
| 259 |
- kde4-base_src_compile |
| 260 |
- |
| 261 |
- # The building of apidox is not managed anymore by the build system |
| 262 |
- if use doc; then |
| 263 |
- einfo "Building API documentation" |
| 264 |
- cd "${S}"/doc/api/ |
| 265 |
- ./doxygen.sh "${S}" || die "APIDOX generation failed" |
| 266 |
- fi |
| 267 |
-} |
| 268 |
- |
| 269 |
-src_install() { |
| 270 |
- kde4-base_src_install |
| 271 |
- |
| 272 |
- # use system certificates |
| 273 |
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die |
| 274 |
- dosym ../../../../etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt |
| 275 |
- |
| 276 |
- if use doc; then |
| 277 |
- einfo "Installing API documentation. This could take a bit of time." |
| 278 |
- cd "${S}"/doc/api/ |
| 279 |
- docinto /HTML/en/kdelibs-apidox |
| 280 |
- dohtml -r ${P}-apidocs/* |
| 281 |
- fi |
| 282 |
- |
| 283 |
- # We don't package it, so don't install headers |
| 284 |
- rm -r "${ED}"/usr/include/KDE/Nepomuk || die |
| 285 |
- |
| 286 |
- einfo Installing environment file. |
| 287 |
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. |
| 288 |
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" |
| 289 |
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" |
| 290 |
- doenvd "${T}/77kde" |
| 291 |
-} |
| 292 |
- |
| 293 |
-pkg_postinst() { |
| 294 |
- xdg_mimeinfo_database_update |
| 295 |
- |
| 296 |
- if use zeroconf; then |
| 297 |
- elog |
| 298 |
- elog "To make zeroconf support available in applications make sure that the avahi daemon" |
| 299 |
- elog "is running." |
| 300 |
- elog |
| 301 |
- elog "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" |
| 302 |
- elog "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" |
| 303 |
- elog "to include 'mdns', e.g.:" |
| 304 |
- elog " hosts: files mdns dns" |
| 305 |
- elog |
| 306 |
- fi |
| 307 |
- |
| 308 |
- kde4-base_pkg_postinst |
| 309 |
-} |
| 310 |
- |
| 311 |
-pkg_prerm() { |
| 312 |
- # Remove ksycoca4 global database |
| 313 |
- rm -f "${EROOT%/}"/usr/share/kde4/services/ksycoca4 || die |
| 314 |
-} |
| 315 |
- |
| 316 |
-pkg_postrm() { |
| 317 |
- xdg_mimeinfo_database_update |
| 318 |
- |
| 319 |
- kde4-base_pkg_postrm |
| 320 |
-} |
Archives