* [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/
@ 2011-04-12 1:45 Theo Chatzimichos
0 siblings, 0 replies; 9+ messages in thread
From: Theo Chatzimichos @ 2011-04-12 1:45 UTC (permalink / raw
To: gentoo-commits
commit: 9306418c967c28877829c6353913a5223063e393
Author: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 01:44:23 2011 +0000
Commit: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 01:44:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9306418c
[kde-base/kdeplasma-addons] Reorder of the deps:
- better handling of semantic-desktop (not ready yet, will be as soon as upstream REVIEW
101095 gets resolved)
- add attica useflag
Remove the cmake patch we had there (why wasn't it upstreamfied? anyway, it seems useless, I removed it)
---
.../files/4.5.0-fix_lancelot.patch | 21 -----
.../files/kdeplasma-addons-4.4.3-cmake.patch | 77 ----------------
.../files/kdeplasma-addons-4.4.74-cmake.patch | 94 --------------------
.../files/kdeplasma-addons-4.4.92-lancelot.patch | 11 ---
.../files/kdeplasma-addons-4.5.56-cmake.patch | 47 ----------
.../kdeplasma-addons-4.6.9999.ebuild | 14 ++--
.../kdeplasma-addons/kdeplasma-addons-9999.ebuild | 14 ++--
kde-base/kdeplasma-addons/metadata.xml | 1 +
8 files changed, 13 insertions(+), 266 deletions(-)
diff --git a/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch b/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch
deleted file mode 100644
index 4ae4319..0000000
--- a/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/MessagesKmail_p.h
-===================================================================
---- trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/MessagesKmail_p.h (revision 1162199)
-+++ trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/MessagesKmail_p.h (revision 1162200)
-@@ -21,11 +21,14 @@
- #include <QHash>
- #include <KIcon>
- #include <KJob>
-+
-+#include "config-lancelot-datamodels.h"
-+
-+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
- #include <Akonadi/Entity>
- #include <Akonadi/Collection>
-+#endif
-
--#include "config-lancelot-datamodels.h"
--
- namespace Lancelot {
- namespace Models {
-
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch
deleted file mode 100644
index 589954b..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: applets/CMakeLists.txt
-===================================================================
---- applets/CMakeLists.txt (revision 1122757)
-+++ applets/CMakeLists.txt (working copy)
-@@ -15,6 +15,7 @@
- add_subdirectory(calculator)
- add_subdirectory(charselect)
- add_subdirectory(comic)
-+add_subdirectory(dict)
- add_subdirectory(fifteenPuzzle)
- add_subdirectory(fileWatcher)
- add_subdirectory(frame)
-@@ -29,14 +30,21 @@
- add_subdirectory(microblog)
- add_subdirectory(notes)
- add_subdirectory(nowplaying)
-+
- if(LIBATTICA_FOUND)
- add_subdirectory(opendesktop)
- add_subdirectory(opendesktop-activities)
- endif(LIBATTICA_FOUND)
-+
- add_subdirectory(pastebin)
- add_subdirectory(previewer)
- add_subdirectory(rememberthemilk)
--add_subdirectory(rssnow)
-+
-+if(KDEPIMLIBS_FOUND)
-+ add_subdirectory(news)
-+ add_subdirectory(rssnow)
-+endif(KDEPIMLIBS_FOUND)
-+
- add_subdirectory(spellcheck)
- add_subdirectory(showdashboard)
- add_subdirectory(timer)
-@@ -47,11 +55,6 @@
- add_subdirectory(weatherstation)
- add_subdirectory(weather)
-
--if(QT_QTWEBKIT_FOUND)
-- add_subdirectory(dict)
-- add_subdirectory(news)
--endif(QT_QTWEBKIT_FOUND)
--
- if(PHONON_FOUND)
- add_subdirectory(mediaplayer)
- endif(PHONON_FOUND)
-Index: runners/CMakeLists.txt
-===================================================================
---- runners/CMakeLists.txt (revision 1122757)
-+++ runners/CMakeLists.txt (working copy)
-@@ -8,10 +8,9 @@
- add_subdirectory(spellchecker)
-
- if(KDEPIMLIBS_FOUND)
--add_subdirectory(contacts)
-+ add_subdirectory(contacts)
- endif(KDEPIMLIBS_FOUND)
-
- if(NOT WIN32)
-- add_subdirectory(konsolesessions)
-+ add_subdirectory(konsolesessions)
- endif(NOT WIN32)
--
-Index: runners/contacts/CMakeLists.txt
-===================================================================
---- runners/contacts/CMakeLists.txt (revision 1122757)
-+++ runners/contacts/CMakeLists.txt (working copy)
-@@ -5,7 +5,7 @@
-
- kde4_add_plugin(krunner_contacts ${krunner_contacts_SRCS})
- target_link_libraries(krunner_contacts ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}
--${KDE4_KABC_LIBS})
-+${KDEPIMLIBS_KABC_LIBS})
-
- install(TARGETS krunner_contacts DESTINATION ${PLUGIN_INSTALL_DIR} )
-
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.74-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.74-cmake.patch
deleted file mode 100644
index 56a1e78..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.74-cmake.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: applets/CMakeLists.txt
-===================================================================
---- applets/CMakeLists.txt (revision 1122904)
-+++ applets/CMakeLists.txt (working copy)
-@@ -16,6 +16,7 @@
- add_subdirectory(calculator)
- add_subdirectory(charselect)
- add_subdirectory(comic)
-+add_subdirectory(dict)
- add_subdirectory(fifteenPuzzle)
- add_subdirectory(fileWatcher)
- add_subdirectory(frame)
-@@ -30,14 +31,21 @@
- add_subdirectory(microblog)
- add_subdirectory(notes)
- add_subdirectory(nowplaying)
-+
- if(LIBATTICA_FOUND)
- add_subdirectory(community)
- add_subdirectory(social-news)
- endif(LIBATTICA_FOUND)
-+
- add_subdirectory(pastebin)
- add_subdirectory(previewer)
- add_subdirectory(rememberthemilk)
--add_subdirectory(rssnow)
-+
-+if(KDEPIMLIBS_FOUND)
-+ add_subdirectory(news)
-+ add_subdirectory(rssnow)
-+endif(KDEPIMLIBS_FOUND)
-+
- add_subdirectory(spellcheck)
- add_subdirectory(showdashboard)
- add_subdirectory(timer)
-@@ -48,11 +56,6 @@
- add_subdirectory(weatherstation)
- add_subdirectory(weather)
-
--if(QT_QTWEBKIT_FOUND)
-- add_subdirectory(dict)
-- add_subdirectory(news)
--endif(QT_QTWEBKIT_FOUND)
--
- if(PHONON_FOUND)
- add_subdirectory(mediaplayer)
- endif(PHONON_FOUND)
-Index: libs/lancelot-datamodels/CMakeLists.txt
-===================================================================
---- libs/lancelot-datamodels/CMakeLists.txt (revision 1122904)
-+++ libs/lancelot-datamodels/CMakeLists.txt (working copy)
-@@ -23,10 +23,8 @@
-
- set (ADDITIONAL_LINK_LIBRARIES
- ${ADDITIONAL_LINK_LIBRARIES}
-- ${KDE4_AKONADI_LIBS}
-- )
--
--
-+ ${KDEPIMLIBS_AKONADI_LIBS}
-+ )
- endif(KDEPIMLIBS_FOUND)
-
- macro_log_feature(LANCELOT_DATAMODELS_HAS_PIMLIBS
-Index: runners/CMakeLists.txt
-===================================================================
---- runners/CMakeLists.txt (revision 1122904)
-+++ runners/CMakeLists.txt (working copy)
-@@ -9,10 +9,9 @@
- add_subdirectory(characters)
-
- if(KDEPIMLIBS_FOUND)
--add_subdirectory(contacts)
-+ add_subdirectory(contacts)
- endif(KDEPIMLIBS_FOUND)
-
- if(NOT WIN32)
-- add_subdirectory(konsolesessions)
-+ add_subdirectory(konsolesessions)
- endif(NOT WIN32)
--
-Index: runners/contacts/CMakeLists.txt
-===================================================================
---- runners/contacts/CMakeLists.txt (revision 1122904)
-+++ runners/contacts/CMakeLists.txt (working copy)
-@@ -5,7 +5,7 @@
-
- kde4_add_plugin(krunner_contacts ${krunner_contacts_SRCS})
- target_link_libraries(krunner_contacts ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}
--${KDE4_KABC_LIBS})
-+${KDEPIMLIBS_KABC_LIBS})
-
- install(TARGETS krunner_contacts DESTINATION ${PLUGIN_INSTALL_DIR} )
-
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.92-lancelot.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.92-lancelot.patch
deleted file mode 100644
index 2a2ceef..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.92-lancelot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/lancelot-datamodels/BaseModel.cpp 2010/06/24 19:25:17 1142379
-+++ libs/lancelot-datamodels/BaseModel.cpp 2010/07/29 09:07:25 1156567
-@@ -165,7 +165,7 @@
- {
- const KService::Ptr service = KService::serviceByStorageId(serviceName);
-
-- qDebug() << "BaseModel::addService Applic:" << service->isValid() << " " << serviceName;
-+ // qDebug() << "BaseModel::addService Applic:" << service->isValid() << " " << serviceName;
-
- return addService(service);
- }
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch
deleted file mode 100644
index 1e326a5..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: applets/CMakeLists.txt
-===================================================================
---- applets/CMakeLists.txt (revision 1172136)
-+++ applets/CMakeLists.txt (working copy)
-@@ -16,6 +16,7 @@
- add_subdirectory(calculator)
- add_subdirectory(charselect)
- add_subdirectory(comic)
-+add_subdirectory(dict)
- add_subdirectory(fifteenPuzzle)
- add_subdirectory(fileWatcher)
- add_subdirectory(frame)
-@@ -30,14 +31,21 @@
- add_subdirectory(microblog)
- add_subdirectory(notes)
- add_subdirectory(nowplaying)
-+
- if(LIBATTICA_FOUND)
- add_subdirectory(community)
- add_subdirectory(social-news)
- endif(LIBATTICA_FOUND)
-+
- add_subdirectory(pastebin)
- add_subdirectory(previewer)
- add_subdirectory(rememberthemilk)
--add_subdirectory(rssnow)
-+
-+if(KDEPIMLIBS_FOUND)
-+ add_subdirectory(news)
-+ add_subdirectory(rssnow)
-+endif(KDEPIMLIBS_FOUND)
-+
- add_subdirectory(spellcheck)
- add_subdirectory(showdashboard)
- add_subdirectory(timer)
-@@ -48,11 +56,6 @@
- add_subdirectory(weatherstation)
- add_subdirectory(weather)
-
--if(QT_QTWEBKIT_FOUND)
-- add_subdirectory(dict)
-- add_subdirectory(news)
--endif(QT_QTWEBKIT_FOUND)
--
- if(PHONON_FOUND)
- add_subdirectory(mediaplayer)
- endif(PHONON_FOUND)
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
index 2e5950f..67633f4 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
@@ -13,23 +13,23 @@ HOMEPAGE="http://www.kde.org/"
LICENSE="GPL-2 LGPL-2"
KEYWORDS=""
-IUSE="debug desktopglobe exif qalculate qwt scim semantic-desktop"
+IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
# krunner is only needed to generate dbus interface for lancelot
COMMON_DEPEND="
app-crypt/qca:2
app-crypt/qca-ossl:2
- dev-libs/libattica
$(add_kdebase_dep kdelibs 'semantic-desktop?')
- $(add_kdebase_dep kdepimlibs)
$(add_kdebase_dep krunner)
- $(add_kdebase_dep plasma-workspace)
+ $(add_kdebase_dep plasma-workspace 'semantic-desktop?')
x11-misc/shared-mime-info
+ attica? ( dev-libs/libattica )
desktopglobe? ( $(add_kdebase_dep marble) )
exif? ( $(add_kdebase_dep libkexiv2) )
qalculate? ( sci-libs/libqalculate )
qwt? ( x11-libs/qwt:5 )
scim? ( app-i18n/scim )
+ semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:2
@@ -46,10 +46,6 @@ RDEPEND="${COMMON_DEPEND}
# kdebase-data: some svg icons moved from data directly here.
add_blocker kdebase-data '<4.2.88'
-PATCHES=(
- "${FILESDIR}/${PN}-4.5.56-cmake.patch"
-)
-
src_prepare() {
find "${S}" -name CMakeLists.txt | \
xargs sed -i \
@@ -64,10 +60,12 @@ src_prepare() {
src_configure() {
mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
+ $(cmake-utils_use_with attica LibAttica)
$(cmake-utils_use_with desktopglobe Marble)
$(cmake-utils_use_with exif Kexiv2)
$(cmake-utils_use_with qalculate)
$(cmake-utils_use_with qwt)
+ $(cmake-utils_use_with semantic-desktop KdepimLibs)
$(cmake-utils_use_with semantic-desktop Nepomuk)
$(cmake-utils_use_with scim)
)
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 2e5950f..67633f4 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -13,23 +13,23 @@ HOMEPAGE="http://www.kde.org/"
LICENSE="GPL-2 LGPL-2"
KEYWORDS=""
-IUSE="debug desktopglobe exif qalculate qwt scim semantic-desktop"
+IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
# krunner is only needed to generate dbus interface for lancelot
COMMON_DEPEND="
app-crypt/qca:2
app-crypt/qca-ossl:2
- dev-libs/libattica
$(add_kdebase_dep kdelibs 'semantic-desktop?')
- $(add_kdebase_dep kdepimlibs)
$(add_kdebase_dep krunner)
- $(add_kdebase_dep plasma-workspace)
+ $(add_kdebase_dep plasma-workspace 'semantic-desktop?')
x11-misc/shared-mime-info
+ attica? ( dev-libs/libattica )
desktopglobe? ( $(add_kdebase_dep marble) )
exif? ( $(add_kdebase_dep libkexiv2) )
qalculate? ( sci-libs/libqalculate )
qwt? ( x11-libs/qwt:5 )
scim? ( app-i18n/scim )
+ semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:2
@@ -46,10 +46,6 @@ RDEPEND="${COMMON_DEPEND}
# kdebase-data: some svg icons moved from data directly here.
add_blocker kdebase-data '<4.2.88'
-PATCHES=(
- "${FILESDIR}/${PN}-4.5.56-cmake.patch"
-)
-
src_prepare() {
find "${S}" -name CMakeLists.txt | \
xargs sed -i \
@@ -64,10 +60,12 @@ src_prepare() {
src_configure() {
mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
+ $(cmake-utils_use_with attica LibAttica)
$(cmake-utils_use_with desktopglobe Marble)
$(cmake-utils_use_with exif Kexiv2)
$(cmake-utils_use_with qalculate)
$(cmake-utils_use_with qwt)
+ $(cmake-utils_use_with semantic-desktop KdepimLibs)
$(cmake-utils_use_with semantic-desktop Nepomuk)
$(cmake-utils_use_with scim)
)
diff --git a/kde-base/kdeplasma-addons/metadata.xml b/kde-base/kdeplasma-addons/metadata.xml
index c912e97..e4b97e4 100644
--- a/kde-base/kdeplasma-addons/metadata.xml
+++ b/kde-base/kdeplasma-addons/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<herd>kde</herd>
<use>
+ <flag name="attica">Enable support for <pkg>dev-libs/libattica</pkg></flag>
<flag name="desktopglobe">Enable Desktop Globe wallpaper using <pkg>kde-base/marble</pkg></flag>
<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
<flag name="qwt">Enable applets that use <pkg>x11-libs/qwt:5</pkg>.</flag>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/
@ 2011-05-07 15:13 Tomas Chvatal
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal @ 2011-05-07 15:13 UTC (permalink / raw
To: gentoo-commits
commit: c0469ddf885006c36d84b235cd5ab6666997c9b4
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 15:12:58 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat May 7 15:12:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c0469ddf
[kde-base/kdeplasma-addons] Move semantic-desktop patch here from main tree.
---
.../kdeplasma-addons-4.6.2-optional-akonadi.patch | 72 ++++++++++++++++++++
.../kdeplasma-addons-4.6.9999.ebuild | 7 ++-
.../kdeplasma-addons/kdeplasma-addons-9999.ebuild | 7 ++-
3 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
new file mode 100644
index 0000000..857e965
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
@@ -0,0 +1,72 @@
+diff --git a/libs/lancelot-datamodels/MessagesKmail.cpp b/libs/lancelot-datamodels/MessagesKmail.cpp
+index 8fa89e0..f56203d 100644
+--- a/libs/lancelot-datamodels/MessagesKmail.cpp
++++ b/libs/lancelot-datamodels/MessagesKmail.cpp
+@@ -35,10 +35,10 @@
+ #ifndef LANCELOT_DATAMODELS_HAS_PIMLIBS
+
+ // just in case messages:
+-I18N_NOOP("Unread messages");
++/*I18N_NOOP("Unread messages");
+ I18N_NOOP("Unable to find Kontact");
+ I18N_NOOP("Start Akonadi server");
+-I18N_NOOP("Akonadi server is not running");
++I18N_NOOP("Akonadi server is not running");*/
+
+ #warning "Pimlibs are not present"
+
+diff --git a/libs/lancelot-datamodels/MessagesKmail.h b/libs/lancelot-datamodels/MessagesKmail.h
+index 8db2a1c..3dfbd6f 100644
+--- a/libs/lancelot-datamodels/MessagesKmail.h
++++ b/libs/lancelot-datamodels/MessagesKmail.h
+@@ -32,6 +32,7 @@ namespace Models {
+ */
+ class LANCELOT_EXPORT MessagesKmail : public BaseModel {
+ Q_OBJECT
++
+ public:
+ /**
+ * Creates a new MessagesKmail instance
+@@ -52,11 +53,13 @@ protected:
+
+ void load();
+
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
+ L_Override QString selfShortTitle() const;
+
+ protected Q_SLOTS:
+ void updateLater();
+ void update();
++#endif
+
+ private:
+ class Private;
+diff --git a/runners/contacts/contactsrunner.cpp b/runners/contacts/contactsrunner.cpp
+index 2b5f3ec..aa64761 100644
+--- a/runners/contacts/contactsrunner.cpp
++++ b/runners/contacts/contactsrunner.cpp
+@@ -23,7 +23,10 @@
+ #include <KLocale>
+ #include <KIcon>
+ #include <KToolInvocation>
++
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
+ #include <akonadi/contact/contactdefaultactions.h>
++#endif
+ /*#include <KMimeType>
+
+ */
+diff --git a/runners/events/events_config.h b/runners/events/events_config.h
+index f73b22b..8bb0148 100644
+--- a/runners/events/events_config.h
++++ b/runners/events/events_config.h
+@@ -26,7 +26,9 @@
+
+ //KDE-Includes
+ #include <KCModule>
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
+ #include <Akonadi/Collection>
++#endif
+
+ //Qt
+
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
index 11636ba..9697f76 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild,v 1.1 2011/05/07 10:48:00 scarabeus Exp $
EAPI=4
@@ -49,6 +49,11 @@ RDEPEND="${COMMON_DEPEND}
# kdebase-data: some svg icons moved from data directly here.
add_blocker kdebase-data '<4.2.88'
+src_prepare() {
+ use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
+ kde4-base_src_prepare
+}
+
src_configure() {
mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 11636ba..9697f76 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.3.ebuild,v 1.1 2011/05/07 10:48:00 scarabeus Exp $
EAPI=4
@@ -49,6 +49,11 @@ RDEPEND="${COMMON_DEPEND}
# kdebase-data: some svg icons moved from data directly here.
add_blocker kdebase-data '<4.2.88'
+src_prepare() {
+ use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
+ kde4-base_src_prepare
+}
+
src_configure() {
mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/
@ 2011-07-31 19:46 Elias Probst
0 siblings, 0 replies; 9+ messages in thread
From: Elias Probst @ 2011-07-31 19:46 UTC (permalink / raw
To: gentoo-commits
commit: e46bfcf4f3372392777d08adf9a7e32e392a7655
Author: Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Sun Jul 31 19:46:20 2011 +0000
Commit: Elias Probst <mail <AT> eliasprobst <DOT> eu>
CommitDate: Sun Jul 31 19:46:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e46bfcf4
[kde-base/kdeplasma-addons-4.7.0-r1] Added patch to prevent crashes of plasma-desktop on startup when using grid layout (see KDE Bug#278222).
---
...plasma-addons-4.7.0-groupingdesktop-crash.patch | 69 ++++++++++++++++++
.../kdeplasma-addons-4.7.0-r1.ebuild | 73 ++++++++++++++++++++
2 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch
new file mode 100644
index 0000000..587295a
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch
@@ -0,0 +1,69 @@
+commit 67b5c56e564f5052238bab38342a85e5f4af570b
+Author: Christoph Feck <christoph@maxiom.de>
+Date: Sat Jul 30 19:15:28 2011 +0200
+
+ Fix assignment operator and add copy constructor
+
+ This fixes the crash in Grid Desktop and Grouping Desktop.
+ Thanks to Aaron Seigo for investigation and patch review.
+
+ BUG: 278222
+ FIXED-IN: 4.7.1
+
+diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containments/groupingdesktop/lib/groupinfo.cpp
+index 2106cca..c945551 100644
+--- a/containments/groupingdesktop/lib/groupinfo.cpp
++++ b/containments/groupingdesktop/lib/groupinfo.cpp
+@@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QString &prettyName)
+ d->prettyName = prettyName;
+ }
+
++GroupInfo::GroupInfo(const GroupInfo &other)
++ : d(new GroupInfoPrivate())
++{
++ *d = *other.d;
++}
++
+ GroupInfo::~GroupInfo()
+ {
+ delete d;
+@@ -78,13 +84,12 @@ QString GroupInfo::icon() const
+ return d->icon;
+ }
+
+-GroupInfo GroupInfo::operator=(const GroupInfo &gi)
++GroupInfo &GroupInfo::operator=(const GroupInfo &gi)
+ {
+- GroupInfo g(gi.name(), gi.prettyName());
+- g.setFormFactors(gi.formFactors());
+- g.setIcon(gi.icon());
+-
+- return g;
++ if (this != &gi) {
++ *d = *gi.d;
++ }
++ return *this;
+ }
+
+ bool GroupInfo::operator==(const GroupInfo &gi) const
+diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments/groupingdesktop/lib/groupinfo.h
+index f8cc66f..320c800 100644
+--- a/containments/groupingdesktop/lib/groupinfo.h
++++ b/containments/groupingdesktop/lib/groupinfo.h
+@@ -31,6 +31,7 @@ class GroupInfo
+ {
+ public:
+ explicit GroupInfo(const QString &name, const QString &prettyName = QString());
++ GroupInfo(const GroupInfo &other);
+ ~GroupInfo();
+ void setFormFactors(QSet<Plasma::FormFactor> formFactors);
+ void setIcon(const QString &icon);
+@@ -40,7 +41,7 @@ class GroupInfo
+ QSet<Plasma::FormFactor> formFactors() const;
+ QString icon() const;
+
+- GroupInfo operator=(const GroupInfo &gi);
++ GroupInfo &operator=(const GroupInfo &gi);
+ bool operator==(const GroupInfo &gi) const;
+ bool operator<(const GroupInfo &gi) const;
+
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild
new file mode 100644
index 0000000..5e3b862
--- /dev/null
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0.ebuild,v 1.1 2011/07/27 14:04:49 alexxy Exp $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Extra Plasma applets and engines."
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2 LGPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
+
+# krunner is only needed to generate dbus interface for lancelot
+COMMON_DEPEND="
+ app-crypt/qca:2
+ app-crypt/qca-ossl:2
+ $(add_kdebase_dep kdelibs 'semantic-desktop=')
+ $(add_kdebase_dep krunner)
+ $(add_kdebase_dep plasma-workspace 'semantic-desktop=')
+ x11-misc/shared-mime-info
+ attica? ( dev-libs/libattica )
+ desktopglobe? ( $(add_kdebase_dep marble) )
+ exif? ( $(add_kdebase_dep libkexiv2) )
+ qalculate? ( sci-libs/libqalculate )
+ qwt? ( x11-libs/qwt:5 )
+ scim? ( app-i18n/scim )
+ semantic-desktop? (
+ $(add_kdebase_dep kdepimlibs 'semantic-desktop')
+ $(add_kdebase_dep plasma-workspace 'rss')
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:2
+"
+# kde-misc/plasmaboard: moved here in 4.3.65
+# kde-misc/qalculate-applet: since 4.4.0
+RDEPEND="${COMMON_DEPEND}
+ !kde-misc/plasmaboard
+ !kde-misc/qalculate-applet
+"
+
+PATCHES=(
+ # needed for 4.7.0, can be removed in 4.7.1, see KDE Bug#278222
+ "${FILESDIR}/${P}-groupingdesktop-crash.patch"
+)
+
+# kdebase-data: some svg icons moved from data directly here.
+add_blocker kdebase-data '<4.2.88'
+
+src_prepare() {
+ use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
+ $(cmake-utils_use_with attica LibAttica)
+ $(cmake-utils_use_with desktopglobe Marble)
+ $(cmake-utils_use_with exif Kexiv2)
+ $(cmake-utils_use_with qalculate)
+ $(cmake-utils_use_with qwt)
+ $(cmake-utils_use_with semantic-desktop KdepimLibs)
+ $(cmake-utils_use_with semantic-desktop Nepomuk)
+ $(cmake-utils_use_with scim)
+ )
+
+ kde4-base_src_configure
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/
@ 2011-11-20 16:14 Andreas Hüttel
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Hüttel @ 2011-11-20 16:14 UTC (permalink / raw
To: gentoo-commits
commit: e06a5f295f86965154bf8a7126ceb95509d22a10
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Nov 20 17:14:41 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 17:14:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e06a5f29
[kde-base/kdeplasma-addons] Only build knowledgebase plasmoid if we USE attica, bug 391019
(Portage version: 2.1.10.34/git/Linux x86_64, unsigned Manifest commit)
---
.../files/kdeplasma-addons-4.7.3-knowledge.patch | 19 +++++++++++++++++++
.../kdeplasma-addons-4.7.49.9999.ebuild | 4 ++++
.../kdeplasma-addons-4.7.80.ebuild | 4 ++++
.../kdeplasma-addons/kdeplasma-addons-9999.ebuild | 4 ++++
4 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch
new file mode 100644
index 0000000..3a7f89f
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch
@@ -0,0 +1,19 @@
+diff -ruN kdeplasma-addons-4.7.3.orig/applets/CMakeLists.txt kdeplasma-addons-4.7.3/applets/CMakeLists.txt
+--- kdeplasma-addons-4.7.3.orig/applets/CMakeLists.txt 2011-10-02 15:26:40.000000000 +0200
++++ kdeplasma-addons-4.7.3/applets/CMakeLists.txt 2011-11-20 18:05:27.833155727 +0100
+@@ -26,7 +26,6 @@
+ add_subdirectory(kolourpicker)
+ add_subdirectory(konqprofiles)
+ add_subdirectory(konsoleprofiles)
+-add_subdirectory(knowledgebase)
+ add_subdirectory(life)
+ add_subdirectory(luna)
+ add_subdirectory(magnifique)
+@@ -34,6 +33,7 @@
+ add_subdirectory(notes)
+ add_subdirectory(nowplaying)
+ if(LIBATTICA_FOUND)
++ add_subdirectory(knowledgebase)
+ add_subdirectory(community)
+ add_subdirectory(social-news)
+ endif(LIBATTICA_FOUND)
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.49.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.49.9999.ebuild
index 416bfee..1b773a4 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.49.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.49.9999.ebuild
@@ -39,6 +39,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7.3-knowledge.patch"
+)
+
src_prepare() {
use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
kde4-base_src_prepare
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild
index d2cb7a9..3999258 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild
@@ -39,6 +39,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7.3-knowledge.patch"
+)
+
src_prepare() {
use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
kde4-base_src_prepare
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 416bfee..1b773a4 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -39,6 +39,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.7.3-knowledge.patch"
+)
+
src_prepare() {
use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
kde4-base_src_prepare
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/
@ 2011-11-28 18:36 Johannes Huber
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Huber @ 2011-11-28 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 4a12e63bdaa62c532ede0673168c8e53c97a0de3
Author: Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Mon Nov 28 18:37:29 2011 +0000
Commit: Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Mon Nov 28 18:37:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4a12e63b
[kde-base/kdeplasma-addons] Add build fix patches to 4.7.80, bug 392027. Thanks Marian Kyral <mkyral <AT> email.cz>.
(Portage version: 2.2.0_alpha78/git/Linux i686, unsigned Manifest commit)
---
...deplasma-addons-4.7.80-fix-build-lancelot.patch | 122 ++++++++++++++++++++
...-addons-4.7.80-fix-build-marble-wallpaper.patch | 19 +++
...-addons-4.7.80-remove-outdated-statements.patch | 40 +++++++
.../kdeplasma-addons-4.7.80.ebuild | 3 +
4 files changed, 184 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch
new file mode 100644
index 0000000..96a00c5
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch
@@ -0,0 +1,122 @@
+commit 6967ee53518136651b4fd5d691293a3c866d7a47
+Author: Aaron Seigo <aseigo@kde.org>
+Date: Tue Nov 22 21:10:45 2011 +0100
+
+ fix build
+
+diff --git a/libs/lancelot-datamodels/OpenDocuments.cpp b/libs/lancelot-datamodels/OpenDocuments.cpp
+index 4b2bec5..b9f24ec 100644
+--- a/libs/lancelot-datamodels/OpenDocuments.cpp
++++ b/libs/lancelot-datamodels/OpenDocuments.cpp
+@@ -66,41 +66,41 @@ OpenDocuments::~OpenDocuments()
+ delete d;
+ }
+
+-void OpenDocuments::Private::connectTask(TaskPtr task)
++void OpenDocuments::Private::connectTask(::TaskManager::Task *task)
+ {
+ Q_ASSERT(task);
+ connect(
+- task.constData(), SIGNAL(changed(::TaskManager::TaskChanges)),
++ task, SIGNAL(changed(::TaskManager::TaskChanges)),
+ this, SLOT(taskChanged())
+ );
+ }
+
+ void OpenDocuments::load()
+ {
+- foreach (TaskPtr task, TaskManager::TaskManager::self()->tasks()) {
++ foreach (TaskManager::Task *task, TaskManager::TaskManager::self()->tasks()) {
+ if (d->setDataForTask(task)) {
+ d->connectTask(task);
+ }
+ }
+
+ connect(
+- TaskManager::TaskManager::self(), SIGNAL(taskAdded(TaskPtr)),
+- d, SLOT(taskAdded(TaskPtr))
++ TaskManager::TaskManager::self(), SIGNAL(taskAdded(::TaskManager::Task*)),
++ d, SLOT(taskAdded(::TaskManager::Task*))
+ );
+
+ connect(
+- TaskManager::TaskManager::self(), SIGNAL(taskRemoved(TaskPtr)),
+- d, SLOT(taskRemoved(TaskPtr))
++ TaskManager::TaskManager::self(), SIGNAL(taskRemoved(::TaskManager::Task*)),
++ d, SLOT(taskRemoved(::TaskManager::Task*))
+ );
+ }
+
+-void OpenDocuments::Private::taskAdded(TaskPtr task)
++void OpenDocuments::Private::taskAdded(::TaskManager::Task *task)
+ {
+ connectTask(task);
+ setDataForTask(task);
+ }
+
+-void OpenDocuments::Private::taskRemoved(TaskPtr task)
++void OpenDocuments::Private::taskRemoved(::TaskManager::Task *task)
+ {
+ Q_ASSERT(task);
+ int index = indexOf(task->window());
+@@ -115,10 +115,10 @@ void OpenDocuments::Private::taskChanged()
+ TaskManager::Task* task = qobject_cast<TaskManager::Task*>(sender());
+ Q_ASSERT(task);
+
+- setDataForTask(TaskPtr(task));
++ setDataForTask(task);
+ }
+
+-bool OpenDocuments::Private::setDataForTask(TaskPtr task)
++bool OpenDocuments::Private::setDataForTask(::TaskManager::Task *task)
+ {
+ Q_ASSERT(task);
+
+diff --git a/libs/lancelot-datamodels/OpenDocuments.h b/libs/lancelot-datamodels/OpenDocuments.h
+index 00b0910..f9c5461 100644
+--- a/libs/lancelot-datamodels/OpenDocuments.h
++++ b/libs/lancelot-datamodels/OpenDocuments.h
+@@ -26,8 +26,6 @@
+ #include <taskmanager/taskmanager.h>
+ #include <QSet>
+
+-using TaskManager::TaskPtr;
+-
+ namespace Lancelot {
+ namespace Models {
+
+diff --git a/libs/lancelot-datamodels/OpenDocuments_p.h b/libs/lancelot-datamodels/OpenDocuments_p.h
+index 5fdfe70..d2dc374 100644
+--- a/libs/lancelot-datamodels/OpenDocuments_p.h
++++ b/libs/lancelot-datamodels/OpenDocuments_p.h
+@@ -24,8 +24,6 @@
+ #include <taskmanager/taskmanager.h>
+ #include <QSet>
+
+-using TaskManager::TaskPtr;
+-
+ namespace Lancelot {
+ namespace Models {
+
+@@ -44,16 +42,16 @@ public:
+
+ public Q_SLOTS:
+ void taskChanged();
+- void taskAdded(TaskPtr task);
+- void taskRemoved(TaskPtr task);
++ void taskAdded(::TaskManager::Task *task);
++ void taskRemoved(::TaskManager::Task *task);
+
+- void connectTask(TaskPtr task);
+- bool setDataForTask(TaskPtr task);
++ void connectTask(::TaskManager::Task *task);
++ bool setDataForTask(::TaskManager::Task *task);
+
+ int indexOf(WId wid);
+
+ public:
+- QMap <WId, TaskPtr > tasks;
++ QMap <WId, TaskManager::Task *> tasks;
+ QList <SupportedTask> supportedTasks;
+
+ private:
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch
new file mode 100644
index 0000000..c01f131
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch
@@ -0,0 +1,19 @@
+commit e089568a73ec0fa9f8e9ec61c9853b1905d3a1d7
+Author: Ben Cooksley <bcooksley@kde.org>
+Date: Mon Nov 28 08:14:54 2011 +1300
+
+ Fix build of Marble wallpaper
+ REVIEW: 103243
+
+diff --git a/wallpapers/marble/marble.cpp b/wallpapers/marble/marble.cpp
+index 3cecaae..988a8b6 100644
+--- a/wallpapers/marble/marble.cpp
++++ b/wallpapers/marble/marble.cpp
+@@ -137,7 +137,6 @@ QWidget *MarbleWallpaper::createConfigurationInterface(QWidget *parent)
+ m_ui.showPlacemarks->setChecked(m_showPlacemarks);
+
+ MapThemeManager themeManager;
+- themeManager.updateMapThemeModel();
+ // FIXME: Going manually through the model is ugly as hell, but plugging the
+ // model into the view didn't work for me
+ for (int i = 0; i < themeManager.mapThemeModel()->rowCount(); i++) {
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch
new file mode 100644
index 0000000..cc6958d
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch
@@ -0,0 +1,40 @@
+commit b0c70d7fd866efb628036f43978bc791e0485f90
+Author: Aaron Seigo <aseigo@kde.org>
+Date: Tue Nov 22 14:07:59 2011 +0100
+
+ remove outdated using statements
+
+diff --git a/applets/icontasks/taskitemlayout.h b/applets/icontasks/taskitemlayout.h
+index 9ebf82f..64142e1 100644
+--- a/applets/icontasks/taskitemlayout.h
++++ b/applets/icontasks/taskitemlayout.h
+@@ -32,9 +32,6 @@ class TaskGroupItem;
+ class AbstractTaskItem;
+ class LauncherSeparator;
+
+-using TaskManager::StartupPtr;
+-using TaskManager::TaskPtr;
+-
+ /**
+ * A Layout for the expanded group
+ */
+diff --git a/applets/icontasks/tasks.h b/applets/icontasks/tasks.h
+index e7bab6b..bf8a665 100644
+--- a/applets/icontasks/tasks.h
++++ b/applets/icontasks/tasks.h
+@@ -54,15 +54,6 @@ namespace TaskManager
+ class GroupManager;
+ } // namespace TaskManager
+
+-using TaskManager::StartupPtr;
+-using TaskManager::TaskPtr;
+-using TaskManager::StartupPtr;
+-using TaskManager::GroupPtr;
+-using TaskManager::AbstractGroupableItem;
+-using TaskManager::TaskItem;
+-using TaskManager::TaskGroup;
+-using TaskManager::LauncherItem;
+-
+ class TaskGroupItem;
+ class GroupManager;
+
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild
index 3999258..0e775f9 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.80.ebuild
@@ -41,6 +41,9 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-4.7.3-knowledge.patch"
+ "${FILESDIR}/${PN}-4.7.80-fix-build-lancelot.patch"
+ "${FILESDIR}/${PN}-4.7.80-remove-outdated-statements.patch"
+ "${FILESDIR}/${PN}-4.7.80-fix-build-marble-wallpaper.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/
@ 2012-04-10 16:59 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2012-04-10 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 7cc140e39b9eb7bfc0c51de46e1a9ceabac38068
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Tue Apr 10 16:58:13 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Tue Apr 10 16:58:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7cc140e3
[kde-base/kdeplasma-addons] Remove patches for issues fixed upstream.
(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)
---
.../kdeplasma-addons-4.6.2-optional-akonadi.patch | 72 --------------------
.../files/kdeplasma-addons-4.7.3-knowledge.patch | 19 -----
.../kdeplasma-addons-4.8.49.9999.ebuild | 5 --
.../kdeplasma-addons/kdeplasma-addons-9999.ebuild | 5 --
4 files changed, 0 insertions(+), 101 deletions(-)
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
deleted file mode 100644
index 857e965..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/libs/lancelot-datamodels/MessagesKmail.cpp b/libs/lancelot-datamodels/MessagesKmail.cpp
-index 8fa89e0..f56203d 100644
---- a/libs/lancelot-datamodels/MessagesKmail.cpp
-+++ b/libs/lancelot-datamodels/MessagesKmail.cpp
-@@ -35,10 +35,10 @@
- #ifndef LANCELOT_DATAMODELS_HAS_PIMLIBS
-
- // just in case messages:
--I18N_NOOP("Unread messages");
-+/*I18N_NOOP("Unread messages");
- I18N_NOOP("Unable to find Kontact");
- I18N_NOOP("Start Akonadi server");
--I18N_NOOP("Akonadi server is not running");
-+I18N_NOOP("Akonadi server is not running");*/
-
- #warning "Pimlibs are not present"
-
-diff --git a/libs/lancelot-datamodels/MessagesKmail.h b/libs/lancelot-datamodels/MessagesKmail.h
-index 8db2a1c..3dfbd6f 100644
---- a/libs/lancelot-datamodels/MessagesKmail.h
-+++ b/libs/lancelot-datamodels/MessagesKmail.h
-@@ -32,6 +32,7 @@ namespace Models {
- */
- class LANCELOT_EXPORT MessagesKmail : public BaseModel {
- Q_OBJECT
-+
- public:
- /**
- * Creates a new MessagesKmail instance
-@@ -52,11 +53,13 @@ protected:
-
- void load();
-
-+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
- L_Override QString selfShortTitle() const;
-
- protected Q_SLOTS:
- void updateLater();
- void update();
-+#endif
-
- private:
- class Private;
-diff --git a/runners/contacts/contactsrunner.cpp b/runners/contacts/contactsrunner.cpp
-index 2b5f3ec..aa64761 100644
---- a/runners/contacts/contactsrunner.cpp
-+++ b/runners/contacts/contactsrunner.cpp
-@@ -23,7 +23,10 @@
- #include <KLocale>
- #include <KIcon>
- #include <KToolInvocation>
-+
-+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
- #include <akonadi/contact/contactdefaultactions.h>
-+#endif
- /*#include <KMimeType>
-
- */
-diff --git a/runners/events/events_config.h b/runners/events/events_config.h
-index f73b22b..8bb0148 100644
---- a/runners/events/events_config.h
-+++ b/runners/events/events_config.h
-@@ -26,7 +26,9 @@
-
- //KDE-Includes
- #include <KCModule>
-+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
- #include <Akonadi/Collection>
-+#endif
-
- //Qt
-
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch
deleted file mode 100644
index 3a7f89f..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN kdeplasma-addons-4.7.3.orig/applets/CMakeLists.txt kdeplasma-addons-4.7.3/applets/CMakeLists.txt
---- kdeplasma-addons-4.7.3.orig/applets/CMakeLists.txt 2011-10-02 15:26:40.000000000 +0200
-+++ kdeplasma-addons-4.7.3/applets/CMakeLists.txt 2011-11-20 18:05:27.833155727 +0100
-@@ -26,7 +26,6 @@
- add_subdirectory(kolourpicker)
- add_subdirectory(konqprofiles)
- add_subdirectory(konsoleprofiles)
--add_subdirectory(knowledgebase)
- add_subdirectory(life)
- add_subdirectory(luna)
- add_subdirectory(magnifique)
-@@ -34,6 +33,7 @@
- add_subdirectory(notes)
- add_subdirectory(nowplaying)
- if(LIBATTICA_FOUND)
-+ add_subdirectory(knowledgebase)
- add_subdirectory(community)
- add_subdirectory(social-news)
- endif(LIBATTICA_FOUND)
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild
index 2237502..523b1a0 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild
@@ -44,11 +44,6 @@ RDEPEND="${COMMON_DEPEND}
# bug 410253
RESTRICT="test"
-src_prepare() {
- use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
- kde4-base_src_prepare
-}
-
src_configure() {
mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index a271f74..48b99c3 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -44,11 +44,6 @@ RDEPEND="${COMMON_DEPEND}
# bug 410253
RESTRICT="test"
-src_prepare() {
- use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
- kde4-base_src_prepare
-}
-
src_configure() {
mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/
@ 2012-05-04 14:48 Johannes Huber
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Huber @ 2012-05-04 14:48 UTC (permalink / raw
To: gentoo-commits
commit: b53f62f8c8136b24fad63319ec189fcce2e6c473
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 4 14:47:57 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 4 14:48:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b53f62f8
[kde-base/kdeplasma-addons] Re-add patch for semantic-desktop in stable branch, patch is applied upstream in master only wrt bug 414573.
(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)
---
.../kdeplasma-addons-4.6.2-optional-akonadi.patch | 72 ++++++++++++++++++++
.../kdeplasma-addons-4.8.49.9999.ebuild | 5 ++
2 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
new file mode 100644
index 0000000..857e965
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
@@ -0,0 +1,72 @@
+diff --git a/libs/lancelot-datamodels/MessagesKmail.cpp b/libs/lancelot-datamodels/MessagesKmail.cpp
+index 8fa89e0..f56203d 100644
+--- a/libs/lancelot-datamodels/MessagesKmail.cpp
++++ b/libs/lancelot-datamodels/MessagesKmail.cpp
+@@ -35,10 +35,10 @@
+ #ifndef LANCELOT_DATAMODELS_HAS_PIMLIBS
+
+ // just in case messages:
+-I18N_NOOP("Unread messages");
++/*I18N_NOOP("Unread messages");
+ I18N_NOOP("Unable to find Kontact");
+ I18N_NOOP("Start Akonadi server");
+-I18N_NOOP("Akonadi server is not running");
++I18N_NOOP("Akonadi server is not running");*/
+
+ #warning "Pimlibs are not present"
+
+diff --git a/libs/lancelot-datamodels/MessagesKmail.h b/libs/lancelot-datamodels/MessagesKmail.h
+index 8db2a1c..3dfbd6f 100644
+--- a/libs/lancelot-datamodels/MessagesKmail.h
++++ b/libs/lancelot-datamodels/MessagesKmail.h
+@@ -32,6 +32,7 @@ namespace Models {
+ */
+ class LANCELOT_EXPORT MessagesKmail : public BaseModel {
+ Q_OBJECT
++
+ public:
+ /**
+ * Creates a new MessagesKmail instance
+@@ -52,11 +53,13 @@ protected:
+
+ void load();
+
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
+ L_Override QString selfShortTitle() const;
+
+ protected Q_SLOTS:
+ void updateLater();
+ void update();
++#endif
+
+ private:
+ class Private;
+diff --git a/runners/contacts/contactsrunner.cpp b/runners/contacts/contactsrunner.cpp
+index 2b5f3ec..aa64761 100644
+--- a/runners/contacts/contactsrunner.cpp
++++ b/runners/contacts/contactsrunner.cpp
+@@ -23,7 +23,10 @@
+ #include <KLocale>
+ #include <KIcon>
+ #include <KToolInvocation>
++
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
+ #include <akonadi/contact/contactdefaultactions.h>
++#endif
+ /*#include <KMimeType>
+
+ */
+diff --git a/runners/events/events_config.h b/runners/events/events_config.h
+index f73b22b..8bb0148 100644
+--- a/runners/events/events_config.h
++++ b/runners/events/events_config.h
+@@ -26,7 +26,9 @@
+
+ //KDE-Includes
+ #include <KCModule>
++#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
+ #include <Akonadi/Collection>
++#endif
+
+ //Qt
+
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild
index 15da7c4..6c6acbb 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild
@@ -41,6 +41,11 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
"
+src_prepare() {
+ use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
+ kde4-base_src_prepare
+}
+
src_configure() {
mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/
@ 2012-05-23 18:39 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2012-05-23 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 4823b771e6bfb368337985f53966592ca068a24a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 18:35:56 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed May 23 18:35:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4823b771
[kde-base/kdeplasma-addons] Remove patch for issue fixed upstream.
For real this time!
http://quickgit.kde.org/?p=kdeplasma-addons.git&a=commit&h=e6d57b0164a95ff66638bde7a8a09961c82da91d
(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)
---
.../kdeplasma-addons-4.6.2-optional-akonadi.patch | 72 --------------------
.../kdeplasma-addons-4.8.49.9999.ebuild | 5 --
2 files changed, 0 insertions(+), 77 deletions(-)
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
deleted file mode 100644
index 857e965..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.6.2-optional-akonadi.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/libs/lancelot-datamodels/MessagesKmail.cpp b/libs/lancelot-datamodels/MessagesKmail.cpp
-index 8fa89e0..f56203d 100644
---- a/libs/lancelot-datamodels/MessagesKmail.cpp
-+++ b/libs/lancelot-datamodels/MessagesKmail.cpp
-@@ -35,10 +35,10 @@
- #ifndef LANCELOT_DATAMODELS_HAS_PIMLIBS
-
- // just in case messages:
--I18N_NOOP("Unread messages");
-+/*I18N_NOOP("Unread messages");
- I18N_NOOP("Unable to find Kontact");
- I18N_NOOP("Start Akonadi server");
--I18N_NOOP("Akonadi server is not running");
-+I18N_NOOP("Akonadi server is not running");*/
-
- #warning "Pimlibs are not present"
-
-diff --git a/libs/lancelot-datamodels/MessagesKmail.h b/libs/lancelot-datamodels/MessagesKmail.h
-index 8db2a1c..3dfbd6f 100644
---- a/libs/lancelot-datamodels/MessagesKmail.h
-+++ b/libs/lancelot-datamodels/MessagesKmail.h
-@@ -32,6 +32,7 @@ namespace Models {
- */
- class LANCELOT_EXPORT MessagesKmail : public BaseModel {
- Q_OBJECT
-+
- public:
- /**
- * Creates a new MessagesKmail instance
-@@ -52,11 +53,13 @@ protected:
-
- void load();
-
-+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
- L_Override QString selfShortTitle() const;
-
- protected Q_SLOTS:
- void updateLater();
- void update();
-+#endif
-
- private:
- class Private;
-diff --git a/runners/contacts/contactsrunner.cpp b/runners/contacts/contactsrunner.cpp
-index 2b5f3ec..aa64761 100644
---- a/runners/contacts/contactsrunner.cpp
-+++ b/runners/contacts/contactsrunner.cpp
-@@ -23,7 +23,10 @@
- #include <KLocale>
- #include <KIcon>
- #include <KToolInvocation>
-+
-+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
- #include <akonadi/contact/contactdefaultactions.h>
-+#endif
- /*#include <KMimeType>
-
- */
-diff --git a/runners/events/events_config.h b/runners/events/events_config.h
-index f73b22b..8bb0148 100644
---- a/runners/events/events_config.h
-+++ b/runners/events/events_config.h
-@@ -26,7 +26,9 @@
-
- //KDE-Includes
- #include <KCModule>
-+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
- #include <Akonadi/Collection>
-+#endif
-
- //Qt
-
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild
index 6c6acbb..15da7c4 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.49.9999.ebuild
@@ -41,11 +41,6 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
"
-src_prepare() {
- use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
- kde4-base_src_prepare
-}
-
src_configure() {
mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/
@ 2013-06-04 17:34 Johannes Huber
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Huber @ 2013-06-04 17:34 UTC (permalink / raw
To: gentoo-commits
commit: 7481883cd3d32ce567db6e7c81e80ead11ff06be
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 4 17:34:18 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jun 4 17:34:18 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7481883c
[kde-base/kdeplasma-addons] Backport patch from upstream to fix CVE-2013-2120 wrt bug #471904 by kensington.
Package-Manager: portage-2.2.0_alpha177
---
.../kdeplasma-addons-4.10.3-cve-2013-2120.patch | 81 ++++++++++++++++++++++
.../kdeplasma-addons-4.10.4.ebuild | 4 +-
2 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch
new file mode 100644
index 0000000..88d7879
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch
@@ -0,0 +1,81 @@
+From d84015218bf78b707650cf5426ae1a469d37c29d Mon Sep 17 00:00:00 2001
+From: Aaron Seigo <aseigo@kde.org>
+Date: Mon, 3 Jun 2013 19:16:32 +0200
+Subject: [PATCH] use KRandom, avoid modulo bias
+
+---
+ applets/paste/pastemacroexpander.cpp | 29 ++++++++++++++++++++++-------
+ 1 file changed, 22 insertions(+), 7 deletions(-)
+
+diff --git a/applets/paste/pastemacroexpander.cpp b/applets/paste/pastemacroexpander.cpp
+index ea6163f..d0a8b49 100644
+--- a/applets/paste/pastemacroexpander.cpp
++++ b/applets/paste/pastemacroexpander.cpp
+@@ -27,6 +27,7 @@
+ #include <KDebug>
+ #include <KLocale>
+ #include <KMessageBox>
++#include <KRandom>
+
+ class PasteMacroExpanderSingleton
+ {
+@@ -142,35 +143,49 @@ QString PasteMacroExpander::password(const QString& args)
+ << "01234567890"
+ << "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~";
+
+- int charCount;
++ int charCount = 8;
+ QString chars;
+ QString result;
+
+ if (a.count() > 0) {
+- charCount = qMax(a[0].trimmed().toInt(), 1);
+- } else {
+- charCount = 8;
++ charCount = qMax(a[0].trimmed().toInt(), 8);
+ }
++
+ if (a.count() < 2) {
+ chars = characterSets.join("");
+ }
++
+ if (a.count() > 1) {
+ chars += (a[1].trimmed() == "true") ? characterSets[0] : "";
+ }
++
+ if (a.count() > 2) {
+ chars += (a[2].trimmed() == "true") ? characterSets[1] : "";
+ }
++
+ if (a.count() > 3) {
+ chars += (a[3].trimmed() == "true") ? characterSets[2] : "";
+ }
++
+ if (a.count() > 4) {
+ chars += (a[4].trimmed() == "true") ? characterSets[3] : "";
+ }
+
+- QDateTime now = QDateTime::currentDateTime();
+- qsrand(now.toTime_t() / now.time().msec());
++ const int setSize = chars.count();
++ const int top = (RAND_MAX / setSize) * setSize;
++ kDebug() << "topping out at " << setSize << RAND_MAX << top;
+ for (int i = 0; i < charCount; ++i) {
+- result += chars[qrand() % chars.count()];
++ // to prevent modulo bias, discard random numbers at the
++ // 'top end' of INT_MAX
++ int rand = -1;
++ do {
++ if (rand > 0) {
++ kDebug() << "Ha!" << rand;
++ }
++ rand = KRandom::random();
++ } while (rand >= top);
++
++ result += chars[rand % setSize];
+ }
+ //kDebug() << result;
+ return result;
+--
+1.8.2.1
+
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.10.4.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.10.4.ebuild
index be3662d..0b3cf52 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.10.4.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.10.4.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
-KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="attica debug desktopglobe exif fcitx ibus json oauth qalculate qwt scim
semantic-desktop"
@@ -44,6 +44,8 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
"
+PATCHES=( "${FILESDIR}/${PN}-4.10.3-cve-2013-2120.patch" )
+
src_configure() {
mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-06-04 17:34 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-12 1:45 [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/ Theo Chatzimichos
-- strict thread matches above, loose matches on Subject: below --
2011-05-07 15:13 Tomas Chvatal
2011-07-31 19:46 Elias Probst
2011-11-20 16:14 Andreas Hüttel
2011-11-28 18:36 Johannes Huber
2012-04-10 16:59 Michael Palimaka
2012-05-04 14:48 Johannes Huber
2012-05-23 18:39 Michael Palimaka
2013-06-04 17:34 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox