Fix compilation with gcc-4.6 using a patch from OpenSUSE, bug 370029

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

diff --git a/kde-misc/quickaccess/ChangeLog b/kde-misc/quickaccess/ChangeLog
index c4026f8ca09ec51a5203c1d0855c9d457e3f7da7..2b71e6a0a7351981b24bf722933734fb7bbc30a3 100644 (file)
--- 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/Manifest b/kde-misc/quickaccess/Manifest
index 4e387e2314aef4a1883c155cf0c19ea59e73aa7e..fe0ea6bf3e07c48b82b6f1c3811acf6cfa2c80d8 100644 (file)
--- a/kde-misc/quickaccess/Manifest
+++ b/kde-misc/quickaccess/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX quickaccess-0.8.1-gcc46.patch 2410 RMD160 0e30643c7155ad9373d51754a632a8e02bf6784b SHA1 e0ba24d761daf35a1054db1d65d08ee775dc8f92 SHA256 565efa1bc2c8d21bded04ed06be7e34af917de38b692c8c1120c818c5754cff0
 DIST 101968-plasma-widget-quickaccess_0.8.1.orig.tar.gz 43904 RMD160 d234c4cba7cad37361cb74de3b9e887a53147a84 SHA1 2e69f5fea3278efb0bae4a86a97d93d8a754fbb9 SHA256 02d50f9ebecdfebe3260f102a1a2e2164675029adcf50af6e9287e667859b7b3
-EBUILD quickaccess-0.8.1.ebuild 753 RMD160 78796938dfdd6a509983722f708f8a177555c84f SHA1 6b65951a3ad32f550e0ce6e8a46a963dc1d86277 SHA256 e22d453d47f8b7bd1a036d66f0469a2080d2c03aaa0452b0c2daab5ecdfc5d62
-MISC ChangeLog 521 RMD160 99b6f8e6adbab7ae7a85f96ac61234e1a7112b0a SHA1 7ba2eb2fa08bfea65469ea89856cde4ac37f0386 SHA256 9c20faa9fdbc51137bd6355e7d458d6817a2aa48d5ff77e4fb715b6fcb0390fb
+EBUILD quickaccess-0.8.1.ebuild 797 RMD160 e30d50c2a5f0609881d57de7b8d414a653d3c5c4 SHA1 d6486c4001bccf740af3a933dc6180a70666295d SHA256 0a7694047673d4af07c727bd07e119aa0a8a249163e70b9371fa3c49cb810072
+MISC ChangeLog 716 RMD160 3fef02005fe6be504d4f89b60a861967fd4fc796 SHA1 eeedc56634c4ffad91e3e35ef7063c3b49d6f719 SHA256 09dde087a00dcca4deb713cc8504ad8719cc8ebbaec4e02a4be102a54e9001f5
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJORYtaAAoJENwGBM22xffec04P/Rzeta7UtQY3nxk2BN6oH2tm
+Oh3yv3Ln7W/5MaAp+L8VJTa3dpsgaJb/rQ9/9pzfxJXKHzNIs0/wRyEn+Z9QodI/
+gXdHMJWwy9Iy5byK4x5f/zQqnxbPdtkmchfhvPi5YQEtQH1+bztdiogh2UkOYF5D
+OgQZVATbLUthNZY9sEBd9YVHnko3KRRLNgSW2sIOqe4sOnbBdRy4G6A9KphJhrtX
+RrOiUUbsrgvJDHgMKVYuTSVOSmMUwEOshOkRli3q+aJRwgi/CHUZ6W6V5kCKLTJu
+lP7BxWoj36d8/yGZPL9vA6nST+vwVnJERL+CZX6GJ8h/sKsmW0SReCOX5lPx8s0O
+hkKglanco+jrdvKdOtN7I3YIumFSX0IZ2Tn8HjMH7VHRLINbzYpHW/NYt2ZJIs3D
+/P6zILmqTMrtSn8hSFd2XytJILgXH0ZKJdbD1OiRNXHJkF3oGqeeeeSUWraBszfD
+UnYrjyb0DZtmg+bAQuAtXs3o8W0pFQZZVCBLMeFg6uJT3Mi+Yx94mIgefCJ0GQiX
+oja6DhOdkrIRiDhGYziMHNqHJuX+0AW1bXdhyzymW+IdXncZpXpriNPiiJKHiBuZ
+wBnOaFN9PCx47C2L0yJCR86Hp4CdDY5S+QwBmv10LDNnsQoio+soy1xIQFn8WsQf
+WEYKE7e69bCQQt+Eann8
+=asty
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..7f5e38f
--- /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 2028adc30712593456896e18965a3c029253841a..7cfc5af6a18db080b5390de8c38f62042c40be16 100644 (file)
--- 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" )