summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2007-07-01 13:34:11 +0000
committerWulf Krueger <philantrop@gentoo.org>2007-07-01 13:34:11 +0000
commitcc1add3afe1c90dd697a05435ea5d223f0762573 (patch)
treed96177915f04409cd1daa189ff3466be59b90225 /kde-base/kdepim
parentapp-laptop/acer_acpi: changed README.gz to README.bz2 (bug #183795) (diff)
downloadgentoo-2-cc1add3afe1c90dd697a05435ea5d223f0762573.tar.gz
gentoo-2-cc1add3afe1c90dd697a05435ea5d223f0762573.tar.bz2
gentoo-2-cc1add3afe1c90dd697a05435ea5d223f0762573.zip
Added the patch from bug 179376 as provided by 6thpink to enable the use of custom colours in akregator. Thanks, 6thpink! Minor whitespace fixes.
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'kde-base/kdepim')
-rw-r--r--kde-base/kdepim/ChangeLog9
-rw-r--r--kde-base/kdepim/files/akregator-3.5.7-customcolors.diff298
-rw-r--r--kde-base/kdepim/files/digest-kdepim-3.5.7-r13
-rw-r--r--kde-base/kdepim/kdepim-3.5.7-r1.ebuild55
4 files changed, 364 insertions, 1 deletions
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 35c6164c9391..6c6715380658 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for kde-base/kdepim
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.273 2007/06/23 21:20:34 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.274 2007/07/01 13:34:11 philantrop Exp $
+
+*kdepim-3.5.7-r1 (01 Jul 2007)
+
+ 01 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
+ +files/akregator-3.5.7-customcolors.diff, +kdepim-3.5.7-r1.ebuild:
+ Added the patch from bug 179376 as provided by 6thpink to enable the use of
+ custom colours in akregator. Thanks, 6thpink! Minor whitespace fixes.
23 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> kdepim-3.5.7.ebuild:
Several tests are broken and therefore deactivated now. Fixes bug 183001.
diff --git a/kde-base/kdepim/files/akregator-3.5.7-customcolors.diff b/kde-base/kdepim/files/akregator-3.5.7-customcolors.diff
new file mode 100644
index 000000000000..c0e5e8b229ea
--- /dev/null
+++ b/kde-base/kdepim/files/akregator-3.5.7-customcolors.diff
@@ -0,0 +1,298 @@
+Index: akregator.kcfg
+===================================================================
+--- akregator/src/akregator.kcfg (revision 573936)
++++ akregator/src/akregator.kcfg (working copy)
+@@ -40,6 +40,16 @@
+ <entry key="Fixed Font" type="String" />
+ <entry key="Serif Font" type="String" />
+ <entry key="Sans Serif Font" type="String" />
++ <entry key="UseCustomColors" type="Bool">
++ <default>false</default>
++ </entry>
++ <entry key="ColorUnreadArticles" type="Color">
++ <default>#0000FF</default>
++ </entry>
++ <entry key="ColorNewArticles" type="Color">
++ <default>#FF0000</default>
++ </entry>
++
+ </group>
+ <group name="HTML Settings" >
+ <entry key="Fonts" type="StringList" />
+Index: articlelistview.cpp
+===================================================================
+--- akregator/src/articlelistview.cpp (revision 573936)
++++ akregator/src/articlelistview.cpp (working copy)
+@@ -181,15 +181,20 @@
+ QColorGroup cg2(cg);
+
+ if (article().status() == Article::Unread)
+- cg2.setColor(QColorGroup::Text, Qt::blue);
++ cg2.setColor(QColorGroup::Text, Settings::useCustomColors() ? Settings::colorUnreadArticles() : Qt::blue);
+ else // New
+- cg2.setColor(QColorGroup::Text, Qt::red);
++ cg2.setColor(QColorGroup::Text, Settings::useCustomColors() ? Settings::colorNewArticles() : Qt::red);
+
+ KListViewItem::paintCell( p, cg2, column, width, align );
+ }
+
+ }
+
++void ArticleListView::slotPaletteOrFontChanged()
++{
++ triggerUpdate();
++}
++
+ void ArticleListView::ArticleItem::updateItem(const Article& article)
+ {
+ m_article = article;
+Index: articlelistview.h
+===================================================================
+--- akregator/src/articlelistview.h (revision 573936)
++++ akregator/src/articlelistview.h (working copy)
+@@ -80,6 +80,8 @@
+ /** selects next unread article in list view, first unread article if no article was selected */
+ void slotNextUnreadArticle();
+
++ void slotPaletteOrFontChanged();
++
+ signals:
+ void signalArticleChosen(const Article& article);
+ void signalDoubleClicked(const Article&, const QPoint&, int);
+Index: settings_appearance.ui
+===================================================================
+--- akregator/src/settings_appearance.ui (revision 573936)
++++ akregator/src/settings_appearance.ui (working copy)
+@@ -10,20 +10,20 @@
+ <x>0</x>
+ <y>0</y>
+ <width>418</width>
+- <height>377</height>
++ <height>566</height>
+ </rect>
+ </property>
+ <property name="caption">
+ <string>General</string>
+ </property>
+- <vbox>
++ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+- <widget class="QGroupBox">
++ <widget class="QGroupBox" row="1" column="0">
+ <property name="name">
+ <cstring>groupBox3</cstring>
+ </property>
+@@ -114,8 +114,25 @@
+ </widget>
+ </grid>
+ </widget>
+- <widget class="QGroupBox">
++ <spacer row="4" column="0">
+ <property name="name">
++ <cstring>spacer1</cstring>
++ </property>
++ <property name="orientation">
++ <enum>Vertical</enum>
++ </property>
++ <property name="sizeType">
++ <enum>Expanding</enum>
++ </property>
++ <property name="sizeHint">
++ <size>
++ <width>20</width>
++ <height>41</height>
++ </size>
++ </property>
++ </spacer>
++ <widget class="QGroupBox" row="2" column="0">
++ <property name="name">
+ <cstring>FontsGroupBox</cstring>
+ </property>
+ <property name="title">
+@@ -179,7 +196,7 @@
+ </widget>
+ </grid>
+ </widget>
+- <widget class="QCheckBox">
++ <widget class="QCheckBox" row="3" column="0">
+ <property name="name">
+ <cstring>kcfg_UnderlineLinks</cstring>
+ </property>
+@@ -187,24 +204,99 @@
+ <string>&amp;Underline links</string>
+ </property>
+ </widget>
+- <spacer>
++ <widget class="QGroupBox" row="0" column="0">
+ <property name="name">
+- <cstring>spacer1</cstring>
++ <cstring>groupBox3_2</cstring>
+ </property>
+- <property name="orientation">
+- <enum>Vertical</enum>
++ <property name="title">
++ <string>Article List Colors</string>
+ </property>
+- <property name="sizeType">
+- <enum>Expanding</enum>
+- </property>
+- <property name="sizeHint">
+- <size>
+- <width>20</width>
+- <height>41</height>
+- </size>
+- </property>
+- </spacer>
+- </vbox>
++ <grid>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
++ <property name="name">
++ <cstring>kcfg_UseCustomColors</cstring>
++ </property>
++ <property name="text">
++ <string>Use custom colors</string>
++ </property>
++ </widget>
++ <widget class="QLayoutWidget" row="1" column="0">
++ <property name="name">
++ <cstring>layout1</cstring>
++ </property>
++ <grid>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="QLabel" row="0" column="0">
++ <property name="name">
++ <cstring>lbl_unreadArticles</cstring>
++ </property>
++ <property name="enabled">
++ <bool>false</bool>
++ </property>
++ <property name="text">
++ <string>Unread articles</string>
++ </property>
++ </widget>
++ <widget class="KColorButton" row="1" column="1">
++ <property name="name">
++ <cstring>kcfg_ColorNewArticles</cstring>
++ </property>
++ <property name="enabled">
++ <bool>false</bool>
++ </property>
++ <property name="text">
++ <string></string>
++ </property>
++ </widget>
++ <widget class="KColorButton" row="0" column="1">
++ <property name="name">
++ <cstring>kcfg_ColorUnreadArticles</cstring>
++ </property>
++ <property name="enabled">
++ <bool>false</bool>
++ </property>
++ <property name="text">
++ <string></string>
++ </property>
++ </widget>
++ <widget class="QLabel" row="1" column="0">
++ <property name="name">
++ <cstring>lbl_newArticles</cstring>
++ </property>
++ <property name="enabled">
++ <bool>false</bool>
++ </property>
++ <property name="text">
++ <string>New articles</string>
++ </property>
++ </widget>
++ </grid>
++ </widget>
++ <spacer row="1" column="1">
++ <property name="name">
++ <cstring>spacer2</cstring>
++ </property>
++ <property name="orientation">
++ <enum>Horizontal</enum>
++ </property>
++ <property name="sizeType">
++ <enum>Expanding</enum>
++ </property>
++ <property name="sizeHint">
++ <size>
++ <width>110</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </grid>
++ </widget>
++ </grid>
+ </widget>
+ <customwidgets>
+ </customwidgets>
+@@ -233,18 +325,38 @@
+ <receiver>kcfg_MinimumFontSize</receiver>
+ <slot>setValue(int)</slot>
+ </connection>
++ <connection>
++ <sender>kcfg_UseCustomColors</sender>
++ <signal>toggled(bool)</signal>
++ <receiver>kcfg_ColorUnreadArticles</receiver>
++ <slot>setEnabled(bool)</slot>
++ </connection>
++ <connection>
++ <sender>kcfg_UseCustomColors</sender>
++ <signal>toggled(bool)</signal>
++ <receiver>kcfg_ColorNewArticles</receiver>
++ <slot>setEnabled(bool)</slot>
++ </connection>
++ <connection>
++ <sender>kcfg_UseCustomColors</sender>
++ <signal>toggled(bool)</signal>
++ <receiver>lbl_unreadArticles</receiver>
++ <slot>setEnabled(bool)</slot>
++ </connection>
++ <connection>
++ <sender>kcfg_UseCustomColors</sender>
++ <signal>toggled(bool)</signal>
++ <receiver>lbl_newArticles</receiver>
++ <slot>setEnabled(bool)</slot>
++ </connection>
+ </connections>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+- <includehint>knuminput.h</includehint>
+- <includehint>knuminput.h</includehint>
+ <includehint>kfontcombo.h</includehint>
+- <includehint>klineedit.h</includehint>
+ <includehint>kfontcombo.h</includehint>
+- <includehint>klineedit.h</includehint>
+ <includehint>kfontcombo.h</includehint>
+- <includehint>klineedit.h</includehint>
+ <includehint>kfontcombo.h</includehint>
+- <includehint>klineedit.h</includehint>
++ <includehint>kcolorbutton.h</includehint>
++ <includehint>kcolorbutton.h</includehint>
+ </includehints>
+ </UI>
+Index: akregator_view.cpp
+===================================================================
+--- akregator/src/akregator_view.cpp (revision 577072)
++++ akregator/src/akregator_view.cpp (working copy)
+@@ -297,6 +297,8 @@
+ connect( m_articleList, SIGNAL(signalDoubleClicked(const Article&, const QPoint&, int)),
+ this, SLOT( slotOpenArticleExternal(const Article&, const QPoint&, int)) );
+
++ connect( m_part, SIGNAL(signalSettingsChanged()), m_articleList, SLOT(slotPaletteOrFontChanged()));
++
+ m_articleViewer = new ArticleViewer(m_articleSplitter, "article_viewer");
+ m_articleViewer->setSafeMode(); // disable JS, Java, etc...
+
diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.7-r1 b/kde-base/kdepim/files/digest-kdepim-3.5.7-r1
new file mode 100644
index 000000000000..01737c61da89
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.5.7-r1
@@ -0,0 +1,3 @@
+MD5 8571db6dcf4168614c96bb72c493f931 kdepim-3.5.7.tar.bz2 14166061
+RMD160 14c05d4620abf1eb5421ad434dc63f037069e930 kdepim-3.5.7.tar.bz2 14166061
+SHA256 9d981d372f1822662e102b6f84f046e4df771641fc4d041aae81b8fafd47b32e kdepim-3.5.7.tar.bz2 14166061
diff --git a/kde-base/kdepim/kdepim-3.5.7-r1.ebuild b/kde-base/kdepim/kdepim-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..13217e174102
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.5.7-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.7-r1.ebuild,v 1.1 2007/07/01 13:34:11 philantrop Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE PIM (Personal Information Management) applications: KOrganizer, KMail, KNode,..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt gnokii"
+
+RESTRICT="test"
+
+# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
+DEPEND="~kde-base/kdebase-${PV}
+ >=dev-libs/cyrus-sasl-2
+ gnokii? ( app-mobilephone/gnokii )
+ crypt? ( >=app-crypt/gpgme-1.1.2-r1
+ || ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 ) )
+ x11-libs/libXScrnSaver
+ app-pda/libopensync"
+# Requires pilot-link-0.12.0
+# pda? ( >=app-pda/pilot-link-0.12.0 dev-libs/libmal )
+
+RDEPEND="${DEPEND}
+ crypt? ( app-crypt/pinentry )"
+
+DEPEND="${DEPEND}
+ x11-proto/scrnsaverproto"
+
+PATCHES="${FILESDIR}/akregator-3.5.7-customcolors.diff"
+
+src_unpack() {
+ kde_src_unpack
+ # Call Qt 3 designer
+ sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed"
+
+ # disabling tests, see bug #164038 and bug #164097
+ sed -e "s:SUBDIRS = libical versit tests:SUBDIRS = libical versit:" \
+ -i libkcal/Makefile.am || die "sed failed" || die "sed failed"
+# sed -e "s:SUBDIRS = . plugins test:SUBDIRS = . plugins:" \
+# -i kitchensync/libkonnector2/Makefile.am || die "sed failed"
+# sed -e "s:SUBDIRS = . tests test:SUBDIRS = .:" \
+# -i kitchensync/libksync/Makefile.am || die "sed failed"
+}
+
+src_compile() {
+ local myconf="--with-sasl $(use_with gnokii)"
+ use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg"
+
+ # use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+ DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
+
+ kde_src_compile
+}