diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-11 23:14:45 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-11 23:14:45 +0000 |
| commit | 3a0439ec6aea4411ac6d11c90cd8220f8f12a660 (patch) | |
| tree | adc6bcfb43847a9615413defa99b7a0946d22565 /extra/kdelibs | |
| parent | b8012183bbaae70ce4a714c618a967e85df9f521 (diff) | |
Wed Jan 11 23:14:45 UTC 2012
Diffstat (limited to 'extra/kdelibs')
| -rw-r--r-- | extra/kdelibs/PKGBUILD | 9 | ||||
| -rw-r--r-- | extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch | 32 |
2 files changed, 38 insertions, 3 deletions
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index cba95a38d..019a971bf 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -4,7 +4,7 @@ pkgname=kdelibs pkgver=4.7.4 -pkgrel=4 +pkgrel=5 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -19,11 +19,12 @@ replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kde-applications-menu.patch' 'archlinux-menu.patch' - 'fix-knotify-filepath.patch') + 'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch') sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - '3312f6005aa56a9b992c74008fe5b314f1c8ffba') + '3312f6005aa56a9b992c74008fe5b314f1c8ffba' + '9cb83cb7f6394549354c6837977f9e9529127041') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -36,6 +37,8 @@ build() { # https://bugs.kde.org/show_bug.cgi?id=285028 patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch + patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch new file mode 100644 index 000000000..bdcd39a6c --- /dev/null +++ b/extra/kdelibs/kdelibs-4.7.4-xinelib12x.patch @@ -0,0 +1,32 @@ +From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001 +From: Johannes Huber <johu@gentoo.org> +Date: Thu, 5 Jan 2012 10:06:05 +0100 +Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2. + +--- + cmake/modules/FindXine.cmake | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake +index 37c58c6..d71969a 100644 +--- a/cmake/modules/FindXine.cmake ++++ b/cmake/modules/FindXine.cmake +@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine + ${PC_LIBXINE_LIBRARY_DIRS} + ) + +-find_program(XINECONFIG_EXECUTABLE NAMES xine-config ++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config + HINTS + ${PC_LIBXINE_PREFIX}/bin + ) + + if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) +- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) ++ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) + if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 + set(XINE_VERSION_OK TRUE) + string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) +-- +1.7.8.2 + |