| 1 |
pinkbyte 14/09/23 17:12:04 |
| 2 |
|
| 3 |
Added: libyui-3.0.13-fix-qt-libs-check.patch |
| 4 |
Removed: libyui-2.21.1-gcc-47.patch |
| 5 |
Log: |
| 6 |
QA: Version bump, drop old, wrt bug #470860 |
| 7 |
|
| 8 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: libyui-3.0.13-fix-qt-libs-check.patch |
| 17 |
=================================================================== |
| 18 |
--- buildtools/LibyuiCommon.cmake 2014-02-10 19:41:45.000000000 +0400 |
| 19 |
+++ buildtools/LibyuiCommon.cmake 2014-09-10 23:16:10.317115440 +0400 |
| 20 |
@@ -245,12 +245,17 @@ |
| 21 |
|
| 22 |
MACRO( FIND_LINKER_LIBS ) # try to find all libs to be linked against |
| 23 |
FOREACH( p ${LIB_LINKER}) |
| 24 |
- FIND_LIBRARY( ${p}_LOOKUP "${p}" ) |
| 25 |
- IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) |
| 26 |
- MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" ) |
| 27 |
- ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) |
| 28 |
- MESSAGE( STATUS "${p} found" ) |
| 29 |
- ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) |
| 30 |
+ STRING(FIND "${p}" "Qt" ISQT) |
| 31 |
+ IF( ISQT GREATER -1 ) |
| 32 |
+ FIND_PACKAGE(Qt4 4.8 REQUIRED ${p}) |
| 33 |
+ ELSE( ISQT GREATER -1 ) |
| 34 |
+ FIND_LIBRARY( ${p}_LOOKUP "${p}" ) |
| 35 |
+ IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) |
| 36 |
+ MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" ) |
| 37 |
+ ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) |
| 38 |
+ MESSAGE( STATUS "${p} found" ) |
| 39 |
+ ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) |
| 40 |
+ ENDIF( ISQT GREATER -1 ) |
| 41 |
ENDFOREACH() |
| 42 |
|
| 43 |
ENDMACRO( FIND_LINKER_LIBS ) |
| 44 |
@@ -616,6 +616,7 @@ |
| 45 |
|
| 46 |
QT4_AUTOMOC( ${${TARGETLIB}_SOURCES} ) |
| 47 |
QT4_WRAP_UI( ${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}" ) |
| 48 |
+ LINK_DIRECTORIES( ${QT_LIBRARY_DIR} ) |
| 49 |
|
| 50 |
ENDIF( QT_FOUND ) |
Archives