mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-19 08:50:24 +08:00
Temporal fix for umbrelo
This commit is contained in:
parent
3758ffcb70
commit
3eb9e37883
@ -55,11 +55,17 @@ md5sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
|
|||||||
build() {
|
build() {
|
||||||
cd ${srcdir}/${pkgbase}-${pkgver}
|
cd ${srcdir}/${pkgbase}-${pkgver}
|
||||||
|
|
||||||
|
# Fixme: why this?
|
||||||
|
export CFLAGS="-fPIC ${CFLAGS[@]}"
|
||||||
|
export CXXFLAGS="-fPIC ${CXXFLAGS[@]}"
|
||||||
|
|
||||||
|
patch -p0 -i ${startdir}/fixdoc.patch
|
||||||
|
|
||||||
msg "starting build ..."
|
msg "starting build ..."
|
||||||
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
|
cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
|
||||||
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
|
-DCMAKE_INSTALL_PREFIX=${_installprefix} \
|
||||||
-DCMAKE_SKIP_RPATH=ON
|
-DCMAKE_SKIP_RPATH=ON
|
||||||
make || return 1
|
make
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -355,7 +361,7 @@ package_kdesdk-umbrello() {
|
|||||||
categories=('programming')
|
categories=('programming')
|
||||||
install=${pkgbase}.install
|
install=${pkgbase}.install
|
||||||
|
|
||||||
splitdirs="umbrello doc/umbrello"
|
splitdirs="umbrello doc/umbrello" # FIXME: doc/umbrello
|
||||||
for i in ${splitdirs} ; do
|
for i in ${splitdirs} ; do
|
||||||
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
|
cd ${srcdir}/${pkgbase}-${pkgver}/${i}
|
||||||
make DESTDIR=${pkgdir} install || return 1
|
make DESTDIR=${pkgdir} install || return 1
|
||||||
|
27
kdesdk/fixdoc.patch
Normal file
27
kdesdk/fixdoc.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
Index: kapptemplate/templates/C++/kapp4-qml/src/CMakeLists.txt
|
||||||
|
===================================================================
|
||||||
|
--- kapptemplate/templates/C++/kapp4-qml/src/CMakeLists.txt (revision 1299497)
|
||||||
|
+++ kapptemplate/templates/C++/kapp4-qml/src/CMakeLists.txt (working copy)
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-set(%{APPNAMELC}_SRCS
|
||||||
|
+set(%{APPNAMELC}_SRCS
|
||||||
|
%{APPNAMELC}.cpp
|
||||||
|
main.cpp
|
||||||
|
%{APPNAMELC}view.cpp
|
||||||
|
Index: doc/CMakeLists.txt
|
||||||
|
===================================================================
|
||||||
|
--- doc/CMakeLists.txt (revision 1299497)
|
||||||
|
+++ doc/CMakeLists.txt (working copy)
|
||||||
|
@@ -28,8 +28,7 @@
|
||||||
|
add_subdirectory(scripts)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-if(LIBXSLT_FOUND AND LIBXML2_FOUND)
|
||||||
|
- if(BUILD_umbrello)
|
||||||
|
- add_subdirectory(umbrello)
|
||||||
|
- endif()
|
||||||
|
-endif(LIBXSLT_FOUND AND LIBXML2_FOUND)
|
||||||
|
+if(BUILD_umbrello)
|
||||||
|
+ add_subdirectory(umbrello)
|
||||||
|
+endif()
|
||||||
|
+
|
Loading…
Reference in New Issue
Block a user