Hello community,
here is the log from the commit of package plasmoid-quickaccess for openSUSE:Factory
checked in at Tue Mar 22 17:24:57 CET 2011.
--------
--- KDE/plasmoid-quickaccess/plasmoid-quickaccess.changes 2009-07-11 00:43:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/plasmoid-quickaccess/plasmoid-quickaccess.changes 2011-03-21 17:53:02.000000000 +0100
@@ -1,0 +2,20 @@
+Mon Mar 21 16:53:02 UTC 2011 - coolo@novell.com
+
+- licenses package is about to die
+
+-------------------------------------------------------------------
+Sun Mar 20 15:59:52 UTC 2011 - asterios.dramis@gmail.com
+
+- Added two patches to fix the issue that the widget icon in the panel does not
+ respect panel icon size (lp#670025). Patches are from
+ https://bugs.launchpad.net/quickaccess/+bug/670025.
+- Added a patch, taken from Fedora, to fix "taking address of temporary object"
+ build error (with -fpermissive) which appears when compiling with gcc-4.6.
+- Spec file updates:
+ * Changes based on rpmdevtools templates and spec-cleaner run.
+ * Changed License: to GPLv2+.
+ * Updates in Buildrequires: (replaced kdebase4-workspace-devel with
+ libkde4-devel).
+ * Updates in %install and %files sections.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
kde-plasma-quickaccess-0.8.1-fix-address-of-temporary-object-error.patch
quickaccess.cpp.diff
quickaccess.h.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasmoid-quickaccess.spec ++++++
--- /var/tmp/diff_new_pack.34XffZ/_old 2011-03-22 17:23:07.000000000 +0100
+++ /var/tmp/diff_new_pack.34XffZ/_new 2011-03-22 17:23:07.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package plasmoid-quickaccess (Version 0.8.1)
+# spec file for package plasmoid-quickaccess
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008-2009 Buschmann
#
# All modifications and additions to the file contributed by third parties
@@ -18,63 +18,69 @@
# norootforbuild
-BuildRequires: kdebase4-workspace-devel libkonq-devel licenses update-desktop-files
Name: plasmoid-quickaccess
+Version: 0.8.1
+Release: 12
Summary: Quick Access Plasmoid for KDE Desktop
+
+License: GPLv2+
Url: http://www.kde-look.org/content/show.php/QuickAccess?content=101968
-Version: 0.8.1
-Release: 2
-License: GPL v2 only
Group: System/GUI/KDE
Source0: 101968-plasma-widget-quickaccess_%{version}.orig.tar.bz2
+# PATCH-FIX-UPSTREAM quickaccess.cpp.diff lp#670025 asterios.dramis@gmail.com -- Fix for widget icon in panel does not respect panel icon size (see https://bugs.launchpad.net/quickaccess/+bug/670025)
+Patch0: quickaccess.cpp.diff
+# PATCH-FIX-UPSTREAM quickaccess.h.diff lp#670025 asterios.dramis@gmail.com -- Fix for widget icon in panel does not respect panel icon size (see https://bugs.launchpad.net/quickaccess/+bug/670025)
+Patch1: quickaccess.h.diff
+# PATCH-FIX-OPENSUSE kde-plasma-quickaccess-0.8.1-fix-address-of-temporary-object-error.patch asterios.dramis@gmail.com -- Fix "taking address of temporary object" build error (with -fpermissive)
+Patch2: kde-plasma-quickaccess-0.8.1-fix-address-of-temporary-object-error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-AutoReqProv: yes
-Requires: kdebase4-workspace licenses
+
+BuildRequires: libkde4-devel
+BuildRequires: libkonq-devel
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+Requires: kdebase4-workspace
+%kde4_runtime_requires
Provides: kdebase3:/opt/kde3/share/apps/kicker/builtins/browser.desktop
Provides: kde4-plasmoid-quickaccess = 0.8.1
Obsoletes: kde4-plasmoid-quickaccess <= 0.8.1
-%kde4_runtime_requires
%description
This is a small applet designed for the panel to have quick access to
the most used folders.
-
-
-Authors:
---------
- Mark Herbert
-
%prep
%setup -qn plasma-widget-quickaccess-%{version}
+%patch0
+%patch1
+%patch2 -p1 -b .fix-address-of-temporary-object-error
%build
- %cmake_kde4 -d builddir
- %make_jobs
+%cmake_kde4 -d builddir
+%make_jobs
%install
- pushd builddir
- %makeinstall
- popd
- for FILE in COPYING ; do
- MD5SUM=$(md5sum $FILE | sed 's/ .*//')
- if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then
- ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE
- fi
- done
- %suse_update_desktop_file -n $RPM_BUILD_ROOT/usr/share/kde4/services/plasma-applet-quickaccess.desktop
- %kde_post_install
- %find_lang plasma_applet_quickaccess
+pushd builddir
+%kde4_makeinstall
+popd
+
+%if 0%{?suse_version}
+%suse_update_desktop_file %{buildroot}%{_kde4_servicesdir}/plasma-applet-quickaccess.desktop
+%endif
+
+%find_lang plasma_applet_quickaccess
+
+%kde_post_install
%clean
- rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f plasma_applet_quickaccess.lang
-%defattr(-,root,root)
-%doc COPYING README
-%_libdir/kde4/plasma_applet_quickaccess.so
-%_kde_share_dir/services/plasma-applet-quickaccess.desktop
+%defattr(-,root,root,-)
+%doc COPYING ChangeLog README
+%{_kde4_modulesdir}/plasma_applet_quickaccess.so
+%{_kde4_servicesdir}/plasma-applet-quickaccess.desktop
%changelog
++++++ kde-plasma-quickaccess-0.8.1-fix-address-of-temporary-object-error.patch ++++++
diff -up plasma-widget-quickaccess-0.8.1/popupdialog.cpp.fix-address-of-temporary-object-error plasma-widget-quickaccess-0.8.1/popupdialog.cpp
--- plasma-widget-quickaccess-0.8.1/popupdialog.cpp.fix-address-of-temporary-object-error 2009-05-27 21:02:59.000000000 +0200
+++ plasma-widget-quickaccess-0.8.1/popupdialog.cpp 2011-02-17 15:56:42.205288780 +0100
@@ -249,7 +249,7 @@ void PopupDialog::hideEvent ( QHideEvent
m_backButton->hide();
if(m_settings->enableDolphinSorting())
{
- checkDolphinSorting(&(m_current.url()));
+ checkDolphinSorting(m_current.url());
}
QWidget::hideEvent( event );
emit signal_hide();
@@ -258,7 +258,7 @@ void PopupDialog::hideEvent ( QHideEvent
void PopupDialog::setStartUrl(const KUrl &url)
{
if(m_settings->enableDolphinSorting())
- checkDolphinSorting(&url);
+ checkDolphinSorting(url);
if( !m_model->dirLister()->openUrl( url ) )
kDebug() << "can not open url: " << url;
connect(m_model->dirLister(), SIGNAL(completed()), this, SLOT(dirListerCompleted()));
@@ -323,7 +323,7 @@ void PopupDialog::slot_open(const QModel
}
if(m_settings->enableDolphinSorting())
- checkDolphinSorting(&(m_current.url()));
+ checkDolphinSorting(m_current.url());
if(m_current.isFile() || !m_settings->allowNavigation()) {
m_current.run();
@@ -332,8 +332,8 @@ void PopupDialog::slot_open(const QModel
m_label->setFileItem(m_current);
}
-void PopupDialog::checkDolphinSorting(const KUrl *dir) {
- KConfig conf(dir->path(KUrl::AddTrailingSlash)+".directory");
+void PopupDialog::checkDolphinSorting(const KUrl& dir) {
+ KConfig conf(dir.path(KUrl::AddTrailingSlash)+".directory");
KConfigGroup cg(&conf, "Dolphin");
int sortingType = cg.readEntry("Sorting", 0);
int sortOrder = cg.readEntry("SortOrder", 0);
diff -up plasma-widget-quickaccess-0.8.1/popupdialog.h.fix-address-of-temporary-object-error plasma-widget-quickaccess-0.8.1/popupdialog.h
--- plasma-widget-quickaccess-0.8.1/popupdialog.h.fix-address-of-temporary-object-error 2009-05-27 21:01:52.000000000 +0200
+++ plasma-widget-quickaccess-0.8.1/popupdialog.h 2011-02-17 15:53:46.015491457 +0100
@@ -58,7 +58,7 @@ class PopupDialog : public ResizeDialog
KFileItem startItem()
{ return m_start; }
- void checkDolphinSorting(const KUrl *dir);
+ void checkDolphinSorting(const KUrl &dir);
signals:
void signal_hide();
++++++ quickaccess.cpp.diff ++++++
--- quickaccess.cpp 2009-05-27 21:02:59.000000000 +0200
+++ quickaccess.cpp 2010-09-11 06:47:36.000000000 +0200
@@ -33,6 +33,7 @@
#include <KConfigDialog>
#include
#include <KMessageBox>
+#include <KGlobalSettings>
//Plasma
#include
@@ -84,7 +85,7 @@
connect(m_icon, SIGNAL(clicked()), this, SLOT(slot_iconClicked()));
layout->addItem(m_icon);
-
+
Plasma::ToolTipManager::self()->registerWidget(this);
//read the config
@@ -101,6 +102,9 @@
setAspectRatioMode(Plasma::ConstrainedSquare);
connect(m_saveTimer, SIGNAL(timeout()), this, SLOT(saveSettings()));
+
+ connect(KGlobalSettings::self(), SIGNAL(iconChanged(int)),
+ this, SLOT(iconSizeChanged(int)));
}
void QuickAccess::popupEvent(bool show)
@@ -338,4 +342,34 @@
}
}
+QSizeF QuickAccess::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
+{
+ if (which == Qt::PreferredSize) {
+ int iconSize;
+
+ switch (formFactor()) {
+ case Plasma::Planar:
+ case Plasma::MediaCenter:
+ iconSize = IconSize(KIconLoader::Desktop);
+ break;
+
+ case Plasma::Horizontal:
+ case Plasma::Vertical:
+ iconSize = IconSize(KIconLoader::Panel);
+ break;
+ }
+
+ return QSizeF(iconSize, iconSize);
+ }
+
+ return Plasma::Applet::sizeHint(which, constraint);
+}
+
+void QuickAccess::iconSizeChanged(int group)
+{
+ if (group == KIconLoader::Desktop || group == KIconLoader::Panel) {
+ updateGeometry();
+ }
+}
+
#include "quickaccess.moc"
++++++ quickaccess.h.diff ++++++
--- quickaccess.h 2009-05-27 21:01:52.000000000 +0200
+++ quickaccess.h 2010-09-11 06:29:39.000000000 +0200
@@ -55,6 +55,7 @@
void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
void dropEvent(QGraphicsSceneDragDropEvent *event);
void popupEvent(bool show);
+ QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF()) const;
private slots:
@@ -64,6 +65,7 @@
void showCustomLabelToggled(bool checked);
void showPreviewToggled(bool checked);
void saveSettings();
+ void iconSizeChanged(int group);
private:
PopupDialog* dialog();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
