commit: c5ee035bf5e54c6946d65ac53144e33079a16806 Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Jun 30 13:52:43 2015 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Jun 30 13:52:43 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5ee035b
[kde-base/kalarm] Add 4.4-noakonadi snapshot Package-Manager: portage-2.2.20 kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch | 34 +++++++++++++++++++ .../files/kalarm-4.4.11.1-underlinking.patch | 14 ++++++++ kde-base/kalarm/kalarm-4.4.2015.06.ebuild | 38 ++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch b/kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch new file mode 100644 index 0000000..2c05d75 --- /dev/null +++ b/kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch @@ -0,0 +1,34 @@ +diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp +index cc10882..f1e8ab9 100644 +--- a/kalarm/lib/spinbox2.cpp ++++ b/kalarm/lib/spinbox2.cpp +@@ -1,7 +1,7 @@ + /* + * spinbox2.cpp - spin box with extra pair of spin buttons (for Qt 3) + * Program: kalarm +- * Copyright © 2001-2009 by David Jarvie <djar...@kde.org> ++ * Copyright © 2001-2009,2011 by David Jarvie <djar...@kde.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -28,7 +28,7 @@ + #include <QMouseEvent> + #include <QStyleOptionSpinBox> + #include <QGraphicsPixmapItem> +-#include <QPaintEngine> ++#include <QPainter> + #include <QTimer> + #include <QFrame> + #include <QBrush> +@@ -588,8 +588,9 @@ void SpinMirror::setFrame() + p = grabWidget(mMainSpinbox, QRect(x, 0, 1, height())); + // Blot out edit field stuff from the middle of the slice + QPixmap dot = grabWidget(mMainSpinbox, QRect(x, editOffsetY, 1, 1)); +- QPaintEngine* pe = p.paintEngine(); +- pe->drawTiledPixmap(QRectF(0, editOffsetY, 1, height() - 2*editOffsetY), dot, QPointF(0, 0)); ++ QPainter painter(&p); ++ painter.drawTiledPixmap(0, editOffsetY, 1, height() - 2*editOffsetY, dot, 0, 0); ++ painter.end(); + // Horizontally fill the mirror widget with the vertical slice + p = p.scaled(size()); + // Grab the left hand border of the main spinbox, and draw it into the mirror widget. diff --git a/kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch b/kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch new file mode 100644 index 0000000..87eadc8 --- /dev/null +++ b/kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch @@ -0,0 +1,14 @@ +diff -ruN kalarm-4.4.11.1.orig/kalarm/CMakeLists.txt kalarm-4.4.11.1/kalarm/CMakeLists.txt +--- kalarm-4.4.11.1.orig/kalarm/CMakeLists.txt 2011-04-20 22:03:31.000000000 +0200 ++++ kalarm-4.4.11.1/kalarm/CMakeLists.txt 2011-08-11 22:03:27.096295681 +0200 +@@ -130,7 +130,9 @@ + + set_target_properties(kalarm_bin PROPERTIES OUTPUT_NAME kalarm) + +-target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources kalarm_calendar ${KDEPIMLIBS_KCAL_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} ${KDE4_PHONON_LIBS} ${X11_X11_LIB} kdepim) ++target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources kalarm_calendar ${KDEPIMLIBS_KCAL_LIBS} ${KDE4_KABC_LIBRARY} ++ ${KDE4_KMIME_LIBRARY} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} ++ ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDE4_PHONON_LIBS} ${X11_X11_LIB} kdepim) + + install(TARGETS kalarm_bin ${INSTALL_TARGETS_DEFAULT_ARGS} ) + #endif (UNIX) diff --git a/kde-base/kalarm/kalarm-4.4.2015.06.ebuild b/kde-base/kalarm/kalarm-4.4.2015.06.ebuild new file mode 100644 index 0000000..3320fd2 --- /dev/null +++ b/kde-base/kalarm/kalarm-4.4.2015.06.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild,v 1.9 2014/04/05 18:08:59 dilfridge Exp $ + +EAPI=5 + +KMNAME="kdepim" +KDE_HANDBOOK=optional +inherit kde4-meta + +DESCRIPTION="Personal alarm message, command and email scheduler for KDE (noakonadi branch)" +KEYWORDS="" +IUSE="debug" + +RDEPEND=" + $(add_kdebase_dep kdepimlibs '' 4.6) + $(add_kdebase_dep libkdepim) +" +DEPEND="${RDEPEND} + dev-libs/boost:= + dev-libs/libxslt +" + +KMEXTRACTONLY=" + kmail/ +" + +PATCHES=( + "${FILESDIR}/${PN}-4.4.11.1-underlinking.patch" +) + +src_configure() { + mycmakeargs=( + -DBUILD_akonadi=OFF + -DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc + ) + kde4-meta_src_configure +}