Patch to fix empty directory listing (gcc-4.4). Fixes bug #284524

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 134 insertions, 12 deletions

diff --git a/media-sound/qmpdclient/ChangeLog b/media-sound/qmpdclient/ChangeLog
index d245e9b0d58c..7c61009dcf19 100644
--- a/media-sound/qmpdclient/ChangeLog
+++ b/media-sound/qmpdclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/qmpdclient
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.63 2010/01/14 12:33:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.64 2010/03/15 15:37:16 hwoarang Exp $
+
+*qmpdclient-1.1.2-r2 (15 Mar 2010)
+
+  15 Mar 2010; Markos Chandras <hwoarang@gentoo.org>
+  +files/directory_listing_gcc44.patch, +qmpdclient-1.1.2-r2.ebuild:
+  Apply patch from upstream to fix empty directory listing when qmpdclient
+  is compiled with gcc-4.4. Fixes bug #284524
 
   14 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   qmpdclient-1.1.2.ebuild:
diff --git a/media-sound/qmpdclient/Manifest b/media-sound/qmpdclient/Manifest
index a6843626b9cf..c8abef456c20 100644
--- a/media-sound/qmpdclient/Manifest
+++ b/media-sound/qmpdclient/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX directory_listing_gcc44.patch 974 RMD160 56eae8d4351dd703035611a118303bdcf1603149 SHA1 96dac1790183853ad34ac4127de875fdde73292f SHA256 4902b181aa8058466d2d2874ffafe6eb9dc94743e4c2b4e73c18b91e8b087e79
 DIST qmpdclient-1.1.1.tar.gz 354318 RMD160 34a31a5e97a426de454b1a581f2f2a25a64e198b SHA1 abc14402b0d8b7b10c310d44935816076fa6b0a2 SHA256 215d3d0c41d688bf13ab3bdbfb66bcffdacd4f7c16f024f2ce6cd9dc622e5f0a
 DIST qmpdclient-1.1.2.tar.bz2 260718 RMD160 098ac9b04ae00bad19687a403073a0c4470e9007 SHA1 a978e939c558b6c6fef07b6e8021d01c5a551de4 SHA256 7bd0c2a87e9a6bdd0580b5c99b6450eb8345f90e27c12a601d3f097e797d794d
 EBUILD qmpdclient-1.1.1.ebuild 2532 RMD160 1f2fd9f5db4bdb17d2734db2b45118d5eec93100 SHA1 e0528f79798707ef843ac778454b21d31394bf93 SHA256 1c51e9eeb02d15a02b2be88e05903ba0b346aef0f22a8735571a9262f5b71ff2
 EBUILD qmpdclient-1.1.2-r1.ebuild 2463 RMD160 e112691e413c0d19cb07849b754ae697d344d68b SHA1 2538e23d7d9ce80f7c11ccb6c852693ccaf04a92 SHA256 51f335ddc33800de28dfd5aa64a3ebfb85b87c3cebe4e4ba4ce2f507ded3cf04
+EBUILD qmpdclient-1.1.2-r2.ebuild 2537 RMD160 0c0790d762c0f61a26a09b4a2775bf4aed1a75c8 SHA1 234ae8c7949c39c8adc355b51d722f2a0f9f7ae0 SHA256 c84a921916c0b99ed191cb785276f5067e34c9ccd4b831b296477cff864b90eb
 EBUILD qmpdclient-1.1.2.ebuild 2706 RMD160 58306ab421786b9378129bcdb1c42df8e8c1252f SHA1 7c73619a05864cf89179e6314049b99e52d1989b SHA256 9dc6cc6c8e937a158d676116232955eaeb9c4e5b2fd03a976215622e9c2000bf
