diff options
Diffstat (limited to 'kde-misc/quickaccess')
| -rw-r--r-- | kde-misc/quickaccess/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-misc/quickaccess/files/quickaccess-0.8.1-gcc46.patch | 53 | ||||
| -rw-r--r-- | kde-misc/quickaccess/quickaccess-0.8.1.ebuild | 4 |
3 files changed, 61 insertions, 2 deletions
diff --git a/kde-misc/quickaccess/ChangeLog b/kde-misc/quickaccess/ChangeLog index c4026f8ca09e..2b71e6a0a735 100644 --- a/kde-misc/quickaccess/ChangeLog +++ b/kde-misc/quickaccess/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-misc/quickaccess # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/quickaccess/ChangeLog,v 1.2 2011/01/31 06:28:47 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/quickaccess/ChangeLog,v 1.3 2011/08/12 20:21:26 dilfridge Exp $ + + 12 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> + quickaccess-0.8.1.ebuild, +files/quickaccess-0.8.1-gcc46.patch: + Fix compilation with gcc-4.6 using a patch from OpenSUSE, bug 370029 31 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> quickaccess-0.8.1.ebuild: diff --git a/kde-misc/quickaccess/files/quickaccess-0.8.1-gcc46.patch b/kde-misc/quickaccess/files/quickaccess-0.8.1-gcc46.patch new file mode 100644 index 000000000000..7f5e38f43eef --- /dev/null +++ b/kde-misc/quickaccess/files/quickaccess-0.8.1-gcc46.patch @@ -0,0 +1,53 @@ +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(); diff --git a/kde-misc/quickaccess/quickaccess-0.8.1.ebuild b/kde-misc/quickaccess/quickaccess-0.8.1.ebuild index 2028adc30712..7cfc5af6a18d 100644 --- a/kde-misc/quickaccess/quickaccess-0.8.1.ebuild +++ b/kde-misc/quickaccess/quickaccess-0.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/quickaccess/quickaccess-0.8.1.ebuild,v 1.2 2011/01/31 06:28:47 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/quickaccess/quickaccess-0.8.1.ebuild,v 1.3 2011/08/12 20:21:26 dilfridge Exp $ EAPI=3 @@ -24,3 +24,5 @@ RDEPEND=" " S="${WORKDIR}/${MY_PN}-${PV}" + +PATCHES=( "${FILESDIR}/${P}-gcc46.patch" ) |