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

fix some issues in tribe

Browse Source
This commit is contained in:
philm 2010-12-11 04:21:26 +00:00
parent f85031a382
commit c100c18cfd
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools-pkg-partitionmanager/PKGBUILD
View File

@ -24,7 +24,7 @@ optdepends=('e2fsprogs: ext2/3/4 support'
'dosfstools: FAT32 support')
install=partitionmanager.install
source=(tribe.patch)
md5sums=('f897c9f163e8f9763abcf07fca6ceb4f')
md5sums=('eaa8f712da2aaf3c4ee519b2bf97c6c7')
#_svntrunk=svn://anonsvn.kde.org/home/kde/trunk/extragear/sysadmin/partitionmanager
_svnmod=partitionmanager-svn
@ -42,11 +42,13 @@ build() {
patch -p1 < ${srcdir}/tribe.patch
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
make || return 1
make DESTDIR="${pkgdir}" install || return 1
rm -rf ${srcdir}/$_svnmod-build
}
package() {
cd "${srcdir}/$_svnmod-build"
make DESTDIR="${pkgdir}" install || return 1
}

31
tools-pkg-partitionmanager/tribe.patch
View File

@ -78,9 +78,28 @@ diff -aur partitionmanager_/src/backend/corebackendmanager.h partitionmanagerA/s
private:
CoreBackend* m_Backend;
diff -aur partitionmanager_/src/CMakeLists.txt partitionmanagerA/src/CMakeLists.txt
--- partitionmanager_/src/CMakeLists.txt 2010-12-10 22:17:52.000000000 -0500
--- partitionmanager_/src/CMakeLists.txt 2010-12-10 21:25:51.910000185 -0500
+++ partitionmanagerA/src/CMakeLists.txt 2010-12-10 22:24:19.306666670 -0500
@@ -47,28 +47,32 @@
@@ -28,34 +28,51 @@
config/*.cpp
)
+file(GLOB partitionmanagerprivate_core_HDRS
+ core/*.h
+)
+file(GLOB partitionmanagerprivate_fs_HDRS
+ fs/*.h
+)
+file(GLOB partitionmanagerprivate_util_HDRS
+ util/*.h
+)
+file(GLOB partitionmanagerprivate_ops_HDRS
+ ops/*.h
+)
+
file(GLOB partitionmanagerprivate_UIFILES config/*.ui gui/*.ui)
kde4_add_ui_files(partitionmanagerprivate_SRCS ${partitionmanagerprivate_UIFILES})
kde4_add_kcfg_files(partitionmanagerprivate_SRCS config.kcfgc)
@ -109,6 +128,10 @@ diff -aur partitionmanager_/src/CMakeLists.txt partitionmanagerA/src/CMakeLists.
-target_link_libraries(partitionmanager-bin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(partitionmanager-bin tribepartitionmanager ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})
+
+add_custom_target(partitionmanager ALL
+ COMMAND sed -e 's,@INSTALL_PATH@,${BIN_INSTALL_DIR},g' < ${CMAKE_CURRENT_SOURCE_DIR}/partitionmanager.in > ${CMAKE_CURRENT_BINARY_DIR}/partitionmanager
+)
-if(UNIX)
- add_custom_target(partitionmanager ALL
@ -116,10 +139,6 @@ diff -aur partitionmanager_/src/CMakeLists.txt partitionmanagerA/src/CMakeLists.
- )
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/partitionmanager DESTINATION ${BIN_INSTALL_DIR})
-endif(UNIX)
+add_custom_target(partitionmanager ALL
+ COMMAND sed -e 's,@INSTALL_PATH@,${BIN_INSTALL_DIR},g' < ${CMAKE_CURRENT_SOURCE_DIR}/partitionmanager.in > ${CMAKE_CURRENT_BINARY_DIR}/partitionmanager
+)
+
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/partitionmanager DESTINATION ${BIN_INSTALL_DIR})
install(TARGETS partitionmanager-bin ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES gui/partitionmanagerui.rc DESTINATION ${DATA_INSTALL_DIR}/partitionmanager)

8
tools-pkg-tribe/PKGBUILD
View File

@ -9,12 +9,12 @@
#
pkgname=tribe
pkgver=0.2.95.1
pkgrel=1
pkgrel=2
pkgdesc="Tribe - Chakra LiveCD Installer"
url="http://git.chakra-project.org/chakra/"
license="GPL"
arch=('i686' 'x86_64')
depends=('kdelibs' 'kdeedu-marble>=4.5.4' 'squashfs-tools' 'partitionmanager')
depends=('kdelibs' 'kdeedu-marble>=4.5.4' 'squashfs-tools' 'partitionmanager>=1196188')
makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.5.4' 'kdebase-workspace')
provides=('tribe')
replaces=('kdemod-tribe-svn' 'kdemod-tribe')
@ -22,7 +22,7 @@ conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' '
options=('!splithdr' '!splitdbg')
source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}.tar.gz"
'http://chakra-project.org/sources/tribe/mirrorlist')
md5sums=('17a5667be4eb29fecaa871757ef088cb'
md5sums=('024a37d8eb8d4e53bba555d605c7b83f'
'dfb3c82b5b1fbc2fccba8725c74dab7a')
groups=('kde-uninstall')
@ -37,7 +37,7 @@ build()
# fixes
#cd "${srcdir}/chakra-$pkgname"
#patch -Np1 -i ${srcdir}/fix-partition-page.patch || return 1
#patch -Np1 -i ${srcdir}/fix.patch || return 1
#patch -Np1 -i ${srcdir}/drake#2.patch || return 1
cd "${srcdir}/chakra-$pkgname"