From 2a7a7ba0c09e5361eed4931412aadd6ec257a6c5 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 10 Apr 2011 21:38:10 +0000 Subject: [PATCH 01/36] Add google talk support --- kdenetwork/PKGBUILD | 6 ++--- support-pkg-mediastreamer/PKGBUILD | 39 +++++++++++------------------- 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/kdenetwork/PKGBUILD b/kdenetwork/PKGBUILD index 3985dccbe..d55b7d152 100644 --- a/kdenetwork/PKGBUILD +++ b/kdenetwork/PKGBUILD @@ -28,7 +28,7 @@ pkgname=('kdenetwork-common' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=1 +pkgrel=2 pkgdesc="split package" url="http://www.kde.org" @@ -39,8 +39,8 @@ options=('docs' '!splithdr' 'splitdbg' 'log') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qca-ossl' "kdebase-workspace>=${_kdever}" "kdebase>=${_kdever}" 'libvncserver' 'libmsn' - 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' - 'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5') + 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss' 'libxdamage' 'ilbc' 'msilbc' + 'libgadu' 'telepathy-qt4' 'meanwhile' 'mediastreamer>=2.7.3' 'kwebkitpart>=0.9.6' 'libktorrent>=1.0.5') source=($_mirror/${_origname}-$_kdever.tar.bz2 \ 'lisa.daemon') diff --git a/support-pkg-mediastreamer/PKGBUILD b/support-pkg-mediastreamer/PKGBUILD index 39c034b10..72a7a9766 100644 --- a/support-pkg-mediastreamer/PKGBUILD +++ b/support-pkg-mediastreamer/PKGBUILD @@ -4,34 +4,23 @@ # maintainer (i686): Phil Miller # maintainer (x86_64): Manuel Tortosa -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - - -# original name (used for the source and pkgnames) -_origname=mediastreamer - -pkgname=${_origname} -pkgver=2.3.0 +pkgname=mediastreamer +pkgver=2.7.3 pkgrel=1 -pkgdesc='A powerful and lightweighted streaming engine specialized for voice/video telephony applications' +pkgdesc="A library written in C that allows you to create and run audio and video streams." arch=('i686' 'x86_64') -url="http://www.linphone.org/index.php/eng/code_review/mediastreamer2" +url="http://www.linphone.org" license=('GPL') -depends=('ortp>=0.15.0' 'sdl>=1.2.14' 'libv4l>=0.6.3' 'speex' 'libtheora>=1.1.1' "ffmpeg>=0.5") -makedepends=() -groups=("kde-uninstall" "kde-support") -options=('!splitdbg' '!splithdr') - -provides=("${_origname}=$pkgver") -conflicts=("${_origname}") - -source=(http://mirror.cinquix.com/pub/savannah/linphone/mediastreamer/${_origname}-$pkgver.tar.gz) -md5sums=('867d539cf11e942dcbfd08d4b3182397') # mediastreamer-2.3.0.tar.gz +depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg' 'libxv') +makedepends=('cmake' 'automoc4') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/mediastreamer-$pkgver.tar.gz") +md5sums=('5213307f557d86aa648f1a53a885138c') build() { - cd "$srcdir"/${_origname}-$pkgver - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + + cd "$srcdir"/$pkgname-$pkgver/ + ./configure --prefix=/usr + make + make DESTDIR=${pkgdir} install + } From 0dfd9a89ba9385d247e374936307f8395e192b39 Mon Sep 17 00:00:00 2001 From: Manuel Tortosa Date: Mon, 11 Apr 2011 00:30:25 +0200 Subject: [PATCH 02/36] Add proper deps --- kdenetwork/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdenetwork/PKGBUILD b/kdenetwork/PKGBUILD index d55b7d152..ac298fc5f 100644 --- a/kdenetwork/PKGBUILD +++ b/kdenetwork/PKGBUILD @@ -137,7 +137,7 @@ package_kdenetwork-kopete() { pkgdesc="Kopete, the instant messenger" depends=("kdebase-runtime>=${_kdever}" "kdepimlibs>=${_kdever}" - 'qca-ossl' 'libotr' 'libmsn' 'libidn' 'qimageblitz' 'libxss' 'libv4l' 'libgadu' 'meanwhile' 'mediastreamer') + 'qca-ossl' 'libotr' 'libmsn' 'libidn' 'qimageblitz' 'libxss' 'v4l-utils' 'libgadu' 'meanwhile' 'mediastreamer' 'msilbc') conflicts=("kdemod-${_origname}-kopete") groups=("kde" "kde-complete" "${_origname}" "kde-uninstall") install=${_origname}.install From 66b35680e707819dab18807f41bb0c96b0500497 Mon Sep 17 00:00:00 2001 From: philm Date: Wed, 13 Apr 2011 19:17:03 +0000 Subject: [PATCH 03/36] appset-qt: new features --- .gitignore | 7 +++++++ tools-pkg-appset-qt/PKGBUILD | 36 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 53494abd7..a24dbed1a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,9 @@ hdr build.sh clean-builddir.sh clean-workdir.sh +copy.sh makepkg +move.sh pkgrels-decrease.sh pkgrels-increase.sh pkgrels-reset.sh @@ -24,6 +26,11 @@ sync-complete.sh sync-down.sh sync-up-nodb.sh sync-up.sh +remove.sh +recreate-database.sh +upload.sh +upload-nodb.sh +unlock-database.sh *-cfg.conf *-makepkg.conf diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index 7cdbef1cb..e737da712 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -3,7 +3,7 @@ # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626 pkgname=appset-qt -pkgver=0.4.0 +pkgver=0.4.1pre pkgrel=1 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') @@ -12,25 +12,25 @@ license=('GPL2') depends=('qt>=4.7') optdepends=('ccr: For Community Repository support') install=${pkgname}.install -source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz +source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/0.4.1/$pkgname-$pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz - http://chakra-project.org/sources/$pkgname/$pkgname-0.4.0-chakra.patch - http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.0.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/$pkgname-0.4.1pre-chakra.patch + #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.0.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.0.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.0.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.0.tar.gz ) -md5sums=(4d0500ae33c8250dfa24c9b696ba7e30 +md5sums=(3f464e9adcc704fabd5cf02e01dba28a 87f5f278e3fe67ed2cd6165c2835d81b - 724e4cea62d3b95dd63573e75dffe783 - 44ba1b52c438e05853fbaf202ae243b6 #appset-qt_ca-0.4.0.tar.gz - 3b5c5027609eef9b43ad0f98c137c094 #appset-qt_de-0.4.0.tar.gz - 84542e24121e93dc1c84b63c940c60e0 #appset-qt_el-0.4.0.tar.gz - ffb9f62a72805a1613a8847598e353ea #appset-qt_es-0.4.0.tar.gz - f64d3552553bf28d12358aba2db4ca2a #appset-qt_fr-0.4.0.tar.gz - b9238caf3c0bf3f7f2258c052d8addf6 #appset-qt_nl-0.4.0.tar.gz + f65a688a2c6c63bcea960cea817c8bb3 + #44ba1b52c438e05853fbaf202ae243b6 #appset-qt_ca-0.4.0.tar.gz + 275ce0fe7db802558340c5c234a66249 #appset-qt_de-0.4.1.tar.gz + #84542e24121e93dc1c84b63c940c60e0 #appset-qt_el-0.4.0.tar.gz + #ffb9f62a72805a1613a8847598e353ea #appset-qt_es-0.4.0.tar.gz + #f64d3552553bf28d12358aba2db4ca2a #appset-qt_fr-0.4.0.tar.gz + #b9238caf3c0bf3f7f2258c052d8addf6 #appset-qt_nl-0.4.0.tar.gz ) build() { @@ -39,7 +39,7 @@ build() { cp -v ../*png Qt/AppSet-Qt # patch it for Chakra GNU/Linux - patch -Np1 -i ${startdir}/src/$pkgname-0.4.0-chakra.patch + patch -Np1 -i ${startdir}/src/$pkgname-0.4.1pre-chakra.patch # add chakra translations (check upstream) #patch -Np1 -i ${startdir}/src/add-spanish.patch From acb15a717d90b4c5cfcff0c330073aa01dd975ce Mon Sep 17 00:00:00 2001 From: Phil Date: Wed, 13 Apr 2011 19:45:42 +0000 Subject: [PATCH 04/36] appset-qt: fix ccr --- tools-pkg-appset-qt/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index e737da712..1248fb8a0 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -4,7 +4,7 @@ pkgname=appset-qt pkgver=0.4.1pre -pkgrel=1 +pkgrel=2 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') url="http://appset.sourceforge.net/" @@ -24,7 +24,7 @@ source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/0.4.1/$pkgnam ) md5sums=(3f464e9adcc704fabd5cf02e01dba28a 87f5f278e3fe67ed2cd6165c2835d81b - f65a688a2c6c63bcea960cea817c8bb3 + 4a1c4f5f31e754e48a9145421c08d900 #44ba1b52c438e05853fbaf202ae243b6 #appset-qt_ca-0.4.0.tar.gz 275ce0fe7db802558340c5c234a66249 #appset-qt_de-0.4.1.tar.gz #84542e24121e93dc1c84b63c940c60e0 #appset-qt_el-0.4.0.tar.gz From 748791610827d67d4f3c086ad6fafcd96dca9be3 Mon Sep 17 00:00:00 2001 From: philm Date: Wed, 13 Apr 2011 23:24:52 +0000 Subject: [PATCH 05/36] appset-qt: update languages --- tools-pkg-appset-qt/PKGBUILD | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index 1248fb8a0..d960175c8 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -4,7 +4,7 @@ pkgname=appset-qt pkgver=0.4.1pre -pkgrel=2 +pkgrel=3 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') url="http://appset.sourceforge.net/" @@ -15,21 +15,21 @@ install=${pkgname}.install source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/0.4.1/$pkgname-$pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz http://chakra-project.org/sources/$pkgname/$pkgname-0.4.1pre-chakra.patch - #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz - #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.0.tar.gz - #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.0.tar.gz - #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.0.tar.gz ) md5sums=(3f464e9adcc704fabd5cf02e01dba28a 87f5f278e3fe67ed2cd6165c2835d81b 4a1c4f5f31e754e48a9145421c08d900 - #44ba1b52c438e05853fbaf202ae243b6 #appset-qt_ca-0.4.0.tar.gz - 275ce0fe7db802558340c5c234a66249 #appset-qt_de-0.4.1.tar.gz - #84542e24121e93dc1c84b63c940c60e0 #appset-qt_el-0.4.0.tar.gz - #ffb9f62a72805a1613a8847598e353ea #appset-qt_es-0.4.0.tar.gz - #f64d3552553bf28d12358aba2db4ca2a #appset-qt_fr-0.4.0.tar.gz + 8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz + 275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz + b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz + 033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz + 676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz #b9238caf3c0bf3f7f2258c052d8addf6 #appset-qt_nl-0.4.0.tar.gz ) From 783d64ad02595df8ad772fafa3e4ce053ab21474 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 16 Apr 2011 18:06:14 +0000 Subject: [PATCH 06/36] Backport and update --- tools-pkg-bluedevil/PKGBUILD | 6 +++--- tools-pkg-libbluedevil/PKGBUILD | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 tools-pkg-libbluedevil/PKGBUILD diff --git a/tools-pkg-bluedevil/PKGBUILD b/tools-pkg-bluedevil/PKGBUILD index ae35cb91a..dc045adce 100644 --- a/tools-pkg-bluedevil/PKGBUILD +++ b/tools-pkg-bluedevil/PKGBUILD @@ -8,9 +8,9 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=bluedevil -pkgver=1.0.2 +pkgver=1.1 pkgrel=1 -pkgdesc='The new bluetooth stack for KDE, it’s composed of: KCM, KDED, KIO, Library and some other small applications' +pkgdesc='The new bluetooth stack for KDE, it is composed of: KCM, KDED, KIO, Library and some other small applications' arch=('i686' 'x86_64') url="http://gitorious.org/bluedevil" license=('GPL') @@ -20,7 +20,7 @@ provides=(bluedevil) conflicts=(bluedevil-git) source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=("c0c814146098b865144957bc8b3bd7e7") +md5sums=('240151ff99b81f630de51fa9f8230198') build(){ cd ${srcdir} diff --git a/tools-pkg-libbluedevil/PKGBUILD b/tools-pkg-libbluedevil/PKGBUILD new file mode 100644 index 000000000..4d390cdd9 --- /dev/null +++ b/tools-pkg-libbluedevil/PKGBUILD @@ -0,0 +1,33 @@ +# +# Chakra Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa + +pkgname=libbluedevil +pkgver=1.8.1 +pkgrel=1 +pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack' +arch=('i686' 'x86_64') +url="https://projects.kde.org/projects/playground/libs/libbluedevil" +license=('GPL') +depends=('qt' 'bluez') +makedepends=('cmake') +source=("http://media.ereslibre.es/2011/03/${pkgname}-v${pkgver}.tar.bz2") +md5sums=('70eee9877228411e6e36a8b64b89bf9a') + + +build(){ + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-v${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/build + make DESTDIR=${pkgdir} install +} From b3ebe534e2942b49f40a30d852f526f5cc02728f Mon Sep 17 00:00:00 2001 From: Manuel Tortosa Date: Sun, 17 Apr 2011 19:44:53 +0200 Subject: [PATCH 07/36] Compile against proper lib --- tools-pkg-bluedevil/PKGBUILD | 2 +- tools-pkg-libbluedevil/PKGBUILD | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools-pkg-bluedevil/PKGBUILD b/tools-pkg-bluedevil/PKGBUILD index dc045adce..bf0634652 100644 --- a/tools-pkg-bluedevil/PKGBUILD +++ b/tools-pkg-bluedevil/PKGBUILD @@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=bluedevil pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc='The new bluetooth stack for KDE, it is composed of: KCM, KDED, KIO, Library and some other small applications' arch=('i686' 'x86_64') url="http://gitorious.org/bluedevil" diff --git a/tools-pkg-libbluedevil/PKGBUILD b/tools-pkg-libbluedevil/PKGBUILD index 4d390cdd9..46f48a5b8 100644 --- a/tools-pkg-libbluedevil/PKGBUILD +++ b/tools-pkg-libbluedevil/PKGBUILD @@ -5,7 +5,7 @@ # maintainer (x86_64): Manuel Tortosa pkgname=libbluedevil -pkgver=1.8.1 +pkgver=1.9 pkgrel=1 pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64') @@ -13,15 +13,15 @@ url="https://projects.kde.org/projects/playground/libs/libbluedevil" license=('GPL') depends=('qt' 'bluez') makedepends=('cmake') -source=("http://media.ereslibre.es/2011/03/${pkgname}-v${pkgver}.tar.bz2") -md5sums=('70eee9877228411e6e36a8b64b89bf9a') - +# source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +source=("ftp://ftp.belnet.be/packages/kde/unstable/libbluedevil/1.9/src/libbluedevil-1.9.tar.bz2") +md5sums=('5f22614dfb840734da6e8b8710c2472e') build(){ cd ${srcdir} mkdir build cd build - cmake ../${pkgname}-v${pkgver} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make From 01f5fbba0efb23205a140fa8879409ea18e337c1 Mon Sep 17 00:00:00 2001 From: abveritas Date: Mon, 18 Apr 2011 16:02:10 +0000 Subject: [PATCH 08/36] mediastreamer rebuild for liboa/libvorbis update --- support-pkg-mediastreamer/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support-pkg-mediastreamer/PKGBUILD b/support-pkg-mediastreamer/PKGBUILD index 72a7a9766..8b54602fb 100644 --- a/support-pkg-mediastreamer/PKGBUILD +++ b/support-pkg-mediastreamer/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mediastreamer pkgver=2.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library written in C that allows you to create and run audio and video streams." arch=('i686' 'x86_64') url="http://www.linphone.org" From 79638097fa9eb310a0e81349d5ecc0b2cf8fc140 Mon Sep 17 00:00:00 2001 From: philm Date: Mon, 18 Apr 2011 22:27:27 +0000 Subject: [PATCH 09/36] update tribe --- tools-pkg-appset-qt/PKGBUILD | 36 ++++++++++++++++++------------------ tools-pkg-tribe/PKGBUILD | 14 +++++++------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index d960175c8..7bbe6b713 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -3,8 +3,8 @@ # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626 pkgname=appset-qt -pkgver=0.4.1pre -pkgrel=3 +pkgver=0.4.1 +pkgrel=1 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') url="http://appset.sourceforge.net/" @@ -14,23 +14,23 @@ optdepends=('ccr: For Community Repository support') install=${pkgname}.install source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/0.4.1/$pkgname-$pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz - http://chakra-project.org/sources/$pkgname/$pkgname-0.4.1pre-chakra.patch - http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz - #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.0.tar.gz + http://chakra-project.org/sources/$pkgname/$pkgname-0.4.1-chakra.patch + #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz ) -md5sums=(3f464e9adcc704fabd5cf02e01dba28a +md5sums=(279ec69590b9d275cf9aaddbb407c888 87f5f278e3fe67ed2cd6165c2835d81b - 4a1c4f5f31e754e48a9145421c08d900 - 8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz - 275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz - b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz - 033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz - 676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz - #b9238caf3c0bf3f7f2258c052d8addf6 #appset-qt_nl-0.4.0.tar.gz + cb627808490b84fb00bb4b710226b694 + #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz + #275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz + #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz + #033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz + #676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz + 2acb9e2ac0e6d75f3d97148a621a5539 #appset-qt_nl-0.4.1.tar.gz ) build() { @@ -39,7 +39,7 @@ build() { cp -v ../*png Qt/AppSet-Qt # patch it for Chakra GNU/Linux - patch -Np1 -i ${startdir}/src/$pkgname-0.4.1pre-chakra.patch + patch -Np1 -i ${startdir}/src/$pkgname-0.4.1-chakra.patch # add chakra translations (check upstream) #patch -Np1 -i ${startdir}/src/add-spanish.patch diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD index 5e4c19967..201b25f01 100644 --- a/tools-pkg-tribe/PKGBUILD +++ b/tools-pkg-tribe/PKGBUILD @@ -8,8 +8,8 @@ # package info # pkgname=tribe -pkgver=2011.04_ms4 -pkgrel=2 +pkgver=2011.04_ms6 +pkgrel=1 _codename=Aida pkgdesc="Tribe - Chakra LiveCD Installer" url="http://git.chakra-project.org/chakra/" @@ -23,10 +23,10 @@ replaces=('kdemod-tribe-svn' 'kdemod-tribe') conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager') options=('!splithdr' '!splitdbg' 'sign') source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz" - "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS4.html") + "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS6.html") -md5sums=('34146b44bd0425f72c12a2c101a04b62' - '77351a268878e2a493bfd8c89fac1e41') +md5sums=('fac311934faa10843ab06c263b8313e6' + '416c5c801e34113b48055fc24d395cd9') groups=('kde-uninstall') install=tools-tribe.install @@ -54,7 +54,7 @@ build() cd "${srcdir}/$pkgname" # workaround for bug https://bugzilla.novell.com/show_bug.cgi?id=656144 - sed -i -e "s~sudo~kdesu~g" "${srcdir}/$pkgname/tribe.desktop" + #sed -i -e "s~sudo~kdesu~g" "${srcdir}/$pkgname/tribe.desktop" # patches #patch -Np1 -i ${srcdir}/fake-progress.patch || return 1 @@ -85,7 +85,7 @@ package() cd "${srcdir}/$pkgname" msg "Make successful, installing..." make DESTDIR=$startdir/pkg install || return 1 - cp -vf ${srcdir}/RELEASE_NOTES_201104MS4.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html + cp -vf ${srcdir}/RELEASE_NOTES_201104MS6.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html # remove nasty files find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} + From 8ddff7d0cc2d7dc5cba7632a90331cf421daa8ed Mon Sep 17 00:00:00 2001 From: philm Date: Tue, 19 Apr 2011 00:58:33 +0200 Subject: [PATCH 10/36] koffice-l10n: fix pkgbuild --- koffice-l10n/PKGBUILD | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/koffice-l10n/PKGBUILD b/koffice-l10n/PKGBUILD index ad2337a75..7a71fcd1c 100644 --- a/koffice-l10n/PKGBUILD +++ b/koffice-l10n/PKGBUILD @@ -35,7 +35,7 @@ pkgname=('koffice-l10n-ca' 'koffice-l10n-zh_cn' 'koffice-l10n-zh_tw') pkgver=2.3.2 -pkgrel=2 +pkgrel=3 arch=('any') url='http://www.koffice.org' license=('GPL') @@ -364,11 +364,8 @@ package_koffice-l10n-gl() { } package_koffice-l10n-hu() { pkgdesc=('Hungarian Localization for Koffice') - cd $srcdir/build/gl + cd $srcdir/build/hu make DESTDIR=$pkgdir install - # temp fix - rm -vR $pkgdir/usr/share/locale/gl - rm -vR $pkgdir/usr/share/doc/kde/html/gl } package_koffice-l10n-it() { pkgdesc=('Italian Localization for Koffice') @@ -402,11 +399,8 @@ package_koffice-l10n-nl() { } package_koffice-l10n-pl() { pkgdesc=('Polish Localization for Koffice') - cd $srcdir/build/gl + cd $srcdir/build/pl make DESTDIR=$pkgdir install - # temp fix - rm -vR $pkgdir/usr/share/locale/gl - rm -vR $pkgdir/usr/share/doc/kde/html/gl } package_koffice-l10n-pt() { pkgdesc=('Portugese Localization for Koffice') From f8ceedd8e64f70bf03dd884dacd6f0731319d853 Mon Sep 17 00:00:00 2001 From: abveritas Date: Wed, 20 Apr 2011 20:55:32 +0000 Subject: [PATCH 11/36] rebuild cbundle/cinstall for glibc --- tools-pkg-cbundle/PKGBUILD | 4 ++-- tools-pkg-cinstall/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD index cc80a3f05..918c853a0 100644 --- a/tools-pkg-cbundle/PKGBUILD +++ b/tools-pkg-cbundle/PKGBUILD @@ -6,7 +6,7 @@ pkgname=cbundle pkgver=0.4.5.1 -pkgrel=1 +pkgrel=2 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse') makedepends=('qt' 'automoc4' 'kdebase-workspace') pkgdesc="A shared library for using Chakra software bundles" @@ -15,7 +15,7 @@ license=('GPL') url="http://chakra-project.org/" source=("http://chakra-project.org/sources/cinstall/cbundle-$pkgver.tar.xz") -md5sums=('70ba09e13b952d8199ad373735088792') +md5sums=('d4ff21cbf6293edd9f134889768d1bbc') # create tarball: source PKGBUILD && mksource diff --git a/tools-pkg-cinstall/PKGBUILD b/tools-pkg-cinstall/PKGBUILD index 37ebe8a3a..94bcbec28 100644 --- a/tools-pkg-cinstall/PKGBUILD +++ b/tools-pkg-cinstall/PKGBUILD @@ -7,7 +7,7 @@ pkgname=cinstall pkgver=0.4.5.1 -pkgrel=1 +pkgrel=2 depends=('rsync' 'cbundle') makedepends=('kdelibs' 'qt' 'automoc4') pkgdesc="Bundle Creator/Launcher and Package-Manager" @@ -17,7 +17,7 @@ install=$pkgname.install url="http://chakra-project.org/" source=("http://chakra-project.org/sources/cinstall/cinstall-$pkgver.tar.xz") -md5sums=('05dc73ea2a2fca80cc55729295053e8b') +md5sums=('c7c22a279dc3f0f9e16ada74e5ebaf41') # create tarball: source PKGBUILD && mksource From 911a0dbad59f91ffa760ecc35068de166986652e Mon Sep 17 00:00:00 2001 From: philm Date: Thu, 21 Apr 2011 22:47:29 +0000 Subject: [PATCH 12/36] appset-qt: add pl and bump to 0.4.2 --- tools-pkg-appset-qt/PKGBUILD | 18 ++++++++++-------- tools-pkg-tribe/PKGBUILD | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index 7bbe6b713..f8c3ceddd 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -3,7 +3,7 @@ # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626 pkgname=appset-qt -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') @@ -12,25 +12,27 @@ license=('GPL2') depends=('qt>=4.7') optdepends=('ccr: For Community Repository support') install=${pkgname}.install -source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/0.4.1/$pkgname-$pkgver-sources.tar.gz +source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz - http://chakra-project.org/sources/$pkgname/$pkgname-0.4.1-chakra.patch + http://chakra-project.org/sources/$pkgname/$pkgname-0.4.2-chakra.patch #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz ) -md5sums=(279ec69590b9d275cf9aaddbb407c888 +md5sums=(672dc9475c94baf614dd12922782c522 87f5f278e3fe67ed2cd6165c2835d81b - cb627808490b84fb00bb4b710226b694 + cb5b8d0889a1a3b2007faa8636388baf #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz #275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz #033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz #676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz - 2acb9e2ac0e6d75f3d97148a621a5539 #appset-qt_nl-0.4.1.tar.gz + #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz + 53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz ) build() { @@ -39,7 +41,7 @@ build() { cp -v ../*png Qt/AppSet-Qt # patch it for Chakra GNU/Linux - patch -Np1 -i ${startdir}/src/$pkgname-0.4.1-chakra.patch + patch -Np1 -i ${startdir}/src/$pkgname-0.4.2-chakra.patch # add chakra translations (check upstream) #patch -Np1 -i ${startdir}/src/add-spanish.patch diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD index 201b25f01..e85f0488c 100644 --- a/tools-pkg-tribe/PKGBUILD +++ b/tools-pkg-tribe/PKGBUILD @@ -9,7 +9,7 @@ # pkgname=tribe pkgver=2011.04_ms6 -pkgrel=1 +pkgrel=4 _codename=Aida pkgdesc="Tribe - Chakra LiveCD Installer" url="http://git.chakra-project.org/chakra/" @@ -25,7 +25,7 @@ options=('!splithdr' '!splitdbg' 'sign') source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz" "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS6.html") -md5sums=('fac311934faa10843ab06c263b8313e6' +md5sums=('a9560c8b4b0737d19aa06a967db37eea' '416c5c801e34113b48055fc24d395cd9') groups=('kde-uninstall') From 349f4b35c03e04ac9ee817e435531fad1ebf4026 Mon Sep 17 00:00:00 2001 From: philm Date: Fri, 22 Apr 2011 17:38:51 +0000 Subject: [PATCH 13/36] fix appset ccr support --- tools-pkg-appset-qt/PKGBUILD | 4 ++-- tools-pkg-cbundle/PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index f8c3ceddd..e478b0997 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -4,7 +4,7 @@ pkgname=appset-qt pkgver=0.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') url="http://appset.sourceforge.net/" @@ -25,7 +25,7 @@ source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgn ) md5sums=(672dc9475c94baf614dd12922782c522 87f5f278e3fe67ed2cd6165c2835d81b - cb5b8d0889a1a3b2007faa8636388baf + eb097d3ceeae3d05eefc0a5717ced010 #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz #275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD index 918c853a0..5cb2cf711 100644 --- a/tools-pkg-cbundle/PKGBUILD +++ b/tools-pkg-cbundle/PKGBUILD @@ -6,7 +6,7 @@ pkgname=cbundle pkgver=0.4.5.1 -pkgrel=2 +pkgrel=3 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse') makedepends=('qt' 'automoc4' 'kdebase-workspace') pkgdesc="A shared library for using Chakra software bundles" @@ -29,7 +29,7 @@ mksource() { build() { cd "${srcdir}/cbundle" - + patch -Np0 -i ${startdir}/debug-env.patch cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ From ea6b86918910c6e7a577782416de1e44389e8b2d Mon Sep 17 00:00:00 2001 From: philm Date: Fri, 22 Apr 2011 17:41:06 +0000 Subject: [PATCH 14/36] cbundle: clean testing stuff --- tools-pkg-cbundle/PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools-pkg-cbundle/PKGBUILD b/tools-pkg-cbundle/PKGBUILD index 5cb2cf711..18644e197 100644 --- a/tools-pkg-cbundle/PKGBUILD +++ b/tools-pkg-cbundle/PKGBUILD @@ -6,7 +6,7 @@ pkgname=cbundle pkgver=0.4.5.1 -pkgrel=3 +pkgrel=2 depends=('squashfs-tools' 'fakechroot' 'unionfs-fuse') makedepends=('qt' 'automoc4' 'kdebase-workspace') pkgdesc="A shared library for using Chakra software bundles" @@ -29,7 +29,6 @@ mksource() { build() { cd "${srcdir}/cbundle" - patch -Np0 -i ${startdir}/debug-env.patch cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ From 36e85a91db8d2036d3f2cfc419d2bc9634c1866d Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Fri, 22 Apr 2011 19:01:14 +0000 Subject: [PATCH 15/36] added flag to compile against xulrunner 2.0 (gtk free) --- .gitignore | 7 +++++++ support-pkg-google-gadgets-qt/PKGBUILD | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 53494abd7..a24dbed1a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,9 @@ hdr build.sh clean-builddir.sh clean-workdir.sh +copy.sh makepkg +move.sh pkgrels-decrease.sh pkgrels-increase.sh pkgrels-reset.sh @@ -24,6 +26,11 @@ sync-complete.sh sync-down.sh sync-up-nodb.sh sync-up.sh +remove.sh +recreate-database.sh +upload.sh +upload-nodb.sh +unlock-database.sh *-cfg.conf *-makepkg.conf diff --git a/support-pkg-google-gadgets-qt/PKGBUILD b/support-pkg-google-gadgets-qt/PKGBUILD index 391d5f4e0..a0358c900 100644 --- a/support-pkg-google-gadgets-qt/PKGBUILD +++ b/support-pkg-google-gadgets-qt/PKGBUILD @@ -16,15 +16,14 @@ _origname=google-gadgets-qt pkgname=${_origname} pkgver=0.11.2 -pkgrel=1 +pkgrel=3 pkgdesc="Desktop Widgets (engine) from Google" arch=(i686 x86_64) url="http://code.google.com/p/google-gadgets-for-linux/" license=('APACHE') -depends=('gstreamer0.10-base-plugins' 'librsvg' 'xulrunner' - "${_qtpkg}>=${_qtver}" 'desktop-file-utils' 'curl' 'spidermonkey') +depends=('gstreamer0.10-base-plugins' 'librsvg' 'xulrunner>=2.0' "${_qtpkg}>=${_qtver}" 'desktop-file-utils' 'curl' 'spidermonkey') makedepends=('zip' 'unzip') -options=('!libtool' '!splitdbg' '!splithdr') +options=('!libtool') conflicts=('google-gadgets-gtk' 'google-gadgets' 'google-gadgets-qt' 'google-gadgets-gtk-svn' 'google-gagdets-qt-svn') replaces=('google-gadgets-qt') install=${_origname}.install @@ -41,7 +40,7 @@ build() { cd "${srcdir}/google-gadgets-for-linux-$pkgver" - ./configure --prefix=${_installprefix} \ + ./configure --prefix=/usr \ --disable-werror \ --disable-update-desktop-database \ --disable-update-mime-database \ @@ -50,6 +49,7 @@ build() --disable-gtk-system-framework \ --disable-gtkmoz-browser-element \ --disable-gtk-flash-element \ + --disable-smjs-script-runtime \ || return 1 make || return 1 From 15f4b5d669f4714f68b3d54d5d97ae1f3b5541f4 Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Sat, 23 Apr 2011 11:03:56 +0000 Subject: [PATCH 16/36] restored splitdbg splithdr options --- support-pkg-google-gadgets-qt/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support-pkg-google-gadgets-qt/PKGBUILD b/support-pkg-google-gadgets-qt/PKGBUILD index a0358c900..3a8d4cd13 100644 --- a/support-pkg-google-gadgets-qt/PKGBUILD +++ b/support-pkg-google-gadgets-qt/PKGBUILD @@ -16,14 +16,14 @@ _origname=google-gadgets-qt pkgname=${_origname} pkgver=0.11.2 -pkgrel=3 +pkgrel=4 pkgdesc="Desktop Widgets (engine) from Google" arch=(i686 x86_64) url="http://code.google.com/p/google-gadgets-for-linux/" license=('APACHE') depends=('gstreamer0.10-base-plugins' 'librsvg' 'xulrunner>=2.0' "${_qtpkg}>=${_qtver}" 'desktop-file-utils' 'curl' 'spidermonkey') makedepends=('zip' 'unzip') -options=('!libtool') +options=('!libtool' '!splitdbg' '!splithdr') conflicts=('google-gadgets-gtk' 'google-gadgets' 'google-gadgets-qt' 'google-gadgets-gtk-svn' 'google-gagdets-qt-svn') replaces=('google-gadgets-qt') install=${_origname}.install From c0579b6bfa11d48a9a0717b4c65174aaaa8687dd Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 24 Apr 2011 15:20:47 +0000 Subject: [PATCH 17/36] Rebuild Koffice against new libwpd and libwpg --- koffice/PKGBUILD | 17 +- koffice/kde4-koffice-libwpg02.patch | 1323 +++++++++++++++++++++++++++ 2 files changed, 1334 insertions(+), 6 deletions(-) create mode 100644 koffice/kde4-koffice-libwpg02.patch diff --git a/koffice/PKGBUILD b/koffice/PKGBUILD index 0e464e6e4..a264875cd 100644 --- a/koffice/PKGBUILD +++ b/koffice/PKGBUILD @@ -22,7 +22,7 @@ pkgname=('koffice-common' 'koffice-doc') pkgver=2.3.3 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -32,16 +32,21 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'eigen' 'lcms' 'lcms2' \ 'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'libwpg' 'openexr' \ 'kdegraphics-common' 'sqlite3' 'libpqxx' 'create-resources' 'freetds' 'docbook-xsl') # 'opengtl' groups=('koffice') -source=("ftp://ftp.kde.org/pub/kde/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099') +source=("ftp://ftp.kde.org/pub/kde/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" + "kde4-koffice-libwpg02.patch") +sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' + '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612') + options=('docs' '!splithdr' 'splitdbg' 'log') build() { - cd ${srcdir} + cd "${srcdir}/${pkgbase}-${pkgver}" - #patch -Np1 -i "${srcdir}/kde4-koffice-libwpg02.patch" + patch -Np1 -i "${srcdir}/kde4-koffice-libwpg02.patch" - mkdir -p build + cd "${srcdir}" + + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/koffice/kde4-koffice-libwpg02.patch b/koffice/kde4-koffice-libwpg02.patch new file mode 100644 index 000000000..e2a55a216 --- /dev/null +++ b/koffice/kde4-koffice-libwpg02.patch @@ -0,0 +1,1323 @@ +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt +--- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt 2011-01-18 07:40:25.000000000 +0100 +@@ -1,16 +1,11 @@ + +- + include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/) + +-set(wpgimport_PART_SRCS +-WPGImport.cpp +-OdgExporter.cxx +-FileOutputHandler.cxx +-GraphicsElement.cxx) ++set(wpgimport_PART_SRCS WPGImport.cpp) + + kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS}) + +-target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES}) ++target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES}) + + install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx +--- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,95 +0,0 @@ +-/* libwpg +- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#include "FileOutputHandler.hxx" +- +-FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) : +- mbIsTagOpened(false), +- mContentStream(contentStream) +-{ +-} +- +-void FileOutputHandler::startDocument() +-{ +-} +- +-void FileOutputHandler::startElement(const char *psName, const std::vector > &xPropList) +-{ +- if (mbIsTagOpened) +- { +- mContentStream << ">"; +- mbIsTagOpened = false; +- } +- mContentStream << "<" << psName; +- +- for (std::vector >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++) +- { +- mContentStream << " " << (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\""; +- } +- mbIsTagOpened = true; +- msOpenedTagName = psName; +-} +- +-void FileOutputHandler::endElement(const char *psName) +-{ +- if (mbIsTagOpened) +- { +- if( msOpenedTagName == psName ) +- { +- mContentStream << "/>"; +- mbIsTagOpened = false; +- } +- else // should not happen, but handle it +- { +- mContentStream << ">"; +- mContentStream << ""; +- mbIsTagOpened = false; +- } +- } +- else +- { +- mContentStream << ""; +- mbIsTagOpened = false; +- } +-} +- +-void FileOutputHandler::characters(const std::string &sCharacters) +-{ +- if (mbIsTagOpened) +- { +- mContentStream << ">"; +- mbIsTagOpened = false; +- } +- mContentStream << sCharacters.c_str(); +-} +- +-void FileOutputHandler::endDocument() +-{ +- if (mbIsTagOpened) +- { +- mContentStream << ">"; +- mbIsTagOpened = false; +- } +-} +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx +--- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,49 +0,0 @@ +-/* libwpg +- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#ifndef FILEOUTPUTHANDLER_H +-#define FILEOUTPUTHANDLER_H +- +-#include +-#include +-#include +-#include "GraphicsHandler.hxx" +- +-class FileOutputHandler : public GraphicsHandler +-{ +- public: +- explicit FileOutputHandler(std::ostringstream &contentStream); +- virtual void startDocument(); +- virtual void endDocument(); +- virtual void startElement(const char *psName, const std::vector > &xPropList); +- virtual void endElement(const char *psName); +- virtual void characters(const std::string &sCharacters); +- +- private: +- bool mbIsTagOpened; +- std::string msOpenedTagName; +- std::ostringstream &mContentStream; +-}; +-#endif +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx +--- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,66 +0,0 @@ +-/* GraphicsElement: The items we are collecting to be put into the Writer +- * document: paragraph and spans of text, as well as section breaks. +- * +- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- * +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#include "GraphicsElement.hxx" +-#include "GraphicsHandler.hxx" +-#include +- +-#define ASCII_SPACE 0x0020 +- +-void TagGraphicsElement::print() const +-{ +-} +- +-void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const +-{ +- pHandler->startElement(getTagName().c_str(), maAttrList); +-} +- +-void OpenTagGraphicsElement::print() const +-{ +- TagGraphicsElement::print(); +-} +- +-void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue) +-{ +- std::pair tmpAttribute; +- tmpAttribute.first = szAttributeName; +- tmpAttribute.second = sAttributeValue; +- maAttrList.push_back(tmpAttribute); +-} +- +-void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const +-{ +- +- pHandler->endElement(getTagName().c_str()); +-} +- +-void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const +-{ +- pHandler->characters(msData); +-} +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx +--- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,84 +0,0 @@ +-/* GraphicsElement: The items we are collecting to be put into the Writer +- * document: paragraph and spans of text, as well as section breaks. +- * +- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpd.sourceforge.net +- * +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#ifndef _GRAPHICSELEMENT_H +-#define _GRAPHICSELEMENT_H +-#include +-#include +-#include +- +-#include "GraphicsHandler.hxx" +- +-class GraphicsElement +-{ +-public: +- virtual ~GraphicsElement() {} +- virtual void write(GraphicsHandler *pHandler) const = 0; +- virtual void print() const {} +-}; +- +-class TagGraphicsElement : public GraphicsElement +-{ +-public: +- explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {} +- const std::string &getTagName() const { return msTagName; } +- virtual void print() const; +-private: +- const std::string msTagName; +-}; +- +-class OpenTagGraphicsElement : public TagGraphicsElement +-{ +-public: +- explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} +- ~OpenTagGraphicsElement() {} +- void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue); +- virtual void write(GraphicsHandler *pHandler) const; +- virtual void print () const; +-private: +- std::vector > maAttrList; +-}; +- +-class CloseTagGraphicsElement : public TagGraphicsElement +-{ +-public: +- explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} +- virtual void write(GraphicsHandler *pHandler) const; +-}; +- +-class CharDataGraphicsElement : public GraphicsElement +-{ +-public: +- CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {} +- virtual void write(GraphicsHandler *pHandler) const; +-private: +- std::string msData; +-}; +- +- +-#endif +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx +--- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,43 +0,0 @@ +-/* +- * Copyright (C) 2004 William Lachance (wlach@interlog.com) +- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; either version 2 +- * of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * Contributor(s): Martin Gallwey (gallwey@sun.com) +- * +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +-#ifndef _GRAPHICSHANDLER_H +-#define _GRAPHICSHANDLER_H +-#include +-#include +-#include +- +-class GraphicsHandler +-{ +-public: +- virtual ~GraphicsHandler() {} +- virtual void startDocument() = 0; +- virtual void endDocument() = 0; +- virtual void startElement(const char *psName, const std::vector< std::pair > &xPropList) = 0; +- virtual void endElement(const char *psName) = 0; +- virtual void characters(const std::string &sCharacters) = 0; +-}; +-#endif +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx +--- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,662 +0,0 @@ +-/* libwpg +- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) +- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#include "OdgExporter.hxx" +-#include "GraphicsElement.hxx" +-#include "GraphicsHandler.hxx" +-#include +- +-static std::string doubleToString(const double value) +-{ +- std::ostringstream tempStream; +- tempStream << value; +- std::string decimalPoint(localeconv()->decimal_point); +- if ((decimalPoint.size() == 0) || (decimalPoint == ".")) +- return tempStream.str(); +- std::string stringValue(tempStream.str()); +- if (!stringValue.empty()) +- { +- std::string::size_type pos; +- while ((pos = stringValue.find(decimalPoint)) != std::string::npos) +- stringValue.replace(pos,decimalPoint.size(),"."); +- } +- return stringValue; +-} +- +- +-OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML): +- mpHandler(pHandler), +- m_fillRule(AlternatingFill), +- m_gradientIndex(1), +- m_dashIndex(1), +- m_styleIndex(1), +- m_width(0.0f), +- m_height(0.0f), +- m_isFlatXML(isFlatXML) +-{ +-} +- +-OdgExporter::~OdgExporter() +-{ +- for (std::vector ::iterator iterStroke = mStrokeDashElements.begin(); +- iterStroke != mStrokeDashElements.end(); iterStroke++) +- delete (*iterStroke); +- +- for (std::vector ::iterator iterGradient = mGradientElements.begin(); +- iterGradient != mGradientElements.end(); iterGradient++) +- delete (*iterGradient); +- +- for (std::vector ::iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); +- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) +- delete (*iterAutomaticStyles); +- +- for (std::vector::iterator bodyIter = mBodyElements.begin(); +- bodyIter != mBodyElements.end(); bodyIter++) +- delete (*bodyIter); +-} +- +-void OdgExporter::startGraphics(double width, double height) +-{ +- m_gradientIndex = 1; +- m_dashIndex = 1; +- m_styleIndex = 1; +- m_width = width; +- m_height = height; +- +- +- mpHandler->startDocument(); +- OpenTagGraphicsElement tmpOfficeDocumentContent("office:document"); +- tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); +- tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office"); +- tmpOfficeDocumentContent.addAttribute("office:version", "1.0"); +- if (m_isFlatXML) +- tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing"); +- tmpOfficeDocumentContent.write(mpHandler); +- +- OpenTagGraphicsElement("office:settings").write(mpHandler); +- +- OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set"); +- configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings"); +- configItemSetOpenElement.write(mpHandler); +- +- OpenTagGraphicsElement configItemOpenElement1("config:config-item"); +- configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop"); +- configItemOpenElement1.addAttribute("config:type", "int"); +- configItemOpenElement1.write(mpHandler); +- mpHandler->characters("0"); +- mpHandler->endElement("config:config-item"); +- +- OpenTagGraphicsElement configItemOpenElement2("config:config-item"); +- configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft"); +- configItemOpenElement2.addAttribute("config:type", "int"); +- configItemOpenElement2.write(mpHandler); +- mpHandler->characters("0"); +- mpHandler->endElement("config:config-item"); +- +- OpenTagGraphicsElement configItemOpenElement3("config:config-item"); +- configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth"); +- configItemOpenElement3.addAttribute("config:type", "int"); +- configItemOpenElement3.write(mpHandler); +- m_value.str(""); +- m_value << (unsigned)(2540 * width); +- mpHandler->characters(m_value.str()); +- mpHandler->endElement("config:config-item"); +- +- OpenTagGraphicsElement configItemOpenElement4("config:config-item"); +- configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight"); +- configItemOpenElement4.addAttribute("config:type", "int"); +- configItemOpenElement4.write(mpHandler); +- m_value.str(""); +- m_value << (unsigned)(2540 * height); +- mpHandler->characters(m_value.str()); +- mpHandler->endElement("config:config-item"); +- +- mpHandler->endElement("config:config-item-set"); +- +- mpHandler->endElement("office:settings"); +- +-} +- +-void OdgExporter::endGraphics() +-{ +- OpenTagGraphicsElement("office:styles").write(mpHandler); +- +- for (std::vector ::const_iterator iterStroke = mStrokeDashElements.begin(); +- iterStroke != mStrokeDashElements.end(); iterStroke++) +- (*iterStroke)->write(mpHandler); +- +- for (std::vector ::const_iterator iterGradient = mGradientElements.begin(); +- iterGradient != mGradientElements.end(); iterGradient++) +- (*iterGradient)->write(mpHandler); +- +- mpHandler->endElement("office:styles"); +- +- OpenTagGraphicsElement("office:automatic-styles").write(mpHandler); +- +- for (std::vector ::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); +- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) +- (*iterAutomaticStyles)->write(mpHandler); +- +- OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout"); +- tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0"); +- tmpStylePageLayoutOpenElement.write(mpHandler); +- +- OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties"); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in"); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in"); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in"); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in"); +- m_value.str(""); +- m_value << doubleToString(m_width) << "in"; +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(m_height) << "in"; +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str()); +- m_value.str(""); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait"); +- tmpStylePageLayoutPropertiesOpenElement.write(mpHandler); +- +- mpHandler->endElement("style:page-layout-properties"); +- +- mpHandler->endElement("style:page-layout"); +- +- OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style"); +- tmpStyleStyleOpenElement.addAttribute("style:name", "dp1"); +- tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page"); +- tmpStyleStyleOpenElement.write(mpHandler); +- +- OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties"); +- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border"); +- tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none"); +- tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler); +- +- mpHandler->endElement("style:drawing-page-properties"); +- +- mpHandler->endElement("style:style"); +- +- mpHandler->endElement("office:automatic-styles"); +- +- OpenTagGraphicsElement("office:master-styles").write(mpHandler); +- +- OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page"); +- tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default"); +- tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0"); +- tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1"); +- tmpStyleMasterPageOpenElement.write(mpHandler); +- +- mpHandler->endElement("style:master-page"); +- +- mpHandler->endElement("office:master-styles"); +- +- OpenTagGraphicsElement("office:body").write(mpHandler); +- +- OpenTagGraphicsElement("office:drawing").write(mpHandler); +- +- OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page"); +- tmpDrawPageOpenElement.addAttribute("draw:name", "page1"); +- tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1"); +- tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default"); +- tmpDrawPageOpenElement.write(mpHandler); +- +- for (std::vector::const_iterator bodyIter = mBodyElements.begin(); +- bodyIter != mBodyElements.end(); bodyIter++) +- { +- (*bodyIter)->write(mpHandler); +- } +- +- mpHandler->endElement("draw:page"); +- mpHandler->endElement("office:drawing"); +- mpHandler->endElement("office:body"); +- mpHandler->endElement("office:document"); +- +- mpHandler->endDocument(); +-} +- +-void OdgExporter::setPen(const libwpg::WPGPen& pen) +-{ +- m_pen = pen; +-} +- +-void OdgExporter::setBrush(const libwpg::WPGBrush& brush) +-{ +- m_brush = brush; +-} +- +-void OdgExporter::setFillRule(FillRule rule) +-{ +- m_fillRule = rule; +-} +- +-void OdgExporter::startLayer(unsigned int) +-{ +-} +- +-void OdgExporter::endLayer(unsigned int) +-{ +-} +- +-void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double ) +-{ +- writeStyle(); +- OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect"); +- m_value.str(""); +- m_value << "gr" << m_styleIndex-1; +- pDrawRectElement->addAttribute("draw:style-name", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rect.x1) << "in"; +- pDrawRectElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rect.y1) << "in"; +- pDrawRectElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rect.x2-rect.x1) << "in"; +- pDrawRectElement->addAttribute("svg:width", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rect.y2-rect.y1) << "in"; +- pDrawRectElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rx) << "in"; +- // FIXME: what to do when rx != ry ? +- pDrawRectElement->addAttribute("draw:corner-radius", m_value.str()); +- m_value.str(""); +- mBodyElements.push_back(static_cast(pDrawRectElement)); +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("draw:rect"))); +-} +- +-void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry) +-{ +- writeStyle(); +- OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse"); +- m_value.str(""); +- m_value << "gr" << m_styleIndex-1; +- pDrawEllipseElement->addAttribute("draw:style-name", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(center.x - rx) << "in"; +- pDrawEllipseElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(center.y - ry) << "in"; +- pDrawEllipseElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(2 * rx) << "in"; +- pDrawEllipseElement->addAttribute("svg:width", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(2 * ry) << "in"; +- pDrawEllipseElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- mBodyElements.push_back(static_cast(pDrawEllipseElement)); +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("draw:ellipse"))); +-} +- +-void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices) +-{ +- if(vertices.count() < 2) +- return; +- +- if(vertices.count() == 2) +- { +- const libwpg::WPGPoint& p1 = vertices[0]; +- const libwpg::WPGPoint& p2 = vertices[1]; +- +- writeStyle(); +- OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line"); +- m_value.str(""); +- m_value << "gr" << m_styleIndex-1; +- pDrawLineElement->addAttribute("draw:style-name", m_value.str()); +- m_value.str(""); +- pDrawLineElement->addAttribute("draw:text-style-name", "P1"); +- pDrawLineElement->addAttribute("draw:layer", "layout"); +- m_value << doubleToString(p1.x) << "in"; +- pDrawLineElement->addAttribute("svg:x1", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(p1.y) << "in"; +- pDrawLineElement->addAttribute("svg:y1", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(p2.x) << "in"; +- pDrawLineElement->addAttribute("svg:x2", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(p2.y) << "in"; +- pDrawLineElement->addAttribute("svg:y2", m_value.str()); +- m_value.str(""); +- mBodyElements.push_back(static_cast(pDrawLineElement)); +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("draw:line"))); +- } +- else +- { +- // draw as path +- libwpg::WPGPath path; +- path.moveTo(vertices[0]); +- for(unsigned long ii = 1; ii < vertices.count(); ii++) +- path.lineTo(vertices[ii]); +- path.closed = true; +- drawPath(path); +- } +-} +- +-void OdgExporter::drawPath(const libwpg::WPGPath& path) +-{ +- if(path.count() == 0) +- return; +- +- // try to find the bounding box +- // this is simple convex hull technique, the bounding box might not be +- // accurate but that should be enough for this purpose +- libwpg::WPGPoint p = path.element(0).point; +- libwpg::WPGPoint q = path.element(0).point; +- for(unsigned k = 0; k < path.count(); k++) +- { +- libwpg::WPGPathElement element = path.element(k); +- p.x = (p.x > element.point.x) ? element.point.x : p.x; +- p.y = (p.y > element.point.y) ? element.point.y : p.y; +- q.x = (q.x < element.point.x) ? element.point.x : q.x; +- q.y = (q.y < element.point.y) ? element.point.y : q.y; +- if(element.type == libwpg::WPGPathElement::CurveToElement) +- { +- p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x; +- p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y; +- q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x; +- q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y; +- p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x; +- p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y; +- q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x; +- q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y; +- } +- } +- double vw = q.x - p.x; +- double vh = q.y - p.y; +- +- writeStyle(); +- +- OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path"); +- m_value.str(""); +- m_value << "gr" << m_styleIndex-1; +- pDrawPathElement->addAttribute("draw:style-name", m_value.str()); +- m_value.str(""); +- pDrawPathElement->addAttribute("draw:text-style-name", "P1"); +- pDrawPathElement->addAttribute("draw:layer", "layout"); +- m_value << doubleToString(p.x) << "in"; +- pDrawPathElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(p.y) << "in"; +- pDrawPathElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(vw) << "in"; +- pDrawPathElement->addAttribute("svg:width", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(vh) << "in"; +- pDrawPathElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540); +- pDrawPathElement->addAttribute("svg:viewBox", m_value.str()); +- m_value.str(""); +- +- for(unsigned i = 0; i < path.count(); i++) +- { +- libwpg::WPGPathElement element = path.element(i); +- libwpg::WPGPoint point = element.point; +- switch(element.type) +- { +- // 2540 is 2.54*1000, 2.54 in = 1 in +- case libwpg::WPGPathElement::MoveToElement: +- m_value << "M" << (int)((point.x-p.x)*2540) << " "; +- m_value << (int)((point.y-p.y)*2540); +- break; +- +- case libwpg::WPGPathElement::LineToElement: +- m_value << "L" << (int)((point.x-p.x)*2540) << " "; +- m_value << (int)((point.y-p.y)*2540); +- break; +- +- case libwpg::WPGPathElement::CurveToElement: +- m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " "; +- m_value << (int)((element.extra1.y-p.y)*2540) << " "; +- m_value << (int)((element.extra2.x-p.x)*2540) << " "; +- m_value << (int)((element.extra2.y-p.y)*2540) << " "; +- m_value << (int)((point.x-p.x)*2540) << " "; +- m_value << (int)((point.y-p.y)*2540); +- break; +- +- default: +- break; +- } +- } +- if(path.closed) +- m_value << " Z"; +- pDrawPathElement->addAttribute("svg:d", m_value.str()); +- m_value.str(""); +- mBodyElements.push_back(static_cast(pDrawPathElement)); +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("draw:path"))); +-} +- +- +-void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap) +-{ +- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); +- m_value.str(""); +- m_value << doubleToString(bitmap.rect.x1) << "in"; +- pDrawFrameElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(bitmap.rect.y1) << "in"; +- pDrawFrameElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(bitmap.rect.height()) << "in"; +- pDrawFrameElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(bitmap.rect.width()) << "in"; +- pDrawFrameElement->addAttribute("svg:width", m_value.str()); +- mBodyElements.push_back(static_cast(pDrawFrameElement)); +- +- mBodyElements.push_back(static_cast(new OpenTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast(new OpenTagGraphicsElement("office:binary-data"))); +- +- libwpg::WPGString base64Binary; +- bitmap.generateBase64DIB(base64Binary); +- mBodyElements.push_back(static_cast(new CharDataGraphicsElement(base64Binary.cstr()))); +- +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("office:binary-data"))); +- +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("draw:frame"))); +-} +- +-void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData) +-{ +- if (binaryData.mimeType.length() <= 0) +- return; +- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); +- m_value.str(""); +- m_value << doubleToString(binaryData.rect.x1) << "in"; +- pDrawFrameElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(binaryData.rect.y1) << "in"; +- pDrawFrameElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(binaryData.rect.height()) << "in"; +- pDrawFrameElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(binaryData.rect.width()) << "in"; +- pDrawFrameElement->addAttribute("svg:width", m_value.str()); +- mBodyElements.push_back(static_cast(pDrawFrameElement)); +- +- mBodyElements.push_back(static_cast(new OpenTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast(new OpenTagGraphicsElement("office:binary-data"))); +- +- libwpg::WPGString base64Binary = binaryData.getBase64Data(); +- mBodyElements.push_back(static_cast(new CharDataGraphicsElement(base64Binary.cstr()))); +- +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("office:binary-data"))); +- +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast(new CloseTagGraphicsElement("draw:frame"))); +-} +- +- +-static std::string colorToHex(const libwpg::WPGColor& color) +-{ +- char hexdigits[] = "0123456789abcdef"; +- char buffer[] = "123456"; +- buffer[0] = hexdigits[(color.red >> 4) & 15]; +- buffer[1] = hexdigits[color.red & 15]; +- buffer[2] = hexdigits[(color.green >> 4) & 15]; +- buffer[3] = hexdigits[color.green & 15]; +- buffer[4] = hexdigits[(color.blue >> 4) & 15]; +- buffer[5] = hexdigits[color.blue & 15]; +- return std::string(buffer); +-} +- +-void OdgExporter::writeStyle() +-{ +- m_value.str(""); +- m_name.str(""); +- +- if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) ) +- { +- // ODG only supports dashes with the same length of spaces inbetween +- // here we take the first space and assume everything else the same +- // note that dash length is written in percentage +- double distance = m_pen.dashArray.at(1); +- OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash"); +- tmpDrawStrokeDashElement->addAttribute("draw:style", "rect"); +- m_value << "Dash_" << m_dashIndex++; +- tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(distance*100) << "%"; +- tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str()); +- m_value.str(""); +- for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++) +- { +- m_name << "draw:dots" << i+1; +- tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1"); +- m_name.str(""); +- m_name << "draw:dots" << i+1 << "-length"; +- m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%"; +- tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str()); +- m_name.str(""); +- m_value.str(""); +- } +- mStrokeDashElements.push_back(static_cast(tmpDrawStrokeDashElement)); +- mStrokeDashElements.push_back(static_cast(new CloseTagGraphicsElement("draw:stroke-dash"))); +- } +- +- if(m_brush.style == libwpg::WPGBrush::Gradient) +- { +- OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient"); +- tmpDrawGradientElement->addAttribute("draw:style", "linear"); +- m_value << "Gradient_" << m_gradientIndex++; +- tmpDrawGradientElement->addAttribute("draw:name", m_value.str()); +- m_value.str(""); +- +- // ODG angle unit is 0.1 degree +- double angle = -m_brush.gradient.angle(); +- while(angle < 0) +- angle += 360; +- while(angle > 360) +- angle -= 360; +- +- m_value << (unsigned)(angle*10); +- tmpDrawGradientElement->addAttribute("draw:angle", m_value.str()); +- m_value.str(""); +- +- libwpg::WPGColor startColor = m_brush.gradient.stopColor(0); +- libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1); +- m_value << "#" << colorToHex(startColor); +- tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str()); +- m_value.str(""); +- m_value << "#" << colorToHex(stopColor); +- tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str()); +- m_value.str(""); +- tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%"); +- tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%"); +- tmpDrawGradientElement->addAttribute("draw:border", "0%"); +- mGradientElements.push_back(static_cast(tmpDrawGradientElement)); +- mGradientElements.push_back(static_cast(new CloseTagGraphicsElement("draw:gradient"))); +- } +- +- OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style"); +- m_value << "gr" << m_styleIndex; +- tmpStyleStyleElement->addAttribute("style:name", m_value.str()); +- m_value.str(""); +- tmpStyleStyleElement->addAttribute("style:family", "graphic"); +- tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard"); +- mAutomaticStylesElements.push_back(static_cast(tmpStyleStyleElement)); +- +- OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties"); +- +- if(m_pen.width > 0.0) +- { +- m_value << doubleToString(m_pen.width) << "in"; +- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str()); +- m_value.str(""); +- m_value << "#" << colorToHex(m_pen.foreColor); +- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str()); +- m_value.str(""); +- +- if(!m_pen.solid) +- { +- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash"); +- m_value << "Dash_" << m_dashIndex-1; +- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str()); +- m_value.str(""); +- } +- } +- else +- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none"); +- +- if(m_brush.style == libwpg::WPGBrush::NoBrush) +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none"); +- +- if(m_brush.style == libwpg::WPGBrush::Solid) +- { +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid"); +- m_value << "#" << colorToHex(m_brush.foreColor); +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str()); +- m_value.str(""); +- } +- +- if(m_brush.style == libwpg::WPGBrush::Gradient) +- { +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient"); +- m_value << "Gradient_" << m_gradientIndex-1; +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str()); +- m_value.str(""); +- } +- +- mAutomaticStylesElements.push_back(static_cast(tmpStyleGraphicPropertiesElement)); +- mAutomaticStylesElements.push_back(static_cast(new CloseTagGraphicsElement("style:graphic-properties"))); +- +- mAutomaticStylesElements.push_back(static_cast(new CloseTagGraphicsElement("style:style"))); +- m_styleIndex++; +-} +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx +--- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,116 +0,0 @@ +-/* libwpg +- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#ifndef __ODGEXPORTER_H__ +-#define __ODGEXPORTER_H__ +- +-#include +-#include +-#include +- +-#include +-#include "GraphicsElement.hxx" +- +-class OdgExporter : public libwpg::WPGPaintInterface { +-public: +- explicit OdgExporter(GraphicsHandler *pHandler, +- const bool isFlatXML = false); +- ~OdgExporter(); +- +-#if LIBWPG_VERSION_MINOR<2 +- void startGraphics(double imageWidth, double imageHeight); +- void endGraphics(); +- void startLayer(unsigned int id); +- void endLayer(unsigned int id); +- +- void setPen(const libwpg::WPGPen& pen); +- void setBrush(const libwpg::WPGBrush& brush); +- void setFillRule(FillRule rule); +- +- void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry); +- void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry); +- void drawPolygon(const libwpg::WPGPointArray& vertices); +- void drawPath(const libwpg::WPGPath& path); +- void drawBitmap(const libwpg::WPGBitmap& bitmap); +- void drawImageObject(const libwpg::WPGBinaryData& binaryData); +- +-private: +- std::vector mBodyElements; +- std::vector mAutomaticStylesElements; +- std::vector mStrokeDashElements; +- std::vector mGradientElements; +- GraphicsHandler *mpHandler; +- +- libwpg::WPGPen m_pen; +- libwpg::WPGBrush m_brush; +- FillRule m_fillRule; +- int m_gradientIndex; +- int m_dashIndex; +- int m_styleIndex; +- void writeStyle(); +- std::ostringstream m_value, m_name; +- double m_width, m_height; +- const bool m_isFlatXML; +-#else +- virtual void startGraphics(const ::WPXPropertyList &propList); +- virtual void endGraphics(); +- virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient); +- virtual void startLayer(const ::WPXPropertyList &propList); +- virtual void endLayer(); +- virtual void drawRectangle(const ::WPXPropertyList& propList); +- virtual void drawEllipse(const ::WPXPropertyList& propList); +- virtual void drawPolygon(const ::WPXPropertyListVector &vertices); +- virtual void drawPath(const ::WPXPropertyListVector &path); +- virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData); +- virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList); +- virtual void endEmbeddedGraphics(); +- virtual void drawPolyline(const ::WPXPropertyListVector &vertices); +- virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path); +- virtual void endTextObject(); +- virtual void startTextLine(const ::WPXPropertyList &propList); +- virtual void endTextLine(); +- virtual void startTextSpan(const ::WPXPropertyList &propList); +- virtual void endTextSpan(); +- virtual void insertText(const ::WPXString &str); +- +- +-private: +- std::vector mBodyElements; +- std::vector mAutomaticStylesElements; +- std::vector mStrokeDashElements; +- std::vector mGradientElements; +- GraphicsHandler *mpHandler; +- +- int m_gradientIndex; +- int m_dashIndex; +- int m_styleIndex; +- void writeStyle(); +- std::ostringstream m_value, m_name; +- double m_width, m_height; +- const bool m_isFlatXML; +-#endif +-}; +- +-#endif // __ODGEXPORTER_H__ +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp +--- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp 2011-01-02 17:46:15.000000000 +0100 +@@ -20,28 +20,26 @@ + #include + #include + +-#include +-#include +-#include +- +-#include + #include + #include + #include ++#include ++ + #include ++#include + +-#include ++ ++#include ++#include + + #include + #if LIBWPG_VERSION_MINOR<2 + #include + #else + #include ++#include + #endif + +-#include "FileOutputHandler.hxx" +-#include "OdgExporter.hxx" +- + #include + + K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin();) +@@ -56,35 +54,13 @@ + { + } + +-static QByteArray createManifest() +-{ +- KoXmlWriter* manifestWriter; +- QByteArray manifestData; +- QBuffer manifestBuffer(&manifestData); +- +- manifestBuffer.open(QIODevice::WriteOnly); +- manifestWriter = new KoXmlWriter(&manifestBuffer); +- +- manifestWriter->startDocument("manifest:manifest"); +- manifestWriter->startElement("manifest:manifest"); +- manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0"); +- manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics"); +- //manifestWriter->addManifestEntry( "styles.xml", "text/xml" ); +- manifestWriter->addManifestEntry("content.xml", "text/xml"); +- manifestWriter->endElement(); +- manifestWriter->endDocument(); +- delete manifestWriter; +- +- return manifestData; +-} +- + + KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to) + { + if (from != "application/x-wpg") + return KoFilter::NotImplemented; + +- if (to != "application/vnd.oasis.opendocument.graphics") ++ if (to != "image/svg+xml") + return KoFilter::NotImplemented; + + #if LIBWPG_VERSION_MINOR<2 +@@ -96,6 +72,7 @@ + input = olestream; + } + } ++ libwpg::WPGString output; + #else + WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit()); + if (input->isOLEStream()) { +@@ -105,59 +82,31 @@ + input = olestream; + } + } ++ ::WPXString output; + #endif + + if (!libwpg::WPGraphics::isSupported(input)) { +- std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl; ++ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!"; + delete input; + return KoFilter::NotImplemented; + } + +- // do the conversion +- std::ostringstream tmpStringStream; +- FileOutputHandler tmpHandler(tmpStringStream); +- OdgExporter exporter(&tmpHandler); +- libwpg::WPGraphics::parse(input, &exporter); +- delete input; +- +- +- // create output store +- KoStore* storeout; +- storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write, +- "application/vnd.oasis.opendocument.graphics", KoStore::Zip); +- +- if (!storeout) { +- kWarning() << "Couldn't open the requested file."; +- return KoFilter::FileNotFound; +- } +- +-#if 0 +- if (!storeout->open("styles.xml")) { +- kWarning() << "Couldn't open the file 'styles.xml'."; +- return KoFilter::CreationError; ++ if (!libwpg::WPGraphics::generateSVG(input, output)) { ++ kWarning() << "ERROR: SVG Generation failed!"; ++ delete input; ++ return KoFilter::ParsingError; + } +- //storeout->write( createStyles() ); +- storeout->close(); +-#endif + +- if (!storeout->open("content.xml")) { +- kWarning() << "Couldn't open the file 'content.xml'."; +- return KoFilter::CreationError; +- } +- storeout->write(tmpStringStream.str().c_str()); +- storeout->close(); ++ delete input; + +- // store document manifest +- storeout->enterDirectory("META-INF"); +- if (!storeout->open("manifest.xml")) { +- kWarning() << "Couldn't open the file 'META-INF/manifest.xml'."; +- return KoFilter::CreationError; ++ QFile outputFile(m_chain->outputFile()); ++ if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) { ++ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile(); ++ return KoFilter::InternalError; + } +- storeout->write(createManifest()); +- storeout->close(); + +- // we are done! +- delete storeout; ++ outputFile.write(output.cstr()); ++ outputFile.close(); + + return KoFilter::OK; + } + From 605df807bfa362898b915d857517509531beb092 Mon Sep 17 00:00:00 2001 From: Fabien Valthier Date: Tue, 26 Apr 2011 01:55:36 +0200 Subject: [PATCH 18/36] backport gluon 0.71 from stable --- support-pkg-gluon-git/PKGBUILD | 17 ++++++++++------- support-pkg-gluon-git/gluon.install | 8 ++++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/support-pkg-gluon-git/PKGBUILD b/support-pkg-gluon-git/PKGBUILD index 50cba8824..d02cf4fca 100644 --- a/support-pkg-gluon-git/PKGBUILD +++ b/support-pkg-gluon-git/PKGBUILD @@ -8,28 +8,31 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=gluon -pkgver=0.70.0 -pkgrel=2 +pkgver=0.71.0 +_pkgver=0.71 +pkgrel=4 pkgdesc="A high-level game development library for the KDE desktop enviornment." arch=('i686' 'x86_64') url="http://gluon.gamingfreedom.org/" license=('GPL') -depends=('glew' 'kdelibs' 'libsndfile' 'openal') +depends=('glew' 'kdelibs' 'libsndfile' 'openal' 'alure') makedepends=('git' 'eigen' 'cmake' 'automoc4') provides=('gluon') conflicts=('gluon') groups=("kde-uninstall" "kde-support") -source=("http://gluon.gamingfreedom.org/sites/default/files/gluon-$pkgver.tar.gz") -md5sums=('3f5b6eae22a5c4f41e574b5ef5c66a8e') # gluon-0.70.0.tar.gz +source=("http://download.kde.org/download.php?url=unstable/$pkgname/$_pkgver/src/$pkgname-$pkgver.tar.gz") +md5sums=('e4f284c0ae00e5b8a58cc3e6201857fe') install=gluon.install build() { msg "Starting make..." - cd "$srcdir/$pkgname-$pkgname" + cd "$srcdir/$pkgname-$pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/$pkgname-$pkgname" + mkdir build && cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_PHYSICS_COMPONENTS=ON -DBUILD_PHYSICS_ASSETS=ON .. make || return 1 make DESTDIR="$pkgdir/" install } diff --git a/support-pkg-gluon-git/gluon.install b/support-pkg-gluon-git/gluon.install index e70c054ec..6ff172ff9 100644 --- a/support-pkg-gluon-git/gluon.install +++ b/support-pkg-gluon-git/gluon.install @@ -1,5 +1,7 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null } post_upgrade() { @@ -7,5 +9,7 @@ post_upgrade() { } post_remove() { - post_install + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null } From 28d6a69ca5e337571cdeabf428fbacac3ad6ba77 Mon Sep 17 00:00:00 2001 From: abveritas Date: Tue, 26 Apr 2011 16:48:36 +0000 Subject: [PATCH 19/36] rebuild gluon, to correct pkrel version in testing, new glew --- support-pkg-gluon-git/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support-pkg-gluon-git/PKGBUILD b/support-pkg-gluon-git/PKGBUILD index d02cf4fca..c82b059ed 100644 --- a/support-pkg-gluon-git/PKGBUILD +++ b/support-pkg-gluon-git/PKGBUILD @@ -10,7 +10,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=gluon pkgver=0.71.0 _pkgver=0.71 -pkgrel=4 +pkgrel=5 pkgdesc="A high-level game development library for the KDE desktop enviornment." arch=('i686' 'x86_64') url="http://gluon.gamingfreedom.org/" From 3b6647acecca21fd888d1816c11dc94077f30cd8 Mon Sep 17 00:00:00 2001 From: abveritas Date: Thu, 28 Apr 2011 01:10:22 +0000 Subject: [PATCH 20/36] libktorrent update, appset-qt not starting correct yet --- support-pkg-libktorrent/PKGBUILD | 6 +++--- tools-pkg-appset-qt/PKGBUILD | 21 +++++++++++---------- tools-pkg-appset-qt/appset-qt.install | 9 +++++++++ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/support-pkg-libktorrent/PKGBUILD b/support-pkg-libktorrent/PKGBUILD index db60678e4..61e083bb5 100644 --- a/support-pkg-libktorrent/PKGBUILD +++ b/support-pkg-libktorrent/PKGBUILD @@ -5,9 +5,9 @@ # maintainer (x86_64): Manuel Tortosa pkgname=libktorrent -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 -ktorver=4.1.0 +ktorver=4.1.1 pkgdesc="A BitTorrent program for KDE" arch=('i686' 'x86_64') url="http://ktorrent.org" @@ -16,7 +16,7 @@ depends=('kdelibs') makedepends=('autoconf' 'perl' 'automoc4' 'cmake' 'kdepimlibs' 'kdebase-workspace') source=(http://ktorrent.org/downloads/${ktorver}/libktorrent-${pkgver}.tar.bz2) options=('libtool') -md5sums=('76d3e58bbf2e4df7e97421e06ebf8fb8') +md5sums=('96de8dd6d6cea4255ce946bb4cd69836') build() { cd ${srcdir} diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index e478b0997..a72d08521 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -3,8 +3,8 @@ # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626 pkgname=appset-qt -pkgver=0.4.2 -pkgrel=2 +pkgver=0.4.3 +pkgrel=1 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') url="http://appset.sourceforge.net/" @@ -14,25 +14,25 @@ optdepends=('ccr: For Community Repository support') install=${pkgname}.install source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz - http://chakra-project.org/sources/$pkgname/$pkgname-0.4.2-chakra.patch + $pkgname/$pkgname-0.4.3-chakra.patch #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz + #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz ) -md5sums=(672dc9475c94baf614dd12922782c522 +md5sums=(ad4d2811b5c0b756e0b79139c9332a60 87f5f278e3fe67ed2cd6165c2835d81b - eb097d3ceeae3d05eefc0a5717ced010 + 0781a4f583b645d1be29689822f568b0 #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz #275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz #033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz #676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz - 53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz + #53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz ) build() { @@ -41,12 +41,12 @@ build() { cp -v ../*png Qt/AppSet-Qt # patch it for Chakra GNU/Linux - patch -Np1 -i ${startdir}/src/$pkgname-0.4.2-chakra.patch + patch -Np1 -i ${startdir}/src/$pkgname-0.4.3-chakra.patch # add chakra translations (check upstream) #patch -Np1 -i ${startdir}/src/add-spanish.patch - cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt - cp -v ../appset-qt*.ts Qt/AppSet-Qt + #cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt + #cp -v ../appset-qt*.ts Qt/AppSet-Qt # check for updated strings cd Qt/AppSet-Qt @@ -73,3 +73,4 @@ package() { install -m 755 -d "$pkgdir/etc/rc.d" || return 1 install -m 755 "$srcdir/$pkgname-$pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper" } + diff --git a/tools-pkg-appset-qt/appset-qt.install b/tools-pkg-appset-qt/appset-qt.install index d76686bfe..c513a1d38 100644 --- a/tools-pkg-appset-qt/appset-qt.install +++ b/tools-pkg-appset-qt/appset-qt.install @@ -1,9 +1,17 @@ whisperer(){ + echo "----------------------------------------------------------------" + echo "Don't forget that this is an alpha release of AppSet-Qt." + echo "You can test it but it is not recommended for use every day" echo "----------------------------------------------------------------" echo "AppSet is in your desktop menu under Applications->System" echo "To launch AppSet from shell run 'appset-launch.sh' as normal" echo "user. To launch the tray type appsettray-qt as normal user." echo "----------------------------------------------------------------" + echo "----------------------------------------------------------------" + echo "IMPORTANT!: NOW YOU NEED TO REBOOT YOUR COMPUTER TO MAKE APPSET" + echo "WORKING CORRECTLY" + echo "----------------------------------------------------------------" + echo "----------------------------------------------------------------" } mr_daemon(){ @@ -27,3 +35,4 @@ post_upgrade(){ post_remove(){ sed -i '/^DAEMONS/{s/ appset-helper)$/)/}' /etc/rc.conf } + From 7897c3ff752e3d478ce3163682ac8e5c8d8fde66 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 30 Apr 2011 01:08:04 +0000 Subject: [PATCH 21/36] Prepare kde 4.6.3 --- kde-sc.md5 | 145 ++++++++++++++++++------------------- kdebase-workspace/PKGBUILD | 2 +- kdebase/PKGBUILD | 2 +- kdebindings/PKGBUILD | 2 +- kdegraphics/PKGBUILD | 2 +- kdenetwork/PKGBUILD | 2 +- 6 files changed, 77 insertions(+), 78 deletions(-) diff --git a/kde-sc.md5 b/kde-sc.md5 index 9a4392f32..36d4231f2 100644 --- a/kde-sc.md5 +++ b/kde-sc.md5 @@ -1,73 +1,72 @@ -c5eea7caa763bdd2a4c695eed2413006 kdeaccessibility-4.6.2.tar.bz2 -f7011751bf9e8b33f6c2f7ed0de01a88 kdeadmin-4.6.2.tar.bz2 -43ddb06238120efc29614d8268dc4dff kdeartwork-4.6.2.tar.bz2 -80b02b96deb1057a7eff5ec691765110 kdebase-4.6.2.tar.bz2 -541029e6a62a8cecade97fb8106d17a8 kdebase-runtime-4.6.2.tar.bz2 -c544190b7f145df58f0e0bad5b46e0b3 kdebase-workspace-4.6.2.tar.bz2 -48f9d1159153224e28e7d97255cbb921 kdebindings-4.6.2.tar.bz2 -282a7fdd582718575e376e033ec8a049 kdeedu-4.6.2.tar.bz2 -56f676e7bdb4475ea9ff9b08c443e919 kdegames-4.6.2.tar.bz2 -3aca3c307b745e7a6f6dd6b137600bdb kdegraphics-4.6.2.tar.bz2 -e6bd12a9701082f12454430c9779b4b8 kde-l10n-ar-4.6.2.tar.bz2 -0743f1164a5f86aff2ce5882fac3f513 kde-l10n-bg-4.6.2.tar.bz2 -b77aa5f347038ec6a0bf22d9ce35a884 kde-l10n-ca-4.6.2.tar.bz2 -0136d5798d45867637b33fb1fdb2e5f5 kde-l10n-ca@valencia-4.6.2.tar.bz2 -e23a88175c0fbf8bd7c9c728907ded5a kde-l10n-cs-4.6.2.tar.bz2 -665c1952c767b882cb102133312d0f60 kde-l10n-da-4.6.2.tar.bz2 -5d45b827275d9bd9588213c9092c9ae0 kde-l10n-de-4.6.2.tar.bz2 -e66b4a7e4fc952bc93c820fee3e9fc5b kde-l10n-el-4.6.2.tar.bz2 -0abb46c540f0392f99325d4d14bb1314 kde-l10n-en_GB-4.6.2.tar.bz2 -36751b8b89b720d914805633b38dd1d8 kde-l10n-es-4.6.2.tar.bz2 -d2d24d1f88d1d93886fcfa508276d5d1 kde-l10n-et-4.6.2.tar.bz2 -60fa3bc214e92dd330f7b6f8b042ed3f kde-l10n-eu-4.6.2.tar.bz2 -5dcd941588632b07aaf566e0788a1884 kde-l10n-fi-4.6.2.tar.bz2 -0fca80598686ba7e0aaeed3f2c1d8680 kde-l10n-fr-4.6.2.tar.bz2 -b569a769bd3f23c6008606175bae85d3 kde-l10n-ga-4.6.2.tar.bz2 -136724fcb34e8f671085f2def9cbba89 kde-l10n-gl-4.6.2.tar.bz2 -53fdce94c526042e1a5d8ffdec783813 kde-l10n-gu-4.6.2.tar.bz2 -35711578a9a3c0f69103e4e2c12d53f2 kde-l10n-he-4.6.2.tar.bz2 -87ef3687e72b2773a9fe60c0602f2484 kde-l10n-hi-4.6.2.tar.bz2 -2a3efa050ac5682bc25f85bcdf7b8cdc kde-l10n-hr-4.6.2.tar.bz2 -f16403e270d06132472c8edf5f9a6a12 kde-l10n-hu-4.6.2.tar.bz2 -6112f2b93cc0405680a646d0b5144f95 kde-l10n-ia-4.6.2.tar.bz2 -dd2e1ea40806ccc80c4b0a4d85497594 kde-l10n-id-4.6.2.tar.bz2 -bb6a596cb19eda100738be4ddc3e0565 kde-l10n-is-4.6.2.tar.bz2 -f5b2770a63cd179f0ebacf459a0fc87a kde-l10n-it-4.6.2.tar.bz2 -fe555c88234be91171db2a02d351872f kde-l10n-ja-4.6.2.tar.bz2 -ee42ed12ec851f27f28fc96051aa9eea kde-l10n-kk-4.6.2.tar.bz2 -4f09440092467b9c1fea14e4b26e92e1 kde-l10n-km-4.6.2.tar.bz2 -9379522de1857f3b3c067064b536db4d kde-l10n-kn-4.6.2.tar.bz2 -aee8f51f1e4ae356b133d1aa226fa32a kde-l10n-ko-4.6.2.tar.bz2 -b1ef49c5cfe8a2133626c2064ab1f32b kde-l10n-lt-4.6.2.tar.bz2 -3f7fb135a725e47e69e666ad368f09fa kde-l10n-lv-4.6.2.tar.bz2 -11530e6568b7eee47629adc210f84517 kde-l10n-mai-4.6.2.tar.bz2 -c666d6125f088ed53fe13d063258a5a1 kde-l10n-nb-4.6.2.tar.bz2 -4e5cdc89446c9cf51522ad46b21d0ca7 kde-l10n-nds-4.6.2.tar.bz2 -d3d1439168d8f68024cb7fcaa383f19e kde-l10n-nl-4.6.2.tar.bz2 -6ab2e60938c1dcafe8043af08ddd4a30 kde-l10n-nn-4.6.2.tar.bz2 -9fdae265f15d0a1b901fe25f460a0221 kde-l10n-pa-4.6.2.tar.bz2 -b648b9b77cfece552ac1116d17eef4fc kde-l10n-pl-4.6.2.tar.bz2 -eb666993b9b4f63c7987c9629ff99eb1 kde-l10n-pt-4.6.2.tar.bz2 -aeca4af4788f2e7e7521ee8043a80ed6 kde-l10n-pt_BR-4.6.2.tar.bz2 -0de87ea137a5ae8a559695ff953cc7be kde-l10n-ro-4.6.2.tar.bz2 -a249e1645f3bcbe5c7bcd68c246bdf4f kde-l10n-ru-4.6.2.tar.bz2 -7bad8e3d8a6c39621e6d8bcc174d8e53 kde-l10n-sk-4.6.2.tar.bz2 -0fb8dca611325b79c73f74c47bcb8265 kde-l10n-sl-4.6.2.tar.bz2 -61f88e1877ff3cdc2ae7d375f1fe4bcd kde-l10n-sr-4.6.2.tar.bz2 -7a72bc8b320e8d10eb5376f99ce3272c kde-l10n-sv-4.6.2.tar.bz2 -d37a6263b87dde08eb7330c33ddd3a95 kde-l10n-th-4.6.2.tar.bz2 -77c142098de145940c5bbbada82fc756 kde-l10n-tr-4.6.2.tar.bz2 -ff8bddce2f4ad8b57ed281ab78add1c1 kde-l10n-uk-4.6.2.tar.bz2 -a800b8e31be14010b690f70add36e02d kde-l10n-wa-4.6.2.tar.bz2 -abc84444c120660f364c95698a67f529 kde-l10n-zh_CN-4.6.2.tar.bz2 -43e19e6eb0bc0f6bdf345e52e5df87f5 kde-l10n-zh_TW-4.6.2.tar.bz2 -7439251b812dc520d4e6ed874036412c kdelibs-4.6.2.tar.bz2 -a6e067136af5a18dc69dc4b591eabe10 kdemultimedia-4.6.2.tar.bz2 -72952749d055f5323df06a6c2a3d3d8b kdenetwork-4.6.2.tar.bz2 -605ed6ca85da2d83605ab500b4b9441a kdepimlibs-4.6.2.tar.bz2 -98f6e080bf0cee39856408de9e531205 kdeplasma-addons-4.6.2.tar.bz2 -2ff1c0b951ea42295343de0c4ebea965 kdesdk-4.6.2.tar.bz2 -c22b64fd89ebb0a0fc53245cf1dad91e kdetoys-4.6.2.tar.bz2 -c3eb6cf124355eb79c68ce403dd740ec kdeutils-4.6.2.tar.bz2 -97ada60c70a73e511a89f83c2287de79 kdewebdev-4.6.2.tar.bz2 -c46e7e51c5dde641f1e4c6bba0f2852f oxygen-icons-4.6.2.tar.bz2 +a29356a9322b9ed61ff369bed5a9a26d kdeaccessibility-4.6.3.tar.bz2 +8ac0a89337a58ddec49be0ca7a4a7534 kdeadmin-4.6.3.tar.bz2 +f45a8ed91c578275056c86f7022695ee kdeartwork-4.6.3.tar.bz2 +4f0627e33bd857beebd92be1065ed83e kdebase-4.6.3.tar.bz2 +a6f294900d73d92cd68ea93aea297ff0 kdebase-runtime-4.6.3.tar.bz2 +1e481727c3a5c2e4b751b9c56bd56583 kdebase-workspace-4.6.3.tar.bz2 +085f6497be800adea167addc09b89ccc kdebindings-4.6.3.tar.bz2 +ace71243cffca5fa9892f0a17dbcc6fc kdeedu-4.6.3.tar.bz2 +d96dd69e7e54c34d9ae18a8db6aee7e3 kdegames-4.6.3.tar.bz2 +26c2eca2d707f9fc69db87c0467e5849 kdegraphics-4.6.3.tar.bz2 +521eb1cc09cc148466610bbeaea4c490 kde-l10n-ar-4.6.3.tar.bz2 +51ba77c47fe5da0b4231c4372301a833 kde-l10n-bg-4.6.3.tar.bz2 +5e95ed75bea716d7dc3f0a24aa834e8b kde-l10n-ca-4.6.3.tar.bz2 +ce9ae8b33a6bc23d36a510dcc3e2de43 kde-l10n-ca@valencia-4.6.3.tar.bz2 +f601f2bfbc855c7c431231b18a5037a6 kde-l10n-cs-4.6.3.tar.bz2 +2c2f38e57dcc5fbb7c812dba4050fb54 kde-l10n-da-4.6.3.tar.bz2 +2e8a58b6660ccdcf4e7415b374f59e2a kde-l10n-de-4.6.3.tar.bz2 +2f450b7ad5d61fa90b7ecac75dece724 kde-l10n-el-4.6.3.tar.bz2 +de1e529ab09c43aee344d11f362e43db kde-l10n-en_GB-4.6.3.tar.bz2 +fb0537d04fd9985a5048b4cb7551eebe kde-l10n-es-4.6.3.tar.bz2 +e0dd4dd166d90740076d5d30211c7d35 kde-l10n-et-4.6.3.tar.bz2 +e9b101f00cd29709e37f876baef6d0c3 kde-l10n-eu-4.6.3.tar.bz2 +a19c739a851bbe9b6dce2288c37a2d71 kde-l10n-fi-4.6.3.tar.bz2 +b46fa84651e0b4a9081f4947170ec60a kde-l10n-fr-4.6.3.tar.bz2 +ec76e99b18f8d27ca9b8df959f1605e7 kde-l10n-ga-4.6.3.tar.bz2 +9f9cc72cf633ed0c5a9b58ee5a0281ca kde-l10n-gl-4.6.3.tar.bz2 +fb532865f497bc133cc91f9b0c98a39a kde-l10n-gu-4.6.3.tar.bz2 +da90b73bfa034c097b8a9fc30053f7a8 kde-l10n-he-4.6.3.tar.bz2 +ace74a0b07d0070cf28bf8adcec233d6 kde-l10n-hi-4.6.3.tar.bz2 +42ec84a3042ae0dae59a326c9d70f029 kde-l10n-hr-4.6.3.tar.bz2 +48628b153b1575c017b80e30a61403b1 kde-l10n-hu-4.6.3.tar.bz2 +a9980e9d8a4e62b830b8e7691c6a3385 kde-l10n-ia-4.6.3.tar.bz2 +2cc1dab0cdc794a409701cfba57879c2 kde-l10n-id-4.6.3.tar.bz2 +fefd6bf0989f7d98eeb0e19fc8d40072 kde-l10n-is-4.6.3.tar.bz2 +89b4ebf8bc08642cac15b43b9f2db1f0 kde-l10n-it-4.6.3.tar.bz2 +2b5c138b4da8485cdbd23840a2c6e1e2 kde-l10n-ja-4.6.3.tar.bz2 +2537b2cdfc138ddf55c0988738368a84 kde-l10n-kk-4.6.3.tar.bz2 +3dc17c22991b26f8caebba79d9364a73 kde-l10n-km-4.6.3.tar.bz2 +1342e8c0bbc969d72fd48e189e16e40c kde-l10n-kn-4.6.3.tar.bz2 +2db2dd6cf706f01b97f8fa789a94f6c8 kde-l10n-ko-4.6.3.tar.bz2 +d66cb3b9afec95f58126800eb02990b0 kde-l10n-lt-4.6.3.tar.bz2 +f973389bcd062bad7d1531c2616779eb kde-l10n-lv-4.6.3.tar.bz2 +68b9d2266eebcd167f81ec5b91469e3d kde-l10n-mai-4.6.3.tar.bz2 +2e1f1b911c1ada5040febc29a4df6198 kde-l10n-nb-4.6.3.tar.bz2 +df0d8d0c68cf8c01ef9b7d096551da49 kde-l10n-nds-4.6.3.tar.bz2 +5e202ffaeaf1d6e45180eb873fbbf20f kde-l10n-nl-4.6.3.tar.bz2 +57d2d45d23e35c8b5093589f2dbd9e0a kde-l10n-nn-4.6.3.tar.bz2 +50c3ce506883642d8efa55a2e9bc1dc1 kde-l10n-pa-4.6.3.tar.bz2 +89057e6e4d0846c752aecabc0386e724 kde-l10n-pl-4.6.3.tar.bz2 +caf1c54964874123e1593eb0a345e1ca kde-l10n-pt-4.6.3.tar.bz2 +fa0df7aeb16c4d454e4c94943c41cbdd kde-l10n-pt_BR-4.6.3.tar.bz2 +66907ed3d8d37afac20aae08e4188a48 kde-l10n-ro-4.6.3.tar.bz2 +59594340a5f9f6a19ca89341533e92e7 kde-l10n-ru-4.6.3.tar.bz2 +86f1a6e190baa2cf4f496c07657fb2fa kde-l10n-sk-4.6.3.tar.bz2 +d6ab0ccd8bc6fcf53c2f7ebedfe85f4a kde-l10n-sl-4.6.3.tar.bz2 +96c1bb81b1fc3cc0f93cd7556e40654e kde-l10n-sr-4.6.3.tar.bz2 +46bdd954e192f96a975947e6b4c88f8a kde-l10n-sv-4.6.3.tar.bz2 +32d2d6e033a3f5f438d5a6990e1e3af5 kde-l10n-th-4.6.3.tar.bz2 +966f3d53c34cbdb42fd8320bc9b8e555 kde-l10n-tr-4.6.3.tar.bz2 +28a503ab78eab59cd19ecabb405db5d7 kde-l10n-uk-4.6.3.tar.bz2 +98680c2c096b26edf17de72252893032 kde-l10n-wa-4.6.3.tar.bz2 +f89c8830eb5813301e1acfa43acea519 kde-l10n-zh_CN-4.6.3.tar.bz2 +81dd406b11ea7e30972269064af47721 kde-l10n-zh_TW-4.6.3.tar.bz2 +923a7e8f89aa504647e14472b24b8c0a kdelibs-4.6.3.tar.bz2 +fcfef0fe2ee4f216831f74efa78b554b kdemultimedia-4.6.3.tar.bz2 +0fd1a35dd3c820d840ca2e11c51b1215 kdenetwork-4.6.3.tar.bz2 +0b0fc8d9fea0a6f26e705460a2865e18 kdepimlibs-4.6.3.tar.bz2 +c4a223067a228688c6b62a6bdd67a022 kdesdk-4.6.3.tar.bz2 +900e1d92cf35ef45eeae9a7796e5fe66 kdetoys-4.6.3.tar.bz2 +0d2911c29300d84db10948d7c196aaac kdeutils-4.6.3.tar.bz2 +1101f7c38b745ba619be6f9665c87ddc kdewebdev-4.6.3.tar.bz2 +3390ae73d1a0c70c121f69b556757fdd oxygen-icons-4.6.3.tar.bz2 diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD index c4a881cbe..69442a0b6 100644 --- a/kdebase-workspace/PKGBUILD +++ b/kdebase-workspace/PKGBUILD @@ -26,7 +26,7 @@ pkgname=('kdebase-workspace' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=3 +pkgrel=1 pkgdesc="split package" url="http://www.kde.org" diff --git a/kdebase/PKGBUILD b/kdebase/PKGBUILD index 8b4723cee..9b6d60cb0 100644 --- a/kdebase/PKGBUILD +++ b/kdebase/PKGBUILD @@ -27,7 +27,7 @@ pkgname=('kdebase' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=4 +pkgrel=1 pkgdesc="split package" url="http://www.kde.org" diff --git a/kdebindings/PKGBUILD b/kdebindings/PKGBUILD index 040d091ce..33363566f 100644 --- a/kdebindings/PKGBUILD +++ b/kdebindings/PKGBUILD @@ -29,7 +29,7 @@ pkgname=('kdebindings-common' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=2 +pkgrel=1 pkgdesc="split package" url="http://www.kde.org" diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD index 1e06019b0..4e3956daa 100644 --- a/kdegraphics/PKGBUILD +++ b/kdegraphics/PKGBUILD @@ -30,7 +30,7 @@ pkgname=('kdegraphics-common' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=2 +pkgrel=1 pkgdesc="split package" url="http://www.kde.org" diff --git a/kdenetwork/PKGBUILD b/kdenetwork/PKGBUILD index ac298fc5f..42909c2ef 100644 --- a/kdenetwork/PKGBUILD +++ b/kdenetwork/PKGBUILD @@ -28,7 +28,7 @@ pkgname=('kdenetwork-common' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=2 +pkgrel=1 pkgdesc="split package" url="http://www.kde.org" From 057c6ee2e956e84fbd672280cb86411e244eb7ff Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 30 Apr 2011 01:22:14 +0000 Subject: [PATCH 22/36] Update kde-common --- kde-common/kde-common.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-common/kde-common.install b/kde-common/kde-common.install index 68df93ee0..461df8bd5 100644 --- a/kde-common/kde-common.install +++ b/kde-common/kde-common.install @@ -3,7 +3,7 @@ # post_install() { echo " " - echo " > KDE Software Compilation 4.6.2" + echo " > KDE Software Compilation 4.6.3" echo " > packaged by the Chakra Project" echo " " echo " Installation Prefix : /usr" From 1bf4bba027672813169f0fadbbb7f1a9aacb101d Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 30 Apr 2011 09:39:53 +0000 Subject: [PATCH 23/36] Add chakra to drkonqui patch --- .../05_add_chakra_to_drkonqui.patch | 26 +++++++++++++++++++ kdebase-runtime/PKGBUILD | 10 +++---- 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 kdebase-runtime/05_add_chakra_to_drkonqui.patch diff --git a/kdebase-runtime/05_add_chakra_to_drkonqui.patch b/kdebase-runtime/05_add_chakra_to_drkonqui.patch new file mode 100644 index 000000000..259e41dcd --- /dev/null +++ b/kdebase-runtime/05_add_chakra_to_drkonqui.patch @@ -0,0 +1,26 @@ +diff --git a/drkonqi/reportassistantpages_bugzilla.cpp b/drkonqi/reportassistantpages_bugzilla.cpp +index b4f8bc2..b282305 100644 +--- a/drkonqi/reportassistantpages_bugzilla.cpp ++++ b/drkonqi/reportassistantpages_bugzilla.cpp +@@ -424,6 +424,8 @@ void BugzillaInformationPage::aboutToShow() + ui.m_distroChooserCombo->addItem(i18nc("@label:listbox KDE distribution method", + "Pardus"), "Pardus Packages"); + ui.m_distroChooserCombo->addItem(i18nc("@label:listbox KDE distribution method", ++ "Chakra"), "Chakra"); ++ ui.m_distroChooserCombo->addItem(i18nc("@label:listbox KDE distribution method", + "Archlinux"), "Archlinux Packages"); + ui.m_distroChooserCombo->addItem(i18nc("@label:listbox KDE distribution method", + "FreeBSD (Ports)"), "FreeBSD Ports"); +diff --git a/drkonqi/systeminformation.cpp b/drkonqi/systeminformation.cpp +index d43094a..6d86d2c 100644 +--- a/drkonqi/systeminformation.cpp ++++ b/drkonqi/systeminformation.cpp +@@ -92,6 +92,8 @@ void SystemInformation::lsbReleaseFinished() + setBugzillaPlatform(QLatin1String("OpenBSD Packages")); + } else if ( m_lsbRelease.contains("solaris",Qt::CaseInsensitive) ) { + setBugzillaPlatform(QLatin1String("Solaris Packages")); ++ } else if ( m_lsbRelease.contains("chakra",Qt::CaseInsensitive) ) { ++ setBugzillaPlatform(QLatin1String("Chakra")); + } else if ( m_lsbRelease.contains("arch",Qt::CaseInsensitive) ) { + setBugzillaPlatform(QLatin1String("Archlinux Packages")); + } else if ( m_lsbRelease.contains("debian",Qt::CaseInsensitive) ) { diff --git a/kdebase-runtime/PKGBUILD b/kdebase-runtime/PKGBUILD index 7f0f6a832..00a23872a 100644 --- a/kdebase-runtime/PKGBUILD +++ b/kdebase-runtime/PKGBUILD @@ -43,15 +43,16 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2 # 01_knetattach_use_sftp.patch # 02_oxygenify_knetattach_icon.patch 03_disable_logout_sound.patch - 04_disable_nepomuk_popups.patch) + 04_disable_nepomuk_popups.patch + 05_add_chakra_to_drkonqui.patch) md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` '68cd8eb57db22c2f2ed554b721253bc2' # branding.svgz # '45fa12b8baf21c4fc845147afcea2bc1' # 01_knetattach_use_sftp.patch # '1f0225f31d5f44e753e966fd3a032f00' # 02_oxygenify_knetattach_icon.patch 'a434bf282ee391b2f857184be59a3b6f' # 03_disable_logout_sound.patch - 'a3c844d7bbd9a31f39b1b877ae521340') # 04_disable_nepomuk_popups.patch - + 'a3c844d7bbd9a31f39b1b877ae521340' # 04_disable_nepomuk_popups.patch + '63082e4f07e5840ae7ff3b42c015d72b') # 05_add_chakra_to_drkonqui.patch # @@ -72,10 +73,9 @@ build() fi msg "applying main patchset ..." - #patch -Np1 -i ${srcdir}/01_knetattach_use_sftp.patch || return 1 - #patch -Np1 -i ${srcdir}/02_oxygenify_knetattach_icon.patch || return 1 patch -Np1 -i ${srcdir}/03_disable_logout_sound.patch || return 1 patch -Np1 -i ${srcdir}/04_disable_nepomuk_popups.patch || return 1 + patch -Np1 -i ${srcdir}/05_add_chakra_to_drkonqui.patch || return 1 # copy our branding stuff cp -f ${srcdir}/branding.svgz ${srcdir}/${_origname}-${pkgver}/desktoptheme/oxygen/widgets/ From 48162d0144ae73eb1bf523c322bf8024b0e5e937 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 30 Apr 2011 14:24:58 +0000 Subject: [PATCH 24/36] Remove upstream patches --- kdebase-workspace/PKGBUILD | 17 ++++++++--------- kdegraphics/PKGBUILD | 2 +- kdegraphics/fix-kruler-docs.diff | 9 --------- kdegraphics/fix-ksnapshot-docs.diff | 9 --------- 4 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 kdegraphics/fix-kruler-docs.diff delete mode 100644 kdegraphics/fix-ksnapshot-docs.diff diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD index 69442a0b6..f8f9f0a81 100644 --- a/kdebase-workspace/PKGBUILD +++ b/kdebase-workspace/PKGBUILD @@ -41,8 +41,7 @@ depends=('polkit-kde-agent' "kdepimlibs>=${_kdever}" "kdebase-runtime>=${_kdever makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' "kdebindings-python>=${_kdever}" "kdebindings-ruby>=${_kdever}" 'oxygen-icons' 'qedje' "kdebase-runtime>=${_kdever}" 'gpsd' 'samba' - 'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl') -# 'google-gadgets-qt>=0.11.2') + 'libraw1394' 'libdmtx' 'consolekit' 'docbook-xsl' 'google-gadgets-qt>=0.11.2') source=($_mirror/${_origname}-$_kdever.tar.bz2 mishaaq-kcm_touchpad-00370b5.tar.gz @@ -96,7 +95,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2 # feature_history-notifications-enable-disable-kde#119207.patch # feature_kdm-plymouth.patch - shutdown-fix.patch +# shutdown-fix.patch sensors-fix.patch ) @@ -134,7 +133,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` # '894815a80f99a9a0dee1adbcda49b161' # feature_battery-tooltip.patch # '9b97ac1b4deb8d0c8ca7afffb80b4320' # feature_history-notifications-enable-disable-kde#119207.patch # '42b3b5e09372c57910c3435e63e2dfd6' # feature_kdm-plymouth.patch - 'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch +# 'c542f58979cf9cb2299dd42f63e6fd72' # shutdown-fix.patch 'ecf3a9d6af9bdd3db0189e06ddf21034' # sensors-fix.patch ) @@ -172,8 +171,8 @@ build() patch -Np0 -i ${srcdir}/fix_terminate-server.patch # patch -Np1 -i ${srcdir}/fix_ck-shutdown.patch patch -p0 -N -i ${srcdir}/fix_kdm_configdef.patch - patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch - patch -Np1 -i ${srcdir}/shutdown-fix.patch + patch -Np1 -i ${srcdir}/fix_root-only-kcms.patch +# patch -Np1 -i ${srcdir}/shutdown-fix.patch # FIXME: update feature patches # msg "applying feature patches ..." @@ -183,8 +182,8 @@ build() # patch -Np1 -i ${srcdir}/feature_history-notifications-enable-disable-kde#119207.patch # patch -Np1 -i ${srcdir}/feature_kdm-plymouth.patch - msg "applying upstream patches ..." - patch -Np1 -i ${srcdir}/sensors-fix.patch +# msg "applying upstream patches ..." +# patch -Np1 -i ${srcdir}/sensors-fix.patch msg "starting workspace build ..." @@ -241,7 +240,7 @@ package_kdebase-workspace() optdepends=("kdebindings-python : Python Support for Plasma" "kdeedu-marble : Marble Wallpaper Plugin" -# "google-gadgets-qt : Plasma Support for Google Gadgets" + "google-gadgets-qt : Plasma Support for Google Gadgets" "qedje : Plasma Support for Edje Files" "gpsd : Plasma geolocation support" "(open)ntp : Time/Date sync support") diff --git a/kdegraphics/PKGBUILD b/kdegraphics/PKGBUILD index 4e3956daa..71a3282cc 100644 --- a/kdegraphics/PKGBUILD +++ b/kdegraphics/PKGBUILD @@ -147,7 +147,7 @@ package_kdegraphics-kamera() make DESTDIR=${pkgdir} install || return 1 done - # Fix duplicated docs in 4.6.2 + # Fix duplicated docs in 4.6.3 sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/common sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.cache.bz2 sudo rm -rf ${pkgdir}/usr/share/doc/kde/html/en/kcontrol/kamera/index.docbook diff --git a/kdegraphics/fix-kruler-docs.diff b/kdegraphics/fix-kruler-docs.diff deleted file mode 100644 index 66bfd05a2..000000000 --- a/kdegraphics/fix-kruler-docs.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- src/kdegraphics-4.6.2/kruler/doc/CMakeLists.txt 2011-04-01 21:38:16.000000000 +0200 -+++ Desenvolupament/CMakeLists.txt 2011-04-03 02:00:59.073215641 +0200 -@@ -1,4 +1,4 @@ - ########### install files ############### - # - # --kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) -+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kruler) -\ No newline at end of file diff --git a/kdegraphics/fix-ksnapshot-docs.diff b/kdegraphics/fix-ksnapshot-docs.diff deleted file mode 100644 index c60fa2088..000000000 --- a/kdegraphics/fix-ksnapshot-docs.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- src/kdegraphics-4.6.2/ksnapshot/doc/CMakeLists.txt 2011-04-01 21:38:15.000000000 +0200 -+++ Desenvolupament/CMakeLists.txt 2011-04-03 02:03:59.134359450 +0200 -@@ -1,4 +1,4 @@ - ########### install files ############### - # - # --kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) -+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR ksnapshot) -\ No newline at end of file From 72655d09fba60a9532473f2ffef6ab2bbd203f65 Mon Sep 17 00:00:00 2001 From: Manuel Date: Thu, 5 May 2011 17:47:27 +0000 Subject: [PATCH 25/36] Temporal fix for kdeedu --- kdeedu/PKGBUILD | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kdeedu/PKGBUILD b/kdeedu/PKGBUILD index c5c96620d..012d930df 100644 --- a/kdeedu/PKGBUILD +++ b/kdeedu/PKGBUILD @@ -55,8 +55,10 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio' " "kdebase-runtime>=${_kdever}" 'openbabel' 'libqalculate' 'gsl' 'boost' 'indilib' 'r>=2.11.1' 'libspectre' 'python' 'xplanet' 'docbook-xml' 'avogadro') -source=($_mirror/${_origname}-$_kdever.tar.bz2) -md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`) +#source=($_mirror/${_origname}-$_kdever.tar.bz2) +source=($_mirror/${_origname}-4.6.2.tar.bz2) +# md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`) +md5sums=('282a7fdd582718575e376e033ec8a049') # @@ -64,6 +66,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`) # build() { + mv -fv ${srcdir}/${_origname}-4.6.2 ${srcdir}/${_origname}-${pkgver} cd ${srcdir}/${_origname}-${pkgver} # parallel build breaks kalzium From 6818f8cda06fac32dc95a2372b00e0088ebed1bc Mon Sep 17 00:00:00 2001 From: philm Date: Thu, 5 May 2011 19:48:49 +0000 Subject: [PATCH 26/36] appset-qt: update to 0.4.4 --- kde-sc.md5 | 2 +- kdeedu/PKGBUILD | 2 +- kdesdk/PKGBUILD | 2 +- tools-pkg-appset-qt/PKGBUILD | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kde-sc.md5 b/kde-sc.md5 index 36d4231f2..b519fafcf 100644 --- a/kde-sc.md5 +++ b/kde-sc.md5 @@ -5,7 +5,7 @@ f45a8ed91c578275056c86f7022695ee kdeartwork-4.6.3.tar.bz2 a6f294900d73d92cd68ea93aea297ff0 kdebase-runtime-4.6.3.tar.bz2 1e481727c3a5c2e4b751b9c56bd56583 kdebase-workspace-4.6.3.tar.bz2 085f6497be800adea167addc09b89ccc kdebindings-4.6.3.tar.bz2 -ace71243cffca5fa9892f0a17dbcc6fc kdeedu-4.6.3.tar.bz2 +cff3b32b151df8991b23eb871389cd88 kdeedu-4.6.3.tar.bz2 d96dd69e7e54c34d9ae18a8db6aee7e3 kdegames-4.6.3.tar.bz2 26c2eca2d707f9fc69db87c0467e5849 kdegraphics-4.6.3.tar.bz2 521eb1cc09cc148466610bbeaea4c490 kde-l10n-ar-4.6.3.tar.bz2 diff --git a/kdeedu/PKGBUILD b/kdeedu/PKGBUILD index 012d930df..731e59118 100644 --- a/kdeedu/PKGBUILD +++ b/kdeedu/PKGBUILD @@ -56,7 +56,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio' " 'libspectre' 'python' 'xplanet' 'docbook-xml' 'avogadro') #source=($_mirror/${_origname}-$_kdever.tar.bz2) -source=($_mirror/${_origname}-4.6.2.tar.bz2) +source=("ftp://ftp.gwdg.de/pub/x11/kde/stable/4.6.2/src/${_origname}-4.6.2.tar.bz2") # md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`) md5sums=('282a7fdd582718575e376e033ec8a049') diff --git a/kdesdk/PKGBUILD b/kdesdk/PKGBUILD index 026cab44c..e5d9f6a41 100644 --- a/kdesdk/PKGBUILD +++ b/kdesdk/PKGBUILD @@ -49,7 +49,7 @@ license=('GPL' 'LGPL' 'FDL') options=('docs' '!splithdr' 'splitdbg' 'log') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' "kdebase-runtime>=${_kdever}" 'antlr2' - "kdepimlibs>=${_kdever}" 'subversion' "kdebindings-python>=${_kdever}") # "kdepim-runtime>=${_kdever}" + "kdepimlibs>=${_kdever}" 'subversion' "kdebindings-python>=${_kdever}" "openjdk6") # "kdepim-runtime>=${_kdever}" source=("$_mirror/${_origname}-$_kdever.tar.bz2" 'fix-antlr2-executable.patch') diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index a72d08521..84ada049f 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -3,7 +3,7 @@ # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626 pkgname=appset-qt -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=1 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('ccr: For Community Repository support') install=${pkgname}.install source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz - $pkgname/$pkgname-0.4.3-chakra.patch + $pkgname/$pkgname-0.4.4-chakra.patch #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz @@ -23,9 +23,9 @@ source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgn #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz ) -md5sums=(ad4d2811b5c0b756e0b79139c9332a60 +md5sums=(ed10d700994a6c38d8eafcf442d90360 87f5f278e3fe67ed2cd6165c2835d81b - 0781a4f583b645d1be29689822f568b0 + 1bc3d8e5ea4301ad60011075eaf786f4 #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz #275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz @@ -41,7 +41,7 @@ build() { cp -v ../*png Qt/AppSet-Qt # patch it for Chakra GNU/Linux - patch -Np1 -i ${startdir}/src/$pkgname-0.4.3-chakra.patch + patch -Np1 -i ${startdir}/src/$pkgname-0.4.4-chakra.patch # add chakra translations (check upstream) #patch -Np1 -i ${startdir}/src/add-spanish.patch From af1da1545a92b63ddb62074a9ff2aaae56933085 Mon Sep 17 00:00:00 2001 From: abveritas Date: Fri, 6 May 2011 04:07:38 +0000 Subject: [PATCH 27/36] koffice rebuild for krita exiv2 --- koffice/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koffice/PKGBUILD b/koffice/PKGBUILD index a264875cd..89b1c0cc6 100644 --- a/koffice/PKGBUILD +++ b/koffice/PKGBUILD @@ -22,7 +22,7 @@ pkgname=('koffice-common' 'koffice-doc') pkgver=2.3.3 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') From 932fad5cf4645aabb8cfecb63ab4d234cf18819b Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 6 May 2011 22:11:46 +0000 Subject: [PATCH 28/36] New tarballs --- kde-sc.md5 | 4 +++- kdeedu/PKGBUILD | 10 +++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kde-sc.md5 b/kde-sc.md5 index 36d4231f2..5a4403f01 100644 --- a/kde-sc.md5 +++ b/kde-sc.md5 @@ -5,7 +5,6 @@ f45a8ed91c578275056c86f7022695ee kdeartwork-4.6.3.tar.bz2 a6f294900d73d92cd68ea93aea297ff0 kdebase-runtime-4.6.3.tar.bz2 1e481727c3a5c2e4b751b9c56bd56583 kdebase-workspace-4.6.3.tar.bz2 085f6497be800adea167addc09b89ccc kdebindings-4.6.3.tar.bz2 -ace71243cffca5fa9892f0a17dbcc6fc kdeedu-4.6.3.tar.bz2 d96dd69e7e54c34d9ae18a8db6aee7e3 kdegames-4.6.3.tar.bz2 26c2eca2d707f9fc69db87c0467e5849 kdegraphics-4.6.3.tar.bz2 521eb1cc09cc148466610bbeaea4c490 kde-l10n-ar-4.6.3.tar.bz2 @@ -70,3 +69,6 @@ c4a223067a228688c6b62a6bdd67a022 kdesdk-4.6.3.tar.bz2 0d2911c29300d84db10948d7c196aaac kdeutils-4.6.3.tar.bz2 1101f7c38b745ba619be6f9665c87ddc kdewebdev-4.6.3.tar.bz2 3390ae73d1a0c70c121f69b556757fdd oxygen-icons-4.6.3.tar.bz2 +259ba3e733fecd145c4389f10bee5ad1 kdeedu-4.6.3.tar.bz2 +f3033dc62fcc1988dec6a38796cb929d kdeplasma-addons-4.6.3.tar.bz2 + diff --git a/kdeedu/PKGBUILD b/kdeedu/PKGBUILD index 012d930df..ec9f20ba2 100644 --- a/kdeedu/PKGBUILD +++ b/kdeedu/PKGBUILD @@ -43,7 +43,7 @@ pkgname=('kdeedu-common' arch=('i686' 'x86_64') pkgver=${_kdever} -pkgrel=1 +pkgrel=2 pkgdesc="split package" url="http://www.kde.org" @@ -55,18 +55,14 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio' " "kdebase-runtime>=${_kdever}" 'openbabel' 'libqalculate' 'gsl' 'boost' 'indilib' 'r>=2.11.1' 'libspectre' 'python' 'xplanet' 'docbook-xml' 'avogadro') -#source=($_mirror/${_origname}-$_kdever.tar.bz2) -source=($_mirror/${_origname}-4.6.2.tar.bz2) -# md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`) -md5sums=('282a7fdd582718575e376e033ec8a049') - +source=($_mirror/${_origname}-$_kdever.tar.bz2) +md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`) # # build function # build() { - mv -fv ${srcdir}/${_origname}-4.6.2 ${srcdir}/${_origname}-${pkgver} cd ${srcdir}/${_origname}-${pkgver} # parallel build breaks kalzium From 1577ed9ad09812c4fe956d9bad39307305737ee1 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 8 May 2011 10:34:18 +0000 Subject: [PATCH 29/36] =?UTF-8?q?New=20libcanberra=20for=20=C3=83pulse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- support-pkg-libcanberra/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/support-pkg-libcanberra/PKGBUILD b/support-pkg-libcanberra/PKGBUILD index b4580c63f..7ff965172 100644 --- a/support-pkg-libcanberra/PKGBUILD +++ b/support-pkg-libcanberra/PKGBUILD @@ -6,9 +6,9 @@ pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) -pkgver=0.26 -pkgrel=2 -pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification without gtk support" +pkgver=0.28 +pkgrel=1 +pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64) license=('LGPL') depends=('libvorbis>=1.3.1' 'libtool' 'alsa-lib>=1.0.23' 'tdb>=1.2.1') @@ -16,13 +16,13 @@ makedepends=('libpulse' 'gstreamer0.10>=0.10.30') options=(!emptydirs) url=http://0pointer.de/lennart/projects/libcanberra source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) -md5sums=('ee2c66ada7c851a4e7b6eb1682285a24') +md5sums=('c198b4811598c4c161ff505e4531b02c') build() { cd "${srcdir}/${pkgbase}-${pkgver}" ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ --disable-static --with-builtin=dso --enable-null --disable-oss \ - --enable-alsa --enable-gstreamer --enable-pulse --disable-gtk + --enable-alsa --enable-gstreamer --enable-pulse --disable-gtk make } @@ -63,4 +63,4 @@ package_libcanberra-gstreamer() { mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" -} \ No newline at end of file +} From ef53337b1fd923d206740187bb03263198ecd2dc Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 8 May 2011 19:11:34 +0000 Subject: [PATCH 30/36] Revert icons to tarball 4.6.2, some icons for 4.7.0 got released by error in 4.6.3, creating an inconsistent icons theme --- oxygen-icons/PKGBUILD | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/oxygen-icons/PKGBUILD b/oxygen-icons/PKGBUILD index c2b3341f1..dc054b4bd 100644 --- a/oxygen-icons/PKGBUILD +++ b/oxygen-icons/PKGBUILD @@ -23,7 +23,7 @@ pkgname=('oxygen-icons' arch=('any') pkgver=${_kdever} -pkgrel=1 +pkgrel=2 pkgdesc="split package" url="http://www.kde.org" @@ -33,13 +33,15 @@ install=oxygen-icons.install makedepends=('pkgconfig' 'cmake' 'automoc4') -source=($_mirror/${_origname}-$_kdever.tar.bz2 - http://chakra-project.org/source/icons/oxygencolors-addon.tar.gz) -md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` - 'da971d7e2c862a6f77fb310a289f5529') # ../_sources/oxygencolors-addon.tar.gz - - +# source=($_mirror/${_origname}-$_kdever.tar.bz2 +source=("$_mirror/${_origname}-4.6.2.tar.bz2" + "http://chakra-project.org/source/icons/oxygencolors-addon.tar.gz") +#md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` +# 'da971d7e2c862a6f77fb310a289f5529') # ../_sources/oxygencolors-addon.tar.gz + +md5sums=('c46e7e51c5dde641f1e4c6bba0f2852f' + 'da971d7e2c862a6f77fb310a289f5529') # @@ -47,6 +49,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` # build() { + mv -f $srcdir/$_origname-4.6.2 $srcdir/$_origname-$pkgver cd $srcdir/$_origname-$pkgver patch -Np0 -i $startdir/install_svg_icons_too.patch || return 1 From 511fae496170dc591884f52f20b9a39ab60e8290 Mon Sep 17 00:00:00 2001 From: philm Date: Tue, 10 May 2011 09:14:55 +0000 Subject: [PATCH 31/36] tribe: 2011.04_r0 appset: 0.5pre - waiting for translations --- tools-pkg-appset-qt/PKGBUILD | 33 ++++++++++++++++++++------------- tools-pkg-tribe/PKGBUILD | 16 ++++++++-------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index 84ada049f..37095517d 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -3,7 +3,8 @@ # Translators: http://chakra-project.org/bbs/viewtopic.php?pid=29626#p29626 pkgname=appset-qt -pkgver=0.4.4 +pkgver=0.4.99 +_pkgver=0.5.0pre pkgrel=1 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') @@ -12,41 +13,45 @@ license=('GPL2') depends=('qt>=4.7') optdepends=('ccr: For Community Repository support') install=${pkgname}.install -source=(http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz +source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkgname-$pkgver-sources.tar.gz + http://sourceforge.net/projects/appset/files/appset-qt/0.5/0.5.0/$pkgname-$_pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz - $pkgname/$pkgname-0.4.4-chakra.patch + http://chakra-project.org/sources/$pkgname/$pkgname-0.4.99-chakra.patch #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz - #http://chakra-project.org/sources/$pkgname/appset-qt_de-0.4.1.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.4.4.tar.gz ) -md5sums=(ed10d700994a6c38d8eafcf442d90360 +md5sums=(fe36bcbe31602fab843e7b0676c5196e 87f5f278e3fe67ed2cd6165c2835d81b - 1bc3d8e5ea4301ad60011075eaf786f4 + f193b069c8ac4d392d0d1b6c9ca3469f #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz - #275ce0fe7db802558340c5c234a66249 # appset-qt_de-0.4.1.tar.gz + 6a0f0a7af86b518853533d046cdba069 # appset-qt_de-0.5.0.tar.gz #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz #033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz #676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz #53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz + 03faf18f8994cd406607d5ab6b0f2f16 # appset-qt_zh-tw-0.4.4.tar.gz ) build() { - cd $srcdir/$pkgname-$pkgver-sources + #cd $srcdir/$pkgname-$pkgver-sources + cd $srcdir/$pkgname-$_pkgver-sources # copy oxygen icons cp -v ../*png Qt/AppSet-Qt # patch it for Chakra GNU/Linux - patch -Np1 -i ${startdir}/src/$pkgname-0.4.4-chakra.patch + patch -Np1 -i ${startdir}/src/$pkgname-0.4.99-chakra.patch # add chakra translations (check upstream) #patch -Np1 -i ${startdir}/src/add-spanish.patch - #cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt - #cp -v ../appset-qt*.ts Qt/AppSet-Qt + cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt + cp -v ../appset-qt*.ts Qt/AppSet-Qt # check for updated strings cd Qt/AppSet-Qt @@ -65,12 +70,14 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver-sources + #cd $srcdir/$pkgname-$pkgver-sources + cd $srcdir/$pkgname-$_pkgver-sources make INSTALL_ROOT="$pkgdir/" install #helper daemon install -m 755 -d "$pkgdir/etc/rc.d" || return 1 - install -m 755 "$srcdir/$pkgname-$pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper" + #install -m 755 "$srcdir/$pkgname-$pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper" + install -m 755 "$srcdir/$pkgname-$_pkgver-sources/AppSetHelper/appset-helper.sh" "$pkgdir/etc/rc.d/appset-helper" } diff --git a/tools-pkg-tribe/PKGBUILD b/tools-pkg-tribe/PKGBUILD index e85f0488c..7e7d7e468 100644 --- a/tools-pkg-tribe/PKGBUILD +++ b/tools-pkg-tribe/PKGBUILD @@ -8,25 +8,25 @@ # package info # pkgname=tribe -pkgver=2011.04_ms6 -pkgrel=4 +pkgver=2011.04_r0 +pkgrel=1 _codename=Aida pkgdesc="Tribe - Chakra LiveCD Installer" url="http://git.chakra-project.org/chakra/" license="GPL" arch=('i686' 'x86_64') -depends=('kdelibs' 'kdeedu-marble>=4.6.2' 'squashfs-tools' 'partitionmanager>=1216949-4' +depends=('kdelibs' 'kdeedu-marble>=4.6.3' 'squashfs-tools' 'partitionmanager>=1216949-4' 'cinstall>=0.4.5' 'rsync' 'mkinitcpio-nfs-utils' 'ntfsprogs') -makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.2' 'kdebase-workspace' 'automoc4') +makedepends=('cmake' 'kdelibs' 'kdeedu-marble>=4.6.3' 'kdebase-workspace' 'automoc4') provides=('tribe') replaces=('kdemod-tribe-svn' 'kdemod-tribe') conflicts=('chakra-tribe' 'tribe-svn' 'kdemod-partitionmanager' 'kdemod-tribe' 'kdemod-tribe-debug' 'kdemod-tribe-partitionmanager') options=('!splithdr' '!splitdbg' 'sign') source=("http://chakra-project.org/sources/tribe/tribe-${pkgver}-${pkgrel}.tar.xz" - "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104MS6.html") + "http://chakra-project.org/sources/tribe/RELEASE_NOTES_201104R0.html") -md5sums=('a9560c8b4b0737d19aa06a967db37eea' - '416c5c801e34113b48055fc24d395cd9') +md5sums=('28f4c2ee7f5a103bb9ab642aa1db87d4' + 'fb75ac0ce37b6ad838f667b415f5a2e0') groups=('kde-uninstall') install=tools-tribe.install @@ -85,7 +85,7 @@ package() cd "${srcdir}/$pkgname" msg "Make successful, installing..." make DESTDIR=$startdir/pkg install || return 1 - cp -vf ${srcdir}/RELEASE_NOTES_201104MS6.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html + cp -vf ${srcdir}/RELEASE_NOTES_201104R0.html $pkgdir/usr/share/tribe/config/RELEASE_NOTES.html # remove nasty files find $startdir/pkg/ -name ".git" -type d -exec rm -fr {} + From a734d3dd766e8e75b5363355eb618345e4ea2e9d Mon Sep 17 00:00:00 2001 From: philm Date: Tue, 10 May 2011 09:17:40 +0000 Subject: [PATCH 32/36] appset: update install file --- tools-pkg-appset-qt/appset-qt.install | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tools-pkg-appset-qt/appset-qt.install b/tools-pkg-appset-qt/appset-qt.install index c513a1d38..5a7e7b5ad 100644 --- a/tools-pkg-appset-qt/appset-qt.install +++ b/tools-pkg-appset-qt/appset-qt.install @@ -1,17 +1,9 @@ whisperer(){ - echo "----------------------------------------------------------------" - echo "Don't forget that this is an alpha release of AppSet-Qt." - echo "You can test it but it is not recommended for use every day" echo "----------------------------------------------------------------" echo "AppSet is in your desktop menu under Applications->System" echo "To launch AppSet from shell run 'appset-launch.sh' as normal" echo "user. To launch the tray type appsettray-qt as normal user." echo "----------------------------------------------------------------" - echo "----------------------------------------------------------------" - echo "IMPORTANT!: NOW YOU NEED TO REBOOT YOUR COMPUTER TO MAKE APPSET" - echo "WORKING CORRECTLY" - echo "----------------------------------------------------------------" - echo "----------------------------------------------------------------" } mr_daemon(){ @@ -36,3 +28,4 @@ post_remove(){ sed -i '/^DAEMONS/{s/ appset-helper)$/)/}' /etc/rc.conf } + From 15562f2556cb498a5bc5ff069b6b793014c4ff6f Mon Sep 17 00:00:00 2001 From: philm Date: Tue, 10 May 2011 09:53:09 +0000 Subject: [PATCH 33/36] appset: proper PKGBUILD --- tools-pkg-appset-qt/PKGBUILD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index 37095517d..6b296527b 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -17,6 +17,7 @@ source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkg http://sourceforge.net/projects/appset/files/appset-qt/0.5/0.5.0/$pkgname-$_pkgver-sources.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt-oxygen-icons.tar.xz http://chakra-project.org/sources/$pkgname/$pkgname-0.4.99-chakra.patch + http://chakra-project.org/sources/$pkgname/add-chinese-taiwan.patch #http://chakra-project.org/sources/$pkgname/appset-qt_ca-0.4.1.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz @@ -29,6 +30,7 @@ source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkg md5sums=(fe36bcbe31602fab843e7b0676c5196e 87f5f278e3fe67ed2cd6165c2835d81b f193b069c8ac4d392d0d1b6c9ca3469f + 7de9e3d87fb4258174af214b291b5444 # add-chinese-taiwan.patch #8c3833816b9270c175636a7bc7fce544 # appset-qt_ca.0.4.1.tar.gz 6a0f0a7af86b518853533d046cdba069 # appset-qt_de-0.5.0.tar.gz #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz @@ -49,15 +51,15 @@ build() { patch -Np1 -i ${startdir}/src/$pkgname-0.4.99-chakra.patch # add chakra translations (check upstream) - #patch -Np1 -i ${startdir}/src/add-spanish.patch + patch -Np1 -i ${startdir}/src/add-chinese-taiwan.patch cp -v ../appsettray-qt*.ts Qt/AppSetTray-Qt cp -v ../appset-qt*.ts Qt/AppSet-Qt # check for updated strings cd Qt/AppSet-Qt - lupdate *.cpp *.ui *.h -ts appset*-qt_*.ts + lupdate *.cpp *.ui *.h -ts *.ts cd ../AppSetTray-Qt - lupdate *.cpp *.h -ts appsettay*-qt_*.ts + lupdate *.cpp *.h -ts *.ts cd ../.. qmake PREFIX=/usr -Wnone From 7aade90c8a2bcafa3b1003dcc23f38e22b73a605 Mon Sep 17 00:00:00 2001 From: philm Date: Tue, 10 May 2011 10:21:45 +0000 Subject: [PATCH 34/36] appset: update zh-tw --- tools-pkg-appset-qt/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index 6b296527b..a552fd261 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -5,7 +5,7 @@ pkgname=appset-qt pkgver=0.4.99 _pkgver=0.5.0pre -pkgrel=1 +pkgrel=2 pkgdesc="An advanced and feature rich Package Manager Frontend" arch=('i686' 'x86_64') url="http://appset.sourceforge.net/" @@ -25,7 +25,7 @@ source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkg #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz - http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.4.4.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.5.0.tar.gz ) md5sums=(fe36bcbe31602fab843e7b0676c5196e 87f5f278e3fe67ed2cd6165c2835d81b @@ -38,7 +38,7 @@ md5sums=(fe36bcbe31602fab843e7b0676c5196e #676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz #53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz - 03faf18f8994cd406607d5ab6b0f2f16 # appset-qt_zh-tw-0.4.4.tar.gz + d41af698b700efac67dd13d873e6a308 # appset-qt_zh-tw-0.5.0.tar.gz ) build() { From 98a6ca9fa09fe1e515b1c1d957329dd01950cb71 Mon Sep 17 00:00:00 2001 From: philm Date: Tue, 10 May 2011 10:25:58 +0000 Subject: [PATCH 35/36] appset: update fr --- tools-pkg-appset-qt/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index a552fd261..ba9caca43 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -22,7 +22,7 @@ source=(#http://sourceforge.net/projects/appset/files/appset-qt/0.4/$pkgver/$pkg http://chakra-project.org/sources/$pkgname/appset-qt_de-0.5.0.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_el-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_es-0.4.1.tar.gz - #http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.4.1.tar.gz + http://chakra-project.org/sources/$pkgname/appset-qt_fr-0.5.0.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_nl-0.4.1.tar.gz #http://chakra-project.org/sources/$pkgname/appset-qt_pl-0.4.2.tar.gz http://chakra-project.org/sources/$pkgname/appset-qt_zh-tw-0.5.0.tar.gz @@ -35,7 +35,7 @@ md5sums=(fe36bcbe31602fab843e7b0676c5196e 6a0f0a7af86b518853533d046cdba069 # appset-qt_de-0.5.0.tar.gz #b9ffe714c1c1d76a9df7f0784c9e62d5 # appset-qt_el.0.4.1.tar.gz #033278244a74b198f386766abbb9fc50 # appset-qt_es.0.4.1.tar.gz - #676f758716610442b0ef873c1d2974f1 # appset-qt_fr.0.4.1.tar.gz + fa69077be4ac7c409df87ab256c97919 # appset-qt_fr.0.5.0.tar.gz #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz #53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz d41af698b700efac67dd13d873e6a308 # appset-qt_zh-tw-0.5.0.tar.gz From 0e7fa0b5362ee83d13d3b202218961b8dbf17d13 Mon Sep 17 00:00:00 2001 From: philm Date: Tue, 10 May 2011 22:18:51 +0000 Subject: [PATCH 36/36] kneda: new tarball appset: zh-tw - updated string --- tools-pkg-appset-qt/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools-pkg-appset-qt/PKGBUILD b/tools-pkg-appset-qt/PKGBUILD index ba9caca43..7fede6e8e 100644 --- a/tools-pkg-appset-qt/PKGBUILD +++ b/tools-pkg-appset-qt/PKGBUILD @@ -38,7 +38,7 @@ md5sums=(fe36bcbe31602fab843e7b0676c5196e fa69077be4ac7c409df87ab256c97919 # appset-qt_fr.0.5.0.tar.gz #2acb9e2ac0e6d75f3d97148a621a5539 # appset-qt_nl-0.4.1.tar.gz #53efb5cc093a97ebeff33e1d25f05a76 # appset-qt_pl-0.4.2.tar.gz - d41af698b700efac67dd13d873e6a308 # appset-qt_zh-tw-0.5.0.tar.gz + f75199ceb618cb580efcd57b89301f6b # appset-qt_zh-tw-0.5.0.tar.gz ) build() {