-MISC ChangeLog 9528 RMD160 89ad9f70520268c4104c0f56539e7f0864432404 SHA1 ffc4284b2c47122576ec55e68ab4eb66a9bf1dac SHA256 c42854ba98fac3c300099df89caed5ad6e3bafff352811e7f9eaf4e208a973bd
+MISC ChangeLog 9811 RMD160 5551fbfe15d580f83d1ecbe3d3363b8b1b8a0677 SHA1 beed2f0a8bfeea3570b02d3ddd724d44e3d705c9 SHA256 a973aeef4fd9fffab846f624077f3ddf3d9b0aaf01f2c6f8e583cb07c27ad406
 MISC metadata.xml 258 RMD160 f32ba62126b21562a3642f9d351eec482fa91c19 SHA1 c9dcd2a5a50ab150a1ddd117357dd705c4d05e77 SHA256 3f6828f13a57795ebfa18907e3cb7a9bf80b7be961ab0b198ec135762e90c723
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktPDzAACgkQNQqtfCuFneNqlgCeNF/rGvcU/n/YGPHfLobEEk89
-2lwAni33XOdUIk3Z5e5AT3iyvn+UtDHf
-=yR2c
------END PGP SIGNATURE-----
diff --git a/media-sound/qmpdclient/files/directory_listing_gcc44.patch b/media-sound/qmpdclient/files/directory_listing_gcc44.patch
new file mode 100644
index 000000000000..7c96892f7720
--- /dev/null
+++ b/media-sound/qmpdclient/files/directory_listing_gcc44.patch
@@ -0,0 +1,34 @@
+commit d306047d90177900018547610209f2c290794d10
+Author: jb <noobinet@gmail.com>
+Date:   Wed Mar 3 01:03:03 2010 +0100
+
+    Fix the empty directory view bug.
+    
+    Dunno at all if it's ok to do that, but at least it works
+
+diff --git a/src/mpddirectory.cpp b/src/mpddirectory.cpp
+index f4ded77..79fa7b0 100644
+--- a/src/mpddirectory.cpp
++++ b/src/mpddirectory.cpp
+@@ -59,7 +59,7 @@ MPDDirectory::MPDDirectory(const MPDDirectory &other) : d(other.d) {}
+ MPDDirectory::~MPDDirectory() {}
+ 
+ bool MPDDirectory::isNull() const {
+-	return d == NULL;
++	return !d;
+ }
+ 
+ MPDDirectoryPointer *MPDDirectory::pointer() const {
+diff --git a/src/mpddirectory.h b/src/mpddirectory.h
+index a7e4cfd..6042187 100644
+--- a/src/mpddirectory.h
++++ b/src/mpddirectory.h
+@@ -55,7 +55,7 @@ public:
+ 	MPDDirectory &operator=(const MPDDirectory &);
+ 
+ private:
+-	QSharedDataPointer<MPDDirectoryPrivate> d;
++	QExplicitlySharedDataPointer<MPDDirectoryPrivate> d;
+ };
+ 
+ class MPDDirectoryPointer {
diff --git a/media-sound/qmpdclient/qmpdclient-1.1.2-r2.ebuild b/media-sound/qmpdclient/qmpdclient-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..ffbe7e92f56f
--- /dev/null
+++ b/media-sound/qmpdclient/qmpdclient-1.1.2-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.1.2-r2.ebuild,v 1.1 2010/03/15 15:37:16 hwoarang Exp $
+
+EAPI="2"
+
+LANGSLONG="cs_CZ de_DE fr_FR it_IT nl_NL nn_NO no_NO ru_RU sv_SE tr_TR uk_UA"
+LANGS="zh_CN zh_TW pt_BR "
+
+inherit qt4-r2
+
+DESCRIPTION="QMPDClient with NBL additions, such as lyrics' display"
+HOMEPAGE="http://bitcheese.net/wiki/QMPDClient"
+SRC_URI="http://dump.bitcheese.net/files/dedycec/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="debug dbus"
+
+DEPEND="x11-libs/qt-gui:4[dbus?]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES="${FILESDIR}/directory_listing_gcc44.patch"
+DOCS="AUTHORS README THANKSTO Changelog"
+
+src_prepare() {
+	# Fix the install path
+	sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:" ${PN}.pro \
+		|| die "sed failed (install path)"
+
+	# Fix package version
+	sed -i -e "s:1.1.1:${PV}:" ${PN}.pro || die "failed to fix package version"
+	# nostrip fix
+	sed -i -e "s:CONFIG += :CONFIG += nostrip :" ${PN}.pro \
+		|| die "sed failed (nostrip)"
+
+	sed -i -e "s:+= -O2 -g0 -s:+= -O2 -g0:" ${PN}.pro \
+		|| die "sed failed (nostrip)"
+
+	# fix installation folder name
+	sed -i "s/share\/QMPDClient/share\/qmpdclient/" ${PN}.pro src/config.cpp \
+		|| die "failed to fix installation directory"
+
+	# check dbus
+	if ! use dbus; then
+		sed -i -e "s/message(DBus notifier:\ enabled)/message(DBus notifier:\ disabled)/" \
+			-e "s/CONFIG\ +=\ nostrip\ qdbus//" \
+			-e "s/SOURCES\ +=\ src\/notifications_dbus.cpp/SOURCES\ +=\ src\/notifications_nodbus.cpp/" \
+			${PN}.pro || die "disabling dbus failed"
+	fi
+	qt4-r2_src_prepare
+}
+
+src_compile() {
+	emake || die "emake failed"
+	# generate translations
+	emake translate || die "failed to generate translations"
+	cd "${S}"/lang
+	for X in *.ts;do
+		lrelease "${X}" || die "lrelease failed"
+	done
+}
+
+src_install() {
+	qt4-r2_src_install
+	for res in 16 22 64 ; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
+		newins icons/qmpdclient${res}.png ${PN}.png || die "Installing icons failed"
+	done
+
+	#install translations
+	insinto /usr/share/${PN}/translations/
+	local LANG=
+	for LANG in ${LINGUAS};do
+	    for X in ${LANGSLONG};do
+			if [[ ${LANG} == ${X%_*} ]];then
+		    	doins -r lang/${X}.qm || die "failed to install translations"
+			fi
+	    done
+		for X in ${LANGS};do
+			if [[ ${LANG} == ${X} ]]; then
+				doins -r lang/${X}.qm || die "failed to install translations"
+			fi
+		done
+	done
+}