summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-08-10 00:11:28 +0200
committerJohannes Huber <johu@gentoo.org>2015-08-10 00:14:07 +0200
commitb9170ee9c05fdaa967f0129a7a8435b8456e82bf (patch)
tree90d5f4094a92b7caf8fdc4e79c1ac75950e5f515 /kde-base/kalarm
parentprofiles: Mask kde-base/{akonadi,kdepim-strigi-analyzer} (diff)
downloadgentoo-b9170ee9c05fdaa967f0129a7a8435b8456e82bf.tar.gz
gentoo-b9170ee9c05fdaa967f0129a7a8435b8456e82bf.tar.bz2
gentoo-b9170ee9c05fdaa967f0129a7a8435b8456e82bf.zip
kde-base: Remove KDEi Old PIM 4.4.11
Package-Manager: portage-2.2.20
Diffstat (limited to 'kde-base/kalarm')
-rw-r--r--kde-base/kalarm/Manifest1
-rw-r--r--kde-base/kalarm/files/4.4/0001-Bug-266082-highlight-alarm-when-message-window-KAlar.patch146
-rw-r--r--kde-base/kalarm/files/4.4/0003-Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch64
-rw-r--r--kde-base/kalarm/files/4.4/0006-Bug-296383-during-startup-check-that-resources-calen.patch123
-rw-r--r--kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch34
-rw-r--r--kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild39
6 files changed, 0 insertions, 407 deletions
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index dce5efd8f5cb..9443459d75d7 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -1,5 +1,4 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
-DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kalarm/files/4.4/0001-Bug-266082-highlight-alarm-when-message-window-KAlar.patch b/kde-base/kalarm/files/4.4/0001-Bug-266082-highlight-alarm-when-message-window-KAlar.patch
deleted file mode 100644
index 932f971c116a..000000000000
--- a/kde-base/kalarm/files/4.4/0001-Bug-266082-highlight-alarm-when-message-window-KAlar.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 712e45630ccd4ec128a087cb3de396b2df9e4ffc Mon Sep 17 00:00:00 2001
-From: David Jarvie <djarvie@kde.org>
-Date: Fri, 22 Apr 2011 00:36:20 +0100
-Subject: [PATCH 1/6] Bug 266082: highlight alarm when message window KAlarm
- button clicked
-
-Fix the KAlarm button in the alarm window not always showing the main
-window, and not highlighting the alarm in the main window.
----
- kalarm/Changelog | 4 ++++
- kalarm/eventlistview.cpp | 11 +++++++----
- kalarm/eventlistview.h | 6 +++---
- kalarm/functions.cpp | 11 +++--------
- kalarm/kalarm.h | 2 +-
- kalarm/mainwindow.cpp | 7 +------
- 6 files changed, 19 insertions(+), 22 deletions(-)
-
-diff --git a/kalarm/Changelog b/kalarm/Changelog
-index 25569f4..fab5edf 100644
---- a/kalarm/Changelog
-+++ b/kalarm/Changelog
-@@ -1,5 +1,9 @@
- KAlarm Change Log
-
-+=== Version 2.4.12 --- 22 April 2011 ===
-+- Fix KAlarm button in alarm window not always showing main window and not
-+ highlighting the alarm in the main window.
-+
- === Version 2.4.11 (KDEPIM 4.4.11) --- 16 April 2011 ===
- - Fix bad borders round left hand buttons of time spinboxes in Oxygen style.
- - Fix initialisation of library global statics.
-diff --git a/kalarm/eventlistview.cpp b/kalarm/eventlistview.cpp
-index 75e8be8..0880c7f 100644
---- a/kalarm/eventlistview.cpp
-+++ b/kalarm/eventlistview.cpp
-@@ -1,7 +1,7 @@
- /*
- * eventlistview.cpp - base class for widget showing list of alarms
- * Program: kalarm
-- * Copyright © 2007-2009 by David Jarvie <djarvie@kde.org>
-+ * Copyright © 2007-2009,2011 by David Jarvie <djarvie@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
-@@ -62,15 +62,18 @@ KAEvent* EventListView::event(int row) const
-
- /******************************************************************************
- * Select one event and make it the current item.
-+* Optionally scroll to ensure that the event is visible.
- */
--void EventListView::select(const QString& eventId)
-+void EventListView::select(const QString& eventId, bool scrollToEvent)
- {
-- select(eventModel()->eventIndex(eventId));
-+ select(eventModel()->eventIndex(eventId), scrollToEvent);
- }
-
--void EventListView::select(const QModelIndex& index)
-+void EventListView::select(const QModelIndex& index, bool scrollToIndex)
- {
- selectionModel()->select(index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
-+ if (scrollToIndex)
-+ scrollTo(index);
- }
-
- /******************************************************************************
-diff --git a/kalarm/eventlistview.h b/kalarm/eventlistview.h
-index 23b97b1..f0dc7ca 100644
---- a/kalarm/eventlistview.h
-+++ b/kalarm/eventlistview.h
-@@ -1,7 +1,7 @@
- /*
- * eventlistview.h - base class for widget showing list of alarms
- * Program: kalarm
-- * Copyright © 2007,2008 by David Jarvie <djarvie@kde.org>
-+ * Copyright © 2007,2008,2011 by David Jarvie <djarvie@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
-@@ -42,8 +42,8 @@ class EventListView : public QTreeView
- EventListModel* eventModel() const { return static_cast<EventListModel*>(static_cast<QAbstractProxyModel*>(model())->sourceModel()); }
- KAEvent* event(int row) const;
- KAEvent* event(const QModelIndex&) const;
-- void select(const QString& eventId);
-- void select(const QModelIndex&);
-+ void select(const QString& eventId, bool scrollToEvent = false);
-+ void select(const QModelIndex&, bool scrollToIndex = false);
- QModelIndex selectedIndex() const;
- KAEvent* selectedEvent() const;
- KAEvent::List selectedEvents() const;
-diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
-index ab1b6f1..307539a 100644
---- a/kalarm/functions.cpp
-+++ b/kalarm/functions.cpp
-@@ -132,14 +132,9 @@ MainWindow* displayMainWindowSelected(const QString& eventID)
- else
- {
- // There is already a main window, so make it the active window
-- bool visible = win->isVisible();
-- if (visible)
-- win->hide(); // in case it's on a different desktop
-- if (!visible || win->isMinimized())
-- {
-- win->setWindowState(win->windowState() & ~Qt::WindowMinimized);
-- win->show();
-- }
-+ win->hide(); // in case it's on a different desktop
-+ win->setWindowState(win->windowState() & ~Qt::WindowMinimized);
-+ win->show();
- win->raise();
- win->activateWindow();
- }
-diff --git a/kalarm/kalarm.h b/kalarm/kalarm.h
-index 63333b2..e887eb3 100644
---- a/kalarm/kalarm.h
-+++ b/kalarm/kalarm.h
-@@ -23,7 +23,7 @@
-
- #undef QT3_SUPPORT
-
--#define KALARM_VERSION "2.4.11"
-+#define KALARM_VERSION "2.4.12"
- #define KALARM_NAME "KAlarm"
- #define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application
-
-diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
-index 95ce321..dd3b915 100644
---- a/kalarm/mainwindow.cpp
-+++ b/kalarm/mainwindow.cpp
-@@ -657,12 +657,7 @@ void MainWindow::updateKeepArchived(int days)
- void MainWindow::selectEvent(const QString& eventID)
- {
- mListView->clearSelection();
-- QModelIndex index = EventListModel::alarms()->eventIndex(eventID);
-- if (index.isValid())
-- {
-- mListView->select(index);
-- mListView->scrollTo(index);
-- }
-+ mListView->select(eventID, true);
- }
-
- /******************************************************************************
---
-1.7.9.2
-
diff --git a/kde-base/kalarm/files/4.4/0003-Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch b/kde-base/kalarm/files/4.4/0003-Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
deleted file mode 100644
index 82fa7e3e8f6f..000000000000
--- a/kde-base/kalarm/files/4.4/0003-Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 4b504e760e0c994e676b55bfaca731d74841f1f4 Mon Sep 17 00:00:00 2001
-From: David Jarvie <djarvie@kde.org>
-Date: Tue, 26 Apr 2011 23:29:19 +0100
-Subject: [PATCH 3/6] Bug 271580: Fix crash displaying New Alarm dialog from
- system tray
-
-Fixes a crash on some systems when the New Alarm dialog is displayed
-from the system tray icon menu.
----
- kalarm/Changelog | 4 +++-
- kalarm/lib/spinbox2.cpp | 9 +++++----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/kalarm/Changelog b/kalarm/Changelog
-index fab5edf..7caf1dd 100644
---- a/kalarm/Changelog
-+++ b/kalarm/Changelog
-@@ -1,6 +1,8 @@
- KAlarm Change Log
-
--=== Version 2.4.12 --- 22 April 2011 ===
-+=== Version 2.4.12 --- 26 April 2011 ===
-+- Fix crash on some systems when New Alarm dialogue is displayed from system tray
-+ icon menu.
- - Fix KAlarm button in alarm window not always showing main window and not
- highlighting the alarm in the main window.
-
-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 <djarvie@kde.org>
-+ * Copyright © 2001-2009,2011 by David Jarvie <djarvie@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.
---
-1.7.9.2
-
diff --git a/kde-base/kalarm/files/4.4/0006-Bug-296383-during-startup-check-that-resources-calen.patch b/kde-base/kalarm/files/4.4/0006-Bug-296383-during-startup-check-that-resources-calen.patch
deleted file mode 100644
index 6e75d0ca3e4e..000000000000
--- a/kde-base/kalarm/files/4.4/0006-Bug-296383-during-startup-check-that-resources-calen.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From f73e082654a88617439043454b45bf950d168dfc Mon Sep 17 00:00:00 2001
-From: David Jarvie <djarvie@kde.org>
-Date: Thu, 29 Mar 2012 00:29:03 +0100
-Subject: [PATCH 6/6] Bug 296383: during startup, check that resources
- calendar opens ok
-
-Prevent crash in program initialisation by checking that the
-resources calendar has opened successfully.
-
-BUG:296383
-
-Backport of 4a3204b75464406ab3b3505e2fe222937aac6750 (master)
----
- kalarm/Changelog | 3 ++-
- kalarm/alarmcalendar.cpp | 19 ++++++++++++++++---
- kalarm/alarmcalendar.h | 4 ++--
- kalarm/kalarmapp.cpp | 3 ++-
- 4 files changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/kalarm/Changelog b/kalarm/Changelog
-index 7caf1dd..e2aee86 100644
---- a/kalarm/Changelog
-+++ b/kalarm/Changelog
-@@ -1,10 +1,11 @@
- KAlarm Change Log
-
--=== Version 2.4.12 --- 26 April 2011 ===
-+=== Version 2.4.12 --- 29 March 2012 ===
- - Fix crash on some systems when New Alarm dialogue is displayed from system tray
- icon menu.
- - Fix KAlarm button in alarm window not always showing main window and not
- highlighting the alarm in the main window.
-+- Fail cleanly if calendar resources fail to open.
-
- === Version 2.4.11 (KDEPIM 4.4.11) --- 16 April 2011 ===
- - Fix bad borders round left hand buttons of time spinboxes in Oxygen style.
-diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
-index 0b6eed8..281b58c 100644
---- a/kalarm/alarmcalendar.cpp
-+++ b/kalarm/alarmcalendar.cpp
-@@ -1,7 +1,7 @@
- /*
- * alarmcalendar.cpp - KAlarm calendar file access
- * Program: kalarm
-- * Copyright © 2001-2009 by David Jarvie <djarvie@kde.org>
-+ * Copyright © 2001-2012 by David Jarvie <djarvie@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
-@@ -187,11 +187,24 @@ AlarmCalendar::~AlarmCalendar()
- }
-
- /******************************************************************************
-+* Check whether the calendar is open.
-+*/
-+bool AlarmCalendar::isOpen()
-+{
-+ if (mOpen && mCalType == RESOURCES && !AlarmResources::instance())
-+ {
-+ mCalendar = 0;
-+ mOpen = false;
-+ }
-+ return mOpen;
-+}
-+
-+/******************************************************************************
- * Open the calendar if not already open, and load it into memory.
- */
- bool AlarmCalendar::open()
- {
-- if (mOpen)
-+ if (isOpen())
- return true;
- if (mCalType == RESOURCES)
- {
-@@ -233,7 +246,7 @@ bool AlarmCalendar::open()
- delete mCalendar;
- mCalendar = 0;
- }
-- return mOpen;
-+ return isOpen();
- }
-
- /******************************************************************************
-diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h
-index be4537d..1535dd0 100644
---- a/kalarm/alarmcalendar.h
-+++ b/kalarm/alarmcalendar.h
-@@ -1,7 +1,7 @@
- /*
- * alarmcalendar.h - KAlarm calendar file access
- * Program: kalarm
-- * Copyright © 2001-2009 by David Jarvie <djarvie@kde.org>
-+ * Copyright © 2001-2012 by David Jarvie <djarvie@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
-@@ -78,7 +78,7 @@ class AlarmCalendar : public QObject
- KAEvent* updateEvent(const KAEvent*);
- bool deleteEvent(const QString& eventID, bool save = false);
- void purgeEvents(const KAEvent::List&);
-- bool isOpen() const { return mOpen; }
-+ bool isOpen();
- QString path() const { return (mCalType == RESOURCES) ? QString() : mUrl.prettyUrl(); }
- QString urlString() const { return (mCalType == RESOURCES) ? QString() : mUrl.url(); }
- void adjustStartOfDay();
-diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
-index e472bac..f432860 100644
---- a/kalarm/kalarmapp.cpp
-+++ b/kalarm/kalarmapp.cpp
-@@ -1953,7 +1953,8 @@ bool KAlarmApp::initCheck(bool calendarOnly)
- */
- AlarmCalendar::displayCalendar()->open();
-
-- AlarmCalendar::resources()->open();
-+ if (!AlarmCalendar::resources()->open())
-+ return false;
- setArchivePurgeDays();
-
- firstTime = false;
---
-1.7.9.2
-
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
deleted file mode 100644
index 2c05d750dea7..000000000000
--- a/kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 <djarvie@kde.org>
-+ * Copyright © 2001-2009,2011 by David Jarvie <djarvie@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/kalarm-4.4.11.1-r2.ebuild b/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild
deleted file mode 100644
index 05fa01e9c1ce..000000000000
--- a/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)' 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"
- "${FILESDIR}/4.4/"000{1,3,6}-*.patch
-)
-
-src_configure() {
- mycmakeargs=(
- -DBUILD_akonadi=OFF
- -DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc
- )
- kde4-meta_src_configure
-}