Author: arekm Date: Wed Feb 15 10:46:45 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 5; fix xinelib detecting macro
---- Files affected: packages/kde4-kdelibs: kde4-kdelibs.spec (1.266 -> 1.267) , kdelibs-4.8.0-xinelib12x.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kde4-kdelibs/kde4-kdelibs.spec diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.266 packages/kde4-kdelibs/kde4-kdelibs.spec:1.267 --- packages/kde4-kdelibs/kde4-kdelibs.spec:1.266 Wed Feb 8 23:07:31 2012 +++ packages/kde4-kdelibs/kde4-kdelibs.spec Wed Feb 15 11:46:40 2012 @@ -18,7 +18,7 @@ Summary(uk.UTF-8): K Desktop Environment - Бібліотеки Name: kde4-kdelibs Version: 4.8.0 -Release: 4 +Release: 5 License: LGPL Group: X11/Libraries Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 @@ -30,6 +30,7 @@ Patch2: %{name}-findlzmafix.patch Patch3: %{name}-aboutPLD.patch Patch4: %{name}-devicemanager_remove.patch +Patch5: kdelibs-4.8.0-xinelib12x.patch URL: http://www.kde.org/ BuildRequires: OpenEXR-devel >= 1.2.2 BuildRequires: Qt3Support-devel >= %{qtver} @@ -237,6 +238,7 @@ %patch2 -p0 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %if "%{pld_release}" == "ti" sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp @@ -1118,6 +1120,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.267 2012/02/15 10:46:40 arekm +- rel 5; fix xinelib detecting macro + Revision 1.266 2012/02/08 22:07:31 arekm - rel 4; polkit-qt-devel is now provided by polkit-qt-1-devel ================================================================ Index: packages/kde4-kdelibs/kdelibs-4.8.0-xinelib12x.patch diff -u /dev/null packages/kde4-kdelibs/kdelibs-4.8.0-xinelib12x.patch:1.1 --- /dev/null Wed Feb 15 11:46:45 2012 +++ packages/kde4-kdelibs/kdelibs-4.8.0-xinelib12x.patch Wed Feb 15 11:46:40 2012 @@ -0,0 +1,33 @@ +commit 568222416da483e81513cd5e28634a829e1aea23 +Author: Raphael Kubo da Costa <[email protected]> +Date: Wed Jan 25 20:49:04 2012 -0200 + + FindXine: Make version detection work with xine >= 1.2.0. + + Starting with the recently released version 1.2.0, xine has its version + number macros in xine/version.h instead of xine.h itself. + + Account for this case by checking if xine/version.h exists and falling + back to xine.h if it doesn't when reading the version numbers. + + Reviewed-by: Alexander Neundorf + +diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake +index 0319b7d..7dd08be 100644 +--- a/cmake/modules/FindXine.cmake ++++ b/cmake/modules/FindXine.cmake +@@ -47,7 +47,13 @@ FIND_PROGRAM(XINECONFIG_EXECUTABLE NAMES xine-config + + # Get the version number from xine.h and store it in the cache: + IF(XINE_INCLUDE_DIR AND NOT XINE_VERSION) +- FILE(READ ${XINE_INCLUDE_DIR}/xine.h XINE_VERSION_CONTENT) ++ IF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) # xine 1.2.0+ ++ SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine/version.h) ++ ELSE(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) ++ SET(XINE_VERSION_FILE ${XINE_INCLUDE_DIR}/xine.h) ++ ENDIF(EXISTS ${XINE_INCLUDE_DIR}/xine/version.h) ++ ++ FILE(READ ${XINE_VERSION_FILE} XINE_VERSION_CONTENT) + STRING(REGEX MATCH "#define *XINE_MAJOR_VERSION *([0-9]+)" _dummy "${XINE_VERSION_CONTENT}") + SET(XINE_VERSION_MAJOR "${CMAKE_MATCH_1}") + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.266&r2=1.267&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
