Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9a859382ac289f8e4d1b29a7d9b1cacd5cf08ada
commit 9a859382ac289f8e4d1b29a7d9b1cacd5cf08ada Author: crazy <cr...@frugalware.org> Date: Sun Jan 31 17:46:31 2010 +0100 koffice-2.1.1-1-x86_64 * Version bump * full split * fixed depends() , makedepends() rodepends() and so on ;) * added patches to fix building and installing of kchart and kformula diff --git a/source/kde-extra/koffice/FrugalBuild b/source/kde-extra/koffice/FrugalBuild index 1265543..55f1335 100644 --- a/source/kde-extra/koffice/FrugalBuild +++ b/source/kde-extra/koffice/FrugalBuild @@ -3,30 +3,146 @@ # Maintainer: crazy <cr...@frugalware.org> pkgname=koffice -pkgver=2.1.0 -pkgrel=2 +pkgver=2.1.1 +pkgrel=1 pkgdesc="An integrated Office suite for KDE" url="http://www.koffice.org"; -_F_cmakekde_final=FALSE +_F_kde_subpkgs_custom_path=1 +_F_kde_split_docs=1 Finclude kde -depends=('libkexif' "kdebase>=$_F_kde_ver" 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ - 'python>=2.6' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt4>=0.8.0' 'imagemagick' 'readline') -makedepends=("${makedepen...@]}" 'doxygen' 'qt-docs>=3.3.6' 'mysql' 'pkgconfig' 'postgresql') +depends=( ) +makedepends=("${makedepen...@]}" 'eigen' 'gmm' 'boost' 'libspnav') groups=('kde-extra') replaces=('keximdb' 'knoda') +provides=("${replac...@]}") +conflicts=("${replac...@]}") archs=('i686' 'x86_64' 'ppc') -_F_kde_split_docs=1 -options=('nodocs') url="http://www.koffice.org"; up2date="Flasttar http://ftp.gwdg.de/pub/x11/kde/stable/$pkgname-latest/"; -source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-latest/$pkgname-$pkgver.tar.bz2) +source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-latest/$pkgname-$pkgver.tar.bz2 \ + kformula_install.patch kchart-build_and_install.patch) +sha1sums=('72a82cfaaca8fbdcd0ba4622f80d4cf27aff74d2' \ + '1ee9c28bebf19ed8d638fe9a4ea86fb4079cb6b9' \ + 'ebe923ce95a0e3902ccf81455fbaac9bdcf80d90') + +## move to main -> post-1.2 + +subpkgs=("${subpk...@]}" "kword") +subdescs=("${subdes...@]}" "KOffice Word Processor") +subdepends=("${subdepen...@]}" "libqtgui>=$_F_kde_qtver libqtxml>=$_F_kde_qtver libgl libxext libwpd wv2 libjpeg") +subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + +subpkgs=("${subpk...@]}" "kspread") +subdescs=("${subdes...@]}" "KOffice Spreadsheet Application") +subdepends=("${subdepen...@]}" "libqtgui>=$_F_kde_qtver libqtxml>=$_F_kde_qtver libxext libgl gsl") +subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + +subpkgs=("${subpk...@]}" "kpresenter") +subdescs=("${subdes...@]}" "KOffice Presentation Tool") +subdepends=("${subdepen...@]}" "libqtgui>=$_F_kde_qtver libqtxml>=$_F_kde_qtver libgl libxext") +subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") +subgroups=("${subgrou...@]}" '') +subarchs=("${subarc...@]}" 'i686 x86_64') + +subpkgs=("${subpk...@]}" "kplato") +subdescs=("${subdes...@]}" "KOffice Planning Tool") +subdepends=("${subdepen...@]}" "libqtgui>=$_F_kde_qtver libqtxml>=$_F_kde_qtver libgl libxext libjpeg") +subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + +subpkgs=("${subpk...@]}" "krita") +subdescs=("${subdes...@]}" "KOffice Image Manipulation Application") +subdepends=("${subdepen...@]}" "libgl libqtcore>=$_F_kde_qtver qimageblitz exiv2 glew expat libxmu libtiff + opengtl libqtgtl poppler-qt4 libkdcraw>=$_F_kde_ver") +subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + +subpkgs=("${subpk...@]}" "karbon") +subdescs=("${subdes...@]}" "KOffice Vector Graphics Drawing Application") +subdepends=("${subdepen...@]}" "libgl poppler-qt4 libwpg pstoedit") +subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + +subpkgs=("${subpk...@]}" "kformula") +subdescs=("${subdes...@]}" "KOffice Formula Editor") +subdepends=("${subdepen...@]}" "libqtgui libqtxml libgl libxext") +subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + +subpkgs=("${subpk...@]}" "kchart") +subdescs=("${subdes...@]}" "KOffice Chart Generator") +subdepends=("${subdepen...@]}" "libqtxml>=$_F_kde_qtver libqtgui>=$_F_kde_qtver libxext libgl") +subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + +subpkgs=("${subpk...@]}" "$pkgname-tools") +subdescs=("${subdes...@]}" "KOffice tools") +subdepends=("${subdepen...@]}" "libqtgui>=$_F_kde_qtver libqtxml>=$_F_kde_qtver libxext libgl") +subrodepends=("${subrodepen...@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + + +_F_kde_subpkgs=("${subpk...@]}") + +subpkgs=("${subpk...@]}" "$pkgname-libs") +subdescs=("${subdes...@]}" "Koffice Libraries") +subdepends=("${subdepen...@]}" "lcms libgcc libice libxrender libglu qca util-linux-ng libxi kdepimlibs>=$_F_kde_ver + cyrus-sasl libqtscript>=$_F_kde_qtver libqt3support>=$_F_kde_qtver") +subrodepends=("${subrodepen...@]}" "") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + +subpkgs=("${subpk...@]}" "$pkgname-data") +subdescs=("${subdes...@]}" "Koffice icons , templates and service files.") +subdepends=("${subdepen...@]}" "") +subrodepends=("${subrodepen...@]}" "") +subgroups=("${subgrou...@]}" 'kde-extra') +subarchs=("${subarc...@]}" 'i686 x86_64') + +rodepends=("${rodepen...@]}" "${subpk...@]}") + +subpkgs=("${subpk...@]}" "$pkgname-docs") +subdescs=("${subdes...@]}" "Koffice Documentation") +subdepends=("${subdepen...@]}" '') +subrodepends=("${subrodepen...@]}" "") +subgroups=("${subgrou...@]}" 'docs-extra kde-docs') +subarchs=("${subarc...@]}" 'i686 x86_64') + + +build() +{ + KDE_make_split + + ## -libs subpackage -- libs* are all over the place + KDE_project_install libs + KDE_project_install interfaces + KDE_project_install plugins + KDE_project_install filters/generic_wrapper + KDE_project_install filters/libkowmf + KDE_project_install filters/xsltfilter + KDE_project_install kounavail + KDE_project_install cmake + Fsplit $pkgname-libs /\* -subpkgs=("$pkgname-docs") -subdescs=('Koffice Documentation.') -subrodepends=("$pkgname>=$pkgver") -subgroups=('kde-extra') -subarchs=('i686 x86_64 ppc') + ## -data subpackage + KDE_project_install pics + KDE_project_install servicetypes + KDE_project_install templates + Fsplit $pkgname-data /\* -sha1sums=('0fd0bf64e6d166d41bae41730b17d5194e7f5adf') + KDE_install + ## that can be right .. + Frm /usr/include/config-openexr.h +} # optimization OK diff --git a/source/kde-extra/koffice/kchart-build_and_install.patch b/source/kde-extra/koffice/kchart-build_and_install.patch new file mode 100644 index 0000000..e091b1e --- /dev/null +++ b/source/kde-extra/koffice/kchart-build_and_install.patch @@ -0,0 +1,57 @@ +diff -Naur koffice-2.1.1/kchart/CMakeLists.txt koffice-2.1.1-p/kchart/CMakeLists.txt +--- koffice-2.1.1/kchart/CMakeLists.txt 2010-01-08 11:43:13.000000000 +0100 ++++ koffice-2.1.1-p/kchart/CMakeLists.txt 2010-01-31 16:51:34.000000000 +0100 +@@ -57,36 +57,36 @@ + + ########### target kchartpart ############### + +-#set(kchartpart_PART_SRCS KChartFactoryInit.cpp ) ++set(kchartpart_PART_SRCS KChartFactoryInit.cpp ) + +-#kde4_add_plugin(kchartpart WITH_PREFIX ${kchartpart_PART_SRCS}) ++kde4_add_plugin(kchartpart WITH_PREFIX ${kchartpart_PART_SRCS}) + + +-#target_link_libraries(kchartpart +-# ${KDE4_KDECORE_LIBS} +-# kchartcommon +- #chartshapelib +-#) ++target_link_libraries(kchartpart ++ ${KDE4_KDECORE_LIBS} ++ kchartcommon ++ chartshapelib ++) + +-#install(TARGETS kchartpart DESTINATION ${PLUGIN_INSTALL_DIR}) ++install(TARGETS kchartpart DESTINATION ${PLUGIN_INSTALL_DIR}) + + + ########### target kchart ############### + +-#set(kchart_KDEINIT_SRCS main.cpp ) ++set(kchart_KDEINIT_SRCS main.cpp ) + +-#kde4_add_kdeinit_executable( kchart ${kchart_KDEINIT_SRCS}) ++kde4_add_kdeinit_executable( kchart ${kchart_KDEINIT_SRCS}) + +-#target_link_libraries(kdeinit_kchart ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} komain ) ++target_link_libraries(kdeinit_kchart ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} komain ) + +-#install(TARGETS kdeinit_kchart ${INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS kdeinit_kchart ${INSTALL_TARGETS_DEFAULT_ARGS}) + +-#target_link_libraries( kchart kdeinit_kchart ) +-#install(TARGETS kchart ${INSTALL_TARGETS_DEFAULT_ARGS}) ++target_link_libraries( kchart kdeinit_kchart ) ++install(TARGETS kchart ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ########### install files ############### + + install( FILES kchartpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +-#install( FILES kchart.rc kchart_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/kchart) +-#install( FILES kchart.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +-#install( FILES kchart.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) ++install( FILES kchart.rc kchart_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/kchart) ++install( FILES kchart.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) ++install( FILES kchart.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/source/kde-extra/koffice/kformula_install.patch b/source/kde-extra/koffice/kformula_install.patch new file mode 100644 index 0000000..d669f15 --- /dev/null +++ b/source/kde-extra/koffice/kformula_install.patch @@ -0,0 +1,20 @@ +diff -Naur koffice-2.1.1/kformula/CMakeLists.txt koffice-2.1.1-p/kformula/CMakeLists.txt +--- koffice-2.1.1/kformula/CMakeLists.txt 2010-01-08 11:36:56.000000000 +0100 ++++ koffice-2.1.1-p/kformula/CMakeLists.txt 2010-01-31 16:40:57.000000000 +0100 +@@ -51,14 +51,14 @@ + + target_link_libraries(kdeinit_kformula_bin komain ) + +-#install(TARGETS kdeinit_kformula_bin ${INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS kdeinit_kformula_bin ${INSTALL_TARGETS_DEFAULT_ARGS}) + + set_target_properties(kdeinit_kformula_bin PROPERTIES OUTPUT_NAME kdeinit_kformula) + + target_link_libraries( kformula_bin kdeinit_kformula_bin ) + set_target_properties( kformula_bin PROPERTIES OUTPUT_NAME kformula) + +-#install(TARGETS kformula_bin ${INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS kformula_bin ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ########### install files ############### + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
