| 1 |
dilfridge 11/11/20 21:28:36 |
| 2 |
|
| 3 |
Added: qtmpc-0.6.1-underlinking.patch |
| 4 |
Log: |
| 5 |
Fix underlinking failure, bug 369459 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.36/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qtmpc-0.6.1-underlinking.patch |
| 16 |
=================================================================== |
| 17 |
diff -ruN QtMPC-0-vanilla/CMakeLists.txt QtMPC/CMakeLists.txt |
| 18 |
--- QtMPC-0-vanilla/CMakeLists.txt 2010-11-02 17:00:58.000000000 +0100 |
| 19 |
+++ QtMPC/CMakeLists.txt 2011-11-20 23:27:18.000000000 +0100 |
| 20 |
@@ -81,6 +81,11 @@ |
| 21 |
|
| 22 |
# this command finds Qt4 libraries and sets all required variables |
| 23 |
FIND_PACKAGE( Qt4 REQUIRED ) |
| 24 |
+ |
| 25 |
+# add some useful macros and variables |
| 26 |
+# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script) |
| 27 |
+INCLUDE( ${QT_USE_FILE} ) |
| 28 |
+ |
| 29 |
FIND_PACKAGE( KDE4 ) |
| 30 |
|
| 31 |
IF( NOT DEFINED WANT_KDE_SUPPORT ) |
| 32 |
@@ -134,12 +139,6 @@ |
| 33 |
ADD_DEFINITIONS( -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -Wall -Wextra ) |
| 34 |
ENDIF( NOT ENABLE_KDE_SUPPORT ) |
| 35 |
|
| 36 |
-# add some useful macros and variables |
| 37 |
-# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script) |
| 38 |
-IF( NOT ENABLE_KDE_SUPPORT ) |
| 39 |
- INCLUDE( ${QT_USE_FILE} ) |
| 40 |
-ENDIF( NOT ENABLE_KDE_SUPPORT ) |
| 41 |
- |
| 42 |
ADD_SUBDIRECTORY( external/libmaia ) |
| 43 |
|
| 44 |
# Compile the resource files |
| 45 |
@@ -169,9 +168,9 @@ |
| 46 |
|
| 47 |
# Last but not least, link everything. Based on whether we are using KDE or not. |
| 48 |
IF( ENABLE_KDE_SUPPORT ) |
| 49 |
- TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} Maia ) |
| 50 |
+ TARGET_LINK_LIBRARIES( QtMPC Maia ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARIES} ) |
| 51 |
ELSE( ENABLE_KDE_SUPPORT ) |
| 52 |
- TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} Maia ) |
| 53 |
+ TARGET_LINK_LIBRARIES( QtMPC Maia ${QT_LIBRARIES} ) |
| 54 |
ENDIF( ENABLE_KDE_SUPPORT ) |
| 55 |
|
| 56 |
IF( ENABLE_KDE_SUPPORT ) |
Archives