pinkbyte 14/09/23 17:12:04 Added: libyui-3.0.13-fix-qt-libs-check.patch Removed: libyui-2.21.1-gcc-47.patch Log: QA: Version bump, drop old, wrt bug #470860 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Revision Changes Path 1.1 x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch 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 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 Index: libyui-3.0.13-fix-qt-libs-check.patch =================================================================== --- buildtools/LibyuiCommon.cmake 2014-02-10 19:41:45.000000000 +0400 +++ buildtools/LibyuiCommon.cmake 2014-09-10 23:16:10.317115440 +0400 @@ -245,12 +245,17 @@ MACRO( FIND_LINKER_LIBS ) # try to find all libs to be linked against FOREACH( p ${LIB_LINKER}) - FIND_LIBRARY( ${p}_LOOKUP "${p}" ) - IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) - MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" ) - ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) - MESSAGE( STATUS "${p} found" ) - ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) + STRING(FIND "${p}" "Qt" ISQT) + IF( ISQT GREATER -1 ) + FIND_PACKAGE(Qt4 4.8 REQUIRED ${p}) + ELSE( ISQT GREATER -1 ) + FIND_LIBRARY( ${p}_LOOKUP "${p}" ) + IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) + MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" ) + ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) + MESSAGE( STATUS "${p} found" ) + ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" ) + ENDIF( ISQT GREATER -1 ) ENDFOREACH() ENDMACRO( FIND_LINKER_LIBS ) @@ -616,6 +616,7 @@ QT4_AUTOMOC( ${${TARGETLIB}_SOURCES} ) QT4_WRAP_UI( ${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}" ) + LINK_DIRECTORIES( ${QT_LIBRARY_DIR} ) ENDIF( QT_FOUND )
