Fix underlinking failure, bug 369459

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

diff --git a/media-sound/qtmpc/ChangeLog b/media-sound/qtmpc/ChangeLog
index 614c6adfd133ca3204041224d7a52f74b42fab39..1410c2ae05905fc2522d0d4d3540763d1eab4385 100644 (file)
--- a/media-sound/qtmpc/ChangeLog
+++ b/media-sound/qtmpc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qtmpc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtmpc/ChangeLog,v 1.2 2011/05/31 10:30:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtmpc/ChangeLog,v 1.3 2011/11/20 21:28:36 dilfridge Exp $
+
+  20 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> qtmpc-0.6.1.ebuild,
+  +files/qtmpc-0.6.1-underlinking.patch:
+  Fix underlinking failure, bug 369459
 
   31 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Reassign to kde herd, rather than to me and qt as it is kde player.

diff --git a/media-sound/qtmpc/Manifest b/media-sound/qtmpc/Manifest
index 30d59f8c4e4ed481efbb02d346fe925cd6a947b9..08d598b4cfffb8ce2d2986efe69887a4c13eba19 100644 (file)
--- a/media-sound/qtmpc/Manifest
+++ b/media-sound/qtmpc/Manifest
@@ -1,14 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX qtmpc-0.6.1-underlinking.patch 1481 RMD160 c94ac3043a8bb8f174c81f05dde5cb474dd0cf4a SHA1 1cdfc12d088b8241cefabc274e8d56bcdb24a2d2 SHA256 8295218ebeeb14372c36c34510a9eed7210e82d8e474ef3caae1bd58327780d3
 DIST QtMPC-0.6.1.tar.bz2 96341 RMD160 5bb20a0a618c735063dbb147fdf48e5e8b118098 SHA1 43511158e8d381981449cdd6132e776d7e187b77 SHA256 82287a26788b36d49db26518b66203f332cf686eefb81ee2d9be095e61123a62
-EBUILD qtmpc-0.6.1.ebuild 553 RMD160 d7d96a079260ca770ef93170915fed1746967ecd SHA1 805154b07cd1b40d5ed74a4e82848f8d2f149f84 SHA256 0b565cdd0e39671a92e3b2c8c0a91464e2d1d86b48e0aa6ddd2dc4ec1c79d386
-MISC ChangeLog 524 RMD160 4c9293f0f93144dd7943ae41ceb24f37257d5317 SHA1 96f8cdb097b6e33d4fe43eb10b8e4c26d2a16f28 SHA256 b8d9d978b3f22bc0a709cef8298800fb420b3cd72d4c89a5e0a7dffba6c575e7
+EBUILD qtmpc-0.6.1.ebuild 604 RMD160 b9800be1e00445233a3a7d41cc641c7d033f6103 SHA1 9585eb296fdd0b82d5a3c3a60b92b6ae0d9065c4 SHA256 bd5f4a5cb26371f5489d3071ce8b98a4b7877adce8d4ae75c9a08e6976011c6f
+MISC ChangeLog 682 RMD160 fb37a2e21f88d6cf278ad6c9a4072e7efed931e7 SHA1 ca8cf3f8576d1772323107f7cf126c978e8b9b4c SHA256 37183b6b6ccacdf2ff321bc995b4893b47686dc80a793d84d942d381bdb423cc
 MISC metadata.xml 158 RMD160 7344d8189b297bc3aaa35226811d79c8dacb9f6f SHA1 4f1871fb2f1f05defed13aa3d8fd3d0e65788b5e SHA256 b1f2af69cc9a002750dfc0abd0f1dc63431290bebbabd4a17169dd3d4dbe89a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3kw1MACgkQHB6c3gNBRYeZYwCeLthzWlf+ajdRnhco8ZiowN33
