Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-01-24 18:42:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

kdelibs: sounstack rebuild

Browse Source 
- add xine-lib patch
This commit is contained in:
philm 2012-02-14 20:20:43 +01:00
parent 3f0224f68b
commit c5b0df0130
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kdelibs/PKGBUILD
View File

@ -13,7 +13,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname="kdelibs"
arch=('i686' 'x86_64')
pkgver=${_kdever}
pkgrel=1
pkgrel=2
pkgdesc="KDE Core Libraries"
url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL')
@ -46,12 +46,14 @@ source=($_mirror/${pkgname}-$_kdever.tar.bz2
#http://chakra-linux.org/sources/${pkgname}/${pkgname}_knotify-qt-4.8.0.diff
01_chakra_tag.patch
02_kde_applications_menu.patch
03_chakra_menu.patch)
03_chakra_menu.patch
kdelibs-4.8.0-xinelib12x.patch)
md5sums=(`grep ${pkgname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
#'677bb68f64da2ca44b57337a9f753e59' # kdelibs_knotify-qt-4.8.0.diff
'40ba51f0c50ced94dfffe667ec856950' # 01_chakra_tag.patch
'e94450ba5430ea9c1e33bad9ae38ca2d' # 02_kde_applications_menu.patch
'53b85403e4dd8f9146933c52ca23243e') # 03_chakra_menu.path
'53b85403e4dd8f9146933c52ca23243e' # 03_chakra_menu.path
'e3182247eba97d0f600b627bcba93dbd') # kdelibs-4.8.0-xinelib12x.patch
#
# build function
@ -64,6 +66,9 @@ build() {
patch -Np1 -i ${srcdir}/01_chakra_tag.patch
patch -Np1 -i ${srcdir}/02_kde_applications_menu.patch
patch -Np1 -i ${srcdir}/03_chakra_menu.patch
# already fixed in 4.8.1
patch -Np1 -i ${srcdir}/kdelibs-4.8.0-xinelib12x.patch
cd ..
rm -rf build

33
kdelibs/kdelibs-4.8.0-xinelib12x.patch Normal file
View File

@ -0,0 +1,33 @@
commit 568222416da483e81513cd5e28634a829e1aea23
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
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}")