Date: Wednesday, September 29, 2010 @ 10:51:01 Author: ronald Revision: 92392
add qt-assistant-compat package, needed for qtiplot now it is removed since qt4.7 Added: qt-assistant-compat/ qt-assistant-compat/repos/ qt-assistant-compat/trunk/ qt-assistant-compat/trunk/PKGBUILD qt-assistant-compat/trunk/debian_patches_01_build_system.diff Modified: liborigin2/trunk/PKGBUILD liborigin2/trunk/liborigin.pro.archlinux qtiplot/trunk/PKGBUILD ---------------------------------------------------------------+ liborigin2/trunk/PKGBUILD | 29 ++--- liborigin2/trunk/liborigin.pro.archlinux | 10 + qt-assistant-compat/trunk/PKGBUILD | 55 ++++++++++ qt-assistant-compat/trunk/debian_patches_01_build_system.diff | 48 ++++++++ qtiplot/trunk/PKGBUILD | 46 +++++--- 5 files changed, 157 insertions(+), 31 deletions(-) Modified: liborigin2/trunk/PKGBUILD =================================================================== --- liborigin2/trunk/PKGBUILD 2010-09-29 14:44:43 UTC (rev 92391) +++ liborigin2/trunk/PKGBUILD 2010-09-29 14:51:01 UTC (rev 92392) @@ -3,37 +3,36 @@ # Contributor: damir <[email protected]> pkgname=liborigin2 -pkgver=20090406 -pkgrel=4 +pkgver=20100913 +pkgrel=1 pkgdesc="A library for reading OriginLab OPJ project files" url="http://soft.proindependent.com/liborigin2/"; -source=(http://download.berlios.de/qtiplot/${pkgname}-06042009.zip +source=(http://download.berlios.de/qtiplot/${pkgname}-13092010.zip liborigin.pro.archlinux - gcc45.patch) + http://tree.phi-sci.com/tree.hh) license=('GPL3') arch=('i686' 'x86_64') depends=('gcc-libs' 'boost-libs') makedepends=('doxygen' 'qt' 'boost') replaces=('liborigin') provides=('liborigin') -md5sums=('b221b2e4d86a4a2b9136bc37944b64b8' - '4fe64e68ef0419926986d3cc1fc79bed' - '2fde6d1e7e94216e82d124c8500e05c5') +md5sums=('e2b41c4d8a1e2d357dd2b5b331d31375' + 'd982e2e07836fe14a430c0062cb59cd2' + 'd24a1c3bdd811354ea7f5885d86ddacb') build() { - cd ${srcdir}/${pkgname}-06042009 - patch -Np0 -i ${srcdir}/gcc45.patch || return 1 + cd ${srcdir}/${pkgname} - install -Dm644 ${srcdir}/liborigin.pro.archlinux ./liborigin.pro || return 1 - - qmake liborigin.pro QMAKESPEC=linux-g++ || return 1 - make QTDIR=/usr/ QMAKESPEC=linux-g++ || return 1 + install -Dm644 ${srcdir}/liborigin.pro.archlinux ./liborigin.pro + install -Dm644 ${srcdir}/tree.hh ./tree.hh # get the header back like it was in previous releases + qmake liborigin.pro QMAKESPEC=linux-g++ + make QTDIR=/usr/ QMAKESPEC=linux-g++ } package() { - cd ${srcdir}/${pkgname}-06042009 + cd ${srcdir}/${pkgname} - INSTALL_ROOT=${pkgdir} make install || return 1 + INSTALL_ROOT=${pkgdir} make install # install missing includes install -Dm644 tree.hh ${pkgdir}/usr/include/liborigin2/tree.hh Modified: liborigin2/trunk/liborigin.pro.archlinux =================================================================== --- liborigin2/trunk/liborigin.pro.archlinux 2010-09-29 14:44:43 UTC (rev 92391) +++ liborigin2/trunk/liborigin.pro.archlinux 2010-09-29 14:51:01 UTC (rev 92392) @@ -17,12 +17,22 @@ HEADERS += OriginFile.h HEADERS += OriginParser.h HEADERS += OriginDefaultParser.h +HEADERS += Origin600Parser.h +HEADERS += Origin610Parser.h +HEADERS += Origin700Parser.h HEADERS += Origin750Parser.h +HEADERS += Origin800Parser.h +HEADERS += Origin810Parser.h SOURCES += OriginFile.cpp SOURCES += OriginParser.cpp SOURCES += OriginDefaultParser.cpp +SOURCES += Origin600Parser.cpp +SOURCES += Origin610Parser.cpp +SOURCES += Origin700Parser.cpp SOURCES += Origin750Parser.cpp +SOURCES += Origin800Parser.cpp +SOURCES += Origin810Parser.cpp headers.files = \$\$HEADERS headers.path = /usr/include/liborigin2 Added: qt-assistant-compat/trunk/PKGBUILD =================================================================== --- qt-assistant-compat/trunk/PKGBUILD (rev 0) +++ qt-assistant-compat/trunk/PKGBUILD 2010-09-29 14:51:01 UTC (rev 92392) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> + +pkgname=qt-assistant-compat +pkgver=4.6.3 +pkgrel=1 +pkgdesk="compat version of Qt Assistant" +url="http://qt.nokia.com/"; +arch=('i686' 'x86_64') +license=('GPL3' 'LGPL') +depends=('qt') +source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz' + 'debian_patches_01_build_system.diff') +md5sums=('a20148e0488d5c12ab35ccc107dcc64d' + '1b55290dc9fab0c035797e9301d2fa61') + +# separate package function does not really work here due to broken build files +build() { + cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver} + + patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff + + cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi + rm -f translations/assistant_adp_*.qm + + qmake CONFIG+=create_prl + make + cd ../translations; lrelease assistant_adp_*.ts + cd .. + qmake CONFIG+=create_prl + make +} + +package(){ + cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver} + + make install INSTALL_ROOT=${pkgdir} + cd lib + make install INSTALL_ROOT=${pkgdir} + cd .. + + # Fix wrong path in prl file + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" \ + ${pkgdir}/usr/lib/libQtAssistantClient.prl + + # Install translations + install -d ${pkgdir}/usr/share/qt/translations/ + install -p -m0644 translations/assistant_adp_*.qm \ + ${pkgdir}/usr/share/qt/translations/ + + # Install prf file + install -D -p -m0644 features/assistant.prf \ + ${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf + +} Property changes on: qt-assistant-compat/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords + Id Added: qt-assistant-compat/trunk/debian_patches_01_build_system.diff =================================================================== --- qt-assistant-compat/trunk/debian_patches_01_build_system.diff (rev 0) +++ qt-assistant-compat/trunk/debian_patches_01_build_system.diff 2010-09-29 14:51:01 UTC (rev 92392) @@ -0,0 +1,48 @@ +Description: several workarounds for the build system which is completely broken +Author: Fathi Boudra <[email protected]> + +--- a/compat.pro ++++ b/compat.pro +@@ -66,8 +66,6 @@ TRANSLATIONS = translations/assistant_ad + translations/assistant_adp_zh_CN.ts \ + translations/assistant_adp_zh_TW.ts + +-unix:!contains(QT_CONFIG, zlib):LIBS += -lz +- + contains(CONFIG, static): { + win32 { + exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) { +@@ -81,3 +79,7 @@ contains(CONFIG, static): { + } + } + } ++ ++target.path = $$[QT_INSTALL_BINS] ++INSTALLS += target ++ +--- a/lib/lib.pro ++++ b/lib/lib.pro +@@ -16,8 +16,8 @@ HEADERS = qassistantclient.h \ + qassistantclient_global.h + SOURCES = qassistantclient.cpp + +-DESTDIR = ../../../../lib +-DLLDESTDIR = ../../../../bin ++DESTDIR = lib ++DLLDESTDIR = bin + + unix { + QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB +@@ -62,7 +62,7 @@ win32 { + } + + qt_install_headers { +- assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES ++ assistant_headers.files = qassistantclient.h qassistantclient_global.h + assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant + INSTALLS += assistant_headers + } +--- /dev/null ++++ b/lib/QtAssistant/qassistantclient_global.h +@@ -0,0 +1 @@ ++#include "../qassistantclient_global.h" Modified: qtiplot/trunk/PKGBUILD =================================================================== --- qtiplot/trunk/PKGBUILD 2010-09-29 14:44:43 UTC (rev 92391) +++ qtiplot/trunk/PKGBUILD 2010-09-29 14:51:01 UTC (rev 92392) @@ -4,13 +4,13 @@ # Contributor: Gergely Imreh <[email protected]> pkgname=qtiplot -pkgver=0.9.7.13 -pkgrel=2 +pkgver=0.9.8.2 +pkgrel=1 pkgdesc="Data analysis and scientific plotting - free clone of Origin" arch=('i686' 'x86_64') url="http://soft.proindependent.com/qtiplot.html"; -depends=('muparser>=1.32' 'gsl' 'pyqt' 'sip>=4.9.1' \ - 'boost>=1.41.0' 'libgl' 'shared-mime-info' 'mesa' 'liborigin2>=20090406') +depends=('muparser' 'gsl' 'pyqt' 'sip' \ + 'boost' 'libgl' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat') # build against qwtplot3d provided in the package ... # build against qwt provided in the package ... # as systemwide one doesn't provide all needed functions @@ -23,39 +23,45 @@ build.conf.archlinux qwtplot3d_gcc.patch qtiplot.xml - qtiplot-0.9.7.12-system-liborigin.patch) -md5sums=('cca071f8160058e5b535776c4e7bede5' + qtiplot-0.9.7.14-system-liborigin.patch + gentoo-fix-origin-build-failure.patch) +md5sums=('e8335a8760e8c2ac044607d5a4bb80ca' '56bd53f4f1367c285086acb969f13348' 'ad8affbd6f0d5cbdcde46c923ee2668a' '95e52ef9c417c8a8dbc1901fe4c0c801' 'ab02c436ec2c04b1838cb5517383b4eb' '35683f3b32e1edcca0bb02c471d284e9' - 'd3fe35e985f6a1f04ba0abeea51ba135') + 'fa7cfc5ba60d28f264ad53869d31fcc8' + '642cb38c6579b51b86834c8640130b6f') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/qtiplot-0.9.7.12-system-liborigin.patch || return 1 - install -Dm644 ${srcdir}/build.conf.archlinux build.conf || return 1 + patch -Np0 -i ${srcdir}/qtiplot-0.9.7.14-system-liborigin.patch + patch -Np0 -i ${srcdir}/gentoo-fix-origin-build-failure.patch + install -Dm644 ${srcdir}/build.conf.archlinux build.conf # Make qwt sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp - patch -Np1 -i ${srcdir}/qwtplot3d_gcc.patch || return 1 + patch -Np1 -i ${srcdir}/qwtplot3d_gcc.patch cd ./3rdparty/qwt - qmake || return 1 - make || return 1 + qmake + make # Make qwtplot3d cd ../qwtplot3d - qmake || return 1 - make || return 1 + qmake + make # Make qtiplot cd ${srcdir}/${pkgname}-${pkgver}/${pkgname} + + # fix stuff sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro + sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp - qmake qtiplot.pro QMAKESPEC=linux-g++ || return 1 - make QTDIR=/usr/ QMAKESPEC=linux-g++ || return 1 + qmake qtiplot.pro QMAKESPEC=linux-g++ + make QTDIR=/usr/ QMAKESPEC=linux-g++ } package() { @@ -71,3 +77,11 @@ install -D -m644 ${srcdir}/${pkgname}.xml \ ${pkgdir}/usr/share/mime/packages/${pkgname}.xml || return 1 } +md5sums=('e8335a8760e8c2ac044607d5a4bb80ca' + '56bd53f4f1367c285086acb969f13348' + 'ad8affbd6f0d5cbdcde46c923ee2668a' + '95e52ef9c417c8a8dbc1901fe4c0c801' + 'ab02c436ec2c04b1838cb5517383b4eb' + '35683f3b32e1edcca0bb02c471d284e9' + 'fa7cfc5ba60d28f264ad53869d31fcc8' + '642cb38c6579b51b86834c8640130b6f')