-13wAoIhIAKQYAY2oQIaeLPblvbcSHGZj
-=eoHh
+iQIcBAEBCgAGBQJOyX9VAAoJENwGBM22xffe61gP/ReR3JbwO8Cj8xX1an+jLfL8
+A8FQhfII88e6sIQi2pUw1NhwrLojFZ2aysCdcDoVfSkeoiXJjVZpVU+CzkJXfSGX
+znrWtx3c1WvGzHjGRObXNhFctqSvX/71rzRcCJVYRr9XkZUB+dK0A0ZmuaSBWKZQ
+dz7GBFvAM/dwGnAUzv7sP6DeZ88b3T57G63qPDIiD6eH+kSpzKhW6AXYneSE3ID/
+BCijrfUBKVNw7g5HyZEJlRvh06ATsKARabAcA/KlnbVtO12sxpdiN2X4E0loQtVS
+yKbkfI9wz598M2aZtHav+VahrZR6Axs07PNaYKtBxQz3nV+R/lNCf6Au1p2Gyk7r
+b68Cw3hULr7EinotHonp8DQP3ykHCASkbeLE0wRI/Fltw8HNhJZ1o7QYEg04gCRb
+Lefca/rBaLkqY761QEr/uJIYsx0/ZNfbydl1EWbaOpESydaXA3oXWTpPqnqZL4O+
+bx6WiWvGqPMsHIfdwZbviXSqTzvl8EH12ZaH2dXHVjRnJVKlqHoNVKX+wfPF6giw
+JNJnfsVw0uvy6WMeEPwYla2BefOpkBQIA+KxW34IM35FiWZw9Yg7NcDF17c3YFWT
+IRkmK4Pr8oizuIMKqFDCFHAdWpBqYdSB+TMsFTzRfCzbzKz5jKyfW6RErcElSmJ0
+Ze93R37dJENHhAGDA4ZC
+=PTI8
 -----END PGP SIGNATURE-----

diff --git a/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch b/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch
new file mode 100644 (file)
index 0000000..881187d
--- /dev/null
+++ b/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch
@@ -0,0 +1,40 @@
+diff -ruN QtMPC-0-vanilla/CMakeLists.txt QtMPC/CMakeLists.txt
+--- QtMPC-0-vanilla/CMakeLists.txt     2010-11-02 17:00:58.000000000 +0100
++++ QtMPC/CMakeLists.txt       2011-11-20 23:27:18.000000000 +0100
+@@ -81,6 +81,11 @@
+ 
+ # this command finds Qt4 libraries and sets all required variables
+ FIND_PACKAGE( Qt4 REQUIRED )
++
++# add some useful macros and variables
++# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
++INCLUDE( ${QT_USE_FILE} )
++
+ FIND_PACKAGE( KDE4 )
+ 
+ IF( NOT DEFINED WANT_KDE_SUPPORT )
+@@ -134,12 +139,6 @@
+       ADD_DEFINITIONS( -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -Wall -Wextra )
+ ENDIF( NOT ENABLE_KDE_SUPPORT )
+ 
+-# add some useful macros and variables
+-# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
+-IF( NOT ENABLE_KDE_SUPPORT )
+-      INCLUDE( ${QT_USE_FILE} )
+-ENDIF( NOT ENABLE_KDE_SUPPORT )
+-
+ ADD_SUBDIRECTORY( external/libmaia )
+ 
+ # Compile the resource files
+@@ -169,9 +168,9 @@
+ 
+ # Last but not least, link everything. Based on whether we are using KDE or not.
+ IF( ENABLE_KDE_SUPPORT )
+-      TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} Maia )
++      TARGET_LINK_LIBRARIES( QtMPC Maia ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARIES} )
+ ELSE( ENABLE_KDE_SUPPORT )
+-      TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} Maia )
++      TARGET_LINK_LIBRARIES( QtMPC Maia ${QT_LIBRARIES} )
+ ENDIF( ENABLE_KDE_SUPPORT )
+ 
+ IF( ENABLE_KDE_SUPPORT )

diff --git a/media-sound/qtmpc/qtmpc-0.6.1.ebuild b/media-sound/qtmpc/qtmpc-0.6.1.ebuild
index 52efe90c6d54d8d5c4d1f3327eca79c4c0d90a4c..1a281cb2b60ca5fecf0a43bfb0b85a17740ffa5e 100644 (file)
--- a/media-sound/qtmpc/qtmpc-0.6.1.ebuild
+++ b/media-sound/qtmpc/qtmpc-0.6.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/media-sound/qtmpc/qtmpc-0.6.1.ebuild,v 1.1 2011/05/12 13:07:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtmpc/qtmpc-0.6.1.ebuild,v 1.2 2011/11/20 21:28:36 dilfridge Exp $
 
 EAPI=4
 
@@ -20,3 +20,5 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/QtMPC"
+
+PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )