diff options
641 files changed, 34459 insertions, 12134 deletions
diff --git a/community-staging/cclive/PKGBUILD b/community-staging/cclive/PKGBUILD deleted file mode 100644 index 8b57f4af2..000000000 --- a/community-staging/cclive/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 47638 2011-05-24 14:28:23Z tdziedzic $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: joyfulgirl@archlinux.us -# Contributor: nathan owe ndowens04 at gmail dot com - -pkgname=cclive -pkgver=0.7.3.1 -pkgrel=3 -pkgdesc='Commandline downloader for popular video websites.' -arch=('i686' 'x86_64') -url='http://cclive.sourceforge.net/' -license=('GPL3') -depends=('boost-libs' 'quvi') -makedepends=('cmake' 'boost') -source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") -md5sums=('de25297e9f34677d4d1920078d9cf254') - -build() { - cd ${pkgname}-${pkgver} - - cmake \ - -DCMAKE_BUILD_TYPE=debug \ - -DCMAKE_INSTALL_PREFIX=/usr -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install -} diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD new file mode 100644 index 000000000..36ec36e3b --- /dev/null +++ b/community-staging/cegui/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 47894 2011-05-26 00:25:26Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com>, +# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> + +pkgname=cegui +pkgver=0.7.5 +pkgrel=3 +pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" +arch=('i686' 'x86_64') +url="http://crayzedsgui.sourceforge.net" +#options=('!libtool') +license=("MIT") +depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') +makedepends=('python2' 'doxygen') +source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) +md5sums=('38c79d1fdfaaa10f481c99a2ac479516') + +build() { + cd $srcdir/CEGUI-${pkgver} + + sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-xerces-c \ + --enable-null-renderer + + make +} + +package() { + cd $srcdir/CEGUI-${pkgver} + + make DESTDIR=${pkgdir} install + + #build docs + cd doc/doxygen && doxygen + cd .. && make DESTDIR=${pkgdir} install-html + + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} + diff --git a/community-staging/clementine/PKGBUILD b/community-staging/clementine/PKGBUILD new file mode 100644 index 000000000..c276ec0d6 --- /dev/null +++ b/community-staging/clementine/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 47879 2011-05-25 20:42:25Z stephane $ +#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > +#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> + +pkgname=clementine +pkgver=0.7.1 +pkgrel=4 +pkgdesc="A music player and library organizer" +url="http://www.clementine-player.org/" +license=('GPL') +arch=('i686' 'x86_64') +depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice') +makedepends=('cmake' 'boost') +optdepends=('gstreamer0.10-base-plugins: for more open formats' + 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' + 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz + clementine-0.7.1-fix-devicekit.patch) +sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142' + 'd595e2746949363680e0d64fe2fb97b524c8d27c') +install=clementine.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch b/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch new file mode 100644 index 000000000..797a2c864 --- /dev/null +++ b/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch @@ -0,0 +1,11 @@ +diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in +--- clementine-0.7.1.ori/src/config.h.in 2011-03-29 12:16:15.000000000 -0700 ++++ clementine-0.7.1/src/config.h.in 2011-05-09 16:00:26.505080057 -0700 +@@ -29,6 +29,7 @@ + #cmakedefine HAVE_STATIC_SQLITE + + #cmakedefine HAVE_DBUS ++#cmakedefine HAVE_DEVICEKIT + #cmakedefine HAVE_GIO + #cmakedefine HAVE_IMOBILEDEVICE + #cmakedefine HAVE_LIBARCHIVE diff --git a/community/skype-call-recorder/skype-call-recorder.install b/community-staging/clementine/clementine.install index e4f8fd06c..2d71a7563 100644 --- a/community/skype-call-recorder/skype-call-recorder.install +++ b/community-staging/clementine/clementine.install @@ -3,11 +3,10 @@ post_install() { } post_upgrade() { - post_install + post_install $1 } + post_remove() { - post_install + post_install $1 } - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/csfml/PKGBUILD b/community-staging/csfml/PKGBUILD new file mode 100644 index 000000000..d0920b18d --- /dev/null +++ b/community-staging/csfml/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 47932 2011-05-26 06:40:32Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=csfml + +_git=true + +if [[ "${_git}" = "true" ]]; then + pkgver=1.99.git20110526 +fi + +pkgrel=1 +pkgdesc='C bindings for sfml' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('sfml') +makedepends=('git' 'cmake' 'doxygen') + +_gitroot='https://github.com/LaurentGomila/SFML.git' +_gitname='SFML' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + cd $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + cd bindings/c/ + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DBUILD_DOC=true + make + make doc +} + +package() { + cd "$srcdir/$_gitname-build/bindings/c/build/" + + make DESTDIR="$pkgdir/" install + + install -Dm644 ../license.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + diff --git a/community-staging/ekg2/PKGBUILD b/community-staging/ekg2/PKGBUILD new file mode 100644 index 000000000..77a930762 --- /dev/null +++ b/community-staging/ekg2/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 47741 2011-05-25 05:00:38Z svenstaro $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> + +pkgname=ekg2 +pkgver=0.3.0 +pkgrel=2 +pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" +arch=('i686' 'x86_64') +url="http://ekg2.org/" +license=('GPL') +depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib' 'gpgme') +optdepends=( 'xosd: for xosd support' + 'sqlite3: sqlite support' + 'gtk2: gtk support') +provides=('ekg2-unicode') +source=(http://pl.ekg2.org/ekg2-$pkgver.tar.gz) +md5sums=('652e492fcf72281a42c3e5960347516e') + +build() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-libgadu \ + --with-xosd \ + --enable-unicode \ + --enable-shared \ + --without-gpg + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + rm -rf $pkgdir/usr/lib/perl5/core_perl/perllocal.pod + mv $pkgdir/usr/libexec/ioctld $pkgdir/usr/lib/ekg2/ioctld + rm -rf $pkgdir/usr/libexec + chmod -R 755 $pkgdir/usr/lib/perl5 +} diff --git a/community-staging/encfs/PKGBUILD b/community-staging/encfs/PKGBUILD deleted file mode 100644 index 9bc1ae9d9..000000000 --- a/community-staging/encfs/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 47658 2011-05-24 17:28:48Z jelle $ -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Sven Kauber, <celeon@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=encfs -pkgver=1.7.4 -pkgrel=4 -pkgdesc='Encrypted filesystem in user-space' -arch=('i686' 'x86_64') -url='http://www.arg0.net/encfs' -license=('GPL') -depends=('rlog' 'openssl' 'fuse' 'boost-libs') -makedepends=('boost') -options=('!libtool') -source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz") -md5sums=('ac90cc10b2e9fc7e72765de88321d617') - -build(){ - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD deleted file mode 100644 index 7411fcd43..000000000 --- a/community-staging/fatrat/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 47629 2011-05-24 14:03:19Z tdziedzic $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -pkgname=fatrat -pkgver=1.1.3 -pkgrel=4 -pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" -arch=('i686' 'x86_64') -url="http://fatrat.dolezel.info/" -license=('GPL') -depends=('gloox' 'curl' 'qt' 'libtorrent-rasterbar') -optdepends=('geoip: GeoIP support') -makedepends=('asio' 'cmake') -source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) -md5sums=('6d4a00cdd0b59a05b1521184508d4637') - -build() { - cd $pkgname-$pkgver - - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - cmake \ - -DWITH_EVERYTHING=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - . - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/frogatto/PKGBUILD b/community-staging/frogatto/PKGBUILD index fb3b6553d..434ddd9fb 100644 --- a/community-staging/frogatto/PKGBUILD +++ b/community-staging/frogatto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47675 2011-05-24 19:05:16Z svenstaro $ +# $Id: PKGBUILD 47897 2011-05-26 00:34:36Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Tom Wambold <tom5760@gmail.com> pkgname='frogatto' arch=('i686' 'x86_64') pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog" url="http://www.frogatto.com" license=('GPL') diff --git a/community-testing/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD index 5a4b5206d..45dee93f7 100644 --- a/community-testing/gambas3/PKGBUILD +++ b/community-staging/gambas3/PKGBUILD @@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=2.99.1 -pkgrel=2 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install index c6aad0d55..c6aad0d55 100644 --- a/community-testing/gambas3/gambas3-runtime.install +++ b/community-staging/gambas3/gambas3-runtime.install diff --git a/community-testing/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install index 77c1aa52f..77c1aa52f 100644 --- a/community-testing/gambas3/gambas3-script.install +++ b/community-staging/gambas3/gambas3-script.install diff --git a/community-testing/gambas3/gambas3.install b/community-staging/gambas3/gambas3.install index c6aad0d55..c6aad0d55 100644 --- a/community-testing/gambas3/gambas3.install +++ b/community-staging/gambas3/gambas3.install diff --git a/community-staging/glob2/PKGBUILD b/community-staging/glob2/PKGBUILD deleted file mode 100644 index 94754172b..000000000 --- a/community-staging/glob2/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 47655 2011-05-24 16:52:31Z schuay $ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> - -pkgname=glob2 -pkgver=0.9.4.4 -pkgrel=8 -pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" -arch=('i686' 'x86_64') -url="http://www.globulation2.org/" -license=('GPL3') -depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' \ - 'fribidi' 'desktop-file-utils') -makedepends=('scons' 'boost') -install=glob2.install -source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz \ - glob2-0.9.4.1-gcc44.patch) -md5sums=('94c527325f355a29a2807f8f18a6e6a8' 'b13cb1f73ece23bfc6413773678d583e') -sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' '3e5ae81d85a727387a7049c3a0dfb3db930391b3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" - scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share" -} - -package () { - cd "${srcdir}/${pkgname}-${pkgver}" - - scons install - find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \; - install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png" -} diff --git a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch deleted file mode 100644 index b425b25ec..000000000 --- a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h ---- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100 -+++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200 -@@ -43,7 +43,7 @@ namespace GAGCore - virtual void flush(void) = 0; - virtual void read(void *data, size_t size) = 0; - virtual void putc(int c) = 0; -- virtual int getc(void) = 0; -+ virtual int get_c(void) = 0; - virtual void seekFromStart(int displacement) = 0; - virtual void seekFromEnd(int displacement) = 0; - virtual void seekRelative(int displacement) = 0; -@@ -67,7 +67,7 @@ namespace GAGCore - virtual void flush(void) { assert(fp); fflush(fp); } - virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); } - virtual void putc(int c) { assert(fp); fputc(c, fp); } -- virtual int getc(void) { assert(fp); return fgetc(fp); } -+ virtual int get_c(void) { assert(fp); return fgetc(fp); } - virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); } - virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); } - virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); } -@@ -92,7 +92,7 @@ namespace GAGCore - virtual void flush(void); - virtual void read(void *data, size_t size); - virtual void putc(int c); -- virtual int getc(void); -+ virtual int get_c(void); - virtual void seekFromStart(int displacement); - virtual void seekFromEnd(int displacement); - virtual void seekRelative(int displacement); -@@ -117,7 +117,7 @@ namespace GAGCore - virtual void flush(void) { } - virtual void read(void *data, size_t size); - virtual void putc(int c); -- virtual int getc(void); -+ virtual int get_c(void); - virtual void seekFromStart(int displacement); - virtual void seekFromEnd(int displacement); - virtual void seekRelative(int displacement); -diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp ---- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100 -+++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200 -@@ -75,9 +75,9 @@ namespace GAGCore - buffer->putc(c); - } - -- int ZLibStreamBackend::getc(void) -+ int ZLibStreamBackend::get_c(void) - { -- return buffer->getc(); -+ return buffer->get_c(); - } - - void ZLibStreamBackend::seekFromStart(int displacement) -@@ -147,7 +147,7 @@ namespace GAGCore - write(&ch, 1); - } - -- int MemoryStreamBackend::getc(void) -+ int MemoryStreamBackend::get_c(void) - { - Uint8 ch; - read(&ch, 1); -diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp ---- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 -+++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200 -@@ -60,7 +60,7 @@ namespace GAGCore
- std::string s;
- while (1)
- {
-- int c = backend->getc();
-+ int c = backend->get_c();
- if(c=='\r')
- continue;
- if ((c >= 0) && (c != '\n'))
-diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp ---- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 -+++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200 -@@ -150,7 +150,7 @@ namespace GAGCore - - int nextChar(void) - { -- next = stream->getc(); -+ next = stream->get_c(); - if (next == '\n') - { - column = 0; diff --git a/community-staging/glom/PKGBUILD b/community-staging/glom/PKGBUILD deleted file mode 100644 index e5251b1f4..000000000 --- a/community-staging/glom/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 47669 2011-05-24 17:51:15Z schuay $ -# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - -pkgname=glom -pkgver=1.16.1 -pkgrel=6 -pkgdesc="An easy-to-use database designer and user interface" -arch=('i686' 'x86_64') -url="http://www.glom.org/" -license=('GPL') -depends=('libgdamm' 'libxml++' 'gconfmm' 'pygtk' - 'python2-gda' 'libgtksourceviewmm2' 'goocanvasmm' 'libepc' - 'iso-codes' 'postgresql' 'hicolor-icon-theme' 'shared-mime-info' - 'gtkmm' 'boost-libs' 'gettext') -makedepends=('intltool' 'gnome-doc-utils' 'boost' 'python-sphinx' 'mm-common') -options=('!libtool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('9ae56e0886f14a48cedaef9beb9c3cc9') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # doctooldir is now owned by mm-common-util instead of glibmm - # the following sed line can be removed once (if) upstream provides a fixed - # configure script - sed -i 's%\(MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir \)glibmm-2.4%\1mm-common-util%' configure - - ./configure --prefix=/usr \ - --with-postgres-utils=/usr/bin \ - --disable-scrollkeeper \ - --disable-update-mime-database \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD deleted file mode 100644 index f962211b1..000000000 --- a/community-staging/gnash/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgbase=gnash -pkgname=(gnash-common gnash-gtk) -pkgver=0.8.9 -pkgrel=3 -arch=(i686 x86_64) -url="http://www.gnu.org/software/gnash/" -license=(GPL3) -makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool - speex fontconfig libva ffmpeg libxinerama - gstreamer0.10-base gstreamer0.10-ffmpeg - gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils - pkgconfig boost) -options=(!libtool !emptydirs) -source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2) -md5sums=('5b2be6b04a1bcc5fb404cc377034499e') - -build() { - cd "$srcdir/gnash-$pkgver" - - # Version is now in version.h - sed -i 's/avcodec\.h/version.h/' macros/ffmpeg.m4 - ./autogen.sh - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-plugins-install=system \ - --with-npapi-plugindir=/usr/lib/mozilla/plugins \ - --enable-gui=sdl,gtk \ - --enable-renderer=agg \ - --enable-media=gst,ffmpeg \ - --enable-hwaccel=vaapi - - make -} - -package_gnash-common() { - pkgdesc="A GNU Flash movie player" - depends=(curl giflib libldap sdl agg libjpeg libpng libtool - speex fontconfig libva ffmpeg libxinerama - gstreamer0.10-base gstreamer0.10-ffmpeg - boost-libs) - backup=(etc/gnashrc) - - cd "$srcdir/gnash-$pkgver" - - make DESTDIR="$pkgdir" install - - # Split gnash-gtk - mkdir -p "$srcdir"/gtk/{bin,man1,share} - mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/" - mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/" - mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/" - mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/" -} - -package_gnash-gtk() { - pkgdesc="A GNU Flash movie player" - depends=("gnash-common=$pkgver" - gtk2 libldap hicolor-icon-theme desktop-file-utils) - install=gnash-gtk.install - backup=(etc/gnashpluginrc) - - cd "$srcdir/gnash-$pkgver" - - make DESTDIR="$pkgdir" install-plugin - - install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}} - mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/" - mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/" - mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/" - mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/" -} diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install deleted file mode 100644 index c317fbaca..000000000 --- a/community-staging/gnash/gnash-gtk.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD new file mode 100644 index 000000000..2c357a634 --- /dev/null +++ b/community-staging/gource/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 47914 2011-05-26 01:27:25Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> +# Contributor: Olivier Ramonat <olivier at ramonat dot fr> +pkgname=gource +pkgver=0.34 +pkgrel=2 +pkgdesc="software version control visualization" +license=(GPL3) +arch=(i686 x86_64) +url=http://code.google.com/p/gource/ +depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') +source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('292a62d687874e871067e985d717d71a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR=$pkgdir install +} +# vim: ts=2:sw=2 et: diff --git a/community-staging/gpsdrive/PKGBUILD b/community-staging/gpsdrive/PKGBUILD deleted file mode 100644 index d7fafb285..000000000 --- a/community-staging/gpsdrive/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 47650 2011-05-24 16:23:35Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: damir <damir@archlinux.org> - -pkgname=gpsdrive -pkgver=2.11 -pkgrel=8 -pkgdesc="A car (bike, ship, plane) navigation system" -arch=("i686" "x86_64") -url="http://www.gpsdrive.de/" -license=('GPL2') -depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn' - 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri' - 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer' - ) # already in core ('sqlite3') -makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') -install="gpsdrive.install" -source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz" - "gpsd-2.96.patch") -md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c' - '5769e12c6d8932fb721212434c64f505') - -build() { - cd "$srcdir" - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - rm -rf build - mkdir build - cd build - - # fix the mapnik default values - sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" - sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" - - export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ - export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ - export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/ - - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - # see DefineOptions.cmake for a list of common options and defaults - # cmake -L for a more in-depth listing - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \ - -DWITH_SCRIPTS=ON \ - -DWITH_MAPNIK=ON \ - -DWITH_POSTGIS=ON \ - -DWITH_GDAL=ON \ - -DWITH_BASEMAPS=ON \ - -DWITH_FRIENDSD=ON \ - -DWITH_KISMET=ON \ - -DWITH_NAVIGATION=ON \ - -DWITH_SPEECH=OFF \ - -DWITH_DBUS=OFF \ - -DLIBGPS_OLD=OFF \ - "$srcdir/gpsdrive-$pkgver" - (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch) - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/gpsdrive/gpsd-2.96.patch b/community-staging/gpsdrive/gpsd-2.96.patch deleted file mode 100644 index bc6c7475f..000000000 --- a/community-staging/gpsdrive/gpsd-2.96.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c ---- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000 -+++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000 -@@ -264,7 +264,8 @@ - #define GPS_TIMER 500 - - static gint gps_timeout_source = 0; --static struct gps_data_t *gpsdata; -+static struct gps_data_t __gd; -+static struct gps_data_t *gpsdata = &__gd; - - /* SYMBOLS USED IN LIBGPS: - * -@@ -410,9 +411,10 @@ - */ - gps_query (gpsdata, "oys\n"); - #else -- if (gps_waiting(gpsdata)) -+ if (gps_waiting(gpsdata, 1000000)) - { -- gps_poll (gpsdata); -+ gps_read (gpsdata); -+ gps_hook_cb(gpsdata, NULL); - } - #endif - -@@ -447,7 +449,7 @@ - } - - /* try to open connection */ -- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); -+ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd; - if (!gpsdata) - { - g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", -@@ -466,7 +468,7 @@ - gps_sats = g_new (gps_satellite_struct, MAXCHANNELS); - - /* set hook function to handle gps data */ -- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); -+// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); - - #ifndef LIBGPS_OLD - /* enable watch mode to get data stream from gpsd */ diff --git a/community-staging/gpsdrive/gpsdrive.install b/community-staging/gpsdrive/gpsdrive.install deleted file mode 100644 index 8ea63912e..000000000 --- a/community-staging/gpsdrive/gpsdrive.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "Don't forget to generate geoinfo.db with geoinfo.pl script" - echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive" -} diff --git a/community-staging/lightspark/PKGBUILD b/community-staging/lightspark/PKGBUILD index 36d912b1e..d1a23e996 100644 --- a/community-staging/lightspark/PKGBUILD +++ b/community-staging/lightspark/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lightspark pkgver=0.4.7.1 -pkgrel=3 +pkgrel=4 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64') url='http://lightspark.sourceforge.net' diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD deleted file mode 100644 index bcfc24c68..000000000 --- a/community-staging/mapnik/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 47631 2011-05-24 14:03:50Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: David Dent <thewinch@gmail.com> -# Contributor: orbisvicis <orbisvicis@gmail.com> - -pkgname=mapnik -pkgver=0.7.1 -pkgrel=9 -pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." -arch=('i686' 'x86_64') -url="http://mapnik.org/" -license=('LGPL') -depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' - 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' - 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') - # already in core ('zlib' 'sqlite3') -optdepends=('libxslt: Web Map Service' - 'python-lxml: Web Map Service' - 'python-imaging: Web Map Service' - 'python-nose: Web Map Service' - 'apache: Web Map Service' - 'mod_fastcgi: Web Map Service - or:' - 'mod_fcgid: Web Map Service - or:' - 'mod_wsgi: Web Map Service' - ) -makedepends=('scons' 'boost') # already in core ('pkg-config') -conflicts=('mapnik-svn') -install="mapnik.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8f65fda2a792518d6f6be8a85f62fc73') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 - sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct - - sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct - - scons configure \ - PREFIX="/usr" \ - INPUT_PLUGINS=all \ - DESTDIR="$pkgdir" - scons -} -package(){ - cd "$srcdir/$pkgname-$pkgver" - scons install - - # fix permissions on SCons-autogenerated files - chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py" -} diff --git a/community-staging/mapnik/mapnik.install b/community-staging/mapnik/mapnik.install deleted file mode 100644 index 46f265d5b..000000000 --- a/community-staging/mapnik/mapnik.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - /sbin/ldconfig -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-staging/mongodb/PKGBUILD b/community-staging/mongodb/PKGBUILD deleted file mode 100644 index c3e44c8fa..000000000 --- a/community-staging/mongodb/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Mathias Stearn <mathias@10gen.com> -# Contributor: Alec Thomas - -pkgname=mongodb -pkgver=1.8.1 -pkgrel=2 -pkgdesc='A high-performance, open source, schema-free document-oriented database.' -arch=('i686' 'x86_64') -url='http://www.mongodb.org' -license=('AGPL3') -depends=('boost-libs' 'spidermonkey' 'pcre') -makedepends=('scons' 'boost') -optdepends=('libpcap: needed for mongosniff') -backup=('etc/mongodb.conf') -install="mongodb.install" -source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" - 'mongodb.rc' - 'mongodb.conf' - 'gcc46fixes.diff' - 'gcc46fixes2.diff') -md5sums=('e75a5cae641a53760df8cb866ad5d929' - '859f8f9bb32ef2bd21fec55ae9a87d0a' - '9e0ea3f96732bb7811f0b64dace56440' - 'e90c78350e25df2d24f98e4767677d4b' - '5097de6ce2c347c3703ab8cf5a611052') - -build() { - export SCONSFLAGS="$MAKEFLAGS" - - cd ${pkgname}-src-r${pkgver} - - patch -Np1 -i ${srcdir}/gcc46fixes.diff - patch -Np1 -i ${srcdir}/gcc46fixes2.diff - - # scons is "special" - sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct - - scons \ - all \ - --full -} - -package() { - cd ${pkgname}-src-r${pkgver} - - scons \ - install \ - --full \ - --prefix=${pkgdir}/usr - - install -D -m755 ${srcdir}/mongodb.rc \ - ${pkgdir}/etc/rc.d/mongodb - install -D -m644 ${srcdir}/mongodb.conf \ - ${pkgdir}/etc/mongodb.conf - install -d -m700 ${pkgdir}/var/state/mongodb - - if [ -d ${pkgdir}/usr/lib64 ]; then - mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib - fi -} diff --git a/community-staging/mongodb/mongodb.conf b/community-staging/mongodb/mongodb.conf deleted file mode 100644 index 60d73eae8..000000000 --- a/community-staging/mongodb/mongodb.conf +++ /dev/null @@ -1,6 +0,0 @@ -# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details -# Run mongod --help to see a list of options - -bind_ip = 127.0.0.1 -quiet = true -dbpath = /var/state/mongodb diff --git a/community-staging/mongodb/mongodb.install b/community-staging/mongodb/mongodb.install deleted file mode 100755 index 152f36515..000000000 --- a/community-staging/mongodb/mongodb.install +++ /dev/null @@ -1,31 +0,0 @@ -# vim: syntax=sh - -show_msg(){ - if [ "$(arch)" != "x86_64" ] - then - cat <<END -########################################################################### -# Warning: the 32 bit version of MongoDB is limited to about 2GB of data. # -# See http://blog.mongodb.org/post/137788967/32-bit-limitations # -########################################################################### -END - fi -} - -post_install() { - useradd -r -g daemon -d /var/state/mongodb -s /bin/false mongodb - chown -R mongodb:daemon /var/state/mongodb - - show_msg -} - -post_upgrade() { - chown -R mongodb:daemon /var/state/mongodb - - show_msg -} - -pre_remove() { - /etc/rc.d/mongodb stop - userdel mongodb -} diff --git a/community-staging/mongodb/mongodb.rc b/community-staging/mongodb/mongodb.rc deleted file mode 100755 index b808a2fb0..000000000 --- a/community-staging/mongodb/mongodb.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# vim: syntax=sh - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof /usr/bin/mongod` -case "$1" in - start) - stat_busy "Starting mongodb" - [ -z "$PID" ] && /bin/su mongodb -s /bin/bash -c "/usr/bin/mongod --config /etc/mongodb.conf &" > /var/log/mongod 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mongodb - stat_done - fi - ;; - stop) - stat_busy "Stopping mongodb" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mongodb - while [ ! -z "$(pidof /usr/bin/mongod)" ]; do - sleep 1; - done - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/ogre/PKGBUILD b/community-staging/ogre/PKGBUILD deleted file mode 100644 index 28e1c7066..000000000 --- a/community-staging/ogre/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# $Id: PKGBUILD 47685 2011-05-24 19:41:50Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -pkgbase=ogre -pkgname=('ogre' 'ogre-docs') -pkgver=1.7.3 -pkgrel=2 -pkgdesc="A scene-oriented, flexible 3D engine written in C++" -arch=('i686' 'x86_64') -url='http://www.ogre3d.org' -license=('custom:MIT') -depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' - 'nvidia-cg-toolkit' 'mesa' 'zziplib' 'ois') -makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu') -optdepends=('cppunit: unit testing' - 'intel-tbb: better threading support' - 'poco: portability' - 'boost: for developing using ogre') -install=ogre.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2") -md5sums=('7a85d3b8f0d64debd186e48ebe9556aa') - -build() { - cd ${srcdir}/${pkgname}_src_v${pkgver//./-} - - # get a clean build dir - [[ -d build ]] && rm -rf build - mkdir build - cd build - - # generate CMake Makefile - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \ - -DOGRE_INSTALL_SAMPLES=TRUE \ - -DOGRE_INSTALL_DOCS=TRUE \ - -DOGRE_INSTALL_MEDIA=TRUE \ - -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version - - # compile - make - - # generate docs - if [[ $(which dot) && $(which doxygen) ]]; then - make doc - fi -} - -package_ogre() { - optdepends=('ogre-docs: documentation') - - cd ${srcdir}/${pkgname}_src_v${pkgver//./-}/build - - # install the bugger - make DESTDIR=${pkgdir} install - - # fix up samples - install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/ - mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/ - mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/ - - # make sample launcher - echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser - echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser - chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser - - # install license - install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html - - # move docs out of this package - mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs -} - -package_ogre-docs() { - pkgdesc="Documentation for ogre" - depends=() - - cd ${srcdir}/${pkgbase}_src_v${pkgver//./-}/build - - # move docs into this package - install -dm755 ${pkgdir}/usr/share/doc - mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/ - - # symlink for docs - install -dm755 ${pkgdir}/usr/share/OGRE/ - cd ${pkgdir}/usr/share - ln -s doc/OGRE/ OGRE/docs -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/ogre/ogre.install b/community-staging/ogre/ogre.install deleted file mode 100644 index 5db668d9e..000000000 --- a/community-staging/ogre/ogre.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "To view the OGRE samples just run OgreSampleBrowser or launch" - echo "it directly in /opt/OGRE/samples/" -} diff --git a/community-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD index 16518d9c9..01aab85d1 100644 --- a/community-staging/performous/PKGBUILD +++ b/community-staging/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47641 2011-05-24 14:35:06Z tdziedzic $ +# $Id: PKGBUILD 47952 2011-05-26 11:21:56Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=5 +pkgrel=6 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" @@ -24,7 +24,7 @@ build() { # fix config loading with libxml++ export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} - # fix to built against boost 1.46 + # fix to built against boost 1.46, upstream (git) now support v3 export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" cmake -DCMAKE_BUILD_TYPE=Release \ diff --git a/community-staging/perl-dbd-odbc/PKGBUILD b/community-staging/perl-dbd-odbc/PKGBUILD new file mode 100644 index 000000000..d787e37b5 --- /dev/null +++ b/community-staging/perl-dbd-odbc/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 47750 2011-05-25 13:23:38Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-dbd-odbc +pkgver=1.29 +pkgrel=1 +pkgdesc="ODBC Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-ODBC/" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi' 'perl' 'unixodbc') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") +md5sums=('66fee532cab75a1e5ffa81dfd26b2367') + +build() { + cd DBD-ODBC-${pkgver} + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd DBD-ODBC-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-dbd-pg/PKGBUILD b/community-staging/perl-dbd-pg/PKGBUILD new file mode 100644 index 000000000..7af282d37 --- /dev/null +++ b/community-staging/perl-dbd-pg/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 47753 2011-05-25 13:27:50Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-dbd-pg +pkgver=2.18.1 +pkgrel=1 +pkgdesc="Postgres Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-Pg" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi>=1.52' 'postgresql-libs') +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-${pkgver}.tar.gz") +md5sums=('1f4a837b3d79789ad6854443fce7a901') + +build() { + cd DBD-Pg-${pkgver} + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd DBD-Pg-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-dbd-sqlite2/PKGBUILD b/community-staging/perl-dbd-sqlite2/PKGBUILD new file mode 100644 index 000000000..314f129d4 --- /dev/null +++ b/community-staging/perl-dbd-sqlite2/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 47756 2011-05-25 13:30:12Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Charles Mauch <cmauch@gmail.com> + +pkgname=perl-dbd-sqlite2 +pkgver=0.33 +pkgrel=7 +pkgdesc="Perl/CPAN Module DBD::SQLite2" +arch=("i686" "x86_64") +url="http://search.cpan.org/dist/DBD-SQLite2" +license=("GPL" "PerlArtistic") +depends=("perl-dbi") +source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-${pkgver}.tar.gz") +md5sums=('babd83fd5eb9ba7560ad4bab4c76c0eb') + +build() { + cd DBD-SQLite2-${pkgver} + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd DBD-SQLite2-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-dbd-sybase/PKGBUILD b/community-staging/perl-dbd-sybase/PKGBUILD new file mode 100644 index 000000000..a33488520 --- /dev/null +++ b/community-staging/perl-dbd-sybase/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 47759 2011-05-25 13:32:36Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-dbd-sybase +pkgver=1.12 +pkgrel=1 +pkgdesc="Sybase Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-Sybase/" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz") +md5sums=('fc01efe30102e801f6fdc1c96352fcde') + +build() { + cd $srcdir/DBD-Sybase-${pkgver} + + export SYBASE=/usr + + echo -e "\n\n\n\n\n\n" | PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd $srcdir/DBD-Sybase-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/pingus/ChangeLog b/community-staging/pingus/ChangeLog deleted file mode 100644 index c182f92eb..000000000 --- a/community-staging/pingus/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - - * pingus 0.7.2-8 - * Rebuilt against boost 1.41.0 - -2010-02-23 Eric Belanger <eric@archlinux.org> - - * pingus 0.7.2-7 - * Rebuilt against boost 1.42.0 - -2010-01-20 Eric Belanger <eric@archlinux.org> - - * pingus 0.7.2-6 - * Rebuilt against libpng 1.4/libjpeg 8 - -2009-07-13 Eric Belanger <eric@archlinux.org> - - * pingus 0.7.2-2 - * Rebuilt against boost 1.39 - * Added gcc 4.4 patch - * Added ChangeLog diff --git a/community-staging/pingus/PKGBUILD b/community-staging/pingus/PKGBUILD deleted file mode 100644 index bba3aea9e..000000000 --- a/community-staging/pingus/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 47672 2011-05-24 18:43:41Z tdziedzic $ -# Maintainer: Eric Belanger <eric@archlinux.org> - -pkgname=pingus -pkgver=0.7.3 -pkgrel=4 -pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." -arch=('i686' 'x86_64') -url="http://pingus.seul.org" -license=('GPL') -depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'boost-libs>=1.46') -makedepends=('scons' 'boost>=1.46') -source=(http://pingus.seul.org/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) -md5sums=('7d1a0b0d658cc46dd09d6274f39acc7d' - 'b94efaa6e2de959de7fdb50cfc7dbdea') -sha1sums=('ca7fe5cea65fb3392d1e81056a879831925502f2' - 'f35649f3b0b2bfcb01ce75085cf719dcaa609a54') - -build() { - cd ${pkgname}-${pkgver} - - scons prefix=/usr -} - -package() { - cd ${pkgname}-${pkgver} - - ./install.sh "${pkgdir}/usr" - - install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" -} diff --git a/community-staging/pingus/pingus.desktop b/community-staging/pingus/pingus.desktop deleted file mode 100644 index 158eaa820..000000000 --- a/community-staging/pingus/pingus.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Pingus -Comment=A free Lemmings[tm] clone -Exec=pingus -Terminal=false -Type=Application -Categories=Application;Game;LogicGame -Icon=/usr/share/pingus/data/images/core/editor/actions.png diff --git a/community-staging/pokerth/PKGBUILD b/community-staging/pokerth/PKGBUILD deleted file mode 100644 index 040111905..000000000 --- a/community-staging/pokerth/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 47635 2011-05-24 14:23:55Z tdziedzic $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: Vasco Costa <vasco.costa@meiodigital.com> - -pkgname=pokerth -_realname=PokerTH -pkgver=0.8.3 -pkgrel=4 -pkgdesc="Poker game written in C++/QT4" -arch=('i686' 'x86_64') -url="http://www.pokerth.net/" -license=('GPL' 'custom') -depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls' 'qt' 'sdl_mixer') -makedepends=('boost') -source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) -md5sums=('adbe56ad5f547eb255dad91de564bf1c') - -build() { - cd $_realname-$pkgver-src - - sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro - - - # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' - sed \ - -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ - -i zlib_compress.pro pokerth_game.pro pokerth_server.pro - - qmake $pkgname.pro - - make -} - -package() { - cd $_realname-$pkgver-src - - make INSTALL_ROOT="$pkgdir" install - - install -D $pkgname "$pkgdir/usr/bin/$pkgname" - install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1" - - install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" - rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt" -} diff --git a/community-staging/qbittorrent/PKGBUILD b/community-staging/qbittorrent/PKGBUILD deleted file mode 100644 index ae549bae2..000000000 --- a/community-staging/qbittorrent/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> - -pkgname=qbittorrent -pkgver=2.7.3 -pkgrel=2 -pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" -arch=('i686' 'x86_64') -url="http://www.qbittorrent.org/" -license=('GPL') -depends=('qt' 'libtorrent-rasterbar' 'xdg-utils') -makedepends=('boost' 'geoip') -optdepends=('python2: needed for search' - 'geoip: improves peer country resolution') -install='qbittorrent.install' -source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/${pkgname}-${pkgver}.tar.gz" - 'python2.patch') -md5sums=('ff1b294133f8dadc781c8f0df50d248d' - 'db0d79fee8ce3470ad3741d36b02a94c') - -build() { - cd ${pkgname}-${pkgver} - - sed -i \ - -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find ./ -name '*.py') - - patch -Np1 -i ${srcdir}/python2.patch - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make INSTALL_ROOT=${pkgdir} install -} diff --git a/community-staging/qbittorrent/python2.patch b/community-staging/qbittorrent/python2.patch deleted file mode 100644 index 24ab742db..000000000 --- a/community-staging/qbittorrent/python2.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nur qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp qbittorrent-2.4.8/src/searchengine.cpp ---- qbittorrent-2.4.8.orig/src/searchengine/searchengine.cpp 2010-10-01 13:52:53.000000000 -0700 -+++ qbittorrent-2.4.8/src/searchengine/searchengine.cpp 2010-10-25 01:20:20.046700620 -0700 -@@ -354,7 +354,7 @@ - //on change le texte du label courrant - currentSearchTab->getCurrentLabel()->setText(tr("Results")+" <i>(0)</i>:"); - // Launch search -- searchProcess->start("python", params, QIODevice::ReadOnly); -+ searchProcess->start("python2", params, QIODevice::ReadOnly); - searchTimeout->start(180000); // 3min - } - -@@ -421,7 +421,7 @@ - params << engine_url; - params << torrent_url; - // Launch search -- downloadProcess->start("python", params, QIODevice::ReadOnly); -+ downloadProcess->start("python2", params, QIODevice::ReadOnly); - } - } - -diff -Nur qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h qbittorrent-2.4.8/src/supportedengines.h ---- qbittorrent-2.4.8.orig/src/searchengine/supportedengines.h 2010-10-24 01:32:39.000000000 -0700 -+++ qbittorrent-2.4.8/src/searchengine/supportedengines.h 2010-10-25 01:18:42.230032834 -0700 -@@ -144,7 +144,7 @@ - QStringList params; - params << misc::searchEngineLocation()+QDir::separator()+"nova2.py"; - params << "--capabilities"; -- nova.start("python", params, QIODevice::ReadOnly); -+ nova.start("python2", params, QIODevice::ReadOnly); - nova.waitForStarted(); - nova.waitForFinished(); - QString capabilities = QString(nova.readAll()); diff --git a/community-staging/root/PKGBUILD b/community-staging/root/PKGBUILD new file mode 100644 index 000000000..4f46232cf --- /dev/null +++ b/community-staging/root/PKGBUILD @@ -0,0 +1,78 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Sebastian Voecking <voeck@web.de> + +pkgname=root +pkgver=5.28.00d +pkgrel=2 +pkgdesc='C++ data analysis framework and interpreter from CERN.' +arch=('i686' 'x86_64') +url='http://root.cern.ch' +license=('LGPL2.1') +depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' + 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') +makedepends=('fftw') +install='root.install' +source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" + 'root.sh' + 'rootd' + 'root.desktop' + 'root.xml') +md5sums=('53505fcb256df38526d446916e6efc15' + '0e883ad44f99da9bc7c23bc102800b62' + 'efd06bfa230cc2194b38e0c8939e72af' + 'ac61b17395d75a2705fefa2ef841a6bf' + 'e2cf69b204192b5889ceb5b4dedc66f7') + +build() { + cd ${pkgname} + + if [ ${CARCH} == 'i686' ]; then + TARGET=linux; + else + TARGET=linuxx8664gcc; + fi + + # python2 switch + find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \; + sed -i 's/python 2/python2 2/g' configure + + ./configure \ + ${TARGET} \ + --prefix=/usr \ + --disable-builtin-glew \ + --disable-builtin-freetype \ + --disable-builtin-ftgl \ + --disable-builtin-pcre \ + --disable-builtin-zlib \ + --enable-gdml \ + --enable-gsl-shared \ + --enable-minuit2 \ + --enable-soversion \ + --enable-roofit \ + --enable-python \ + --with-python-incdir=/usr/include/python2.7 \ + --with-python-libdir=/usr/lib + #--disable-krb5 + # disable krb5 because of compile error + + # move from aur + #--disable-builtin-afterimage \ + + #--with-python-incdir=/usr/include/python2.7/Python.h \ + #--with-python-libdir=/usr/lib/libpython2.7.so + + make +} + +package() { + cd ${pkgname} + + make DESTDIR=${pkgdir} install + + install -D ${srcdir}/root.sh ${pkgdir}/etc/profile.d/root.sh + install -D ${srcdir}/rootd ${pkgdir}/etc/rc.d/rootd + install -D -m644 ${srcdir}/root.desktop ${pkgdir}/usr/share/applications/root.desktop + install -D -m644 ${srcdir}/root.xml ${pkgdir}/usr/share/mime/packages/root.xml + + rm -rf ${pkgdir}/etc/root/daemons +} diff --git a/community-staging/root/root.desktop b/community-staging/root/root.desktop new file mode 100644 index 000000000..ca382111c --- /dev/null +++ b/community-staging/root/root.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Exec=root +Terminal=true +Name=ROOT +Name[de]=ROOT +Comment=An object-oriented data analysis framework +Comment[de]=Ein objektorientiertes Framework zur Datenanalyse +StartupNotify=true +MimeType=application/x-root;text/x-c++src +Categories=Science;Development;Application; diff --git a/community-staging/root/root.install b/community-staging/root/root.install new file mode 100644 index 000000000..457af7314 --- /dev/null +++ b/community-staging/root/root.install @@ -0,0 +1,17 @@ +post_install() { + if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then + echo "/usr/lib/root" >> etc/ld.so.conf + sbin/ldconfig -r . + fi + + update-desktop-database >/dev/null + + update-mime-database /usr/share/mime >/dev/null +} + +pre_remove() { + cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot + mv /tmp/.pacroot etc/ld.so.conf + chmod 644 etc/ld.so.conf + sbin/ldconfig -r . +} diff --git a/community-staging/root/root.sh b/community-staging/root/root.sh new file mode 100644 index 000000000..685e6036b --- /dev/null +++ b/community-staging/root/root.sh @@ -0,0 +1,5 @@ +if [ $PYTHONPATH ]; then + export PYTHONPATH=$PYTHONPATH:/usr/lib/root; +else + export PYTHONPATH=/usr/lib/root; +fi diff --git a/community-staging/root/root.xml b/community-staging/root/root.xml new file mode 100644 index 000000000..af8dd69c5 --- /dev/null +++ b/community-staging/root/root.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/x-root"> + <comment>ROOT file</comment> + <comment xml:lang="de">ROOT-Datei</comment> + <glob pattern="*.root"/> + <magic priority="80"> + <match value="root" type="string" offset="0:64"/> + </magic> + </mime-type> +</mime-info> diff --git a/community-staging/root/rootd b/community-staging/root/rootd new file mode 100755 index 000000000..fb2c3388c --- /dev/null +++ b/community-staging/root/rootd @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/rootd` +case "$1" in + start) + stat_busy "Starting ROOT file server daemon" + [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + PID=`pidof -o %PPID /usr/sbin/rootd` + echo $PID >/var/run/rootd.pid + add_daemon rootd + stat_done + fi + ;; + stop) + stat_busy "Stopping ROOT file server daemon" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon rootd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/rss-glx/PKGBUILD b/community-staging/rss-glx/PKGBUILD new file mode 100644 index 000000000..37c440cf4 --- /dev/null +++ b/community-staging/rss-glx/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 48037 2011-05-27 16:21:40Z spupykin $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> +# Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> + +pkgname=rss-glx +pkgver=0.9.1 +pkgrel=6 +pkgdesc="The Really Slick Screensavers port to GLX" +arch=('i686' 'x86_64') +url="http://rss-glx.sourceforge.net/" +license=('GPL') +depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick') +optdepends=('xscreensaver: xscreensaver integration') +install=rss-glx.install +options=('!libtool') +source=(http://downloads.sourceforge.net/rss-glx/${pkgname}_${pkgver}.tar.bz2 + rss-glx-desktops.tar.bz2) +md5sums=('a772bd143cd8d141edf4d9eff9860ab3' + '4211215c9a4918b0dff30a7000647dd9') + +build() { + cd ${srcdir}/${pkgname}_${pkgver} + + [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in) + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --program-transform-name='s/plasma/plasma_rss/' \ + --with-configdir=/usr/share/xscreensaver/config \ + --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \ + --enable-shared=yes --enable-static=no + make CFLAGS="$CFLAGS -I/usr/include/ImageMagick" + make DESTDIR=${pkgdir} install + + # FS#18300 + install -d ${pkgdir}/usr/lib/xscreensaver/ + list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl) + for i in $list; do + ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/" + done + + install -d ${pkgdir}/usr/share/applications/screensavers + install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers +} diff --git a/community-staging/rss-glx/rss-glx-desktops.tar.bz2 b/community-staging/rss-glx/rss-glx-desktops.tar.bz2 Binary files differnew file mode 100644 index 000000000..940fd5277 --- /dev/null +++ b/community-staging/rss-glx/rss-glx-desktops.tar.bz2 diff --git a/community-staging/rss-glx/rss-glx.install b/community-staging/rss-glx/rss-glx.install new file mode 100644 index 000000000..758642618 --- /dev/null +++ b/community-staging/rss-glx/rss-glx.install @@ -0,0 +1,12 @@ +post_install() { + cat << 'EOM' + --> If you want to integrate the RSS screen savers with xscreensaver + --> for your user, then install the xscreensaver package and launch + --> the command "rss-glx_install.pl" +EOM + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/community-staging/schroot/PKGBUILD b/community-staging/schroot/PKGBUILD deleted file mode 100644 index 949227809..000000000 --- a/community-staging/schroot/PKGBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# $Id: PKGBUILD 47626 2011-05-24 13:55:50Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> - -pkgname=schroot -pkgver=1.4.22 -pkgrel=1 -pkgdesc="Allows users to execute shell commands under different root filesystems. \ - (Successor to dchroot)." -url="http://packages.qa.debian.org/s/schroot.html" -license=('GPL3') -depends=('pam' 'lockdev' 'boost' 'e2fsprogs') -optdepends=('btrfs-progs-unstable' 'lvm2') -arch=('i686' 'x86_64') -conflicts=('dchroot') -replaces=('dchroot') -provides=('schroot' 'sbuild' 'dchroot') -backup=('etc/schroot/schroot.conf' - 'etc/schroot/script-arch32' - 'etc/schroot/mount-arch32' - 'etc/schroot/copyfiles-arch32') -options=(!libtool) -source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2" - 'script-arch32' - 'copyfiles-arch32' - 'mount-arch32') -md5sums=('0dde4c76b1623cc277d92f8dc06109d1' - '8e86445e188129232e1782d978dfc967' - 'd4558d5691fbdaa46ce669e8f327133b' - 'f0d5d5b5e34a860f6f90b5628c680f46') - -build() { - cd ${pkgname}-${pkgver} - - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - - ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var \ - --enable-dchroot --enable-lvm-snapshot --enable-btrfs-snapshot \ - BTRFS=/sbin/btrfs \ - BTRFSCTL=/sbin/btrfsctl \ - LVCREATE=/sbin/lvcreate \ - LVREMOVE=/sbin/lvremove -# --enable-csbuild - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=$pkgdir install - - install -m 644 ${srcdir}/script-arch32 ${pkgdir}/etc/schroot - install -m 644 ${srcdir}/mount-arch32 ${pkgdir}/etc/schroot - install -m 644 ${srcdir}/copyfiles-arch32 ${pkgdir}/etc/schroot - cat >> $pkgdir/etc/schroot/schroot.conf << EOF - -[Arch32] -description=Arch32 -type=directory -directory=/opt/arch32 -priority=1 -#users=username -groups=users -root-groups=root -script-config=script-arch32 -personality=linux32 -aliases=32,default - -EOF -} diff --git a/community-staging/schroot/copyfiles-arch32 b/community-staging/schroot/copyfiles-arch32 deleted file mode 100644 index 7dd32b7d9..000000000 --- a/community-staging/schroot/copyfiles-arch32 +++ /dev/null @@ -1,8 +0,0 @@ -/etc/group -/etc/hosts -/etc/passwd -/etc/resolv.conf -/etc/rc.conf -/etc/localtime -/etc/locale.gen -/etc/profile.d/locale.sh
\ No newline at end of file diff --git a/community-staging/schroot/mount-arch32 b/community-staging/schroot/mount-arch32 deleted file mode 100644 index 075d6e451..000000000 --- a/community-staging/schroot/mount-arch32 +++ /dev/null @@ -1,12 +0,0 @@ -# mount.defaults: static file system information for chroots. -# Note that the mount point will be prefixed by the chroot path -# (CHROOT_PATH) -# -# <file system> <mount point> <type> <options> <dump> <pass> -proc /proc proc defaults 0 0 -/dev /dev none rw,bind 0 0 -#/dev/pts /dev/pts none rw,bind 0 0 -tmpfs /dev/shm tmpfs defaults 0 0 -/sys /sys none rw,bind 0 0 -/tmp /tmp none rw,bind 0 0 -/home /home none rw,bind 0 0 diff --git a/community-staging/schroot/script-arch32 b/community-staging/schroot/script-arch32 deleted file mode 100644 index fb87b4822..000000000 --- a/community-staging/schroot/script-arch32 +++ /dev/null @@ -1,15 +0,0 @@ -# Default settings for chroot setup and exec scripts. -# See schroot-script-config(5) for further details. - -# Filesystems to mount inside the chroot. -FSTAB="/etc/schroot/mount-arch32" - -# Files to copy from the host system into the chroot. -COPYFILES="/etc/schroot/copyfiles-arch32" - -# Is sbuild installed? -if [ -x /usr/bin/sbuild ]; then - SBUILD="true" -else - SBUILD="false" -fi diff --git a/community-staging/sfml/PKGBUILD b/community-staging/sfml/PKGBUILD new file mode 100644 index 000000000..806e373d4 --- /dev/null +++ b/community-staging/sfml/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 47923 2011-05-26 03:12:35Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Ondrej Martinak <omartinak@gmail.com> + +pkgname=sfml + +_git=true + +if [[ "${_git}" = "true" ]]; then + pkgver=1.99.git20110526 +fi + +pkgrel=1 +pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') +makedepends=('git' 'mesa' 'cmake' 'doxygen') + +_gitroot='https://github.com/LaurentGomila/SFML.git' +_gitname='SFML' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + cd $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DBUILD_DOC=true \ + -DBUILD_EXAMPLES=true + make + make doc +} + +package() { + cd "$srcdir/$_gitname-build/build" + make DESTDIR="$pkgdir/" install + + install -Dm644 ../license.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + diff --git a/community-staging/sfml/sfml.install b/community-staging/sfml/sfml.install new file mode 100644 index 000000000..9d18b5251 --- /dev/null +++ b/community-staging/sfml/sfml.install @@ -0,0 +1,3 @@ +post_install() { + echo "To view the SFML samples, go to /opt/SFML/samples/bin and run them individually" +} diff --git a/community-staging/sfml/use-system-libs.patch b/community-staging/sfml/use-system-libs.patch new file mode 100644 index 000000000..5d3200225 --- /dev/null +++ b/community-staging/sfml/use-system-libs.patch @@ -0,0 +1,70 @@ +Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6 +Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ +Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ +Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ +diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp +--- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100 ++++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2010-08-16 12:27:33.983627625 +0200 +@@ -28,10 +28,10 @@ + #include <SFML/Graphics/ImageLoader.hpp>
+ extern "C"
+ {
+- #include <SFML/Graphics/libjpeg/jpeglib.h>
+- #include <SFML/Graphics/libjpeg/jerror.h>
++ #include <jpeglib.h>
++ #include <jerror.h>
+ }
+-#include <SFML/Graphics/libpng/png.h>
++#include <png.h>
+ #include <SFML/Graphics/SOIL/SOIL.h>
+ #include <iostream>
+
+Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej +diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile +--- SFML-1.6-old/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100 ++++ SFML-1.6/src/SFML/Graphics/Makefile 2010-08-16 12:25:13.663501212 +0200 +@@ -1,15 +1,5 @@ + SRC = $(wildcard *.cpp)
+-SRCGLEW = $(wildcard ./GLEW/*.c)
+-SRCJPEG = $(wildcard ./libjpeg/*.c)
+-SRCPNG = $(wildcard ./libpng/*.c)
+-SRCSOIL = $(wildcard ./SOIL/*.c)
+-SRCZLIB = $(wildcard ./zlib/*.c)
+ OBJ = $(SRC:.cpp=.o)
+-OBJGLEW = $(SRCGLEW:.c=.o)
+-OBJJPEG = $(SRCJPEG:.c=.o)
+-OBJPNG = $(SRCPNG:.c=.o)
+-OBJSOIL = $(SRCSOIL:.c=.o)
+-OBJZLIB = $(SRCZLIB:.c=.o)
+
+ ifeq ($(STATIC), yes)
+ LIB = libsfml-graphics-s.a
+@@ -23,22 +13,19 @@ +
+ all: $(LIB)
+
+-libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++libsfml-graphics-s.a: $(OBJ)
++ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -static -lGLEW -ljpeg -lpng -lsoil -lz -lSOIL
+
+-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
++libsfml-graphics.so: $(OBJ)
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL
+
+ $(OBJ): %.o: %.cpp
+ $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
+
+-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
+- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
+-
+ .PHONY: clean mrproper
+
+ clean:
+- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
++ @rm -rf $(OBJ)
+
+ mrproper: clean
+ @rm -rf $(LIBNAME)
+Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD deleted file mode 100644 index a3fe89406..000000000 --- a/community-staging/smc/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 47652 2011-05-24 16:35:46Z schuay $ -# Maintainer: -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Kritoke <typeolinux@yahoo.com> - -pkgname=smc -pkgver=1.9 -pkgrel=11 -pkgdesc="Secret Maryo Chronicles" -arch=('i686' 'x86_64') -url="http://www.secretmaryo.org/" -license=('GPL3') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') -makedepends=('autoconf' 'automake' 'boost') -source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 - smc-for-cegui-v0-7.diff - smc.desktop - smc.png) -md5sums=('75ab7826303c49aec25b052a8b90287f' - '51dfea21b741ad19df14e738df52f1cf' - '80fe208132ff41dd7677a53ee429ecdb' - 'efca7580e28748625eb676c9d24ee122') - -build() { - cd $srcdir/$pkgname-$pkgver - - # to remove when smc will be compatible with cegui-0.7.x - patch -Np1 -i ${srcdir}/smc-for-cegui-v0-7.diff - # fix for boost-1.46 - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - ./autogen.sh - ./configure --prefix=/usr -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make install DESTDIR=$pkgdir - # install some freedesktop.org compatibility - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop - install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png - - rm -rf $pkgdir/usr/share/smc/ -} diff --git a/community-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff deleted file mode 100644 index a99cbce6c..000000000 --- a/community-staging/smc/smc-for-cegui-v0-7.diff +++ /dev/null @@ -1,437 +0,0 @@ -diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac ---- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 -+++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 -@@ -53,7 +53,7 @@ - AC_MSG_ERROR([SDL_ttf library not found])) - - # Check for the CEGUI library --PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) -+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) - CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" - LIBS="$LIBS $CEGUI_LIBS" - -diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp ---- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 -+++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 -@@ -118,16 +118,10 @@ - return tmp;
- }
-
--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
- {
- // draw text
-- list_text->draw( position, alpha, clipper );
--}
--
--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
--{
-- // draw text
-- list_text->draw( cache, targetRect, zBase, alpha, clipper );
-+ list_text->draw( buffer, targetRect, alpha, clipper );
- }
-
- void cEditor_Item_Object :: Draw_Image( void )
-@@ -533,12 +527,12 @@ - if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
- {
- // Listbox dimension
-- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
-- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
-+ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
- // Vertical ScrollBar Position
- float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
- // font height
-- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
-+ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
-
- // draw items
- for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h ---- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 -+++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 -@@ -62,8 +62,7 @@ - */
- virtual CEGUI::Size getPixelSize( void ) const;
- // draw
-- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
-- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
-+ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
- // draw image
- void Draw_Image( void );
-
-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp ---- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 -+++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 -@@ -265,7 +265,7 @@ -
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- // fixme : Can't handle multiple lines of text
- float text_width = font->getTextExtent( text ) * global_downscalex;
-
-@@ -1182,7 +1182,7 @@ - text_default->setText( gui_text );
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
-@@ -1190,7 +1190,7 @@ - text_default->moveToFront();
-
- // set window height
-- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
-+ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
-
- while( draw )
- {
-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp ---- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 -+++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 -@@ -444,13 +444,15 @@ - - if( pGuiSystem ) - { -- delete pGuiSystem; -+ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); -+ pGuiSystem->destroy(); - pGuiSystem = NULL; -+ delete rp; - } - - if( pGuiRenderer ) - { -- delete pGuiRenderer; -+ pGuiRenderer->destroy( *pGuiRenderer ); - pGuiRenderer = NULL; - } - -@@ -507,7 +509,7 @@ - } - case SDL_VIDEORESIZE: - { -- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); -+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); - break; - } - case SDL_KEYDOWN: -diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp ---- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 -+++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 -@@ -946,7 +946,7 @@ - m_text_debug_text->setVisible( 1 );
-
- // update position
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- if( text_width > 800.0f )
-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp ---- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 -+++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -432,17 +432,12 @@ -
- void cMouseCursor :: Render( void ) const
- {
-- if( !m_active )
-- {
-+ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-+
-+ if ( m_active == mouse->isVisible() )
- return;
-- }
-
-- // Render CEGUI Mouse
-- pGuiRenderer->setQueueingEnabled( 0 );
-- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-- mouse->setVisible( 1 );
-- mouse->draw();
-- mouse->setVisible( 0 );
-+ mouse->setVisible( m_active );
- }
-
- void cMouseCursor :: Update_Position( void )
-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp ---- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 -+++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 -@@ -163,8 +163,8 @@ - editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
- // preview window
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
-- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
-+ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
-+ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
-
- Update_BG_Colors( CEGUI::EventArgs() );
-
-@@ -555,8 +555,8 @@ -
- // set default rect
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
-- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
-+ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
-
- if( !File_Exists( filename ) )
- {
-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp ---- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 -+++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -1663,7 +1663,7 @@ - window_name->setText( name );
- window_name->setTooltipText( tooltip );
- // get text width
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
- // all names should have the same width
- if( text_width > m_editor_window_name_width )
-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp ---- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 -+++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 -@@ -103,15 +103,15 @@ -
- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-
--cFake_Renderer :: cFake_Renderer( void )
--{
-- d_identifierString = "Fake Renderer";
--}
-+//cFake_Renderer :: cFake_Renderer( void )
-+//{
-+// d_identifierString = "Fake Renderer";
-+//}
-
--cFake_Renderer :: ~cFake_Renderer( void )
--{
-+//cFake_Renderer :: ~cFake_Renderer( void )
-+//{
-
--}
-+//}
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
-
-@@ -158,7 +158,7 @@ - std::string log_dump_dir = "/dev/null";
- #endif
- // create fake system and renderer
-- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
-+ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
- }
-
- void cVideo :: Delete_CEGUI_Fake( void ) const
-@@ -166,7 +166,7 @@ - CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
- CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
-
-- delete pGuiSystem;
-+ pGuiSystem->destroy();
- pGuiSystem = NULL;
- delete renderer;
- delete rp;
-@@ -177,7 +177,7 @@ - // create renderer
- try
- {
-- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
-+ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -186,10 +186,10 @@ - exit( EXIT_FAILURE );
- }
-
-- /* create Resource Provider
-- * no need to destroy it later since it is handled by the CEGUI renderer
-- */
-- CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
-+ pGuiRenderer->enableExtraStateSettings(true);
-+
-+ // create Resource Provider
-+ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
-
- // set Resource Provider directories
- rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
-@@ -215,7 +215,7 @@ - // create system
- try
- {
-- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
-+ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -242,7 +242,7 @@ - // load the scheme file, which auto-loads the imageset
- try
- {
-- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
-+ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -254,9 +254,7 @@ - // default mouse cursor
- pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
- // force new mouse image
-- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
-- // hide CEGUI mouse always because we render it manually
-- CEGUI::MouseCursor::getSingleton().hide();
-+ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
- // default tooltip
- pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
- // create default root window
-@@ -553,7 +551,7 @@ - pFont->Restore_Textures();
-
- // send new size to CEGUI
-- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-
- // check if CEGUI is initialized
- bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h ---- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 -+++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 -@@ -23,7 +23,7 @@ - #include "SDL_opengl.h"
- // CEGUI
- #include "CEGUI.h"
--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
-
- namespace SMC
- {
-@@ -129,31 +129,100 @@ - EFFECT_IN_AMOUNT
- };
-
--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
-+{
-+ void draw() const {}
-+ void setTranslation(const CEGUI::Vector3&) {}
-+ void setRotation(const CEGUI::Vector3&) {}
-+ void setPivot(const CEGUI::Vector3&) {}
-+ void setClippingRegion(const CEGUI::Rect&) {}
-+ void appendVertex(const CEGUI::Vertex&) {}
-+ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
-+ void setActiveTexture(CEGUI::Texture*) {}
-+ void reset() {}
-+ CEGUI::Texture* getActiveTexture() const { return 0; }
-+ CEGUI::uint getVertexCount() const { return 0; }
-+ CEGUI::uint getBatchCount() const { return 0; }
-+ void setRenderEffect(CEGUI::RenderEffect*) {}
-+ CEGUI::RenderEffect* getRenderEffect() { return 0; }
-+};
-
--class cFake_Renderer : public CEGUI::Renderer
-+class cFake_Texture : public CEGUI::Texture
-+{
-+public:
-+ cFake_Texture() :
-+ m_size(1, 1),
-+ m_scaling(1, 1) {}
-+
-+ const CEGUI::Size& getSize() const { return m_size; }
-+ const CEGUI::Size& getOriginalDataSize() const { return m_size; }
-+ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
-+ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
-+ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
-+ void saveToMemory(void*) {}
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_scaling;
-+};
-+
-+class cFake_RenderTarget : public CEGUI::RenderTarget
- {
- public:
-- cFake_Renderer( void );
-- virtual ~cFake_Renderer( void );
-+ cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
-+ void draw(const CEGUI::GeometryBuffer&) {}
-+ void draw(const CEGUI::RenderQueue&) {}
-+ void setArea(const CEGUI::Rect&) {}
-+ const CEGUI::Rect& getArea() const { return m_area; }
-+ bool isImageryCache() const { return false; }
-+ void activate() {}
-+ void deactivate() {}
-+ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
-+
-+private:
-+ CEGUI::Rect m_area;
-+};
-
-- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
-- virtual void doRender(void) {};
-- virtual void clearRenderList(void) {};
-- virtual void setQueueingEnabled(bool setting) {};
-- virtual CEGUI::Texture *createTexture(void) { return NULL; };
-- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
-- virtual CEGUI::Texture *createTexture(float size) { return NULL; };
-- virtual void destroyTexture(CEGUI::Texture* texture) {};
-- virtual void destroyAllTextures(void) {};
-- virtual bool isQueueingEnabled(void) const { return 0; };
-- virtual float getWidth(void) const { return 0; };
-- virtual float getHeight(void) const { return 0; };
-- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
-- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
-- virtual unsigned int getMaxTextureSize(void) const { return 0; };
-- virtual unsigned int getHorzScreenDPI(void) const { return 0; };
-- virtual unsigned int getVertScreenDPI(void) const { return 0; };
-+class cFake_Renderer : public CEGUI::Renderer
-+{
-+public:
-+ cFake_Renderer( void ) :
-+ m_size(0, 0),
-+ m_dpi(0, 0),
-+ m_identifierString("Fake Renderer"),
-+ m_root(m_target) {}
-+ ~cFake_Renderer( void ) {}
-+
-+ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
-+ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
-+ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
-+ void destroyAllGeometryBuffers() {}
-+ CEGUI::TextureTarget* createTextureTarget() { return 0; }
-+ void destroyTextureTarget(CEGUI::TextureTarget*) {}
-+ void destroyAllTextureTargets() {}
-+ CEGUI::Texture& createTexture() { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
-+ void destroyTexture(CEGUI::Texture&) {}
-+ void destroyAllTextures() {}
-+ void beginRendering() {}
-+ void endRendering() {}
-+ void setDisplaySize(const CEGUI::Size&) {}
-+ const CEGUI::Size& getDisplaySize() const { return m_size; }
-+ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
-+ CEGUI::uint getMaxTextureSize() const { return 0; }
-+ const CEGUI::String& getIdentifierString() const { return m_identifierString; }
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_dpi;
-+ CEGUI::String m_identifierString;
-+ cFake_GeometryBuffer m_geometry;
-+ cFake_Texture m_texture;
-+ cFake_RenderTarget m_target;
-+ CEGUI::RenderingRoot m_root;
- };
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-staging/smc/smc.desktop b/community-staging/smc/smc.desktop deleted file mode 100644 index 6cfe5b018..000000000 --- a/community-staging/smc/smc.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry]
-Name=Secret Maryo Chronicles
-GenericName=Arcade Game
-Exec=smc
-Icon=smc.png
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;KidsGame;
-StartupNotify=false
\ No newline at end of file diff --git a/community-staging/smc/smc.png b/community-staging/smc/smc.png Binary files differdeleted file mode 100644 index f02af1bfc..000000000 --- a/community-staging/smc/smc.png +++ /dev/null diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD index aeac8eda8..38ce61979 100644 --- a/community-staging/spring/PKGBUILD +++ b/community-staging/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47695 2011-05-24 20:14:25Z svenstaro $ +# $Id: PKGBUILD 47908 2011-05-26 01:20:52Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring pkgver=0.82.7.1 -pkgrel=2 +pkgrel=4 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" diff --git a/community-staging/spring/gcc46.patch b/community-staging/spring/gcc46.patch new file mode 100644 index 000000000..4f6865cac --- /dev/null +++ b/community-staging/spring/gcc46.patch @@ -0,0 +1,67 @@ +From: Jan Dittberner <jandd@debian.org> +Subject: Patch for FTBFS with g++ 4.6.0 +Bug-Debian: http://bugs.debian.org/625097 +Bug: http://springrts.com/mantis/view.php?id=2415 +--- a/AI/Skirmish/E323AI/AAStar.h ++++ b/AI/Skirmish/E323AI/AAStar.h +@@ -4,6 +4,7 @@ + #include <queue> + #include <vector> + #include <list> ++#include <cstddef> // for NULL + + class AAStar { + public: +--- a/rts/Rendering/ShadowHandler.cpp ++++ b/rts/Rendering/ShadowHandler.cpp +@@ -318,6 +318,11 @@ + xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); + ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); + ++ shadowParams.x = xmid; ++ shadowParams.y = ymid; ++ shadowParams.z = p17; ++ shadowParams.w = p18; ++ + shadowMatrix[ 0] = cross1.x / maxLengthX; + shadowMatrix[ 4] = cross1.y / maxLengthX; + shadowMatrix[ 8] = cross1.z / maxLengthX; +--- a/rts/Rendering/ShadowHandler.h ++++ b/rts/Rendering/ShadowHandler.h +@@ -38,7 +38,7 @@ + CMatrix44f shadowMatrix; + void CalcMinMaxView(void); + +- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } ++ const float4& GetShadowParams() const { return shadowParams; } + + enum ShadowGenProgram { + SHADOWGEN_PROGRAM_MODEL = 0, +@@ -76,6 +76,7 @@ + //! to write the (FBO) depth-buffer texture + std::vector<Shader::IProgramObject*> shadowGenProgs; + ++ float4 shadowParams; + float x1, x2, y1, y2; + float xmid, ymid; + float p17, p18; +--- a/rts/Rendering/GLContext.cpp ++++ b/rts/Rendering/GLContext.cpp +@@ -9,6 +9,7 @@ + #include "GLContext.h" + + #include <list> ++#include <cstddef> // for NULL + + + using namespace std; +--- a/rts/System/MemPool.h ++++ b/rts/System/MemPool.h +@@ -4,6 +4,7 @@ + #define _MEM_POOL_H_ + + #include <new> ++#include <cstddef> // for NULL + + const size_t MAX_MEM_SIZE=200; + diff --git a/community-staging/springlobby/PKGBUILD b/community-staging/springlobby/PKGBUILD deleted file mode 100644 index 2ccb51e50..000000000 --- a/community-staging/springlobby/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 47682 2011-05-24 19:40:45Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: DuGi <dugi@irc.pl> - -pkgname=springlobby -pkgver=0.131 -pkgrel=2 -pkgdesc="A free cross-platform lobby client for the Spring RTS project." -arch=('i686' 'x86_64') -url="http://springlobby.info/" -license=('GPL2') -depends=('wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs') -optdepends=('sdl' 'sdl_sound' 'sdl_mixer') -makedepends=('boost' 'asio' 'cmake') -source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 - springlobby.desktop - springlobby.png) -md5sums=('ea25f376a3fc48e3f3ff4de6d6637b5d' - '45f8b59d033931d02e734fe3bd7777dd' - '1f388187539aeb0358b51995e26ed890') - -build() { - cd $srcdir/${pkgname}-$pkgver - - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - cp $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak - sed -e 's|/usr/bin/awk|/bin/awk|g' $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak>$srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk - - sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DOPTION_SOUND=false - make -} - -package() { - cd $srcdir/${pkgname}-$pkgver - - make DESTDIR=$pkgdir install - - install -m755 -d $pkgdir/usr/share/applications - install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications - - install -m755 -d -p $pkgdir/usr/share/pixmaps - install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps -} - -# vim: sw=2:ts=2 et: diff --git a/community-staging/springlobby/springlobby.desktop b/community-staging/springlobby/springlobby.desktop deleted file mode 100644 index 1dce96b90..000000000 --- a/community-staging/springlobby/springlobby.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=SpringLobby -Comment=Lobby for Spring. An open source RTS with similar gameplay to TA -Exec=springlobby -Icon=springlobby.png -Terminal=false -Type=Application -Categories=Application;Game;StrategyGame; diff --git a/community-staging/springlobby/springlobby.png b/community-staging/springlobby/springlobby.png Binary files differdeleted file mode 100644 index 89c7ab0ac..000000000 --- a/community-staging/springlobby/springlobby.png +++ /dev/null diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD new file mode 100644 index 000000000..dbcd690af --- /dev/null +++ b/community-staging/supertux/PKGBUILD @@ -0,0 +1,30 @@ +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Eric Belanger <belanger@astro.umontreal.ca> +# Contributor: vande198 +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=supertux +pkgver=0.3.3 +pkgrel=3 +pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" +arch=('i686' 'x86_64') +url="http://super-tux.sourceforge.net/" +license=('GPL') +depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') +makedepends=('cmake' 'boost') +source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2) +md5sums=('f3f803e629ee51a9de0b366a036e393d') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp + cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/supertux/compile.patch b/community-staging/supertux/compile.patch new file mode 100644 index 000000000..05376fe91 --- /dev/null +++ b/community-staging/supertux/compile.patch @@ -0,0 +1,67 @@ +diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp +--- supertux-0.3.1.orig/src/console.hpp 2008-01-03 21:59:27.000000000 +0100 ++++ supertux-0.3.1/src/console.hpp 2008-08-23 11:57:47.000000000 +0200 +@@ -27,6 +27,8 @@ + #include <sstream> + #include <iostream> + #include <squirrel.h> ++#include <memory> ++#include <cstdlib> + + class Console; + class ConsoleStreamBuffer; +diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp +--- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 21:59:26.000000000 +0100 ++++ supertux-0.3.1/src/lisp/lexer.cpp 2008-08-23 13:45:58.000000000 +0200 +@@ -21,6 +21,7 @@ + #include <sstream> + #include <stdexcept> + #include <iostream> ++#include <cstring> + + #include "lexer.hpp" + +diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp +--- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 21:59:26.000000000 +0100 ++++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-08-23 13:29:34.000000000 +0200 +@@ -21,6 +21,7 @@ + #define SUPERTUX_SPRITE_MANAGER_H + + #include <map> ++#include <string> + + class SpriteData; + class Sprite; +diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp +--- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 21:59:27.000000000 +0100 ++++ supertux-0.3.1/src/textscroller.hpp 2008-08-23 13:34:35.000000000 +0200 +@@ -24,6 +24,7 @@ + #include <vector> + #include <string> + #include <map> ++#include <memory> + + #include "screen.hpp" + #include "math/vector.hpp" +diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp +--- supertux-0.3.1.orig/src/title.cpp 2008-01-03 21:59:28.000000000 +0100 ++++ supertux-0.3.1/src/title.cpp 2008-08-23 12:05:19.000000000 +0200 +@@ -32,6 +32,7 @@ + #include <SDL.h> + #include <SDL_image.h> + #include <physfs.h> ++#include <algorithm> + + #include "title.hpp" + #include "mainloop.hpp" +diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp +--- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 21:59:22.000000000 +0100 ++++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-08-23 13:37:14.000000000 +0200 +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <SDL.h> ++#include <algorithm> + + #include "texture.hpp" + #include "color.hpp" diff --git a/community-staging/supertux/gcc44.patch b/community-staging/supertux/gcc44.patch new file mode 100644 index 000000000..b58d9c29d --- /dev/null +++ b/community-staging/supertux/gcc44.patch @@ -0,0 +1,90 @@ +diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp +--- supertux-0.3.1.orig/src/console.hpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/console.hpp 2009-05-17 19:43:26.914307646 +0000 +@@ -27,6 +27,8 @@ + #include <sstream> + #include <iostream> + #include <squirrel.h> ++#include <memory> ++#include <cstdlib> + + class Console; + class ConsoleStreamBuffer; +diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp +--- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/lisp/lexer.cpp 2009-05-17 19:43:27.037705317 +0000 +@@ -21,6 +21,7 @@ + #include <sstream> + #include <stdexcept> + #include <iostream> ++#include <cstring> + + #include "lexer.hpp" + +diff -ruN supertux-0.3.1.orig/src/lisp/lisp.cpp supertux-0.3.1/src/lisp/lisp.cpp +--- supertux-0.3.1.orig/src/lisp/lisp.cpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/lisp/lisp.cpp 2009-05-17 19:44:29.305165638 +0000 +@@ -18,7 +18,7 @@ + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + #include <config.h> +- ++#include <cstdio> + #include "lisp.hpp" + + namespace lisp +diff -ruN supertux-0.3.1.orig/src/random_generator.cpp supertux-0.3.1/src/random_generator.cpp +--- supertux-0.3.1.orig/src/random_generator.cpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/random_generator.cpp 2009-05-17 19:44:05.851002254 +0000 +@@ -39,6 +39,7 @@ + #include <stdexcept> + #include <time.h> + #include <cassert> ++#include <cstdio> + #include "random_generator.hpp" + + RandomGenerator systemRandom; // global random number generator +diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp +--- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2009-05-17 19:43:27.037705317 +0000 +@@ -21,6 +21,7 @@ + #define SUPERTUX_SPRITE_MANAGER_H + + #include <map> ++#include <string> + + class SpriteData; + class Sprite; +diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp +--- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/textscroller.hpp 2009-05-17 19:43:27.037705317 +0000 +@@ -24,6 +24,7 @@ + #include <vector> + #include <string> + #include <map> ++#include <memory> + + #include "screen.hpp" + #include "math/vector.hpp" +diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp +--- supertux-0.3.1.orig/src/title.cpp 2008-01-03 20:59:28.000000000 +0000 ++++ supertux-0.3.1/src/title.cpp 2009-05-17 19:43:27.041000359 +0000 +@@ -32,6 +32,7 @@ + #include <SDL.h> + #include <SDL_image.h> + #include <physfs.h> ++#include <algorithm> + + #include "title.hpp" + #include "mainloop.hpp" +diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp +--- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 20:59:22.000000000 +0000 ++++ supertux-0.3.1/src/video/sdl_texture.hpp 2009-05-17 19:43:27.041000359 +0000 +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <SDL.h> ++#include <algorithm> + + #include "texture.hpp" + #include "color.hpp" diff --git a/community-staging/tagpy/PKGBUILD b/community-staging/tagpy/PKGBUILD deleted file mode 100644 index 246a92e12..000000000 --- a/community-staging/tagpy/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 47614 2011-05-24 13:24:59Z jelle $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Callan Barrett <wizzomafizzo@gmail.com> -# Contributor: Scott Horowitz <stonecrest@gmail.com> - -pkgname=tagpy -pkgver=0.94.8 -pkgrel=4 -pkgdesc="Python bindings for TagLib" -arch=('i686' 'x86_64') -url="http://pypi.python.org/pypi/tagpy" -license=('MIT') -depends=('python2' 'taglib' 'boost-libs') -makedepends=('python2-distribute' 'boost') -source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('6baff63318cf90b9bc5a2497a0597802') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find . -name '*.py') - - ./configure.py --taglib-lib-dir=/usr/lib/ \ - --taglib-inc-dir=/usr/include/taglib/ \ - --boost-inc-dir=/usr/include/boost/ \ - --boost-lib-dir=/usr/lib/ \ - --boost-python-libname=boost_python - python2 setup.py build -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - python2 setup.py install --root="${pkgdir}" --optimize=1 - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-staging/twinkle/PKGBUILD b/community-staging/twinkle/PKGBUILD deleted file mode 100644 index 02e37d080..000000000 --- a/community-staging/twinkle/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 47620 2011-05-24 13:41:29Z jelle $ -# Maintainer: -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> - -pkgname=twinkle -pkgver=1.4.2 -pkgrel=10 -pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" -arch=('i686' 'x86_64') -url="http://www.twinklephone.com/" -license=('GPL') -depends=('file' 'speex' 'boost-libs' 'libsndfile' 'commoncpp2' 'libxml2' 'libx11' - 'qt3' 'libzrtpcpp') -makedepends=('pkg-config' 'boost') -source=(http://www.xs4all.nl/~mfnboer/${pkgname}/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('d70c8972f296ffd998c7fb698774705b') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - . /etc/profile.d/qt3.sh - ./configure --prefix=/usr \ - --without-kde \ - --with-speex - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 twinkle.desktop ${pkgdir}/usr/share/applications/twinkle.desktop -} diff --git a/community-staging/twinkle/twinkle.desktop b/community-staging/twinkle/twinkle.desktop deleted file mode 100644 index e85a32e51..000000000 --- a/community-staging/twinkle/twinkle.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Twinkle -Comment=A SIP softphone for Qt -Icon=/usr/share/twinkle/twinkle48.png -Exec=twinkle -Terminal=false -Type=Application -Categories=Network; -StartupNotify=false diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD new file mode 100644 index 000000000..41dab8d90 --- /dev/null +++ b/community-staging/vdrift/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 47904 2011-05-26 00:55:30Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Lone_Wolf lonewolf@xs4all.nl + +pkgname=vdrift +pkgver=2010.06.30 +pkgrel=3 +pkgdesc="An open source driving simulation made with drift racing in mind" +arch=('i686' 'x86_64') +url="http://vdrift.net/" +license=('GPL') +depends=('sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') +makedepends=('scons' 'boost' 'asio') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-${pkgver//./-}/$pkgname-${pkgver//./-}.tar.bz2 + $pkgname.desktop) +md5sums=('ddcaf90bb25f9ce9cc084d7f467d7b56' + '8bb429f37bcb4aed5e7ab1d80c5a4f93') + +build() { + cd "$srcdir"/$pkgname-${pkgver//./-} + + # select arch + if [ `uname -m` = "x86_64" ]; then + _sconsarch="a64" + else + _sconsarch="686" + fi + + # patch for crashing with bad drivers + sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp + + # build and install + scons \ + "destdir"="$pkgdir" \ + "arch"=$_sconsarch \ + "release"=1 \ + "force_feedback"=1 \ + "prefix"=/usr \ + "datadir"=share/$pkgname/data || return 1 +} + +package() { + cd "$srcdir"/$pkgname-${pkgver//./-} + + scons install || return 1 + + # remove some unneeded files + find "$pkgdir"/usr/share/$pkgname -name SConscript -delete + + # install icons + install -Dm644 data/textures/icons/$pkgname-16x16.png \ + "$pkgdir"/usr/share/icons/hicolor/16x16/apps/$pkgname.png + install -Dm644 data/textures/icons/$pkgname-32x32.png \ + "$pkgdir"/usr/share/icons/hicolor/32x32/apps/$pkgname.png + install -Dm644 data/textures/icons/$pkgname-64x64.png \ + "$pkgdir"/usr/share/icons/hicolor/64x64/apps/$pkgname.png + + # install .desktop file + install -Dm644 ../$pkgname.desktop \ + "$pkgdir"/usr/share/applications/$pkgname.desktop + + # delete installed data (will be provided by -data package) + rm -r "$pkgdir"/usr/share/$pkgname +} +# vim: sw=2:ts=2 et: diff --git a/community-staging/vdrift/vdrift.desktop b/community-staging/vdrift/vdrift.desktop new file mode 100644 index 000000000..7078f0d9c --- /dev/null +++ b/community-staging/vdrift/vdrift.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=VDrift +Version=2009-06-15 +GenericName=Racing Simulation +Comment=An open source driving simulation made with drift racing in mind +Exec=vdrift +Icon=vdrift.png +Terminal=false +Categories=Game;Simulation; diff --git a/community-staging/widelands/PKGBUILD b/community-staging/widelands/PKGBUILD new file mode 100644 index 000000000..e2a882999 --- /dev/null +++ b/community-staging/widelands/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 47900 2011-05-26 00:39:20Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <rabyte*gmail> + +pkgname=widelands +pkgver=16 +_realver=build16 +pkgrel=2 +pkgdesc="A realtime strategy game with emphasis on economy and transport" +arch=('i686' 'x86_64') +url="http://widelands.org/" +license=('GPL') +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') +makedepends=('cmake' 'boost') +source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 + $pkgname.desktop + $pkgname.png + $pkgname.sh) +md5sums=('3d8c28e145b73c64d8ed1625319d25a2' + '15820bf099fd6f16251fe70a75c534bb' + '3dfda7e9ca76ca00dd98d745d0ceb328' + '7cae50aba5ed0cd2cfeea79124637b46') + +build() { + cd $srcdir/$pkgname-$_realver-src + + mkdir -p build/compile && cd build/compile + + cmake ../.. -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_DATADIR=share/$pkgname \ + -DWL_INSTALL_BINDIR=bin + make +} + +package() { + cd $srcdir/$pkgname-$_realver-src/build/compile + + make DESTDIR="$pkgdir" install + + # Install bin, icon and desktop file + #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname + #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname + install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png + install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +} diff --git a/community-staging/widelands/widelands-build15-gcc-4.5-patch b/community-staging/widelands/widelands-build15-gcc-4.5-patch new file mode 100644 index 000000000..6ba313358 --- /dev/null +++ b/community-staging/widelands/widelands-build15-gcc-4.5-patch @@ -0,0 +1,51 @@ +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 +@@ -113,7 +113,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Map::button_clicked, *this, 4, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -142,7 +142,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name + ()); + break; + } +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 +@@ -272,7 +272,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Random_Map::button_clicked, *this, 8, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -343,7 +343,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + break; + case 9: + break; +@@ -476,7 +476,7 @@ + (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) + ++m_currentworld; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + button_clicked(-1); // Update other values in UI as well + diff --git a/community-staging/widelands/widelands.desktop b/community-staging/widelands/widelands.desktop new file mode 100644 index 000000000..9715d816c --- /dev/null +++ b/community-staging/widelands/widelands.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Widelands +GenericName=Widelands +Comment=Realtime strategy game +Icon=widelands +Exec=widelands +Type=Application +Categories=Game;StrategyGame; diff --git a/community-staging/widelands/widelands.png b/community-staging/widelands/widelands.png Binary files differnew file mode 100644 index 000000000..c329cf667 --- /dev/null +++ b/community-staging/widelands/widelands.png diff --git a/community-staging/widelands/widelands.sh b/community-staging/widelands/widelands.sh new file mode 100644 index 000000000..0b21a1694 --- /dev/null +++ b/community-staging/widelands/widelands.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /usr/share/widelands +./widelands $* diff --git a/community-staging/wml/PKGBUILD b/community-staging/wml/PKGBUILD new file mode 100644 index 000000000..2f7a3781f --- /dev/null +++ b/community-staging/wml/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 47762 2011-05-25 13:41:49Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=wml +pkgver=2.0.11 +pkgrel=6 +pkgdesc="The Website Meta Language" +arch=('i686' 'x86_64') +url="http://thewml.org/" +license=('GPL') +depends=('perl' 'libpng' 'gdbm' 'db' 'ncurses') +makedepends=('lynx') +source=("http://thewml.org/distrib/${pkgname}-${pkgver}.tar.gz") +md5sums=('a26feebf4e59e9a6940f54c69dde05b5') +build() { + cd ${pkgname}-${pkgver} + + # missing Perl modules fix + sed -i 's/PREFIX=$(libdir)\/perl/DESTDIR=\.\.\/\.\.\/\.\.\/\.\.\/pkg\/ PREFIX=$(libdir)\/perl/' wml_common/Makefile.in + sed -i 's/$(MAKE) pure_perl_install $(MM_INSTALL_OPTS)/$(MAKE) pure_perl_install/' wml_common/Makefile.in + + unset LDFLAGS + ./configure \ + --prefix=/usr + + # compile fixhack + sed -i 's#/usr/lib/perl5/core_perl/auto/DynaLoader/DynaLoader.a##' wml_backend/p3_eperl/Makefile + sed -i 's/extern struct option options\[\]\;//' ${srcdir}/${pkgname}-${pkgver}/wml_backend/p3_eperl/eperl_proto.h + sed -i 's|strip $dsttmp|#strip $dsttmp|' etc/shtool + mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib/wml/exec ${pkgdir}/usr/man/man{1,3,7} ${pkgdir}/usr/man/cat{1,7} + +# make clean + make +} + +package() { + cd ${pkgname}-${pkgver} + + make prefix=${pkgdir}/usr install + + [ -d ${pkgdir}/usr/man ] && mkdir -p ${pkgdir}/usr/share && mv ${pkgdir}/usr/man ${pkgdir}/usr/share +} diff --git a/community-staging/znc/PKGBUILD b/community-staging/znc/PKGBUILD new file mode 100644 index 000000000..0bc108944 --- /dev/null +++ b/community-staging/znc/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 47765 2011-05-25 13:51:21Z tdziedzic $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: mickael9 <mickael9 at gmail dot com> + +pkgname=znc +pkgver=0.098 +pkgrel=3 +pkgdesc='An IRC bouncer with modules & scripts support' +url='http://en.znc.in/wiki/index.php/ZNC' +license=('GPL2') +arch=('i686' 'x86_64') + +depends=('c-ares' 'gcc-libs' 'openssl') +makedepends=('swig' 'tcl' 'python' 'perl' 'cyrus-sasl') +optdepends=('tcl: modtcl module' + 'python: modpython module' + 'perl: modperl module' + 'cyrus-sasl: saslauth module') + +source=("http://znc.in/releases/znc-${pkgver}.tar.gz") +md5sums=('5667b4acb1f01309d6eded77abac700c') + +build() { + cd znc-${pkgver} + + ./configure --prefix=/usr \ + --enable-sasl \ + --enable-tcl \ + --enable-python \ + --enable-perl \ + --enable-extra + + make +} + +package() { + cd znc-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/gitg/PKGBUILD b/community-testing/gitg/PKGBUILD new file mode 100644 index 000000000..19c71018e --- /dev/null +++ b/community-testing/gitg/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Blaž Tomžič <blaz.tomazic@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> +# Contributor: M Rawash <mrawash@gmail.com> +# Contributor: DonVla <donvla@users.sourceforge.net> + +pkgname=gitg +pkgver=0.2.2 +pkgrel=1 +pkgdesc='A GIT repository viewer based on GTK+' +arch=('i686' 'x86_64') +url='http://trac.novowork.com/gitg/' +license=('GPL') +depends=('gconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas') +makedepends=('intltool') +install="${pkgname}.install" +source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.bz2") +sha256sums=('cfa1b1d2bdd1211c09e00dca42130ea98e98fde576d85e18eabfde1802d0d04a') + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/gitg/gitg.install b/community-testing/gitg/gitg.install new file mode 100644 index 000000000..787d6085e --- /dev/null +++ b/community-testing/gitg/gitg.install @@ -0,0 +1,17 @@ +# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: DonVla <donvla@users.sourceforge.net> +# gitg install file + +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD index 34a1fd70d..6d13e9d8b 100644 --- a/community/calcurse/PKGBUILD +++ b/community/calcurse/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 44138 2011-04-03 20:43:17Z lfleischer $ +# $Id: PKGBUILD 48143 2011-05-28 23:23:26Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: wain <wain.at.gmx.net> pkgname=calcurse -pkgver=2.8 -pkgrel=2 +pkgver=2.9.0 +pkgrel=1 pkgdesc='A text-based personal organizer.' arch=('i686' 'x86_64' 'mips64el') url='http://calcurse.org/' license=('BSD') depends=('ncurses') source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('124d40c0912b12021996220f02b759cc') +md5sums=('3ff0229581060d43232a6fb56b0cd07a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index c36f9fcac..9ec165ff9 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 47354 2011-05-21 22:44:04Z giovanni $ +# $Id: PKGBUILD 47955 2011-05-26 11:34:38Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" license=('GPL3') -depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'python2-cherrypy' +depends=('python-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 'python-imaging' 'desktop-file-utils' 'shared-mime-info' @@ -26,7 +26,8 @@ md5sums=('e64c92ccf29ac17bfaf4a296e17a38ba' build() { cd "${srcdir}/${pkgname}" - rm -rf src/{cherrypy,pyPdf} + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ $(find . -regex ".*.py\|.*.recipe") diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index c7c273d5d..4acbcb555 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 43777 2011-03-29 18:26:08Z lfleischer $ +# $Id: PKGBUILD 47638 2011-05-24 14:28:23Z tdziedzic $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive pkgver=0.7.3.1 -pkgrel=2 +pkgrel=3 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64' 'mips64el') url='http://cclive.sourceforge.net/' @@ -16,11 +16,15 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pk md5sums=('de25297e9f34677d4d1920078d9cf254') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - cmake -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=/usr + cd ${pkgname}-${pkgver} + + cmake \ + -DCMAKE_BUILD_TYPE=debug \ + -DCMAKE_INSTALL_PREFIX=/usr } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index 091e9dfa9..e312ba5ef 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42879 2011-03-22 02:06:35Z foutrelis $ +# $Id: PKGBUILD 47874 2011-05-25 20:20:57Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Link Dupont <link@subpop.net> pkgname=cherokee -pkgver=1.2.2 -pkgrel=2 +pkgver=1.2.98 +pkgrel=1 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64' 'mips64el') url="http://www.cherokee-project.com/" @@ -25,7 +25,7 @@ options=('!libtool') source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz cherokee.rc cherokee.logrotate) -md5sums=('6450f0aa116966227c477a1930292e53' +md5sums=('21b01e7d45c0e82ecc0c4257a9c27feb' 'a2d2b69c6220fab57cda4f531b680f9f' '8d69341bd4002bffd69c6e82ff6c905f') @@ -38,10 +38,15 @@ build() { # Use Python 2 in cherokee-admin sed -i 's/"python"/"python2"/' cherokee/main_admin.c - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-wwwroot=/srv/http --disable-static \ - --with-wwwuser=http --with-wwwgroup=http \ - --enable-os-string="Arch Linux" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --with-wwwroot=/srv/http \ + --with-wwwuser=http \ + --with-wwwgroup=http \ + --enable-os-string="Arch Linux" make } diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD deleted file mode 100644 index 914d80456..000000000 --- a/community/csfml/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 21275 2010-07-15 20:18:37Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arvil <arvil at k3v1n5 dot eu> - -pkgname=csfml -pkgver=1.6 -pkgrel=1 -pkgdesc="C binding for SFML." -arch=('i686' 'x86_64' 'mips64el') -url=http://www.sfml-dev.org -license=('zlib') -depends=('sfml') -source=(http://downloads.sourceforge.net/sfml/SFML-$pkgver-c-sdk-linux-32.tar.gz) -md5sums=('47612e9dc3c9be35e32c188dd937e0d6') - -build() { - cd "$srcdir/SFML-$pkgver/CSFML" - - msg "Building libraries." - make || return 1 - make DESTDIR=${pkgdir}/usr install || return 1 - - # Fix the library softlinks - cd "$pkgdir/usr/lib" - rm *.so - for lib in *; do - ln -s $lib ${lib/.$pkgver/} - done -} -# vim:set ts=2 sw=2 et: diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index c4c21332d..be91a3d52 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47194 2011-05-18 15:41:47Z lfleischer $ +# $Id: PKGBUILD 48027 2011-05-27 16:02:04Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef -pkgver=0.5.0 -pkgrel=2 +pkgver=0.5.1 +pkgrel=1 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' @@ -29,7 +29,7 @@ optdepends=('libvorbis: for Ogg Vorbis playback' options=('!libtool') install='deadbeef.install' source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('713c47c5e7bb9a29cd0de877aff04ae6') +md5sums=('be8359d1bd9cf7679cf2ca748996e726') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/elinks/elinks.desktop b/community/elinks/elinks.desktop deleted file mode 100644 index e27adf912..000000000 --- a/community/elinks/elinks.desktop +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -Categories=Application;Network; -Comment=advanced and well-established feature-rich text mode web (HTTP/FTP/..) browser -Comment[en_GB]=advanced and well-established feature-rich text mode web (HTTP/FTP/..) browser -Exec=elinks %u -GenericName=Full-Featured Text WWW Browser -GenericName[en_GB]=Full-Featured Text WWW Browser -Icon= -MimeType=text/html -Name=Elinks -Name[en_GB]=Elinks -Path= -StartupNotify=true -Terminal=true -TerminalOptions= -Type=Application -X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD index decc78a79..b996779ba 100644 --- a/community/encfs/PKGBUILD +++ b/community/encfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40979 2011-03-02 23:44:42Z tdziedzic $ +# $Id: PKGBUILD 47658 2011-05-24 17:28:48Z jelle $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Sven Kauber, <celeon@gmail.com> @@ -6,7 +6,7 @@ pkgname=encfs pkgver=1.7.4 -pkgrel=3 +pkgrel=4 pkgdesc='Encrypted filesystem in user-space' arch=('i686' 'x86_64' 'mips64el') url='http://www.arg0.net/encfs' diff --git a/community/evolution-rss/PKGBUILD b/community/evolution-rss/PKGBUILD deleted file mode 100644 index fdb86d4c3..000000000 --- a/community/evolution-rss/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Creator: Borromini <gotleenucks at g-male dot com> -# Maintainter: Jelle van der Waa <jelle at vdwaa dot nl> - -pkgname='evolution-rss' -pkgver=0.2.3 -pkgrel=5 -pkgdesc="This plugin implements RSS reading capability within Evolution" -arch=(i686 x86_64 'mips64el') -license=('GPL') -install=evolution-rss.install -url="http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin" -depends=('evolution' 'libsoup' 'libgnomecanvas') -makedepends=('intltool' 'gnome-common') -options=('!libtool' '!emptydirs') -source=(http://gnome.eu.org/$pkgname-$pkgver.tar.gz - add-dbus-glib.patch) -md5sums=('bbf825c3655eaebadc429141a8f408d0' - 'ef16147db282739cd5218ef590b79c81') -build() { - cd $srcdir/$pkgname-${pkgver} - patch -Np1 -i $srcdir/add-dbus-glib.patch - ./autogen.sh - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-primary-render=gtkhtml \ - --disable-schemas-install - make -} - -package() { - cd $srcdir/$pkgname-${pkgver} - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install - - mkdir -p $pkgdir/usr/share/gconf/schemas - gconf-merge-schema $pkgdir/usr/share/gconf/schemas/${pkgname}.schemas $pkgdir/etc/gconf/schemas/*.schemas - rm -rf $pkgdir/etc/gconf/ -} diff --git a/community/evolution-rss/add-dbus-glib.patch b/community/evolution-rss/add-dbus-glib.patch deleted file mode 100644 index fa5cd5ada..000000000 --- a/community/evolution-rss/add-dbus-glib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur evolution-rss-0.2.3.orig/src/Makefile.am evolution-rss-0.2.3/src/Makefile.am ---- evolution-rss-0.2.3.orig/src/Makefile.am 2011-01-28 09:29:44.000000000 -0800 -+++ evolution-rss-0.2.3/src/Makefile.am 2011-03-14 09:51:19.510031938 -0700 -@@ -94,7 +94,7 @@ - endif - - liborg_gnome_evolution_rss_la_SOURCES = $(SOURCES) --liborg_gnome_evolution_rss_la_LIBADD = $(WEBKIT_LIBS) $(GECKO_LIBS) $(LIBSOUP_LIBS) $(GTKHTML_EDITOR_LIBS) $(NO_UNDEFINED_LIBS) -+liborg_gnome_evolution_rss_la_LIBADD = $(WEBKIT_LIBS) $(GECKO_LIBS) $(LIBSOUP_LIBS) $(GTKHTML_EDITOR_LIBS) $(NO_UNDEFINED_LIBS) $(DBUS_LIBS) - liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - #$(GECKO_RPATH) - diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 55ee84975..e3d246e34 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 40982 2011-03-03 00:04:39Z tdziedzic $ +# $Id: PKGBUILD 47629 2011-05-24 14:03:19Z tdziedzic $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=fatrat pkgver=1.1.3 -pkgrel=3 +pkgrel=4 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" @@ -14,16 +14,20 @@ source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) md5sums=('6d4a00cdd0b59a05b1521184508d4637') build() { - cd "$srcdir"/$pkgname-$pkgver + cd $pkgname-$pkgver export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - cmake -DWITH_EVERYTHING=ON -DCMAKE_INSTALL_PREFIX=/usr . + cmake \ + -DWITH_EVERYTHING=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + make } package() { - cd "$srcdir"/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD index 2aae5aebc..6171fed8b 100644 --- a/community/flickcurl/PKGBUILD +++ b/community/flickcurl/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 44887 2011-04-12 12:28:24Z spupykin $ +# $Id: PKGBUILD 48114 2011-05-28 21:04:15Z remy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=flickcurl pkgver=1.21 -pkgrel=1 +pkgrel=2 pkgdesc="C library for the Flickr API" arch=(i686 x86_64 'mips64el') url="http://librdf.org/flickcurl/" license=('GPL') depends=(raptor) -makedepends=() source=(http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz) md5sums=('d4d364231505dc22a6af42be7bc85edf') diff --git a/community/frogatto/PKGBUILD b/community/frogatto/PKGBUILD index b4da0526c..fb3b6553d 100644 --- a/community/frogatto/PKGBUILD +++ b/community/frogatto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 46852 2011-05-12 23:55:35Z svenstaro $ +# $Id: PKGBUILD 47675 2011-05-24 19:05:16Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Tom Wambold <tom5760@gmail.com> pkgname='frogatto' arch=('i686' 'x86_64') pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog" url="http://www.frogatto.com" license=('GPL') diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index 66506836b..a775b9b25 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44283 2011-04-05 06:25:28Z lcarlier $ +# $Id: PKGBUILD 48045 2011-05-27 17:00:59Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -19,7 +19,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') -pkgver=2.23.0 +pkgver=2.23.1 pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') @@ -35,10 +35,11 @@ groups=('gambas2') replaces=('gambas2') conflicts=('gambas2') source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 - 'fix-gbi-gba-path.patch' 'gambas2-script.install' - 'gambas2-runtime.install') -md5sums=('f777cfe187ba58c176f90a85e33a9758' + 'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch' + 'gambas2-script.install' 'gambas2-runtime.install') +md5sums=('ff8d2c1f310222c150b114e7ce247dfd' '9dda03a1bbfb7e7ba8b6a4ae91b6752b' + 'ac9703b390502ed3242c8d34485c9236' '870ff5b4b33cd75aa9c290539e6fdd5d' 'ab5667175c4945282d2f40a35d0e9e5b') _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" @@ -67,6 +68,8 @@ build() { ## workaround to allow package splitting msg "Applying patches ..." patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch" + # merged upstream + patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch" ./reconf-all ## diff --git a/community/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community/gambas2/db.firebird.gcc-4.6.0-fix.patch new file mode 100644 index 000000000..0b6e68df3 --- /dev/null +++ b/community/gambas2/db.firebird.gcc-4.6.0-fix.patch @@ -0,0 +1,35 @@ +--- gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:01:54 3864 ++++ gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:26:41 3865 +@@ -1216,7 +1216,8 @@ + GB.StoreVariant(&fantom, &buffer[i]); + } + else{ +- GB.StoreVariant(&res->GetData(pos,i), &buffer[i]); ++ GB_VARIANT val = res->GetData(pos,i); ++ GB.StoreVariant(&val , &buffer[i]); + } + } + } +@@ -1874,6 +1875,8 @@ + static char query[SQLMAXLEN]; + int type; + std::string str1,str2; ++ GB_VARIANT varval; ++ char* charval; + snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field); + if (do_query(db, query, &res, "Unable to get the field from the table")){ + delete res; +@@ -1900,9 +1903,11 @@ + str1=res->GetData(0,3).value.value._string; + if(str1!="") + str2=str1.assign(str1,8,str1.length()-8); +- GB.FreeString(&res->GetData(0,3).value.value._string); ++ charval = res->GetData(0,3).value.value._string; ++ GB.FreeString(&charval); + res->SetData(0,3,str2); +- GB.StoreVariant(&res->GetData(0,3), &info->def); ++ varval = res->GetData(0,3); ++ GB.StoreVariant(&varval, &info->def); + } + delete res; + return FALSE; diff --git a/community/gambas3/gambas3.desktop b/community/gambas3/gambas3.desktop deleted file mode 100644 index d35d829f3..000000000 --- a/community/gambas3/gambas3.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=Gambas3 -Exec=gambas3 -Icon=/usr/share/pixmaps/gambas3.png -Terminal=false -X-MultipleArgs=false -Type=Application -Categories=Application;Development; -Encoding=UTF-8 -StartupNotify=true - -GenericName= diff --git a/community/gambas3/gambas3.png b/community/gambas3/gambas3.png Binary files differdeleted file mode 100644 index 302ab3058..000000000 --- a/community/gambas3/gambas3.png +++ /dev/null diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 7a291ddb0..433981d5d 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45665 2011-04-26 21:32:06Z ibiru $ +# $Id: PKGBUILD 47971 2011-05-26 16:56:27Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Contributor: Hugo Doria <hugo@archlinux.org> #Contributor: Sergej Chodarev <sergejx@centrum.sk> #Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="Set of plugins for gedit" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gedit-plugins.install source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.bz2) -sha256sums=('7152d3f5639258a0b5fb873521d36fc9919dee4c00ce9fb414045a2d8b0c06f6') +sha256sums=('d574accc1238fb45759c7b088154f934cdd1ef8f7dcb42420db02ee73a46af4b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD index 9fc2ca432..053da0ecd 100644 --- a/community/glob2/PKGBUILD +++ b/community/glob2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 40961 2011-03-02 21:23:41Z lcarlier $ +# $Id: PKGBUILD 47655 2011-05-24 16:52:31Z schuay $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=glob2 pkgver=0.9.4.4 -pkgrel=7 +pkgrel=8 pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" arch=('i686' 'x86_64' 'mips64el') url="http://www.globulation2.org/" license=('GPL3') -depends=('boost-libs>=1.46' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' \ +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' \ 'fribidi' 'desktop-file-utils') -makedepends=('scons' 'boost>=1.46') +makedepends=('scons' 'boost') install=glob2.install source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz \ glob2-0.9.4.1-gcc44.patch) diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 6200c084a..4dbef2056 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 41025 2011-03-03 06:39:10Z svenstaro $ +# $Id: PKGBUILD 47669 2011-05-24 17:51:15Z schuay $ # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom pkgver=1.16.1 -pkgrel=5 +pkgrel=6 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.glom.org/" license=('GPL') -depends=('libgdamm>=3.99.21' 'libxml++>=2.30.1' 'gconfmm>=2.28.2' 'pygtk' +depends=('libgdamm' 'libxml++' 'gconfmm' 'pygtk' 'python2-gda' 'libgtksourceviewmm2' 'goocanvasmm' 'libepc' 'iso-codes' 'postgresql' 'hicolor-icon-theme' 'shared-mime-info' - 'gtkmm>=2.22.0' 'boost-libs>=1.45' 'gettext') -makedepends=('intltool' 'gnome-doc-utils>=0.20.2' 'boost>=1.45' 'python-sphinx' 'glibmm-docs') + 'gtkmm' 'boost-libs' 'gettext') +makedepends=('intltool' 'gnome-doc-utils' 'boost' 'python-sphinx' 'mm-common') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) @@ -22,6 +22,12 @@ md5sums=('9ae56e0886f14a48cedaef9beb9c3cc9') build() { cd "$srcdir/$pkgname-$pkgver" + + # doctooldir is now owned by mm-common-util instead of glibmm + # the following sed line can be removed once (if) upstream provides a fixed + # configure script + sed -i 's%\(MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir \)glibmm-2.4%\1mm-common-util%' configure + ./configure --prefix=/usr \ --with-postgres-utils=/usr/bin \ --disable-scrollkeeper \ diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 557c1edd1..f962211b1 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -4,8 +4,8 @@ pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.9 -pkgrel=2 -arch=(i686 x86_64 'mips64el') +pkgrel=3 +arch=(i686 x86_64) url="http://www.gnu.org/software/gnash/" license=(GPL3) makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool @@ -20,6 +20,10 @@ md5sums=('5b2be6b04a1bcc5fb404cc377034499e') build() { cd "$srcdir/gnash-$pkgver" + # Version is now in version.h + sed -i 's/avcodec\.h/version.h/' macros/ffmpeg.m4 + ./autogen.sh + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index 549571f5b..a435daaaa 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 46877 2011-05-13 10:25:53Z lfleischer $ +# $Id: PKGBUILD 47944 2011-05-26 08:59:17Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64' 'mips64el') url='http://gnome-mplayer.googlecode.com/' license=('GPL') -depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme') +depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme' 'dconf') makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") @@ -19,7 +19,7 @@ md5sums=('72a1c7d640a67eb2d60f2671108919c2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-install --without-gconf + ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-install make } diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index cd517d218..20c933ec7 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 47009 2011-05-14 01:24:52Z jconder $ +# $Id: PKGBUILD 48001 2011-05-26 23:17:43Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64') url='http://www.packagekit.org/' license=('GPL') depends=('dconf' 'desktop-file-utils' 'gnome-menus' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'packagekit') -makedepends=('gconf' 'gtk-doc' 'intltool' 'libcanberra' 'upower') +makedepends=('gconf' 'gtk-doc' 'gnome-common' 'intltool' 'libcanberra' 'upower') optdepends=('gnome-settings-daemon-updates: update and message notifications') options=('!emptydirs' '!libtool') install="$pkgname.install" source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" 'arch.patch') -sha256sums=('838ca07168dbf7f29fc83ff3c0ef570e7703082d44f5607b09af01972fc52a49' +sha256sums=('faaae52d839a66d0bcb7d7cf97ef62d11bccf558e6aa9fdb0dbc8d61dbaf714f' '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac') build() { @@ -26,7 +26,8 @@ build() { sed -i 's@python@python2@' 'python/enum-convertor.py' export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr \ + # TODO: remove gnome-common dependency and switch back to configure + gnome-autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --disable-gtk-doc \ --disable-schemas-compile \ diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 26279b4aa..e1c0348e9 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46899 2011-05-13 15:02:09Z jconder $ +# $Id: PKGBUILD 48006 2011-05-26 23:21:11Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('!emptydirs' '!libtool') install=$_pkgname.install source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2" 'arch.patch') -sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117' +sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec' '91700d5c7c52cb6e15ed46ec61a150af58e073de7332351a1f7863a41042d134') build() { diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index f3f104163..b8b6efcc2 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45236 2011-04-18 13:25:52Z spupykin $ +# $Id: PKGBUILD 47650 2011-05-24 16:23:35Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> pkgname=gpsdrive pkgver=2.11 -pkgrel=7 +pkgrel=8 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64" 'mips64el') url="http://www.gpsdrive.de/" diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index e639dc22a..442493585 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,9 +1,10 @@ +# $Id: PKGBUILD 47888 2011-05-25 23:35:15Z ebelanger $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 pkgdesc="Japanese input method Anthy IMEngine for IBus Framework" arch=('i686' 'x86_64' 'mips64el') @@ -11,28 +12,22 @@ license=('LGPL') url="http://ibus.googlecode.com" depends=('ibus' 'anthy' 'python2') makedepends=('swig' 'intltool') -provides=('ibus-anthy') options=('!libtool') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('00b44c874616d797a0117d087cf33341') +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +md5sums=('894c7311f4d5c96b1fdb8b3795446ead') build() { - cd ${pkgname}-${pkgver} - - # python2 fix + cd "${srcdir}/${pkgname}-${pkgver}" +# python2 fix for file in setup/ibus-setup-anthy.in engine/ibus-engine-anthy.in; do sed -i 's_exec python_exec python2_' $file done - ./configure \ - --prefix=/usr \ - --libexec=/usr/lib/ibus - + ./configure --prefix=/usr --libexec=/usr/lib/ibus make } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD deleted file mode 100644 index e94913fa2..000000000 --- a/community/inn/PKGBUILD +++ /dev/null @@ -1,121 +0,0 @@ -# $Id: PKGBUILD 44059 2011-04-01 20:32:01Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Edward Tjörnhammar <xhemi@cube2.se> -# Contributor: Edward Tjörnhammar <xhemi@cube2.se> - -pkgname=inn -pkgver=2.5.2 -pkgrel=5 -pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." -url="http://www.isc.org/software/inn/" -arch=('i686' 'x86_64' 'mips64el') -license=("custom:INN") -depends=('openssl' 'dovecot') -makedepends=('make' 'bison' 'python2' 'gcc' 'smtp-forwarder' 'libsasl') -optdepends=('perl' 'python2' 'libsasl') -options=(emptydirs docs zipman) -install=inn.install -backup=(etc/inn/newsfeeds - etc/inn/incoming.conf - etc/inn/nnrpd.track - etc/inn/passwd.nntp - etc/inn/inn.conf - etc/inn/moderators - etc/inn/control.ctl - etc/inn/expire.ctl - etc/inn/nntpsend.ctl - etc/inn/innreport.conf - etc/inn/innwatch.ctl - etc/inn/distrib.pats - etc/inn/actsync.cfg - etc/inn/actsync.ign - etc/inn/motd.news - etc/inn/storage.conf - etc/inn/cycbuff.conf - etc/inn/buffindexed.conf - etc/inn/innfeed.conf - etc/inn/news2mail.cf - etc/inn/readers.conf - etc/inn/radius.conf - etc/inn/ovdb.conf - etc/inn/subscriptions - var/db/inn/active - var/db/inn/active.times - var/db/inn/history - var/db/inn/history.dir - var/db/inn/history.hash - var/db/inn/history.index - var/db/inn/newsgroups) -source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz - innd.rc - nnrpd.rc - innd.conf - nnrpd.conf - site.make.patch) -md5sums=('a6e577dceb90d07501b96149508b974b' - '2ad5138dac7c7535278f73f30020d656' - 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' - 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' - 'bb4bbe86ae52fbbf08b0f6f370dea052' - '960c800026ed6e03901cf0bafdfd53d8') - -build() { - cd $srcdir/inn-$pkgver - - [ $NOEXTRACT -eq 1 ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --includedir=/usr/include/inn \ - --sbindir=/usr/sbin \ - --with-libtool \ - --with-gnu-id \ - --with-db-dir=/var/db/inn \ - --sysconfdir=/etc/inn \ - --with-spool-dir=/var/spool/news \ - --with-log-dir=/var/log/inn \ - --with-run-dir=/var/run/inn \ - --with-tmp-dir=/var/spool/inn/tmp \ - --enable-largefiles \ - --with-openssl=/usr \ - --with-perl \ - --with-python \ - --with-sendmail=/usr/bin/msmtp \ - --with-sasl=/usr - # build in chroot fails with default news:news since they don't exist. - # uncomment following lines for working build. not sure if this is the correct solution though. - # --with-news-user=root \ - # --with-news-group=root \ - - sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global - - [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch - export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH - - make - make DESTDIR=$pkgdir install - - mkdir -p $pkgdir/etc/{conf,rc}.d && \ - install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd - install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd - - install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd - install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd - - cd $pkgdir/usr/lib - for i in lib*.a; do - gcc -shared -o ${i%%.a}.so.2.0.0 $i - for j in 2.0 2; do - ln -s ${i%%a}so.2.0.0 ${i%%a}so.$j - done - done - - touch $pkgdir/var/db/inn/history{.dir,.hash,.index,} - - mkdir -p $pkgdir/usr/share/doc/inn $pkgdir/usr/share/inn/ - mv $pkgdir/usr/share/man/man3/list.3 $pkgdir/usr/share/man/man3/list-inn.3 - mv $pkgdir/usr/doc/* $pkgdir/usr/share/doc/inn/ - mv $pkgdir/usr/http/* $pkgdir/usr/share/inn/ - mv $pkgdir/usr/bin/archive $pkgdir/usr/bin/archive.inn - rm -rf $pkgdir/usr/doc $pkgdir/usr/http $pkgdir/var/run - install -D -m0644 $srcdir/inn-$pkgver/LICENSE $pkgdir/usr/share/licenses/inn/LICENSE - chown root:root $pkgdir/usr/bin/innbind - chmod 05555 $pkgdir/usr/bin/innbind -} diff --git a/community/inn/inn.install b/community/inn/inn.install deleted file mode 100644 index 37b6394b1..000000000 --- a/community/inn/inn.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - grep -e "^news:" /etc/group 2>&- >&- || groupadd -r news 2>&- >&- - grep -e "^news:" /etc/passwd 2>&- >&- || useradd -r -m -g news news 2>&- >&- - - /usr/bin/makedbz -i -o 2>&- >&- - mkdir /var/log/news 2>&- >&- - - chown news:news -R var/spool/news 2>&- >&- - chown news:news var/log/news 2>&- >&- - chown news:news -R var/db/inn 2>&- >&- - - echo "" - echo "->" - echo "-> If this is a first-time installation, a minimal active file and" - echo "-> history database have been installed. Do not forget to update" - echo "-> your cron entries and configure INN. See INSTALL for more" - echo "-> information." - echo "->" - echo "-> The default user:group for inn is news:news" - echo "->" - echo "" -} diff --git a/community/inn/innd.conf b/community/inn/innd.conf deleted file mode 100644 index 48f96ba5e..000000000 --- a/community/inn/innd.conf +++ /dev/null @@ -1,2 +0,0 @@ -NEWS_USER=news -NEWS_GROUP=news diff --git a/community/inn/innd.rc b/community/inn/innd.rc deleted file mode 100644 index e88bd0c39..000000000 --- a/community/inn/innd.rc +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/innd ] && . /etc/conf.d/innd -[ -z "$NEWS_USER" ] && print "Please set news username" && exit 1; - -case "$1" in - start) - stat_busy "Starting InterNetNews" - [ -d /var/run/inn ] || mkdir -p /var/run/inn - su $NEWS_USER -c /usr/bin/rc.news 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - echo $! > /var/run/innd.pid - add_daemon innd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews" - su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/innd.pid - rm_daemon innd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/inn/nnrpd.conf b/community/inn/nnrpd.conf deleted file mode 100644 index 689a289ce..000000000 --- a/community/inn/nnrpd.conf +++ /dev/null @@ -1,3 +0,0 @@ -USE_SSL=1 -LISTEN_PORT=563 -NNRPD_OPTS="-D -S -p $LISTEN_PORT -c /etc/inn/readers.conf" diff --git a/community/inn/nnrpd.rc b/community/inn/nnrpd.rc deleted file mode 100644 index d7c902832..000000000 --- a/community/inn/nnrpd.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/nnrpd ] && . /etc/conf.d/nnrpd -[ -z "$NNRPD_OPTS" ] && print "FATAL: No arguments where passed" && exit 1; - -PID=`pidof -o %PPID nnrpd` -case "$1" in - start) - stat_busy "Starting InterNetNews Readers Daemon" - if [ ! -f /var/run/nnrpd.pid ]; then - stat_append ":: InterNetNews (innd) is not running" - stat_fail - exit 1 - fi - - [ -d /var/run/inn ] || mkdir -p /var/run/inn - [ -z "$PID" ] && nnrpd $NNRPD_OPTS 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID nnrpd` - echo $PID > /var/run/nnrpd.pid - add_daemon nnrpd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews Readers Daemon" - [ ! -z "$PID" ] && kill $PID >&- - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/nnrpd.pid - rm_daemon nnrpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/inn/site.make.patch b/community/inn/site.make.patch deleted file mode 100644 index 5af6e1162..000000000 --- a/community/inn/site.make.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- old/src/inn-2.4.5/site/Makefile 2008-06-29 19:56:57.000000000 +0200 -+++ new/src/inn-2.4.5/site/Makefile 2008-10-09 19:27:59.613208825 +0200 -@@ -52,7 +52,6 @@ - - PATH_ACTIVE = ${PATHDB}/active - PATH_ACTIVE_TIMES = ${PATHDB}/active.times --PATH_HISTORY = ${PATHDB}/history - PATH_NEWSGROUPS = ${PATHDB}/newsgroups - - ## Scripts from above, plus site-specific config files. -@@ -98,7 +97,7 @@ - ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED) - - SPECIAL = $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \ -- $D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY) -+ $D$(PATH_NEWSGROUPS) - - ## Get new versions of everything from samples directory. - all: $(ALL) config -@@ -143,12 +142,6 @@ - chown $(RUNASUSER) $@ - chgrp $(RUNASGROUP) $@ - chmod $(FILEMODE) $@ --$D$(PATH_HISTORY): -- touch $@ -- chown $(RUNASUSER) $@ -- chgrp $(RUNASGROUP) $@ -- chmod $(FILEMODE) $@ -- test -z "$D" && $(PATHBIN)/makedbz -i -o - - bootstrap: - diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index bed806c4e..db91491a9 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=john -pkgver=1.7.6 -pkgrel=3 +pkgver=1.7.7 +pkgrel=1 pkgdesc="John The Ripper - A fast password cracker. Additional patches (NTLM, MySQL, Kerberos V5, etc.) included." arch=('i686' 'x86_64' 'mips64el') url="http://www.openwall.com/$pkgname/" @@ -14,18 +14,18 @@ license=('GPL2' 'custom') depends=('openssl') backup=('etc/john/john.conf') source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 - http://www.openwall.com/john/g/john-$pkgver-jumbo-12.diff.gz + http://www.openwall.com/john/g/john-$pkgver-jumbo-1.diff.gz ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) -md5sums=('321ac0793f1aa4f0603b33a393133756' - '405750a1d8f5c62d434e97cd2775843b' +md5sums=('be316618de834a58573a21225d4a2674' + 'ee776d17726e7c15e90f2cf7ca85492f' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') build() { # jumbo patch cd ${srcdir}/$pkgname-$pkgver - patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-12.diff + patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-1.diff cd ${srcdir}/john-$pkgver/src/ # patch default params diff --git a/community/libssh2/PKGBUILD b/community/libssh2/PKGBUILD deleted file mode 100644 index d5eee92c8..000000000 --- a/community/libssh2/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 34134 2010-12-03 13:35:55Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: ice-man <icemanf@gmail.com> - -pkgname=libssh2 -pkgver=1.2.7 -pkgrel=1 -pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" -url="http://www.libssh2.org/" -arch=('i686' 'x86_64' 'mips64el') -license=('BSD') -depends=('openssl') -makedepends=('zlib') -options=('!libtool') -source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('a5d78344886f1282e4008c09bf568076') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index 84aa865ff..46ab4dbec 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=lightspark -pkgver=0.4.7.1 -pkgrel=2 +pkgver=0.4.8.1 +pkgrel=1 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://lightspark.sourceforge.net' @@ -12,9 +12,9 @@ conflicts=('lightspark-git') depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'pkgconfig' 'fontconfig') optdepends=('gnash-gtk: fallback support') -install="${pkgname}.install" -source=("http://launchpad.net/${pkgname}/trunk/${pkgname}-${pkgver:0:5}/+download/${pkgname}-${pkgver}.tar.gz") -md5sums=('fee5cd52a8a23e858979a8f4ec778266') +install="lightspark.install" +source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver:0:5}/+download/lightspark-${pkgver}.tar.gz") +md5sums=('296b859ea2b5c126e899e609014f2786') build() { rm -rf build @@ -26,7 +26,7 @@ build() { -DCOMPILE_PLUGIN=1 \ -DCMAKE_BUILD_TYPE=Release \ -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ - ../${pkgname}-${pkgver} + ../lightspark-${pkgver} make } diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 6b7e96899..25f922cd8 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41028 2011-03-03 07:23:21Z tdziedzic $ +# $Id: PKGBUILD 47631 2011-05-24 14:03:50Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=0.7.1 -pkgrel=8 +pkgrel=9 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" @@ -42,6 +42,9 @@ build() { INPUT_PLUGINS=all \ DESTDIR="$pkgdir" scons +} +package(){ + cd "$srcdir/$pkgname-$pkgver" scons install # fix permissions on SCons-autogenerated files diff --git a/community/mednafen/fix_build.diff b/community/mednafen/fix_build.diff deleted file mode 100644 index d91a6faf4..000000000 --- a/community/mednafen/fix_build.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN mednafen.orig//src/pcfx/soundbox.cpp mednafen/src/pcfx/soundbox.cpp ---- mednafen.orig//src/pcfx/soundbox.cpp 2010-06-05 09:35:40.000000000 -0400 -+++ mednafen/src/pcfx/soundbox.cpp 2010-06-05 09:35:55.000000000 -0400 -@@ -416,7 +416,7 @@ - int rolloff = (int)((double)0.90 * 21477272 * 2 / 1365 / (1 << SampleFreq) ) / 2; - for(int ch = 0; ch < 2; ch++) - for(int lr = 0; lr < 2; lr++) -- ADPCMSynth[ch][lr].treble_eq(blip_eq_t::blip_eq_t(-1000, rolloff, FSettings.SndRate)); -+ ADPCMSynth[ch][lr].treble_eq(blip_eq_t(-1000, rolloff, FSettings.SndRate)); - LSampleFreq = SampleFreq; - } - } diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 1cd5a0fd6..707c3a003 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46547 2011-05-09 02:22:08Z svenstaro $ +# $Id: PKGBUILD 48032 2011-05-27 16:13:36Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.5.1 +pkgver=3.5.2 pkgrel=1 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL3') depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua' 'icu') makedepends=('ftjam' 'p7zip' 'wxgtk' 'cmake') source=("http://downloads.sourceforge.net/project/${pkgname}/current_release/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('924a02881b2e7e2fc68910d41ce51d8a') +md5sums=('90e0bdcbdfa95cb0322c04082418a56c') build() { cd ${srcdir}/${pkgname}-${pkgver}/ diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 0d3c48c5a..3e20e38ea 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mongodb pkgver=1.8.1 -pkgrel=1 +pkgrel=2 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -16,16 +16,23 @@ backup=('etc/mongodb.conf') install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' - 'mongodb.conf') + 'mongodb.conf' + 'gcc46fixes.diff' + 'gcc46fixes2.diff') md5sums=('e75a5cae641a53760df8cb866ad5d929' '859f8f9bb32ef2bd21fec55ae9a87d0a' - '9e0ea3f96732bb7811f0b64dace56440') + '9e0ea3f96732bb7811f0b64dace56440' + 'e90c78350e25df2d24f98e4767677d4b' + '5097de6ce2c347c3703ab8cf5a611052') build() { export SCONSFLAGS="$MAKEFLAGS" cd ${pkgname}-src-r${pkgver} + patch -Np1 -i ${srcdir}/gcc46fixes.diff + patch -Np1 -i ${srcdir}/gcc46fixes2.diff + # scons is "special" sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct diff --git a/community-staging/mongodb/gcc46fixes.diff b/community/mongodb/gcc46fixes.diff index 487c88f16..487c88f16 100644 --- a/community-staging/mongodb/gcc46fixes.diff +++ b/community/mongodb/gcc46fixes.diff diff --git a/community-staging/mongodb/gcc46fixes2.diff b/community/mongodb/gcc46fixes2.diff index 17257b136..17257b136 100644 --- a/community-staging/mongodb/gcc46fixes2.diff +++ b/community/mongodb/gcc46fixes2.diff diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD index 5934210e6..240bf0076 100644 --- a/community/mysql-workbench/PKGBUILD +++ b/community/mysql-workbench/PKGBUILD @@ -1,36 +1,36 @@ -# $Id: PKGBUILD 46305 2011-05-04 18:56:20Z andrea $ +# $Id: PKGBUILD 47963 2011-05-26 13:44:42Z ibiru $ # Maintainer: # Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: totoloco <totoloco at gmail _dot_com> pkgname=mysql-workbench epoch=1 -pkgver=5.2.33b +pkgver=5.2.34 pkgrel=1 pkgdesc="A cross-platform, visual database design tool developed by MySQL" arch=('i686' 'x86_64' 'mips64el') url="http://wb.mysql.com/" license=('GPL2') -depends=('libgnome' 'libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libglade' 'libgl' +depends=('libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libgl' 'libsigc++' 'python-paramiko' 'python-pexpect') makedepends=('boost' 'curl' 'mesa') options=('!libtool') source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz ArchLinux.xml arch.patch python27.patch gcc46.patch) -md5sums=('850e081eeaea87a88c408483817e4b1f' +md5sums=('781a4e9f6b5573b06a838d53ddb9136d' 'c2f986cd5737413d020c55db32713c48' '23430d24400fd65c9fd872bd8e2411e5' '47bc4cdfaa035a0132392e94c462ebf7' - '8e7a6d5aa59b73727e862724f115d90a') + '43917ebc79794ba15a64f7ba820fa20b') build() { - cd "${srcdir}/${pkgname}-gpl-5.2.33-src" + cd "${srcdir}/${pkgname}-gpl-${pkgver}-src" cp "${srcdir}/ArchLinux.xml" res/mysql.profiles patch -Np1 -i ${srcdir}/arch.patch patch -Np0 -i ${srcdir}/python27.patch - patch -p1 -i ${srcdir}/gcc46.patch + patch -Np1 -i ${srcdir}/gcc46.patch #we use System provided libraries rm -rf ext/curl @@ -46,8 +46,9 @@ build() { } package() { - cd "${srcdir}/${pkgname}-gpl-5.2.33-src" + cd "${srcdir}/${pkgname}-gpl-${pkgver}-src" make DESTDIR="${pkgdir}" install sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" $pkgdir/usr/share/mysql-workbench/sshtunnel.py + sed -i -e "s|python|python2|" $pkgdir/usr/lib/mysql-workbench/modules/wb_utils_grt.py } diff --git a/community/mysql-workbench/gcc46.patch b/community/mysql-workbench/gcc46.patch index 9daa162c8..6a0d2cd97 100644 --- a/community/mysql-workbench/gcc46.patch +++ b/community/mysql-workbench/gcc46.patch @@ -1,108 +1,6 @@ -diff -up mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp ---- mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp.gcc46 2011-03-23 17:05:33.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/backend/wbprivate/workbench/metaclasses.cpp 2011-03-23 17:06:02.000000000 +0100 -@@ -23,7 +23,7 @@ - #include "grts/structs.workbench.model.reporting.h"
- #include "grts/structs.workbench.physical.h"
-
--
-+namespace wb {
- void register_all_metaclasses()
- {
- register_structs_app_xml();
-@@ -46,3 +46,6 @@ void register_all_metaclasses()
- register_structs_workbench_model_reporting_xml();
- register_structs_workbench_physical_xml();
- }
-+// end of namespace wb
-+}
-+
-diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp ---- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 2011-03-23 16:56:16.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp 2011-03-23 17:07:36.000000000 +0100 -@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo - } - - Glib::RefPtr<Gtk::ListStore> model= Gtk::ListStore::create(*color_combo_columns); -- Gtk::ComboBox *combo= new Gtk::ComboBox(model); -+ Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr<Gtk::TreeModel> &)model); - - combo->pack_start(color_combo_columns->image); - -diff -up mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp ---- mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp.gcc46 2011-03-23 17:04:17.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/forms/utilities.cpp 2011-03-23 17:04:40.000000000 +0100 -@@ -32,10 +32,11 @@ - #include <math.h> - #include "base/log.h" - ENABLE_LOG("mforms.utils") -- - using namespace mforms; - -+namespace mforms { - GThread *_mforms_main_thread=0; -+} - - static std::map<std::string, int> remembered_message_answers; - static std::string remembered_message_answer_file; -diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp ---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp.gcc46 2011-03-17 13:48:45.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_lua_help.cpp 2011-03-23 16:44:22.000000000 +0100 -@@ -1909,6 +1909,8 @@ static MYX_GRT_SHELL_COMMAND_HELP_GROUP - - //============================================================================ - -+namespace grt { -+ - static void myx_grt_shell_show_command_help_print(grt::GRT *grt, const char *group_name, const char *cmd) - { - MYX_GRT_SHELL_COMMAND_HELP_GROUP help_group; -@@ -2097,3 +2099,6 @@ void myx_grt_shell_show_help(grt::GRT *g - } - } - -+// End of namspace grt -+} -+ -diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp ---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp.gcc46 2011-03-17 13:48:41.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.cpp 2011-03-23 16:44:22.000000000 +0100 -@@ -187,7 +187,7 @@ NL - }; - - --void grt_shell_show_python_help(grt::GRT *grt, const char *command) -+void grt::grt_shell_show_python_help(grt::GRT *grt, const char *command) - { - if (!command || !*command) - grt->send_output( -diff -up mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h ---- mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h.gcc46 2011-03-17 13:48:39.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/library/grt/src/grtpp_shell_python_help.h 2011-03-23 16:44:22.000000000 +0100 -@@ -21,6 +21,8 @@ - #ifndef __grtpp_shell_python_help_h__ - #define __grtpp_shell_python_help_h__ - -+namespace grt { - void grt_shell_show_python_help(grt::GRT *grt, const char *command); -+} - --#endif /* __grtpp_shell_python_help_h__ */ -\ Pas de fin de ligne à la fin du fichier. -+#endif /* __grtpp_shell_python_help_h__ */ -diff -up mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h ---- mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 2011-03-23 16:51:30.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/modules/db.mysql/src/db_mysql_catalog_report.h 2011-03-23 16:52:33.000000000 +0100 -@@ -10,6 +10,7 @@ - #include "config.h" - #endif - -+#include <cstddef> - #include "ctemplate/template.h" - - #include "grt/common.h" ---- mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in~ 2011-05-04 00:57:31.029029610 -0700 -+++ mysql-workbench-gpl-5.2.33-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-04 00:57:45.162361700 -0700 +diff -Nur mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in +--- mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-26 09:33:54.128803186 +0000 ++++ mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-26 09:34:45.312611839 +0000 @@ -54,6 +54,7 @@ #include <map> #include <string> diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 32327b71d..e3ec00716 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47433 2011-05-23 03:25:22Z jconder $ +# $Id: PKGBUILD 47935 2011-05-26 08:19:27Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -15,17 +15,17 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') pkgver=0.24.1 -pkgrel=2 +pkgrel=3 epoch=1 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') -makedepends=("mythtv>=$epoch-$pkgver" 'cdparanoia' 'cdrkit' 'dvdauthor' - 'dvd+rw-tools' 'ffmpeg' 'flac' 'libcdaudio' 'libexif' 'libvisual' - 'libvorbis' 'mplayer' 'perl-datetime-format-iso8601' - 'perl-date-manip' 'perl-image-size' 'perl-libwww' 'perl-soap-lite' - 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' - 'python-imaging' 'python-pycurl' 'sdl' 'taglib' 'zlib') +makedepends=('cdparanoia' 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' + 'libcdaudio' 'libexif' 'libvisual' 'libvorbis' 'mplayer' 'mythtv' + 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' + 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' + 'perl-xml-xpath' 'python2-oauth' 'python-imaging' 'python-pycurl' + 'sdl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" 'mtd.rc') md5sums=('76aeefeff70b550b2d35c2d9d751df18' @@ -44,7 +44,7 @@ build() { package_mythplugins-mytharchive() { pkgdesc="Create DVDs or archive recorded shows in MythTV" - depends=("mythtv>=$epoch-$pkgver" 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' + depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv' 'python-imaging') cd "$srcdir/$pkgbase-$pkgver/mytharchive" @@ -53,7 +53,7 @@ package_mythplugins-mytharchive() { package_mythplugins-mythbrowser() { pkgdesc="Mini web browser for MythTV" - depends=("mythtv>=$epoch-$pkgver") + depends=('mythtv') cd "$srcdir/$pkgbase-$pkgver/mythbrowser" make INSTALL_ROOT="$pkgdir" install @@ -61,7 +61,7 @@ package_mythplugins-mythbrowser() { package_mythplugins-mythgallery() { pkgdesc="Image gallery plugin for MythTV" - depends=("mythtv>=$epoch-$pkgver" 'libexif') + depends=('libexif' 'mythtv') cd "$srcdir/$pkgbase-$pkgver/mythgallery" make INSTALL_ROOT="$pkgdir" install @@ -69,7 +69,7 @@ package_mythplugins-mythgallery() { package_mythplugins-mythgame() { pkgdesc="Game emulator plugin for MythTV" - depends=("mythtv>=$epoch-$pkgver") + depends=('mythtv') cd "$srcdir/$pkgbase-$pkgver/mythgame" make INSTALL_ROOT="$pkgdir" install @@ -77,8 +77,8 @@ package_mythplugins-mythgame() { package_mythplugins-mythmusic() { pkgdesc="Music playing plugin for MythTV" - depends=("mythtv>=$epoch-$pkgver" 'cdparanoia' 'flac' 'libcdaudio' 'libvisual' - 'libvorbis' 'sdl' 'taglib') + depends=('cdparanoia' 'flac' 'libcdaudio' 'libvisual' 'libvorbis' 'mythtv' + 'sdl' 'taglib') cd "$srcdir/$pkgbase-$pkgver/mythmusic" make INSTALL_ROOT="$pkgdir" install @@ -86,7 +86,7 @@ package_mythplugins-mythmusic() { package_mythplugins-mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" - depends=("mythtv>=$epoch-$pkgver" 'python2-oauth' 'python-pycurl') + depends=('mythtv' 'python2-oauth' 'python-pycurl') cd "$srcdir/$pkgbase-$pkgver/mythnetvision" make INSTALL_ROOT="$pkgdir" install @@ -94,7 +94,7 @@ package_mythplugins-mythnetvision() { package_mythplugins-mythnews() { pkgdesc="News checking plugin for MythTV" - depends=("mythtv>=$epoch-$pkgver") + depends=('mythtv') cd "$srcdir/$pkgbase-$pkgver/mythnews" make INSTALL_ROOT="$pkgdir" install @@ -102,7 +102,7 @@ package_mythplugins-mythnews() { package_mythplugins-mythvideo() { pkgdesc="Video playback and browsing plugin for MythTV" - depends=("mythtv>=$epoch-$pkgver" 'mplayer') + depends=('mplayer' 'mythtv') cd "$srcdir/$pkgbase-$pkgver/mythvideo" make INSTALL_ROOT="$pkgdir" install @@ -112,7 +112,7 @@ package_mythplugins-mythvideo() { package_mythplugins-mythweather() { pkgdesc="Weather checking plugin for MythTV" - depends=("mythtv>=$epoch-$pkgver" 'perl-date-manip' 'perl-libwww' + depends=('mythtv' 'perl-date-manip' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size' 'perl-datetime-format-iso8601') @@ -122,9 +122,9 @@ package_mythplugins-mythweather() { package_mythplugins-mythweb() { pkgdesc="Web interface for the MythTV scheduler" - depends=("mythtv>=$epoch-$pkgver") - optdepends=('php-apache' - 'lighttpd') + depends=('mythtv') + optdepends=('lighttpd' + 'php-apache') mkdir -p "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions} cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/srv/http/mythweb" @@ -134,7 +134,7 @@ package_mythplugins-mythweb() { package_mythplugins-mythzoneminder() { pkgdesc="View CCTV footage from zoneminder in MythTV" - depends=("mythtv>=$epoch-$pkgver") + depends=('mythtv') install='mythplugins-mythzoneminder.install' cd "$srcdir/$pkgbase-$pkgver/mythzoneminder" diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index 7727dc7a9..15ef52001 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 38970 2011-02-04 10:43:11Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 48022 2011-05-27 15:14:57Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor : Ionut Biru <ibiru@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> pkgname=nbd -pkgver=2.9.20 +pkgver=2.9.21a pkgrel=1 pkgdesc="Tools for network block devices, allowing you to use remote block devices over TCP/IP." arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +12,7 @@ license=('GPL') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 nbd.conf.d nbd) depends=('glib2') -md5sums=('aec35f6beb7bb4cb2ee267fe0f72c8d6' +md5sums=('4028c77d52a13f16be5e9bf3d3bab27d' '6d746f377a28b92dd2c80f01176cb811' 'ab9c431881f5e3c98a8f6c04016f0e00') diff --git a/community/nginx/ChangeLog b/community/nginx/ChangeLog deleted file mode 100644 index fb28b1717..000000000 --- a/community/nginx/ChangeLog +++ /dev/null @@ -1,7 +0,0 @@ -2009-05-26 sergej <pupykin.s+arch@gmail.com> -* etc/conf.d params added - -2007-06-29 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 -* Clearly the ugliest pkgbuild I've seen but the author deserves - kudos diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 52e644464..4baafd3d9 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46704 2011-05-10 20:38:51Z spupykin $ +# $Id: PKGBUILD 47990 2011-05-26 22:02:37Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -11,7 +11,7 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -27,7 +27,7 @@ backup=("etc/nginx/conf/nginx.conf" "etc/logrotate.d/nginx") source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) -md5sums=('8a528ccaab3ddba84e72443fa40b19e7' +md5sums=('eebf1e9c7e86f923923b828ae0156103' '837b010afcbdfe82d8e65ef00c4e14ba') build() { diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD index f732f1646..39fa1917e 100644 --- a/community/ogre/PKGBUILD +++ b/community/ogre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46578 2011-05-09 16:26:46Z svenstaro $ +# $Id: PKGBUILD 47685 2011-05-24 19:41:50Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgbase=ogre pkgname=('ogre' 'ogre-docs') pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A scene-oriented, flexible 3D engine written in C++" arch=('i686' 'x86_64' 'mips64el') url='http://www.ogre3d.org' diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index d4f8d828c..153eff008 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 45280 2011-04-18 23:09:30Z giovanni $ +# $Id: PKGBUILD 48094 2011-05-28 15:09:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite pkgver=1.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64' 'mips64el') url="https://alioth.debian.org/projects/pcsclite/" license=('BSD') -depends=('libusb') +depends=('udev') makedepends=('pkgconfig') options=('!libtool' '!docs') source=(https://alioth.debian.org/frs/download.php/3533/pcsc-lite-${pkgver}.tar.bz2 @@ -21,8 +21,7 @@ build() { cd "${srcdir}/pcsc-lite-${pkgver}" ./configure --prefix=/usr \ - --disable-libudev \ - --enable-libusb \ + --enable-libudev \ --sysconfdir=/etc \ --enable-usbdropdir=/usr/lib/pcsc/drivers diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 87c07ae56..16518d9c9 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 40964 2011-03-02 22:24:28Z lcarlier $ +# $Id: PKGBUILD 47641 2011-05-24 14:35:06Z tdziedzic $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=4 +pkgrel=5 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' -arch=('i686' 'x86_64' 'mips64el') -url="http://$pkgname.org/" +arch=('i686' 'x86_64') +url="http://performous.org/" license=('GPL') depends=('boost-libs>=1.46' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') diff --git a/community/perl-xml-dom/PKGBUILD b/community/perl-xml-dom/PKGBUILD deleted file mode 100644 index 34ff452ee..000000000 --- a/community/perl-xml-dom/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-xml-dom -pkgver=1.44 -pkgrel=7 -pkgdesc="Implements Level 1 of W3's DOM" -arch=('i686' 'x86_64' 'mips64el') -url="http://search.cpan.org/dist/XML-DOM" -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0' 'perlxml>=2.30' 'perl-xml-regexp' 'libxml-perl>=0.07' 'perl-libwww') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TJ/TJMATHER/XML-DOM-$pkgver.tar.gz) -md5sums=('1ec2032a06e5762984f7a332c199c205') - -build() { - cd $startdir/src/XML-DOM-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make install DESTDIR=$startdir/pkg - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete -} diff --git a/community/php52/PKGBUILD b/community/php52/PKGBUILD deleted file mode 100644 index bb89920b4..000000000 --- a/community/php52/PKGBUILD +++ /dev/null @@ -1,192 +0,0 @@ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=php52 -pkgver=5.2.17 -pkgrel=5 -_suhosinver=5.2.16-0.9.7 -pkgdesc='A high-level scripting language' -arch=('i686' 'x86_64' 'mips64el') -license=('PHP') -url='http://www.php.net' -backup=('etc/php/php.ini') -depends=('glibc' 'readline' 'ncurses' 'libxml2' 'pcre') -makedepends=('apache' 'imap' 'postgresql-libs' 'libmysqlclient' - 'libldap' 'postfix' 'libpng' 'libjpeg' 'sqlite3' 'unixodbc' - 'net-snmp' 'mhash' 'gmp' 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' - 'freetype2' 'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db') -optdepends=('bzip2: bz2' - 'curl: curl' - 'gdbm: dba' - 'libpng: gd' - 'libjpeg: gd' - 'freetype2: gd' - 'pam: imap' - 'libldap: ldap' - 'libmcrypt: mcrypt' - 'libtool: mcrypt' - 'libmysqlclient: mysql/mysqli/pdo_mysql' - 'unixodbc: odbc/pdo_odbc' - 'openssl: openssl' - 'postgresql-libs: pgsql/pdo_pgsql' - 'aspell: pspell' - 'net-snmp: snmp' - 'sqlite3: pdo_sqlite' - 'tidyhtml: tidy' - 'libxslt: xsl' - 'mhash: mhash' - 'gmp: gmp') -provides=("php=$pkgver") -conflicts=('php') -source=("http://php.net/distributions/php-${pkgver}.tar.bz2" - "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" - 'php.ini' - 'apache.conf' - 'db-configure.patch' - 'db-5.patch' - 'libpng14.patch') -md5sums=('b27947f3045220faf16e4d9158cbfe13' - 'd815fc99a0c25c21f5df28551fcbb001' - '55c09c89e34eb5c555d842a4d01590e6' - '96ca078be6729b665be8a865535a97bf' - 'f3da248d934bc99354fdfa98cdac23ad' - '40f3d5f546087dac33bfa21a85b79203' - '77ea0756996df0932fce472ff3ec2693') - -build() { - phpconfig="--prefix=/usr \ - --sysconfdir=/etc/php \ - --with-layout=GNU \ - --with-config-file-path=/etc/php \ - --with-config-file-scan-dir=/etc/php/conf.d \ - --enable-inline-optimization \ - --disable-debug \ - --disable-rpath \ - --disable-static \ - --enable-shared \ - --mandir=/usr/share/man \ - " - - phpextensions="--with-openssl=shared \ - --with-zlib=shared \ - --enable-bcmath=shared \ - --with-bz2=shared \ - --enable-calendar=shared \ - --with-curl=shared \ - --enable-dba=shared \ - --without-db2 \ - --without-db3 \ - --with-db4=shared \ - --with-gdbm=shared \ - --enable-dbase=shared \ - --enable-exif=shared \ - --enable-ftp=shared \ - --with-gd=shared \ - --enable-gd-native-ttf \ - --with-jpeg-dir=shared,/usr \ - --with-png-dir=shared,/usr \ - --with-gettext=shared \ - --with-imap=shared \ - --with-imap-ssl=shared \ - --with-ldap=shared \ - --enable-mbstring=shared \ - --with-mcrypt=shared \ - --with-mysql=shared \ - --with-mysql-sock=/var/run/mysqld/mysqld.sock \ - --with-mysql=shared \ - --with-mysqli=shared \ - --with-ncurses=shared \ - --with-unixODBC=shared,/usr \ - --enable-pdo=shared \ - --with-pdo-mysql=shared \ - --with-pdo-sqlite=shared,/usr \ - --with-pdo-odbc=shared,unixODBC,/usr \ - --with-pdo-pgsql=shared \ - --with-sqlite=shared \ - --enable-sqlite-utf8 \ - --with-pgsql=shared \ - --enable-shmop=shared \ - --with-snmp=shared \ - --enable-soap=shared \ - --enable-sysvmsg=shared \ - --enable-sysvsem=shared \ - --enable-sysvshm=shared \ - --with-tidy=shared \ - --with-xsl=shared \ - --enable-zip=shared \ - --enable-posix=shared \ - --enable-sockets=shared \ - --enable-xml \ - --with-ttf=shared \ - --enable-session=shared \ - --with-regex=php \ - --with-pcre-regex=/usr \ - --enable-mbstring=all \ - --enable-mbregex \ - --enable-json=shared \ - --with-iconv=shared \ - --with-xmlrpc=shared \ - --with-pspell=shared \ - --with-freetype-dir=shared,/usr \ - --with-mime-magic=shared \ - --with-gmp=shared \ - --with-mhash=shared \ - " - - PEAR_INSTALLDIR=/usr/share/pear - export PEAR_INSTALLDIR - - cd ${srcdir}/php-${pkgver} - - # db 5.1 fix - patch -p4 -i ${srcdir}/db-5.patch - - # avoid linking against old db version - patch -p0 -i ${srcdir}/db-configure.patch - - # libpng 1.4 fix - patch -p3 -i ${srcdir}/libpng14.patch - - # gmp 5.0 fix - sed -i 's/__GMP_BITS_PER_MP_LIMB/GMP_LIMB_BITS/g' ext/gmp/gmp.c - - # apply suhosin patch - patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch - - # cli - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - --with-pear=/usr/share/pear \ - ${phpextensions} - make - # make test - make -j1 INSTALL_ROOT=${pkgdir} install - - # cleanup - rm -f ${pkgdir}`${pkgdir}/usr/bin/php-config --extension-dir`/*.a - # install php.ini - install -D -m644 ${srcdir}/php.ini ${pkgdir}/etc/php/php.ini - install -d -m755 ${pkgdir}/etc/php/conf.d/ - - # cgi and fcgi - ./configure ${phpconfig} \ - --enable-fastcgi \ - --enable-cgi \ - --enable-discard-path \ - --enable-force-cgi-redirect \ - --disable-cli \ - ${phpextensions} - make - install -D -m755 sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi - - # mod_php - ./configure ${phpconfig} \ - --with-apxs2 \ - --disable-cli \ - ${phpextensions} - make - install -D -m644 libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so - install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf -} diff --git a/community/php52/apache.conf b/community/php52/apache.conf deleted file mode 100644 index 86344c803..000000000 --- a/community/php52/apache.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Required modules: dir_module, php5_module - -<IfModule dir_module> - <IfModule php5_module> - DirectoryIndex index.php index.html - AddHandler application/x-httpd-php .php - AddHandler application/x-httpd-php-source .phps - </IfModule> -</IfModule>
\ No newline at end of file diff --git a/community/php52/db-5.patch b/community/php52/db-5.patch deleted file mode 100644 index 46c64c8b0..000000000 --- a/community/php52/db-5.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- omg/kittens/everywhere/lol/configure.orig 2010-07-21 17:31:30.000000000 +0300 -+++ omg/kittens/everywhere/lol/configure 2010-10-21 00:05:41.000000000 +0300 -@@ -28605,7 +28610,7 @@ if { (eval echo configure:28601: \"$ac_l - #include "confdefs.h" - - #include "$THIS_INCLUDE" --#if DB_VERSION_MAJOR == 4 -+#if DB_VERSION_MAJOR == 4 || DB_VERSION_MAJOR == 5 - yes - #endif - -@@ -28649,7 +28654,7 @@ echo "configure:28647: checking for DB4 - #include "confdefs.h" - - #include "$THIS_INCLUDE" --#if DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25 -+#if DB_VERSION_MINOR != 1 || (DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25) || DB_VERSION_MAJOR == 5 - yes - #endif - - -Modified: php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c -=================================================================== ---- php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c 2010-06-03 06:57:47 UTC (rev 300150) -+++ php/php-src/branches/PHP_5_3/ext/dba/dba_db4.c 2010-06-03 07:03:05 UTC (rev 300151) -@@ -37,14 +37,14 @@ - #endif - - static void php_dba_db4_errcall_fcn( --#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3) -+#if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)) - const DB_ENV *dbenv, - #endif - const char *errpfx, const char *msg) - { - TSRMLS_FETCH(); - --#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8 && DB_VERSION_PATCH <= 26) -+#if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8)) - /* Bug 51086, Berkeley DB 4.8.26 */ - /* This code suppresses a BDB 4.8 error message that BDB incorrectly emits */ - { -@@ -124,7 +124,7 @@ - if ((err=db_create(&dbp, NULL, 0)) == 0) { - dbp->set_errcall(dbp, php_dba_db4_errcall_fcn); - if ( --#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) -+#if (DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) - (err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) { - #else - (err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) { diff --git a/community/php52/db-configure.patch b/community/php52/db-configure.patch deleted file mode 100644 index 404febeaa..000000000 --- a/community/php52/db-configure.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- configure.orig 2008-07-03 10:27:06.000000000 +0000 -+++ configure 2008-07-03 10:30:56.000000000 +0000 -@@ -28399,51 +28399,15 @@ - - unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT - -- dbdp="/usr/local/BerkeleyDB.4." -- for i in $PHP_DB4 ${dbdp}8 ${dbdp}7 ${dbdp}6 ${dbdp}5 ${dbdp}4 ${dbdp}3 ${dbdp}2 ${dbdp}1 ${dbdp}0 /usr/local /usr; do -- if test -f "$i/db4/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/db4/db.h -- break -- elif test -f "$i/include/db4.8/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.8/db.h -- break -- elif test -f "$i/include/db4.7/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.7/db.h -- break -- elif test -f "$i/include/db4.6/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.6/db.h -- break -- elif test -f "$i/include/db4.5/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.5/db.h -- break -- elif test -f "$i/include/db4/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4/db.h -- break -- elif test -f "$i/include/db/db4.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db/db4.h -- break -- elif test -f "$i/include/db4.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.h -- break -- elif test -f "$i/include/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db.h -- break -- fi -- done -+ if test -f "/usr/include/db.h"; then -+ THIS_PREFIX=/usr -+ THIS_INCLUDE=/usr/include/db.h -+ fi - - if test -z "$THIS_INCLUDE"; then - { echo "configure: error: DBA: Could not find necessary header file(s)." 1>&2; exit 1; } - fi -- for LIB in db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do -+ for LIB in db; do - if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then - lib_found=""; - diff --git a/community/php52/libpng14.patch b/community/php52/libpng14.patch deleted file mode 100644 index 08bb4e1dd..000000000 --- a/community/php52/libpng14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php/php-src/trunk/ext/gd/libgd/gd_png.c 2009/04/01 16:05:17 278124 -+++ php/php-src/trunk/ext/gd/libgd/gd_png.c 2010/01/10 02:13:45 293341 -@@ -145,7 +145,7 @@ - return NULL; - } - -- if (!png_check_sig (sig, 8)) { /* bad signature */ -+ if (png_sig_cmp(sig, 0, 8) != 0) { /* bad signature */ - return NULL; - } - diff --git a/community/php52/php.ini b/community/php52/php.ini deleted file mode 100644 index 26f632bd4..000000000 --- a/community/php52/php.ini +++ /dev/null @@ -1,1309 +0,0 @@ -[PHP] - -;;;;;;;;;;;;;;;;;;; -; About php.ini ; -;;;;;;;;;;;;;;;;;;; -; This file controls many aspects of PHP's behavior. In order for PHP to -; read it, it must be named 'php.ini'. PHP looks for it in the current -; working directory, in the path designated by the environment variable -; PHPRC, and in the path that was defined in compile time (in that order). -; The path in which the php.ini file is looked for can be overridden using -; the -c argument in command line mode. -; -; The syntax of the file is extremely simple. Whitespace and Lines -; beginning with a semicolon are silently ignored (as you probably guessed). -; Section headers (e.g. [Foo]) are also silently ignored, even though -; they might mean something in the future. -; -; Directives are specified using the following syntax: -; directive = value -; Directive names are *case sensitive* - foo=bar is different from FOO=bar. -; -; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one -; of the INI constants (On, Off, True, False, Yes, No and None) or an expression -; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo"). -; -; Expressions in the INI file are limited to bitwise operators and parentheses: -; | bitwise OR -; & bitwise AND -; ~ bitwise NOT -; ! boolean NOT -; -; Boolean flags can be turned on using the values 1, On, True or Yes. -; They can be turned off using the values 0, Off, False or No. -; -; An empty string can be denoted by simply not writing anything after the equal -; sign, or by using the None keyword: -; -; foo = ; sets foo to an empty string -; foo = none ; sets foo to an empty string -; foo = "none" ; sets foo to the string 'none' -; -; If you use constants in your value, and these constants belong to a -; dynamically loaded extension (either a PHP extension or a Zend extension), -; you may only use these constants *after* the line that loads the extension. -; -; -;;;;;;;;;;;;;;;;;;; -; About this file ; -;;;;;;;;;;;;;;;;;;; -; This is the recommended, PHP 5-style version of the php.ini-dist file. It -; sets some non standard settings, that make PHP more efficient, more secure, -; and encourage cleaner coding. -; -; The price is that with these settings, PHP may be incompatible with some -; applications, and sometimes, more difficult to develop with. Using this -; file is warmly recommended for production sites. As all of the changes from -; the standard settings are thoroughly documented, you can go over each one, -; and decide whether you want to use it or not. -; -; For general information about the php.ini file, please consult the php.ini-dist -; file, included in your PHP distribution. -; -; This file is different from the php.ini-dist file in the fact that it features -; different values for several directives, in order to improve performance, while -; possibly breaking compatibility with the standard out-of-the-box behavior of -; PHP. Please make sure you read what's different, and modify your scripts -; accordingly, if you decide to use this file instead. -; -; - register_long_arrays = Off [Performance] -; Disables registration of the older (and deprecated) long predefined array -; variables ($HTTP_*_VARS). Instead, use the superglobals that were -; introduced in PHP 4.1.0 -; - display_errors = Off [Security] -; With this directive set to off, errors that occur during the execution of -; scripts will no longer be displayed as a part of the script output, and thus, -; will no longer be exposed to remote users. With some errors, the error message -; content may expose information about your script, web server, or database -; server that may be exploitable for hacking. Production sites should have this -; directive set to off. -; - log_errors = On [Security] -; This directive complements the above one. Any errors that occur during the -; execution of your script will be logged (typically, to your server's error log, -; but can be configured in several ways). Along with setting display_errors to off, -; this setup gives you the ability to fully understand what may have gone wrong, -; without exposing any sensitive information to remote users. -; - output_buffering = 4096 [Performance] -; Set a 4KB output buffer. Enabling output buffering typically results in less -; writes, and sometimes less packets sent on the wire, which can often lead to -; better performance. The gain this directive actually yields greatly depends -; on which Web server you're working with, and what kind of scripts you're using. -; - register_argc_argv = Off [Performance] -; Disables registration of the somewhat redundant $argv and $argc global -; variables. -; - magic_quotes_gpc = Off [Performance] -; Input data is no longer escaped with slashes so that it can be sent into -; SQL databases without further manipulation. Instead, you should use the -; database vendor specific escape string function on each input element you -; wish to send to a database. -; - variables_order = "GPCS" [Performance] -; The environment variables are not hashed into the $_ENV. To access -; environment variables, you can use getenv() instead. -; - error_reporting = E_ALL [Code Cleanliness, Security(?)] -; By default, PHP suppresses errors of type E_NOTICE. These error messages -; are emitted for non-critical errors, but that could be a symptom of a bigger -; problem. Most notably, this will cause error messages about the use -; of uninitialized variables to be displayed. -; - allow_call_time_pass_reference = Off [Code cleanliness] -; It's not possible to decide to force a variable to be passed by reference -; when calling a function. The PHP 4 style to do this is by making the -; function require the relevant argument by reference. -; - short_open_tag = Off [Portability] -; Using short tags is discouraged when developing code meant for redistribution -; since short tags may not be supported on the target server. - -;;;;;;;;;;;;;;;;;;;; -; Language Options ; -;;;;;;;;;;;;;;;;;;;; - -; Enable the PHP scripting language engine under Apache. -engine = On - -; Enable compatibility mode with Zend Engine 1 (PHP 4.x) -zend.ze1_compatibility_mode = Off - -; Allow the <? tag. Otherwise, only <?php and <script> tags are recognized. -; NOTE: Using short tags should be avoided when developing applications or -; libraries that are meant for redistribution, or deployment on PHP -; servers which are not under your control, because short tags may not -; be supported on the target server. For portable, redistributable code, -; be sure not to use short tags. -short_open_tag = Off - -; Allow ASP-style <% %> tags. -asp_tags = Off - -; The number of significant digits displayed in floating point numbers. -precision = 14 - -; Enforce year 2000 compliance (will cause problems with non-compliant browsers) -y2k_compliance = On - -; Output buffering allows you to send header lines (including cookies) even -; after you send body content, at the price of slowing PHP's output layer a -; bit. You can enable output buffering during runtime by calling the output -; buffering functions. You can also enable output buffering for all files by -; setting this directive to On. If you wish to limit the size of the buffer -; to a certain size - you can use a maximum number of bytes instead of 'On', as -; a value for this directive (e.g., output_buffering=4096). -output_buffering = 4096 - -; You can redirect all of the output of your scripts to a function. For -; example, if you set output_handler to "mb_output_handler", character -; encoding will be transparently converted to the specified encoding. -; Setting any output handler automatically turns on output buffering. -; Note: People who wrote portable scripts should not depend on this ini -; directive. Instead, explicitly set the output handler using ob_start(). -; Using this ini directive may cause problems unless you know what script -; is doing. -; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" -; and you cannot use both "ob_gzhandler" and "zlib.output_compression". -; Note: output_handler must be empty if this is set 'On' !!!! -; Instead you must use zlib.output_handler. -;output_handler = - -; Transparent output compression using the zlib library -; Valid values for this option are 'off', 'on', or a specific buffer size -; to be used for compression (default is 4KB) -; Note: Resulting chunk size may vary due to nature of compression. PHP -; outputs chunks that are few hundreds bytes each as a result of -; compression. If you prefer a larger chunk size for better -; performance, enable output_buffering in addition. -; Note: You need to use zlib.output_handler instead of the standard -; output_handler, or otherwise the output will be corrupted. -zlib.output_compression = Off -;zlib.output_compression_level = -1 - -; You cannot specify additional output handlers if zlib.output_compression -; is activated here. This setting does the same as output_handler but in -; a different order. -;zlib.output_handler = - -; Implicit flush tells PHP to tell the output layer to flush itself -; automatically after every output block. This is equivalent to calling the -; PHP function flush() after each and every call to print() or echo() and each -; and every HTML block. Turning this option on has serious performance -; implications and is generally recommended for debugging purposes only. -implicit_flush = Off - -; The unserialize callback function will be called (with the undefined class' -; name as parameter), if the unserializer finds an undefined class -; which should be instantiated. -; A warning appears if the specified function is not defined, or if the -; function doesn't include/implement the missing class. -; So only set this entry, if you really want to implement such a -; callback-function. -unserialize_callback_func= - -; When floats & doubles are serialized store serialize_precision significant -; digits after the floating point. The default value ensures that when floats -; are decoded with unserialize, the data will remain the same. -serialize_precision = 100 - -; Whether to enable the ability to force arguments to be passed by reference -; at function call time. This method is deprecated and is likely to be -; unsupported in future versions of PHP/Zend. The encouraged method of -; specifying which arguments should be passed by reference is in the function -; declaration. You're encouraged to try and turn this option Off and make -; sure your scripts work properly with it in order to ensure they will work -; with future versions of the language (you will receive a warning each time -; you use this feature, and the argument will be passed by value instead of by -; reference). -allow_call_time_pass_reference = Off - -; -; Safe Mode -; -safe_mode = Off - -; By default, Safe Mode does a UID compare check when -; opening files. If you want to relax this to a GID compare, -; then turn on safe_mode_gid. -safe_mode_gid = Off - -; When safe_mode is on, UID/GID checks are bypassed when -; including files from this directory and its subdirectories. -; (directory must also be in include_path or full path must -; be used when including) -safe_mode_include_dir = - -; When safe_mode is on, only executables located in the safe_mode_exec_dir -; will be allowed to be executed via the exec family of functions. -safe_mode_exec_dir = - -; Setting certain environment variables may be a potential security breach. -; This directive contains a comma-delimited list of prefixes. In Safe Mode, -; the user may only alter environment variables whose names begin with the -; prefixes supplied here. By default, users will only be able to set -; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR). -; -; Note: If this directive is empty, PHP will let the user modify ANY -; environment variable! -safe_mode_allowed_env_vars = PHP_ - -; This directive contains a comma-delimited list of environment variables that -; the end user won't be able to change using putenv(). These variables will be -; protected even if safe_mode_allowed_env_vars is set to allow to change them. -safe_mode_protected_env_vars = LD_LIBRARY_PATH - -; open_basedir, if set, limits all file operations to the defined directory -; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ - -; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -disable_functions = - -; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -disable_classes = - -; Colors for Syntax Highlighting mode. Anything that's acceptable in -; <span style="color: ???????"> would work. -;highlight.string = #DD0000 -;highlight.comment = #FF9900 -;highlight.keyword = #007700 -;highlight.bg = #FFFFFF -;highlight.default = #0000BB -;highlight.html = #000000 - -; If enabled, the request will be allowed to complete even if the user aborts -; the request. Consider enabling it if executing long request, which may end up -; being interrupted by the user or a browser timing out. -; ignore_user_abort = On - -; Determines the size of the realpath cache to be used by PHP. This value should -; be increased on systems where PHP opens many files to reflect the quantity of -; the file operations performed. -; realpath_cache_size=16k - -; Duration of time, in seconds for which to cache realpath information for a given -; file or directory. For systems with rarely changing files, consider increasing this -; value. -; realpath_cache_ttl=120 - -; -; Misc -; -; Decides whether PHP may expose the fact that it is installed on the server -; (e.g. by adding its signature to the Web server header). It is no security -; threat in any way, but it makes it possible to determine whether you use PHP -; on your server or not. -expose_php = On - - -;;;;;;;;;;;;;;;;;;; -; Resource Limits ; -;;;;;;;;;;;;;;;;;;; - -max_execution_time = 30 ; Maximum execution time of each script, in seconds -max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -;max_input_nesting_level = 64 ; Maximum input variable nesting level -memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Error handling and logging ; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; error_reporting is a bit-field. Or each number up to get desired error -; reporting level -; E_ALL - All errors and warnings (doesn't include E_STRICT) -; E_ERROR - fatal run-time errors -; E_RECOVERABLE_ERROR - almost fatal run-time errors -; E_WARNING - run-time warnings (non-fatal errors) -; E_PARSE - compile-time parse errors -; E_NOTICE - run-time notices (these are warnings which often result -; from a bug in your code, but it's possible that it was -; intentional (e.g., using an uninitialized variable and -; relying on the fact it's automatically initialized to an -; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes -; to your code which will ensure the best interoperability -; and forward compatibility of your code -; E_CORE_ERROR - fatal errors that occur during PHP's initial startup -; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's -; initial startup -; E_COMPILE_ERROR - fatal compile-time errors -; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) -; E_USER_ERROR - user-generated error message -; E_USER_WARNING - user-generated warning message -; E_USER_NOTICE - user-generated notice message -; -; Examples: -; -; - Show all errors, except for notices and coding standards warnings -; -;error_reporting = E_ALL & ~E_NOTICE -; -; - Show all errors, except for notices -; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT -; -; - Show only errors -; -;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR -; -; - Show all errors, except coding standards warnings -; -error_reporting = E_ALL - -; Print out errors (as a part of the output). For production web sites, -; you're strongly encouraged to turn this feature off, and use error logging -; instead (see below). Keeping display_errors enabled on a production web site -; may reveal security information to end users, such as file paths on your Web -; server, your database schema or other information. -; -; possible values for display_errors: -; -; Off - Do not display any errors -; stderr - Display errors to STDERR (affects only CGI/CLI binaries!) -; On or stdout - Display errors to STDOUT (default) -; -; To output errors to STDERR with CGI/CLI: -;display_errors = "stderr" -; -; Default -; -display_errors = Off - -; Even when display_errors is on, errors that occur during PHP's startup -; sequence are not displayed. It's strongly recommended to keep -; display_startup_errors off, except for when debugging. -display_startup_errors = Off - -; Log errors into a log file (server-specific log, stderr, or error_log (below)) -; As stated above, you're strongly advised to use error logging in place of -; error displaying on production web sites. -log_errors = On - -; Set maximum length of log_errors. In error_log information about the source is -; added. The default is 1024 and 0 allows to not apply any maximum length at all. -log_errors_max_len = 1024 - -; Do not log repeated messages. Repeated errors must occur in same file on same -; line unless ignore_repeated_source is set true. -ignore_repeated_errors = Off - -; Ignore source of message when ignoring repeated messages. When this setting -; is On you will not log errors with repeated messages from different files or -; source lines. -ignore_repeated_source = Off - -; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This has only effect in a debug compile, and if -; error reporting includes E_WARNING in the allowed list -report_memleaks = Off - -;report_zend_debug = 0 - -; Store the last error/warning message in $php_errormsg (boolean). -track_errors = Off - -; Turn off normal error reporting and emit XML-RPC error XML -;xmlrpc_errors = 0 -; An XML-RPC faultCode -;xmlrpc_error_number = 0 - -; Disable the inclusion of HTML tags in error messages. -; Note: Never use this feature for production boxes. -;html_errors = Off - -; If html_errors is set On PHP produces clickable error messages that direct -; to a page describing the error or function causing the error in detail. -; You can download a copy of the PHP manual from http://www.php.net/docs.php -; and change docref_root to the base URL of your local copy including the -; leading '/'. You must also specify the file extension being used including -; the dot. -; Note: Never use this feature for production boxes. -;docref_root = "/phpmanual/" -;docref_ext = .html - -; String to output before an error message. -;error_prepend_string = "<font color=#ff0000>" - -; String to output after an error message. -;error_append_string = "</font>" - -; Log errors to specified file. -;error_log = filename - -; Log errors to syslog. -;error_log = syslog - - -;;;;;;;;;;;;;;;;; -; Data Handling ; -;;;;;;;;;;;;;;;;; -; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 - -; The separator used in PHP generated URLs to separate arguments. -; Default is "&". -;arg_separator.output = "&" - -; List of separator(s) used by PHP to parse input URLs into variables. -; Default is "&". -; NOTE: Every character in this directive is considered as separator! -;arg_separator.input = ";&" - -; This directive describes the order in which PHP registers GET, POST, Cookie, -; Environment and Built-in variables (G, P, C, E & S respectively, often -; referred to as EGPCS or GPC). Registration is done from left to right, newer -; values override older values. -variables_order = "GPCS" - -; Whether or not to register the EGPCS variables as global variables. You may -; want to turn this off if you don't want to clutter your scripts' global scope -; with user data. This makes most sense when coupled with track_vars - in which -; case you can access all of the GPC variables through the $HTTP_*_VARS[], -; variables. -; -; You should do your best to write your scripts so that they do not require -; register_globals to be on; Using form variables as globals can easily lead -; to possible security problems, if the code is not very well thought of. -register_globals = Off - -; Whether or not to register the old-style input arrays, HTTP_GET_VARS -; and friends. If you're not using them, it's recommended to turn them off, -; for performance reasons. -register_long_arrays = Off - -; This directive tells PHP whether to declare the argv&argc variables (that -; would contain the GET information). If you don't use these variables, you -; should turn it off for increased performance. -register_argc_argv = Off - -; When enabled, the SERVER and ENV variables are created when they're first -; used (Just In Time) instead of when the script starts. If these variables -; are not used within a script, having this directive on will result in a -; performance gain. The PHP directives register_globals, register_long_arrays, -; and register_argc_argv must be disabled for this directive to have any affect. -auto_globals_jit = On - -; Maximum size of POST data that PHP will accept. -post_max_size = 8M - -; Magic quotes -; - -; Magic quotes for incoming GET/POST/Cookie data. -magic_quotes_gpc = Off - -; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. -magic_quotes_runtime = Off - -; Use Sybase-style magic quotes (escape ' with '' instead of \'). -magic_quotes_sybase = Off - -; Automatically add files before or after any PHP document. -auto_prepend_file = -auto_append_file = - -; As of 4.0b4, PHP always outputs a character encoding by default in -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. -; -; PHP's built-in default is text/html -default_mimetype = "text/html" -;default_charset = "iso-8859-1" - -; Always populate the $HTTP_RAW_POST_DATA variable. -;always_populate_raw_post_data = On - - -;;;;;;;;;;;;;;;;;;;;;;;;; -; Paths and Directories ; -;;;;;;;;;;;;;;;;;;;;;;;;; - -; UNIX: "/path1:/path2" -include_path = ".:/usr/share/pear" - -; The root of the PHP pages, used only if nonempty. -; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -; if you are running php as a CGI under any web server (other than IIS) -; see documentation for security issues. The alternate is to use the -; cgi.force_redirect configuration below -doc_root = - -; The directory under which PHP opens the script using /~username used only -; if nonempty. -user_dir = - -; Directory in which the loadable extensions (modules) reside. -extension_dir = "/usr/lib/php/20060613/" - -; Whether or not to enable the dl() function. The dl() function does NOT work -; properly in multithreaded servers, such as IIS or Zeus, and is automatically -; disabled on them. -enable_dl = Off - -; cgi.force_redirect is necessary to provide security running PHP as a CGI under -; most web servers. Left undefined, PHP turns this on by default. You can -; turn it off here AT YOUR OWN RISK -; **You CAN safely turn this off for IIS, in fact, you MUST.** -; cgi.force_redirect = 1 - -; if cgi.nph is enabled it will force cgi to always sent Status: 200 with -; every request. -; cgi.nph = 1 - -; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape -; (iPlanet) web servers, you MAY need to set an environment variable name that PHP -; will look for to know it is OK to continue execution. Setting this variable MAY -; cause security issues, KNOW WHAT YOU ARE DOING FIRST. -; cgi.redirect_status_env = ; - -; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's -; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok -; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting -; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting -; of zero causes PHP to behave as before. Default is 1. You should fix your scripts -; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. -; cgi.fix_pathinfo=1 - -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate -; security tokens of the calling client. This allows IIS to define the -; security context that the request runs under. mod_fastcgi under Apache -; does not currently support this feature (03/17/2002) -; Set to 1 if running under IIS. Default is zero. -; fastcgi.impersonate = 1; - -; Disable logging through FastCGI connection -; fastcgi.logging = 0 - -; cgi.rfc2616_headers configuration option tells PHP what type of headers to -; use when sending HTTP response code. If it's set 0 PHP sends Status: header that -; is supported by Apache. When this option is set to 1 PHP will send -; RFC2616 compliant header. -; Default is zero. -;cgi.rfc2616_headers = 0 - - -;;;;;;;;;;;;;;;; -; File Uploads ; -;;;;;;;;;;;;;;;; - -; Whether to allow HTTP file uploads. -file_uploads = On - -; Temporary directory for HTTP uploaded files (will use system default if not -; specified). -;upload_tmp_dir = - -; Maximum allowed size for uploaded files. -upload_max_filesize = 2M - -; Maximum number of files that can be uploaded via a single request -max_file_uploads = 20 - - -;;;;;;;;;;;;;;;;;; -; Fopen wrappers ; -;;;;;;;;;;;;;;;;;; - -; Whether to allow the treatment of URLs (like http:// or ftp://) as files. -allow_url_fopen = On - -; Whether to allow include/require to open URLs (like http:// or ftp://) as files. -allow_url_include = Off - -; Define the anonymous ftp password (your email address) -;from="john@doe.com" - -; Define the User-Agent string -; user_agent="PHP" - -; Default timeout for socket based streams (seconds) -default_socket_timeout = 60 - - -;;;;;;;;;;;;;;;;;;;;;; -; Dynamic Extensions ; -;;;;;;;;;;;;;;;;;;;;;; -; -; If you wish to have an extension loaded automatically, use the following -; syntax: -; -; extension=modulename.extension -; -; For example, under UNIX: -; -; extension=msql.so -; -; Note that it should be the name of the module only; no directory information -; needs to go here. Specify the location of the extension with the -; extension_dir directive above. - -;extension=bcmath.so -;extension=bz2.so -;extension=calendar.so -;extension=curl.so -;extension=dba.so -;extension=dbase.so -;extension=exif.so -;extension=ftp.so -;extension=gd.so -extension=gettext.so -;extension=gmp.so -;extension=iconv.so -;extension=imap.so -;extension=json.so -;extension=ldap.so -;extension=mcrypt.so -;extension=mhash.so -;extension=mime_magic.so -;extension=mysql.so -;extension=mysqli.so -;extension=ncurses.so -;extension=odbc.so -;extension=openssl.so -;extension=pdo.so -;extension=pdo_mysql.so -;extension=pdo_odbc.so -;extension=pdo_pgsql.so -;extension=pdo_sqlite.so -;extension=pgsql.so -;extension=posix.so -;extension=pspell.so -extension=session.so -;extension=shmop.so -;extension=snmp.so -;extension=soap.so -;extension=sockets.so -;extension=sqlite.so -;extension=sysvmsg.so -;extension=sysvsem.so -;extension=sysvshm.so -;extension=tidy.so -;extension=xmlrpc.so -;extension=xsl.so -;extension=zip.so -extension=zlib.so - - -;;;;;;;;;;;;;;;;;;; -; Module Settings ; -;;;;;;;;;;;;;;;;;;; - -[Date] -; Defines the default timezone used by the date functions -;date.timezone = - -;date.default_latitude = 31.7667 -;date.default_longitude = 35.2333 - -;date.sunrise_zenith = 90.583333 -;date.sunset_zenith = 90.583333 - -[filter] -;filter.default = unsafe_raw -;filter.default_flags = - -[iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 - -[sqlite] -;sqlite.assoc_case = 0 - -[Pcre] -;PCRE library backtracking limit. -;pcre.backtrack_limit=100000 - -;PCRE library recursion limit. -;Please note that if you set this value to a high number you may consume all -;the available process stack and eventually crash PHP (due to reaching the -;stack size limit imposed by the Operating System). -;pcre.recursion_limit=100000 - -[Syslog] -; Whether or not to define the various syslog variables (e.g. $LOG_PID, -; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In -; runtime, you can define these variables by calling define_syslog_variables(). -define_syslog_variables = Off - -[mail function] -; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). -;sendmail_path = - -; Force the addition of the specified parameters to be passed as extra parameters -; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. -;mail.force_extra_parameters = - -[SQL] -sql.safe_mode = Off - -[ODBC] -;odbc.default_db = Not yet implemented -;odbc.default_user = Not yet implemented -;odbc.default_pw = Not yet implemented - -; Allow or prevent persistent links. -odbc.allow_persistent = On - -; Check that a connection is still valid before reuse. -odbc.check_persistent = On - -; Maximum number of persistent links. -1 means no limit. -odbc.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -odbc.max_links = -1 - -; Handling of LONG fields. Returns number of bytes to variables. 0 means -; passthru. -odbc.defaultlrl = 4096 - -; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. -; See the documentation on odbc_binmode and odbc_longreadlen for an explanation -; of uodbc.defaultlrl and uodbc.defaultbinmode -odbc.defaultbinmode = 1 - -[MySQL] -; Allow or prevent persistent links. -mysql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mysql.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -mysql.max_links = -1 - -; Default port number for mysql_connect(). If unset, mysql_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). -mysql.default_port = - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysql.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysql.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysql.default_user = - -; Default password for mysql_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysql.default_password = - -; Maximum time (in seconds) for connect timeout. -1 means no limit -mysql.connect_timeout = 60 - -; Trace mode. When trace_mode is active (=On), warnings for table/index scans and -; SQL-Errors will be displayed. -mysql.trace_mode = Off - -[MySQLi] - -; Maximum number of links. -1 means no limit. -mysqli.max_links = -1 - -; Default port number for mysqli_connect(). If unset, mysqli_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). -mysqli.default_port = 3306 - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysqli.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysqli.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysqli.default_user = - -; Default password for mysqli_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysqli.default_pw = - -; Allow or prevent reconnect -mysqli.reconnect = Off - -[mSQL] -; Allow or prevent persistent links. -msql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -msql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -msql.max_links = -1 - -[OCI8] -; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) -;oci8.privileged_connect = Off - -; Connection: The maximum number of persistent OCI8 connections per -; process. Using -1 means no limit. -;oci8.max_persistent = -1 - -; Connection: The maximum number of seconds a process is allowed to -; maintain an idle persistent connection. Using -1 means idle -; persistent connections will be maintained forever. -;oci8.persistent_timeout = -1 - -; Connection: The number of seconds that must pass before issuing a -; ping during oci_pconnect() to check the connection validity. When -; set to 0, each oci_pconnect() will cause a ping. Using -1 disables -; pings completely. -;oci8.ping_interval = 60 - -; Tuning: This option enables statement caching, and specifies how -; many statements to cache. Using 0 disables statement caching. -;oci8.statement_cache_size = 20 - -; Tuning: Enables statement prefetching and sets the default number of -; rows that will be fetched automatically after statement execution. -;oci8.default_prefetch = 10 - -; Compatibility. Using On means oci_close() will not close -; oci_connect() and oci_new_connect() connections. -;oci8.old_oci_close_semantics = Off - -[PostgresSQL] -; Allow or prevent persistent links. -pgsql.allow_persistent = On - -; Detect broken persistent links always with pg_pconnect(). -; Auto reset feature requires a little overheads. -pgsql.auto_reset_persistent = Off - -; Maximum number of persistent links. -1 means no limit. -pgsql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -pgsql.max_links = -1 - -; Ignore PostgreSQL backends Notice message or not. -; Notice message logging require a little overheads. -pgsql.ignore_notice = 0 - -; Log PostgreSQL backends Notice message or not. -; Unless pgsql.ignore_notice=0, module cannot log notice message. -pgsql.log_notice = 0 - -[Sybase] -; Allow or prevent persistent links. -sybase.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybase.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybase.max_links = -1 - -;sybase.interface_file = "/usr/sybase/interfaces" - -; Minimum error severity to display. -sybase.min_error_severity = 10 - -; Minimum message severity to display. -sybase.min_message_severity = 10 - -; Compatibility mode with old versions of PHP 3.0. -; If on, this will cause PHP to automatically assign types to results according -; to their Sybase type, instead of treating them all as strings. This -; compatibility mode will probably not stay around forever, so try applying -; whatever necessary changes to your code, and turn it off. -sybase.compatability_mode = Off - -[Sybase-CT] -; Allow or prevent persistent links. -sybct.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybct.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybct.max_links = -1 - -; Minimum server message severity to display. -sybct.min_server_severity = 10 - -; Minimum client message severity to display. -sybct.min_client_severity = 10 - -[bcmath] -; Number of decimal digits for all bcmath functions. -bcmath.scale = 0 - -[browscap] -;browscap = extra/browscap.ini - -[Informix] -; Default host for ifx_connect() (doesn't apply in safe mode). -ifx.default_host = - -; Default user for ifx_connect() (doesn't apply in safe mode). -ifx.default_user = - -; Default password for ifx_connect() (doesn't apply in safe mode). -ifx.default_password = - -; Allow or prevent persistent links. -ifx.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -ifx.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -ifx.max_links = -1 - -; If on, select statements return the contents of a text blob instead of its id. -ifx.textasvarchar = 0 - -; If on, select statements return the contents of a byte blob instead of its id. -ifx.byteasvarchar = 0 - -; Trailing blanks are stripped from fixed-length char columns. May help the -; life of Informix SE users. -ifx.charasvarchar = 0 - -; If on, the contents of text and byte blobs are dumped to a file instead of -; keeping them in memory. -ifx.blobinfile = 0 - -; NULL's are returned as empty strings, unless this is set to 1. In that case, -; NULL's are returned as string 'NULL'. -ifx.nullformat = 0 - -[Session] -; Handler used to store/retrieve data. -session.save_handler = files - -; Argument passed to save_handler. In the case of files, this is the path -; where data files are stored. -; -; As of PHP 4.0.1, you can define the path as: -; -; session.save_path = "N;/path" -; -; where N is an integer. Instead of storing all the session files in -; /path, what this will do is use subdirectories N-levels deep, and -; store the session data in those directories. This is useful if you -; or your OS have problems with lots of files in one directory, and is -; a more efficient layout for servers that handle lots of sessions. -; -; NOTE 1: PHP will not create this directory structure automatically. -; You can use the script in the ext/session dir for that purpose. -; NOTE 2: See the section on garbage collection below if you choose to -; use subdirectories for session storage -; -; The file storage module creates files using mode 600 by default. -; You can change that by using -; -; session.save_path = "N;MODE;/path" -; -; where MODE is the octal representation of the mode. Note that this -; does not overwrite the process's umask. -;session.save_path = "/tmp" - -; Whether to use cookies. -session.use_cookies = 1 - -;session.cookie_secure = - -; This option enables administrators to make their users invulnerable to -; attacks which involve passing session ids in URLs; defaults to 0. -; session.use_only_cookies = 1 - -; Name of the session (used as cookie name). -session.name = PHPSESSID - -; Initialize session on request startup. -session.auto_start = 0 - -; Lifetime in seconds of cookie or, if 0, until browser is restarted. -session.cookie_lifetime = 0 - -; The path for which the cookie is valid. -session.cookie_path = / - -; The domain for which the cookie is valid. -session.cookie_domain = - -; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. -session.cookie_httponly = - -; Handler used to serialize data. php is the standard serializer of PHP. -session.serialize_handler = php - -; Define the probability that the 'garbage collection' process is started -; on every session initialization. -; The probability is calculated by using gc_probability/gc_divisor, -; e.g. 1/100 means there is a 1% chance that the GC process starts -; on each request. - -session.gc_probability = 1 -session.gc_divisor = 1000 - -; After this number of seconds, stored data will be seen as 'garbage' and -; cleaned up by the garbage collection process. -session.gc_maxlifetime = 1440 - -; NOTE: If you are using the subdirectory option for storing session files -; (see session.save_path above), then garbage collection does *not* -; happen automatically. You will need to do your own garbage -; collection through a shell script, cron entry, or some other method. -; For example, the following script would is the equivalent of -; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): -; cd /path/to/sessions; find -cmin +24 | xargs rm - -; PHP 4.2 and less have an undocumented feature/bug that allows you to -; to initialize a session variable in the global scope, albeit register_globals -; is disabled. PHP 4.3 and later will warn you, if this feature is used. -; You can disable the feature and the warning separately. At this time, -; the warning is only displayed, if bug_compat_42 is enabled. - -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 - -; Check HTTP Referer to invalidate externally stored URLs containing ids. -; HTTP_REFERER has to contain this substring for the session to be -; considered as valid. -session.referer_check = - -; How many bytes to read from the file. -session.entropy_length = 0 - -; Specified here to create the session id. -session.entropy_file = - -;session.entropy_length = 16 - -;session.entropy_file = /dev/urandom - -; Set to {nocache,private,public,} to determine HTTP caching aspects -; or leave this empty to avoid sending anti-caching headers. -session.cache_limiter = nocache - -; Document expires after n minutes. -session.cache_expire = 180 - -; trans sid support is disabled by default. -; Use of trans sid may risk your users security. -; Use this option with caution. -; - User may send URL contains active session ID -; to other person via. email/irc/etc. -; - URL that contains active session ID may be stored -; in publically accessible computer. -; - User may access your site with the same session ID -; always using URL stored in browser's history or bookmarks. -session.use_trans_sid = 0 - -; Select a hash function -; 0: MD5 (128 bits) -; 1: SHA-1 (160 bits) -session.hash_function = 0 - -; Define how many bits are stored in each character when converting -; the binary hash data to something readable. -; -; 4 bits: 0-9, a-f -; 5 bits: 0-9, a-v -; 6 bits: 0-9, a-z, A-Z, "-", "," -session.hash_bits_per_character = 5 - -; The URL rewriter will look for URLs in a defined set of HTML tags. -; form/fieldset are special; if you include them here, the rewriter will -; add a hidden <input> field with the info which is otherwise appended -; to URLs. If you want XHTML conformity, remove the form entry. -; Note that all valid entries require a "=", even if no value follows. -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -[MSSQL] -; Allow or prevent persistent links. -mssql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mssql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -mssql.max_links = -1 - -; Minimum error severity to display. -mssql.min_error_severity = 10 - -; Minimum message severity to display. -mssql.min_message_severity = 10 - -; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off - -; Connect timeout -;mssql.connect_timeout = 5 - -; Query timeout -;mssql.timeout = 60 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textlimit = 4096 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textsize = 4096 - -; Limits the number of records in each batch. 0 = all records in one batch. -;mssql.batchsize = 0 - -; Specify how datetime and datetim4 columns are returned -; On => Returns data converted to SQL server settings -; Off => Returns values as YYYY-MM-DD hh:mm:ss -;mssql.datetimeconvert = On - -; Use NT authentication when connecting to the server -mssql.secure_connection = Off - -; Specify max number of processes. -1 = library default -; msdlib defaults to 25 -; FreeTDS defaults to 4096 -;mssql.max_procs = -1 - -; Specify client character set. -; If empty or not set the client charset from freetds.comf is used -; This is only used when compiled with FreeTDS -;mssql.charset = "ISO-8859-1" - -[Assertion] -; Assert(expr); active by default. -;assert.active = On - -; Issue a PHP warning for each failed assertion. -;assert.warning = On - -; Don't bail out by default. -;assert.bail = Off - -; User-function to be called if an assertion fails. -;assert.callback = 0 - -; Eval the expression with current error_reporting(). Set to true if you want -; error_reporting(0) around the eval(). -;assert.quiet_eval = 0 - -[COM] -; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs -;com.typelib_file = -; allow Distributed-COM calls -;com.allow_dcom = true -; autoregister constants of a components typlib on com_load() -;com.autoregister_typelib = true -; register constants casesensitive -;com.autoregister_casesensitive = false -; show warnings on duplicate constant registrations -;com.autoregister_verbose = true - -[mbstring] -; language for internal character representation. -;mbstring.language = Japanese - -; internal/script encoding. -; Some encoding cannot work as internal encoding. -; (e.g. SJIS, BIG5, ISO-2022-*) -;mbstring.internal_encoding = EUC-JP - -; http input encoding. -;mbstring.http_input = auto - -; http output encoding. mb_output_handler must be -; registered as output buffer to function -;mbstring.http_output = SJIS - -; enable automatic encoding translation according to -; mbstring.internal_encoding setting. Input chars are -; converted to internal encoding by setting this to On. -; Note: Do _not_ use automatic encoding translation for -; portable libs/applications. -;mbstring.encoding_translation = Off - -; automatic encoding detection order. -; auto means -;mbstring.detect_order = auto - -; substitute_character used when character cannot be converted -; one from another -;mbstring.substitute_character = none; - -; overload(replace) single byte functions by mbstring functions. -; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), -; etc. Possible values are 0,1,2,4 or combination of them. -; For example, 7 for overload everything. -; 0: No overload -; 1: Overload mail() function -; 2: Overload str*() functions -; 4: Overload ereg*() functions -;mbstring.func_overload = 0 - -; enable strict encoding detection. -;mbstring.strict_detection = Off - -[FrontBase] -;fbsql.allow_persistent = On -;fbsql.autocommit = On -;fbsql.show_timestamp_decimals = Off -;fbsql.default_database = -;fbsql.default_database_password = -;fbsql.default_host = -;fbsql.default_password = -;fbsql.default_user = "_SYSTEM" -;fbsql.generate_warnings = Off -;fbsql.max_connections = 128 -;fbsql.max_links = 128 -;fbsql.max_persistent = -1 -;fbsql.max_results = 128 - -[gd] -; Tell the jpeg decode to libjpeg warnings and try to create -; a gd image. The warning will then be displayed as notices -; disabled by default -;gd.jpeg_ignore_warning = 0 - -[exif] -; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. -; With mbstring support this will automatically be converted into the encoding -; given by corresponding encode setting. When empty mbstring.internal_encoding -; is used. For the decode settings you can distinguish between motorola and -; intel byte order. A decode setting cannot be empty. -;exif.encode_unicode = ISO-8859-15 -;exif.decode_unicode_motorola = UCS-2BE -;exif.decode_unicode_intel = UCS-2LE -;exif.encode_jis = -;exif.decode_jis_motorola = JIS -;exif.decode_jis_intel = JIS - -[Tidy] -; The path to a default tidy configuration file to use when using tidy -;tidy.default_config = /usr/local/lib/php/default.tcfg - -; Should tidy clean and repair output automatically? -; WARNING: Do not use this option if you are generating non-html content -; such as dynamic images -tidy.clean_output = Off - -[soap] -; Enables or disables WSDL caching feature. -soap.wsdl_cache_enabled=1 -; Sets the directory name where SOAP extension will put cache files. -soap.wsdl_cache_dir="/tmp" -; (time to live) Sets the number of second while cached file will be used -; instead of original one. -soap.wsdl_cache_ttl=86400 - -; Local Variables: -; tab-width: 4 -; End: diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 0e0c3ee7c..751711d03 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40956 2011-03-02 21:08:01Z lcarlier $ +# $Id: PKGBUILD 47672 2011-05-24 18:43:41Z tdziedzic $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus pkgver=0.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" @@ -17,14 +17,15 @@ sha1sums=('ca7fe5cea65fb3392d1e81056a879831925502f2' 'f35649f3b0b2bfcb01ce75085cf719dcaa609a54') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} scons prefix=/usr } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./install.sh "${pkgdir}/usr" + install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" } diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index e34e02601..cc4df5fca 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45135 2011-04-17 08:17:41Z tdziedzic $ +# $Id: PKGBUILD 47635 2011-05-24 14:23:55Z tdziedzic $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Vasco Costa <vasco.costa@meiodigital.com> pkgname=pokerth _realname=PokerTH pkgver=0.8.3 -pkgrel=3 +pkgrel=4 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64' 'mips64el') url="http://www.pokerth.net/" @@ -16,16 +16,23 @@ source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver- md5sums=('adbe56ad5f547eb255dad91de564bf1c') build() { - cd "$srcdir/$_realname-$pkgver-src" + cd $_realname-$pkgver-src sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro + + # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' + sed \ + -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ + -i zlib_compress.pro pokerth_game.pro pokerth_server.pro + qmake $pkgname.pro + make } package() { - cd "$srcdir/$_realname-$pkgver-src" + cd $_realname-$pkgver-src make INSTALL_ROOT="$pkgdir" install diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index aa7d2cc4c..84d40eeb8 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 78581 2010-04-26 20:01:05Z andrea $ -# Maintainer: +# $Id: PKGBUILD 48148 2011-05-29 00:07:23Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=projectm pkgver=2.0.1 -pkgrel=2 -pkgdesc="A music visualizer which uses 3D accelerated iterative image based rendering" -arch=('i686' 'x86_64' 'mips64el') -url="http://projectm.sourceforge.net/" +pkgrel=3 +pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' +arch=('i686' 'x86_64') +url='http://projectm.sourceforge.net/' license=('LGPL') depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext') makedepends=('pkgconfig' 'cmake') -source=(http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz) -md5sums=('f8bf795878cdbbef54784cf2390b4c89') +source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz" + 'libprojectM-2.0.1-pkg-config.patch') +md5sums=('f8bf795878cdbbef54784cf2390b4c89' + 'c271ec8c541eb281f1294287bdbc3488') build() { - cd ${srcdir} -# sed -i 's|FTGL/FTGL.h|FTGL/ftgl.h|' Renderer.hpp || return 1 -# sed -i "s|#include <iostream>|#include <cstdio>\n#include <iostream>|" BuiltinParams.cpp || return 1 - mkdir build - cd build - cmake ../projectM-${pkgver}-Source \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release || return 1 - make || return 1 + cd "${srcdir}/projectM-${pkgver}-Source" + + patch -p0 -i ../libprojectM-2.0.1-pkg-config.patch + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/projectM-${pkgver}-Source" + make DESTDIR="${pkgdir}" install } diff --git a/community/projectm/libprojectM-2.0.1-pkg-config.patch b/community/projectm/libprojectM-2.0.1-pkg-config.patch new file mode 100644 index 000000000..415e92fd7 --- /dev/null +++ b/community/projectm/libprojectM-2.0.1-pkg-config.patch @@ -0,0 +1,10 @@ +--- libprojectM.pc.orig 2011-05-29 01:52:53.869288700 +0200 ++++ libprojectM.pc 2011-05-29 01:53:08.604851407 +0200 +@@ -1,6 +1,6 @@ + prefix=/usr/local + exec_prefix=/usr/local +-libdir= ++libdir=${exec_prefix}/lib + includedir=/usr/local/include + pkgdatadir=/usr/local/share/projectM + sysconfdir=/usr/local/share/projectM diff --git a/community/python-pysfml/PKGBUILD b/community/python-pysfml/PKGBUILD deleted file mode 100644 index f4bd94dad..000000000 --- a/community/python-pysfml/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 40196 2011-02-21 18:40:57Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: scj <scj(at)archlinux(dot)us> - -pkgname=('python-pysfml' 'python2-pysfml') -pkgbase=python-pysfml -pkgver=1.6 -pkgrel=3 -pkgdesc="Python bindings for the SFML library" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.sfml-dev.org" -makedepends=('sfml' 'python' 'python2') -license=('zlib') -depends=() -replaces=('pysfml') -source=(http://downloads.sourceforge.net/sfml/SFML-${pkgver}-python-sdk.zip) -md5sums=('9acaf793ae9a498a51f7f6fc74307b32') - -build() { - cd "${srcdir}/SFML-${pkgver}/python" -} - -package_python-pysfml() { - depends=('sfml' 'python') - - cd "${srcdir}/SFML-${pkgver}/python" - - python3 setup.py install --root=${pkgdir} -} - -package_python2-pysfml() { - depends=('sfml' 'python2') - - cd "${srcdir}/SFML-${pkgver}/python" - - python2 setup.py install --root=${pkgdir} -} - -# vim:set ts=2 sw=2 et: diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 591963f40..82b0f5e0b 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -4,7 +4,7 @@ pkgname=qbittorrent pkgver=2.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') url="http://www.qbittorrent.org/" diff --git a/community/qlandkartegt/gpsd-2.96.patch b/community/qlandkartegt/gpsd-2.96.patch deleted file mode 100644 index 634e9ad7e..000000000 --- a/community/qlandkartegt/gpsd-2.96.patch +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2011/03/31 20:21:34 drochner Exp $ - -for gpsd-2.96 - ---- src/CDeviceGPSD.h.orig 2011-03-15 20:13:04.000000000 +0000 -+++ src/CDeviceGPSD.h -@@ -56,7 +56,7 @@ class CGPSDThread : public QThread - protected: - virtual void run(); - -- gps_data_t* gpsdata; -+ gps_data_t* gpsdata, gpsdata_store; - - bool decodeData(); - -$NetBSD: patch-ac,v 1.1 2011/03/31 20:21:34 drochner Exp $ - -for gpsd-2.96 - ---- src/CDeviceGPSD.cpp.orig 2011-03-15 20:13:04.000000000 +0000 -+++ src/CDeviceGPSD.cpp -@@ -138,6 +138,7 @@ CGPSDThread::CGPSDThread( int _pipe_fd ) - log_mutex( new QMutex() ), - pipe_fd( _pipe_fd ) - { -+ gpsdata = &gpsdata_store; - } - - -@@ -149,8 +150,8 @@ CGPSDThread::~CGPSDThread() - - void CGPSDThread::run() - { -- gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT ); -- if( !gpsdata ) -+ int res = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata ); -+ if( res ) - { - // TODO: message box (from other thread) - qDebug() << "gps_open failed."; -@@ -187,7 +188,7 @@ void CGPSDThread::run() - } // if - else if( FD_ISSET( gpsdata->gps_fd, &fds ) ) - { -- gps_poll( gpsdata ); -+ gps_read( gpsdata ); - if( !decodeData() ) break; - } // else if - } // else if diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 60f22d91b..1dbb52f23 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47038 2011-05-14 10:40:55Z jelle $ +# $Id: PKGBUILD 48128 2011-05-28 22:25:50Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.2.7 +pkgver=2.2.8 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('86937a61b9788d1d06fbfbd2bff03916' +md5sums=('106af5e3d4646588fd27be499227e14c' 'bf61968d18d0e42529880f5c488ea9ed' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 5cec3a966..a0e10fec0 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -4,13 +4,14 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=4.6.2 -pkgrel=2 +pkgver=4.7 +pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('readline') +#depends=('readline') +depends=('ppl') makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core') optdepends=('imagemagick: some plotting functionality benefits from it' 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' @@ -19,8 +20,8 @@ options=('!makeflags') install="${pkgname}.install" source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" 'SAGE-notebook.desktop') -md5sums=('0dc2c9e9cc593685bb039085900ddfeb' - 'bcd01b7863794431f8f208ed96fd108d') +md5sums=('db4d891feed487e1696b8d01ae3b6469' + 'dc391f12b7d17dd37326343ec0e99bbd') build() { cd sage-${pkgver} @@ -30,8 +31,10 @@ build() { # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash # this is for people who have custom kernels (sage works this around by checking uname -r) + #mkdir -p spkg/installed + #touch spkg/installed/readline-6.1 mkdir -p spkg/installed - touch spkg/installed/readline-6.1 + touch spkg/installed/ppl-0.11.2 # fix "missing sage.all error" during build unset CFLAGS @@ -61,6 +64,9 @@ build() { # only build sage, no documents #make build make + + # uncomment if we want to run all the tests (warning: very long) + #make ptestlong } package() { diff --git a/community/sage-mathematics/SAGE-notebook.desktop b/community/sage-mathematics/SAGE-notebook.desktop index 87496030b..26a35d3ac 100644 --- a/community/sage-mathematics/SAGE-notebook.desktop +++ b/community/sage-mathematics/SAGE-notebook.desktop @@ -9,7 +9,6 @@ GenericName[de]= Icon=/opt/sage/data/extcode/notebook/images/sageicon.png MimeType= Name[de]=SAGE -Path=/opt/sage/notebook StartupNotify=true Terminal=true Type=Application diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install index f5c16308e..6caa5299e 100644 --- a/community/sage-mathematics/sage-mathematics.install +++ b/community/sage-mathematics/sage-mathematics.install @@ -5,6 +5,9 @@ post_install() { # the files it writes to ~/.sage can be safely ignored HOME=/tmp ./sage -c + # add sagemath user for the daemon + useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath + # Update LaTeX db to point to SageTeX if [ -f /usr/bin/texhash ]; then /usr/bin/texhash /usr/share/texmf @@ -23,11 +26,14 @@ echo ' \___/ | |_/|/\__/ \_/|/o /| /| \| \| - ___ __ _ __ _ ___ -/ __|/ _` |/ _` |/ _ \ -\__ \ (_| | (_| | __/ -|___/\__,_|\__, |\___| - |___/ + ________________________________ +< sage-mathematics, I mean, MOO! > + -------------------------------- + \ ^__^ + \ (oo)\_______ + (__)\ )\/\ + ||----w | + || || ' } @@ -42,6 +48,9 @@ post_remove() { /usr/bin/texhash /usr/share/texmf fi + # remove the sagemath daemon user + userdel sagemath + # clean up left overs rm -rf /opt/sage } diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 2c60c4f3e..3601e266b 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 43438 2011-03-26 08:44:13Z spupykin $ +# $Id: PKGBUILD 47626 2011-05-24 13:55:50Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot -pkgver=1.4.21 +pkgver=1.4.22 pkgrel=1 pkgdesc="Allows users to execute shell commands under different root filesystems. \ (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') -depends=('pam' 'lockdev' 'boost>=1.41' 'e2fsprogs') +depends=('pam' 'lockdev' 'boost' 'e2fsprogs') optdepends=('btrfs-progs-unstable' 'lvm2') arch=('i686' 'x86_64' 'mips64el') conflicts=('dchroot') @@ -24,13 +24,13 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'script-arch32' 'copyfiles-arch32' 'mount-arch32') -md5sums=('fbbb65213e26a0a3e2e1bac04a24d20d' +md5sums=('0dde4c76b1623cc277d92f8dc06109d1' '8e86445e188129232e1782d978dfc967' 'd4558d5691fbdaa46ce669e8f327133b' 'f0d5d5b5e34a860f6f90b5628c680f46') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" @@ -43,7 +43,13 @@ build() { # --enable-csbuild make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=$pkgdir install + install -m 644 ${srcdir}/script-arch32 ${pkgdir}/etc/schroot install -m 644 ${srcdir}/mount-arch32 ${pkgdir}/etc/schroot install -m 644 ${srcdir}/copyfiles-arch32 ${pkgdir}/etc/schroot diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 978b33d71..ed81809a9 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 45502 2011-04-22 15:22:48Z spupykin $ +# $Id: PKGBUILD 48133 2011-05-28 22:32:26Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.9.3 +pkgver=0.10 pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' - 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'gnome-vfs') +depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'gnome-vfs') makedepends=('intltool' 'vala') install=shotwell.install -source=(http://yorba.org/download/shotwell/0.9/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b1a3281be7d4ff8eac98289bcd129387') +source=("http://yorba.org/download/shotwell/${pkgver}/shotwell-${pkgver}.tar.bz2") +md5sums=('680c688cefdf6929f0a995d755b9f8f7') build() { cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ --disable-schemas-install \ --disable-desktop-update \ --disable-icon-update + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/skype-call-recorder/PKGBUILD b/community/skype-call-recorder/PKGBUILD deleted file mode 100644 index 620e23b1a..000000000 --- a/community/skype-call-recorder/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 6063 2009-11-28 12:03:50Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Tarinaky <tarinaky@hunity.co.uk> - -pkgname=skype-call-recorder -pkgver=0.8 -pkgrel=1 -pkgdesc="Open source tool that allows you to record your Skype calls on Linux" -arch=('i686' 'x86_64' 'mips64el') -url="http://atdot.ch/scr/" -license=('GPL') -depends=('qt' 'libvorbis' 'lame' 'id3lib' 'hicolor-icon-theme') -makedepends=('cmake') -install=skype-call-recorder.install -source=(http://atdot.ch/scr/files/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('937544a5245fdcfa50878d083dab706a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cmake -DCMAKE_INSTALL_PREFIX=/usr . - make || return 1 - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD index 46c7da2e5..74b9e3bfc 100644 --- a/community/smc/PKGBUILD +++ b/community/smc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 40953 2011-03-02 21:01:34Z lcarlier $ +# $Id: PKGBUILD 47652 2011-05-24 16:35:46Z schuay $ # Maintainer: # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=smc pkgver=1.9 -pkgrel=10 +pkgrel=11 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64' 'mips64el') url="http://www.secretmaryo.org/" license=('GPL3') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui>=0.7' 'boost-libs>=1.46' 'smc-data') -makedepends=('autoconf' 'automake' 'boost>=1.46') +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') +makedepends=('autoconf' 'automake' 'boost') source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 smc-for-cegui-v0-7.diff smc.desktop diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 92cb5c5ed..7a32da2c9 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41178 2011-03-04 19:28:06Z svenstaro $ +# $Id: PKGBUILD 47736 2011-05-25 04:13:58Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring pkgver=0.82.7.1 -pkgrel=2 +pkgrel=3 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" @@ -14,8 +14,10 @@ depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python' 'java-environment') optdepends=('python: python-based bots' 'java-runtime: java-based bots') -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma) -md5sums=('378cf0b18a5dd5b840964e5945778503') +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma + gcc46.patch) +md5sums=('378cf0b18a5dd5b840964e5945778503' + 'e9586b611db1ed04fe4f0c5982fda7d2') build() { bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma @@ -24,6 +26,7 @@ build() { sed -i '1i\ #include <list>' rts/lib/lobby/Connection.h + patch -Np1 < $srcdir/gcc46.patch cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring diff --git a/community/spring/gcc46.patch b/community/spring/gcc46.patch new file mode 100644 index 000000000..4f6865cac --- /dev/null +++ b/community/spring/gcc46.patch @@ -0,0 +1,67 @@ +From: Jan Dittberner <jandd@debian.org> +Subject: Patch for FTBFS with g++ 4.6.0 +Bug-Debian: http://bugs.debian.org/625097 +Bug: http://springrts.com/mantis/view.php?id=2415 +--- a/AI/Skirmish/E323AI/AAStar.h ++++ b/AI/Skirmish/E323AI/AAStar.h +@@ -4,6 +4,7 @@ + #include <queue> + #include <vector> + #include <list> ++#include <cstddef> // for NULL + + class AAStar { + public: +--- a/rts/Rendering/ShadowHandler.cpp ++++ b/rts/Rendering/ShadowHandler.cpp +@@ -318,6 +318,11 @@ + xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); + ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); + ++ shadowParams.x = xmid; ++ shadowParams.y = ymid; ++ shadowParams.z = p17; ++ shadowParams.w = p18; ++ + shadowMatrix[ 0] = cross1.x / maxLengthX; + shadowMatrix[ 4] = cross1.y / maxLengthX; + shadowMatrix[ 8] = cross1.z / maxLengthX; +--- a/rts/Rendering/ShadowHandler.h ++++ b/rts/Rendering/ShadowHandler.h +@@ -38,7 +38,7 @@ + CMatrix44f shadowMatrix; + void CalcMinMaxView(void); + +- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } ++ const float4& GetShadowParams() const { return shadowParams; } + + enum ShadowGenProgram { + SHADOWGEN_PROGRAM_MODEL = 0, +@@ -76,6 +76,7 @@ + //! to write the (FBO) depth-buffer texture + std::vector<Shader::IProgramObject*> shadowGenProgs; + ++ float4 shadowParams; + float x1, x2, y1, y2; + float xmid, ymid; + float p17, p18; +--- a/rts/Rendering/GLContext.cpp ++++ b/rts/Rendering/GLContext.cpp +@@ -9,6 +9,7 @@ + #include "GLContext.h" + + #include <list> ++#include <cstddef> // for NULL + + + using namespace std; +--- a/rts/System/MemPool.h ++++ b/rts/System/MemPool.h +@@ -4,6 +4,7 @@ + #define _MEM_POOL_H_ + + #include <new> ++#include <cstddef> // for NULL + + const size_t MAX_MEM_SIZE=200; + diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index b7924959c..aeb542a56 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46590 2011-05-09 22:11:42Z svenstaro $ +# $Id: PKGBUILD 47682 2011-05-24 19:40:45Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby pkgver=0.131 -pkgrel=1 +pkgrel=2 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') url="http://springlobby.info/" diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 845868e6b..325223225 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47349 2011-05-21 21:23:44Z dreisner $ +# $Id: PKGBUILD 47976 2011-05-26 18:14:34Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=systemd -pkgver=27 -pkgrel=2 +pkgver=28 +pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -26,18 +26,13 @@ backup=(etc/systemd/system.conf usr/lib/tmpfiles.d/x11.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" - "mqueue-signed-int.patch" "os-release") -md5sums=('6d6319e1817960459f13b300c4881f18' - '2ba01b4fc5c70eb51c223005fa5b9ecc' +md5sums=('be37500f576a0494f82fed7fa47cc306' '752636def0db3c03f121f8b4f44a63cd') build() { cd "$srcdir/$pkgname-$pkgver" - # fix ABRT on systemctl status - patch -Np1 <"$srcdir/mqueue-signed-int.patch" - ./configure --prefix=/usr \ --with-rootdir= \ --sysconfdir=/etc \ diff --git a/community/systemd/mqueue-signed-int.patch b/community/systemd/mqueue-signed-int.patch deleted file mode 100644 index dc9ac3524..000000000 --- a/community/systemd/mqueue-signed-int.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/dbus-common.c b/src/dbus-common.c -index fe7f84b..9bf0dab 100644 ---- a/src/dbus-common.c -+++ b/src/dbus-common.c -@@ -569,15 +569,15 @@ int bus_property_append_ul(DBusMessageIter *i, const char *property, void *data) - } - - int bus_property_append_long(DBusMessageIter *i, const char *property, void *data) { -- uint64_t u; -+ int64_t l; - - assert(i); - assert(property); - assert(data); - -- u = (int64_t) *(long*) data; -+ l = (int64_t) *(long*) data; - -- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &u)) -+ if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &l)) - return -ENOMEM; - - return 0; -diff --git a/src/dbus-socket.c b/src/dbus-socket.c -index b81569d..7194611 100644 ---- a/src/dbus-socket.c -+++ b/src/dbus-socket.c -@@ -115,8 +115,8 @@ DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMes - { "org.freedesktop.systemd1.Socket", "MaxConnections", bus_property_append_unsigned, "u", &u->socket.max_connections }, - { "org.freedesktop.systemd1.Socket", "NConnections", bus_property_append_unsigned, "u", &u->socket.n_connections }, - { "org.freedesktop.systemd1.Socket", "NAccepted", bus_property_append_unsigned, "u", &u->socket.n_accepted }, -- { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"t", &u->socket.mq_maxmsg }, -- { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"t", &u->socket.mq_msgsize }, -+ { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"x", &u->socket.mq_maxmsg }, -+ { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"x", &u->socket.mq_msgsize }, - { NULL, NULL, NULL, NULL, NULL } - }; - diff --git a/community/tagpy/PKGBUILD b/community/tagpy/PKGBUILD index bf1af0741..51c11eaf4 100644 --- a/community/tagpy/PKGBUILD +++ b/community/tagpy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41005 2011-03-03 04:37:04Z tdziedzic $ +# $Id: PKGBUILD 47614 2011-05-24 13:24:59Z jelle $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Callan Barrett <wizzomafizzo@gmail.com> # Contributor: Scott Horowitz <stonecrest@gmail.com> pkgname=tagpy pkgver=0.94.8 -pkgrel=3 +pkgrel=4 pkgdesc="Python bindings for TagLib" arch=('i686' 'x86_64' 'mips64el') url="http://pypi.python.org/pypi/tagpy" @@ -32,6 +32,5 @@ build() { package(){ cd ${srcdir}/${pkgname}-${pkgver} python2 setup.py install --root="${pkgdir}" --optimize=1 - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD index 61d9a3cce..3bbc94879 100644 --- a/community/twinkle/PKGBUILD +++ b/community/twinkle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47223 2011-05-19 07:52:09Z andrea $ +# $Id: PKGBUILD 47620 2011-05-24 13:41:29Z jelle $ # Maintainer: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -6,7 +6,7 @@ pkgname=twinkle pkgver=1.4.2 -pkgrel=9 +pkgrel=10 pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" arch=('i686' 'x86_64' 'mips64el') url="http://www.twinklephone.com/" diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index d7cb8de65..1c312b3d5 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 pkgdesc='Validating, recursive, and caching DNS resolver' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/$pkgname-$pkgver.tar.gz" 'unbound.conf' 'rc.d') -sha1sums=('f2ac7b4ef1d1b330e2dd5e2eedeb6fd2bbad8478' +sha1sums=('ac9ab61a51e147ade69ca8b043fee2ed76336a62' '5d473ec2943fd85367cdb653fcd58e186f07383f' 'a0c8c496d71d43ed9e09b170d3df836dfb096480') diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 144f0d22a..40c07c280 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 39013 2011-02-05 01:04:18Z lcarlier $ +# $Id: PKGBUILD 48138 2011-05-28 22:59:33Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 -pkgver=2.3.7 +pkgver=2.3.8 pkgrel=1 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'physfs' 'mesa' 'quesoglc' 'popt' 'ttf-dejavu') makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip') source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('67c2bb506fc59336eb830ff50303745d') +md5sums=('612306c1b6a9d38b632ea3168b824f5e') build() { cd ${pkgname}-${pkgver} diff --git a/community/wbar/ChangeLog b/community/wbar/ChangeLog deleted file mode 100644 index 710f62f34..000000000 --- a/community/wbar/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2008-10-13 Allan McRae <allan@archlinux.org> - * wbar 1.3.3-2 - * Moved to [community] repo diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD new file mode 100644 index 000000000..c9bc1dae8 --- /dev/null +++ b/community/wine/PKGBUILD @@ -0,0 +1,144 @@ +# $Id: PKGBUILD 48061 2011-05-27 19:54:08Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Eduardo Romero <eduardo@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=wine +pkgver=1.3.21 +pkgrel=1 + +_pkgbasever=${pkgver/rc/-rc} + +source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) +md5sums=('dfcefe48a9aae82f7f1aa4d2c6617961') + +pkgdesc="A compatibility layer for running Windows programs" +url="http://www.winehq.com" +arch=(i686 x86_64) +license=(LGPL) +install=wine.install + +depends=( + fontconfig lib32-fontconfig + mesa lib32-mesa + libxcursor lib32-libxcursor + libxrandr lib32-libxrandr + libxdamage lib32-libxdamage + libxxf86dga lib32-libxxf86dga + alsa-lib lib32-alsa-lib + desktop-file-utils +) + +makedepends=(autoconf ncurses bison perl fontforge flex prelink + 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' + giflib lib32-giflib + libxpm lib32-libxpm + libpng lib32-libpng + libxinerama lib32-libxinerama + libxcomposite lib32-libxcomposite + libxmu lib32-libxmu + libxxf86vm lib32-libxxf86vm + libxml2 lib32-libxml2 + libxslt lib32-libxslt + libldap lib32-libldap + lcms lib32-lcms + mpg123 lib32-mpg123 + openal lib32-openal + jack lib32-jack + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +optdepends=( + giflib lib32-giflib + libpng lib32-libpng + libldap lib32-libldap + lcms lib32-lcms + libxml2 lib32-libxml2 + mpg123 lib32-mpg123 + openal lib32-openal + jack lib32-jack + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +if [[ $CARCH == i686 ]]; then + # Strip lib32 etc. on i686 + depends=(${depends[@]/*32-*/}) + makedepends=(${makedepends[@]/*32-*/}) + makedepends=(${makedepends[@]/*-multilib*/}) + optdepends=(${optdepends[@]/*32-*/}) +else + provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") + conflicts=('bin32-wine' 'wine-wow64') + replaces=('bin32-wine') +fi + +build() { + cd "$srcdir" + + # Allow ccache to work + mv $pkgname-$_pkgbasever $pkgname + + # Get rid of old build dirs + rm -rf $pkgname-{32,64}-build + mkdir $pkgname-32-build + + if [[ $CARCH == x86_64 ]]; then + msg2 "Building Wine-64..." + + mkdir $pkgname-64-build + cd "$srcdir/$pkgname-64-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --with-x \ + --enable-win64 + + make + + _wine32opts=( + --libdir=/usr/lib32 + --with-wine64="$srcdir/$pkgname-64-build" + ) + + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + msg2 "Building Wine-32..." + cd "$srcdir/$pkgname-32-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-x \ + "${_wine32opts[@]}" + + make +} + +package() { + msg2 "Packaging Wine-32..." + cd "$srcdir/$pkgname-32-build" + + if [[ $CARCH == i686 ]]; then + make prefix="$pkgdir/usr" install + else + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib32" \ + dlldir="$pkgdir/usr/lib32/wine" install + + msg2 "Packaging Wine-64..." + cd "$srcdir/$pkgname-64-build" + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib" \ + dlldir="$pkgdir/usr/lib/wine" install + fi +} + +# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install new file mode 100644 index 000000000..f71262186 --- /dev/null +++ b/community/wine/wine.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." + echo "If you are on x86_64, the default WINEARCH will be win64." + echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." + echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." + echo "See the Arch wiki on wine for more information." +} + +post_remove() { + update-desktop-database -q +} diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 032d2a9d1..a44a19138 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -46,6 +46,9 @@ build() { --without-bash-malloc --with-installed-readline \ --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info make +} + +check() { make check } diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 7b11f8318..7b59c45c8 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 107680 2011-01-26 22:30:45Z thomas $ +# $Id: PKGBUILD 123921 2011-05-14 11:29:02Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.18.2 +pkgver=1.18.4 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ license=('GPL') depends=('glibc') source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 config) -sha256sums=('aa7e1cec8cd9c7f4e56098b9e4bb2ab5d593d5a35f766ad9e6a312289bf57080' +sha256sums=('4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa' 'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194') build() { diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules index 21127a729..3e71a9118 100644 --- a/core/udev/81-arch.rules +++ b/core/udev/81-arch.rules @@ -28,10 +28,6 @@ # check if the device has already been claimed by a driver ACTION!="add", GOTO="drivers_end" -# SOUND addon modules -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-pcm-oss" -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-seq-oss" - #PNP addon modules SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr" SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir" @@ -50,26 +46,6 @@ LABEL="drivers_end" ##################################### ##################################### -###### CD/DVD symlinks - begin -##################################### -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" -ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" -ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" -ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b" -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh" -##################################### -###### CD/DVD symlinks - end -##################################### - -##################################### # Additional Archlinux # Permissions and Symlinks - begin ##################################### diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index d596361c9..0db5f45cf 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124183 2011-05-17 13:17:56Z tomegun $ +# $Id: PKGBUILD 125635 2011-05-27 11:47:52Z tomegun $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -6,8 +6,8 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=168 -pkgrel=2 +pkgver=171 +pkgrel=1 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') @@ -18,18 +18,16 @@ makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 80-drivers.rules 81-arch.rules - load-modules.sh - cdsymlinks.sh - 01-settle.patch - 02-settle.patch) + load-modules.sh + static-audio-nodes-permissions.patch) build() { cd $srcdir/$pkgbase-$pkgver - # fix https://bugs.archlinux.org/task/24288 - patch -Np1 -i ../01-settle.patch - patch -Np1 -i ../02-settle.patch + # fix https://bugs.archlinux.org/task/24362 (will be in udev-172) + patch -Np1 -i ../static-audio-nodes-permissions.patch ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ - --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system + --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\ + --disable-rule-generator make } @@ -51,16 +49,6 @@ package_udev() { install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules # install our module loading subsystem install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh - # install cdsymlinks.sh - install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh - # disable error logging to prevent startup failures printed to vc on boot - sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf - # disable persistent cdromsymlinks and network by default - # and move it to /etc/udev/rules.d - mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \ - $pkgdir/etc/udev/rules.d/75-persistent-net-generator.rules.optional - mv $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules \ - $pkgdir/etc/udev/rules.d/75-cd-aliases-generator.rules.optional # create framebuffer blacklist mkdir -p $pkgdir/etc/modprobe.d/ @@ -101,9 +89,6 @@ package_udev() { s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' $i done - - # Provided by the bluez package, remove this line when updating to udev>=169 - rm ${pkgdir}/lib/udev/hid2hci } package_udev-compat() { @@ -114,10 +99,8 @@ package_udev-compat() { install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } -sha256sums=('9ddc43173cf7b397c8cc01d26d644932ff2c2259b3a5eea7be90db96a28080e2' - '0cb99cc7cea92238dd6b19a4c104c3b9e9f744c6b9d6b4382c7cd22be18c98f9' - '377c13f20de32776107dddc8324f599f31320e8dd1185e3282856aee5cb08499' - 'c6b41afb24e8f496064d8baad844697a6515cea1b7e0389054cd8a2053477377' - 'cc0d281926bf2f1ac816c0060a2afc59444ddf0f8dab6e2d9924a2a7c8de4a13' - '70d2fd079901bf9940c4811ec91634da0d8b3425ebcdbffeba5a73cb616be650' - 'fe9d1aafb1a620108790d82960577de4eb757450c35a146475aed3f5e9356f1a') +md5sums=('bdf4617284be2ecac11767437417e209' + '4427855146513a4703ab5c7eb8a0156e' + 'd8725e64fd0ce6e784ae795fae424c0a' + 'f91fddc67609b45b244a624977c4247b' + '4f625aea95a5597afd8cdf189421f193') diff --git a/core/udev/static-audio-nodes-permissions.patch b/core/udev/static-audio-nodes-permissions.patch new file mode 100644 index 000000000..b1fc4f935 --- /dev/null +++ b/core/udev/static-audio-nodes-permissions.patch @@ -0,0 +1,27 @@ +From 3e227830ad6494700e18ae03297e8fb833ff26bf Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay.sievers@vrfy.org> +Date: Fri, 27 May 2011 02:50:29 +0200 +Subject: [PATCH] rules: apply 'audio' group of the static snd/{seq,timer} + nodes + +--- + rules/rules.d/50-udev-default.rules | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules +index cd745ef..cacb533 100644 +--- a/rules/rules.d/50-udev-default.rules ++++ b/rules/rules.d/50-udev-default.rules +@@ -38,7 +38,8 @@ SUBSYSTEM=="graphics", GROUP="video" + SUBSYSTEM=="drm", GROUP="video" + + # sound +-SUBSYSTEM=="sound", GROUP="audio" ++SUBSYSTEM=="sound", GROUP="audio", \ ++ OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" + + # DVB (video) + SUBSYSTEM=="dvb", GROUP="video" +-- +1.7.5.3 + diff --git a/core/udev/udev.install b/core/udev/udev.install index e953ec743..b2ed69467 100644 --- a/core/udev/udev.install +++ b/core/udev/udev.install @@ -11,6 +11,17 @@ post_upgrade() { echo "They are located in /etc/udev/readme-udev-arch.txt" echo "----------" fi + if [ "$(vercmp $2 169)" -lt 0 ]; then + echo "ATTENTION UDEV:" + echo "---------------" + echo "Kernel 2.6.32 or newer is now required." + echo "OSS emulation modules are not loaded by default, add to rc.conf if needed." + echo "Arch specific cd symlinks are now no longer created." + echo "cd and net persistent rules will no longer be autogenerated," + echo "see <https://wiki.archlinux.org/index.php/Udev> for details." + echo "Errors are now logged (possibly to the console) by default." + echo "---------------" + fi } post_install() { diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 1541ff19c..5f0c6e93a 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 121312 2011-04-30 14:57:48Z ibiru $ +# $Id: PKGBUILD 124664 2011-05-23 20:15:43Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.10 +pkgver=0.6.12 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -11,7 +11,7 @@ depends=('dbus-glib' 'polkit') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e43d0ea4c0cb9291e60f800d9c2d0ba4') +md5sums=('2fcf38a65d574dd2fe6ba182ff4de053') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 7b5d011c9..1e5037778 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122924 2011-05-07 10:20:40Z andrea $ +# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org/akonadi' diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD index b644eb196..a37609c5e 100644 --- a/extra/allegro/PKGBUILD +++ b/extra/allegro/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 91255 2010-09-25 13:05:55Z ibiru $ +# $Id: PKGBUILD 125663 2011-05-27 21:50:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: arjan <arjan@archlinux.org> pkgname=allegro -pkgver=4.4.1.1 -pkgrel=2 +pkgver=4.4.2 +pkgrel=1 pkgdesc="Portable library mainly aimed at video game and multimedia programming" arch=('i686' 'x86_64' 'mips64el') url="http://alleg.sourceforge.net/" license=('custom') depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng') makedepends=('cmake') -options=('!makeflags') source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz LICENSE) -md5sums=('0f1cfff8f2cf88e5c91a667d9fd386ec' +md5sums=('4db71b0460fc99926ae91d223199c2e6' 'cd97e2992e8e66b9e6a449d832dc9c7a') build() { @@ -28,6 +27,11 @@ build() { -DWANT_DOCS=OFF make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index e8f8112bc..e161588d0 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $ +# $Id: PKGBUILD 124683 2011-05-23 21:00:48Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.0.1.0 -pkgrel=2 +pkgver=3.0.2.0 +pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ url="http://anjuta.sourceforge.net/" install=anjuta.install source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261') +sha256sums=('5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0') build() { cd "${srcdir}/anjuta-${pkgver}" diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index 0e97d0b5c..93d71053f 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120742 2011-04-26 09:43:00Z andrea $ +# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=avogadro pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64' 'mips64el') url="http://avogadro.openmolecules.net/wiki/Main_Page" license=('GPL2') -depends=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy') +depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') makedepends=('cmake' 'boost') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('92c2702c1980f70fb6d87a1a58147911') diff --git a/extra/bind/ChangeLog b/extra/bind/ChangeLog deleted file mode 100644 index fac736994..000000000 --- a/extra/bind/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ - -2010-03-27 kevin <kevin@archlinux.org> - - * bind 9.7.0.P1-1 - - Patch addresses excessive query traffic generated when there is a break - in the DNSSEC trust chain as a result of a configuration error - -2010-01-22 kevin <kevin@archlinux.org> - - * bind 9.6.1.P3-1 - - Fix for CVE-2010-0097, VU#360341, BIND 9 DNSSEC validation code could - cause bogus NXDOMAIN responses - - Updated fix for CVE-2009-4022, VU#418861, BIND 9 Cache Update from - Additional Section - diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 77394d336..7237e301b 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 114691 2011-03-15 13:50:13Z andrea $ +# $Id: PKGBUILD 124783 2011-05-24 12:31:42Z ibiru $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -6,17 +6,17 @@ pkgbase=boost pkgname=('boost-libs' 'boost') -pkgver=1.46.0 +pkgver=1.46.1 _boostver=${pkgver//./_} -pkgrel=4 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=1 +arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz 4994-compile-fix-for-Python32-v2.patch boost-1.46.0-spirit.patch) license=('custom') -md5sums=('820393d5746553c192db7b81ba0e53fe' +md5sums=('341e5d993b19d099bf1a548495ea91ec' 'cb59e8adbf2a45ef9264a2f4ab92b849' '9d6e2f13fef23bf27d7bdddc104e182a') diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index cd55d811d..7ae96eb77 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 119485 2011-04-11 18:46:01Z eric $ +# $Id: PKGBUILD 124960 2011-05-25 12:48:29Z andrea $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr -pkgver=2.3.1 +pkgver=2.3.3 pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.bazaar-vcs.org" +arch=('i686' 'x86_64') +url="http://bazaar.canonical.com/en/" license=('GPL') depends=('python2') optdepends=('python-paramiko: for sftp support') -source=(http://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) -md5sums=('1a4367ce59a2880f321ecb882e195856') -sha1sums=('49b9dfb5a01ffd87a120f8a7abf4833a482ba245') +source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +md5sums=('a8ca30af0431c691ce7e71a74497e31d') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,7 +22,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 # bash-completion install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr" diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index 28365ff5e..29c80bbd3 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 120785 2011-04-26 15:12:27Z ibiru $ +# $Id: PKGBUILD 125706 2011-05-28 10:53:12Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cheese pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'clutter-gst' +depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' 'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme') makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection') groups=('gnome-extra') diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 3637d7ef4..e6e328a7b 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121163 2011-04-29 06:26:08Z andyrtr $ +# $Id: PKGBUILD 124918 2011-05-25 08:15:13Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.7.9 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -20,12 +20,17 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + claws-notify-crash.patch) +md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3' + '9a2903449f679344b5f5f51c91825b45') build() { cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np0 -i $srcdir/claws-notify-crash.patch sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + ./configure --prefix=/usr --disable-static \ --enable-enchant \ --enable-gnutls \ diff --git a/extra/claws-mail/claws-notify-crash.patch b/extra/claws-mail/claws-notify-crash.patch new file mode 100644 index 000000000..e1d4eb686 --- /dev/null +++ b/extra/claws-mail/claws-notify-crash.patch @@ -0,0 +1,18 @@ +Index: src/main.c +=================================================================== +RCS file: //claws/src/main.c,v +retrieving revision 1.115.2.237 +retrieving revision 1.115.2.238 +diff -u -r1.115.2.237 -r1.115.2.238 +--- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237 ++++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238 +@@ -331,7 +331,7 @@ + gtk_widget_show(hack); + } + +- xdisplay = gdk_display_get_default(); ++ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); + sn_display = sn_display_new(xdisplay, + sn_error_trap_push, + sn_error_trap_pop); + diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD index 355449166..9034823d7 100644 --- a/extra/cmus/PKGBUILD +++ b/extra/cmus/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 120673 2011-04-25 22:55:12Z eric $ +# $Id: PKGBUILD 125618 2011-05-27 08:07:05Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus -pkgver=2.4.0 +pkgver=2.4.1 pkgrel=1 pkgdesc="A very feature-rich ncurses-based music player" arch=('i686' 'x86_64' 'mips64el') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' 'libvorbis' 'libpulse' 'wavpack') +makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' + 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' 'libpulse: for PulseAudio output plugin support' @@ -21,10 +22,11 @@ optdepends=('alsa-lib: for ALSA output plugin support' 'libmpcdec: for musepack input plugin support' 'wavpack: for wavpack input plugin support' 'libvorbis: for vorbis input plugin support' - 'flac: for flac input plugin support') + 'flac: for flac input plugin support' + 'libmp4v2: for mp4 input plugin support') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2") -md5sums=('0c5a9f4032e632e5f6b6a49f53df1e7e') -sha1sums=('cbd80d1ff12be5dbf9a3b8b6494381f8b3073761') +md5sums=('7932bbada04bc9a273c332a323fc5704') +sha1sums=('918c637becdcbca3652b836b38b164eb852fa896') build() { cd "$srcdir/$pkgname-v$pkgver" diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index 5ca48711c..baeddbc94 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 109077 2011-02-05 18:14:46Z eric $ +# $Id: PKGBUILD 125668 2011-05-27 23:18:08Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.06 +pkgver=9.08 pkgrel=1 pkgdesc="A command line based converter for digicams raw output" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,10 @@ license=('custom') depends=('lcms') source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz license.txt) -md5sums=('22921c24c697bbe43c1010f463176921' '110b4604a6dacd5537339c4082e9e12a') -sha1sums=('7bd7b2283cf1ad1cb1591d0f69fd6831689b20b0' '502c8f0ac7434d48f5dcb2eefe7599627cb69454') +md5sums=('eb1d365c27495a513c0768b2f696ba66' + '110b4604a6dacd5537339c4082e9e12a') +sha1sums=('1282402201ca48f922d9167ad078aa58cb18593e' + '502c8f0ac7434d48f5dcb2eefe7599627cb69454') build() { cd "${srcdir}/${pkgname}" @@ -26,26 +28,21 @@ package() { install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1 for langchar in \ - fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 sv.latin1 \ + fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \ ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \ zh_TW.big5 zh_CN.gb2312 do lang=$(echo $langchar | cut -d. -f1) char=$(echo $langchar | cut -d. -f2-) - mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1 - iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1 - mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1 - cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1 + if [ -f dcraw_${lang}.1 ]; then + mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1 + iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1 + mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1 + cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1 + fi mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po done -# dcraw_nl.1 is missing - langchar=nl.latin1 - lang=$(echo $langchar | cut -d. -f1) - char=$(echo $langchar | cut -d. -f2-) - mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES - msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po - install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 731a5e78a..a8a00c533 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122127 2011-05-02 09:20:52Z heftig $ +# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index a42ae2bd2..ed67782cb 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 120614 2011-04-25 18:12:59Z ibiru $ +# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4e29feb9f1100db2b4183b6f3aeccca85b0c89e7806c28adff0cb365b55c3809') +sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index 44b11b962..4d6f58f5c 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 120830 2011-04-26 16:59:37Z ibiru $ +# $Id: PKGBUILD 124886 2011-05-24 21:41:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi' - 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme') + 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') makedepends=('gtk-doc' 'intltool') install=eog.install groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('97e40b0e0b618a53dffa83e30ff9add1563d54356e6ab1d588d510cedbc148d2') +sha256sums=('96fa5af97baba0bce8dec376d7cd49512768505f473b11b2cf61881f6be8cb60') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index 494341f87..a03a3630e 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 122054 2011-05-02 05:12:37Z heftig $ +# $Id: PKGBUILD 125696 2011-05-28 10:41:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany pkgver=3.0.2 -pkgrel=1 +pkgrel=2 install=epiphany.install pkgdesc="A GNOME3 web browser based on the WebKit rendering engine." arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libsoup-gnome' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils' - 'hicolor-icon-theme') + 'hicolor-icon-theme' 'seed') makedepends=('intltool' 'networkmanager' 'gnome-doc-utils' 'startup-notification') options=('!libtool' '!emptydirs') groups=('gnome') @@ -23,7 +23,8 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --disable-scrollkeeper \ - --enable-network-manager + --enable-network-manager \ + --enable-seed make } diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 2ccc6a4e9..1532bce40 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123362 2011-05-10 16:22:31Z ibiru $ +# $Id: PKGBUILD 124739 2011-05-24 07:25:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.0.0 -pkgrel=4 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 introspection-fix.patch) -sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b' +sha256sums=('03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97' '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1') build() { diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 195be21c6..040385490 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $ +# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2.1 +pkgrel=1 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" arch=('i686' 'x86_64') depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') @@ -12,7 +12,7 @@ options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0') +sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index 3dcb196d7..db3854d78 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $ +# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02') +sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 42e98b3ca..557c4b855 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120599 2011-04-25 17:55:43Z ibiru $ +# $Id: PKGBUILD 124643 2011-05-23 17:54:16Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d322241c38ece00e2ee7adf0c4d0583dc811c52d5a176ef93427b9b35c04487b') +sha256sums=('6fdf6a39a89bb04c406225984e5b730e86a370024f30ef9cf019840be9fbe59a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/file-roller/PKGBUILD b/extra/file-roller/PKGBUILD index 0e4f9d9a6..a27c424d2 100644 --- a/extra/file-roller/PKGBUILD +++ b/extra/file-roller/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 122038 2011-05-01 20:05:25Z ibiru $ +# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=file-roller -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus') makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm') -optdepends=('nautilus: nautilus shell extension' - 'unrar: the RAR uncompression program' +optdepends=('unrar: the RAR uncompression program' 'zip: creates PKZIP-compatible .zip files' 'unzip: unpacks .zip archives' 'p7zip: 7zip compression utility' @@ -22,7 +21,7 @@ options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('805f5fb77fa8c2f982a2cee0db1b56fbc335f63a1eed34e0bac228ce8349d3ce') +sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD index 608c11bd0..1c05d49c0 100644 --- a/extra/gdl/PKGBUILD +++ b/extra/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120644 2011-04-25 20:32:25Z ibiru $ +# $Id: PKGBUILD 124671 2011-05-23 20:42:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdl -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="GNOME Docking Library" arch=(i686 x86_64 mips64el) @@ -12,7 +12,7 @@ depends=('gtk3') makedepends=('pkgconfig' 'intltool' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09') +sha256sums=('b4a0e7539a1133afca1b370818373fb8dcf29b50f12edbfaf6c1d5560977a308') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index bbb3b7622..323edc3c4 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 119944 2011-04-17 09:10:01Z ibiru $ +# $Id: PKGBUILD 124668 2011-05-23 20:39:21Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.0.0 -pkgrel=3 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -10,7 +10,7 @@ url="http://www.gnome.org" backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf') groups=('gnome-extra') options=('!libtool') -depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit') +depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb') makedepends=('intltool' 'gnome-doc-utils' 'xorg-server') conflicts=('fast-user-switch-applet') replaces=('fast-user-switch-applet') @@ -20,24 +20,19 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname gdm-vt-allocation-hack.patch gdm.pam gdm-autologin.pam - gdm - fix_crasher_with_gtk307.patch) -sha256sums=('2d6443912272c0aa339a06b58d797cc11ce6b0854dadfcc027408f546da7aeff' + gdm) +sha256sums=('3e0d44d551230c02a00ce27e4d98a5ebd54aac81520949076ad3111658eb2a05' '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1' '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5' - '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' - '6d08951919dcb1f928dd67c0b5a5c209b32464c2374ee7d2369ed8e914d541c9') + '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch" patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" - #https://bugzilla.gnome.org/show_bug.cgi?id=646498 - patch -Np1 -i "${srcdir}/fix_crasher_with_gtk307.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \ --with-at-spi-registryd-directory=/usr/lib/at-spi \ diff --git a/extra/gdm/fix_crasher_with_gtk307.patch b/extra/gdm/fix_crasher_with_gtk307.patch deleted file mode 100644 index 3b8379ea3..000000000 --- a/extra/gdm/fix_crasher_with_gtk307.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 045c319f2655fc45c24951479eb9cd1e59792cef Mon Sep 17 00:00:00 2001 -From: Benjamin Otte <otte@redhat.com> -Date: Sat, 2 Apr 2011 04:10:09 +0200 -Subject: [PATCH] simple-greeter: Don't request an invalid size - -GTK widgets must at all times report a size they can handle. So it is -not allowed to return 0 when not realized, because then size allocations -break when GTK uses this size for its widget. -In this case, GTK uses the pre-realize size to determine the size it -should request when creating the greeter window - chicken and egg so to -say. - -This patch just uses the default monitor (I guess the root window's -monitor is the default monitor?) for determining the login window size. - -One thing this patch doesn't do is add a call to gtk_widget_queue_resize() -from the realize callback or from monitor-changing signals, though -that's probably technically necessary. - -https://bugzilla.gnome.org/show_bug.cgi?id=646498 ---- - gui/simple-greeter/gdm-greeter-login-window.c | 28 +++++++++---------------- - 1 files changed, 10 insertions(+), 18 deletions(-) - -diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c -index abd6707..3ec9a09 100644 ---- a/gui/simple-greeter/gdm-greeter-login-window.c -+++ b/gui/simple-greeter/gdm-greeter-login-window.c -@@ -1413,25 +1413,22 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget, - { - int monitor; - GdkScreen *screen; -+ GdkWindow *window; - GdkRectangle area; - GtkAllocation widget_allocation; - int min_size; - int nat_size; - -- min_size = 0; -- nat_size = 0; -- -- if (!gtk_widget_get_realized (widget)) { -- goto out; -- } -- - gtk_widget_get_preferred_width (gtk_bin_get_child (GTK_BIN (widget)), - &min_size, - &nat_size); - - /* Make width be at least 33% screen width */ - screen = gtk_widget_get_screen (widget); -- monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget)); -+ window = gtk_widget_get_window (widget); -+ if (window == NULL) -+ window = gdk_screen_get_root_window (screen); -+ monitor = gdk_screen_get_monitor_at_window (screen, window); - gdk_screen_get_monitor_geometry (screen, monitor, &area); - min_size = MAX (min_size, .33 * area.width); - nat_size = MAX (nat_size, .33 * area.width); -@@ -1442,7 +1439,6 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget, - min_size = MAX (min_size, widget_allocation.width); - nat_size = MAX (nat_size, widget_allocation.width); - -- out: - if (minimum_size) - *minimum_size = min_size; - if (natural_size) -@@ -1456,29 +1452,25 @@ gdm_greeter_login_window_get_preferred_height (GtkWidget *widget, - { - int monitor; - GdkScreen *screen; -+ GdkWindow *window; - GdkRectangle area; - int min_size; - int nat_size; - -- min_size = 0; -- nat_size = 0; -- -- if (!gtk_widget_get_realized (widget)) { -- goto out; -- } -- - gtk_widget_get_preferred_height (gtk_bin_get_child (GTK_BIN (widget)), - &min_size, - &nat_size); - - /* Make height be at most 80% of screen height */ - screen = gtk_widget_get_screen (widget); -- monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget)); -+ window = gtk_widget_get_window (widget); -+ if (window == NULL) -+ window = gdk_screen_get_root_window (screen); -+ monitor = gdk_screen_get_monitor_at_window (screen, window); - gdk_screen_get_monitor_geometry (screen, monitor, &area); - min_size = MIN (min_size, .8 * area.height); - nat_size = MIN (nat_size, .8 * area.height); - -- out: - if (minimum_size) - *minimum_size = min_size; - if (natural_size) --- -1.7.4
\ No newline at end of file diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 42b189676..40699597b 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 120727 2011-04-26 07:34:29Z ibiru $ +# $Id: PKGBUILD 125557 2011-05-26 17:02:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.0.2 -pkgrel=1 +pkgver=3.0.3 +pkgrel=2 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' - 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject') +depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject' 'dconf') makedepends=('gnome-doc-utils' 'intltool') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a91fcfe321d8d5d8fe5c6c11f3b05389febe396efa2172b5ea6cb79d2f16b2db') +sha256sums=('16764f0cf17fcd85f9c3f031bb151aa87ef1e727e8d19814a4746d376adca578') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index f7c87770a..c789f208b 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 121199 2011-04-29 10:51:43Z ibiru $ +# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.28.6.1 -pkgrel=2 +pkgver=2.28.7 +pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -11,8 +11,8 @@ depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schema makedepends=('intltool') options=('!libtool') install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('50f9aac36ce49b0e16f84a9f516cf59d0a1f9b3199634787fd9db7470ab6c65b') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) +sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index eaf8911b5..6b5ef16b8 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117688 2011-04-04 16:21:47Z ibiru $ +# $Id: PKGBUILD 125640 2011-05-27 17:23:17Z ibiru $ # Maintainer: # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2 61-gnome-bluetooth-rfkill.rules) -sha256sums=('bdfa7986b8b7f622b48a70b29a48016482190d240de499da5d7fddb48ed4c211' +sha256sums=('bce843f7cf690c595678fd554b546bd35175f6e7afa70a1463037a0367b3fd38' 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') build() { diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 1b7fd44d0..945af2f09 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $ +# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.0.1.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5') @@ -14,8 +14,8 @@ groups=('gnome') install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79') +source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 3ba0e1161..ce09ddf4c 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123357 2011-05-10 15:51:14Z ibiru $ +# $Id: PKGBUILD 124748 2011-05-24 07:38:40Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') @@ -12,16 +12,12 @@ makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') url="http://www.gnome.org" groups=('gnome') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - randr-fix.patch) -sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3' - '815a36c39d07eea48cb836bf25389c7057605239cb30b425d6c98763aeee4b89') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/randr-fix.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --with-gnome-distributor="Arch Linux" \ diff --git a/extra/gnome-desktop/randr-fix.patch b/extra/gnome-desktop/randr-fix.patch deleted file mode 100644 index c5d83ef2c..000000000 --- a/extra/gnome-desktop/randr-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Sun, 01 May 2011 00:48:03 +0000 -Subject: Don't fall over if RANDR is missing - -When RANDR is not present, the screen object never gets an info, -and since screen_info_free asserts, we must not call it unconditionally -in finalize. -This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053 ---- -diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c -index 4a9d98e..eb3d735 100644 ---- a/libgnome-desktop/gnome-rr.c -+++ b/libgnome-desktop/gnome-rr.c -@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject) - - gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen); - -- screen_info_free (screen->priv->info); -+ if (screen->priv->info) -+ screen_info_free (screen->priv->info); - - G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject); - } --- -cgit v0.9 diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index ff10f5bea..cac447e29 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 120383 2011-04-23 09:47:40Z ibiru $ +# $Id: PKGBUILD 124637 2011-05-23 17:10:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.0.1.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed') +depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject') makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') provides=('glchess') conflicts=('glchess') @@ -15,8 +15,8 @@ options=('!emptydirs' '!libtool') install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('dbbda8aa6960e36acff7537e49e033fc8037e6b3b3aa52d5f066cb67b34b4319') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('1b731d691806d89d411a6bfaaca05a441555adee2760b97bb80fb5ded8326cb1') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -38,4 +38,6 @@ package() { install -m755 -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + + sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku } diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 7bf4f4cc3..cfa1dc390 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 124399 2011-05-20 14:09:17Z heftig $ +#$Id: PKGBUILD 125542 2011-05-26 16:38:57Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64 'mips64el') @@ -10,11 +10,11 @@ license=('GPL' 'LGPL') depends=('gtk3' 'dconf') makedepends=('intltool' 'pkgconfig' 'python2') groups=('gnome') -options=('!libtool' '!emptydirs' '!makeflags') +options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ed834e5a6d87fe8a90c7c79153af3d8979740d5f8eacad6a8991ef147c924af7') +sha256sums=('a06c34e474d93da62bf96a816e58cb5730e181d6523730f041f34c58a0d5e94e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD index c2c7931bd..2ecec8404 100644 --- a/extra/gnome-panel/PKGBUILD +++ b/extra/gnome-panel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119512 2011-04-11 20:09:24Z ibiru $ +# $Id: PKGBUILD 124734 2011-05-24 07:14:49Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=3.0.0.1 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgver=3.0.2 +pkgrel=1 +arch=('i686' 'x86_64') license=('GPL') pkgdesc="The GNOME Panel" url="http://www.gnome.org" @@ -15,14 +15,11 @@ groups=('gnome') replaces=('gnome-panel-bonobo') provides=("gnome-panel-bonobo=${pkgver}") options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2 - fix-crasher-launchers.patch) -sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b' - '6724690bb2943f50ab296af6f1e1a7c10a91415ba150586b5623f20cc214ace0') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-crasher-launchers.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-panel \ diff --git a/extra/gnome-panel/fix-crasher-launchers.patch b/extra/gnome-panel/fix-crasher-launchers.patch deleted file mode 100644 index b15fdf29c..000000000 --- a/extra/gnome-panel/fix-crasher-launchers.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8c275a2adf4ad99297a17cabf251344837620831 Mon Sep 17 00:00:00 2001 -From: Josselin Mouette <joss@malsain.org> -Date: Mon, 11 Apr 2011 13:05:32 +0000 -Subject: panel: Fix crash when starting launcher - -Do not destroy a widget in its draw signal. This is bad. Really. - -This was happening in the animation that is being drawn after clicking a -launcher. - -https://bugzilla.gnome.org/show_bug.cgi?id=641325 ---- -diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c -index 8465341..5acbf66 100644 ---- a/gnome-panel/xstuff.c -+++ b/gnome-panel/xstuff.c -@@ -305,6 +305,14 @@ zoom_timeout (GtkWidget *window) - } - - static gboolean -+idle_destroy (gpointer data) -+{ -+ gtk_widget_destroy (GTK_WIDGET (data)); -+ -+ return FALSE; -+} -+ -+static gboolean - zoom_draw (GtkWidget *widget, - cairo_t *cr, - gpointer user_data) -@@ -323,7 +331,7 @@ zoom_draw (GtkWidget *widget, - - g_slice_free (CompositedZoomData, zoom); - -- gtk_widget_destroy (widget); -+ g_idle_add (idle_destroy, widget); - } else { - GdkPixbuf *scaled; - int width, height; --- -cgit v0.9 diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index c9161e142..61fa2a7a7 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117756 2011-04-04 17:41:50Z heftig $ +# $Id: PKGBUILD 124602 2011-05-23 10:33:56Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system." arch=(i686 x86_64 'mips64el') @@ -13,9 +13,9 @@ depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower' makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center') options=(!emptydirs) install=gnome-power-manager.install -groups=(gnome-extra) +groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('20d8c147a50eef534e81edb033648e5e9cf7a3f733e80c5d6c946b571f7ae4e1') +sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 14916a6dd..3d62ff5bb 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120864 2011-04-26 21:44:03Z ibiru $ +# $Id: PKGBUILD 124745 2011-05-24 07:33:54Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-session -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ install=gnome-session.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8a553569d500e84e5815e5b0b2eb1ac1bf4064ef9afb0e16f28d948978efbd25') +sha256sums=('4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index c3270d70e..38617dc2e 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $ +# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,7 +18,7 @@ groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117') +sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch b/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch deleted file mode 100644 index c07627338..000000000 --- a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8977ba4f23aef8754c0a912e7e1ec46f8da4776e Mon Sep 17 00:00:00 2001 -From: Ionut Biru <ibiru@archlinux.org> -Date: Mon, 9 May 2011 13:03:17 -0700 -Subject: [PATCH] Don't crash when removing nameless user - -Fixes https://bugzilla.gnome.org/show_bug.cgi?id=647893 - -Signed-off-by: Ionut Biru <ibiru@archlinux.org> ---- - src/gdmuser/gdm-user-manager.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c -index eba9da1..543fcc3 100644 ---- a/src/gdmuser/gdm-user-manager.c -+++ b/src/gdmuser/gdm-user-manager.c -@@ -777,7 +777,10 @@ remove_user (GdmUserManager *manager, - if (gdm_user_get_object_path (user) != NULL) { - g_hash_table_remove (manager->priv->users_by_object_path, gdm_user_get_object_path (user)); - } -- g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user)); -+ -+ if (gdm_user_get_user_name (user) != NULL) { -+ g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user)); -+ } - - if (manager->priv->is_loaded) { - g_signal_emit (manager, signals[USER_REMOVED], 0, user); --- -1.7.5.1 - diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 34974115f..0c005f56e 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123600 2011-05-11 18:16:09Z ibiru $ +# $Id: PKGBUILD 125332 2011-05-25 22:41:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.0.1 -pkgrel=5 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -19,28 +19,19 @@ install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 arch.patch - network_fixes_up_to_5090a4ccce.patch - shell-xfixes-cursor_missing_free.patch - st-private_fix_memory_leak.patch - st-private_correct_fix_memory_leak.patch - 0001-Don-t-crash-when-removing-nameless-user.patch) -sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079' + bluetoothstatus-always-update-devices.patch + shell-recorder-missing-XFree.patch) +sha256sums=('a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95' 'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db' - '01bf41483d5d8935ed2dd6294ee04024f2d9bcb2ef13276b07331e485965c822' - 'c8b92768c869d0d77595da3466cc0dba3b6f067ea5fac048f32a918bbe98bbf6' - '8b80a0cec39c38a47521183a3030a782ab84bb6ea5e9cc58213589245288e718' - 'c676067fff399a87625187381db5331d82c44f6c14f51d409392851dbbeb5074' - '291d1fa51344325e3dabc0c1287750cde98605c30f079ffad9b3523a3aba860d') + 'f592752875085fceebdb27e65802e09c07edd7be57eec0da3edfcad5052be2ae' + '070edd5e720c063be41c158f39b7ef62a0d4a7f547ca0d23216104d5428ff971') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/arch.patch" - patch -Np1 -i "${srcdir}/network_fixes_up_to_5090a4ccce.patch" - patch -Np1 -i "${srcdir}/shell-xfixes-cursor_missing_free.patch" - patch -Np1 -i "${srcdir}/st-private_fix_memory_leak.patch" - patch -Np1 -i "${srcdir}/st-private_correct_fix_memory_leak.patch" - patch -Np1 -i "${srcdir}/0001-Don-t-crash-when-removing-nameless-user.patch" + patch -Np1 -i "${srcdir}/bluetoothstatus-always-update-devices.patch" + patch -Np1 -i "${srcdir}/shell-recorder-missing-XFree.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ diff --git a/extra/gnome-shell/bluetoothstatus-always-update-devices.patch b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch new file mode 100644 index 000000000..0272169f5 --- /dev/null +++ b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch @@ -0,0 +1,132 @@ +From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna@src.gnome.org> +Date: Wed, 13 Apr 2011 17:08:45 +0000 +Subject: BluetoothStatus: always update devices + +Previously, we skipped rebuilding device items in case the device +had already been seen, but this caused the connected switch not to +be updated. Now it has been refactored to update in case the device +changes, and to create only when the device is completely new. + +https://bugzilla.gnome.org/show_bug.cgi?id=647565 +--- +diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js +index 070016a..cee2f90 100644 +--- a/js/ui/status/bluetooth.js ++++ b/js/ui/status/bluetooth.js +@@ -127,13 +127,6 @@ Indicator.prototype = { + } + }, + +- _deviceCompare: function(d1, d2) { +- return d1.device_path == d2.device_path && +- d1.bdaddr == d2.bdaddr && +- d1.can_connect == d2.can_connect && +- d1.capabilities == d2.capabilities; +- }, +- + _updateDevices: function() { + let devices = this._applet.get_devices(); + +@@ -142,12 +135,8 @@ Indicator.prototype = { + let item = this._deviceItems[i]; + let destroy = true; + for (let j = 0; j < devices.length; j++) { +- // we need to deep compare because BluetoothSimpleDevice is a boxed type +- // (but we take advantage of that, because _skip will disappear the next +- // time get_devices() is called) +- if (this._deviceCompare(item._device, devices[j])) { +- item.label.text = devices[j].alias; +- devices[j]._skip = true; ++ if (item._device.device_path == devices[j].device_path) { ++ this._updateDeviceItem(item, devices[j]); + destroy = false; + break; + } +@@ -162,7 +151,7 @@ Indicator.prototype = { + this._hasDevices = newlist.length > 0; + for (let i = 0; i < devices.length; i++) { + let d = devices[i]; +- if (d._skip) ++ if (d._item) + continue; + let item = this._createDeviceItem(d); + if (item) { +@@ -177,17 +166,55 @@ Indicator.prototype = { + this._deviceSep.actor.hide(); + }, + ++ _updateDeviceItem: function(item, device) { ++ if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) { ++ item.destroy(); ++ return; ++ } ++ ++ let prevDevice = item._device; ++ let prevCapabilities = prevDevice.capabilities; ++ let prevCanConnect = prevDevice.can_connect; ++ ++ // adopt the new device object ++ item._device = device; ++ device._item = item; ++ ++ // update properties ++ item.label.text = device.alias; ++ ++ if (prevCapabilities != device.capabilities || ++ prevCanConnect != device.can_connect) { ++ // need to rebuild the submenu ++ item.menu.removeAll(); ++ this._buildDeviceSubMenu(item, device); ++ } ++ ++ // update connected property ++ if (device.can_connect) ++ item._connectedMenuitem.setToggleState(device.connected); ++ }, ++ + _createDeviceItem: function(device) { + if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) + return null; + let item = new PopupMenu.PopupSubMenuMenuItem(device.alias); ++ ++ // adopt the device object, and add a back link + item._device = device; ++ device._item = item; + ++ this._buildDeviceSubMenu(item, device); ++ ++ return item; ++ }, ++ ++ _buildDeviceSubMenu: function(item, device) { + if (device.can_connect) { + item._connected = device.connected; +- let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); ++ item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); + +- menuitem.connect('toggled', Lang.bind(this, function() { ++ item._connectedMenuitem.connect('toggled', Lang.bind(this, function() { + if (item._connected > ConnectionState.CONNECTED) { + // operation already in progress, revert + menuitem.setToggleState(menuitem.state); +@@ -217,7 +244,7 @@ Indicator.prototype = { + } + })); + +- item.menu.addMenuItem(menuitem); ++ item.menu.addMenuItem(item._connectedMenuitem); + } + + if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) { +@@ -263,8 +290,6 @@ Indicator.prototype = { + default: + break; + } +- +- return item; + }, + + _updateFullMenu: function() { +-- +cgit v0.9 diff --git a/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch b/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch deleted file mode 100644 index 16453b0b9..000000000 --- a/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch +++ /dev/null @@ -1,814 +0,0 @@ -From d0780d16224d7bb2ad183542337c48324fdd2185 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna <gcampagna@src.gnome.org> -Date: Wed, 06 Apr 2011 16:11:23 +0000 -Subject: NetworkMenu: keep wirelesss networks in predictable order - -Adds a function that compares wireless networks and keeps them sorted -at all times. Order is: first already configured connections, then -first secure networks, then alphabtic. Also, the appearance of a new access -point no longer causes the whole menu to be rebuilt (but it still linear -searches for the position, I guess that could be skipped), which caused -the addition of more code for tracking the active access point. - -https://bugzilla.gnome.org/show_bug.cgi?id=646580 ---- -(limited to 'js/ui/status/network.js') - -diff --git a/js/ui/status/network.js b/js/ui/status/network.js -index 6fa5642..49cb3f0 100644 ---- a/js/ui/status/network.js -+++ b/js/ui/status/network.js -@@ -42,6 +42,10 @@ const NM80211Mode = NetworkManager['80211Mode']; - const NM80211ApFlags = NetworkManager['80211ApFlags']; - const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags']; - -+// number of wireless networks that should be visible -+// (the remaining are placed into More...) -+const NUM_VISIBLE_NETWORKS = 5; -+ - function macToArray(string) { - return string.split(':').map(function(el) { - return parseInt(el, 16); -@@ -1036,6 +1040,7 @@ NMDeviceWireless.prototype = { - item: null, - accessPoints: [ ap ] - }; -+ obj.ssidText = NetworkManager.utils_ssid_to_utf8(obj.ssid); - this._networks.push(obj); - } - -@@ -1048,6 +1053,14 @@ NMDeviceWireless.prototype = { - } - } - } -+ if (this.device.active_access_point) { -+ this._activeNetwork = this._networks[this._findNetwork(this.device.active_access_point)]; -+ } else { -+ this._activeNetwork = null; -+ } -+ this._networks.sort(this._networkSortFunction); -+ -+ this._apChangedId = device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged)); - this._apAddedId = device.connect('access-point-added', Lang.bind(this, this._accessPointAdded)); - this._apRemovedId = device.connect('access-point-removed', Lang.bind(this, this._accessPointRemoved)); - -@@ -1055,8 +1068,13 @@ NMDeviceWireless.prototype = { - }, - - destroy: function() { -- if (this._apAddedId) { -+ if (this._apChangedId) { - // see above for this HACK -+ GObject.Object.prototype.disconnect.call(this.device, this._apChangedId); -+ this._apChangedId = 0; -+ } -+ -+ if (this._apAddedId) { - GObject.Object.prototype.disconnect.call(this.device, this._apAddedId); - this._apAddedId = 0; - } -@@ -1122,6 +1140,19 @@ NMDeviceWireless.prototype = { - } - }, - -+ _activeApChanged: function() { -+ this._activeNetwork = null; -+ -+ let activeAp = this.device.active_access_point; -+ -+ if (activeAp) { -+ let pos = this._findNetwork(activeAp); -+ this._activeNetwork = this._networks[pos]; -+ } -+ -+ // we don't refresh the view here, setActiveConnection will -+ }, -+ - _getApSecurityType: function(accessPoint) { - if (accessPoint._secType) - return accessPoint._secType; -@@ -1151,6 +1182,32 @@ NMDeviceWireless.prototype = { - return type; - }, - -+ _networkSortFunction: function(one, two) { -+ let oneHasConnection = one.connections.length != 0; -+ let twoHasConnection = two.connections.length != 0; -+ -+ // place known connections first -+ // (-1 = good order, 1 = wrong order) -+ if (oneHasConnection && !twoHasConnection) -+ return -1; -+ else if (!oneHasConnection && twoHasConnection) -+ return 1; -+ -+ let oneHasSecurity = one.security != NMAccessPointSecurity.NONE; -+ let twoHasSecurity = two.security != NMAccessPointSecurity.NONE; -+ -+ // place secure connections first -+ // (we treat WEP/WPA/WPA2 the same as there is no way to -+ // take them apart from the UI) -+ if (oneHasSecurity && !twoHasSecurity) -+ return -1; -+ else if (!oneHasSecurity && twoHasSecurity) -+ return 1; -+ -+ // sort alphabetically -+ return GLib.utf8_collate(one.ssidText, two.ssidText); -+ }, -+ - _networkCompare: function(network, accessPoint) { - if (!ssidCompare(network.ssid, accessPoint.get_ssid())) - return false; -@@ -1173,6 +1230,8 @@ NMDeviceWireless.prototype = { - _accessPointAdded: function(device, accessPoint) { - let pos = this._findNetwork(accessPoint); - let apObj; -+ let needsupdate = false; -+ - if (pos != -1) { - apObj = this._networks[pos]; - if (apObj.accessPoints.indexOf(accessPoint) != -1) { -@@ -1181,6 +1240,8 @@ NMDeviceWireless.prototype = { - } - - apObj.accessPoints.push(accessPoint); -+ if (apObj.item) -+ apObj.item.updateAccessPoints(apObj.accessPoints); - } else { - apObj = { ssid: accessPoint.get_ssid(), - mode: accessPoint.mode, -@@ -1189,7 +1250,8 @@ NMDeviceWireless.prototype = { - item: null, - accessPoints: [ accessPoint ] - }; -- this._networks.push(apObj); -+ apObj.ssidText = NetworkManager.utils_ssid_to_utf8(apObj.ssid); -+ needsupdate = true; - } - - // check if this enables new connections for this group -@@ -1198,12 +1260,44 @@ NMDeviceWireless.prototype = { - if (this._connectionValidForAP(connection, accessPoint) && - apObj.connections.indexOf(connection) == -1) { - apObj.connections.push(connection); -+ -+ // this potentially changes the order -+ needsupdate = true; - } - } - -- // update everything -- this._clearSection(); -- this._createSection(); -+ if (needsupdate) { -+ if (apObj.item) -+ apObj.item.destroy(); -+ -+ if (pos != -1) -+ this._networks.splice(pos, 1); -+ -+ if (this._networks.length == 0) { -+ // only network in the list -+ this._networks.push(apObj); -+ this._clearSection(); -+ this._createSection(); -+ return; -+ } -+ -+ // skip networks that should appear earlier -+ let menuPos = 0; -+ for (pos = 0; -+ pos < this._networks.length && -+ this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) { -+ if (this._networks[pos] != this._activeNetwork) -+ menuPos++; -+ } -+ -+ // (re-)add the network -+ this._networks.splice(pos, 0, apObj); -+ -+ if (this._shouldShowConnectionList()) { -+ menuPos += (this._activeConnectionItem ? 1 : 0); -+ this._createNetworkItem(apObj, menuPos); -+ } -+ } - }, - - _accessPointRemoved: function(device, accessPoint) { -@@ -1315,6 +1409,12 @@ NMDeviceWireless.prototype = { - // remove the connection from the access point group - connections.splice(k); - anyauto = connections.length == 0; -+ -+ if (anyauto) { -+ // this potentially changes the sorting order -+ forceupdate = true; -+ break; -+ } - if (apObj.item) { - if (apObj.item instanceof PopupMenu.PopupSubMenuMenuItem) { - let items = apObj.item.menu.getMenuItems(); -@@ -1340,6 +1440,7 @@ NMDeviceWireless.prototype = { - } - - if (forceupdate || anyauto) { -+ this._networks.sort(this._networkSortFunction); - this._clearSection(); - this._createSection(); - } -@@ -1355,42 +1456,24 @@ NMDeviceWireless.prototype = { - this._connections.push(obj); - - // find an appropriate access point -- let any = false, forceupdate = false; -+ let forceupdate = false; - for (let i = 0; i < this._networks.length; i++) { - let apObj = this._networks[i]; - - // Check if connection is valid for any of these access points -- let any = false; - for (let k = 0; k < apObj.accessPoints.length; k++) { - let ap = apObj.accessPoints[k]; - if (this._connectionValidForAP(connection, ap)) { - apObj.connections.push(connection); -- any = true; -+ // this potentially changes the sorting order -+ forceupdate = true; - break; - } - } -- -- if (any && this._shouldShowConnectionList()) { -- // we need to show this connection -- if (apObj.item && apObj.item.menu) { -- // We're already showing the submenu for this access point -- apObj.item.menu.addMenuItem(this._createAPItem(connection, apObj, true)); -- } else { -- if (apObj.item) -- apObj.item.destroy(); -- if (apObj.connections.length == 1) { -- apObj.item = this._createAPItem(connection, apObj, false); -- this.section.addMenuItem(apObj.item); -- } else { -- apObj.item = null; -- // we need to force an update to create the submenu -- forceupdate = true; -- } -- } -- } - } - - if (forceupdate) { -+ this._networks.sort(this._networkSortFunction); - this._clearSection(); - this._createSection(); - } -@@ -1473,6 +1556,37 @@ NMDeviceWireless.prototype = { - return connection; - }, - -+ _createNetworkItem: function(apObj, position) { -+ if(apObj.connections.length > 0) { -+ if (apObj.connections.length == 1) -+ apObj.item = this._createAPItem(apObj.connections[0], apObj, false); -+ else { -+ let title = apObj.ssidText; -+ apObj.item = new PopupMenu.PopupSubMenuMenuItem(title); -+ apObj.item._apObj = apObj; -+ for (let i = 0; i < apObj.connections.length; i++) -+ apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true)); -+ } -+ } else { -+ apObj.item = new NMNetworkMenuItem(apObj.accessPoints); -+ apObj.item._apObj = apObj; -+ apObj.item.connect('activate', Lang.bind(this, function() { -+ let connection = this._createAutomaticConnection(apObj); -+ let accessPoints = sortAccessPoints(apObj.accessPoints); -+ this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null) -+ })); -+ } -+ if (position < NUM_VISIBLE_NETWORKS) -+ this.section.addMenuItem(apObj.item); -+ else { -+ if (!this._overflowItem) { -+ this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More...")); -+ this.section.addMenuItem(this._overflowItem); -+ } -+ this._overflowItem.menu.addMenuItem(apObj.item, position - NUM_VISIBLE_NETWORKS); -+ } -+ }, -+ - _createSection: function() { - if (!this._shouldShowConnectionList()) - return; -@@ -1482,47 +1596,14 @@ NMDeviceWireless.prototype = { - this.section.addMenuItem(this._activeConnectionItem); - } - -- let activeAp = this.device.active_access_point; -- let activeApSsid = activeAp ? activeAp.get_ssid() : null; -- -- // we want five access points in the menu, including the active one -- let numItems = this._activeConnection ? 4 : 5; -+ let activeOffset = this._activeConnectionItem ? 1 : 0; - - for(let j = 0; j < this._networks.length; j++) { - let apObj = this._networks[j]; -- if(activeAp && ssidCompare(apObj.ssid, activeApSsid)) -+ if (apObj == this._activeNetwork) - continue; - -- let menuItem; -- if(apObj.connections.length > 0) { -- if (apObj.connections.length == 1) -- apObj.item = this._createAPItem(apObj.connections[0], apObj, false); -- else { -- let title = NetworkManager.utils_ssid_to_utf8(apObj.ssid) || _("<unknown>"); -- apObj.item = new PopupMenu.PopupSubMenuMenuItem(title); -- apObj.item._apObj = apObj; -- for (let i = 0; i < apObj.connections.length; i++) -- apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true)); -- } -- } else { -- apObj.item = new NMNetworkMenuItem(apObj.accessPoints); -- apObj.item._apObj = apObj; -- apObj.item.connect('activate', Lang.bind(this, function() { -- let connection = this._createAutomaticConnection(apObj); -- let accessPoints = sortAccessPoints(apObj.accessPoints); -- this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null) -- })); -- } -- -- if (j < numItems) -- this.section.addMenuItem(apObj.item); -- else { -- if (!this._overflowItem) { -- this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More...")); -- this.section.addMenuItem(this._overflowItem); -- } -- this._overflowItem.menu.addMenuItem(apObj.item); -- } -+ this._createNetworkItem(apObj, j + activeOffset); - } - }, - }; --- -cgit v0.9 -From 42a5531f1588ae3063e7d8ff7642e9f81c13afbd Mon Sep 17 00:00:00 2001 -From: Dan Winship <danw@gnome.org> -Date: Wed, 27 Apr 2011 13:05:39 +0000 -Subject: network: fix a variable name - ---- -(limited to 'js/ui/status/network.js') - -diff --git a/js/ui/status/network.js b/js/ui/status/network.js -index 49cb3f0..d56c0b1 100644 ---- a/js/ui/status/network.js -+++ b/js/ui/status/network.js -@@ -1285,7 +1285,7 @@ NMDeviceWireless.prototype = { - let menuPos = 0; - for (pos = 0; - pos < this._networks.length && -- this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) { -+ this._networkSortFunction(this._networks[pos], apObj) < 0; ++pos) { - if (this._networks[pos] != this._activeNetwork) - menuPos++; - } --- -cgit v0.9 -From c31109800b3267df433841bff08c9383a5d669cb Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Mon, 25 Apr 2011 22:13:12 +0000 -Subject: network: simplify connection sorting by using libnm-glib functions - -Instead of rolling our own code, use new libnm-glib functions to do -the same thing. Requires libnm-glib as of -779215c742bbe29a2c66202ec7e2e6d43edeb8ff (which will be part of 0.9). - -Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648648 ---- -(limited to 'js/ui/status/network.js') - -diff --git a/js/ui/status/network.js b/js/ui/status/network.js -index d56c0b1..bf8e272 100644 ---- a/js/ui/status/network.js -+++ b/js/ui/status/network.js -@@ -505,7 +505,7 @@ NMDevice.prototype = { - }, - - connectionValid: function(connection) { -- throw new TypeError('Invoking pure virtual function NMDevice.connectionValid'); -+ return this.device.connection_valid(connection); - }, - - setEnabled: function(enabled) { -@@ -723,17 +723,6 @@ NMDeviceWired.prototype = { - NMDevice.prototype._init.call(this, client, device, connections); - }, - -- connectionValid: function(connection) { -- if (connection._type != NetworkManager.SETTING_WIRED_SETTING_NAME) -- return false; -- -- let ethernetSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRED_SETTING_NAME); -- let fixedMac = ethernetSettings.get_mac_address(); -- if (fixedMac) -- return macCompare(fixedMac, macToArray(this.device.perm_hw_address)); -- return true; -- }, -- - _createSection: function() { - NMDevice.prototype._createSection.call(this); - -@@ -876,10 +865,6 @@ NMDeviceModem.prototype = { - NMDevice.prototype._clearSection.call(this); - }, - -- connectionValid: function(connection) { -- return connection._type == this._connectionType; -- }, -- - _createAutomaticConnection: function() { - // FIXME: we need to summon the mobile wizard here - // or NM will not have the necessary parameters to complete the connection -@@ -913,18 +898,6 @@ NMDeviceBluetooth.prototype = { - NMDevice.prototype._init.call(this, client, device, connections); - }, - -- connectionValid: function(connection) { -- if (connection._type != NetworkManager.SETTING_BLUETOOTH_SETTING_NAME) -- return false; -- -- let bluetoothSettings = connection.get_setting_by_name(NetworkManager.SETTING_BLUETOOTH_SETTING_NAME); -- let fixedBdaddr = bluetoothSettings.get_bdaddr(); -- if (fixedBdaddr) -- return macCompare(fixedBdaddr, macToArray(this.device.hw_address)); -- -- return true; -- }, -- - _createAutomaticConnection: function() { - let connection = new NetworkManager.Connection; - connection._uuid = NetworkManager.utils_uuid_generate(); -@@ -1047,7 +1020,7 @@ NMDeviceWireless.prototype = { - // Check if some connection is valid for this AP - for (let j = 0; j < validConnections.length; j++) { - let connection = validConnections[j]; -- if (this._connectionValidForAP(connection, ap) && -+ if (ap.connection_valid(connection) && - obj.connections.indexOf(connection) == -1) { - obj.connections.push(connection); - } -@@ -1121,7 +1094,7 @@ NMDeviceWireless.prototype = { - if (best) { - for (let i = 0; i < bestApObj.accessPoints.length; i++) { - let ap = bestApObj.accessPoints[i]; -- if (this._connectionValidForAP(best, ap)) { -+ if (ap.connection_valid(best)) { - this._client.activate_connection(best, this.device, ap.dbus_path, null); - break; - } -@@ -1257,7 +1230,7 @@ NMDeviceWireless.prototype = { - // check if this enables new connections for this group - for (let i = 0; i < this._connections.length; i++) { - let connection = this._connections[i].connection; -- if (this._connectionValidForAP(connection, accessPoint) && -+ if (accessPoint.connection_valid(connection) && - apObj.connections.indexOf(connection) == -1) { - apObj.connections.push(connection); - -@@ -1337,7 +1310,7 @@ NMDeviceWireless.prototype = { - item.connect('activate', Lang.bind(this, function() { - let accessPoints = sortAccessPoints(accessPointObj.accessPoints); - for (let i = 0; i < accessPoints.length; i++) { -- if (this._connectionValidForAP(connection, accessPoints[i])) { -+ if (accessPoints[i].connection_valid(connection)) { - this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null); - break; - } -@@ -1346,40 +1319,6 @@ NMDeviceWireless.prototype = { - return item; - }, - -- connectionValid: function(connection) { -- if (connection._type != NetworkManager.SETTING_WIRELESS_SETTING_NAME) -- return false; -- -- let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME); -- let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME); -- -- let fixedMac = wirelessSettings.get_mac_address(); -- if (fixedMac && !macCompare(fixedMac, macToArray(this.device.perm_hw_address))) -- return false; -- -- if (wirelessSecuritySettings && -- wirelessSecuritySettings.key_mgmt != 'none' && -- wirelessSecuritySettings.key_mgmt != 'ieee8021x') { -- let capabilities = this.device.wireless_capabilities; -- if (!(capabilities & NetworkManager.DeviceWifiCapabilities.WPA) || -- !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_TKIP)) -- return false; -- if (wirelessSecuritySettings.get_num_protos() == 1 && -- wirelessSecuritySettings.get_proto(0) == 'rsn' && -- !(capabilities & NetworkManager.DeviceWifiCapabilities.RSN)) -- return false; -- if (wirelessSecuritySettings.get_num_pairwise() == 1 && -- wirelessSecuritySettings.get_pairwise(0) == 'ccmp' && -- !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP)) -- return false; -- if (wirelessSecuritySettings.get_num_groups() == 1 && -- wirelessSecuritySettings.get_group(0) == 'ccmp' && -- !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP)) -- return false; -- } -- return true; -- }, -- - _clearSection: function() { - NMDevice.prototype._clearSection.call(this); - -@@ -1463,7 +1402,7 @@ NMDeviceWireless.prototype = { - // Check if connection is valid for any of these access points - for (let k = 0; k < apObj.accessPoints.length; k++) { - let ap = apObj.accessPoints[k]; -- if (this._connectionValidForAP(connection, ap)) { -+ if (ap.connection_valid(connection)) { - apObj.connections.push(connection); - // this potentially changes the sorting order - forceupdate = true; -@@ -1479,37 +1418,6 @@ NMDeviceWireless.prototype = { - } - }, - -- _connectionValidForAP: function(connection, ap) { -- // copied and adapted from nm-applet -- let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME); -- if (!ssidCompare(wirelessSettings.get_ssid(), ap.get_ssid())) -- return false; -- -- let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME); -- -- let fixedBssid = wirelessSettings.get_bssid(); -- if (fixedBssid && !macCompare(fixedBssid, macToArray(ap.hw_address))) -- return false; -- -- let fixedBand = wirelessSettings.band; -- if (fixedBand) { -- let freq = ap.frequency; -- if (fixedBand == 'a' && (freq < 4915 || freq > 5825)) -- return false; -- if (fixedBand == 'bg' && (freq < 2412 || freq > 2484)) -- return false; -- } -- -- let fixedChannel = wirelessSettings.channel; -- if (fixedChannel && fixedChannel != NetworkManager.utils_wifi_freq_to_channel(ap.frequency)) -- return false; -- -- if (!wirelessSecuritySettings) -- return true; -- -- return wirelessSettings.ap_security_compatible(wirelessSecuritySettings, ap.flags, ap.wpa_flags, ap.rsn_flags, ap.mode); -- }, -- - _createActiveConnectionItem: function() { - let activeAp = this.device.active_access_point; - let icon, title; --- -cgit v0.9 -From 101a07a3d79223cc153a6c65f22acd76cbae4818 Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Tue, 03 May 2011 17:21:45 +0000 -Subject: network: fix handling of AP flags and enhance for 802.1x - -All WPA APs were getting set as WPA2 due to the check for privacy; -WPA/WPA2 APs *must* set the Privacy bit according to the standard, -so we'd never end up in the case for NMAccessPointSecurity.WPA. - -Fix that, and also add flags for WPA[2] Enterprise which we'll -use a bit later for the first-time connect case for 802.1x enabled -access points. ---- -(limited to 'js/ui/status/network.js') - -diff --git a/js/ui/status/network.js b/js/ui/status/network.js -index bf8e272..6f0cdac 100644 ---- a/js/ui/status/network.js -+++ b/js/ui/status/network.js -@@ -33,8 +33,10 @@ const NMAccessPointSecurity = { - UNKNOWN: 0, - NONE: 1, - WEP: 2, -- WPA: 3, -- WPA2: 4 -+ WPA_PSK: 3, -+ WPA2_PSK: 4, -+ WPA_ENT: 5, -+ WPA2_ENT: 6 - }; - - // small optimization, to avoid using [] all the time -@@ -1129,26 +1131,28 @@ NMDeviceWireless.prototype = { - _getApSecurityType: function(accessPoint) { - if (accessPoint._secType) - return accessPoint._secType; -- // XXX: have this checked by someone familiar with IEEE 802.1x - - let flags = accessPoint.flags; - let wpa_flags = accessPoint.wpa_flags; - let rsn_flags = accessPoint.rsn_flags; - let type; -- if ( !(flags & NM80211ApFlags.PRIVACY) -- && (wpa_flags == NM80211ApSecurityFlags.NONE) -- && (rsn_flags == NM80211ApSecurityFlags.NONE)) -- type = NMAccessPointSecurity.NONE; -- else if ( (flags & NM80211ApFlags.PRIVACY) -- && (wpa_flags == NM80211ApSecurityFlags.NONE) -- && (rsn_flags == NM80211ApSecurityFlags.NONE)) -- type = NMAccessPointSecurity.WEP; -- else if ( !(flags & NM80211ApFlags.PRIVACY) -- && (wpa_flags != NM80211ApSecurity.NONE) -- && (rsn_flags != NM80211ApSecurity.NONE)) -- type = NMAccessPointSecurity.WPA; -- else -- type = NMAccessPointSecurity.WPA2; -+ if (rsn_flags != NM80211ApSecurityFlags.NONE) { -+ /* RSN check first so that WPA+WPA2 APs are treated as RSN/WPA2 */ -+ if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X) -+ type = NMAccessPointSecurity.WPA2_ENT; -+ else if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK) -+ type = NMAccessPointSecurity.WPA2_PSK; -+ } else if (wpa_flags != NM80211ApSecurityFlags.NONE) { -+ if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X) -+ type = NMAccessPointSecurity.WPA_ENT; -+ else if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK) -+ type = NMAccessPointSecurity.WPA_PSK; -+ } else { -+ if (flags & NM80211ApFlags.PRIVACY) -+ type = NMAccessPointSecurity.WEP; -+ else -+ type = NMAccessPointSecurity.NONE; -+ } - - // cache the found value to avoid checking flags all the time - accessPoint._secType = type; --- -cgit v0.9 -From ae0652d13fc2d7caa3d64f2b87d174253cae5901 Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Tue, 03 May 2011 18:31:45 +0000 -Subject: network: fix initial connections to WPA[2] Enterprise APs - -Call out to nm-applet to do the dirty work since the dialog of -doom is pretty complicated and we don't have a JS equivalent -of it for now. - -Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648171 ---- -(limited to 'js/ui/status/network.js') - -diff --git a/js/ui/status/network.js b/js/ui/status/network.js -index 6f0cdac..ca4facf 100644 ---- a/js/ui/status/network.js -+++ b/js/ui/status/network.js -@@ -48,6 +48,16 @@ const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags']; - // (the remaining are placed into More...) - const NUM_VISIBLE_NETWORKS = 5; - -+const NMAppletHelperInterface = { -+ name: 'org.gnome.network_manager_applet', -+ methods: [ -+ { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' }, -+ { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' }, -+ { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' } -+ ], -+}; -+const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface); -+ - function macToArray(string) { - return string.split(':').map(function(el) { - return parseInt(el, 16); -@@ -991,6 +1001,10 @@ NMDeviceWireless.prototype = { - this._overflowItem = null; - this._networks = [ ]; - -+ this._applet_proxy = new NMAppletProxy(DBus.session, -+ 'org.gnome.network_manager_applet', -+ '/org/gnome/network_manager_applet'); -+ - // breaking the layers with this, but cannot call - // this.connectionValid until I have a device - this.device = device; -@@ -1483,9 +1497,20 @@ NMDeviceWireless.prototype = { - apObj.item = new NMNetworkMenuItem(apObj.accessPoints); - apObj.item._apObj = apObj; - apObj.item.connect('activate', Lang.bind(this, function() { -- let connection = this._createAutomaticConnection(apObj); - let accessPoints = sortAccessPoints(apObj.accessPoints); -- this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null) -+ if ( (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT) -+ || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) { -+ // 802.1x-enabled APs get handled by nm-applet for now... -+ this._applet_proxy.ConnectTo8021xNetworkRemote(this.device.get_path(), -+ accessPoints[0].dbus_path, -+ Lang.bind(this, function(results, err) { -+ if (err) -+ log(err); -+ })); -+ } else { -+ let connection = this._createAutomaticConnection(apObj); -+ this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null) -+ } - })); - } - if (position < NUM_VISIBLE_NETWORKS) --- -cgit v0.9 -From 5090a4ccce87643081138272fb8a2fe687f1ed0a Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Tue, 03 May 2011 19:48:10 +0000 -Subject: network: request that nm-applet show the mobile broadband wizard - -Use nm-applet 0.8.999 API to call the mobile broadband wizard and -activate the new connection. - -Fixes https://bugzilla.gnome.org/show_bug.cgi?id=649318 ---- -(limited to 'js/ui/status/network.js') - -diff --git a/js/ui/status/network.js b/js/ui/status/network.js -index ca4facf..756b27f 100644 ---- a/js/ui/status/network.js -+++ b/js/ui/status/network.js -@@ -53,7 +53,8 @@ const NMAppletHelperInterface = { - methods: [ - { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' }, - { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' }, -- { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' } -+ { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' }, -+ { name: 'ConnectTo3gNetwork', inSignature: 'o', outSignature: '' } - ], - }; - const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface); -@@ -440,7 +441,8 @@ NMDevice.prototype = { - this._client.activate_connection(this._connections[0].connection, this.device, null, null); - } else if (this._autoConnectionName) { - let connection = this._createAutomaticConnection(); -- this._client.add_and_activate_connection(connection, this.device, null, null); -+ if (connection) -+ this._client.add_and_activate_connection(connection, this.device, null, null); - } - }, - -@@ -620,7 +622,8 @@ NMDevice.prototype = { - this._autoConnectionItem = new PopupMenu.PopupMenuItem(this._autoConnectionName); - this._autoConnectionItem.connect('activate', Lang.bind(this, function() { - let connection = this._createAutomaticConnection(); -- this._client.add_and_activate_connection(connection, this.device, null, null); -+ if (connection) -+ this._client.add_and_activate_connection(connection, this.device, null, null); - })); - this.section.addMenuItem(this._autoConnectionItem); - } -@@ -777,6 +780,10 @@ NMDeviceModem.prototype = { - this.mobileDevice = null; - this._connectionType = 'ppp'; - -+ this._applet_proxy = new NMAppletProxy(DBus.session, -+ 'org.gnome.network_manager_applet', -+ '/org/gnome/network_manager_applet'); -+ - this._capabilities = device.current_capabilities; - if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) { - is_wwan = true; -@@ -878,19 +885,13 @@ NMDeviceModem.prototype = { - }, - - _createAutomaticConnection: function() { -- // FIXME: we need to summon the mobile wizard here -- // or NM will not have the necessary parameters to complete the connection -- // pending a DBus method on nm-applet -- -- let connection = new NetworkManager.Connection; -- connection._uuid = NetworkManager.utils_uuid_generate(); -- connection.add_setting(new NetworkManager.SettingConnection({ -- uuid: connection._uuid, -- id: this._autoConnectionName, -- type: this._connectionType, -- autoconnect: false -- })); -- return connection; -+ // Mobile wizard is handled by nm-applet for now... -+ this._applet_proxy.ConnectTo3gNetworkRemote(this.device.get_path(), -+ Lang.bind(this, function(results, err) { -+ if (err) -+ log(err); -+ })); -+ return null; - } - }; - --- -cgit v0.9 diff --git a/extra/gnome-shell/shell-recorder-missing-XFree.patch b/extra/gnome-shell/shell-recorder-missing-XFree.patch new file mode 100644 index 000000000..a7329166f --- /dev/null +++ b/extra/gnome-shell/shell-recorder-missing-XFree.patch @@ -0,0 +1,22 @@ +From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001 +From: Maxim Ermilov <zaspire@rambler.ru> +Date: Tue, 24 May 2011 22:46:47 +0000 +Subject: shell-recorder: missing XFree + +https://bugzilla.gnome.org/show_bug.cgi?id=650934 +--- +diff --git a/src/shell-recorder.c b/src/shell-recorder.c +index 6555187..d297923 100644 +--- a/src/shell-recorder.c ++++ b/src/shell-recorder.c +@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder) + *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j]; + + cairo_surface_mark_dirty (recorder->cursor_image); ++ ++ XFree (cursor_image); + } + + /* Overlay the cursor image on the frame. We draw the cursor image +-- +cgit v0.9 diff --git a/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch b/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch deleted file mode 100644 index 6a66c9384..000000000 --- a/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 88de26138a8b79d89884ff2eb6471c5a8e3b39ca Mon Sep 17 00:00:00 2001 -From: Maxim Ermilov <zaspire@rambler.ru> -Date: Thu, 05 May 2011 10:06:05 +0000 -Subject: shell-xfixes-cursor: missing XFree - -memory returned by XFixesGetCursorImage should be freed after usage. -https://bugzilla.gnome.org/show_bug.cgi?id=642652 ---- -diff --git a/src/shell-xfixes-cursor.c b/src/shell-xfixes-cursor.c -index 14d2b59..334503d 100644 ---- a/src/shell-xfixes-cursor.c -+++ b/src/shell-xfixes-cursor.c -@@ -254,6 +254,7 @@ xfixes_cursor_reset_image (ShellXFixesCursor *xfixes_cursor) - xfixes_cursor->cursor_hot_y = cursor_image->yhot; - g_signal_emit (xfixes_cursor, signals[CURSOR_CHANGED], 0); - } -+ XFree (cursor_image); - } - - static void --- -cgit v0.9 diff --git a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch deleted file mode 100644 index d3f887c29..000000000 --- a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c975740f9228b2c53d79ac08ad704fca5f1c5b6e Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Wed, 11 May 2011 15:21:18 +0000 -Subject: st-private: Correct fix for memory leak - -The previous fix in 72f9f482d was wrong; we need to keep around -the buffer until cairo is done with the pattern. - -https://bugzilla.gnome.org/show_bug.cgi?id=649497 ---- -diff --git a/src/st/st-private.c b/src/st/st-private.c -index 51798a1..21ca09a 100644 ---- a/src/st/st-private.c -+++ b/src/st/st-private.c -@@ -667,6 +667,7 @@ cairo_pattern_t * - _st_create_shadow_cairo_pattern (StShadow *shadow_spec, - cairo_pattern_t *src_pattern) - { -+ static cairo_user_data_key_t shadow_pattern_user_data; - cairo_t *cr; - cairo_surface_t *src_surface; - cairo_surface_t *surface_in; -@@ -728,6 +729,8 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec, - width_out, - height_out, - rowstride_out); -+ cairo_surface_set_user_data (surface_out, &shadow_pattern_user_data, -+ pixels_out, (cairo_destroy_func_t) g_free); - - dst_pattern = cairo_pattern_create_for_surface (surface_out); - cairo_surface_destroy (surface_out); -@@ -745,8 +748,7 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec, - (width_out - width_in) / 2.0, - (height_out - height_in) / 2.0); - cairo_pattern_set_matrix (dst_pattern, &shadow_matrix); -- -- goto out; -+ return dst_pattern; - } - - /* Read all the code from the cairo_pattern_set_matrix call -@@ -784,8 +786,6 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec, - - cairo_pattern_set_matrix (dst_pattern, &shadow_matrix); - -- out: -- g_free (pixels_out); - return dst_pattern; - } - --- -cgit v0.9 diff --git a/extra/gnome-shell/st-private_fix_memory_leak.patch b/extra/gnome-shell/st-private_fix_memory_leak.patch deleted file mode 100644 index 677a26531..000000000 --- a/extra/gnome-shell/st-private_fix_memory_leak.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 72f9f482d6f1bcb53ea2bd1606818af1f33a5a8c Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Thu, 05 May 2011 19:21:58 +0000 -Subject: st-private: Fix memory leak - -==13810== 11,360 bytes in 1 blocks are definitely lost in loss record 18,574 of 18,765 -==13810== at 0x4005447: calloc (vg_replace_malloc.c:467) -==13810== by 0x5191882: standard_calloc (gmem.c:107) -==13810== by 0x51920A7: g_malloc0 (gmem.c:196) -==13810== by 0x4056201: blur_pixels (st-private.c:466) -==13810== by 0x40573B4: _st_create_shadow_cairo_pattern (st-private.c:710) -==13810== by 0x4070746: st_theme_node_paint (st-theme-node-drawing.c:856) -==13810== by 0x3FEFFFFF: ??? - -https://bugzilla.gnome.org/show_bug.cgi?id=649497 ---- -diff --git a/src/st/st-private.c b/src/st/st-private.c -index d0aa89b..51798a1 100644 ---- a/src/st/st-private.c -+++ b/src/st/st-private.c -@@ -746,7 +746,7 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec, - (height_out - height_in) / 2.0); - cairo_pattern_set_matrix (dst_pattern, &shadow_matrix); - -- return dst_pattern; -+ goto out; - } - - /* Read all the code from the cairo_pattern_set_matrix call -@@ -784,6 +784,8 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec, - - cairo_pattern_set_matrix (dst_pattern, &shadow_matrix); - -+ out: -+ g_free (pixels_out); - return dst_pattern; - } - --- -cgit v0.9 diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index b383bb180..04172d277 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117833 2011-04-04 18:12:02Z heftig $ +# $Id: PKGBUILD 124753 2011-05-24 07:53:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8d4b695ec165645c3d070f3296dc25cea4e3f1f4da7b4afa10ff1c166cc62d24') +sha256sums=('0fe6a263875b23a35fd17d8952e666e17801cb68bb664d6ce8cabcfd9ac0f972') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index 0bc006cf1..12b8c7d90 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 120589 2011-04-25 17:43:37Z ibiru $ +# $Id: PKGBUILD 124628 2011-05-23 14:48:53Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2) -sha256sums=('9630b12c02d8a05a328cb0bef111bb776b86639c9c582475943f71666ab82677') +sha256sums=('1def884063aa441860e20dd9925bb7c3b6f917bae44f77b1ada999940c463809') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 6b666f476..fe6d43a9e 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119590 2011-04-12 15:33:34Z eric $ +# $Id: PKGBUILD 125742 2011-05-29 04:00:08Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash -pkgver=2.4.5 +pkgver=2.4.6 pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64' 'mips64el') @@ -20,8 +20,8 @@ optdepends=('evince: for print preview' options=('!libtool' '!makeflags') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('94168fe959743fc342812ac3a01814a1') -sha1sums=('4f40b039ee8e9bcc15d49a8ed52bd7ef94bc8126') +md5sums=('b7d5fbb1bddf3618c97ebeeb76408ebe') +sha1sums=('b6d4a6bc327ef5a260d070215a14a3180b474ad8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 5550647fc..4cff80b52 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $ +# $Id: PKGBUILD 125375 2011-05-26 12:54:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.0.9 +pkgver=3.0.10 pkgrel=2 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') @@ -14,12 +14,15 @@ options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 - settings.ini) -sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + settings.ini + only_draw_resize_grip_if_its_window_exists.patch) +sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + 'fa2bd8085cae6cdb4f3b8baae11d3c0b38afec2eb4503f5bacabf87aee15313a') build() { cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/only_draw_resize_grip_if_its_window_exists.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch new file mode 100644 index 000000000..a6514b550 --- /dev/null +++ b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch @@ -0,0 +1,28 @@ +From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Mon, 23 May 2011 13:46:59 +0000 +Subject: window: Only draw resize grip if its window exists + +Don't rely on priv->resize_grip_visible as the code comment in the +variable declaration indicates. +This fixes warnings with GtkPlug, which can cause resize_grip_visible to +be TRUE but grid_window to be NULL - running tests/teststatusicon +reproduces this. + +This broke with 0cf31b35eb10cb5bc08048ecdc141c949efec4cc +--- +diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c +index b97418a..b1caa9b 100644 +--- a/gtk/gtkwindow.c ++++ b/gtk/gtkwindow.c +@@ -7304,7 +7304,7 @@ gtk_window_draw (GtkWidget *widget, + if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw) + ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr); + +- if (priv->resize_grip_visible && ++ if (priv->grip_window && + gtk_cairo_should_draw_window (cr, priv->grip_window)) + { + GdkRectangle rect; +-- +cgit v0.9 diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index fb98d197d..eec9417b7 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120698 2011-04-25 23:34:40Z ibiru $ +# $Id: PKGBUILD 125532 2011-05-26 16:26:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.0.1 +pkgver=3.0.3 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.bz2) -sha256sums=('4e76f037184d56767e09df909490f10ee417a5265febae8a4d23255a902ae20a') +sha256sums=('582765d4ff9ec2141eaaa96d52596bee71af798bf5bc1e5fed686c60331b6de7') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 40322ce77..48ee41746 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120775 2011-04-26 14:51:23Z ibiru $ +# $Id: PKGBUILD 124634 2011-05-23 15:36:42Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -13,7 +13,7 @@ makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('7d305320d881d914d88286a72a311587ea33fbe5075101729cb5766f01832ff7') +sha256sums=('0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index 8fe42ce6e..aa432f086 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 116002 2011-03-22 15:28:48Z giovanni $ +# $Id: PKGBUILD 124968 2011-05-25 13:58:20Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.39.2 +pkgver=1.39.4 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/help2man/" license=('GPL') depends=('perl-locale-gettext') +install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('36659da3ba7a9a51813e1c4848900a28') +md5sums=('6b1160697451ba87067231d172285840') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/help2man/help2man.install b/extra/help2man/help2man.install new file mode 100644 index 000000000..ab6585b91 --- /dev/null +++ b/extra/help2man/help2man.install @@ -0,0 +1,18 @@ +info_dir=/usr/share/info +info_files=(help2man.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 9d0759d68..6029c1ebe 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112014 2011-03-03 05:10:44Z eric $ +# $Id: PKGBUILD 124912 2011-05-25 06:37:46Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2010.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64' 'mips64el') url="http://hugin.sourceforge.net/" @@ -14,13 +14,15 @@ depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') makedepends=('zip' 'cmake' 'boost') install=${pkgname}.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bfd716655461987312b2f2f00c90dcc5') -sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) +md5sums=('bfd716655461987312b2f2f00c90dcc5' + '4393c7b31da60f230c85e63a6a2e43a0') +sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' + '52798a155a037f853f41402f797e8a4cb6bb3e07') build() { cd "${srcdir}" - + (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) mkdir build && cd build cmake "${srcdir}/${pkgname}-${pkgver}" \ diff --git a/extra/hugin/hugin-gcc46.patch b/extra/hugin/hugin-gcc46.patch new file mode 100644 index 000000000..98a70ad50 --- /dev/null +++ b/extra/hugin/hugin-gcc46.patch @@ -0,0 +1,16 @@ + +diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx +--- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 ++++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + + + + + diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 35cc5fa90..db4a0aba4 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 114609 2011-03-14 15:02:27Z jgc $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 125606 2011-05-26 21:06:33Z bisson $ +# Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.1 -pkgrel=2 +pkgrel=3 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') @@ -13,33 +14,40 @@ makedepends=('boost' 'pkg-config' 'intltool') depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2' 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('python2-numpy: some extensions' - 'python-lxml: some extensions and filters') + 'python-lxml: some extensions and filters' + 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -install=inkscape.install -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gcc46.patch') +sha1sums=('a43467119925aee70d1d63d746f9846abb4dea91' + '7163f35978538a6e223005737e8707b6f847fab3') + +install=install build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-python \ - --with-perl \ - --without-gnome-vfs \ - --with-xft \ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-dependency-tracking - - sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py - sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py - sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp - sed -i 's|\<python -c |python2 -c|g' share/extensions/uniconv*.py - sed -i 's|"python"|"python2"|g' src/main.cpp - - make + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../gcc46.patch + sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py + sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py + sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp + sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py + sed -i 's|"python"|"python2"|g' src/main.cpp + + ./configure --prefix=/usr \ + --with-python \ + --with-perl \ + --without-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking \ + + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/extra/inkscape/gcc46.patch b/extra/inkscape/gcc46.patch new file mode 100644 index 000000000..d04914c87 --- /dev/null +++ b/extra/inkscape/gcc46.patch @@ -0,0 +1,849 @@ +diff -aur old/src/2geom/utils.h new/src/2geom/utils.h +--- old/src/2geom/utils.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/2geom/utils.h 2011-05-26 14:38:55.912288964 +0000 +@@ -35,6 +35,7 @@ + + #include <cmath> + #include <vector> ++#include <cstddef> + + namespace Geom { + +diff -aur old/src/arc-context.h new/src/arc-context.h +--- old/src/arc-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/arc-context.h 2011-05-26 14:37:30.814792031 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/connection.h> + + #include <2geom/point.h> +diff -aur old/src/box3d-context.h new/src/box3d-context.h +--- old/src/box3d-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/box3d-context.h 2011-05-26 14:37:30.814792031 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "proj_pt.h" +diff -aur old/src/conn-avoid-ref.h new/src/conn-avoid-ref.h +--- old/src/conn-avoid-ref.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/conn-avoid-ref.h 2011-05-26 14:37:30.814792031 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <glib/gslist.h> ++#include <stddef.h> + #include <sigc++/connection.h> + + struct SPDesktop; +diff -aur old/src/connection-pool.h new/src/connection-pool.h +--- old/src/connection-pool.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/connection-pool.h 2011-05-26 14:37:30.814792031 +0000 +@@ -3,6 +3,7 @@ + + #include <glib-object.h> + #include <gtkmm.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape +diff -aur old/src/connector-context.h new/src/connector-context.h +--- old/src/connector-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/connector-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -12,6 +12,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <sigc++/connection.h> + #include "event-context.h" +diff -aur old/src/desktop.h new/src/desktop.h +--- old/src/desktop.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/desktop.h 2011-05-26 14:37:30.814792120 +0000 +@@ -27,6 +27,7 @@ + + #include <gdk/gdkevents.h> + #include <gtk/gtktypeutils.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include <2geom/matrix.h> +diff -aur old/src/dialogs/object-attributes.cpp new/src/dialogs/object-attributes.cpp +--- old/src/dialogs/object-attributes.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/dialogs/object-attributes.cpp 2011-05-26 14:37:30.814792120 +0000 +@@ -13,6 +13,7 @@ + #include <glibmm/i18n.h> + #include <string> + #include <cstring> ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/ptr_fun.h> + #include <sigc++/adaptors/bind.h> +diff -aur old/src/display/canvas-temporary-item.h new/src/display/canvas-temporary-item.h +--- old/src/display/canvas-temporary-item.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/display/canvas-temporary-item.h 2011-05-26 14:37:30.814792120 +0000 +@@ -14,6 +14,7 @@ + + #include "display/display-forward.h" + ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { +diff -aur old/src/document.h new/src/document.h +--- old/src/document.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/document.h 2011-05-26 14:37:30.814792120 +0000 +@@ -17,6 +17,7 @@ + + #include <glib-object.h> + #include <gtk/gtksignal.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <sigc++/class_slot.h> + +diff -aur old/src/document-private.h new/src/document-private.h +--- old/src/document-private.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/document-private.h 2011-05-26 14:37:30.814792120 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <map> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "xml/event-fns.h" + #include "sp-defs.h" +diff -aur old/src/document-subset.h new/src/document-subset.h +--- old/src/document-subset.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/document-subset.h 2011-05-26 14:37:30.814792120 +0000 +@@ -10,6 +10,7 @@ + #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H + #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H + ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/slot.h> + +diff -aur old/src/draw-context.h new/src/draw-context.h +--- old/src/draw-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/draw-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -14,6 +14,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include <forward.h> +diff -aur old/src/extension/timer.h new/src/extension/timer.h +--- old/src/extension/timer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/extension/timer.h 2011-05-26 14:37:30.814792120 +0000 +@@ -13,6 +13,7 @@ + #ifndef INKSCAPE_EXTENSION_TIMER_H__ + #define INKSCAPE_EXTENSION_TIMER_H__ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glibmm/timeval.h> + #include "extension-forward.h" +diff -aur old/src/flood-context.h new/src/flood-context.h +--- old/src/flood-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/flood-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -11,6 +11,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtk/gtk.h> + #include "event-context.h" +diff -aur old/src/gc-alloc.h new/src/gc-alloc.h +--- old/src/gc-alloc.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gc-alloc.h 2011-05-26 14:37:30.814792120 +0000 +@@ -16,6 +16,7 @@ + #define SEEN_INKSCAPE_GC_ALLOC_H + + #include <limits> ++#include <cstddef> + #include "gc-core.h" + + namespace Inkscape { +diff -aur old/src/gc.cpp new/src/gc.cpp +--- old/src/gc.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gc.cpp 2011-05-26 14:37:30.814792120 +0000 +@@ -16,6 +16,7 @@ + #include <glib/gmessages.h> + #include <sigc++/functors/ptr_fun.h> + #include <glibmm/main.h> ++#include <cstddef> + + namespace Inkscape { + namespace GC { +diff -aur old/src/gc-finalized.h new/src/gc-finalized.h +--- old/src/gc-finalized.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gc-finalized.h 2011-05-26 14:37:30.814792120 +0000 +@@ -17,6 +17,7 @@ + #define SEEN_INKSCAPE_GC_FINALIZED_H + + #include <new> ++#include <cstddef> + #include "gc-core.h" + + namespace Inkscape { +diff -aur old/src/gradient-context.h new/src/gradient-context.h +--- old/src/gradient-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/gradient-context.h 2011-05-26 14:37:30.814792120 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + +diff -aur old/src/gradient-drag.h new/src/gradient-drag.h +--- old/src/gradient-drag.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/gradient-drag.h 2011-05-26 14:37:30.814792120 +0000 +@@ -15,6 +15,7 @@ + */ + + #include <glib/gslist.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <vector> + +diff -aur old/src/knot.h new/src/knot.h +--- old/src/knot.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/knot.h 2011-05-26 14:37:30.814792120 +0000 +@@ -20,6 +20,7 @@ + #include "forward.h" + #include <2geom/point.h> + #include "knot-enums.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class SPKnot; +diff -aur old/src/libavoid/geomtypes.h new/src/libavoid/geomtypes.h +--- old/src/libavoid/geomtypes.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/libavoid/geomtypes.h 2011-05-26 14:37:30.814792120 +0000 +@@ -29,6 +29,7 @@ + #ifndef AVOID_GEOMTYPES_H + #define AVOID_GEOMTYPES_H + ++#include <cstddef> + #include <vector> + #include <utility> + +diff -aur old/src/live_effects/lpeobject-reference.h new/src/live_effects/lpeobject-reference.h +--- old/src/live_effects/lpeobject-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/live_effects/lpeobject-reference.h 2011-05-26 14:37:30.818124452 +0000 +@@ -11,6 +11,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { +diff -aur old/src/live_effects/parameter/path.h new/src/live_effects/parameter/path.h +--- old/src/live_effects/parameter/path.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/live_effects/parameter/path.h 2011-05-26 14:37:30.818124452 +0000 +@@ -16,6 +16,7 @@ + + #include "live_effects/parameter/parameter.h" + #include "live_effects/parameter/path-reference.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { +diff -aur old/src/live_effects/parameter/path-reference.h new/src/live_effects/parameter/path-reference.h +--- old/src/live_effects/parameter/path-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/live_effects/parameter/path-reference.h 2011-05-26 14:37:30.818124452 +0000 +@@ -11,6 +11,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class Path; +diff -aur old/src/Makefile.am new/src/Makefile.am +--- old/src/Makefile.am 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/Makefile.am 2011-05-26 14:37:30.814792031 +0000 +@@ -205,7 +205,7 @@ + + inkscape_SOURCES += main.cpp $(win32_sources) + inkscape_LDADD = $(all_libs) +-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows) ++inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows) + + inkview_SOURCES += inkview.cpp $(win32_sources) + inkview_LDADD = $(all_libs) +diff -aur old/src/message-stack.h new/src/message-stack.h +--- old/src/message-stack.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/message-stack.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H + #define SEEN_INKSCAPE_MESSAGE_STACK_H + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glib.h> + #include <stdarg.h> +diff -aur old/src/object-hierarchy.h new/src/object-hierarchy.h +--- old/src/object-hierarchy.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/object-hierarchy.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + + #include <exception> + #include <list> ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/signal.h> + #include <glib/gmessages.h> +diff -aur old/src/persp3d-reference.h new/src/persp3d-reference.h +--- old/src/persp3d-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/persp3d-reference.h 2011-05-26 14:37:30.818124452 +0000 +@@ -11,6 +11,7 @@ + */ + + #include "uri-references.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "persp3d.h" + +diff -aur old/src/rect-context.h new/src/rect-context.h +--- old/src/rect-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/rect-context.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + * Released under GNU GPL + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "libnr/nr-point.h" +diff -aur old/src/selcue.h new/src/selcue.h +--- old/src/selcue.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/selcue.h 2011-05-26 14:37:30.818124452 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class SPDesktop; +diff -aur old/src/selection-describer.h new/src/selection-describer.h +--- old/src/selection-describer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/selection-describer.h 2011-05-26 14:37:30.818124452 +0000 +@@ -12,6 +12,7 @@ + #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H + #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "message-context.h" + +diff -aur old/src/selection.h new/src/selection.h +--- old/src/selection.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/selection.h 2011-05-26 14:37:30.818124452 +0000 +@@ -19,6 +19,7 @@ + #include <vector> + #include <map> + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + //#include "libnr/nr-rect.h" +diff -aur old/src/seltrans.h new/src/seltrans.h +--- old/src/seltrans.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/seltrans.h 2011-05-26 14:37:30.818124452 +0000 +@@ -15,6 +15,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <2geom/point.h> + #include <2geom/matrix.h> +diff -aur old/src/sp-conn-end.h new/src/sp-conn-end.h +--- old/src/sp-conn-end.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-conn-end.h 2011-05-26 14:37:30.818124452 +0000 +@@ -2,6 +2,7 @@ + #define SEEN_SP_CONN_END + + #include <glib/gtypes.h> ++#include <stddef.h> + #include <sigc++/connection.h> + + #include "sp-use-reference.h" +diff -aur old/src/sp-conn-end-pair.h new/src/sp-conn-end-pair.h +--- old/src/sp-conn-end-pair.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-conn-end-pair.h 2011-05-26 14:37:30.818124452 +0000 +@@ -15,6 +15,7 @@ + + #include "forward.h" + #include "libnr/nr-point.h" ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/slot.h> + #include <sigc++/signal.h> +diff -aur old/src/sp-gradient.h new/src/sp-gradient.h +--- old/src/sp-gradient.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/sp-gradient.h 2011-05-26 14:37:30.818124452 +0000 +@@ -25,6 +25,7 @@ + #include "sp-gradient-units.h" + #include "sp-gradient-vector.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + struct SPGradientReference; +diff -aur old/src/spiral-context.h new/src/spiral-context.h +--- old/src/spiral-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/spiral-context.h 2011-05-26 14:37:30.821456796 +0000 +@@ -16,6 +16,7 @@ + */ + + #include <gtk/gtktypeutils.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "libnr/nr-point.h" +diff -aur old/src/sp-object.h new/src/sp-object.h +--- old/src/sp-object.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-object.h 2011-05-26 14:37:30.818124452 +0000 +@@ -56,6 +56,7 @@ + + + #include <glib-object.h> ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/functors/slot.h> + #include <sigc++/signal.h> +diff -aur old/src/sp-offset.h new/src/sp-offset.h +--- old/src/sp-offset.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-offset.h 2011-05-26 14:37:30.818124452 +0000 +@@ -16,6 +16,7 @@ + + #include "sp-shape.h" + ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #define SP_TYPE_OFFSET (sp_offset_get_type ()) +diff -aur old/src/sp-pattern.h new/src/sp-pattern.h +--- old/src/sp-pattern.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-pattern.h 2011-05-26 14:37:30.818124452 +0000 +@@ -32,6 +32,7 @@ + #include "sp-paint-server.h" + #include "uri-references.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + class SPPatternReference : public Inkscape::URIReference { +diff -aur old/src/sp-shape.h new/src/sp-shape.h +--- old/src/sp-shape.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-shape.h 2011-05-26 14:37:30.818124452 +0000 +@@ -19,6 +19,7 @@ + #include "sp-marker-loc.h" + #include <2geom/forward.h> + ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_SHAPE (sp_shape_get_type ()) +diff -aur old/src/sp-switch.h new/src/sp-switch.h +--- old/src/sp-switch.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-switch.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + + #include "sp-item-group.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_SWITCH (CSwitch::getType()) +diff -aur old/src/sp-text.h new/src/sp-text.h +--- old/src/sp-text.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-text.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + */ + + #include <glib/gtypes.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "sp-item.h" + #include "sp-string.h" +diff -aur old/src/sp-tref-reference.h new/src/sp-tref-reference.h +--- old/src/sp-tref-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-tref-reference.h 2011-05-26 14:37:30.821456796 +0000 +@@ -13,6 +13,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include "util/share.h" +diff -aur old/src/sp-use.h new/src/sp-use.h +--- old/src/sp-use.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-use.h 2011-05-26 14:37:30.821456796 +0000 +@@ -13,6 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "svg/svg-length.h" + #include "sp-item.h" +diff -aur old/src/sp-use-reference.h new/src/sp-use-reference.h +--- old/src/sp-use-reference.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/sp-use-reference.h 2011-05-26 14:37:30.821456796 +0000 +@@ -11,6 +11,7 @@ + + #include <forward.h> + #include <uri-references.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class Path; +diff -aur old/src/star-context.h new/src/star-context.h +--- old/src/star-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/star-context.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "libnr/nr-point.h" +diff -aur old/src/style.h new/src/style.h +--- old/src/style.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/style.h 2011-05-26 14:37:30.821456796 +0000 +@@ -24,6 +24,7 @@ + #include "uri.h" + #include "sp-paint-server.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + namespace Inkscape { +diff -aur old/src/text-context.h new/src/text-context.h +--- old/src/text-context.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/text-context.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + */ + + /* #include <gdk/gdkic.h> */ ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtk/gtkimcontext.h> + +diff -aur old/src/ui/dialog/desktop-tracker.h new/src/ui/dialog/desktop-tracker.h +--- old/src/ui/dialog/desktop-tracker.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/desktop-tracker.h 2011-05-26 14:37:30.821456796 +0000 +@@ -11,6 +11,7 @@ + #ifndef SEEN_DIALOG_DESKTOP_TRACKER + #define SEEN_DIALOG_DESKTOP_TRACKER + ++#include <stddef.h> + #include <sigc++/connection.h> + #include <glib/gtypes.h> + +diff -aur old/src/ui/dialog/document-metadata.h new/src/ui/dialog/document-metadata.h +--- old/src/ui/dialog/document-metadata.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/document-metadata.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H + + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtkmm/notebook.h> + #include <glibmm/i18n.h> +diff -aur old/src/ui/dialog/document-properties.h new/src/ui/dialog/document-properties.h +--- old/src/ui/dialog/document-properties.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/document-properties.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H + + #include <list> ++#include <stddef.h> + #include <sigc++/sigc++.h>// + #include <gtkmm/notebook.h> + #include <glibmm/i18n.h> +diff -aur old/src/ui/dialog/inkscape-preferences.h new/src/ui/dialog/inkscape-preferences.h +--- old/src/ui/dialog/inkscape-preferences.h 2010-11-06 18:47:19.806162000 +0000 ++++ new/src/ui/dialog/inkscape-preferences.h 2011-05-26 14:37:30.821456796 +0000 +@@ -28,6 +28,7 @@ + #include <gtkmm/frame.h> + #include <gtkmm/notebook.h> + #include "ui/widget/preferences-widget.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glibmm/i18n.h> + #include <gtkmm/textview.h> +diff -aur old/src/ui/dialog/undo-history.cpp new/src/ui/dialog/undo-history.cpp +--- old/src/ui/dialog/undo-history.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/dialog/undo-history.cpp 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + + #include <glibmm/i18n.h> + #include <gtk/gtkimage.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + +diff -aur old/src/ui/tool/control-point.h new/src/ui/tool/control-point.h +--- old/src/ui/tool/control-point.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/tool/control-point.h 2011-05-26 14:37:30.821456796 +0000 +@@ -12,6 +12,7 @@ + #define SEEN_UI_TOOL_CONTROL_POINT_H + + #include <boost/utility.hpp> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gdkmm.h> + #include <gtkmm.h> +diff -aur old/src/ui/tool/control-point-selection.h new/src/ui/tool/control-point-selection.h +--- old/src/ui/tool/control-point-selection.h 2010-08-04 16:45:00.868588000 +0000 ++++ new/src/ui/tool/control-point-selection.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + + #include <memory> + #include <boost/optional.hpp> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <2geom/forward.h> + #include <2geom/point.h> +diff -aur old/src/ui/tool/manipulator.h new/src/ui/tool/manipulator.h +--- old/src/ui/tool/manipulator.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/tool/manipulator.h 2011-05-26 14:37:30.821456796 +0000 +@@ -13,6 +13,7 @@ + + #include <set> + #include <map> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glib.h> + #include <gdk/gdk.h> +diff -aur old/src/ui/tool/multi-path-manipulator.h new/src/ui/tool/multi-path-manipulator.h +--- old/src/ui/tool/multi-path-manipulator.h 2010-11-06 18:47:19.806162000 +0000 ++++ new/src/ui/tool/multi-path-manipulator.h 2011-05-26 14:37:30.821456796 +0000 +@@ -11,6 +11,7 @@ + #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H + #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H + ++#include <stddef.h> + #include <sigc++/connection.h> + #include "display/display-forward.h" + #include "forward.h" +diff -aur old/src/ui/tool/node.h new/src/ui/tool/node.h +--- old/src/ui/tool/node.h 2011-01-02 04:34:09.814902000 +0000 ++++ new/src/ui/tool/node.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + #include <iterator> + #include <iosfwd> + #include <stdexcept> ++#include <cstddef> + #include <tr1/functional> + #include <boost/utility.hpp> + #include <boost/shared_ptr.hpp> +diff -aur old/src/ui/tool/node-tool.h new/src/ui/tool/node-tool.h +--- old/src/ui/tool/node-tool.h 2010-11-06 18:47:19.806162000 +0000 ++++ new/src/ui/tool/node-tool.h 2011-05-26 14:37:30.821456796 +0000 +@@ -14,6 +14,7 @@ + #include <memory> + #include <boost/ptr_container/ptr_map.hpp> + #include <glib.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include "event-context.h" + #include "forward.h" +diff -aur old/src/ui/view/view.h new/src/ui/view/view.h +--- old/src/ui/view/view.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/view/view.h 2011-05-26 14:37:30.821456796 +0000 +@@ -15,6 +15,7 @@ + */ + + #include <gdk/gdktypes.h> ++#include <stddef.h> + #include <sigc++/connection.h> + #include "message.h" + #include "gc-managed.h" +diff -aur old/src/ui/widget/color-picker.h new/src/ui/widget/color-picker.h +--- old/src/ui/widget/color-picker.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/color-picker.h 2011-05-26 14:37:30.824789230 +0000 +@@ -13,6 +13,7 @@ + #ifndef __COLOR_PICKER_H__ + #define __COLOR_PICKER_H__ + ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <gtkmm/button.h> + #include <gtkmm/dialog.h> +diff -aur old/src/ui/widget/page-sizer.h new/src/ui/widget/page-sizer.h +--- old/src/ui/widget/page-sizer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/page-sizer.h 2011-05-26 14:37:30.824789230 +0000 +@@ -13,6 +13,7 @@ + #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H + + #include <gtkmm.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include "helper/units.h" +diff -aur old/src/ui/widget/preferences-widget.h new/src/ui/widget/preferences-widget.h +--- old/src/ui/widget/preferences-widget.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/preferences-widget.h 2011-05-26 14:37:30.824789230 +0000 +@@ -26,6 +26,7 @@ + #include <gtkmm/drawingarea.h> + #include <gtkmm/frame.h> + #include <gtkmm/filechooserbutton.h> ++#include <stddef.h> + #include <sigc++/sigc++.h> + #include <glibmm/i18n.h> + +diff -aur old/src/ui/widget/selected-style.h new/src/ui/widget/selected-style.h +--- old/src/ui/widget/selected-style.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/selected-style.h 2011-05-26 14:37:30.824789230 +0000 +@@ -23,6 +23,7 @@ + #include <gtkmm/adjustment.h> + #include <gtkmm/spinbutton.h> + ++#include <stddef.h> + #include <sigc++/sigc++.h> + + #include <glibmm/i18n.h> +diff -aur old/src/ui/widget/style-subject.h new/src/ui/widget/style-subject.h +--- old/src/ui/widget/style-subject.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/ui/widget/style-subject.h 2011-05-26 14:37:30.824789230 +0000 +@@ -14,6 +14,7 @@ + #include "libnr/nr-rect.h" + #include <2geom/rect.h> + #include "sp-item.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + class SPDesktop; +diff -aur old/src/uri-references.h new/src/uri-references.h +--- old/src/uri-references.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/uri-references.h 2011-05-26 14:37:30.824789230 +0000 +@@ -13,6 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include <stddef.h> + #include <sigc++/connection.h> + #include <sigc++/trackable.h> + +diff -aur old/src/util/forward-pointer-iterator.h new/src/util/forward-pointer-iterator.h +--- old/src/util/forward-pointer-iterator.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/util/forward-pointer-iterator.h 2011-05-26 14:37:30.824789230 +0000 +@@ -15,6 +15,7 @@ + #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H + + #include <iterator> ++#include <cstddef> + #include "util/reference.h" + + namespace Inkscape { +diff -aur old/src/util/share.h new/src/util/share.h +--- old/src/util/share.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/util/share.h 2011-05-26 14:37:30.824789230 +0000 +@@ -14,6 +14,7 @@ + + #include "gc-core.h" + #include <cstring> ++#include <cstddef> + + namespace Inkscape { + namespace Util { +diff -aur old/src/util/unordered-containers.h new/src/util/unordered-containers.h +--- old/src/util/unordered-containers.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/util/unordered-containers.h 2011-05-26 14:37:30.824789230 +0000 +@@ -41,6 +41,8 @@ + # define INK_UNORDERED_MAP __gnu_cxx::hash_map + # define INK_HASH __gnu_cxx::hash + ++#include <cstddef> ++ + namespace __gnu_cxx { + // hash function for pointers + // TR1 and Boost have this defined by default, __gnu_cxx doesn't +diff -aur old/src/widgets/desktop-widget.h new/src/widgets/desktop-widget.h +--- old/src/widgets/desktop-widget.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/desktop-widget.h 2011-05-26 14:37:30.824789230 +0000 +@@ -21,6 +21,7 @@ + #include "ui/view/view-widget.h" + #include "ui/view/edit-widget-interface.h" + ++#include <stddef.h> + #include <sigc++/connection.h> + + // forward declaration +diff -aur old/src/widgets/gradient-image.h new/src/widgets/gradient-image.h +--- old/src/widgets/gradient-image.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/gradient-image.h 2011-05-26 14:37:30.824789230 +0000 +@@ -19,6 +19,7 @@ + + #include <glib.h> + ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ()) +diff -aur old/src/widgets/gradient-vector.h new/src/widgets/gradient-vector.h +--- old/src/widgets/gradient-vector.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/gradient-vector.h 2011-05-26 14:37:30.824789230 +0000 +@@ -17,6 +17,7 @@ + + #include <glib.h> + ++#include <stddef.h> + #include <sigc++/connection.h> + + #include <gtk/gtkvbox.h> +diff -aur old/src/widgets/sp-attribute-widget.h new/src/widgets/sp-attribute-widget.h +--- old/src/widgets/sp-attribute-widget.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/sp-attribute-widget.h 2011-05-26 14:37:30.824789230 +0000 +@@ -14,6 +14,7 @@ + #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H + + #include <glib.h> ++#include <stddef.h> + #include <sigc++/connection.h> + + #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ()) +diff -aur old/src/widgets/sp-color-notebook.cpp new/src/widgets/sp-color-notebook.cpp +--- old/src/widgets/sp-color-notebook.cpp 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/widgets/sp-color-notebook.cpp 2011-05-26 14:37:30.824789230 +0000 +@@ -22,6 +22,7 @@ + #include <cstring> + #include <string> + #include <cstdlib> ++#include <cstddef> + #include <gtk/gtk.h> + #include <glibmm/i18n.h> + +diff -aur old/src/xml/helper-observer.h new/src/xml/helper-observer.h +--- old/src/xml/helper-observer.h 2010-07-13 03:48:40.691600000 +0000 ++++ new/src/xml/helper-observer.h 2011-05-26 14:37:30.824789230 +0000 +@@ -5,6 +5,7 @@ + #include "node.h" + #include "../sp-object.h" + //#include "../sp-object-repr.h" ++#include <stddef.h> + #include <sigc++/sigc++.h> + + namespace Inkscape { diff --git a/extra/inkscape/inkscape.install b/extra/inkscape/inkscape.install deleted file mode 100644 index c4b2efa09..000000000 --- a/extra/inkscape/inkscape.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - - -post_remove() { - post_install -} diff --git a/extra/inkscape/install b/extra/inkscape/install new file mode 100644 index 000000000..6e803bf1d --- /dev/null +++ b/extra/inkscape/install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} diff --git a/extra/ipod-sharp/PKGBUILD b/extra/ipod-sharp/PKGBUILD deleted file mode 100644 index 29ca26d97..000000000 --- a/extra/ipod-sharp/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 59294 2009-11-21 20:34:51Z jgc $ -# Maintainer: Hugo Doria <hugo@archlinux.org> - -pkgname=ipod-sharp -pkgver=0.8.5 -pkgrel=1 -pkgdesc="C# bindings for libipoddevice" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://download.banshee-project.org/ipod-sharp/" -depends=('podsleuth' 'ndesk-dbus-glib' 'gtk-sharp-2') -options=(!makeflags) -source=(http://download.banshee-project.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('7c5b02872c75a7d61662e266e6f7a2a1aae14f71d9820a59faef2813dcd825fd') - -build() { - export MONO_SHARED_DIR="${srcdir}/.wabi" - mkdir -p "${MONO_SHARED_DIR}" - - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-docs || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - rm -fr "${MONO_SHARED_DIR}" -} diff --git a/extra/kdebase-workspace/nm-09.patch b/extra/kdebase-workspace/nm-09.patch deleted file mode 100644 index 20ccd4d7d..000000000 --- a/extra/kdebase-workspace/nm-09.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- kdebase-workspace-4.6.3/solid/CMakeLists.txt~ 2011-04-29 03:43:20.321994578 -0700 -+++ kdebase-workspace-4.6.3/solid/CMakeLists.txt 2011-04-29 03:43:33.271995023 -0700 -@@ -17,7 +17,7 @@ - add_subdirectory(networkmanager-0.6) - endif (NM_0_6) - -- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7) -+ macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7) - if (NM_0_7) - message(STATUS "Will build networkmanager-0.7") - set(HAVE_NETWORKMANAGER TRUE) ---- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp~ 2011-04-29 03:32:33.838644845 -0700 -+++ kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp 2011-04-29 03:40:52.308657544 -0700 -@@ -118,16 +118,16 @@ - uint deviceType = devIface.deviceType(); - NMNetworkInterface * createdInterface = 0; - switch ( deviceType ) { -- case DEVICE_TYPE_802_3_ETHERNET: -+ case NM_DEVICE_TYPE_ETHERNET: - createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager - break; -- case DEVICE_TYPE_802_11_WIRELESS: -+ case NM_DEVICE_TYPE_WIFI: - createdInterface = new NMWirelessNetworkInterface(uni, this, 0); - break; -- case DEVICE_TYPE_GSM: -+ case 3: - createdInterface = new NMGsmNetworkInterface(uni, this, 0); - break; -- case DEVICE_TYPE_CDMA: -+ case 4: - createdInterface = new NMCdmaNetworkInterface(uni, this, 0); - break; - /* diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD index e1c29b24b..a5a24fb20 100644 --- a/extra/kdeedu/PKGBUILD +++ b/extra/kdeedu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122727 2011-05-06 08:29:55Z andrea $ +# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -26,8 +26,8 @@ pkgname=('kdeedu-blinken' 'kdeedu-rocs' 'kdeedu-step') pkgver=4.6.3 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2 +arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeedu') @@ -46,7 +46,6 @@ build() { cd ${srcdir} mkdir build cd build - # rpath is needed for cantor to find R cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=OFF \ diff --git a/extra/kdeplasma-applets-networkmanagement/nm-09.patch b/extra/kdeplasma-applets-networkmanagement/nm-09.patch deleted file mode 100644 index 52b875513..000000000 --- a/extra/kdeplasma-applets-networkmanagement/nm-09.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Lamarque V. Souza <lamarque@gmail.com> -Date: Sun, 17 Apr 2011 00:09:43 +0000 -Subject: Fix compilation against NetworkManager-0.8.98. -X-Git-Url: http://quickgit.kde.org/?p=networkmanagement.git&a=commitdiff&h=e87ceccadc833e220f73d86352968655cedc0485 ---- -Fix compilation against NetworkManager-0.8.98. - -BUG: 271101 ---- - - ---- a/backends/NetworkManager/nmdbussettingsservice.cpp -+++ b/backends/NetworkManager/nmdbussettingsservice.cpp -@@ -59,7 +59,7 @@ public: - QHash<QUuid, QDBusObjectPath> uuidToPath; - }; - --const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS); -+const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String("org.freedesktop.NetworkManagerUserSettings"); - const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String("org.freedesktop.NetworkManager"); - - NMDBusSettingsService::NMDBusSettingsService(QObject * parent) - ---- a/backends/NetworkManager/settings/gsmdbus.cpp -+++ b/backends/NetworkManager/settings/gsmdbus.cpp -@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap - if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) { - setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>()); - } else { -- setting->setNetworktype(NM_GSM_NETWORK_ANY); -+ setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY); - } - if (map.contains("band")) { - setting->setBand(map.value("band").value<int>()); -@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap() - map.insert("apn", setting->apn()); - if (!setting->networkid().isEmpty()) - map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid()); -- if (setting->networktype() != NM_GSM_NETWORK_ANY) { -+ if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) { - map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype()); - } - - diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD index 2347fc4f7..fb532e990 100644 --- a/extra/libdmapsharing/PKGBUILD +++ b/extra/libdmapsharing/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 117405 2011-04-01 16:34:19Z ibiru $ +# $Id: PKGBUILD 125725 2011-05-28 15:53:41Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libdmapsharing -pkgver=2.9.7 +pkgver=2.9.12 pkgrel=1 -pkgdesc="Libdmapsharing is a library you may use to access and share DMAP content" -arch=('i686' 'x86_64' 'mips64el') +pkgdesc="A library that implements the DMAP family of protocols" +arch=('i686' 'x86_64') url="http://www.flyn.org/projects/libdmapsharing/index.html" license=('LGPL2.1') depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2') options=('!libtool') source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz) -md5sums=('5eeded6d82ed2c2f6f310b9bd484798c') +md5sums=('ec34948df21e9ba0656c917b10fed1c3') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --with-mdns=avahi make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD index ba33e210d..b43d6ab53 100644 --- a/extra/libftdi/PKGBUILD +++ b/extra/libftdi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 101400 2010-11-29 04:43:52Z allan $ +# $Id: PKGBUILD 125350 2011-05-26 02:17:50Z eric $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libftdi -pkgver=0.18 -pkgrel=2 +pkgver=0.19 +pkgrel=1 pkgdesc="A library to talk to FTDI chips" -arch=("i686" "x86_64" 'mips64el') +arch=('i686' 'x86_64') url="http://www.intra2net.com/en/developer/libftdi/download.php" -license=("GPL2" "LGPL2.1") -depends=('libusb-compat') -makedepends=("boost") +license=('GPL2' 'LGPL2.1') +depends=('libusb-compat' 'gcc-libs') +makedepends=('boost') options=('!libtool') source=("http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz") -md5sums=('916f65fa68d154621fc0cf1f405f2726') -sha1sums=('52401db0e7cb90a5d83f82c2859a4f8d44e52579') +md5sums=('e6e25f33b4327b1b7aa1156947da45f3') +sha1sums=('0f08caf8e754ace69cd682489fae3f7f09920fe1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index 57df71c05..fa4540a1a 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 124609 2011-05-23 13:28:25Z ibiru $ +#$Id: PKGBUILD 125537 2011-05-26 16:32:57Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.0.2 -pkgrel=2 +pkgver=3.0.3 +pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') @@ -11,14 +11,11 @@ depends=('dbus-core' 'libgcrypt' 'glib2') makedepends=('intltool' 'pkgconfig') options=('!libtool' '!emptydirs') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - fix_crash.patch) -sha256sums=('7914ac5edae5e602ba8f7c505ecd18faa84e8482a3f4e6ee0a20aee3a24d6f5d' - '4b8c3d9cbc72d171b274e9ad38b01ff9f7ce92beaf1d1e89c54db70d6c4e8a6a') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('a0cc08bcd431070d3f01c2741903c2bd8b0231ee73de709d28e722e28575fdf8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_crash.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch deleted file mode 100644 index 1e28cdb73..000000000 --- a/extra/libgnome-keyring/fix_crash.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Mon, 23 May 2011 08:58:49 +0000 -Subject: Fix crash from recent memleak fix (b49e32b) - -make_attribute_list_va() statically copies the caller's method arguments into -the GnomeKeyringAttributeList, so we must only free the array itself, not the -GnomeKeyringAttribute strings. - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840 ---- -diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c -index dc271dd..4febf47 100644 ---- a/library/gnome-keyring.c -+++ b/library/gnome-keyring.c -@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType type, - va_end (args); - - ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data); -- gnome_keyring_attribute_list_free (attributes); -+ g_array_free (attributes, TRUE); - return ret; - } - -@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync (GnomeKeyringItemType type, - va_end (args); - - ret = gnome_keyring_find_items_sync (type, attributes, found); -- gnome_keyring_attribute_list_free (attributes); -+ g_array_free (attributes, TRUE); - return ret; - } - --- -cgit v0.9 diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 9de18bb05..55cfcad8c 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117926 2011-04-04 21:33:29Z heftig $ +# $Id: PKGBUILD 124751 2011-05-24 07:48:30Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org/" install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gettext-not-xml.patch) -sha256sums=('f13eb69c6ec8c4db08a78ffe980a5dd0e194894d411691a6821a068c650d1545' +sha256sums=('9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c' 'f21d55ab7916a50cad10d1c0bb3785a262e8ad8f35b9fb4c02ae23f1b0783727') build() { diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD index f53f584e9..9d29118a9 100644 --- a/extra/liborigin2/PKGBUILD +++ b/extra/liborigin2/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 112096 2011-03-03 20:59:03Z eric $ +# $Id: PKGBUILD 124976 2011-05-25 14:38:34Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgbase=liborigin2 pkgname=('liborigin2' 'liborigin2-docs') pkgver=20100913 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=4 +arch=('i686' 'x86_64') url="http://soft.proindependent.com/liborigin2/" license=('GPL3') makedepends=('doxygen' 'qt' 'boost') diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD index 1daebcb01..614c58ea4 100644 --- a/extra/libpst/PKGBUILD +++ b/extra/libpst/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112025 2011-03-03 09:42:31Z eric $ +# $Id: PKGBUILD 124979 2011-05-25 14:53:00Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libpst pkgname=('libpst' 'libpst-docs') pkgver=0.6.49 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=3 +arch=('i686' 'x86_64') url="http://www.five-ten-sg.com/libpst/" license=('GPL') makedepends=('python2' 'boost') diff --git a/kde-unstable/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD index 057ee2628..6e2d4766f 100644 --- a/kde-unstable/libqzeitgeist/PKGBUILD +++ b/extra/libqzeitgeist/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 124473 2011-05-22 13:09:39Z andrea $ +# $Id: PKGBUILD 125364 2011-05-26 10:10:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libqzeitgeist -pkgver=0.1git20110522 +pkgver=0.7.0 pkgrel=1 pkgdesc="A Qt interface to the Zeitgeist event tracking system" url="https://projects.kde.org/projects/kdesupport/libqzeitgeist" @@ -10,14 +10,14 @@ arch=('i686' 'x86_64') license=('GPL') depends=('qt') makedepends=('cmake') -source=("${pkgname}-${pkgver}.tar.bz2"::'http://quickgit.kde.org/?p=libqzeitgeist.git&a=snapshot&h=289c66f430dfb842afd36191a0ef82a26111c403&fmt=tbz2') -md5sums=('ba7d2c347e82b0aa6ab55f3136fb9468') +source=("http://releases.zeitgeist-project.com/qzeitgeist/QtZeitgeist-${pkgver}.tar.bz2") +md5sums=('e58d4b988bbab812f8bd6878d87c0956') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname} \ + cmake ../QtZeitgeist-${pkgver}-Source \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 901438de5..0367ee9c9 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120683 2011-04-25 23:06:22Z ibiru $ +# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.34.1 +pkgver=2.34.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject- url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -sha256sums=('a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b') +sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 77f1d048b..24f4aea76 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120130 2011-04-20 11:35:26Z ibiru $ +# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar pkgver=0.15.6 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index c9395bec3..d37c740ec 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117893 2011-04-04 21:09:31Z heftig $ +# $Id: PKGBUILD 124742 2011-05-24 07:31:15Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('bc34093ad185bb5086e97226f36157a6dd205623d32bdef71261a8b248a41f15') +sha256sums=('4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index 95fe0d747..d89319bd6 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112021 2011-03-03 08:05:12Z eric $ +# $Id: PKGBUILD 124982 2011-05-25 15:39:01Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx -pkgver=1.6.9 -pkgrel=2 +pkgver=1.6.10 +pkgrel=1 pkgdesc="An advanced open-source document processor." arch=('i686' 'x86_64' 'mips64el') url="http://www.lyx.org" @@ -12,14 +12,15 @@ depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'aspell' 'aiksaurus' makedepends=('boost') license=('GPL') source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \ - lyx.desktop) -sha1sums=('a1acacc8a26546542e32977ae222e811c98b1ca4' + lyx.desktop) +sha1sums=('344e14897ea7d004bf181eac39355f1b08f0af83' 'e207a0b14d58aeb7b83f8fc47ab2e668cbc66844') build() { cd "${srcdir}/${pkgname}-${pkgver}" find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp + export CXXFLAGS="$CXXFLAGS -fpermissive" ./configure --prefix=/usr \ --with-frontend=qt4 --without-included-boost make diff --git a/extra/madwifi-utils/PKGBUILD b/extra/madwifi-utils/PKGBUILD deleted file mode 100644 index ca961c3d0..000000000 --- a/extra/madwifi-utils/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 70649 2010-02-27 18:41:30Z tpowa $ -# Originally by kleptophobiac <kleptophobiac@gmail.com> -# Modified by James Rayner for the repositories <iphitus@gmail.com> - -pkgname=madwifi-utils -pkgver=0.9.4.4119 -_kernver=2.6.33-ARCH -pkgrel=1 -pkgdesc="Userspace tools of madwifi drivers for Atheros wireless chipsets." -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://madwifi-project.org" -depends=('wireless_tools') -makedepends=('sharutils') -provides=("madwifi-ng-utils") -conflicts=("madwifi-ng-utils") -replaces=("madwifi-ng-utils") -# subversion source: svn checkout http://madwifi-project.org/svn/madwifi/trunk madwifi -source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2 - #http://downloads.sourceforge.net/sourceforge/madwifi/madwifi-$pkgver.tar.gz - ) - -build() { - [ "${CARCH}" == "i686" ] && export ARCH=i386 - - export KERNELPATH=/lib/modules/${_kernver}/build - #cd $startdir/src/madwifi-$pkgver - cd $startdir/src/madwifi - make tools|| return 1 - make DESTDIR=$startdir/pkg \ - BINDIR=/usr/bin \ - MANDIR=/usr/share/man \ - install-tools -} -md5sums=('a720a20264b312c0ff906b9888bb49ae') diff --git a/extra/madwifi/PKGBUILD b/extra/madwifi/PKGBUILD deleted file mode 100644 index 1075c1476..000000000 --- a/extra/madwifi/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 115939 2011-03-22 14:09:32Z tpowa $ -# Originally by kleptophobiac <kleptophobiac@gmail.com> -# Modified by James Rayner for the repositories <iphitus@gmail.com> - -_kernver=2.6.38-ARCH - -pkgname=madwifi -pkgver=0.9.4.4136 -pkgrel=2 -pkgdesc="Madwifi drivers for Atheros wireless chipsets. For stock arch 2.6 kernel" -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://madwifi-project.org" -depends=('madwifi-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39') -makedepends=('kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39') -makedepends=('sharutils') -install=madwifi-ng.install -# subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi -source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2 - #http://downloads.sourceforge.net/madwifi/madwifi-${pkgver}.tar.gz - ) -options=(!strip) - -build() { - [ "${CARCH}" = "i686" ] && export ARCH=i386 - - #cd $startdir/src/$pkgname-$pkgver - cd $startdir/src/$pkgname - sed -i -e 's/-Werror//g' Makefile.inc - make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules -} - -package() { - cd $startdir/src/$pkgname - make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules \ - DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver install-modules - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install - - # install to wireless kernel directory - mkdir -p $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi - mv $startdir/pkg/lib/modules/$_kernver/net/* $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi - rm -r $startdir/pkg/lib/modules/$_kernver/net/ - # gzip -9 modules - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; -} -md5sums=('f705acf5597ebe070efeaeb6c330748f') diff --git a/extra/madwifi/kernel-2.6.30.patch b/extra/madwifi/kernel-2.6.30.patch deleted file mode 100644 index f844668de..000000000 --- a/extra/madwifi/kernel-2.6.30.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ath/if_athvar.h~ 2009-06-13 09:38:53.000000000 +0200 -+++ ath/if_athvar.h 2009-06-13 09:38:53.000000000 +0200 -@@ -103,11 +103,6 @@ - /* - * Guess how the interrupt handler should work. - */ --#if !defined(IRQ_NONE) --typedef void irqreturn_t; --#define IRQ_NONE --#define IRQ_HANDLED --#endif /* !defined(IRQ_NONE) */ - - #ifndef SET_MODULE_OWNER - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) diff --git a/extra/madwifi/madwifi-ng.install b/extra/madwifi/madwifi-ng.install deleted file mode 100644 index 8681b53ed..000000000 --- a/extra/madwifi/madwifi-ng.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - KERNEL_VERSION='2.6.38-ARCH' - depmod -ae $KERNEL_VERSION > /dev/null 2>&1 -} - -post_upgrade() { - KERNEL_VERSION='2.6.38-ARCH' - depmod -ae $KERNEL_VERSION > /dev/null 2>&1 -} - -post_remove() { - KERNEL_VERSION='2.6.38-ARCH' - depmod -ae $KERNEL_VERSION > /dev/null 2>&1 -} diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 386ec0f3b..5b83cd885 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124863 2011-05-24 19:57:14Z giovanni $ +# $Id: PKGBUILD 124985 2011-05-25 16:04:09Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: 03/08/04 <lefungus@altern.org> pkgname=mkvtoolnix pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Set of tools to create, edit and inspect Matroska files" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/extra/moc/ChangeLog b/extra/moc/ChangeLog deleted file mode 100644 index d494c5280..000000000 --- a/extra/moc/ChangeLog +++ /dev/null @@ -1,32 +0,0 @@ -2010-02-25 Eric Belanger <eric@archlinux.org> - - * moc 2.5.0_alpha4-2 - * Added wavpack and modplug support (close FS#18449) - -2010-01-24 Eric Belanger <eric@archlinux.org> - - * moc 2.5.0_alpha4-1 - * Upstream update to unstable series - * Fixed aac support (close FS#13164) - -2009-11-07 Eric Belanger <eric@archlinux.org> - - * Fixed optdepends array syntax (close FS#16053) - -2009-03-21 Eric Belanger <eric@archlinux.org> - - * moc 2.4.4-3 - * Added missing libid3tag depends (close FS#13819) - -2009-03-07 Eric Belanger <eric@archlinux.org> - - * moc 2.4.4-2 - * Added patch to fix playback of WMA files - -2009-01-11 Eric Belanger <eric@archlinux.org> - - * moc 2.4.4-1 - * Upstream update - * Added libtool depends - * Replaced install scriptlet by optdepends - * Added ChangeLog diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD index fa02064c6..52a4e8806 100644 --- a/extra/most/PKGBUILD +++ b/extra/most/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 57012 2009-10-31 08:10:58Z allan $ +# $Id: PKGBUILD 125648 2011-05-27 17:52:54Z stephane $ # Maintainer: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=most pkgver=5.0.0a -pkgrel=2 +pkgrel=3 pkgdesc="A terminal pager similar to 'more' and 'less'" arch=('i686' 'x86_64' 'mips64el') depends=('slang') license=('GPL') url="ftp://space.mit.edu/pub/davis/most/" -source=(ftp://space.mit.edu/pub/davis/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('30f2131b67f61716f6fe1f65205da48b') +source=(ftp://space.mit.edu/pub/davis/${pkgname}/${pkgname}-${pkgver}.tar.gz most-debian.patch) +sha1sums=('99eedb7169754b9a47c7755ac48949d76531e3b2' + '937796040c69bae3bf735fa3cd734775c582e7d0') + build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../most-debian.patch + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=$pkgdir install } diff --git a/extra/most/most-debian.patch b/extra/most/most-debian.patch index 4387420e8..292c83b5a 100644 --- a/extra/most/most-debian.patch +++ b/extra/most/most-debian.patch @@ -1,1655 +1,2313 @@ ---- most-4.10.2.orig/most.1 -+++ most-4.10.2/most.1 -@@ -134,7 +134,7 @@ - Use this switch when you want to view files - containing 8 bit characters. - .I most --will display the file 16 bytes per line in hexidecimal notation. -+will display the file 16 bytes per line in hexadecimal notation. - A typical line looks like: - .IP - .Ds -@@ -185,12 +185,13 @@ - This option is meaningful only when used with the - .B \-v - option. -+.TP - .BI + lineno - Start up at - .IR lineno . +--- most-5.0.0a.orig/lesskeys.rc ++++ most-5.0.0a/lesskeys.rc +@@ -57,3 +57,8 @@ + setkey goto_mark "'" + setkey find_file "E" + setkey edit "v" ++setkey bob "^[[7~" ++setkey eob "^[[8~" ++setkey bob "^[OH" ++setkey eob "^[OF" ++ +--- most-5.0.0a.orig/most.1 ++++ most-5.0.0a/most.1 +@@ -203,7 +203,7 @@ + .TP + .B +u + Force UTF-8 mode. By default most will use the current locale to +-determine if UTF-8 mode shoul be used. The ++determine if UTF-8 mode should be used. The + .B +u + and + .B \-u +@@ -224,20 +224,28 @@ + Start up at the line containing the first occurrence of + .IR string . + .SH "COMMAND USAGE" +-The commands take effect immediately; it is not necessary to type a +-carriage return. +-.PP +-In the following commands, +-.I i +-is a numerical argument +-(1 by default). +-.TP +-.BR SPACE ", " CTRL-D ", " NEXT_SCREEN +-Display another windowful, or jump +-.I i +-windowfuls if +-.I i +-is specified. ++Some commands have an optional numeric argument ++.I id ++,entered before the command. If not given, the ++default value of ++.I i ++is 1. ++.PP ++Commands take effect immediately; typing a ++.I RETURN ++after isn't necessary or correct. (Besides, ++.I RETURN ++itself is a command.) ++.PP ++Example: to go down one line, press the ++.I DOWN_ARROW ++key. To go down 20 lines, press ++.I 2 ++then ++.I 0 ++then the ++.I DOWN_ARROW ++key. + .TP + \fBRETURN\fR, \fBDOWN_ARROW\fR, \fBV\fR, \fBCTRL-N\fR + Display another line, or +@@ -341,7 +349,7 @@ + .PD + Set a mark on the current line for later reference. .TP --.B +c --Make search case sensitive. -+.B -c -+Make searches case sensitive. - By default, they are not. +-.BR "INSERT_HERE, CTRL-X CTRL-X, COMMA, CTRL-K RETURN, GOLD PERIOD" ++.BR "INSERT_HERE" ", " "CTRL-X CTRL-X" ", " "COMMA" ", " "CTRL-K RETURN" ", " "GOLD PERIOD" + Set a mark on the current line but return to previous mark. + This allows the user to toggle back and forth between two positions + in the file. +@@ -355,7 +363,7 @@ + .BR "CTRL-X 2" ", " "CTRL-W 2" ", " "GOLD X" + Split this window in half. .TP - .B +d -@@ -482,7 +483,7 @@ - descriptors that represent the file name and line number, - respectively. For example, if JED is your editor, then set - .B MOST_EDITOR --to 'jed %s -g %d'. -+to 'jed %s -g %d'. This will only work where the %s preceeds the %d. +-.BR "CTRL-X o" ", " "CTRL-W o" ", " o ", " GOLD UP ", " GOLD DOWN ++.BR "CTRL-X o" ", " "CTRL-W o" ", " o ", " "GOLD UP" ", " "GOLD DOWN" + Move to other window. .TP - .B MOST_HELP - This variable may be used to specify an alternate help file. -@@ -496,7 +497,7 @@ - .I most.rc - on other systems. + .BR "CTRL-X 0" ", " "CTRL-W 0" ", " "GOLD V" +@@ -506,13 +514,15 @@ + .B MOST_INITFILE + Set this variable to specify the initialization file to load during + startup. The default action is to load the system configuration file +-and then a personal configuration file called +-.I .mostrc +-on Unix, and +-.I most.rc +-on other systems. ++from ++.I /etc/most.conf ++and then a personal configuration file located at ++.I $HOME/.mostrc ++. .SH CONFIGURATION FILE SYNTAX --When most starts up, it tries to read a system confiuration file and -+When most starts up, it tries to read a system configuration file and +-When most starts up, it tries to read a system configuration file and ++When ++.I most ++starts up, it tries to read a system configuration file and then a personal configuration file. These files may be used to specify keybindings and colors. .PP ---- most-4.10.2.orig/src/buffer.c -+++ most-4.10.2/src/buffer.c -@@ -44,10 +44,10 @@ - - Most_Buffer_Type *Most_Buf; - --int Most_Num_Lines; -+long long Most_Num_Lines; - --unsigned int Most_C_Offset; --int Most_C_Line; -+unsigned long long Most_C_Offset; -+long long Most_C_Line; - - static unsigned char *beg_of_line1(void) - { -@@ -61,24 +61,29 @@ - { - if (*pos == '\n') - { -- pos--; -- while ((pos > Most_Beg) -- && (*pos != '\n')) -+ pos--; /* Skip back the new-line. */ -+ /* This block is UTF-8 safe, because it only scans the -+ buffer for a new-line, and doesn't count -+ characters. */ -+ while ((pos > Most_Beg) && (*pos != '\n')) - pos--; - -- if (*pos != '\n') return pos; -+ if (*pos != '\n') return Most_Beg; -+ /* from here on *pos == '\n' */ - if (pos + 1 != cpos) - return pos + 1; - } - } -- else pos--; -+ else -+ pos = SLutf8_bskip_char(Most_Beg, pos); - - if (*pos != '\n') - { -- while ((pos > Most_Beg) -- && (*pos != '\n')) -+ /* This block is UTF-8 safe. See comment above. */ -+ while ((pos > Most_Beg) && (*pos != '\n')) - pos--; - if (*pos != '\n') return Most_Beg; -+ /* from here on *pos == '\n' */ - return pos + 1; - } - -@@ -93,55 +98,6 @@ - return pos; - } - -- --static unsigned char *forward_columns (unsigned char *b, unsigned char *e, unsigned int num_cols) --{ -- unsigned int col = 0; -- -- while ((b < e) -- && (col < num_cols)) -- { -- unsigned char ch = *b++; -- if (((ch >= ' ') && (ch < 0x7F)) -- || (ch >= SLsmg_Display_Eight_Bit)) -- { -- col++; -- continue; -- } -- -- if ((ch == '\b') || (ch == '\t') || (ch == '\r')) -- switch (ch) -- { -- case '\b': -- if (Most_V_Opt == 0) -- { -- if (col > 0) col--; -- } -- else col += 2; -- break; -- -- case '\r': -- if (Most_V_Opt == 0) -- col = 0; -- else -- col += 2; -- break; -- -- case '\t': -- if (Most_T_Opt == 0) -- col = Most_Tab_Width * (col/Most_Tab_Width + 1); -- else -- col += 2; -- break; -- } -- else if (ch & 0x80) -- col += 3; -- else -- col += 2; -- } -- return b; --} -- - /* does not move point */ - static unsigned char *end_of_line1(void) - { -@@ -164,6 +120,9 @@ - - if (*pos != '\n') - { -+ /* This block is UTF-8 safe, because it only scans the buffer -+ for a new-line, and doesn't count characters. */ -+ - n = pmax - pos; - n2 = n % 8; - pmax = pos + (n - 8); -@@ -215,7 +174,7 @@ - ncols = SLtt_Screen_Cols-1; - while (1) - { -- unsigned char *next_b = forward_columns (b, e, ncols); -+ unsigned char *next_b = most_forward_columns (b, e, ncols, 1); - if ((next_b == e) || (next_b == b)) - break; - -@@ -237,11 +196,12 @@ - return e; - - if (b == NULL) b = most_beg_of_line (); -- b = forward_columns (b, e, SLtt_Screen_Cols-1); -+ b = most_forward_columns (b, e, SLtt_Screen_Cols-1, 1); - - /* Do not wrap the line if the last character falls on the last column - * of the display. - */ -+ /* FIXME potential bug if dealing with multi-byte char. */ - if ((b + 1 <= e) - && (b + 1 < Most_Eob) - && (b[1] == '\n')) -@@ -250,10 +210,10 @@ - return b; - } - --int most_forward_line(int save) -+long long most_forward_line(long long save) - { -- int m; -- register int n = save; -+ long long m; -+ register long long n = save; - unsigned char *p; - unsigned char *pmax; - -@@ -346,14 +306,14 @@ - } - - /* Count lines in the region. A half line counts as 1 */ --int most_count_lines(unsigned char *beg, unsigned char *end) -+long long most_count_lines(unsigned char *beg, unsigned char *end) - { -- int save_line, n; -+ long long save_line, n; - unsigned char *save_beg, *save_eob; -- unsigned int save_pos; -+ unsigned long long save_pos; - int dn = 1000; - -- if (Most_B_Opt) return(1 + (int)(end - beg) / 16); -+ if (Most_B_Opt) return(1 + (long long)(end - beg) / 16); - - save_line = Most_C_Line; save_beg = Most_Beg; save_eob = Most_Eob; - save_pos = Most_C_Offset; -@@ -371,9 +331,9 @@ - return(n); - } - --void most_goto_line(int line) -+void most_goto_line(long long line) - { -- int dif_c, dif_b,dif_t; -+ long long dif_c, dif_b,dif_t; - - if (line < 1) line = 1; - most_read_to_line(line); -@@ -420,7 +380,7 @@ - } - - /* return line the point is on without the final '\n's */ --int most_extract_line(unsigned char **beg, unsigned char **end) -+long long most_extract_line(unsigned char **beg, unsigned char **end) - { - *beg = most_beg_of_line(); - *end = end_of_line (*beg); -@@ -428,12 +388,12 @@ - return 0; - } - --int most_what_line(unsigned char *pos) -+long long most_what_line(unsigned char *pos) - { -- unsigned int save_pos; -- int save_line, dir; -- register int dif_c, dif_b,dif_t; -- int ret; -+ unsigned long long save_pos; -+ long long save_line, dir; -+ register long long dif_c, dif_b,dif_t; -+ long long ret; - - if (Most_B_Opt) - { -@@ -517,7 +477,7 @@ - } - - /* given a buffer position, find the line and column */ --void most_find_row_column(unsigned char *pos, int *r, int *c) -+void most_find_row_column(unsigned char *pos, long long *r, long long *c) - { - unsigned char *beg; - unsigned int save_offset; -@@ -545,7 +505,10 @@ - /* Now we have found the line it is on so.... */ - beg = most_beg_of_line(); - *c = 1; -- while (beg++ < pos) *c = *c + 1; -+ if (Most_UTF8_Mode) -+ while ((beg = SLutf8_skip_char(beg, pos)) < pos) *c = *c + 1; -+ else -+ while (beg++ < pos) *c = *c + 1; - Most_C_Line = save_line; - Most_C_Offset = save_offset; - } ---- most-4.10.2.orig/src/buffer.h -+++ most-4.10.2/src/buffer.h -@@ -23,12 +23,12 @@ - - extern Most_Buffer_Type *Most_Buf; - extern unsigned char *Most_Beg, *Most_Eob; --extern int Most_Num_Lines; -+extern long long Most_Num_Lines; - - /* Offset of current position from beginning of buffer */ --extern unsigned int Most_C_Offset; -+extern unsigned long long Most_C_Offset; - --extern int Most_C_Line; -+extern long long Most_C_Line; - /* - * Current line number. If at the beginning of the buffer, it is 1. If - * we are at the last point of the buffer it is the number of lines. -@@ -37,26 +37,26 @@ - /* This routine does not move the point */ - extern unsigned char *most_beg_of_line(void); - --extern int most_forward_line(int); -+extern long long most_forward_line(long long); - /* This routine moves the point forward n lines. n can be negative. - It returns the number moved. */ - --extern void most_goto_line(int); -+extern void most_goto_line(long long); - /* Move the point somewhere on the nth line of the buffer returning - C_POS */ - --extern int most_what_line(unsigned char *); -+extern long long most_what_line(unsigned char *); - /* return the line number of position 'argument'. Does not move point */ - - /* count the number of lines in the region delimited by beg and end. - Counts lines from beg up to end but does not count end. - Does not move point. */ --extern int most_count_lines(unsigned char *, unsigned char *); --extern int most_extract_line(unsigned char **, unsigned char **); -+extern long long most_count_lines(unsigned char *, unsigned char *); -+extern long long most_extract_line(unsigned char **, unsigned char **); - - extern Most_Buffer_Type *most_switch_to_buffer(Most_Buffer_Type *); - extern Most_Buffer_Type *most_create_buffer(char *); --extern void most_find_row_column(unsigned char *, int *, int *); -+extern void most_find_row_column(unsigned char *, long long *, long long *); - - #endif - ---- most-4.10.2.orig/src/keym.c -+++ most-4.10.2/src/keym.c -@@ -228,7 +228,7 @@ - static void goto_percent_cmd(void) - { - unsigned char *pos; -- int n; -+ long long n; - - if (Most_Digit_Arg != (int *) NULL) n = *Most_Digit_Arg; - else -@@ -282,7 +282,7 @@ - - static void find_next_cmd(void) - { -- int col, line, n = 1; -+ long long col, line, n = 1; - unsigned long ofs; - - if (Most_Digit_Arg != NULL) n = *Most_Digit_Arg; -@@ -309,7 +309,7 @@ - #else - "Search: ", - #endif -- Most_Search_Str, -+ (char *) Most_Search_Str, - MOST_SEARCH_BUF_LEN - ) == -1) return; - Most_Curs_Offset = Most_C_Offset; -@@ -325,7 +325,7 @@ - #else - "Search Backwards: ", - #endif -- Most_Search_Str, -+ (char *) Most_Search_Str, - MOST_SEARCH_BUF_LEN) == -1) return; - find_next_cmd(); - } ---- most-4.10.2.orig/src/line.c -+++ most-4.10.2/src/line.c -@@ -87,8 +87,7 @@ - while (b < end) - { - ch = *b++; -- if (((ch >= ' ') && (ch < 0x7F)) -- || (ch >= SLsmg_Display_Eight_Bit)) -+ if (most_isprint(ch)) - { - *s++ = ch; - continue; -@@ -108,103 +107,156 @@ - - if (end > Most_Eob) end = Most_Eob; - -- sprintf (buf, "0x%08X: ", Most_C_Offset); -+ sprintf (buf, "0x%08llX: ", Most_C_Offset); - ascii_format_line (beg, end, buf + 12); - SLsmg_write_string (buf); - SLsmg_erase_eol (); - } - --static int most_analyse_line(unsigned char *begg, unsigned char *endd, -- char *out, char *attributes) -+int most_isprint(unsigned char ch) - { -- unsigned char *beg, *end; -- unsigned int min_col, max_col; -- unsigned int i, i_max; -+ /* Can this be directly replaced with isprint? */ -+ return (ch >= ' ' && ch < 0x7F) || ch >= SLsmg_Display_Eight_Bit; -+} -+ -+static void most_analyse_line(unsigned char *beg, unsigned char *end, -+ unsigned char *out, char *attributes) -+{ -+ unsigned char *pout; -+ char* pattributes; -+ -+ /* Holds the number of columns for the current character counting -+ * from the left margin (in contrast to the leftmost visible -+ * column). -+ */ -+ unsigned int col; -+ -+ /* Holds the number of the column up to which to apply the -+ * current/following formatting. Only meaningful when format_rlim > i. -+ */ -+ unsigned int format_rlim; - -- beg = begg; -- end = endd; -- i = i_max = 0; -- min_col = Most_Column - 1; -- max_col = min_col + SLtt_Screen_Cols; -+ beg = most_forward_columns(beg, end, Most_Column - 1, 0); -+ pout = out; -+ pattributes = attributes; -+ col = format_rlim = 0; - - while (beg < end) - { - char attr = ' '; -- unsigned char ch; -+ unsigned char ch = *beg++; - -- if ('\n' == (ch = *beg++)) -+ if ('\n' == ch) - break; - - if ((ch == '\r') && (Most_V_Opt == 0)) - { -- if (i > i_max) i_max = i; -- i = 0; -+ if (col > format_rlim) format_rlim = col; -+ col = 0; - continue; - } - - if ((ch == '\b') && (Most_V_Opt == 0)) - { -- if (i > i_max) i_max = i; -- if (i > 0) -- i--; -+ if (col > format_rlim) format_rlim = col; -+ if (col > 0) -+ { -+ if (Most_UTF8_Mode) -+ { -+ SLwchar_Type wc; -+ pout = SLutf8_bskip_char(out, pout); -+ if (SLutf8_decode(pout, pout + SLUTF8_MAX_MBLEN, &wc, NULL)) -+ { -+ unsigned int char_len = SLwchar_wcwidth(wc); -+ if (char_len > 1) -+ col -= char_len - 1; -+ } -+ } -+ else -+ pout--; -+ pattributes--; -+ col--; -+ } - continue; - } - -- if (i < i_max) /* overstrike */ -+ if (col < format_rlim) /* overstrike */ - { - attr = 'b'; -- if ((i >= min_col) && (i < max_col)) -+ if (col < SLtt_Screen_Cols) - { -- if (out[i-min_col] == '_') -+ if (*pout == '_') - attr = 'u'; - else if (ch == '_') - { - attr = 'u'; -- ch = out[i - min_col]; -+ ch = *pout; - } - } - if (ch == ' ') - { -- i++; -+ col++; - continue; - } - /* drop */ - } -- -- if ((ch >= ' ') && (ch < 0x7F)) -- { -- if ((i >= min_col) && (i < max_col)) -+ -+ if (Most_UTF8_Mode) { -+ unsigned char *prev = --beg; -+ SLwchar_Type wc; -+ unsigned int len; -+ -+ if (SLutf8_decode(beg, end, &wc, NULL)) -+ { -+ unsigned int char_len = SLwchar_wcwidth(wc); -+ if (char_len > 1) -+ col += char_len - 1; -+ } -+ -+ beg = SLutf8_skip_char(beg, end); -+ len = beg - prev; -+ -+ if (len > 1) { -+ /* Non-ASCII char, display it. */ -+ if (col < SLtt_Screen_Cols) - { -- out[i-min_col] = ch; -- attributes[i-min_col] = attr; -+ memcpy(pout, prev, len); -+ pout += len; -+ *pattributes++ = attr; - } -- i++; -+ col++; - continue; -- } -- -- if (ch >= SLsmg_Display_Eight_Bit) -+ } -+ } -+ -+ if (most_isprint(ch)) - { -- if ((i >= min_col) && (i < max_col)) -+ if (col < SLtt_Screen_Cols) - { -- out[i-min_col] = ch; -- attributes[i-min_col] = attr; -+ *pout++ = ch; -+ *pattributes++ = attr; - } -- i++; -+ col++; - continue; - } - - if ((ch == '\t') && (Most_T_Opt == 0) && (Most_Tab_Width)) - { -- -- int nspaces = Most_Tab_Width * (i/Most_Tab_Width + 1) - i; -+ /* Tab expansion must take into consideration the -+ * leftmost visible column. However, variable col holds the -+ * number of columns from the left margin and must be -+ * corrected. -+ */ -+ int vis_col = col + Most_Column - 1; -+ int nspaces = Most_Tab_Width - (vis_col % Most_Tab_Width); - while (nspaces > 0) - { -- if ((i >= min_col) && (i < max_col)) -+ if (col < SLtt_Screen_Cols) - { -- out[i-min_col] = ' '; -- attributes[i-min_col] = attr; -+ *pout++ = ' '; -+ *pattributes++ = attr; - } -- i++; -+ col++; - nspaces--; - } - continue; -@@ -212,36 +264,36 @@ - - if (ch & 0x80) - { -- if ((i >= min_col) && (i < max_col)) -+ if (col < SLtt_Screen_Cols) - { -- out[i-min_col] = '~'; -- attributes[i-min_col] = attr; -+ *pout++ = '~'; -+ *pattributes++ = attr; - } -- i++; -+ col++; - ch &= 0x7F; - /* drop */ - } - -- if ((i >= min_col) && (i < max_col)) -+ if (col < SLtt_Screen_Cols) - { -- out[i-min_col] = '^'; -- attributes[i-min_col] = attr; -+ *pout++ = '^'; -+ *pattributes++ = attr; - } -- i++; -+ col++; - - if (ch == 0x7F) ch = '?'; - else ch += '@'; - -- if ((i >= min_col) && (i < max_col)) -+ if (col < SLtt_Screen_Cols) - { -- out[i-min_col] = ch; -- attributes[i-min_col] = attr; -+ *pout++ = ch; -+ *pattributes++ = attr; - } -- i++; -+ col++; - } - -- if (i < i_max) -- i = i_max; -+ if (col < format_rlim) -+ col = format_rlim; - - /* Now add "..." if selective display. To do that, the next line needs to - * be dealt with to determine whether or not it will be hidden. -@@ -249,7 +301,7 @@ - if (Most_Selective_Display - && (Most_W_Opt == 0) - && (beg < Most_Eob) -- && ((i >= min_col) && (i < max_col))) -+ && (col < SLtt_Screen_Cols)) - { - if (*beg == '\n') beg++; - -@@ -260,37 +312,29 @@ - if ((beg >= Most_Eob) || (*beg == '\n') - || (most_apparant_distance(beg) >= Most_Selective_Display)) - { -- i_max = i + 3; -- while (i < i_max) -+ /* Add an ellipsis, if they fit on the screen. */ -+ int rlimit = col + 3; -+ while (col < rlimit) - { -- if (i < max_col) -+ if (col < SLtt_Screen_Cols) - { -- out[i] = '.'; -- attributes[i] = ' '; -+ *pout++ = '.'; -+ *pattributes++ = ' '; - } -- i++; -+ col++; - } - } - } -- -- i_max = i; - -- if (i < min_col) -- i = min_col; -- else if (i >= max_col) -- i = max_col; -- -- i -= min_col; -- -- out[i] = 0; -- attributes[i] = 0; -- return i_max; -+ *pout = 0; -+ *pattributes = 0; - } - --static void output_with_attr (unsigned char *out, unsigned char *attr) -+static void output_with_attr (unsigned char *out, char *attr) - { -- unsigned char at, ch, lat; -+ unsigned char at, lat; - unsigned char *p = out; -+ unsigned char *pmax = p + strlen((char *) p); - - if (Most_V_Opt) - { -@@ -299,7 +343,7 @@ - } - - lat = ' '; -- while ((ch = *p) != 0) -+ while (p < pmax) - { - if (lat != *attr) - { -@@ -321,7 +365,7 @@ - else most_tt_normal_video (); - lat = at; - } -- p++; -+ p = SLutf8_skip_char(p, pmax); - attr++; - } - -@@ -340,10 +384,11 @@ - void most_display_line (void) +@@ -520,13 +530,13 @@ + .PP + .B setkey function-name key-sequence + .PP +-The ++The + .I setkey + command requires two arguments. The + .I function-name + argument specifies the function that is to be executed as a response + to the keys specified by the +-.I key-sequence ++.I key-sequence + argument are pressed. For example, + .PP + setkey "up" "^P" +@@ -544,9 +554,9 @@ + .PP + unsetkey "^F" + .PP +-Colors may be defined through the use of the ++Colors may be defined through the use of the + .I color +-keyword in the the configuration file using the syntax: ++keyword in the configuration file using the syntax: + .PP + .B color OBJECT-NAME FOREGROUND-COLOR BACKGROUND-COLOR + .PP +@@ -589,19 +599,19 @@ + for valuable comments and criticisms. + I would especially like to thank those individuals + who have contributed code to +-.IR most. ++.IR most . + .PP + Mats Akerberg, Henk D. Davids, Rex O. Livingston, and Mark + Pizzolato contributed to the early VMS versions of +-.IR most. ++.IR most . + In particular, Mark worked on it to get it ready for DECUS. + .PP + Foteos Macrides <MACRIDES@SCI.WFEB.EDU> adapted + .IR most +-for use in ++for use in + .IR cswing + and +-.IR gopher. ++.IR gopher . + A few features of the present version of + .IR most + was inspired from his work. +@@ -613,7 +623,7 @@ + automatic detection of zipped files. + .PP + I would also like to thank Shinichi Hama for his valuable criticisms of +-.IR most. ++.IR most . + .PP + Javier Kohen was instrumental in the support for UTF-8. + .PP +--- most-5.0.0a.orig/src/file.h ++++ most-5.0.0a/src/file.h +@@ -22,6 +22,7 @@ + #define MOST_MAX_FILES 4096 + #define MOST_GUNZIP_POPEN_FORMAT "gzip -dc \"%s\"" + #define MOST_BZIP2_POPEN_FORMAT "bzip2 -dc \"%s\"" ++#define MOST_LZMA_POPEN_FORMAT "lzma -dc '%s'" + + extern void most_reread_file (void); + extern void most_read_to_line (int); +--- most-5.0.0a.orig/src/file.c ++++ most-5.0.0a/src/file.c +@@ -77,7 +77,7 @@ + static int open_compressed_file(char *file, int mode, int *size) { - unsigned char *beg, *end; -- unsigned int len; -+#if 0 - unsigned char dollar; -+#endif - static unsigned char *line; -- static unsigned char *attr; -+ static char *attr; - static unsigned int line_len; - - if (Most_B_Opt) -@@ -357,37 +402,43 @@ - if (line_len < (unsigned int)(SLtt_Screen_Cols + 1) * SLUTF8_MAX_MBLEN) - { - SLfree ((char *) line); -- SLfree ((char *) attr); -+ SLfree (attr); - - line_len = (SLtt_Screen_Cols + 1) * SLUTF8_MAX_MBLEN; - - if ((NULL == (line = (unsigned char *) SLmalloc (line_len))) -- || (NULL == (attr = (unsigned char *) SLmalloc (line_len)))) -+ || (NULL == (attr = SLmalloc (line_len)))) - most_exit_error ("Out of memory"); - } + int fd; +- char buf[4], cmdbuf[2*MAX_PATHLEN]; ++ char buf[6], cmdbuf[2*MAX_PATHLEN]; + struct stat st; - (void) most_extract_line (&beg, &end); + # ifdef O_BINARY +@@ -97,7 +97,7 @@ -- len = most_analyse_line(beg, end, (char *) line, (char *) attr); -+ most_analyse_line(beg, end, line, attr); + if (fd < 0) return fd; -+#if 0 -+ /* Currently the dollar sign is not always being written at the -+ rightmost column when displaying multi-byte characters. */ - dollar = 0; - if (Most_W_Opt) - { -- if ((end < Most_Eob) -- && (*end != '\n')) -- dollar = '\\'; -+ if ((end < Most_Eob) -+ && (*end != '\n')) -+ dollar = '\\'; - } - else if (len > (unsigned int) SLtt_Screen_Cols + (Most_Column - 1)) - dollar = '$'; -- -+ - if (dollar) +- if (4 == read(fd, buf, 4)) ++ if (6 == read(fd, buf, 6)) { -- line[SLtt_Screen_Cols-1] = dollar; -- attr[SLtt_Screen_Cols-1] = ' '; -- line[SLtt_Screen_Cols] = 0; -- attr[SLtt_Screen_Cols] = 0; -+ unsigned char *pline = -+ most_forward_columns(line, line + line_len, SLtt_Screen_Cols-1, 1); -+ *pline = dollar; -+ *(pline+1) = 0; -+ attr[SLtt_Screen_Cols-1] = ' '; -+ attr[SLtt_Screen_Cols] = 0; - } -- -+#endif -+ - output_with_attr (line, attr); - SLsmg_erase_eol (); - } -@@ -398,21 +449,34 @@ - int most_apparant_distance (unsigned char *pos) - { - int i; -- unsigned char *save_pos, ch; -+ unsigned char *save_pos, *beg, ch; - unsigned int save_offset; + char *cmd = NULL; - save_offset = Most_C_Offset; - save_pos = pos; - Most_C_Offset = (unsigned int) (pos - Most_Beg); -- pos = most_beg_of_line(); -+ beg = pos = most_beg_of_line(); - Most_C_Offset = save_offset; - - i = 0; - while (pos < save_pos) - { -- ch = *pos++; -- if (((ch >= ' ') && (ch < 0x7F)) -- || (ch >= SLsmg_Display_Eight_Bit)) -+ ch = *pos; -+ -+ if (Most_UTF8_Mode) { -+ unsigned char *prev = pos; -+ int len; -+ pos = SLutf8_skip_char(pos, save_pos); -+ len = pos - prev; -+ if (len > 1) { -+ i++; -+ continue; -+ } -+ } else { -+ pos++; -+ } -+ -+ if (most_isprint(ch)) +@@ -113,6 +113,13 @@ { - i++; - continue; -@@ -420,7 +484,13 @@ - - if (!Most_V_Opt && (ch == '\b')) - { -- if (i > 0) i--; -+ if (i > 0) -+ { -+ if (Most_UTF8_Mode) -+ i -= pos - SLutf8_bskip_char(beg, pos); -+ else -+ i--; -+ } + cmd = MOST_BZIP2_POPEN_FORMAT; } - else if (!Most_V_Opt && (ch == '\015')) /* ^M */ - { -@@ -439,3 +509,95 @@ - } - return i; - } -+ -+/* -+ * Returns a pointer to the num_cols'th character after the one -+ * pointed at b. Invisible character runs are not counted toward this -+ * limit, i.e. strings that represent attributes, such as "_\b" for -+ * underlines. -+ * -+ * If multi_column is non-zero, characters spanning more than one -+ * column will add their extra width to the column count. -+ * -+ * If there the end of the buffer is reached, as delimited by argument -+ * e, then e is returned. -+ */ -+unsigned char *most_forward_columns (unsigned char *beg, unsigned char *e, unsigned int num_cols, int multi_column) -+{ -+ unsigned int col = 0; -+ unsigned int prev_width = 1; -+ unsigned char* b = beg; -+ -+ while ((b < e) -+ && ((col < num_cols) -+ || (*b == '\b') -+ || (*b == '\r'))) -+ { -+ unsigned char ch = *b; -+ -+ if (Most_UTF8_Mode) ++ else if ((buf[0] == (char) 0xff) ++ && (buf[1] == 'L') && (buf[2] == 'Z') ++ && (buf[3] == 'M') && (buf[4] == 'A') ++ && (buf[5] == (char) 0x00)) + { -+ unsigned char *prev = b; -+ int len; -+ b = SLutf8_skip_char(b, e); -+ len = b - prev; -+ if (len > 1) -+ { -+ if (multi_column) -+ { -+ SLwchar_Type wc; -+ if (SLutf8_decode(prev, e, &wc, NULL)) -+ col += prev_width = SLwchar_wcwidth(wc); -+ } -+ else -+ col++; -+ continue; -+ } ++ cmd = MOST_LZMA_POPEN_FORMAT; + } -+ else -+ b++; -+ -+ if (most_isprint(ch)) -+ { -+ col++; -+ prev_width = 1; -+ continue; -+ } -+ -+ if ((ch == '\b') || (ch == '\t') || (ch == '\r')) -+ switch (ch) -+ { -+ case '\b': -+ if (Most_V_Opt == 0) -+ { -+ if (col > 0) col -= prev_width; -+ } -+ else col += 2; -+ break; -+ -+ case '\r': -+ if (Most_V_Opt == 0) -+ col = 0; -+ else -+ col += 2; -+ break; + + if (cmd != NULL) + { +--- most-5.0.0a.orig/autoconf/config.guess ++++ most-5.0.0a/autoconf/config.guess +@@ -1,9 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++# Free Software Foundation, Inc. + +-timestamp='2005-04-22' ++timestamp='2009-12-30' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,23 +18,25 @@ + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + +-# Originally written by Per Bothner <per@bothner.com>. +-# Please send patches to <config-patches@gnu.org>. Submit a context +-# diff and a properly formatted ChangeLog entry. + -+ case '\t': -+ if (Most_T_Opt == 0) -+ col = Most_Tab_Width * (col/Most_Tab_Width + 1); -+ else -+ col += 2; /* ^I is two chars long. */ -+ break; -+ } -+ else if (ch & 0x80) -+ col += 3; -+ else -+ col += 2; -+ } ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to <config-patches@gnu.org> and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -53,8 +56,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free ++Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -66,11 +70,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -104,7 +108,7 @@ + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; + trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +@@ -123,7 +127,7 @@ + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ;' ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi@noc.rutgers.edu 1994-08-24) +@@ -158,6 +162,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -166,7 +171,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -196,55 +201,23 @@ + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; +- amd64:OpenBSD:*:*) +- echo x86_64-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- cats:OpenBSD:*:*) +- echo arm-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- luna88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mips64-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; + macppc:MirBSD:*:*) +- echo powerppc-unknown-mirbsd${UNAME_RELEASE} +- exit 0 ;; ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) +@@ -297,40 +270,43 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; ++ exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix +- exit 0 ;; ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe +- exit 0 ;; ++ exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 +- exit 0 ;; ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ exit ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -338,32 +314,51 @@ + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; ++ exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 +- exit 0 ;; ++ exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7 && exit 0 ;; ++ sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -372,10 +367,10 @@ + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 +@@ -387,10 +382,10 @@ + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -401,40 +396,40 @@ + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -458,32 +453,33 @@ + exit (-1); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c \ +- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; ++ exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` +@@ -499,29 +495,29 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +@@ -529,7 +525,7 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build +@@ -544,15 +540,19 @@ + exit(0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) ++ exit ;; ++ *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -565,28 +565,28 @@ + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in +@@ -648,9 +648,19 @@ + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then +- # avoid double evaluation of $set_cc_for_build +- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null ++ eval $set_cc_for_build + -+ /* Last character was too wide. Backstep it. */ -+ if (col > num_cols) -+ b = SLutf8_bskip_char(beg, b); ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 + -+ return b; -+} ---- most-4.10.2.orig/src/line.h -+++ most-4.10.2/src/line.h -@@ -7,5 +7,7 @@ - - extern void most_display_line(void); - extern int most_apparant_distance(unsigned char *); -+extern int most_isprint(unsigned char); -+extern unsigned char *most_forward_columns (unsigned char *, unsigned char *, unsigned int, int); - #endif - ---- most-4.10.2.orig/src/most.c -+++ most-4.10.2/src/most.c -@@ -125,7 +125,7 @@ - ch = *(++str); - if ( ch == '/') - { -- strcpy (Most_Search_Str,++str); -+ strcpy ((char *) Most_Search_Str,++str); - return; - } - -@@ -329,7 +329,8 @@ - - static void do_most (char *file, int start) - { -- int piped, row, col; -+ int piped; -+ long long row, col; - - most_get_cdir(Most_C_Dir); - -@@ -347,7 +348,7 @@ - Most_Curs_Offset = Most_C_Offset; - - if (*Most_Search_Str -- && ((row = most_search (Most_Beg + Most_C_Offset, 1, &col)) > 0)) -+ && ((row = most_search (Most_Beg + Most_C_Offset, 1LL, &col)) > 0)) - most_goto_line(row); - else - { -@@ -455,13 +456,7 @@ - - SLtt_get_terminfo(); - #if SLANG_VERSION >= 20000 --#if 0 -- Most_UTF8_Mode = SLutf8_enable (1); -- if (Most_UTF8_Mode) -- { -- fprintf (stderr, "UTF-8 Mode is in effect\n"); -- } --#endif -+ Most_UTF8_Mode = SLutf8_enable (-1); - #endif - SLtt_Ignore_Beep = 1; - if (No_Colors) ---- most-4.10.2.orig/src/most.h -+++ most-4.10.2/src/most.h -@@ -1,4 +1,5 @@ - #include "config.h" -+#define SLANG_REGEXP - extern int Most_S_Opt; - extern int Most_A_Opt; /* automatically choose -b if necessary */ - extern int Most_V_Opt; /* display control chars */ ---- most-4.10.2.orig/src/search.c -+++ most-4.10.2/src/search.c -@@ -20,6 +20,7 @@ - */ - #include "config.h" - -+#include <ctype.h> - #include <stdio.h> - #include <string.h> - #include <slang.h> -@@ -31,18 +32,18 @@ - #include "display.h" - #include "search.h" - --/* Note!!! The regular expression searches may not work. I have not -- * tested them. -- * FIXME!!! -- */ -- - int Most_Case_Sensitive = 0; --char Most_Search_Str[256]; -+unsigned char Most_Search_Str[256]; - int Most_Search_Dir = 1; - - #include "jdmacros.h" - --#define UPCASE(ch) ((!Most_Case_Sensitive && (ch <= 'z') && (ch >= 'a')) ? (ch - 32) : ch) -+#if SLANG_VERSION < 20000 -+# define NORM_CHAR(ch) ((!Most_Case_Sensitive) ? toupper(ch) : ch) -+# define UPCASE(ch) NORM_CHAR(ch) -+#else -+# define NORM_CHAR(ch) (ch) -+#endif - - #if defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP) - -@@ -78,7 +79,7 @@ - * This function is called by the V8 regcomp to report - * errors in regular expressions. - */ --static void regerror(char *s) -+static void regerror(const char *s) - { - char string[256]; - -@@ -95,13 +96,17 @@ - * 0 error - * - */ --static int do_regcomp(unsigned char *key) -+static int do_regcomp(const unsigned char *key) - { - static int old_Most_Case_Sensitive; -- unsigned char UpCaseKey[sizeof(savepattern)]; - # ifndef HAVE_V8_REGCOMP - int posn; /* reg exp error at this offset */ - # endif -+# if SLANG_VERSION < 20000 -+ unsigned char UpCaseKey[sizeof(savepattern)]; -+# else -+ int re_flags = 0; -+# endif - - /* - * Only recompile search string if it has changed -@@ -124,6 +129,7 @@ - - old_Most_Case_Sensitive = Most_Case_Sensitive; - -+# if SLANG_VERSION < 20000 - if ( Most_Case_Sensitive == 0 ) - { - register unsigned char *p; /* ptr to UpCaseKey */ -@@ -141,6 +147,7 @@ - - *p = '\0'; - } -+# endif - - strcpy((char *)savepattern, (char *)key); - -@@ -162,7 +169,12 @@ - # else - if (Regexp != NULL) - SLregexp_free (Regexp); -- if (NULL == (Regexp = SLregexp_compile ((char *)key, Most_Case_Sensitive ? 0 : SLREGEXP_CASELESS))) -+ -+ if (!Most_Case_Sensitive) -+ re_flags |= SLREGEXP_CASELESS; -+ if (Most_UTF8_Mode) -+ re_flags |= SLREGEXP_UTF8; -+ if (NULL == (Regexp = SLregexp_compile ((char *)key, re_flags))) - posn = -1; - else - posn = 0; -@@ -187,7 +199,7 @@ - * Call the appropriate regular expression execute function - */ - --static unsigned char *do_regexec(unsigned char *string) -+static unsigned char *do_regexec(const unsigned char *string, size_t length) - { - # ifdef HAVE_V8_REGCOMP - if ( regexec(regpattern, (char *)string) ) -@@ -196,40 +208,46 @@ - return( NULL ); - # else - # if SLANG_VERSION < 20000 -- return ( SLang_regexp_match(string, strlen((char *)string), ®data) ); -+ return ( SLang_regexp_match(string, length, ®data) ); - # else -- return (unsigned char *)SLregexp_match (Regexp, (char *)string, strlen ((char *)string)); -+ return (unsigned char *)SLregexp_match (Regexp, (char *)string, length); - # endif - # endif /* HAVE_V8_REGCOMP */ - } - - /* -- * Make a upper case copy of a string. Also changes any "c\b" character -- * strings into just "" so that highlighted and underlined characters -- * can be searched. -+ * Changes any "c\b" character strings into just "" so that -+ * highlighted and underlined characters can be searched. Stores in -+ * length the new size of the string, after the aforementioned -+ * changes. -+ * -+ * If using a version of S-Lang that does not support case -+ * insensitive regular expressions, this function upper cases the -+ * input string, as well. - * - * Reuses malloced memory, so a copy cannot be retained between calls. - */ - --static unsigned char *StrUpCaseCopy(unsigned char *input) -+static const unsigned char *StrNormCopy(const unsigned char *input, -+ size_t *length) - { - static unsigned char *uppercase; /* ptr to malloced area */ - static size_t bufsize; /* size of malloced area */ -- unsigned char *src; /* ptr to source */ -+ const unsigned char *src; /* ptr to source */ -+ const unsigned char *end; /* ptr to end of source */ - register unsigned char *dest; /* ptr to destination */ - register int idx; /* index into uppercase[] */ -- register unsigned char c; /* source character */ -- size_t length; /* size of string to copy */ - - src = input; -- length = strlen((char *)src) + 1; /* len of line plus terminator */ -+ end = input + *length; - -- if ( length > bufsize ) -+ if ( *length >= bufsize ) - { - if ( uppercase != (unsigned char *)NULL ) - free(uppercase); - -- bufsize = (length > 256 ) ? length : 256; /* 256 byte default */ -+ /* len of line plus terminator */ -+ bufsize = (*length >= 256 ) ? *length + 1 : 256; /* 256 byte default */ - - uppercase = (unsigned char *)malloc(bufsize); - if ( uppercase == (unsigned char *)NULL ) -@@ -242,8 +260,9 @@ - - dest = uppercase; - -- for ( idx = 0 ; (c = *src) != '\0' ; src++ ) -+ for ( idx = 0 ; src < end ; src++ ) - { -+ unsigned char c = *src; - if ( c == '\b' ) /* backspace */ - { - if ( idx-- > 0 ) -@@ -252,54 +271,79 @@ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -658,11 +668,11 @@ + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -690,219 +700,248 @@ + exit (0); + } + EOF +- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; ++ exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; ++ exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk else - { - if ( idx++ >= 0 ) -- *dest++ = UPCASE(c); -+ *dest++ = NORM_CHAR(c); - } - } - - *dest = '\0'; /* add termination */ - -+ *length = dest - uppercase; - return(uppercase); - } - - /* -- * Given an offset into a copy made by StrUpCaseCopy() and a pointer to the -+ * Given an offset into a copy made by StrNormCopy() and a pointer to the - * original string, returns a pointer into the original string corresponding - * to this offset. - */ - --static unsigned char *GetOrigPtr(unsigned char *original, int offset) -+static const unsigned char * -+GetOrigPtr(const unsigned char *original, int offset, -+ const unsigned char *end) - { -- register unsigned char *p = original; -+ const unsigned char *p = original; - register int j = offset; - - /* - * Step through, adjusting offset according to backspaces found - */ -- while ( *p != '\0' ) -+ while ( p < end ) - { -+ const unsigned char *next; -+ if (Most_UTF8_Mode) -+ next = SLutf8_skip_char((unsigned char*) p, (unsigned char*) end); + echo ${UNAME_MACHINE}-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:FreeBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit 0 ;; ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) ++ exit ;; ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; +- x86:Interix*:[34]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit 0 ;; ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +- exit 0 ;; ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix +- exit 0 ;; ++ exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; +- amd64:CYGWIN*:*:*) ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin +- exit 0 ;; ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin +- exit 0 ;; ++ exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu +- exit 0 ;; ++ exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + else -+ next = p + 1; -+ size_t length_last = next - p; -+ - if ( *p == '\b' ) -- j++; -+ j += length_last; ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu +- exit 0 ;; ++ exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu +- exit 0 ;; ++ exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- mips:Linux:*:*) ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 +- #else +- CPU= +- #endif +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 +- ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit 0 ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit 0 ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ or32:Linux:*:*) ++ echo or32-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -910,87 +949,40 @@ + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac +- exit 0 ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu +- exit 0 ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit 0 ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit 0 ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit 0 ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include <features.h> +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #ifdef __INTEL_COMPILER +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 +- ;; ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... +@@ -998,27 +990,27 @@ + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; ++ exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; +- i*86:syllable:*:*) ++ exit ;; ++ i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable +- exit 0 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp +- exit 0 ;; ++ exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +@@ -1026,15 +1018,16 @@ else -- j--; -+ j -= length_last; - - if ( j < 0 ) - break; + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` +@@ -1052,73 +1045,86 @@ else -- p++; -+ p = next; - } - - return(p); - } - #endif /* HAVE_V8_REGCOMP || SLANG_REGEXP */ - -+/* Returns a pointer to the first occurrence of '\n' in string beg, or -+ * end if no '\n' can be found between inclusive beg and exclusive -+ * end. -+ */ -+static const unsigned char * -+find_eol(const unsigned char *beg, const unsigned char *end) -+{ -+ const unsigned char *p; -+ if ( (p = memchr(beg, '\n', end - beg)) != NULL) -+ return p; -+ else -+ return end; -+} -+ - /* This routine returns the 1 + position of first match of key in str. - key is modified to match the case of str. */ - /* We should try to optimize this routine */ - /* searches from beg up to but not including end */ - --static unsigned char *forw_search_region(unsigned char *beg, -- unsigned char *end, -- unsigned char *key) -+static const unsigned char * -+forw_search_region(const unsigned char *beg, -+ const unsigned char *end, -+ const unsigned char *key) - { - #if defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP) - /* -@@ -307,10 +351,11 @@ - * to be broken into lines. - * - */ -- unsigned char *p; /* temp pointer */ -- unsigned char *linebeg; /* beginning of working line */ -- unsigned char *copy; /* ptr to upper case copy */ -+ const unsigned char *linebeg; /* beginning of working line */ -+ const unsigned char *lineend; /* end of working line */ -+ const unsigned char *norm_line; /* ptr to normalized line */ - unsigned char *match; /* ptr to matching string */ -+ int anchored_re; - - /* - * Compile "key" into an executable regular expression -@@ -318,58 +363,35 @@ - if ( do_regcomp(key) == 0 ) - return(Most_Eob); - -- /* -- * For regular expression searches we need to do a line by line -- * search, so it is necessary to temporarily replace '\n' with '\0' -- * characters. -- */ -- p = beg; -- linebeg = beg; -+ anchored_re = key[0] == '^'; - -- while (linebeg < end) -+ for ( linebeg = beg ; linebeg < end ; linebeg = lineend + 1 ) - { -- while ((p < end) && (*p != '\n')) p++; -- if (p == end) break; -- *p = 0; -+ size_t length; - -- if ( Most_Case_Sensitive == 0 ) /* i.e. case insensitive */ -- { -- copy = StrUpCaseCopy(linebeg); -- if ( copy == (unsigned char *)NULL ) -- return(Most_Eob); -- } -+ lineend = find_eol(linebeg, end); -+ -+ length = lineend - linebeg; -+ if (0 == length) continue; /* Skip empty lines. */ -+ -+ norm_line = StrNormCopy(linebeg, &length); -+ if ( norm_line == NULL ) -+ return(Most_Eob); - - /* - * Quick sanity check for beginning of line archored tests. -- * If 1st char of key is "^", then the character before linebeg (which -- * must be beyond the start of the window), must be a "\n", -- * otherwise do_regexec() isn't called. -+ * If 1st char of key is "^", then the character before -+ * linebeg (which must be within the buffer), must be a "\n". - */ -- if ( --# if 0 -- ((*key != '^') -- || (linebeg > Most_Win->beg_pos && linebeg[-1] == '\n')) -- && --#endif -- (match = do_regexec(Most_Case_Sensitive ? linebeg : copy))) -+ if ( !(anchored_re && (linebeg <= Most_Beg || linebeg[-1] != '\n')) -+ && (match = do_regexec(norm_line, length)) ) - { -- *p = '\n'; -- if ( Most_Case_Sensitive == 0 ) -- { -- /* -- * Use offset into "copy" as idx to find point in -- * real line. -- */ -- return( GetOrigPtr(linebeg, match - copy) ); -- } -- else -- { -- return( match ); -- } -+ /* -+ * Use offset into "norm_line" as idx to find point in -+ * real line. -+ */ -+ return( GetOrigPtr(linebeg, match - norm_line, lineend) ); - } -- -- *p++ = '\n'; -- linebeg = p; - } - - return(Most_Eob); -@@ -475,23 +497,18 @@ - * pattern "key". - */ - --static unsigned char *back_search_region(unsigned char *beg, -- unsigned char *end, -- unsigned char *key) -+static const unsigned char * -+back_search_region(const unsigned char *beg, -+ const unsigned char *end, -+ const unsigned char *key) - { - #if defined(HAVE_V8_REGCOMP) || defined(SLANG_REGEXP) -- register unsigned char *p; -- unsigned char *endp, /* end of line */ -- *lastmatch, /* last match in line */ -+ const unsigned char *p; -+ const unsigned char *endp, /* end of line */ -+ *lastmatch, /* last match in line */ - *endprevline, /* end of line before this one */ - *match; /* ptr to matching string */ -- unsigned char savec; /* last char on line */ -- -- /* -- * Compile "key" into an executable regular expression -- */ -- if ( do_regcomp(key) == 0 ) -- return(Most_Eob); -+ int anchored_re; + echo ${UNAME_MACHINE}-pc-sysv32 + fi +- exit 0 ;; ++ exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit 0 ;; ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 +- exit 0 ;; ++ exit ;; + paragon:*:*:*) + echo i860-intel-osf1 +- exit 0 ;; ++ exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; ++ exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv +- exit 0 ;; ++ exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix +- exit 0 ;; ++ exit ;; + M68*:*:R3V[5678]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +@@ -1126,73 +1132,94 @@ + else + echo ns32k-sni-sysv + fi +- exit 0 ;; ++ exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says <Richard.M.Bartel@ccMail.Census.GOV> + echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <hewes@openmarket.com>. + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos +- exit 0 ;; ++ exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos +- exit 0 ;; ++ exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in +- *86) UNAME_PROCESSOR=i686 ;; ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then +@@ -1200,25 +1227,25 @@ + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; ++ exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 +@@ -1229,41 +1256,50 @@ + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; ++ exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit 0 ;; ++ exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in +- A*) echo alpha-dec-vms && exit 0 ;; +- I*) echo ia64-dec-vms && exit 0 ;; +- V*) echo vax-dec-vms && exit 0 ;; ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix +- exit 0 ;; ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +@@ -1295,7 +1331,7 @@ + #endif - /* - * Starting from the end of the buffer, break the buffer into lines -@@ -501,84 +518,60 @@ - * and isn't that what we want to do in a reverse search. - */ - endp = end; -- lastmatch = Most_Eob; -- while ( 1 ) /* forever loop */ -- { -- if ( (endp < beg) ) -- return(Most_Eob); /* Reach start of buffer, no match */ -+ endprevline = end; -+ match = Most_Eob; + #if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); ++ printf ("arm-acorn-riscix\n"); exit (0); + #endif -- /* Find the real end of current line */ -- if ( (p = (unsigned char *)strchr((char *)endp, '\n')) != NULL ) -- endp = p; + #if defined (hp300) && !defined (hpux) +@@ -1384,11 +1420,12 @@ + } + EOF + +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + + # Apollos put the system type in the environment. + +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + + # Convex versions that predate uname can use getsysinfo(1) + +@@ -1397,22 +1434,22 @@ + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + c34*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + c38*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + c4*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + esac + fi + +@@ -1423,9 +1460,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + and +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +--- most-5.0.0a.orig/autoconf/config.sub ++++ most-5.0.0a/autoconf/config.sub +@@ -1,9 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++# Free Software Foundation, Inc. + +-timestamp='2005-04-22' ++timestamp='2010-01-22' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,22 +22,26 @@ + # + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, +-# Boston, MA 02111-1307, USA. - -- savec = *endp; -- *endp = '\0'; /* terminate line with NULL */ -+ /* Find out whether the regexp attempts to match a line boundary. -+ * In this case, only a match on the full line should be attempted. -+ */ -+ anchored_re = key[strlen((const char *) key)-1] == '$'; ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. -+ while ( endp > beg ) -+ { - /* Find the beginning of line */ - for ( p = endp - 1 ; (p >= beg) && (*p != '\n') ; p-- ) - { - } - -+ if ( p < beg ) -+ break; + - endprevline = p; - -- p++; /* point to 1st char after newline */ -+ /* -+ * Quick sanity check for end of line archored tests. If last -+ * char of key is "$", then the character after endp (which -+ * must be within the buffer), must be a "\n". -+ */ -+ if ( anchored_re && endp < Most_Eob && endp[0] != '\n' ) -+ { -+ endp = p; -+ continue; -+ } - - /* - * Keep searching forward in this line till no more matches - */ -- if ( Most_Case_Sensitive == 0 ) /* i.e. case insensitive */ -+ do - { -- unsigned char *copy; /* ptr to upper case copy */ -- unsigned char *savecopy; /* copy of "copy" */ -- -- copy = StrUpCaseCopy(p); -- if ( copy == (unsigned char *)NULL ) -- return(Most_Eob); -+ lastmatch = match; - -- savecopy = copy; -- -- /* -- * Quick sanity check for beginning of line archored tests. -- * Must be at start of line. -- */ -- while ( ((*key != '^') || (copy == savecopy)) -- && (match = do_regexec(copy)) ) -- { -- if ( GetOrigPtr(p, match - savecopy) > end ) -- break; -- lastmatch = match; -- if ( *lastmatch == '\0' ) /* key must be "$" or "^" */ -- break; -- copy = lastmatch + 1; /* character after match */ -- } -+ if (Most_UTF8_Mode) -+ p = SLutf8_skip_char((unsigned char*) p, (unsigned char*) endp); -+ else -+ p++; - -- if ( lastmatch != Most_Eob ) /* found a match */ -- lastmatch = GetOrigPtr(p, lastmatch - savecopy); -- } -- else -- { -- /* -- * Quick sanity check for beginning of line archored tests. -- * Must be at start of buffer or start of line -- */ -- while ( ( (*key != '^') || (p == endprevline + 1) ) -- && (match = do_regexec(p)) ) -- { -- if ( match > end ) -- break; -- lastmatch = match; -- if ( *lastmatch == '\0' ) /* key must be "$" or "^" */ -- break; -- p = lastmatch + 1; /* character after match */ -- } -+ match = forw_search_region(p, endp, key); - } -+ while ( match <= endp ); - -- *endp = savec; - if ( lastmatch != Most_Eob ) /* found a match */ - return(lastmatch); - - endp = endprevline; - } + # Please send patches to <config-patches@gnu.org>. Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + -+ return(Most_Eob); /* Reached start of buffer, no match */ - #else - char ch, char1, work[256]; - unsigned char *pos; -@@ -670,15 +663,15 @@ - #endif /* HAVE_V8_REGCOMP || SLANG_REGEXP */ - } - --int most_search(unsigned char *from, int repeat, int *col) -+long long most_search(const unsigned char *from, int repeat, long long *col) - { - /* return the line match was found as well as line number, - * search from i on; assume that line_array match the i so we need - * no initial lookup */ - -- int test, save_line, the_col, row, s_len; -+ long long test, save_line, the_col, row, s_len; - char string[300]; -- unsigned char *pos; -+ const unsigned char *pos; - unsigned int save_ofs; - unsigned int found_ofs; - -@@ -687,7 +680,10 @@ - save_line = Most_C_Line; - found_ofs = Most_Eob - Most_Beg; - *col = 0; -- s_len = strlen (Most_Search_Str); -+ if (Most_UTF8_Mode) -+ s_len = SLutf8_strlen (Most_Search_Str, 0); -+ else -+ s_len = strlen ((char *) Most_Search_Str); - pos = from; - - if (*Most_Search_Str) ---- most-4.10.2.orig/src/search.h -+++ most-4.10.2/src/search.h -@@ -6,7 +6,7 @@ - extern int Most_Case_Sensitive; - extern int Most_Search_Dir; - #define MOST_SEARCH_BUF_LEN 256 --extern char Most_Search_Str[MOST_SEARCH_BUF_LEN]; --extern int most_search(unsigned char *, int, int *); -+extern unsigned char Most_Search_Str[MOST_SEARCH_BUF_LEN]; -+extern long long most_search(const unsigned char *, int, long long *); - #endif - ---- most-4.10.2.orig/src/window.c -+++ most-4.10.2/src/window.c -@@ -48,10 +48,11 @@ - - Most_Window_Type *Most_Win; - Most_Window_Type *Most_Top_Win; --int Most_Top_Line; /* row number of top window */ --int Most_Curs_Row; --int Most_Curs_Col; --int Most_Column = 1; -+long long Most_Top_Line; /* row number of top window */ -+long long Most_Curs_Row; -+long long Most_Curs_Col; -+/* The leftmost visible column. */ -+long long Most_Column = 1; - int Most_Restore_Width_To = 0; - char Most_Mini_Buf[256]; - unsigned long Most_Curs_Offset; -@@ -156,7 +157,7 @@ - SLsmg_write_nchars (buf + point, len - point); - if (col < SLtt_Screen_Cols) - break; -- buf++; point--; len--; /* FIXME for UTF-8 */ -+ buf++; point--; len--; - } - SLsmg_erase_eol (); - SLsmg_gotorc (SLtt_Screen_Rows - 1, col); -@@ -227,6 +228,8 @@ - { - SLang_RLine_Info_Type *rli; - unsigned int flags = SL_RLINE_BLINK_MATCH; -+ if (Most_UTF8_Mode) -+ flags |= SL_RLINE_UTF8_MODE; - - if (NULL == (rli = SLrline_open (SLtt_Screen_Cols, flags))) - return NULL; -@@ -258,7 +261,7 @@ - - /* do not use default. The up arrow can always get it back. */ - if ((what != NULL) -- && (*what) && (what != Most_Search_Str)) -+ && (*what) && (what != (char *) Most_Search_Str)) - { - if (-1 == SLrline_set_line (Most_RLI, what)) - return -1; -@@ -593,7 +596,8 @@ - unsigned int num_chars; - unsigned int field_width, info_len; - unsigned char *eob; -- int r, x; -+ int r; -+ long long x; - - eob = Most_Eob; - #if MOST_HAS_MMAP -@@ -601,20 +605,20 @@ - eob = Most_Beg + Most_Buf->mmap_size; - #endif - -- if (eob == Most_Beg) x = 100; -+ if (eob == Most_Beg) x = 100LL; - else - { -- x = Most_C_Offset * 100; -+ x = Most_C_Offset * 100LL; - x = x / (eob - Most_Beg); - } - - if (Most_C_Line + (Most_Win->bot - Most_Win->top + 1) >= Most_Num_Lines) -- x = 100; -+ x = 100LL; - - /* for files with end of file above the bottom row (due to window manipulations) */ -- if (x > 100) x = 100; -+ if (x > 100LL) x = 100LL; - -- sprintf (info, "(%d,%d) %d%%", Most_C_Line, Most_Column, x); -+ sprintf (info, "(%lld,%lld) %d%%", Most_C_Line, Most_Column, (int)x); - - r = Most_Win->bot + 1; - most_goto_rc (r,1); ---- most-4.10.2.orig/src/window.h -+++ most-4.10.2/src/window.h -@@ -5,11 +5,11 @@ - typedef struct _Most_Window_Type - { - unsigned long top_offset; /* offset of top line of window from bob */ -- int beg_line; /* line number of top */ -- int curs_line; /* line number of curs pos */ -- int curs_col; /* column number of curs pos */ -+ long long beg_line; /* line number of top */ -+ long long curs_line; /* line number of curs pos */ -+ long long curs_col; /* column number of curs pos */ - unsigned long curs_offset; /* pos of cursor from bob*/ -- int col; /* column offset */ -+ long long col; /* column offset */ - int n_lines; /* number of lines of buffer (mode dependent) */ - int top; /* screen location of top */ - int bot; /* screen location of bot */ -@@ -29,9 +29,9 @@ - extern Most_Window_Type *Most_Win; - extern Most_Window_Type *Most_Top_Win; - extern unsigned long Most_Curs_Offset; --extern int Most_Column; --extern int Most_Curs_Row; --extern int Most_Curs_Col; -+extern long long Most_Column; -+extern long long Most_Curs_Row; -+extern long long Most_Curs_Col; - #define MOST_MINI_BUF_LEN 256 - extern char Most_Mini_Buf[MOST_MINI_BUF_LEN]; - extern int Most_Selective_Display; + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -70,8 +75,9 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free ++Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -83,11 +89,11 @@ + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -99,7 +105,7 @@ + *local*) + # First pass through any local machine types. + echo $1 +- exit 0;; ++ exit ;; + + * ) + break ;; +@@ -118,8 +124,10 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ +- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; +@@ -145,10 +153,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -170,6 +181,10 @@ + -hiux*) + os=-hiuxwe2 + ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -186,6 +201,10 @@ + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -230,23 +249,28 @@ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +- | fr30 | frv \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ +- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +- | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ +@@ -255,31 +279,40 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ + | msp430 \ ++ | nios | nios2 \ + | ns16k | ns32k \ +- | openrisc | or32 \ ++ | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ +- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ++ | rx \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ +- | sparcv8 | sparcv9 | sparcv9b \ +- | strongarm \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ ++ | ubicom32 \ + | v850 | v850e \ + | we32k \ +- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ +- | z8k) ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and +@@ -299,28 +332,32 @@ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* \ ++ | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ +- | m32r-* | m32rle-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +- | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ +@@ -329,27 +366,35 @@ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ ++ | mt-* \ + | msp430-* \ ++ | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ ++ | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ +- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile-* | tilegx-* \ + | tron-* \ ++ | ubicom32-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ +- | xstormy16-* | xtensa-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. +@@ -413,6 +458,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -421,10 +470,26 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -453,8 +518,8 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16c) +- basic_machine=cr16c-unknown ++ cr16) ++ basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) +@@ -492,6 +557,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp +@@ -646,6 +715,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -657,10 +734,17 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +@@ -686,6 +770,9 @@ + basic_machine=i386-pc + os=-msdos + ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs +@@ -761,9 +848,8 @@ + basic_machine=hppa1.1-oki + os=-proelf + ;; +- or32 | or32-*) ++ openrisc | openrisc-*) + basic_machine=or32-unknown +- os=-coff + ;; + os400) + basic_machine=powerpc-ibm +@@ -785,6 +871,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; +@@ -794,6 +888,12 @@ + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +@@ -850,6 +950,10 @@ + basic_machine=i586-unknown + os=-pw32 + ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff +@@ -876,6 +980,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; + sei) + basic_machine=mips-sei + os=-seiux +@@ -887,6 +995,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; + sh64) + basic_machine=sh64-unknown + ;; +@@ -976,6 +1087,15 @@ + basic_machine=tic6x-unknown + os=-coff + ;; ++ # This must be matched before tile*. ++ tilegx*) ++ basic_machine=tilegx-unknown ++ os=-linux-gnu ++ ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; + tx39) + basic_machine=mipstx39-unknown + ;; +@@ -1051,6 +1171,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1089,13 +1213,10 @@ + we32k) + basic_machine=we32k-att + ;; +- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sh64) +- basic_machine=sh64-unknown +- ;; +- sparc | sparcv8 | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) +@@ -1142,6 +1263,9 @@ + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1162,26 +1286,30 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ +- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1199,7 +1327,7 @@ + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) +@@ -1311,6 +1439,11 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1333,6 +1466,12 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1342,9 +1481,9 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff +- ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 +@@ -1370,6 +1509,9 @@ + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;; +@@ -1388,6 +1530,9 @@ + *-be) + os=-beos + ;; ++ *-haiku) ++ os=-haiku ++ ;; + *-ibm) + os=-aix + ;; +@@ -1496,7 +1641,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) +@@ -1559,7 +1704,7 @@ + esac + + echo $basic_machine$os +-exit 0 ++exit + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/extra/multitail/PKGBUILD b/extra/multitail/PKGBUILD index 93558817f..aa356da64 100644 --- a/extra/multitail/PKGBUILD +++ b/extra/multitail/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 79574 2010-05-04 15:01:54Z kevin $ +# $Id: PKGBUILD 125613 2011-05-27 00:13:31Z kevin $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Roberto Carvajal <roberto@archlinux.org> pkgname=multitail -pkgver=5.2.6 +pkgver=5.2.8 pkgrel=1 -pkgdesc="MultiTail lets you view one or multiple files like the original tail program" -arch=(i686 x86_64 'mips64el') +pkgdesc="Lets you view one or multiple files like the original tail program" +arch=(i686 x86_64) license=('GPL') url="http://www.vanheusden.com/multitail" depends=('ncurses') backup=(etc/multitail.conf) source=(${url}/${pkgname}-${pkgver}.tgz) -md5sums=('6496b3d78660ff8d11c743a0d03cca34') +md5sums=('aaa3691b0ea66ef02ffefd628c7dee8b') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - /usr/bin/make || return 1 - /bin/install -D -m 755 multitail ${startdir}/pkg/usr/bin/multitail - /bin/install -D -m 644 multitail.1 ${startdir}/pkg/usr/share/man/man1/multitail.1 - /bin/install -D -m 644 multitail.conf ${startdir}/pkg/etc/multitail.conf + cd ${srcdir}/${pkgname}-${pkgver} + /usr/bin/make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + /bin/install -D -m 755 multitail ${pkgdir}/usr/bin/multitail + /bin/install -D -m 644 multitail.1 ${pkgdir}/usr/share/man/man1/multitail.1 + /bin/install -D -m 644 multitail.conf ${pkgdir}/etc/multitail.conf } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 0f40309d1..7f1a0f89a 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,28 +1,25 @@ -# $Id: PKGBUILD 123610 2011-05-11 18:27:48Z ibiru $ +# $Id: PKGBUILD 125321 2011-05-25 21:21:29Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2.1 +pkgrel=1 pkgdesc="A window manager for GNOME3" arch=(i686 x86_64) license=('GPL') depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection') -makedepends=('intltool' 'gtk-doc') +makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - squash_some_leaks.patch) -sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708' - 'dda962cfd884ffbe2c3c4a86641964228d7b04ef30e19bb2894c4398fa4c296a') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b122ffe170078af3edb9d4aa076c89eefd7a12a8aa57a1025227c1ab92912b3c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/squash_some_leaks.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static diff --git a/extra/mutter/squash_some_leaks.patch b/extra/mutter/squash_some_leaks.patch deleted file mode 100644 index 0e6b506bc..000000000 --- a/extra/mutter/squash_some_leaks.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 65963748860aec8e3d7ee939b3b16876f4117904 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Thu, 05 May 2011 20:11:02 +0000 -Subject: region-utils.c: Squash a memory leak - -"chunk" was an allocated but unused variable. - -https://bugzilla.gnome.org/show_bug.cgi?id=649504 ---- -diff --git a/src/compositor/region-utils.c b/src/compositor/region-utils.c -index b4071ca..cf3c64e 100644 ---- a/src/compositor/region-utils.c -+++ b/src/compositor/region-utils.c -@@ -248,7 +248,6 @@ expand_region_inverse (cairo_region_t *region, - MetaRegionBuilder builder; - MetaRegionIterator iter; - cairo_rectangle_int_t extents; -- cairo_region_t *chunk; - - int last_x; - -@@ -268,16 +267,11 @@ expand_region_inverse (cairo_region_t *region, - extents.x, extents.y + extents.height, extents.width, 1, - x_amount, y_amount, flip); - -- chunk = NULL; -- - last_x = extents.x; - for (meta_region_iterator_init (&iter, region); - !meta_region_iterator_at_end (&iter); - meta_region_iterator_next (&iter)) - { -- if (chunk == NULL) -- chunk = cairo_region_create (); -- - if (iter.rectangle.x > last_x) - add_expanded_rect (&builder, - last_x, iter.rectangle.y, --- -cgit v0.9 -From d0414a3ea697738dcdf2641b6a8000df35215862 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Thu, 05 May 2011 20:46:00 +0000 -Subject: theme.c: Squash memory leak - -When converting a token to a different type, we need to free its -string. - -https://bugzilla.gnome.org/show_bug.cgi?id=649500 ---- -diff --git a/src/ui/theme.c b/src/ui/theme.c -index 0077388..9305645 100644 ---- a/src/ui/theme.c -+++ b/src/ui/theme.c -@@ -2639,11 +2639,13 @@ meta_theme_replace_constants (MetaTheme *theme, - { - if (meta_theme_lookup_int_constant (theme, t->d.v.name, &ival)) - { -+ g_free (t->d.v.name); - t->type = POS_TOKEN_INT; - t->d.i.val = ival; - } - else if (meta_theme_lookup_float_constant (theme, t->d.v.name, &dval)) - { -+ g_free (t->d.v.name); - t->type = POS_TOKEN_DOUBLE; - t->d.d.val = dval; - } --- -cgit v0.9 diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index 94cdc6efa..7ba50f3f1 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122706 2011-05-06 06:57:16Z ibiru $ +# $Id: PKGBUILD 124892 2011-05-24 21:49:03Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.0.1.1 -pkgrel=3 +pkgver=3.0.2 +pkgrel=1 pkgdesc="The GNOME shell and file manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,8 +14,8 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD index b43b0526d..bcfd1aa15 100644 --- a/extra/neon/PKGBUILD +++ b/extra/neon/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 121086 2011-04-29 00:26:05Z stephane $ +# $Id: PKGBUILD 124952 2011-05-25 12:20:04Z andrea $ +# Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# KEEP LIBTOOL FILES! pkgname=neon -pkgver=0.29.3 -pkgrel=3 +pkgver=0.29.6 +pkgrel=1 pkgdesc="HTTP and WebDAV client library with a C interface" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') depends=('krb5' 'expat' 'ca-certificates') url="http://www.webdav.org/neon/" -source=("http://www.webdav.org/neon/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba1015b59c112d44d7797b62fe7bee51') -options=('libtool') +source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('591e0c82e6979e7e615211b386b8f6bc') +options=('libtool') # FS#16067 build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr \ - --with-expat --enable-shared --disable-static \ - --with-ssl=openssl --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + --with-expat \ + --enable-shared \ + --disable-static \ + --with-ssl=openssl \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/neverball/ChangeLog b/extra/neverball/ChangeLog deleted file mode 100644 index d4c6561ca..000000000 --- a/extra/neverball/ChangeLog +++ /dev/null @@ -1,50 +0,0 @@ -2010-01-18 Eric Belanger <eric@archlinux.org> - - * neverball 1.5.4-2 - * Rebuilt for libpng 1.4 and libjpeg 8 - -2009-09-20 Eric Belanger <eric@archlinux.org> - - * neverball 1.5.4-1 - * Upstream update - -2009-09-08 Eric Belanger <eric@archlinux.org> - - * neverball 1.5.3-1 - * Upstream update - -2009-08-16 Eric Belanger <eric@archlinux.org> - - * neverball 1.5.2-1 - * Upstream update - * Added physfs depends - * Fixed file permissions - -2009-08-08 Eric Belanger <eric@archlinux.org> - - * neverball 1.5.1-2.1 - * Built i686 package without sse (close FS#15849) - -2009-07-01 Eric Belanger <eric@archlinux.org> - - * neverball 1.5.1-2 - * Rebuilt against libjpeg 7 - -2009-04-08 Eric Belanger <eric@archlinux.org> - - * neverball 1.5.1-1 - * Upstream update - * Removed sdl_image and sdl_mixer depends: not needed anymore - * Added libpng, libjpeg and libvorbis depends - -2009-02-03 Eric Belanger <eric@archlinux.org> - - * neverball 1.5.0-1 - * Upstream update - * Updated url - * Added mesa makedepends - * Switched to upstream desktop file and icons - * Removed wrapper scripts - * Added mapc binary - * Added locales, man pages and docs - * Added ChangeLog diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index 1bf49cf8f..7b918c9ec 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108496 2011-01-31 15:55:57Z jgc $ +# $Id: PKGBUILD 125631 2011-05-27 10:55:14Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.8.7 +pkgver=4.8.8 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('97e30989a56ab813453b71261849c200' +md5sums=('b3a961d2e0ff3331745220984c70b6a9' 'bce1611f3117b53fc904cab549c09967') build() { @@ -32,6 +32,10 @@ build() { --enable-optimize \ --disable-debug ${confflags} make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install NSPR_LIBS=`./config/nspr-config --libs` diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index d0768b67a..88c740808 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 109101 2011-02-06 10:02:09Z andyrtr $ +# $Id: PKGBUILD 125630 2011-05-27 10:55:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.12.9 +pkgver=3.12.10 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') @@ -11,14 +11,14 @@ _nsprver=4.8.7 depends=("nspr>=${_nsprver}" 'sqlite3>=3.7.5' 'zlib' 'sh') makedepends=('perl') replaces=('nss-nspr') +options=('!strip') source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz nss-no-rpath.patch nss.pc.in nss-config.in add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch) -options=('!strip') -md5sums=('bd32f183ca28440c1744650be31a9ccc' +md5sums=('027954e894f02732f4e66cd854261145' 'e5c97db0c884d5f4cfda21e562dc9bba' 'c547b030c57fe1ed8b77c73bf52b3ded' '46bee81908f1e5b26d6a7a2e14c64d9f' diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD index 1d7d537dd..5211c17d2 100644 --- a/extra/ntrack/PKGBUILD +++ b/extra/ntrack/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118407 2011-04-06 16:43:17Z andrea $ +# $Id: PKGBUILD 125701 2011-05-28 10:48:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=ntrack pkgver=13 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A network connectivity tracking library" arch=('i686' 'x86_64' 'mips64el') @@ -11,13 +11,17 @@ url="http://launchpad.net/ntrack/" license=('LGPL') depends=('qt' 'libnl' 'gcc-libs') makedepends=('python2') -optdepends=('python2') -source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz") -md5sums=('90596b924a108f8b4eea52239ba64369') -options=('!libtool') +source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz" + 'dead-loop-fix.patch') +md5sums=('90596b924a108f8b4eea52239ba64369' + '02bda6ae15ef04b6a7d9273c37752681') +options=('!libtool' '!emptydirs') build() { cd "${srcdir}/${pkgname}-0${pkgver}" + + patch -p0 -i "${srcdir}"/dead-loop-fix.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/extra/ntrack/dead-loop-fix.patch b/extra/ntrack/dead-loop-fix.patch new file mode 100644 index 000000000..133bb4ace --- /dev/null +++ b/extra/ntrack/dead-loop-fix.patch @@ -0,0 +1,14 @@ +=== modified file 'modules/ntrack-libnl.c' +--- modules/ntrack-libnl.c 2011-04-25 16:28:19 +0000 ++++ modules/ntrack-libnl.c 2011-04-25 17:25:24 +0000 +@@ -394,6 +394,9 @@ + if (rtnl_link_get_ifindex(link) > iindex) + break; + i = i->next; ++ ++ if (i == linklist) ++ break; + } + return result; + } + diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 814b4a97f..05883a1d8 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123134 2011-05-08 21:15:31Z foutrelis $ +# $Id: PKGBUILD 124929 2011-05-25 09:33:46Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,8 +7,8 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.7.11 -pkgrel=3 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=5 +arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' @@ -16,12 +16,22 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('07c2a2535b4d7436b5ec7685fe063fec') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + nm09-pidgin.patch + nm09-more.patch) +md5sums=('07c2a2535b4d7436b5ec7685fe063fec' + '744a21b4dbaf949dba7cd3b75b12b4fe' + 'a673659d86c7a65aa710f7c8c7feda82') build() { cd "$srcdir/$pkgname-$pkgver" + # Update for NetworkManager 0.9 connection states + # (http://developer.pidgin.im/ticket/13505) + # (http://developer.pidgin.im/ticket/13859) + patch -Np1 -i "$srcdir/nm09-pidgin.patch" + patch -Np1 -i "$srcdir/nm09-more.patch" + # Use Python 2 sed -i 's/env python$/\02/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -51,7 +61,7 @@ package_pidgin(){ install=pidgin.install cd "$srcdir/pidgin-$pkgver" - + # For linking make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES @@ -72,7 +82,7 @@ package_libpurple(){ 'cyrus-sasl-plugins') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') - + cd "$srcdir/pidgin-$pkgver" for _dir in libpurple share/sounds share/ca-certs m4macros po; do @@ -100,3 +110,5 @@ package_finch(){ rm "$pkgdir"/usr/share/man/man1/pidgin.1 } + +# vim:set ts=2 sw=2 et: diff --git a/extra/pidgin/nm09-more.patch b/extra/pidgin/nm09-more.patch new file mode 100644 index 000000000..8c708df9a --- /dev/null +++ b/extra/pidgin/nm09-more.patch @@ -0,0 +1,49 @@ +diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c +--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500 ++++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500 +@@ -833,8 +833,20 @@ purple_network_is_available(void) + purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); + } + +- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED) +- return TRUE; ++ switch (nm_state) ++ { ++ case NM_STATE_UNKNOWN: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else ++ case NM_STATE_CONNECTED: ++#endif ++ return TRUE; ++ default: ++ break; ++ } + + return FALSE; + +@@ -1170,9 +1182,14 @@ purple_network_init(void) + NM_DBUS_SERVICE, + NM_DBUS_PATH, + NM_DBUS_INTERFACE); ++ /* NM 0.6 signal */ + dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(nm_proxy, "StateChange", + G_CALLBACK(nm_state_change_cb), NULL, NULL); ++ /* NM 0.7 and later signal */ ++ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged", ++ G_CALLBACK(nm_state_change_cb), NULL, NULL); + + dbus_proxy = dbus_g_proxy_new_for_name(nm_conn, + DBUS_SERVICE_DBUS, +@@ -1207,6 +1224,7 @@ purple_network_uninit(void) + #ifdef HAVE_NETWORKMANAGER + if (nm_proxy) { + dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL); ++ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL); + g_object_unref(G_OBJECT(nm_proxy)); + } + if (dbus_proxy) { diff --git a/extra/pidgin/nm09-pidgin.patch b/extra/pidgin/nm09-pidgin.patch new file mode 100644 index 000000000..1c2471d1f --- /dev/null +++ b/extra/pidgin/nm09-pidgin.patch @@ -0,0 +1,38 @@ +diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c +--- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600 ++++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600 +@@ -71,6 +71,10 @@ + #include <dbus/dbus-glib.h> + #include <NetworkManager.h> + ++#if !defined(NM_CHECK_VERSION) ++#define NM_CHECK_VERSION(x,y,z) 0 ++#endif ++ + static DBusGConnection *nm_conn = NULL; + static DBusGProxy *nm_proxy = NULL; + static DBusGProxy *dbus_proxy = NULL; +@@ -863,7 +867,13 @@ nm_update_state(NMState state) + + switch(state) + { ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else + case NM_STATE_CONNECTED: ++#endif + /* Call res_init in case DNS servers have changed */ + res_init(); + /* update STUN IP in case we it changed (theoretically we could +@@ -880,6 +890,9 @@ nm_update_state(NMState state) + case NM_STATE_ASLEEP: + case NM_STATE_CONNECTING: + case NM_STATE_DISCONNECTED: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_DISCONNECTING: ++#endif + if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) + break; + if (ui_ops != NULL && ui_ops->network_disconnected != NULL) diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index a2a7721cf..92c049e73 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121957 2011-04-30 20:53:21Z eric $ +# $Id: PKGBUILD 125726 2011-05-28 15:54:25Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=2.90.1 -pkgrel=3 +pkgver=2.90.1.git20110528 +pkgrel=1 pkgdesc="An iTunes-like music player/libary" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -20,8 +20,8 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' options=('!libtool' '!emptydirs' '!strip') install=rhythmbox.install #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110426.tar.xz) -sha256sums=('513cfa653cf68a05b1fe5f6e41744af4baed0d0fff169000b3153effa232e23d') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('8e73675d36a90950034862e1aaa8db96267c8c4563823983d3ee2dc239c0a4f0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/rxvt-unicode/popup-menu-hang.diff b/extra/rxvt-unicode/popup-menu-hang.diff deleted file mode 100644 index 09bb3c64b..000000000 --- a/extra/rxvt-unicode/popup-menu-hang.diff +++ /dev/null @@ -1,24 +0,0 @@ -Index: src/perl/urxvt-popup -=================================================================== -RCS file: /schmorpforge/rxvt-unicode/src/perl/urxvt-popup,v -retrieving revision 1.15 -diff -u -r1.15 urxvt-popup ---- src/perl/urxvt-popup 24 Dec 2007 08:21:40 -0000 1.15 -+++ src/perl/urxvt-popup 2 Aug 2009 08:22:52 -0000 -@@ -120,7 +120,7 @@ - $self->refresh; - - # might fail, but try anyways -- $self->grab ($self->{data}{event}{time}, 1) -+ $self->grab ($self->{data}{event}{time}) - and $self->allow_events_async; - - on_button_press $self, $self->{data}{event} if $self->{data}{event}{button}; -@@ -132,7 +132,7 @@ - my ($self, $event) = @_; - - # should definitely not fail -- $self->grab ($self->{data}{event}{time}, 1) -+ $self->grab ($self->{data}{event}{time}) - and $self->allow_events_async; - } diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index 0a650eb85..e9755aada 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,29 +1,40 @@ -# $Id: PKGBUILD 84723 2010-07-03 19:29:41Z ibiru $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 125359 2011-05-26 09:22:50Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim -pkgver=1.4.9 -pkgrel=2 -pkgdesc="A Input Method development platform" -arch=("i686" "x86_64" 'mips64el') -url="http://www.scim-im.org/projects/scim" +pkgver=1.4.10 +pkgrel=1 +pkgdesc='Input method user interface and development platform' +url='http://www.scim-im.org/projects/scim' license=('GPL') +arch=('i686' 'x86_64') depends=('gtk2' 'gcc-libs') makedepends=('intltool') backup=('etc/scim/config' 'etc/scim/global') options=('!libtool') -install=scim.install -source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz - gcc45.patch) -md5sums=('975ba34b01304ea8166ac8ea27aa9e88' - '9d7b41421424cedcbc5740098afa4921') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$pkgver.tar.gz") +sha1sums=('bf33a6ceb199453fed909a61f54e971653fe5abf') + +install=install build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/gcc45.patch - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-gnu-ld --with-x --disable-static - make - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + + ./bootstrap + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-static \ + --with-gnu-ld \ + --with-x \ + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/extra/scim/gcc45.patch b/extra/scim/gcc45.patch deleted file mode 100644 index 267a2bbf6..000000000 --- a/extra/scim/gcc45.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur scim-1.4.9.orig//src/ltdl.cpp scim-1.4.9/src/ltdl.cpp ---- scim-1.4.9.orig//src/ltdl.cpp 2008-11-02 01:42:40.000000000 -0500 -+++ scim-1.4.9/src/ltdl.cpp 2010-07-04 00:19:58.924925581 -0500 -@@ -3361,7 +3361,7 @@ - { - lt_dlhandle handle = 0; - char * tmp = 0; -- char * ext = 0; -+ const char * ext = 0; - size_t len; - int errors = 0; - diff --git a/extra/scim/install b/extra/scim/install new file mode 100644 index 000000000..405061cb4 --- /dev/null +++ b/extra/scim/install @@ -0,0 +1,13 @@ +post_install() { + echo -n 'updating gtk.immodules... ' + /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + echo 'done.' +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/scim/scim.install b/extra/scim/scim.install deleted file mode 100644 index 1097ea400..000000000 --- a/extra/scim/scim.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - echo -n "updating gtk.immodules... " - /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - echo "done." -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD index 435321d1b..1d1af26d0 100644 --- a/extra/socat/PKGBUILD +++ b/extra/socat/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 87629 2010-08-17 13:33:30Z bisson $ -# Maintainer: +# $Id: PKGBUILD 125383 2011-05-26 13:02:11Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=socat pkgver=1.7.1.3 -pkgrel=1 -pkgdesc='Relay for bidirectional data transfer via socket, pty, pipe, file and more' -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') +pkgrel=2 +pkgdesc='Multipurpose relay' url='http://www.dest-unreach.org/socat/' +license=('GPL2') +arch=('i686' 'x86_64') depends=('readline' 'openssl' 'tcp_wrappers') -makedepends=('imake') source=("http://www.dest-unreach.org/socat/download/$pkgname-$pkgver.tar.gz") sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --mandir=/usr/share/man - make depend || return 1 - make || return 1 + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install || return 1 + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD index 0c582933f..5f2c69b20 100644 --- a/extra/source-highlight/PKGBUILD +++ b/extra/source-highlight/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111993 2011-03-02 22:17:55Z ibiru $ +# $Id: PKGBUILD 124988 2011-05-25 16:07:54Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=source-highlight pkgver=3.1.4 -pkgrel=2 +pkgrel=3 pkgdesc="Convert source code to syntax highlighted document" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/src-highlite/" diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 4c0943fa1..98cbad621 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116067 2011-03-22 18:11:16Z heftig $ +# $Id: PKGBUILD 125552 2011-05-26 16:51:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=totem-plparser -pkgver=2.32.4 +pkgver=2.32.5 pkgrel=1 url="http://www.hadess.net/totem.php3" pkgdesc="Totem playlist parser library" @@ -12,7 +12,7 @@ depends=('gmime' 'libsoup-gnome') makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-${pkgver}.tar.bz2) -sha256sums=('349006c8c26a7bee6775c2f48cb158be15c92608f444598c67ca820c205213d6') +sha256sums=('f7233972602321db5e46819a5b47b52c10b63c4344725a5179ac956284e1991d') build() { cd "${srcdir}/totem-pl-parser-${pkgver}" diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index ff9fb8a51..75b5f10da 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120757 2011-04-26 11:04:01Z heftig $ +# $Id: PKGBUILD 125547 2011-05-26 16:47:44Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') pkgver=3.0.1 -pkgrel=1 +pkgrel=2 url="http://www.hadess.net/totem.php3" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'custom') @@ -27,7 +27,7 @@ build() { package_totem() { pkgdesc="A GNOME3 integrated movie player based on Gstreamer." - depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas') + depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf') groups=('gnome-extra') install=totem.install optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index fac9cc594..30a9704c2 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122280 2011-05-03 18:02:14Z ibiru $ +# $Id: PKGBUILD 124973 2011-05-25 14:17:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.10 +pkgver=0.9.11 pkgrel=1 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection') replaces=('devicekit-power') options=('!libtool') source=($url/releases/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('fa567509c4ce8d1975259665b907929cac692a59dbe0e217e7494b1cdc949288') +sha256sums=('567358cc1b4887485d29e309897dd091c2c2ae95e48dfbb3279ffdc44a4b2956') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 436ec5ddd..43f4aa5a4 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112123 2011-03-04 03:09:16Z eric $ +# $Id: PKGBUILD 124991 2011-05-25 16:14:08Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=vigra -pkgver=1.7.0 -pkgrel=6 +pkgver=1.7.1 +pkgrel=2 pkgdesc="Computer vision library" arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" @@ -14,13 +14,14 @@ makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-num optdepends=('python2: for python bindings' 'boost-libs: for python bindings') options=('!libtool') -source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz libpng-1.4.patch) -md5sums=('a40b3b013653f75dc84ba55b2df1fae2' 'db610e48558eb323490ad21d636bac76') -sha1sums=('31875646cbb1928d93c96fc4da4fda31772cf8f6' '5f668c861f5fe927a4f51014afab94805db60c46') +source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz + vigra-1.7.1.gcc460.patch) +md5sums=('2bde208e0fd7626770169dd4fa097282' + '25ef8bc26bc38ee67e5b512d2acd0166') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-src - patch -p1 < ../libpng-1.4.patch + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_VIGRANUMPY=1 \ -DDOCINSTALL=share/doc @@ -28,7 +29,7 @@ build() { } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-src + cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # license install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/vigra/libpng-1.4.patch b/extra/vigra/libpng-1.4.patch deleted file mode 100644 index 3c69e8eb8..000000000 --- a/extra/vigra/libpng-1.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur vigra1.6.0-orig/src/impex/png.cxx vigra1.6.0/src/impex/png.cxx ---- vigra1.6.0-orig/src/impex/png.cxx 2010-01-20 19:46:57.000000000 -0500 -+++ vigra1.6.0/src/impex/png.cxx 2010-01-20 19:47:55.000000000 -0500 -@@ -270,8 +270,8 @@ - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) -- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); -- png_set_gray_1_2_4_to_8(png); -+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); -+ png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; - } - diff --git a/extra/vigra/vigra-1.7.1.gcc460.patch b/extra/vigra/vigra-1.7.1.gcc460.patch new file mode 100644 index 000000000..46f194dbc --- /dev/null +++ b/extra/vigra/vigra-1.7.1.gcc460.patch @@ -0,0 +1,33 @@ +diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx +--- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000 +@@ -43,6 +43,7 @@ + #include <set> + #include <list> + #include <numeric> ++#include <stddef.h> + #include "mathutil.hxx" + #include "array_vector.hxx" + #include "sized_int.hxx" +diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx +--- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -57,6 +57,7 @@ + #include <fstream> + #include <cstring> + #include <vector> ++#include <stddef.h> + #include "vigra/multi_array.hxx" + + namespace vigra { +diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx +--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index efe3dac2e..e54d2ecb6 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,30 +1,44 @@ -# $Id: PKGBUILD 119562 2011-04-12 10:29:49Z giovanni $ +# $Id: PKGBUILD 125719 2011-05-28 14:45:23Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> -pkgbase=vlc -pkgname=('vlc' 'vlc-plugin') +pkgname=vlc pkgver=1.1.9 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=3 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('GPL') -makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' - 'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm' - 'xulrunner' 'pkgconfig' 'live-media' 'libnotify' 'libcdio' +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' - 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse') + 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' + 'lirc-utils' 'gnutls' 'libcaca') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' + 'libpulse: PulseAudio support') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') options=('!libtool') -source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2") +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") md5sums=('06adb1848e6b87fbe1ced77ec0f91e4c') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c ./configure --prefix=/usr \ @@ -37,35 +51,12 @@ build() { --enable-lirc \ --enable-pvr \ --enable-ncurses \ - --enable-mozilla \ --with-live555-tree=/usr/lib/live \ --enable-realrtsp make } - -package_vlc() { - pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" - depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' - 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') - optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' - 'libpulse: PulseAudio support') - options=('!libtool') - conflicts=('vlc-pulse-plugin') - replaces=('vlc-pulse-plugin') - install=vlc.install - cd "${srcdir}/${pkgbase}-${pkgver}" +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install @@ -73,20 +64,4 @@ package_vlc() { install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" done - - rm -rf "${pkgdir}/usr/lib/mozilla" -} - -package_vlc-plugin() { - pkgdesc="VLC mozilla browser plugin" - depends=("${pkgbase}=${pkgver}" 'nspr' 'xulrunner' 'libxpm') - cd "${srcdir}/${pkgbase}-${pkgver}" - - #for linking against libvlc - make -C src DESTDIR="${pkgdir}" install-libLTLIBRARIES - - make -C projects/mozilla DESTDIR="${pkgdir}/" install - - #clean up libvlc - make -C src DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES } diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD index 24ba5d5c2..ec1cd77a8 100644 --- a/extra/wesnoth/PKGBUILD +++ b/extra/wesnoth/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 112017 2011-03-03 06:20:54Z eric $ +# $Id: PKGBUILD 125126 2011-05-25 17:01:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Jacobo Arvelo <unix4all@ya.com> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=wesnoth -pkgver=1.8.5 -pkgrel=3 +pkgver=1.8.6 +pkgrel=1 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ makedepends=('boost') install=wesnoth.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 wesnoth-libpng-1.4.0.patch) -md5sums=('a800285d1406690755dd0ea22b98b6df' +md5sums=('f1c3179869b01b61e253e74aeb241034' 'ca7412ffc4682ef55ddf82d56b0e2f08') build() { diff --git a/extra/xaw3d/ChangeLog b/extra/xaw3d/ChangeLog deleted file mode 100644 index 077b24d3d..000000000 --- a/extra/xaw3d/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -2009-05-10 Jan de Groot <jgc@archlinux.org> - - * xaw3d 1.5E-2 - * Build without libxp (requires latest imake) - * Simplify PKGBUILD a bit - * Add extra patches from Fedora - * Fix URL - -2008-12-14 Eric Belanger <eric@archlinux.org> - - * xaw3d 1.5E-1 - * Upstream update - * Updated url - * Added misc. patches - * Added ChangeLog diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD index 47d56dc44..9063e3a4d 100644 --- a/extra/xorg-iceauth/PKGBUILD +++ b/extra/xorg-iceauth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113660 2011-03-10 14:29:50Z jgc $ +# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-iceauth -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc="ICE authority file utility" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,12 +12,16 @@ depends=('libice') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2) -sha1sums=('9b446c0d1815dce48bdea32db7dea7e429f6a310') +sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e') build() { cd "${srcdir}/iceauth-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/iceauth-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xauth/PKGBUILD b/extra/xorg-xauth/PKGBUILD index 85a358954..192dcce39 100644 --- a/extra/xorg-xauth/PKGBUILD +++ b/extra/xorg-xauth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113711 2011-03-10 14:51:46Z jgc $ +# $Id: PKGBUILD 125581 2011-05-26 20:38:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xauth -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="X.Org authorization settings program" arch=(i686 x86_64) license=('custom') @@ -12,12 +12,16 @@ depends=('libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(${url}/releases/individual/app/xauth-${pkgver}.tar.bz2) -sha1sums=('6d94b5822e8ce08630a8ff510230246d5ed45290') +sha1sums=('10a68367ecc60a641b9aa89e6f24f7ca71f23874') build() { cd "${srcdir}/xauth-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xauth-${pkgver}" make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD index f4f07366d..5a8334b7a 100644 --- a/extra/zile/PKGBUILD +++ b/extra/zile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 104088 2010-12-28 17:55:43Z kevin $ +# $Id: PKGBUILD 125598 2011-05-26 20:47:05Z kevin $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=zile -pkgver=2.3.21 +pkgver=2.3.24 pkgrel=1 pkgdesc="A small, fast, and powerful Emacs clone" arch=(i686 x86_64 'mips64el') @@ -13,12 +13,16 @@ makedepends=('help2man') depends=('ncurses') license=('GPL') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('4bac1dc5d7e6fb5c13bd6677bca34b11') +md5sums=('fe77d801ba69e0fb9b4914a04b9ff506') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } -md5sums=('ec2834a42789477c55e7d44bc9438de1') + diff --git a/kde-unstable/akonadi/PKGBUILD b/kde-unstable/akonadi/PKGBUILD index 52f2939bd..c19e6d4ce 100644 --- a/kde-unstable/akonadi/PKGBUILD +++ b/kde-unstable/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124449 2011-05-21 11:40:47Z andrea $ +# $Id: PKGBUILD 125234 2011-05-25 19:13:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.5.80 -pkgrel=1 +pkgrel=2 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') url='http://pim.kde.org/akonadi' diff --git a/kde-unstable/kdeaccessibility/PKGBUILD b/kde-unstable/kdeaccessibility/PKGBUILD new file mode 100644 index 000000000..9fe34bcd9 --- /dev/null +++ b/kde-unstable/kdeaccessibility/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeaccessibility +pkgname=('kdeaccessibility-jovie' + 'kdeaccessibility-kaccessible' + 'kdeaccessibility-kmag' + 'kdeaccessibility-kmousetool' + 'kdeaccessibility-kmouth') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://accessibility.kde.org' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('a8d4ca99dadc9439b6a1ee91645527f954665cb1') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Opentts=OFF + make +} + +package_kdeaccessibility-jovie() { + pkgdesc='A text to speech application' + depends=('kdebase-runtime' 'speech-dispatcher') + replaces=('kdeaccessibility-kttsd') + install='kdeaccessibility.install' + cd $srcdir/build/jovie + make DESTDIR=$pkgdir install + cd $srcdir/build/jovie/doc + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kaccessible() { + pkgdesc='Provides accessibility services like focus tracking and a screenreader' + depends=('kdebase-runtime' 'speech-dispatcher') + install='kdeaccessibility.install' + cd $srcdir/build/kaccessible + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kmag() { + pkgdesc='Screen Magnifier' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kmag/" + install='kdeaccessibility.install' + cd $srcdir/build/kmag + make DESTDIR=$pkgdir install + cd $srcdir/build/kmag/doc + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kmousetool() { + pkgdesc='Clicks the mouse for you, reducing the effects of RSI' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kmousetool/" + install='kdeaccessibility.install' + cd $srcdir/build/kmousetool + make DESTDIR=$pkgdir install + cd $srcdir/build/kmousetool/doc + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kmouth() { + pkgdesc='Speech Synthesizer Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kmouth/" + install='kdeaccessibility.install' + cd $srcdir/build/kmouth + make DESTDIR=$pkgdir install + cd $srcdir/build/kmouth/doc + make DESTDIR=$pkgdir install +} diff --git a/community-staging/qbittorrent/qbittorrent.install b/kde-unstable/kdeaccessibility/kdeaccessibility.install index e70c054ec..e70c054ec 100644 --- a/community-staging/qbittorrent/qbittorrent.install +++ b/kde-unstable/kdeaccessibility/kdeaccessibility.install diff --git a/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD new file mode 100644 index 000000000..ceac7ec49 --- /dev/null +++ b/kde-unstable/kdeadmin/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 124778 2011-05-24 11:55:25Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeadmin +pkgname=('kdeadmin-kcron' + 'kdeadmin-ksystemlog' + 'kdeadmin-kuser' + 'kdeadmin-system-config-printer-kde') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeadmin') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' + 'system-config-printer-common') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'syslog-path.patch') +sha1sums=('ceb0ccd2d24b64770f6ac7649d312937a09a17e2' + '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + patch -p1 -i ${srcdir}/syslog-path.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_strigi-analyzer=OFF + make +} + +package_kdeadmin-kcron() { + pkgdesc='Configure and schedule tasks' + depends=('kdelibs') + cd $srcdir/build/kcron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcron + make DESTDIR=$pkgdir install +} + +package_kdeadmin-ksystemlog() { + pkgdesc='System log viewer tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/ksystemlog/" + cd $srcdir/build/ksystemlog + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksystemlog + make DESTDIR=$pkgdir install +} + +package_kdeadmin-kuser() { + pkgdesc='User Manager' + depends=('kdepim-runtime') + url="http://kde.org/applications/system/kuser/" + install='kdeadmin.install' + cd $srcdir/build/kuser + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kuser + make DESTDIR=$pkgdir install +} + +package_kdeadmin-system-config-printer-kde() { + pkgdesc='Configure local and remote Printers' + depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt') + url="http://kde.org/applications/system/printerapplet/" + cd $srcdir/build/system-config-printer-kde + make DESTDIR=$pkgdir install + + # Use the python2 executable + find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} diff --git a/staging/kdeedu/kdeedu.install b/kde-unstable/kdeadmin/kdeadmin.install index e70c054ec..e70c054ec 100644 --- a/staging/kdeedu/kdeedu.install +++ b/kde-unstable/kdeadmin/kdeadmin.install diff --git a/kde-unstable/kdeadmin/syslog-path.patch b/kde-unstable/kdeadmin/syslog-path.patch new file mode 100644 index 000000000..8a9142bf6 --- /dev/null +++ b/kde-unstable/kdeadmin/syslog-path.patch @@ -0,0 +1,11 @@ +--- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100 ++++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100 +@@ -39,7 +39,7 @@ + SystemConfiguration() : + GenericLogModeConfiguration( + QLatin1String( SYSTEM_LOG_MODE_ID ), +- QStringList() << QLatin1String( "/var/log/syslog" ), ++ QStringList() << QLatin1String( "/var/log/messages.log" ), + QList<int>() << INFORMATION_LOG_LEVEL_ID + ) { + diff --git a/kde-unstable/kdeartwork/PKGBUILD b/kde-unstable/kdeartwork/PKGBUILD new file mode 100644 index 000000000..0118d8b45 --- /dev/null +++ b/kde-unstable/kdeartwork/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 124845 2011-05-24 18:14:29Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeartwork +pkgname=('kdeartwork-aurorae' + 'kdeartwork-colorschemes' + 'kdeartwork-desktopthemes' + 'kdeartwork-emoticons' + 'kdeartwork-iconthemes' + 'kdeartwork-kscreensaver' + 'kdeartwork-sounds' + 'kdeartwork-styles' + 'kdeartwork-wallpapers' + 'kdeartwork-weatherwallpapers') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeartwork') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' + 'kdebase-workspace' 'libkexiv2') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('70c5274f2c933b87c10a1ae53eb6971ae3887e87') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeartwork-aurorae() { + pkgdesc='An Aurorae theme based on the Oxygen plasma theme' + cd $srcdir/build/aurorae + make DESTDIR=$pkgdir install +} + +package_kdeartwork-colorschemes() { + pkgdesc='KDE color schemes' + replaces=('kdeaccessibility-colorschemes') + cd $srcdir/build/ColorSchemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-desktopthemes() { + pkgdesc='KDE desktop themes' + cd $srcdir/build/desktopthemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-emoticons() { + pkgdesc='KDE emoticons' + cd $srcdir/build/emoticons + make DESTDIR=$pkgdir install +} + +package_kdeartwork-iconthemes() { + pkgdesc='KDE icon themes' + replaces=('kdeaccessibility-iconthemes') + cd $srcdir/build/IconThemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-kscreensaver() { + pkgdesc='KDE screensaver' + depends=('kdebase-workspace' 'libkexiv2') + cd $srcdir/build/kscreensaver + make DESTDIR=$pkgdir install +} + +package_kdeartwork-sounds() { + pkgdesc='KDE sounds' + cd $srcdir/build/sounds + make DESTDIR=$pkgdir install +} + +package_kdeartwork-styles() { + pkgdesc='KDE styles' + depends=('kdebase-workspace') + cd $srcdir/build/styles + make DESTDIR=$pkgdir install + cd $srcdir/build/kwin-styles + make DESTDIR=$pkgdir install +} + +package_kdeartwork-wallpapers() { + pkgdesc='KDE wallpapers' + cd $srcdir/build/wallpapers + make DESTDIR=$pkgdir install + cd $srcdir/build/HighResolutionWallpapers + make DESTDIR=$pkgdir install +} + +package_kdeartwork-weatherwallpapers() { + pkgdesc='KDE weather wallpapers' + cd $srcdir/build/WeatherWallpapers + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdebase-konsole/PKGBUILD b/kde-unstable/kdebase-konsole/PKGBUILD new file mode 100644 index 000000000..105e3dc39 --- /dev/null +++ b/kde-unstable/kdebase-konsole/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124800 2011-05-24 13:26:15Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebase-konsole +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://kde.org/applications/system/konsole/' +pkgdesc="Terminal" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.bz2") +sha1sums=('7e7b5a0b37ae4d22e51a61f70afccbba86a93921') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../konsole-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD new file mode 100644 index 000000000..70105c4ec --- /dev/null +++ b/kde-unstable/kdebase-runtime/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdebase-runtime +_pkgname=kde-runtime +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE Base Runtime Environment" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' + 'xorg-xauth' 'hicolor-icon-theme') +makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib') +optdepends=('htdig: to build the search index in khelpcenter' + 'rarian: needed by khelpcenter' + 'gdb: drkonq crash handler') +install="${pkgname}.install" +source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('5d06c11f43beb21ebf6c47d2a7addcbe710e019e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install + rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" +} diff --git a/kde-unstable/kdebase-runtime/kdebase-runtime.install b/kde-unstable/kdebase-runtime/kdebase-runtime.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/kde-unstable/kdebase-runtime/kdebase-runtime.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD new file mode 100644 index 000000000..fae8c192f --- /dev/null +++ b/kde-unstable/kdebase-workspace/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 125374 2011-05-26 12:53:42Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdebase-workspace +_pkgname=kde-workspace +pkgver=4.6.80 +pkgrel=2 +pkgdesc="KDE Base Workspace" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde') +# note on libxdamage: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxdamage +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' + 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx' + 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'kde-wallpapers') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +install="${pkgname}.install" +backup=('usr/share/config/kdm/kdmrc' + 'etc/pam.d/kde' + 'etc/pam.d/kde-np' + 'etc/pam.d/kscreensaver') +options=('emptydirs') +source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" + 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'fixpath.patch' 'terminate-server.patch') +sha1sums=('99bf68ee90c4cfa3568527a55c7c68d4247d9b13' + '8c2bdefb23a03b753b78d16944d03fa3939d2d99' + '5db3a245201bd4a50e65aa2ef583cf5490e4f646' + 'f7b38af38549242a240f1a90ab9964ca8a366129' + '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'd7b5883f7e65c6839b1f65f94d58026673dd0226' + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + patch -p0 -i ${srcdir}/kdm-zsh-profile.patch + patch -p0 -i ${srcdir}/fixpath.patch + patch -p0 -i ${srcdir}/terminate-server.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xmms=OFF \ + -DWITH_Googlegadgets=OFF \ + -DWITH_libgps=OFF \ + -DWITH_Prison=OFF \ + -DWITH_NetworkManager=OFF \ + -DKWIN_MOBILE_EFFECTS=OFF \ + -DWITH_OpenGLES=OFF \ + -DKWIN_BUILD_WITH_OPENGLES=OFF + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + + install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm + install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde + install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np + install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver + install -d -m755 ${pkgdir}/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/ + install -d -m755 ${pkgdir}/etc/kde/{env,shutdown} + + install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm +} diff --git a/kde-unstable/kdebase-workspace/fixpath.patch b/kde-unstable/kdebase-workspace/fixpath.patch new file mode 100644 index 000000000..be2b8383e --- /dev/null +++ b/kde-unstable/kdebase-workspace/fixpath.patch @@ -0,0 +1,34 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -34,22 +34,6 @@ + MALLOC_CHECK_=2 + export MALLOC_CHECK_ + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do diff --git a/testing/gdm/gdm-autologin.pam b/kde-unstable/kdebase-workspace/kde-np.pam index 7c2f9a985..81eeef47b 100644 --- a/testing/gdm/gdm-autologin.pam +++ b/kde-unstable/kdebase-workspace/kde-np.pam @@ -1,8 +1,7 @@ #%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so +auth required pam_nologin.so auth required pam_permit.so account required pam_unix.so password required pam_unix.so -session required pam_limits.so session required pam_unix.so +session required pam_limits.so
\ No newline at end of file diff --git a/kde-unstable/kdebase-workspace/kde.pam b/kde-unstable/kdebase-workspace/kde.pam new file mode 100644 index 000000000..1a259390f --- /dev/null +++ b/kde-unstable/kdebase-workspace/kde.pam @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so
\ No newline at end of file diff --git a/kde-unstable/kdebase-workspace/kdebase-workspace.install b/kde-unstable/kdebase-workspace/kdebase-workspace.install new file mode 100644 index 000000000..f7d6d305b --- /dev/null +++ b/kde-unstable/kdebase-workspace/kdebase-workspace.install @@ -0,0 +1,25 @@ +post_install() { + groupadd -g 135 kdm &>/dev/null + useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null + getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_remove() { + if getent passwd kdm >/dev/null 2>&1; then + userdel kdm + fi + if getent group kdm >/dev/null 2>&1; then + groupdel kdm + fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/kde-unstable/kdebase-workspace/kdm b/kde-unstable/kdebase-workspace/kdm new file mode 100644 index 000000000..799d58f4b --- /dev/null +++ b/kde-unstable/kdebase-workspace/kdm @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/kdm) +case "$1" in + start) + stat_busy "Starting KDE Desktop Manager" + [ -z "$PID" ] && /usr/bin/kdm &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon kdm + stat_done + fi + ;; + stop) + stat_busy "Stopping KDE Desktop Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kdm + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch b/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch new file mode 100644 index 000000000..779456b39 --- /dev/null +++ b/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch @@ -0,0 +1,11 @@ +--- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000 ++++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000 +@@ -662,7 +662,7 @@ + " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n" + " zhome=${ZDOTDIR:-$HOME}\n" + " # zshenv is always sourced automatically.\n" +-" [ -f $zdir/zprofile ] && . $zdir/zprofile\n" ++" [ -f /etc/profile ] && . /etc/profile\n" + " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n" + " [ -f $zdir/zlogin ] && . $zdir/zlogin\n" + " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n" diff --git a/kde-unstable/kdebase-workspace/kscreensaver.pam b/kde-unstable/kdebase-workspace/kscreensaver.pam new file mode 100644 index 000000000..b4d80c21f --- /dev/null +++ b/kde-unstable/kdebase-workspace/kscreensaver.pam @@ -0,0 +1 @@ +auth required pam_unix_auth.so diff --git a/kde-unstable/kdebase-workspace/terminate-server.patch b/kde-unstable/kdebase-workspace/terminate-server.patch new file mode 100644 index 000000000..094591317 --- /dev/null +++ b/kde-unstable/kdebase-workspace/terminate-server.patch @@ -0,0 +1,11 @@ +--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 ++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 +@@ -1448,7 +1448,7 @@ + + Key: TerminateServer + Type: bool +-Default: false ++Default: true + User: core + Instance: #:*/! + Merge: xdm diff --git a/kde-unstable/kdebase/PKGBUILD b/kde-unstable/kdebase/PKGBUILD new file mode 100644 index 000000000..da7098290 --- /dev/null +++ b/kde-unstable/kdebase/PKGBUILD @@ -0,0 +1,117 @@ +# $Id: PKGBUILD 124659 2011-05-23 19:43:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdebase +pkgname=('kdebase-dolphin' + 'kdebase-kdepasswd' + 'kdebase-kdialog' + 'kdebase-keditbookmarks' + 'kdebase-kfind' + 'kdebase-konq-plugins' + 'kdebase-konqueror' + 'kdebase-lib' + 'kdebase-plasma') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml') +source=("http://download.kde.org/unstable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2") +sha1sums=('f89b848791628d675e26dd7e703bd79834d1c951') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../kde-baseapps-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdebase-dolphin() { + pkgdesc='File Manager' + depends=('kdebase-runtime' 'kdebase-lib') + optdepends=('ruby: servicemenu installation') + url="http://kde.org/applications/system/dolphin/" + cd $srcdir/build/dolphin + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dolphin + make DESTDIR=$pkgdir install +} + +package_kdebase-kdepasswd() { + pkgdesc='Change Password' + depends=('kdebase-runtime' 'kdebase-lib') + cd $srcdir/build/kdepasswd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdepasswd + make DESTDIR=$pkgdir install +} + +package_kdebase-kdialog() { + pkgdesc='A utility for displaying dialog boxes from shell scripts' + depends=('kdebase-runtime') + cd $srcdir/build/kdialog + make DESTDIR=$pkgdir install +} + +package_kdebase-keditbookmarks() { + pkgdesc='Bookmark Organizer and Editor' + depends=('kdebase-runtime') + cd $srcdir/build/keditbookmarks + make DESTDIR=$pkgdir install +} + +package_kdebase-kfind() { + pkgdesc='Find Files/Folders' + depends=('kdebase-runtime' 'kdebase-lib') + url="http://kde.org/applications/utilities/kfind/" + install='kdebase.install' + cd $srcdir/build/kfind + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfind + make DESTDIR=$pkgdir install +} + +package_kdebase-konq-plugins() { + pkgdesc='Extra plugins for Konqueror' + depends=('kdebase-konqueror') + replaces=('konq-plugins') + install='kdebase.install' + cd $srcdir/build/konq-plugins + make DESTDIR=$pkgdir install +} + +package_kdebase-konqueror() { + pkgdesc='KDE File Manager & Web Browser' + depends=('kdebase-dolphin' 'kdebase-keditbookmarks') + optdepends=('kwebkitpart: to enable webkit engine') + url="http://kde.org/applications/internet/konqueror/" + install='kdebase.install' + conflicts=('kdebase-nsplugins') + replaces=('kdebase-nsplugins') + for i in konqueror doc/konqueror nsplugins; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdebase-lib() { + pkgdesc='KDE libraries for the basic desktop applications' + groups=() + depends=('kdelibs') + cd $srcdir/build/lib + make DESTDIR=$pkgdir install +} + +package_kdebase-plasma() { + pkgdesc='Display the contents of folders (User´s home folder as default)' + depends=('kdebase-workspace' 'kdebase-lib') + cd $srcdir/build/plasma + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdebase/kdebase.install b/kde-unstable/kdebase/kdebase.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdebase/kdebase.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdebindings-kimono/PKGBUILD b/kde-unstable/kdebindings-kimono/PKGBUILD new file mode 100644 index 000000000..0fa73a2b1 --- /dev/null +++ b/kde-unstable/kdebindings-kimono/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124934 2011-05-25 09:35:20Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-kimono +pkgver=4.6.80 +pkgrel=1 +pkgdesc=".NET/Mono bindings for the KDE libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-qyoto' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') +conflicts=('kdebindings-csharp') +source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.bz2") +sha1sums=('911dfbee3141ca0f72c13e15bafc549ccd9ab33a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kimono-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-korundum/PKGBUILD b/kde-unstable/kdebindings-korundum/PKGBUILD new file mode 100644 index 000000000..9c40054a2 --- /dev/null +++ b/kde-unstable/kdebindings-korundum/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124940 2011-05-25 09:48:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-korundum +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE bindings for ruby" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-qtruby' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' + 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') +conflicts=('kdebindings-ruby') +source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2") +sha1sums=('30209e7e3d3dc54c7eb787d7e7bcc90735c5bc1a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../korundum-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-perlkde/PKGBUILD b/kde-unstable/kdebindings-perlkde/PKGBUILD new file mode 100644 index 000000000..4dfb0d07e --- /dev/null +++ b/kde-unstable/kdebindings-perlkde/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124941 2011-05-25 09:55:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-perlkde +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Perl bindings for the KDE libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-perlqt' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' + 'kdegraphics-okular' 'kdesdk-kate') +source=("http://download.kde.org/unstable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") +sha1sums=('0d689b8ffcfaeb1f4e216f00f0ddacb5f59b9047') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../perlkde-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD new file mode 100644 index 000000000..a8268f3c5 --- /dev/null +++ b/kde-unstable/kdebindings-perlqt/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124667 2011-05-23 20:36:47Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-perlqt +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Perl bindings for the Qt libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-smokeqt') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +source=("http://download.kde.org/unstable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") +sha1sums=('aa6f72ff5eed3f178a1d7274e61c2c7ed81fd74e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../perlqt-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD new file mode 100644 index 000000000..817ca914a --- /dev/null +++ b/kde-unstable/kdebindings-python/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 124775 2011-05-24 11:26:16Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-python +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE bindings for python" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2" + 'fix-build.patch') +sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da' + '3d2329981ea571d38f0354c6d1300a2743a775db') + +build() { + cd "${srcdir}"/pykde4-${pkgver} + patch -p3 -i "${srcdir}"/fix-build.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../pykde4-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} +sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da' + '4eb8917ad922819bbea038d79a9786cf5d0e2767') diff --git a/kde-unstable/kdebindings-python/fix-build.patch b/kde-unstable/kdebindings-python/fix-build.patch new file mode 100644 index 000000000..6a3d0c9cf --- /dev/null +++ b/kde-unstable/kdebindings-python/fix-build.patch @@ -0,0 +1,96 @@ +--- a/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
++++ b/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
+@@ -18,6 +18,7 @@
+ Boston, MA 02111-1307, USA.
+ */
+
++#include <Python.h>
+ #include <QtCore/QCoreApplication>
+ #include <QFileInfo>
+ #include <QDir>
+@@ -25,7 +26,6 @@
+ #include <klibloader.h>
+ #include <kstandarddirs.h>
+ #include <kcmodule.h>
+-#include <Python.h>
+ #include <kcomponentdata.h>
+ #include <kdebug.h>Index: b/python/pykde4/CMakeLists.txt
+===================================================================
+--- a/python/pykde4/CMakeLists.txt
++++ b/python/pykde4/CMakeLists.txt
+@@ -87,6 +87,9 @@
+ ${KDEPIMLIBS_INCLUDE_DIRS}
+ )
+
++# Pull in ARM configuration options if needed
++STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
++
+ SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
+ SET(SIP_CONCAT_PARTS 8)
+ IF (WIN32)
+@@ -94,7 +97,7 @@
+ ELSE (WIN32)
+ SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+ ENDIF (WIN32)
+-SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
++SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
+
+ # Use an extra option when compiling on Python 3.
+ IF (PYTHON_3)diff -ur kdebindings-4.5.95/python/pykde4/sip/nepomuk/nuao.sip kdebindings-4.5.95.mine/python/pykde4/sip/nepomuk/nuao.sip
+--- kdebindings-4.5.95/python/pykde4/sip/nepomuk/nuao.sip 2010-12-22 09:55:07.000000000 +0000
++++ kdebindings-4.5.95.mine/python/pykde4/sip/nepomuk/nuao.sip 2011-01-07 00:04:41.157926502 +0000
+@@ -32,7 +32,7 @@
+ QUrl Event ();
+ QUrl ModificationEvent ();
+ QUrl UsageEvent ();
+-QUrl duration ();
++QUrl end ();
+ QUrl eventCount ();
+ QUrl firstEvent ();
+ QUrl firstModification ();--- a/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
++++ b/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
+@@ -297,7 +297,7 @@ QLibrary *LoadPythonLibrary()
+ {
+ QLibrary *pythonLib = new QLibrary();
+ pythonLib->setLoadHints(QLibrary::ExportExternalSymbolsHint);
+- pythonLib->setFileName(LIB_PYTHON);
++ pythonLib->setFileName(LIB_PYTHON ".1");
+ pythonLib->load();
+ return pythonLib;
+ }Index: b/python/pykde4/CMakeLists.txt
+===================================================================
+--- a/python/pykde4/CMakeLists.txt
++++ b/python/pykde4/CMakeLists.txt
+@@ -15,6 +15,18 @@
+ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde)
+ ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
+
++# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
++set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
++
++# search packages used by KDE
++find_package(KDE4 REQUIRED)
++include (KDE4Defaults)
++include (MacroLibrary)
++include(MacroOptionalAddSubdirectory)
++
++add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT)
++
++
+ FIND_PACKAGE(PythonLibrary REQUIRED)
+ INCLUDE(PythonMacros)Do not link python modules against -lpython2.X. Since KDE4's cmake file uses --no-undefined by default, we have to remove that from the default CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory.
+
+Index: b/python/pykde4/CMakeLists.txt
+===================================================================
+--- a/python/pykde4/CMakeLists.txt
++++ b/python/pykde4/CMakeLists.txt
+@@ -93,6 +93,9 @@
+
+ ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
+
++# Do not use --no-undefined for python modules.
++STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
++
+ FILE(GLOB kdecore_files_sip sip/kdecore/*.sip)
+ set(SIP_EXTRA_FILES_DEPEND ${kdecore_files_sip})
+ ADD_SIP_PYTHON_MODULE(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTNETWORK_LIBRARY})
diff --git a/kde-unstable/kdebindings-qtruby/PKGBUILD b/kde-unstable/kdebindings-qtruby/PKGBUILD new file mode 100644 index 000000000..82fd53c1b --- /dev/null +++ b/kde-unstable/kdebindings-qtruby/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-qtruby +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Qt bindings for ruby" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-smokeqt' 'ruby') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-ruby') +source=("http://download.kde.org/unstable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") +sha1sums=('9b153784efb3187ca4f38a14355b8a5ce283316c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../qtruby-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-qyoto/PKGBUILD b/kde-unstable/kdebindings-qyoto/PKGBUILD new file mode 100644 index 000000000..d130b397d --- /dev/null +++ b/kde-unstable/kdebindings-qyoto/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-qyoto +pkgver=4.6.80 +pkgrel=1 +pkgdesc=".NET/Mono bindings for the Qt libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-smokeqt' 'mono') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-csharp') +source=("http://download.kde.org/unstable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") +sha1sums=('7f63ae1c1e30edf226ca8418d5fa78edaf42cb36') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../qyoto-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD new file mode 100644 index 000000000..ba2edc4f6 --- /dev/null +++ b/kde-unstable/kdebindings-smokegen/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-smokegen +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A general purpose C++ parser with a plugin infrastructure" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") +sha1sums=('ce860f4308df4cc91b1e49d0f1f5bca3805c4cf1') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokegen-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-smokekde/PKGBUILD b/kde-unstable/kdebindings-smokekde/PKGBUILD new file mode 100644 index 000000000..6f9724353 --- /dev/null +++ b/kde-unstable/kdebindings-smokekde/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124928 2011-05-25 09:28:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-smokekde +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Language independent library for KDE bindings" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebindings-smokeqt') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' + 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") +sha1sums=('9fd8cbac3f0affce6fa078b07ca418a5e0c79521') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokekde-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD new file mode 100644 index 000000000..c7bdbcbd1 --- /dev/null +++ b/kde-unstable/kdebindings-smokeqt/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-smokeqt +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Language independent library for Qt bindings" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebindings') +depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") +sha1sums=('872b77e7e445b7492a647e63e267677604d76a96') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokeqt-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-blinken/PKGBUILD b/kde-unstable/kdeedu-blinken/PKGBUILD new file mode 100644 index 000000000..7ebd3c811 --- /dev/null +++ b/kde-unstable/kdeedu-blinken/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-blinken +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Memory Enhancement Game" +url="http://kde.org/applications/education/blinken/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/blinken-${pkgver}.tar.bz2") +sha1sums=('847ee81d2a4f5f1acb4bf8c0835c2e8187a631ea') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../blinken-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-blinken/kdeedu-blinken.install b/kde-unstable/kdeedu-blinken/kdeedu-blinken.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-blinken/kdeedu-blinken.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-cantor/PKGBUILD b/kde-unstable/kdeedu-cantor/PKGBUILD new file mode 100644 index 000000000..a82cacfaa --- /dev/null +++ b/kde-unstable/kdeedu-cantor/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-cantor +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE Frontend to Mathematical Software" +url="http://kde.org/applications/education/cantor/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'r' 'libspectre') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.bz2") +sha1sums=('0c6ebd5e523bf5fdf01bbf654ce60a55fc72cbe2') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../cantor-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-cantor/kdeedu-cantor.install b/kde-unstable/kdeedu-cantor/kdeedu-cantor.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-cantor/kdeedu-cantor.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kalgebra/PKGBUILD b/kde-unstable/kdeedu-kalgebra/PKGBUILD new file mode 100644 index 000000000..40b24830e --- /dev/null +++ b/kde-unstable/kdeedu-kalgebra/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kalgebra +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Graph Calculator" +url="http://kde.org/applications/education/kalgebra/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") +sha1sums=('d448a675782157d8c553db497e048231d6eb5f53') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kalgebra-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install b/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kalzium/PKGBUILD b/kde-unstable/kdeedu-kalzium/PKGBUILD new file mode 100644 index 000000000..8bc1d0c3c --- /dev/null +++ b/kde-unstable/kdeedu-kalzium/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kalzium +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Periodic Table of Elements" +url="http://kde.org/applications/education/kalzium/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdelibs' 'avogadro' 'ocaml') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") +sha1sums=('1ace4d42711904d9556efbe1ff89dc4c803887fe') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kalzium-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install b/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kanagram/PKGBUILD b/kde-unstable/kdeedu-kanagram/PKGBUILD new file mode 100644 index 000000000..45a33746c --- /dev/null +++ b/kde-unstable/kdeedu-kanagram/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kanagram +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Letter Order Game" +url="http://kde.org/applications/education/kanagram/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") +sha1sums=('b7075ffa2c366acecfce13b5bef9938c6317aefb') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kanagram-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install b/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kbruch/PKGBUILD b/kde-unstable/kdeedu-kbruch/PKGBUILD new file mode 100644 index 000000000..9710c1df2 --- /dev/null +++ b/kde-unstable/kdeedu-kbruch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kbruch +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Exercise Fractions" +url="http://kde.org/applications/education/kbruch/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") +sha1sums=('205b7f2171e67b55fc1bbcd0844702daf9dcb4a6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kbruch-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install b/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kgeography/PKGBUILD b/kde-unstable/kdeedu-kgeography/PKGBUILD new file mode 100644 index 000000000..720c4027a --- /dev/null +++ b/kde-unstable/kdeedu-kgeography/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kgeography +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Geography Trainer" +url="http://kde.org/applications/education/kgeography/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") +sha1sums=('2d161ef150618780e6f2bcf3a8e19993a5c95fa6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kgeography-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install b/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-khangman/PKGBUILD b/kde-unstable/kdeedu-khangman/PKGBUILD new file mode 100644 index 000000000..56df0fbce --- /dev/null +++ b/kde-unstable/kdeedu-khangman/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-khangman +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Hangman Game" +url="http://kde.org/applications/education/khangman/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/khangman-${pkgver}.tar.bz2") +sha1sums=('a3e140a71c27400d49f75b862965123c1df6e992') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../khangman-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-khangman/kdeedu-khangman.install b/kde-unstable/kdeedu-khangman/kdeedu-khangman.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-khangman/kdeedu-khangman.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kig/PKGBUILD b/kde-unstable/kdeedu-kig/PKGBUILD new file mode 100644 index 000000000..ca6f92279 --- /dev/null +++ b/kde-unstable/kdeedu-kig/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 125335 2011-05-25 23:12:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kig +pkgver=4.6.80 +pkgrel=2 +pkgdesc="Interactive Geometry" +url="http://kde.org/applications/education/kig/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kig-${pkgver}.tar.bz2") +sha1sums=('d0b2ca69262b1e720be8ab2b6cfb9dd6b5a81371') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kig-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py +} diff --git a/kde-unstable/kdeedu-kig/kdeedu-kig.install b/kde-unstable/kdeedu-kig/kdeedu-kig.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-kig/kdeedu-kig.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kiten/PKGBUILD b/kde-unstable/kdeedu-kiten/PKGBUILD new file mode 100644 index 000000000..6ba5c4b19 --- /dev/null +++ b/kde-unstable/kdeedu-kiten/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kiten +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Japanese Reference/Study Tool" +url="http://kde.org/applications/education/kiten/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kiten-${pkgver}.tar.bz2") +sha1sums=('a5120c87015e044b4313e889b80afd608341e414') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kiten-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kiten/kdeedu-kiten.install b/kde-unstable/kdeedu-kiten/kdeedu-kiten.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kiten/kdeedu-kiten.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-klettres/PKGBUILD b/kde-unstable/kdeedu-klettres/PKGBUILD new file mode 100644 index 000000000..70f5e54b4 --- /dev/null +++ b/kde-unstable/kdeedu-klettres/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-klettres +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Learn The Alphabet" +url="http://kde.org/applications/education/klettres/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/klettres-${pkgver}.tar.bz2") +sha1sums=('395a1c700eaf1fee83216facbe5442162d383e64') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../klettres-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-klettres/kdeedu-klettres.install b/kde-unstable/kdeedu-klettres/kdeedu-klettres.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-klettres/kdeedu-klettres.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kmplot/PKGBUILD b/kde-unstable/kdeedu-kmplot/PKGBUILD new file mode 100644 index 000000000..8db40962f --- /dev/null +++ b/kde-unstable/kdeedu-kmplot/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kmplot +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Mathematical Function Plotter" +url="http://kde.org/applications/education/kmplot/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") +sha1sums=('be3593a33b05a59d82020d988804e82737abbc09') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmplot-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install b/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kstars/PKGBUILD b/kde-unstable/kdeedu-kstars/PKGBUILD new file mode 100644 index 000000000..77306c68d --- /dev/null +++ b/kde-unstable/kdeedu-kstars/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kstars +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Desktop Planetarium" +url="http://kde.org/applications/education/kstars/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kstars-${pkgver}.tar.bz2") +sha1sums=('c74818da033d70200b873a954a2f05af3e03c610') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kstars-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xplanet=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kstars/kdeedu-kstars.install b/kde-unstable/kdeedu-kstars/kdeedu-kstars.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kstars/kdeedu-kstars.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-ktouch/PKGBUILD b/kde-unstable/kdeedu-ktouch/PKGBUILD new file mode 100644 index 000000000..0b8e706e9 --- /dev/null +++ b/kde-unstable/kdeedu-ktouch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-ktouch +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Touch Typing Tutor" +url="http://kde.org/applications/education/ktouch/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") +sha1sums=('7e80926b1fe45d7af861891a140e843b27cbf171') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ktouch-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install b/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kturtle/PKGBUILD b/kde-unstable/kdeedu-kturtle/PKGBUILD new file mode 100644 index 000000000..dc60d6200 --- /dev/null +++ b/kde-unstable/kdeedu-kturtle/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kturtle +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Educational Programming Environment" +url="http://kde.org/applications/education/kturtle/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") +sha1sums=('5aa67c458212315616a9c67e06a3e8a8a79ee302') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kturtle-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install b/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-kwordquiz/PKGBUILD b/kde-unstable/kdeedu-kwordquiz/PKGBUILD new file mode 100644 index 000000000..76696bc6d --- /dev/null +++ b/kde-unstable/kdeedu-kwordquiz/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kwordquiz +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Flash Card Trainer" +url="http://kde.org/applications/education/kwordquiz/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") +sha1sums=('44277946ffad538cd50690af9475e0520698bafb') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kwordquiz-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD new file mode 100644 index 000000000..39fe50f17 --- /dev/null +++ b/kde-unstable/kdeedu-marble/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-marble +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Desktop Globe" +url="http://kde.org/applications/education/marble/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'gpsd') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2" + 'gpsd-2.96.patch') +sha1sums=('4d7663909efe3b42006debd78f1217bb3dfffd88' + 'f44dfd3bb384e631d59b93d7dda3413795da8183') + +build() { + cd "${srcdir}"/marble-${pkgver} + patch -p1 -i "${srcdir}"/gpsd-2.96.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../marble-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu/gpsd-2.96.patch b/kde-unstable/kdeedu-marble/gpsd-2.96.patch index ec515e99d..e27702181 100644 --- a/staging/kdeedu/gpsd-2.96.patch +++ b/kde-unstable/kdeedu-marble/gpsd-2.96.patch @@ -1,7 +1,5 @@ -Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -=================================================================== ---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp +--- marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp ++++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp @@ -18,6 +18,9 @@ using namespace Marble; GpsdConnection::GpsdConnection( QObject* parent ) diff --git a/kde-unstable/kdeedu-marble/kdeedu-marble.install b/kde-unstable/kdeedu-marble/kdeedu-marble.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-marble/kdeedu-marble.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-parley/PKGBUILD b/kde-unstable/kdeedu-parley/PKGBUILD new file mode 100644 index 000000000..7b27fa558 --- /dev/null +++ b/kde-unstable/kdeedu-parley/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-parley +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Vocabulary Trainer" +url="http://kde.org/applications/education/parley/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/parley-${pkgver}.tar.bz2") +sha1sums=('991f7aeee7849913a167d65b792791724bc5c1aa') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../parley-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-parley/kdeedu-parley.install b/kde-unstable/kdeedu-parley/kdeedu-parley.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdeedu-parley/kdeedu-parley.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD new file mode 100644 index 000000000..1ab660c03 --- /dev/null +++ b/kde-unstable/kdeedu-rocs/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-rocs +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Rocs Graph Theory" +url="http://kde.org/applications/education/rocs/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'boost-libs') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.bz2") +sha1sums=('90ea18d54bc7dc6a87db72e34fb9131849300392') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../rocs-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-step/PKGBUILD b/kde-unstable/kdeedu-step/PKGBUILD new file mode 100644 index 000000000..6b63198df --- /dev/null +++ b/kde-unstable/kdeedu-step/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-step +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Interactive Physical Simulator" +url="http://kde.org/applications/education/step/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/step-${pkgver}.tar.bz2") +sha1sums=('a71d1ed2f92c9b881640b273adafa71240ca6e8a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../step-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdeedu-step/kdeedu-step.install b/kde-unstable/kdeedu-step/kdeedu-step.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeedu-step/kdeedu-step.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/PKGBUILD b/kde-unstable/kdegames/PKGBUILD new file mode 100644 index 000000000..bc3b1576a --- /dev/null +++ b/kde-unstable/kdegames/PKGBUILD @@ -0,0 +1,514 @@ +# $Id: PKGBUILD 124786 2011-05-24 12:57:40Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdegames +pkgname=('kdegames-bomber' + 'kdegames-bovo' + 'kdegames-granatier' + 'kdegames-kajongg' + 'kdegames-kapman' + 'kdegames-katomic' + 'kdegames-kbattleship' + 'kdegames-kblackbox' + 'kdegames-kblocks' + 'kdegames-kbounce' + 'kdegames-kbreakout' + 'kdegames-kdiamond' + 'kdegames-kfourinline' + 'kdegames-kgoldrunner' + 'kdegames-kigo' + 'kdegames-killbots' + 'kdegames-kiriki' + 'kdegames-kjumpingcube' + 'kdegames-klines' + 'kdegames-klickety' + 'kdegames-kmahjongg' + 'kdegames-kmines' + 'kdegames-knetwalk' + 'kdegames-kolf' + 'kdegames-kollision' + 'kdegames-konquest' + 'kdegames-kpatience' + 'kdegames-kreversi' + 'kdegames-kshisen' + 'kdegames-ksirk' + 'kdegames-kspaceduel' + 'kdegames-ksquares' + 'kdegames-ksudoku' + 'kdegames-ktron' + 'kdegames-ktuberling' + 'kdegames-kubrick' + 'kdegames-libkdegames' + 'kdegames-libkmahjongg' + 'kdegames-lskat' + 'kdegames-palapeli') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegames') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted' + 'kdebindings-python' 'openal') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('c9e21203e8f47e1748c309a4ff14c87953c43839') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdegames-bomber() { + pkgdesc='Arcade Bombing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bomber/" + install='kdegames.install' + cd $srcdir/build/bomber + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bomber + make DESTDIR=$pkgdir install +} + +package_kdegames-bovo() { + pkgdesc='Five-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bovo/" + install='kdegames.install' + cd $srcdir/build/bovo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bovo + make DESTDIR=$pkgdir install +} + +package_kdegames-granatier() { + pkgdesc='Granatier' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') + url="http://kde.org/applications/games/granatier/" + install='kdegames.install' + cd $srcdir/build/granatier + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/granatier + make DESTDIR=$pkgdir install +} + +package_kdegames-kajongg() { + pkgdesc='The ancient Chinese board game for 4 players' + depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted') + install='kdegames.install' + cd $srcdir/build/kajongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kajongg + make DESTDIR=$pkgdir install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdegames-kapman() { + pkgdesc='Eat pills escaping ghosts' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kapman/" + install='kdegames.install' + cd $srcdir/build/kapman + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kapman + make DESTDIR=$pkgdir install +} + +package_kdegames-katomic() { + pkgdesc='Sokoban-like Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/katomic/" + install='kdegames.install' + cd $srcdir/build/katomic + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/katomic + make DESTDIR=$pkgdir install +} + +package_kdegames-kbattleship() { + pkgdesc='Battleship Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kbattleship/" + install='kdegames-kbattleship.install' + cd $srcdir/build/kbattleship + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbattleship + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \ + $pkgdir/usr/share/ggz/kbattleship.dsc +} + +package_kdegames-kblackbox() { + pkgdesc='Blackbox Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblackbox/" + install='kdegames.install' + cd $srcdir/build/kblackbox + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblackbox + make DESTDIR=$pkgdir install +} + +package_kdegames-kblocks() { + pkgdesc='Falling Blocks Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblocks/" + install='kdegames.install' + cd $srcdir/build/kblocks + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblocks + make DESTDIR=$pkgdir install +} + +package_kdegames-kbounce() { + pkgdesc='Ball Bouncing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbounce/" + install='kdegames.install' + cd $srcdir/build/kbounce + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbounce + make DESTDIR=$pkgdir install +} + +package_kdegames-kbreakout() { + pkgdesc='Breakout-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbreakout/" + install='kdegames.install' + cd $srcdir/build/kbreakout + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbreakout + make DESTDIR=$pkgdir install +} + +package_kdegames-kdiamond() { + pkgdesc='Three-in-a-row game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kdiamond/" + install='kdegames.install' + cd $srcdir/build/kdiamond + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdiamond + make DESTDIR=$pkgdir install +} + +package_kdegames-kfourinline() { + pkgdesc='Four-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kfourinline/" + install='kdegames-kfourinline.install' + cd $srcdir/build/kfourinline + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfourinline + make DESTDIR=$pkgdir install +} + +package_kdegames-kgoldrunner() { + pkgdesc='A game of action and puzzle-solving' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kgoldrunner/" + install='kdegames.install' + cd $srcdir/build/kgoldrunner + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgoldrunner + make DESTDIR=$pkgdir install +} + +package_kdegames-kigo() { + pkgdesc='Go Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo') + url="http://kde.org/applications/games/kigo/" + install='kdegames-kigo.install' + cd $srcdir/build/kigo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kigo + make DESTDIR=$pkgdir install +} + +package_kdegames-killbots() { + pkgdesc='Killbots' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/killbots/" + install='kdegames.install' + cd $srcdir/build/killbots + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/killbots + make DESTDIR=$pkgdir install +} + +package_kdegames-kiriki() { + pkgdesc='Yahtzee-like Dice Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kiriki/" + install='kdegames.install' + cd $srcdir/build/kiriki + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kiriki + make DESTDIR=$pkgdir install +} + +package_kdegames-kjumpingcube() { + pkgdesc='Territory Capture Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kjumpingcube/" + install='kdegames.install' + cd $srcdir/build/kjumpingcube + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kjumpingcube + make DESTDIR=$pkgdir install +} + +package_kdegames-klickety() { + pkgdesc='Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + replaces=('kdegames-ksame') + conflicts=('kdegames-ksame') + url="http://kde.org/applications/games/ksame/" + install='kdegames.install' + cd $srcdir/build/klickety + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klickety + make DESTDIR=$pkgdir install +} + +package_kdegames-klines() { + pkgdesc='Tactical Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/klines/" + install='kdegames.install' + cd $srcdir/build/klines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klines + make DESTDIR=$pkgdir install +} + +package_kdegames-kmahjongg() { + pkgdesc='Mahjongg Solitaire' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kmahjongg/" + install='kdegames.install' + cd $srcdir/build/kmahjongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-kmines() { + pkgdesc='Minesweeper-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kmines/" + install='kdegames.install' + cd $srcdir/build/kmines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmines + make DESTDIR=$pkgdir install +} + +package_kdegames-knetwalk() { + pkgdesc='Network Construction Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/knetwalk/" + install='kdegames.install' + cd $srcdir/build/knetwalk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/knetwalk + make DESTDIR=$pkgdir install +} + +package_kdegames-kolf() { + pkgdesc='Miniature Golf' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kolf/" + install='kdegames-kolf.install' + cd $srcdir/build/kolf + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kolf + make DESTDIR=$pkgdir install +} + +package_kdegames-kollision() { + pkgdesc='A simple ball dodging game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kollision/" + install='kdegames.install' + cd $srcdir/build/kollision + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kollision + make DESTDIR=$pkgdir install +} + +package_kdegames-konquest() { + pkgdesc='Galactic Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/konquest/" + install='kdegames.install' + cd $srcdir/build/konquest + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/konquest + make DESTDIR=$pkgdir install +} + +package_kdegames-kpatience() { + pkgdesc='Patience Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kpatience/" + install='kdegames.install' + replaces=('kdegames-kpat') + cd $srcdir/build/kpat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kpat + make DESTDIR=$pkgdir install +} + +package_kdegames-kreversi() { + pkgdesc='Reversi Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kreversi/" + install='kdegames-kreversi.install' + cd $srcdir/build/kreversi + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kreversi + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \ + $pkgdir/usr/share/ggz/kreversi.dsc +} + +package_kdegames-kshisen() { + pkgdesc='Shisen-Sho Mahjongg-like Tile Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kshisen/" + install='kdegames.install' + cd $srcdir/build/kshisen + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kshisen + make DESTDIR=$pkgdir install +} + +package_kdegames-ksirk() { + pkgdesc='World Domination Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksirk/" + install='kdegames.install' + cd $srcdir/build/ksirk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksirk + make DESTDIR=$pkgdir install +} + +package_kdegames-kspaceduel() { + pkgdesc='Space Arcade Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kspaceduel/" + install='kdegames-kspaceduel.install' + cd $srcdir/build/kspaceduel + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kspaceduel + make DESTDIR=$pkgdir install +} + +package_kdegames-ksquares() { + pkgdesc='Connect the dots to create squares' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/ksquares/" + install='kdegames-ksquares.install' + cd $srcdir/build/ksquares + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksquares + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \ + $pkgdir/usr/share/ggz/ksquares.dsc +} + +package_kdegames-ksudoku() { + pkgdesc='KSudoku, Sudoku game & more for KDE' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksudoku/" + install='kdegames.install' + cd $srcdir/build/ksudoku + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksudoku + make DESTDIR=$pkgdir install +} + +package_kdegames-ktron() { + pkgdesc='Tron-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktron/" + install='kdegames.install' + cd $srcdir/build/ktron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktron + make DESTDIR=$pkgdir install +} + +package_kdegames-ktuberling() { + pkgdesc='Picture Game for Children' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktuberling/" + install='kdegames-ktuberling.install' + cd $srcdir/build/ktuberling + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktuberling + make DESTDIR=$pkgdir install +} + +package_kdegames-kubrick() { + pkgdesc='A 3-D game based on Rubik´s Cube' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kubrick/" + install='kdegames.install' + cd $srcdir/build/kubrick + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kubrick + make DESTDIR=$pkgdir install +} + +package_kdegames-libkdegames() { + pkgdesc='KDE game library' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkdegames + make DESTDIR=$pkgdir install + for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do + install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i) + done +} + +package_kdegames-libkmahjongg() { + pkgdesc='Library used for loading and rendering of Mahjongg tilesets' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-lskat() { + pkgdesc='Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/lskat/" + install='kdegames-lskat.install' + cd $srcdir/build/lskat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/lskat + make DESTDIR=$pkgdir install +} + +package_kdegames-palapeli() { + pkgdesc='Jigsaw puzzle game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/palapeli/" + install='kdegames-palapeli.install' + cd $srcdir/build/palapeli + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/palapeli + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdegames/kdegames-kbattleship.install b/kde-unstable/kdegames/kdegames-kbattleship.install new file mode 100644 index 000000000..ac4516ed0 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kbattleship.install @@ -0,0 +1,24 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kbattleship.dsc ]; then + ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/kde-unstable/kdegames/kdegames-kfourinline.install b/kde-unstable/kdegames/kdegames-kfourinline.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kfourinline.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-kigo.install b/kde-unstable/kdegames/kdegames-kigo.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kigo.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-kolf.install b/kde-unstable/kdegames/kdegames-kolf.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kolf.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-kreversi.install b/kde-unstable/kdegames/kdegames-kreversi.install new file mode 100644 index 000000000..4623e6e49 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kreversi.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kreversi.dsc ]; then + ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/kde-unstable/kdegames/kdegames-kspaceduel.install b/kde-unstable/kdegames/kdegames-kspaceduel.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-kspaceduel.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-ksquares.install b/kde-unstable/kdegames/kdegames-ksquares.install new file mode 100644 index 000000000..5a619897d --- /dev/null +++ b/kde-unstable/kdegames/kdegames-ksquares.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/ksquares.dsc ]; then + ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/kde-unstable/kdegames/kdegames-ktuberling.install b/kde-unstable/kdegames/kdegames-ktuberling.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-ktuberling.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-lskat.install b/kde-unstable/kdegames/kdegames-lskat.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-lskat.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames-palapeli.install b/kde-unstable/kdegames/kdegames-palapeli.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/kde-unstable/kdegames/kdegames-palapeli.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegames/kdegames.install b/kde-unstable/kdegames/kdegames.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdegames/kdegames.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-gwenview/PKGBUILD b/kde-unstable/kdegraphics-gwenview/PKGBUILD new file mode 100644 index 000000000..c8528477b --- /dev/null +++ b/kde-unstable/kdegraphics-gwenview/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-gwenview +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A fast and easy to use image viewer for KDE" +url="http://kde.org/applications/graphics/gwenview/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-lib' 'libkipi') +makedepends=('cmake' 'automoc4') +optdepends=('kipi-plugins') +source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") +sha1sums=('41b93bdcab6ba169be4ed3fcfb481c6ae1161bd6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../gwenview-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install b/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-kamera/PKGBUILD b/kde-unstable/kdegraphics-kamera/PKGBUILD new file mode 100644 index 000000000..17b0a9b3f --- /dev/null +++ b/kde-unstable/kdegraphics-kamera/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kamera +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Configure Kamera" +url="http://kde.org/applications/graphics/kamera/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'gphoto2') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kamera-${pkgver}.tar.bz2") +sha1sums=('cba0e4ca19fe62a9cbfe7b2559e5364c16944901') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kamera-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD new file mode 100644 index 000000000..ebad9e424 --- /dev/null +++ b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kcolorchooser +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Color Chooser" +url="http://kde.org/applications/graphics/kcolorchooser/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") +sha1sums=('99aad5ebb4b1d5d99426e8a33c2f15717cc4087e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kcolorchooser-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-kgamma/PKGBUILD b/kde-unstable/kdegraphics-kgamma/PKGBUILD new file mode 100644 index 000000000..18926be42 --- /dev/null +++ b/kde-unstable/kdegraphics-kgamma/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 124788 2011-05-24 12:59:42Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kgamma +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A monitor calibration tool" +url="http://kde.org/applications/graphics/kgamma/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +# note on libxxf86vm: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxxf86vm +depends=('kdebase-runtime' 'libxxf86vm') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") +sha1sums=('aac4e43df0095e0511bb27cc27a23b10847eb075') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kgamma-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD new file mode 100644 index 000000000..c68c46c2d --- /dev/null +++ b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kolourpaint +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Paint Program" +url="http://kde.org/applications/graphics/kolourpaint/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'qimageblitz') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") +sha1sums=('c79fc3a31d61623a02e7c89ede19cbe7e49a8518') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kolourpaint-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-kruler/PKGBUILD b/kde-unstable/kdegraphics-kruler/PKGBUILD new file mode 100644 index 000000000..663888d54 --- /dev/null +++ b/kde-unstable/kdegraphics-kruler/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-kruler +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Screen Ruler" +url="http://kde.org/applications/graphics/kruler/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kruler-${pkgver}.tar.bz2") +sha1sums=('b43fee1954baa7b84866a1cd5f15cbcff54d5e3d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kruler-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install b/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD new file mode 100644 index 000000000..4dde21e03 --- /dev/null +++ b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-ksaneplugin +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A scan plugin that implements the scanning" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('libksane') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") +sha1sums=('3caa70899ed3797c9739409d311779f39fa9eda7') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ksaneplugin-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD new file mode 100644 index 000000000..de10d1e5e --- /dev/null +++ b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-ksnapshot +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Screen Capture Program" +url="http://kde.org/applications/graphics/ksnapshot/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdelibs' 'libkipi') +makedepends=('cmake' 'automoc4') +optdepends=('kipi-plugins') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") +sha1sums=('684be8b03920e4a92625337ff18a5b368482dd08') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ksnapshot-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD new file mode 100644 index 000000000..4c027b673 --- /dev/null +++ b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-strigi-analyzer +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Strigi analyzers for various graphics file formats" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('bc4c901bc4bc7080c91ed739d2480294d2fc5033') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-svgpart/PKGBUILD b/kde-unstable/kdegraphics-svgpart/PKGBUILD new file mode 100644 index 000000000..ce748bb92 --- /dev/null +++ b/kde-unstable/kdegraphics-svgpart/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-svgpart +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A KPart for viewving SVGs" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") +sha1sums=('300fc6a062ea34e6131097ae9a59e8279f3c1193') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../svgpart-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD new file mode 100644 index 000000000..7a3e5b1a1 --- /dev/null +++ b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-thumbnailers +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Thumbnailers for various graphics file formats" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('libkexiv2' 'libkdcraw') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('d350cb85ad8520be00f6ee1f05a393d777e0f021') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdegraphics/PKGBUILD b/kde-unstable/kdegraphics/PKGBUILD new file mode 100644 index 000000000..4780a97e7 --- /dev/null +++ b/kde-unstable/kdegraphics/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdegraphics +pkgname=('kdegraphics-okular') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'ebook-tools' + 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('69f191663db147cf481edd9f528fcae50c1dc2c3') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdegraphics-okular() { + pkgdesc='Document Viewer' + depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' + 'ebook-tools' 'libspectre') + url="http://kde.org/applications/graphics/okular/" + install='kdegraphics-okular.install' + cd $srcdir/build/okular + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/okular + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdegraphics/kdegraphics-okular.install b/kde-unstable/kdegraphics/kdegraphics-okular.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdegraphics/kdegraphics-okular.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD new file mode 100644 index 000000000..8bfff6584 --- /dev/null +++ b/kde-unstable/kdelibs/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 124924 2011-05-25 08:50:46Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdelibs +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' + 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' + 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' + 'docbook-xsl') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' + 'hspell') +replaces=('kdelibs-experimental') +install='kdelibs.install' +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'kcalendarsystem-fixed.patch') +sha1sums=('313e051b08762ec68d7d7aaceb5471ede2bf66ac' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + '13cbb58347dc7103684bb002b8f636fc0fa9e738') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # avoid file conflict with gnome-menu + patch -p1 -i $srcdir/kde-applications-menu.patch + # add Archlinux menu entry + patch -p1 -i $srcdir/archlinux-menu.patch + + # Already fixed upstream + patch -p1 -i "${srcdir}"/kcalendarsystem-fixed.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ + -DKDE_DEFAULT_HOME='.kde4' \ + -DWITH_FAM=OFF + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + + # cert bundle seems to be hardcoded + # link it to the one from ca-certificates + rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt +} diff --git a/kde-unstable/kdelibs/archlinux-menu.patch b/kde-unstable/kdelibs/archlinux-menu.patch new file mode 100644 index 000000000..546784fa2 --- /dev/null +++ b/kde-unstable/kdelibs/archlinux-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 ++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 +@@ -16,11 +16,19 @@ + </DefaultLayout> + <Layout> + <Merge type="menus"/> ++ <Menuname>Arch Linux</Menuname> + <Menuname>Applications</Menuname> + <Merge type="files"/> + </Layout> + + <Menu> ++ <Name>Arch Linux</Name> ++ <Directory>Archlinux.directory</Directory> ++ <Include> ++ <Category>Archlinux</Category> ++ </Include> ++ </Menu> ++ <Menu> + <Name>Applications</Name> + <Directory>kde-unknown.directory</Directory> + <OnlyUnallocated/> diff --git a/kde-unstable/kdelibs/kcalendarsystem-fixed.patch b/kde-unstable/kdelibs/kcalendarsystem-fixed.patch new file mode 100644 index 000000000..d97a9b904 --- /dev/null +++ b/kde-unstable/kdelibs/kcalendarsystem-fixed.patch @@ -0,0 +1,18073 @@ +diff --git a/kdecore/date/kcalendarera.cpp b/kdecore/date/kcalendarera.cpp +index d56c265..0a21e37 100644 +--- a/kdecore/date/kcalendarera.cpp ++++ b/kdecore/date/kcalendarera.cpp +@@ -71,21 +71,21 @@ int KCalendarEra::direction() const + return m_direction; + } + +-bool KCalendarEra::isInEra( const QDate &date ) const ++bool KCalendarEra::isInEra(const QDate &date) const + { +- if ( m_endDate < m_startDate ) { +- return ( date >= m_endDate && date <= m_startDate ); ++ if (m_endDate < m_startDate) { ++ return (date >= m_endDate && date <= m_startDate); + } else { +- return ( date >= m_startDate && date <= m_endDate ); ++ return (date >= m_startDate && date <= m_endDate); + } + } + +-int KCalendarEra::yearInEra( int year ) const ++int KCalendarEra::yearInEra(int year) const + { +- return ( ( year - m_startYear ) * m_direction ) + m_offset; ++ return ((year - m_startYear) * m_direction) + m_offset; + } + +-int KCalendarEra::year( int yearInEra ) const ++int KCalendarEra::year(int yearInEra) const + { +- return ( ( yearInEra - m_offset ) / m_direction ) + m_startYear; ++ return ((yearInEra - m_offset) / m_direction) + m_startYear; + } +diff --git a/kdecore/date/kcalendarera_p.h b/kdecore/date/kcalendarera_p.h +index f1f05f7..d1564ea 100644 +--- a/kdecore/date/kcalendarera_p.h ++++ b/kdecore/date/kcalendarera_p.h +@@ -56,9 +56,9 @@ public: + int direction() const; + int offset() const; + +- bool isInEra( const QDate &date ) const; +- int yearInEra( int year ) const; +- int year( int yearInEra ) const; ++ bool isInEra(const QDate &date) const; ++ int yearInEra(int year) const; ++ int year(int yearInEra) const; + + private: + friend class KCalendarSystemPrivate; +diff --git a/kdecore/date/kcalendarsystem.cpp b/kdecore/date/kcalendarsystem.cpp +index ccc02cd..77ef0e9 100644 +--- a/kdecore/date/kcalendarsystem.cpp ++++ b/kdecore/date/kcalendarsystem.cpp +@@ -34,91 +34,92 @@ + #include "kcalendarsystemcoptic_p.h" + #include "kcalendarsystemethiopian_p.h" + #include "kcalendarsystemgregorian_p.h" +-#include "kcalendarsystemgregorianproleptic_p.h" + #include "kcalendarsystemhebrew_p.h" +-#include "kcalendarsystemhijri_p.h" + #include "kcalendarsystemindiannational_p.h" ++#include "kcalendarsystemislamiccivil_p.h" + #include "kcalendarsystemjalali_p.h" + #include "kcalendarsystemjapanese_p.h" + #include "kcalendarsystemjulian_p.h" + #include "kcalendarsystemminguo_p.h" ++#include "kcalendarsystemqdate_p.h" + #include "kcalendarsystemthai_p.h" + +-KCalendarSystem *KCalendarSystem::create( const QString &calendarType, const KLocale *locale ) ++KCalendarSystem *KCalendarSystem::create(const QString &calendarType, const KLocale *locale) + { +- return create( calendarSystemForCalendarType( calendarType ), locale ); ++ return create(calendarSystem(calendarType), locale); + } + +-KCalendarSystem *KCalendarSystem::create( const QString &calendarType, KSharedConfig::Ptr config, +- const KLocale *locale ) ++KCalendarSystem *KCalendarSystem::create(const QString &calendarType, KSharedConfig::Ptr config, ++ const KLocale *locale) + { +- return create( calendarSystemForCalendarType( calendarType ), config, locale ); ++ return create(calendarSystem(calendarType), config, locale); + } + + QStringList KCalendarSystem::calendarSystems() + { + QStringList lst; + +- lst.append( QLatin1String("coptic") ); +- lst.append( QLatin1String("ethiopian") ); +- lst.append( QLatin1String("gregorian") ); +- lst.append( QLatin1String("gregorian-proleptic") ); +- lst.append( QLatin1String("hebrew") ); +- lst.append( QLatin1String("hijri") ); +- lst.append( QLatin1String("indian-national") ); +- lst.append( QLatin1String("jalali") ); +- lst.append( QLatin1String("japanese") ); +- lst.append( QLatin1String("julian") ); +- lst.append( QLatin1String("minguo") ); +- lst.append( QLatin1String("thai") ); ++ lst.append(QLatin1String("coptic")); ++ lst.append(QLatin1String("ethiopian")); ++ lst.append(QLatin1String("gregorian")); ++ lst.append(QLatin1String("gregorian-proleptic")); ++ lst.append(QLatin1String("hebrew")); ++ lst.append(QLatin1String("hijri")); ++ lst.append(QLatin1String("indian-national")); ++ lst.append(QLatin1String("jalali")); ++ lst.append(QLatin1String("japanese")); ++ lst.append(QLatin1String("julian")); ++ lst.append(QLatin1String("minguo")); ++ lst.append(QLatin1String("thai")); + + return lst; + } + +-QString KCalendarSystem::calendarLabel( const QString &calendarType ) ++QString KCalendarSystem::calendarLabel(const QString &calendarType) + { +- if ( calendarSystems().contains( calendarType ) ) { +- return KCalendarSystem::calendarLabel( KCalendarSystem::calendarSystemForCalendarType( calendarType ) ); ++ if (calendarSystemsList().contains(calendarSystem(calendarType))) { ++ return KCalendarSystem::calendarLabel(KCalendarSystem::calendarSystem(calendarType)); + } else { +- return ki18nc( "@item Calendar system", "Invalid Calendar Type" ).toString( KGlobal::locale() ); ++ return ki18nc("@item Calendar system", "Invalid Calendar Type").toString(KGlobal::locale()); + } + } + +-KCalendarSystem *KCalendarSystem::create( KLocale::CalendarSystem calendarSystem, const KLocale *locale ) ++KCalendarSystem *KCalendarSystem::create(KLocale::CalendarSystem calendarSystem, const KLocale *locale) + { +- return create( calendarSystem, KSharedConfig::Ptr(), locale ); ++ return create(calendarSystem, KSharedConfig::Ptr(), locale); + } + +-KCalendarSystem *KCalendarSystem::create( KLocale::CalendarSystem calendarSystem, KSharedConfig::Ptr config, +- const KLocale *locale ) ++KCalendarSystem *KCalendarSystem::create(KLocale::CalendarSystem calendarSystem, ++ KSharedConfig::Ptr config, ++ const KLocale *locale) + { +- switch ( calendarSystem ) { ++ switch (calendarSystem) { + case KLocale::QDateCalendar: +- return new KCalendarSystemGregorian( config, locale ); ++ return new KCalendarSystemQDate(config, locale); + case KLocale::CopticCalendar: +- return new KCalendarSystemCoptic( config, locale ); ++ return new KCalendarSystemCoptic(config, locale); + case KLocale::EthiopianCalendar: +- return new KCalendarSystemEthiopian( config, locale ); ++ return new KCalendarSystemEthiopian(config, locale); + case KLocale::GregorianCalendar: +- return new KCalendarSystemGregorianProleptic( config, locale ); ++ return new KCalendarSystemGregorian(config, locale); + case KLocale::HebrewCalendar: +- return new KCalendarSystemHebrew( config, locale ); +- case KLocale::IslamicCivilCalendar: +- return new KCalendarSystemHijri( config, locale ); ++ return new KCalendarSystemHebrew(config, locale); + case KLocale::IndianNationalCalendar: +- return new KCalendarSystemIndianNational( config, locale ); ++ return new KCalendarSystemIndianNational(config, locale); ++ case KLocale::IslamicCivilCalendar: ++ return new KCalendarSystemIslamicCivil(config, locale); + case KLocale::JalaliCalendar: +- return new KCalendarSystemJalali( config, locale ); ++ return new KCalendarSystemJalali(config, locale); + case KLocale::JapaneseCalendar: +- return new KCalendarSystemJapanese( config, locale ); ++ return new KCalendarSystemJapanese(config, locale); + case KLocale::JulianCalendar: +- return new KCalendarSystemJulian( config, locale ); ++ return new KCalendarSystemJulian(config, locale); + case KLocale::MinguoCalendar: +- return new KCalendarSystemMinguo( config, locale ); ++ return new KCalendarSystemMinguo(config, locale); + case KLocale::ThaiCalendar: +- return new KCalendarSystemThai( config, locale ); ++ return new KCalendarSystemThai(config, locale); + default: +- return new KCalendarSystemGregorian( config, locale ); ++ return new KCalendarSystemQDate(config, locale); + } + } + +@@ -126,90 +127,127 @@ QList<KLocale::CalendarSystem> KCalendarSystem::calendarSystemsList() + { + QList<KLocale::CalendarSystem> list; + +- list.append( KLocale::QDateCalendar ); +- list.append( KLocale::CopticCalendar ); +- list.append( KLocale::EthiopianCalendar ); +- list.append( KLocale::GregorianCalendar ); +- list.append( KLocale::HebrewCalendar ); +- list.append( KLocale::IslamicCivilCalendar ); +- list.append( KLocale::IndianNationalCalendar ); +- list.append( KLocale::JalaliCalendar ); +- list.append( KLocale::JapaneseCalendar ); +- list.append( KLocale::JulianCalendar ); +- list.append( KLocale::MinguoCalendar ); +- list.append( KLocale::ThaiCalendar ); ++ list.append(KLocale::QDateCalendar); ++ list.append(KLocale::CopticCalendar); ++ list.append(KLocale::EthiopianCalendar); ++ list.append(KLocale::GregorianCalendar); ++ list.append(KLocale::HebrewCalendar); ++ list.append(KLocale::IslamicCivilCalendar); ++ list.append(KLocale::IndianNationalCalendar); ++ list.append(KLocale::JalaliCalendar); ++ list.append(KLocale::JapaneseCalendar); ++ list.append(KLocale::JulianCalendar); ++ list.append(KLocale::MinguoCalendar); ++ list.append(KLocale::ThaiCalendar); + + return list; + } + +-QString KCalendarSystem::calendarLabel( KLocale::CalendarSystem calendarSystem, const KLocale *locale ) ++QString KCalendarSystem::calendarLabel(KLocale::CalendarSystem calendarSystem, const KLocale *locale) + { +- switch ( calendarSystem ) { ++ switch (calendarSystem) { + case KLocale::QDateCalendar: +- return ki18nc( "@item Calendar system", "Gregorian" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Gregorian").toString(locale); + case KLocale::CopticCalendar: +- return ki18nc( "@item Calendar system", "Coptic" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Coptic").toString(locale); + case KLocale::EthiopianCalendar: +- return ki18nc( "@item Calendar system", "Ethiopian" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Ethiopian").toString(locale); + case KLocale::GregorianCalendar: +- return ki18nc( "@item Calendar system", "Gregorian (Proleptic)" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Gregorian (Proleptic)").toString(locale); + case KLocale::HebrewCalendar: +- return ki18nc( "@item Calendar system", "Hebrew" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Hebrew").toString(locale); + case KLocale::IslamicCivilCalendar: +- return ki18nc( "@item Calendar system", "Islamic / Hijri (Civil)" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Islamic / Hijri (Civil)").toString(locale); + case KLocale::IndianNationalCalendar: +- return ki18nc( "@item Calendar system", "Indian National" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Indian National").toString(locale); + case KLocale::JalaliCalendar: +- return ki18nc( "@item Calendar system", "Jalali" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Jalali").toString(locale); + case KLocale::JapaneseCalendar: +- return ki18nc( "@item Calendar system", "Japanese" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Japanese").toString(locale); + case KLocale::JulianCalendar: +- return ki18nc( "@item Calendar system", "Julian" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Julian").toString(locale); + case KLocale::MinguoCalendar: +- return ki18nc( "@item Calendar system", "Taiwanese" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Taiwanese").toString(locale); + case KLocale::ThaiCalendar: +- return ki18nc( "@item Calendar system", "Thai" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Thai").toString(locale); + } + +- return ki18nc( "@item Calendar system", "Invalid Calendar Type" ).toString( locale ); ++ return ki18nc("@item Calendar system", "Invalid Calendar Type").toString(locale); + } + +-KLocale::CalendarSystem KCalendarSystem::calendarSystemForCalendarType( const QString &calendarType ) ++KLocale::CalendarSystem KCalendarSystem::calendarSystemForCalendarType(const QString &calendarType ) + { +- if ( calendarType == QLatin1String( "coptic" ) ) { ++ return calendarSystem( calendarType ); ++} ++ ++KLocale::CalendarSystem KCalendarSystem::calendarSystem(const QString &calendarType ) ++{ ++ if (calendarType == QLatin1String("coptic")) { + return KLocale::CopticCalendar; +- } else if ( calendarType == QLatin1String( "ethiopian" ) ) { ++ } else if (calendarType == QLatin1String("ethiopian")) { + return KLocale::EthiopianCalendar; +- } else if ( calendarType == QLatin1String( "gregorian" ) ) { ++ } else if (calendarType == QLatin1String("gregorian")) { + return KLocale::QDateCalendar; +- } else if ( calendarType == QLatin1String( "gregorian-proleptic" ) ) { ++ } else if (calendarType == QLatin1String("gregorian-proleptic")) { + return KLocale::GregorianCalendar; +- } else if ( calendarType == QLatin1String( "hebrew" ) ) { ++ } else if (calendarType == QLatin1String("hebrew")) { + return KLocale::HebrewCalendar; +- } else if ( calendarType == QLatin1String( "hijri" ) ) { ++ } else if (calendarType == QLatin1String("hijri")) { + return KLocale::IslamicCivilCalendar; +- } else if ( calendarType == QLatin1String( "indian-national" ) ) { ++ } else if (calendarType == QLatin1String("indian-national")) { + return KLocale::IndianNationalCalendar; +- } else if ( calendarType == QLatin1String( "jalali" ) ) { ++ } else if (calendarType == QLatin1String("jalali")) { + return KLocale::JalaliCalendar; +- } else if ( calendarType == QLatin1String( "japanese" ) ) { ++ } else if (calendarType == QLatin1String("japanese")) { + return KLocale::JapaneseCalendar; +- } else if ( calendarType == QLatin1String( "julian" ) ) { ++ } else if (calendarType == QLatin1String("julian")) { + return KLocale::JulianCalendar; +- } else if ( calendarType == QLatin1String( "minguo" ) ) { ++ } else if (calendarType == QLatin1String("minguo")) { + return KLocale::MinguoCalendar; +- } else if ( calendarType == QLatin1String( "thai" ) ) { ++ } else if (calendarType == QLatin1String("thai")) { + return KLocale::ThaiCalendar; + } else { + return KLocale::QDateCalendar; + } + } + ++QString KCalendarSystem::calendarType(KLocale::CalendarSystem calendarSystem) ++{ ++ if (calendarSystem == KLocale::QDateCalendar) { ++ return QLatin1String("gregorian"); ++ } else if (calendarSystem == KLocale::CopticCalendar) { ++ return QLatin1String("coptic"); ++ } else if (calendarSystem == KLocale::EthiopianCalendar) { ++ return QLatin1String("ethiopian"); ++ } else if (calendarSystem == KLocale::GregorianCalendar) { ++ return QLatin1String("gregorian-proleptic"); ++ } else if (calendarSystem == KLocale::HebrewCalendar) { ++ return QLatin1String("hebrew"); ++ } else if (calendarSystem == KLocale::IndianNationalCalendar) { ++ return QLatin1String("indian-national"); ++ } else if (calendarSystem == KLocale::IslamicCivilCalendar) { ++ return QLatin1String("hijri"); ++ } else if (calendarSystem == KLocale::JalaliCalendar) { ++ return QLatin1String("jalali"); ++ } else if (calendarSystem == KLocale::JapaneseCalendar) { ++ return QLatin1String("japanese"); ++ } else if (calendarSystem == KLocale::JulianCalendar) { ++ return QLatin1String("julian"); ++ } else if (calendarSystem == KLocale::MinguoCalendar) { ++ return QLatin1String("minguo"); ++ } else if (calendarSystem == KLocale::ThaiCalendar) { ++ return QLatin1String("thai"); ++ } else { ++ return QLatin1String("gregorian"); ++ } ++} ++ + // Shared d pointer base class definitions + +-KCalendarSystemPrivate::KCalendarSystemPrivate( KCalendarSystem *q_ptr ): q( q_ptr ), +- m_eraList( 0 ), +- m_shortYearWindowStartYear( 2000 ) ++KCalendarSystemPrivate::KCalendarSystemPrivate(KCalendarSystem *q_ptr) ++ : q(q_ptr), ++ m_eraList(0), ++ m_shortYearWindowStartYear(2000) + { + } + +@@ -230,31 +268,31 @@ KLocale::CalendarSystem KCalendarSystemPrivate::calendarSystem() const + // This method MUST be re-implemented in any new Calendar System + void KCalendarSystemPrivate::loadDefaultEraList() + { +- addEra( '-', 1, q->epoch().addDays( -1 ), -1, q->earliestValidDate(), QLatin1String("Before KDE"), QLatin1String("BK"), QLatin1String("%Ey %EC") ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), QLatin1String("Anno KDE"), QLatin1String("AK"), QLatin1String("%Ey %EC") ); ++ addEra('-', 1, q->epoch().addDays(-1), -1, q->earliestValidDate(), QLatin1String("Before KDE"), QLatin1String("BK"), QLatin1String("%Ey %EC")); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), QLatin1String("Anno KDE"), QLatin1String("AK"), QLatin1String("%Ey %EC")); + } + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System +-int KCalendarSystemPrivate::monthsInYear( int year ) const ++int KCalendarSystemPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System +-int KCalendarSystemPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemPrivate::daysInMonth(int year, int month) const + { +- if ( month == 2 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 2) { ++ if (isLeapYear(year)) { + return 29; + } else { + return 28; + } + } + +- if ( month == 4 || month == 6 || month == 9 || month == 11 ) { ++ if (month == 4 || month == 6 || month == 9 || month == 11) { + return 30; + } + +@@ -263,9 +301,9 @@ int KCalendarSystemPrivate::daysInMonth( int year, int month ) const + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System +-int KCalendarSystemPrivate::daysInYear( int year ) const ++int KCalendarSystemPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -281,16 +319,16 @@ int KCalendarSystemPrivate::daysInWeek() const + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System +-bool KCalendarSystemPrivate::isLeapYear( int year ) const ++bool KCalendarSystemPrivate::isLeapYear(int year) const + { +- if ( year < 1 ) { ++ if (year < 1) { + year = year + 1; + } + +- if ( year % 4 == 0 ) { +- if ( year % 100 != 0 ) { ++ if (year % 4 == 0) { ++ if (year % 100 != 0) { + return true; +- } else if ( year % 400 == 0 ) { ++ } else if (year % 400 == 0) { + return true; + } + } +@@ -346,120 +384,120 @@ int KCalendarSystemPrivate::latestValidYear() const + + // Dummy version + // This method MUST be re-implemented in any new Calendar System +-QString KCalendarSystemPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( month ); +- Q_UNUSED( year ); +- Q_UNUSED( format ); +- Q_UNUSED( possessive ); ++ Q_UNUSED(month); ++ Q_UNUSED(year); ++ Q_UNUSED(format); ++ Q_UNUSED(possessive); + return QString(); + } + + // Dummy version + // This method MUST be re-implemented in any new Calendar System +-QString KCalendarSystemPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- Q_UNUSED( weekDay ); +- Q_UNUSED( format ); ++ Q_UNUSED(weekDay); ++ Q_UNUSED(format); + return QString(); + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::week( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum ) const ++int KCalendarSystemPrivate::week(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum) const + { + int y, m, d; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); ++ q->julianDayToDate(date.toJulianDay(), y, m, d); + +- switch ( weekNumberSystem ) { ++ switch (weekNumberSystem) { + case KLocale::IsoWeekNumber: +- return isoWeekNumber( date, yearNum ); ++ return isoWeekNumber(date, yearNum); + case KLocale::FirstFullWeek: +- return regularWeekNumber( date, locale()->weekStartDay(), 0, yearNum ); ++ return regularWeekNumber(date, locale()->weekStartDay(), 0, yearNum); + case KLocale::FirstPartialWeek: +- return regularWeekNumber( date, locale()->weekStartDay(), 1, yearNum ); ++ return regularWeekNumber(date, locale()->weekStartDay(), 1, yearNum); + case KLocale::SimpleWeek: +- return simpleWeekNumber( date, yearNum ); ++ return simpleWeekNumber(date, yearNum); + case KLocale::DefaultWeekNumber: + default: +- return week( date, locale()->weekNumberSystem(), yearNum ); ++ return week(date, locale()->weekNumberSystem(), yearNum); + } + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::isoWeekNumber( const QDate &date, int *yearNum ) const ++int KCalendarSystemPrivate::isoWeekNumber(const QDate &date, int *yearNum) const + { + int y, m, d; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); ++ q->julianDayToDate(date.toJulianDay(), y, m, d); + + QDate firstDayWeek1, lastDay; + int week; + int weekDay1, dayOfWeek1InYear; + + // let's guess 1st day of 1st week +- firstDayWeek1 = firstDayOfYear( y ); +- weekDay1 = dayOfWeek( firstDayWeek1 ); ++ firstDayWeek1 = firstDayOfYear(y); ++ weekDay1 = dayOfWeek(firstDayWeek1); + + // iso 8601: week 1 is the first containing thursday and week starts on monday +- if ( weekDay1 > 4 /*Thursday*/ ) { +- firstDayWeek1 = q->addDays( firstDayWeek1 , daysInWeek() - weekDay1 + 1 ); // next monday ++ if (weekDay1 > 4 /*Thursday*/) { ++ firstDayWeek1 = q->addDays(firstDayWeek1 , daysInWeek() - weekDay1 + 1); // next monday + } + +- dayOfWeek1InYear = dayOfYear( firstDayWeek1 ); ++ dayOfWeek1InYear = dayOfYear(firstDayWeek1); + + // our date in prev year's week +- if ( dayOfYear( date ) < dayOfWeek1InYear ) { +- if ( yearNum ) { +- *yearNum = addYears( y, - 1 ); ++ if (dayOfYear(date) < dayOfWeek1InYear) { ++ if (yearNum) { ++ *yearNum = addYears(y, - 1); + } +- return isoWeeksInYear( addYears( y, - 1 ) ); ++ return isoWeeksInYear(addYears(y, - 1)); + } + + // let's check if its last week belongs to next year +- lastDay = lastDayOfYear( y ); ++ lastDay = lastDayOfYear(y); + + // if our date is in last week && 1st week in next year has thursday +- if ( ( dayOfYear( date ) >= daysInYear( y ) - dayOfWeek( lastDay ) + 1 ) +- && dayOfWeek( lastDay ) < 4 ) { +- if ( yearNum ) { +- * yearNum = addYears( y, 1 ); ++ if ((dayOfYear(date) >= daysInYear(y) - dayOfWeek(lastDay) + 1) ++ && dayOfWeek(lastDay) < 4) { ++ if (yearNum) { ++ * yearNum = addYears(y, 1); + } + week = 1; + } else { + // To calculate properly the number of weeks from day a to x let's make a day 1 of week +- if( weekDay1 < 5 ) { +- firstDayWeek1 = q->addDays( firstDayWeek1, -( weekDay1 - 1 ) ); ++ if (weekDay1 < 5) { ++ firstDayWeek1 = q->addDays(firstDayWeek1, -(weekDay1 - 1)); + } + +- if ( yearNum ) { ++ if (yearNum) { + * yearNum = y; + } + +- week = firstDayWeek1.daysTo( date ) / daysInWeek() + 1; ++ week = firstDayWeek1.daysTo(date) / daysInWeek() + 1; + } + + return week; + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::regularWeekNumber( const QDate &date, int weekStartDay, int firstWeekNumber, int *weekYear ) const ++int KCalendarSystemPrivate::regularWeekNumber(const QDate &date, int weekStartDay, int firstWeekNumber, int *weekYear) const + { + int y, m, d; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); ++ q->julianDayToDate(date.toJulianDay(), y, m, d); + +- int firstWeekDayOffset = ( dayOfWeek( date ) - weekStartDay + daysInWeek() ) % daysInWeek(); +- int dayInYear = date.toJulianDay() - firstDayOfYear( y ).toJulianDay(); // 0 indexed +- int week = ( ( dayInYear - firstWeekDayOffset + daysInWeek() ) / daysInWeek() ); ++ int firstWeekDayOffset = (dayOfWeek(date) - weekStartDay + daysInWeek()) % daysInWeek(); ++ int dayInYear = date.toJulianDay() - firstDayOfYear(y).toJulianDay(); // 0 indexed ++ int week = ((dayInYear - firstWeekDayOffset + daysInWeek()) / daysInWeek()); + +- if ( dayOfWeek( firstDayOfYear( y ) ) != weekStartDay ) { ++ if (dayOfWeek(firstDayOfYear(y)) != weekStartDay) { + week = week + firstWeekNumber; + } + +- if ( week < 1 ) { ++ if (week < 1) { + y = y - 1; +- week = regularWeeksInYear( y, weekStartDay, firstWeekNumber ); ++ week = regularWeeksInYear(y, weekStartDay, firstWeekNumber); + } + +- if ( weekYear ) { ++ if (weekYear) { + *weekYear = y; + } + +@@ -467,67 +505,67 @@ int KCalendarSystemPrivate::regularWeekNumber( const QDate &date, int weekStartD + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::simpleWeekNumber( const QDate &date, int *yearNum ) const ++int KCalendarSystemPrivate::simpleWeekNumber(const QDate &date, int *yearNum) const + { + int y, m, d; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); +- if ( yearNum ) { ++ q->julianDayToDate(date.toJulianDay(), y, m, d); ++ if (yearNum) { + *yearNum = y; + } +- return ( ( date.toJulianDay() - firstDayOfYear( y ).toJulianDay() ) / daysInWeek() ) + 1; ++ return ((date.toJulianDay() - firstDayOfYear(y).toJulianDay()) / daysInWeek()) + 1; + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::weeksInYear( int year, KLocale::WeekNumberSystem weekNumberSystem ) const ++int KCalendarSystemPrivate::weeksInYear(int year, KLocale::WeekNumberSystem weekNumberSystem) const + { +- switch ( weekNumberSystem ) { ++ switch (weekNumberSystem) { + case KLocale::IsoWeekNumber: +- return isoWeeksInYear( year ); ++ return isoWeeksInYear(year); + case KLocale::FirstFullWeek: +- return regularWeeksInYear( year, locale()->weekStartDay(), 0 ); ++ return regularWeeksInYear(year, locale()->weekStartDay(), 0); + case KLocale::FirstPartialWeek: +- return regularWeeksInYear( year, locale()->weekStartDay(), 1 ); ++ return regularWeeksInYear(year, locale()->weekStartDay(), 1); + case KLocale::SimpleWeek: +- return simpleWeeksInYear( year ); ++ return simpleWeeksInYear(year); + case KLocale::DefaultWeekNumber: + default: +- return weeksInYear( year, locale()->weekNumberSystem() ); ++ return weeksInYear(year, locale()->weekNumberSystem()); + } + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::isoWeeksInYear( int year ) const ++int KCalendarSystemPrivate::isoWeeksInYear(int year) const + { +- QDate lastDayOfThisYear = lastDayOfYear( year ); ++ QDate lastDayOfThisYear = lastDayOfYear(year); + + int weekYear = year; +- int lastWeekInThisYear = isoWeekNumber( lastDayOfThisYear, &weekYear ); ++ int lastWeekInThisYear = isoWeekNumber(lastDayOfThisYear, &weekYear); + + // If error, or the last day of the year is in the first week of next year use the week before +- if ( lastWeekInThisYear < 1 || weekYear != year ) { +- lastWeekInThisYear = isoWeekNumber( q->addDays( lastDayOfThisYear, -7 ), &weekYear ); ++ if (lastWeekInThisYear < 1 || weekYear != year) { ++ lastWeekInThisYear = isoWeekNumber(q->addDays(lastDayOfThisYear, -7), &weekYear); + } + + return lastWeekInThisYear; + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::regularWeeksInYear( int year, int weekStartDay, int firstWeekNumber ) const ++int KCalendarSystemPrivate::regularWeeksInYear(int year, int weekStartDay, int firstWeekNumber) const + { +- return regularWeekNumber( lastDayOfYear( year ), weekStartDay, firstWeekNumber, 0 ); ++ return regularWeekNumber(lastDayOfYear(year), weekStartDay, firstWeekNumber, 0); + } + + // Reimplement if special maths handling required, e.g. Hebrew. +-int KCalendarSystemPrivate::simpleWeeksInYear( int year ) const ++int KCalendarSystemPrivate::simpleWeeksInYear(int year) const + { +- return simpleWeekNumber( lastDayOfYear( year ), 0 ); ++ return simpleWeekNumber(lastDayOfYear(year), 0); + } + + // Reimplement if special maths handling required, e.g. Hebrew. + // Works for calendars with constant number of months, or where leap month is last month of year + // Will not work for Hebrew or others where leap month is inserted in middle of year +-void KCalendarSystemPrivate::dateDifference( const QDate &fromDate, const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction ) const ++void KCalendarSystemPrivate::dateDifference(const QDate &fromDate, const QDate &toDate, ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const + { + // This could be optimised a little but is left in full as it's easier to understand + int dy = 0; +@@ -535,171 +573,171 @@ void KCalendarSystemPrivate::dateDifference( const QDate &fromDate, const QDate + int dd = 0; + int dir = 1; + +- if ( toDate < fromDate ) { +- dateDifference( toDate, fromDate, &dy, &dm, &dd, 0 ); ++ if (toDate < fromDate) { ++ dateDifference(toDate, fromDate, &dy, &dm, &dd, 0); + dir = -1; +- } else if ( toDate > fromDate ) { ++ } else if (toDate > fromDate) { + +- int fromYear = q->year( fromDate ); +- int toYear = q->year( toDate ); +- int fromMonth = q->month( fromDate ); +- int toMonth = q->month( toDate ); +- int fromDay = q->day( fromDate ); +- int toDay = q->day( toDate ); ++ int fromYear = q->year(fromDate); ++ int toYear = q->year(toDate); ++ int fromMonth = q->month(fromDate); ++ int toMonth = q->month(toDate); ++ int fromDay = q->day(fromDate); ++ int toDay = q->day(toDate); + +- int monthsInPrevYear = monthsInYear( addYears( toYear, -1 ) ); +- int daysInPrevMonth = q->daysInMonth( q->addMonths( toDate, -1 ) ); +- int daysInFromMonth = daysInMonth( fromYear, fromMonth ); +- int daysInToMonth = daysInMonth( toYear, toMonth ); ++ int monthsInPrevYear = monthsInYear(addYears(toYear, -1)); ++ int daysInPrevMonth = q->daysInMonth(q->addMonths(toDate, -1)); ++ int daysInFromMonth = daysInMonth(fromYear, fromMonth); ++ int daysInToMonth = daysInMonth(toYear, toMonth); + + // Calculate years difference +- if ( toYear == fromYear ) { ++ if (toYear == fromYear) { + dy = 0; +- } else if ( toMonth > fromMonth ) { +- dy = differenceYearNumbers( fromYear, toYear ); +- } else if ( toMonth < fromMonth ) { +- dy = differenceYearNumbers( fromYear, toYear ) - 1; ++ } else if (toMonth > fromMonth) { ++ dy = differenceYearNumbers(fromYear, toYear); ++ } else if (toMonth < fromMonth) { ++ dy = differenceYearNumbers(fromYear, toYear) - 1; + } else { // toMonth == fromMonth + // Allow for last day of month to last day of month and leap days + // e.g. 2000-02-29 to 2001-02-28 is 1 year not 0 years +- if ( ( toDay >= fromDay ) || ( fromDay == daysInFromMonth && toDay == daysInToMonth ) ) { +- dy = differenceYearNumbers( fromYear, toYear ); ++ if ((toDay >= fromDay) || (fromDay == daysInFromMonth && toDay == daysInToMonth)) { ++ dy = differenceYearNumbers(fromYear, toYear); + } else { +- dy = differenceYearNumbers( fromYear, toYear ) - 1; ++ dy = differenceYearNumbers(fromYear, toYear) - 1; + } + } + + // Calculate months and days difference +- if ( toDay >= fromDay ) { +- dm = ( monthsInPrevYear + toMonth - fromMonth ) % monthsInPrevYear; ++ if (toDay >= fromDay) { ++ dm = (monthsInPrevYear + toMonth - fromMonth) % monthsInPrevYear; + dd = toDay - fromDay; + } else { // toDay < fromDay + // Allow for last day of month to last day of month and leap days + // e.g. 2010-03-31 to 2010-04-30 is 1 month + // 2000-02-29 to 2001-02-28 is 1 year + // 2000-02-29 to 2001-03-01 is 1 year 1 day +- int prevMonth = q->month( q->addMonths( toDate, -1 ) ); +- if ( fromDay == daysInFromMonth && toDay == daysInToMonth ) { +- dm = ( monthsInPrevYear + toMonth - fromMonth ) % monthsInPrevYear; ++ int prevMonth = q->month(q->addMonths(toDate, -1)); ++ if (fromDay == daysInFromMonth && toDay == daysInToMonth) { ++ dm = (monthsInPrevYear + toMonth - fromMonth) % monthsInPrevYear; + dd = 0; +- } else if ( prevMonth == fromMonth && daysInPrevMonth < daysInFromMonth ) { ++ } else if (prevMonth == fromMonth && daysInPrevMonth < daysInFromMonth) { + // Special case where fromDate = leap day and toDate in month following but non-leap year + // e.g. 2000-02-29 to 2001-03-01 needs to use 29 to calculate day number not 28 +- dm = ( monthsInPrevYear + toMonth - fromMonth - 1 ) % monthsInPrevYear; +- dd = ( daysInFromMonth + toDay - fromDay ) % daysInFromMonth; ++ dm = (monthsInPrevYear + toMonth - fromMonth - 1) % monthsInPrevYear; ++ dd = (daysInFromMonth + toDay - fromDay) % daysInFromMonth; + } else { +- dm = ( monthsInPrevYear + toMonth - fromMonth - 1 ) % monthsInPrevYear; +- dd = ( daysInPrevMonth + toDay - fromDay ) % daysInPrevMonth; ++ dm = (monthsInPrevYear + toMonth - fromMonth - 1) % monthsInPrevYear; ++ dd = (daysInPrevMonth + toDay - fromDay) % daysInPrevMonth; + } + } + + } + + // Only return values if we have a valid pointer +- if ( yearsDiff ) { ++ if (yearsDiff) { + *yearsDiff = dy; + } +- if ( monthsDiff ) { ++ if (monthsDiff) { + *monthsDiff = dm; + } +- if ( daysDiff ) { ++ if (daysDiff) { + *daysDiff = dd; + } +- if ( direction ) { ++ if (direction) { + *direction = dir; + } + } + + // Reimplement if special maths handling required, e.g. Hebrew + // Allows for calendars with leap months at end of year but not during year +-int KCalendarSystemPrivate::yearsDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystemPrivate::yearsDifference(const QDate &fromDate, const QDate &toDate) const + { + // This could be optimised a little but is left in full as it's easier to understand + // Alternatively could just call dateDifference(), but this is slightly more efficient + +- if ( toDate < fromDate ) { +- return 0 - yearsDifference( toDate, fromDate ); ++ if (toDate < fromDate) { ++ return 0 - yearsDifference(toDate, fromDate); + } + +- if ( toDate == fromDate ) { ++ if (toDate == fromDate) { + return 0; + } + +- int fromYear = q->year( fromDate ); +- int toYear = q->year( toDate ); ++ int fromYear = q->year(fromDate); ++ int toYear = q->year(toDate); + +- if ( toYear == fromYear ) { ++ if (toYear == fromYear) { + return 0; + } + +- int fromMonth = q->month( fromDate ); +- int toMonth = q->month( toDate ); ++ int fromMonth = q->month(fromDate); ++ int toMonth = q->month(toDate); + +- if ( toMonth > fromMonth ) { +- return differenceYearNumbers( fromYear, toYear ); ++ if (toMonth > fromMonth) { ++ return differenceYearNumbers(fromYear, toYear); + } + +- if ( toMonth < fromMonth ) { +- return differenceYearNumbers( fromYear, toYear ) - 1; ++ if (toMonth < fromMonth) { ++ return differenceYearNumbers(fromYear, toYear) - 1; + } + + // toMonth == fromMonth +- int fromDay = q->day( fromDate ); +- int toDay = q->day( toDate ); ++ int fromDay = q->day(fromDate); ++ int toDay = q->day(toDate); + + // Adjust for month numbers in from and to year + // Allow for last day of month to last day of month and leap days + // e.g. 2000-02-29 to 2001-02-28 is 1 year not 0 years +- if ( ( toDay >= fromDay ) || +- ( fromDay == daysInMonth( fromYear, fromMonth ) && +- toDay == daysInMonth( toYear, toMonth ) ) ) { +- return differenceYearNumbers( fromYear, toYear ); ++ if ((toDay >= fromDay) || ++ (fromDay == daysInMonth(fromYear, fromMonth) && ++ toDay == daysInMonth(toYear, toMonth))) { ++ return differenceYearNumbers(fromYear, toYear); + } else { +- return differenceYearNumbers( fromYear, toYear ) - 1; ++ return differenceYearNumbers(fromYear, toYear) - 1; + } + + } + + // Reimplement if special maths handling required, e.g. maybe Hebrew? + // Allows for calendars with leap months +-int KCalendarSystemPrivate::monthsDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystemPrivate::monthsDifference(const QDate &fromDate, const QDate &toDate) const + { +- if ( toDate < fromDate ) { +- return 0 - monthsDifference( toDate, fromDate ); ++ if (toDate < fromDate) { ++ return 0 - monthsDifference(toDate, fromDate); + } + +- if ( toDate == fromDate ) { ++ if (toDate == fromDate) { + return 0; + } + +- int fromYear = q->year( fromDate ); +- int toYear = q->year( toDate ); +- int fromMonth = q->month( fromDate ); +- int toMonth = q->month( toDate ); +- int fromDay = q->day( fromDate ); +- int toDay = q->day( toDate ); ++ int fromYear = q->year(fromDate); ++ int toYear = q->year(toDate); ++ int fromMonth = q->month(fromDate); ++ int toMonth = q->month(toDate); ++ int fromDay = q->day(fromDate); ++ int toDay = q->day(toDate); + + int monthsInPreceedingYears; + + // Calculate number of months in full years preceding toYear +- if ( toYear == fromYear ) { ++ if (toYear == fromYear) { + monthsInPreceedingYears = 0; +- } else if ( hasLeapMonths() ) { ++ } else if (hasLeapMonths()) { + monthsInPreceedingYears = 0; +- for ( int y = fromYear; y < toYear; y = addYears( y, 1 ) ) { +- monthsInPreceedingYears = monthsInPreceedingYears + monthsInYear( y ); ++ for (int y = fromYear; y < toYear; y = addYears(y, 1)) { ++ monthsInPreceedingYears = monthsInPreceedingYears + monthsInYear(y); + } + } else { +- monthsInPreceedingYears = differenceYearNumbers( fromYear, toYear ) * monthsInYear( toYear ); ++ monthsInPreceedingYears = differenceYearNumbers(fromYear, toYear) * monthsInYear(toYear); + } + + // Adjust for months in from and to year + // Allow for last day of month to last day of month and leap days + // e.g. 2010-03-31 to 2010-04-30 is 1 month not 0 months + // also 2000-02-29 to 2001-02-28 is 12 months not 11 months +- if ( ( toDay >= fromDay ) || +- ( fromDay == daysInMonth( fromYear, fromMonth ) && +- toDay == daysInMonth( toYear, toMonth ) ) ) { ++ if ((toDay >= fromDay) || ++ (fromDay == daysInMonth(fromYear, fromMonth) && ++ toDay == daysInMonth(toYear, toMonth))) { + return monthsInPreceedingYears + toMonth - fromMonth; + } else { + return monthsInPreceedingYears + toMonth - fromMonth - 1; +@@ -709,26 +747,26 @@ int KCalendarSystemPrivate::monthsDifference( const QDate &fromDate, const QDate + // Reimplement if special string to integer handling required, e.g. Hebrew. + // Peel a number off the front of a string which may have other trailing chars after the number + // Stop either at either maxLength, eos, or first non-digit char +-int KCalendarSystemPrivate::integerFromString( const QString &string, int maxLength, int &readLength ) const ++int KCalendarSystemPrivate::integerFromString(const QString &string, int maxLength, int &readLength) const + { + int value = -1; + int position = 0; + readLength = 0; + bool ok = false; + +- if ( maxLength < 0 ) { ++ if (maxLength < 0) { + maxLength = string.length(); + } + +- while ( position < string.length() && ++ while (position < string.length() && + position < maxLength && +- string.at( position ).isDigit() ) { ++ string.at(position).isDigit()) { + position++; + } + +- if ( position > 0 ) { +- value = string.left( position ).toInt( &ok ); +- if ( ok ) { ++ if (position > 0) { ++ value = string.left(position).toInt(&ok); ++ if (ok) { + readLength = position; + } else { + value = -1; +@@ -740,41 +778,41 @@ int KCalendarSystemPrivate::integerFromString( const QString &string, int maxLen + + // Reimplement if special integer to string handling required, e.g. Hebrew. + // Utility to convert an integer into the correct display string form +-QString KCalendarSystemPrivate::stringFromInteger( int number, int padWidth, QChar padChar ) const ++QString KCalendarSystemPrivate::stringFromInteger(int number, int padWidth, QChar padChar) const + { +- return stringFromInteger( number, padWidth, padChar, q->locale()->dateTimeDigitSet() ); ++ return stringFromInteger(number, padWidth, padChar, q->locale()->dateTimeDigitSet()); + } + + // Reimplement if special integer to string handling required, e.g. Hebrew. + // Utility to convert an integer into the correct display string form +-QString KCalendarSystemPrivate::stringFromInteger( int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet ) const ++QString KCalendarSystemPrivate::stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const + { +- if ( padChar == QLatin1Char('\0') || padWidth == 0 ) { +- return q->locale()->convertDigits( QString::number( number ), digitSet ); ++ if (padChar == QLatin1Char('\0') || padWidth == 0) { ++ return q->locale()->convertDigits(QString::number(number), digitSet); + } else { +- return q->locale()->convertDigits( QString::number( number ).rightJustified( padWidth, padChar ), digitSet ); ++ return q->locale()->convertDigits(QString::number(number).rightJustified(padWidth, padChar), digitSet); + } + } + + // Allows us to set dates outside publically valid range, USE WITH CARE!!!! +-bool KCalendarSystemPrivate::setAnyDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemPrivate::setAnyDate(QDate &date, int year, int month, int day) const + { + int jd; +- q->dateToJulianDay( year, month, day, jd ); +- date = QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, month, day, jd); ++ date = QDate::fromJulianDay(jd); + return true; + } + + // Utility to correctly add years to a year number because some systems such as + // Julian and Gregorian calendars don't have a year 0 +-int KCalendarSystemPrivate::addYears( int originalYear, int addYears ) const ++int KCalendarSystemPrivate::addYears(int originalYear, int addYears) const + { + int newYear = originalYear + addYears; + +- if ( !hasYearZero() ) { +- if ( originalYear > 0 && newYear <= 0 ) { ++ if (!hasYearZero()) { ++ if (originalYear > 0 && newYear <= 0) { + newYear = newYear - 1; +- } else if ( originalYear < 0 && newYear >= 0 ) { ++ } else if (originalYear < 0 && newYear >= 0) { + newYear = newYear + 1; + } + } +@@ -784,14 +822,14 @@ int KCalendarSystemPrivate::addYears( int originalYear, int addYears ) const + + // Utility to correctly return number of years between two year numbers because some systems such as + // Julian and Gregorian calendars don't have a year 0 +-int KCalendarSystemPrivate::differenceYearNumbers( int fromYear, int toYear ) const ++int KCalendarSystemPrivate::differenceYearNumbers(int fromYear, int toYear) const + { + int dy = toYear - fromYear; + +- if ( !hasYearZero() ) { +- if ( toYear > 0 && fromYear < 0 ) { ++ if (!hasYearZero()) { ++ if (toYear > 0 && fromYear < 0) { + dy = dy - 1; +- } else if ( toYear < 0 && fromYear > 0 ) { ++ } else if (toYear < 0 && fromYear > 0) { + dy = dy + 1; + } + } +@@ -805,71 +843,71 @@ QDate KCalendarSystemPrivate::invalidDate() const + return QDate(); + } + +-QString KCalendarSystemPrivate::simpleDateString( const QString &str ) const ++QString KCalendarSystemPrivate::simpleDateString(const QString &str) const + { + QString newStr; +- for ( int i = 0; i < str.length(); i++ ) { +- if ( str.at(i).isLetterOrNumber() ) { +- newStr.append( str.at(i) ); ++ for (int i = 0; i < str.length(); i++) { ++ if (str.at(i).isLetterOrNumber()) { ++ newStr.append(str.at(i)); + } else { +- newStr.append( QLatin1Char(' ') ); ++ newStr.append(QLatin1Char(' ')); + } + } + newStr.simplified(); + return newStr; + } + +-int KCalendarSystemPrivate::dayOfYear( const QDate &date ) const ++int KCalendarSystemPrivate::dayOfYear(const QDate &date) const + { + int y, m, d, jdFirstDayOfYear; +- q->julianDayToDate( date.toJulianDay(), y, m, d ); +- q->dateToJulianDay( y, 1, 1, jdFirstDayOfYear ); ++ q->julianDayToDate(date.toJulianDay(), y, m, d); ++ q->dateToJulianDay(y, 1, 1, jdFirstDayOfYear); + //Take the jd of the given date, and subtract the jd of the first day of that year +- return ( date.toJulianDay() - jdFirstDayOfYear + 1 ); ++ return (date.toJulianDay() - jdFirstDayOfYear + 1); + } + +-int KCalendarSystemPrivate::dayOfWeek( const QDate &date ) const ++int KCalendarSystemPrivate::dayOfWeek(const QDate &date) const + { + // Makes assumption that Julian Day 0 was day 1 of week + // This is true for Julian/Gregorian calendar with jd 0 being Monday + // We add 1 for ISO compliant numbering for 7 day week + // Assumes we've never skipped weekdays +- return ( ( date.toJulianDay() % daysInWeek() ) + 1 ); ++ return ((date.toJulianDay() % daysInWeek()) + 1); + } + +-QDate KCalendarSystemPrivate::firstDayOfYear( int year ) const ++QDate KCalendarSystemPrivate::firstDayOfYear(int year) const + { + int jd; +- q->dateToJulianDay( year, 1, 1, jd ); +- return QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, 1, 1, jd); ++ return QDate::fromJulianDay(jd); + } + +-QDate KCalendarSystemPrivate::lastDayOfYear( int year ) const ++QDate KCalendarSystemPrivate::lastDayOfYear(int year) const + { + int jd; +- q->dateToJulianDay( year, 1, 1, jd ); +- jd = jd + daysInYear( year ) - 1; +- return QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, 1, 1, jd); ++ jd = jd + daysInYear(year) - 1; ++ return QDate::fromJulianDay(jd); + } + +-QDate KCalendarSystemPrivate::firstDayOfMonth( int year, int month ) const ++QDate KCalendarSystemPrivate::firstDayOfMonth(int year, int month) const + { + int jd; +- q->dateToJulianDay( year, month, 1, jd ); +- return QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, month, 1, jd); ++ return QDate::fromJulianDay(jd); + } + +-QDate KCalendarSystemPrivate::lastDayOfMonth( int year, int month ) const ++QDate KCalendarSystemPrivate::lastDayOfMonth(int year, int month) const + { + int jd; +- q->dateToJulianDay( year, month, 1, jd ); +- jd = jd + daysInMonth( year, month ) - 1; +- return QDate::fromJulianDay( jd ); ++ q->dateToJulianDay(year, month, 1, jd); ++ jd = jd + daysInMonth(year, month) - 1; ++ return QDate::fromJulianDay(jd); + } + + const KLocale * KCalendarSystemPrivate::locale() const + { +- if ( m_locale ) { ++ if (m_locale) { + return m_locale; + } else { + return KGlobal::locale(); +@@ -881,93 +919,93 @@ QList<KCalendarEra> *KCalendarSystemPrivate::eraList() const + return m_eraList; + } + +-KCalendarEra KCalendarSystemPrivate::era( const QDate &eraDate ) const ++KCalendarEra KCalendarSystemPrivate::era(const QDate &eraDate) const + { +- for ( int i = m_eraList->count() -1; i >= 0; --i ) { +- if ( m_eraList->at( i ).isInEra( eraDate ) ) { +- return m_eraList->at( i ); ++ for (int i = m_eraList->count() - 1; i >= 0; --i) { ++ if (m_eraList->at(i).isInEra(eraDate)) { ++ return m_eraList->at(i); + } + } + return KCalendarEra(); + } + +-KCalendarEra KCalendarSystemPrivate::era( const QString &eraName, int yearInEra ) const ++KCalendarEra KCalendarSystemPrivate::era(const QString &eraName, int yearInEra) const + { +- Q_UNUSED( yearInEra ) ++ Q_UNUSED(yearInEra) + +- for ( int i = m_eraList->count() - 1; i >= 0; --i ) { +- KCalendarEra era = m_eraList->at( i ); +- if ( era.name(KLocale::LongName).toLower() == eraName.toLower() || +- era.name(KLocale::ShortName).toLower() == eraName.toLower() ) { ++ for (int i = m_eraList->count() - 1; i >= 0; --i) { ++ KCalendarEra era = m_eraList->at(i); ++ if (era.name(KLocale::LongName).toLower() == eraName.toLower() || ++ era.name(KLocale::ShortName).toLower() == eraName.toLower()) { + return era; + } + } + return KCalendarEra(); + } + +-void KCalendarSystemPrivate::loadEraList( const KConfigGroup & cg ) ++void KCalendarSystemPrivate::loadEraList(const KConfigGroup & cg) + { + delete m_eraList; + m_eraList = new QList<KCalendarEra>; + QString eraKey = QString::fromLatin1("Era1"); + int i = 1; +- while ( cg.hasKey( eraKey ) ) { +- QString eraEntry = cg.readEntry( eraKey, QString() ); +- if ( !eraEntry.isEmpty() ) { ++ while (cg.hasKey(eraKey)) { ++ QString eraEntry = cg.readEntry(eraKey, QString()); ++ if (!eraEntry.isEmpty()) { + // Based on LC_TIME, but different! + // Includes long and short names, uses ISO fomat dates + // e.g. +:1:0001-01-01:9999-12-31:Anno Domini:AD:%EC %Ey +- QChar direction = eraEntry.section( QLatin1Char(':'), 0, 0 ).at( 0 ); ++ QChar direction = eraEntry.section(QLatin1Char(':'), 0, 0).at(0); + QDate startDate, endDate; + int startYear; +- QString buffer = eraEntry.section( QLatin1Char(':'), 2, 2 ); +- if ( buffer.isEmpty() ) { +- if ( direction == QLatin1Char('-') ) { ++ QString buffer = eraEntry.section(QLatin1Char(':'), 2, 2); ++ if (buffer.isEmpty()) { ++ if (direction == QLatin1Char('-')) { + startDate = q->latestValidDate(); + } else { + startDate = q->earliestValidDate(); + } + } else { +- startDate = q->readDate( buffer, KLocale::IsoFormat ); ++ startDate = q->readDate(buffer, KLocale::IsoFormat); + } +- if ( q->isValid( startDate ) ) { +- startYear = q->year( startDate ); ++ if (q->isValid(startDate)) { ++ startYear = q->year(startDate); + } else { +- startYear = eraEntry.section( QLatin1Char(':'), 1, 1 ).toInt(); //Use offset ++ startYear = eraEntry.section(QLatin1Char(':'), 1, 1).toInt(); //Use offset + } + +- buffer = eraEntry.section( QLatin1Char(':'), 3, 3 ); +- if ( buffer.isEmpty() ) { +- if ( direction == QLatin1Char('-') ) { ++ buffer = eraEntry.section(QLatin1Char(':'), 3, 3); ++ if (buffer.isEmpty()) { ++ if (direction == QLatin1Char('-')) { + endDate = q->earliestValidDate(); + } else { + endDate = q->latestValidDate(); + } + } else { +- endDate = q->readDate( buffer, KLocale::IsoFormat ); ++ endDate = q->readDate(buffer, KLocale::IsoFormat); + } +- addEra( direction.toLatin1(), eraEntry.section( QLatin1Char(':'), 1, 1 ).toInt(), +- startDate, startYear, endDate, eraEntry.section( QLatin1Char(':'), 4, 4 ), +- eraEntry.section( QLatin1Char(':'), 5, 5 ), eraEntry.section( QLatin1Char(':'), 6 ) ); ++ addEra(direction.toLatin1(), eraEntry.section(QLatin1Char(':'), 1, 1).toInt(), ++ startDate, startYear, endDate, eraEntry.section(QLatin1Char(':'), 4, 4), ++ eraEntry.section(QLatin1Char(':'), 5, 5), eraEntry.section(QLatin1Char(':'), 6)); + } + ++i; + eraKey = QString::fromLatin1("Era%1").arg(i); + } + +- if ( m_eraList->isEmpty() ) { ++ if (m_eraList->isEmpty()) { + loadDefaultEraList(); + } + } + +-void KCalendarSystemPrivate::addEra( char direction, int offset, +- const QDate &startDate, int startYear, const QDate &endDate, +- const QString &name, const QString &shortName, +- const QString &format ) ++void KCalendarSystemPrivate::addEra(char direction, int offset, ++ const QDate &startDate, int startYear, const QDate &endDate, ++ const QString &name, const QString &shortName, ++ const QString &format) + { + KCalendarEra newEra; + + newEra.m_sequence = m_eraList->count() + 1; +- if ( direction == '-' ) { ++ if (direction == '-') { + newEra.m_direction = -1; + } else { + newEra.m_direction = 1; +@@ -980,7 +1018,7 @@ void KCalendarSystemPrivate::addEra( char direction, int offset, + newEra.m_shortName = shortName; + newEra.m_format = format; + +- m_eraList->append( newEra ); ++ m_eraList->append(newEra); + } + + int KCalendarSystemPrivate::shortYearWindowStartYear() const +@@ -988,12 +1026,12 @@ int KCalendarSystemPrivate::shortYearWindowStartYear() const + return m_shortYearWindowStartYear; + } + +-int KCalendarSystemPrivate::applyShortYearWindow( int inputYear ) const ++int KCalendarSystemPrivate::applyShortYearWindow(int inputYear) const + { +- if ( inputYear >= 0 && inputYear <= 99 ) { ++ if (inputYear >= 0 && inputYear <= 99) { + int shortStartYear = m_shortYearWindowStartYear % 100; + int yearOffset = m_shortYearWindowStartYear - shortStartYear; +- if ( inputYear >= shortStartYear ) { ++ if (inputYear >= shortStartYear) { + return inputYear + yearOffset; + } else { + return inputYear + yearOffset + 100; +@@ -1003,51 +1041,51 @@ int KCalendarSystemPrivate::applyShortYearWindow( int inputYear ) const + } + } + +-void KCalendarSystemPrivate::loadShortYearWindowStartYear( const KConfigGroup & cg ) ++void KCalendarSystemPrivate::loadShortYearWindowStartYear(const KConfigGroup & cg) + { +- // Default to 2000 for backwards compatability ++ // Default to 2000 for backwards compatibility + // as that's the old readDate() default value + int startYear = 2000; +- if ( cg.exists() ) { +- startYear = cg.readEntry( "ShortYearWindowStartYear", 2000 ); ++ if (cg.exists()) { ++ startYear = cg.readEntry("ShortYearWindowStartYear", 2000); + } + m_shortYearWindowStartYear = startYear; + } + + KSharedConfig::Ptr KCalendarSystemPrivate::config() + { +- if ( m_config == KSharedConfig::Ptr() ) { ++ if (m_config == KSharedConfig::Ptr()) { + return KGlobal::config(); + } else { + return m_config; + } + } + +-void KCalendarSystemPrivate::loadConfig( const QString & calendarType ) ++void KCalendarSystemPrivate::loadConfig(const QString & calendarType) + { +- KConfigGroup localeGroup( config(), QString::fromLatin1( "Locale" ) ); +- KConfigGroup calendarGroup = localeGroup.group( QString::fromLatin1( "KCalendarSystem %1" ).arg( calendarType ) ); +- loadEraList( calendarGroup ); +- loadShortYearWindowStartYear( calendarGroup ); ++ KConfigGroup localeGroup(config(), QString::fromLatin1("Locale")); ++ KConfigGroup calendarGroup = localeGroup.group(QString::fromLatin1("KCalendarSystem %1").arg(calendarType)); ++ loadEraList(calendarGroup); ++ loadShortYearWindowStartYear(calendarGroup); + } + + +-KCalendarSystem::KCalendarSystem( const KLocale *locale ) +- : d_ptr( new KCalendarSystemPrivate( this ) ) ++KCalendarSystem::KCalendarSystem(const KLocale *locale) ++ : d_ptr(new KCalendarSystemPrivate(this)) + { + d_ptr->m_config = KSharedConfig::Ptr(); + d_ptr->m_locale = locale; + } + +-KCalendarSystem::KCalendarSystem( const KSharedConfig::Ptr config, const KLocale *locale ) +- : d_ptr( new KCalendarSystemPrivate( this ) ) ++KCalendarSystem::KCalendarSystem(const KSharedConfig::Ptr config, const KLocale *locale) ++ : d_ptr(new KCalendarSystemPrivate(this)) + { + d_ptr->m_config = config; + d_ptr->m_locale = locale; + } + +-KCalendarSystem::KCalendarSystem( KCalendarSystemPrivate &dd, const KSharedConfig::Ptr config, const KLocale *locale ) +- : d_ptr( &dd ) ++KCalendarSystem::KCalendarSystem(KCalendarSystemPrivate &dd, const KSharedConfig::Ptr config, const KLocale *locale) ++ : d_ptr(&dd) + { + d_ptr->m_config = config; + d_ptr->m_locale = locale; +@@ -1061,7 +1099,7 @@ KCalendarSystem::~KCalendarSystem() + // NOT VIRTUAL - If override needed use shared-d + KLocale::CalendarSystem KCalendarSystem::calendarSystem() const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + return d->calendarSystem(); + } +@@ -1069,14 +1107,14 @@ KLocale::CalendarSystem KCalendarSystem::calendarSystem() const + // NOT VIRTUAL - If override needed use shared-d + QString KCalendarSystem::calendarLabel() const + { +- return KCalendarSystem::calendarLabel( calendarSystem() ); ++ return KCalendarSystem::calendarLabel(calendarSystem()); + } + + // Dummy version using Gregorian as an example + // This method MUST be re-implemented in any new Calendar System + QDate KCalendarSystem::epoch() const + { +- return QDate::fromJulianDay( 38 ); ++ return QDate::fromJulianDay(38); + } + + QDate KCalendarSystem::earliestValidDate() const +@@ -1089,23 +1127,23 @@ QDate KCalendarSystem::earliestValidDate() const + QDate KCalendarSystem::latestValidDate() const + { + // Default to Gregorian 9999-12-31 +- return QDate::fromJulianDay( 5373484 ); ++ return QDate::fromJulianDay(5373484); + } + +-bool KCalendarSystem::isValid( int year, int month, int day ) const ++bool KCalendarSystem::isValid(int year, int month, int day) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( year < d->earliestValidYear() || year > d->latestValidYear() || +- ( !d->hasYearZero() && year == 0 ) ) { ++ if (year < d->earliestValidYear() || year > d->latestValidYear() || ++ (!d->hasYearZero() && year == 0)) { + return false; + } + +- if ( month < 1 || month > d->monthsInYear( year ) ) { ++ if (month < 1 || month > d->monthsInYear(year)) { + return false; + } + +- if ( day < 1 || day > d->daysInMonth( year, month ) ) { ++ if (day < 1 || day > d->daysInMonth(year, month)) { + return false; + } + +@@ -1113,59 +1151,59 @@ bool KCalendarSystem::isValid( int year, int month, int day ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::isValid( int year, int dayOfYear ) const ++bool KCalendarSystem::isValid(int year, int dayOfYear) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- return ( isValid( year, 1, 1 ) && dayOfYear > 0 && dayOfYear <= d->daysInYear( year ) ); ++ return (isValid(year, 1, 1) && dayOfYear > 0 && dayOfYear <= d->daysInYear(year)); + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::isValid( const QString &eraName, int yearInEra, int month, int day ) const ++bool KCalendarSystem::isValid(const QString &eraName, int yearInEra, int month, int day) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- KCalendarEra era = d->era( eraName, yearInEra ); +- return ( era.isValid() && isValid( era.year( yearInEra ), month, day ) ); ++ KCalendarEra era = d->era(eraName, yearInEra); ++ return (era.isValid() && isValid(era.year(yearInEra), month, day)); + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::isValidIsoWeekDate( int year, int isoWeekNumber, int dayOfIsoWeek ) const ++bool KCalendarSystem::isValidIsoWeekDate(int year, int isoWeekNumber, int dayOfIsoWeek) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + //Tests Year value in standard YMD isValid() +- if ( !isValid( year, 1, 1 ) ) { ++ if (!isValid(year, 1, 1)) { + return false; + } + + //Test Week Number falls in valid range for this year +- int weeksInThisYear = weeksInYear( year ); +- if ( isoWeekNumber < 1 || isoWeekNumber > weeksInThisYear ) { ++ int weeksInThisYear = weeksInYear(year); ++ if (isoWeekNumber < 1 || isoWeekNumber > weeksInThisYear) { + return false; + } + + //Test Day of Week Number falls in valid range +- if ( dayOfIsoWeek < 1 || dayOfIsoWeek > d->daysInWeek() ) { ++ if (dayOfIsoWeek < 1 || dayOfIsoWeek > d->daysInWeek()) { + return false; + } + + //If not in earliest or latest years then all OK + //Otherwise need to check don't fall into previous or next year that would be invalid +- if ( year == d->earliestValidYear() && isoWeekNumber == 1 ) { ++ if (year == d->earliestValidYear() && isoWeekNumber == 1) { + //If firstDayOfYear falls on or before Thursday then firstDayOfYear falls in week 1 this + //year and if wanted dayOfIsoWeek falls before firstDayOfYear then falls in previous year + //and so in invalid year +- int dowFirstDay = dayOfWeek( d->firstDayOfYear( year ) ); +- if ( dowFirstDay <= 4 && dayOfIsoWeek < dowFirstDay ) { ++ int dowFirstDay = dayOfWeek(d->firstDayOfYear(year)); ++ if (dowFirstDay <= 4 && dayOfIsoWeek < dowFirstDay) { + return false; + } +- } else if ( year == d->latestValidYear() && isoWeekNumber == weeksInThisYear ) { ++ } else if (year == d->latestValidYear() && isoWeekNumber == weeksInThisYear) { + //If lastDayOfYear falls on or after Thursday then lastDayOfYear falls in last week this + //year and if wanted dayOfIsoWeek falls after lastDayOfYear then falls in next year + //and so in invalid year +- int dowLastDay = dayOfWeek( d->lastDayOfYear( year ) ); +- if ( dowLastDay >= 4 && dayOfIsoWeek > dowLastDay ) { ++ int dowLastDay = dayOfWeek(d->lastDayOfYear(year)); ++ if (dowLastDay >= 4 && dayOfIsoWeek > dowLastDay) { + return false; + } + } +@@ -1173,26 +1211,26 @@ bool KCalendarSystem::isValidIsoWeekDate( int year, int isoWeekNumber, int dayOf + return true; + } + +-bool KCalendarSystem::isValid( const QDate &date ) const ++bool KCalendarSystem::isValid(const QDate &date) const + { +- if ( date.isNull() || date < earliestValidDate() || date > latestValidDate() ) { ++ if (date.isNull() || date < earliestValidDate() || date > latestValidDate()) { + return false; + } + return true; + } + +-bool KCalendarSystem::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystem::setDate(QDate &date, int year, int month, int day) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + date = d->invalidDate(); + +- if ( isValid( year, month, day ) ) { ++ if (isValid(year, month, day)) { + int jd; +- dateToJulianDay( year, month, day, jd ); +- QDate calcDate = QDate::fromJulianDay( jd ); ++ dateToJulianDay(year, month, day, jd); ++ QDate calcDate = QDate::fromJulianDay(jd); + +- if ( isValid( calcDate ) ) { ++ if (isValid(calcDate)) { + date = calcDate; + return true; + } +@@ -1202,17 +1240,17 @@ bool KCalendarSystem::setDate( QDate &date, int year, int month, int day ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::setDate( QDate &date, int year, int dayOfYear ) const ++bool KCalendarSystem::setDate(QDate &date, int year, int dayOfYear) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + date = d->invalidDate(); + +- if ( isValid( year, dayOfYear ) ) { ++ if (isValid(year, dayOfYear)) { + int jd; +- dateToJulianDay( year, 1, 1, jd ); +- QDate calcDate = QDate::fromJulianDay( jd + dayOfYear - 1 ); +- if ( isValid( calcDate ) ) { ++ dateToJulianDay(year, 1, 1, jd); ++ QDate calcDate = QDate::fromJulianDay(jd + dayOfYear - 1); ++ if (isValid(calcDate)) { + date = calcDate; + return true; + } +@@ -1222,35 +1260,35 @@ bool KCalendarSystem::setDate( QDate &date, int year, int dayOfYear ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::setDate( QDate &date, QString eraName, int yearInEra, int month, int day ) const ++bool KCalendarSystem::setDate(QDate &date, QString eraName, int yearInEra, int month, int day) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- KCalendarEra era = d->era( eraName, yearInEra ); +- return ( era.isValid() && setDate( date, era.year( yearInEra ), month, day ) ); ++ KCalendarEra era = d->era(eraName, yearInEra); ++ return (era.isValid() && setDate(date, era.year(yearInEra), month, day)); + } + + // NOT VIRTUAL - If override needed use shared-d +-bool KCalendarSystem::setDateIsoWeek( QDate &date, int year, int isoWeekNumber, int dayOfIsoWeek ) const ++bool KCalendarSystem::setDateIsoWeek(QDate &date, int year, int isoWeekNumber, int dayOfIsoWeek) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + date = d->invalidDate(); + +- if ( isValidIsoWeekDate( year, isoWeekNumber, dayOfIsoWeek ) ) { ++ if (isValidIsoWeekDate(year, isoWeekNumber, dayOfIsoWeek)) { + +- QDate calcDate = d->firstDayOfYear( year ); +- int dowFirstDayOfYear = dayOfWeek( calcDate ); ++ QDate calcDate = d->firstDayOfYear(year); ++ int dowFirstDayOfYear = dayOfWeek(calcDate); + +- int daysToAdd = ( d->daysInWeek() * ( isoWeekNumber - 1 ) ) + dayOfIsoWeek; ++ int daysToAdd = (d->daysInWeek() * (isoWeekNumber - 1)) + dayOfIsoWeek; + +- if ( dowFirstDayOfYear <= 4 ) { +- calcDate = calcDate.addDays( daysToAdd - dowFirstDayOfYear ); ++ if (dowFirstDayOfYear <= 4) { ++ calcDate = calcDate.addDays(daysToAdd - dowFirstDayOfYear); + } else { +- calcDate = calcDate.addDays( daysInWeek( calcDate ) + daysToAdd - dowFirstDayOfYear ); ++ calcDate = calcDate.addDays(daysInWeek(calcDate) + daysToAdd - dowFirstDayOfYear); + } + +- if ( isValid( calcDate ) ) { ++ if (isValid(calcDate)) { + date = calcDate; + return true; + } +@@ -1260,42 +1298,42 @@ bool KCalendarSystem::setDateIsoWeek( QDate &date, int year, int isoWeekNumber, + } + + // Deprecated +-bool KCalendarSystem::setYMD( QDate &date, int year, int month, int day ) const ++bool KCalendarSystem::setYMD(QDate &date, int year, int month, int day) const + { +- return setDate( date, year, month, day ); ++ return setDate(date, year, month, day); + } + + // NOT VIRTUAL - If override needed use shared-d +-void KCalendarSystem::getDate( const QDate date, int *year, int *month, int *day ) const ++void KCalendarSystem::getDate(const QDate date, int *year, int *month, int *day) const + { + int y, m, d; + +- if ( isValid( date ) ) { +- julianDayToDate( date.toJulianDay(), y, m, d ); ++ if (isValid(date)) { ++ julianDayToDate(date.toJulianDay(), y, m, d); + } else { + y = 0; // How do you denote invalid year when we support -ve years? + m = 0; + d = 0; + } + +- if ( year ) { ++ if (year) { + *year = y; + } +- if ( month ) { ++ if (month) { + *month = m; + } +- if ( day ) { ++ if (day) { + *day = d; + } + + } + +-int KCalendarSystem::year( const QDate &date ) const ++int KCalendarSystem::year(const QDate &date) const + { +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month, day; + +- julianDayToDate( date.toJulianDay(), year, month, day ); ++ julianDayToDate(date.toJulianDay(), year, month, day); + + return year; + } +@@ -1303,12 +1341,12 @@ int KCalendarSystem::year( const QDate &date ) const + return 0; // How do you denote invalid year when we support -ve years? + } + +-int KCalendarSystem::month( const QDate &date ) const ++int KCalendarSystem::month(const QDate &date) const + { +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month, day; + +- julianDayToDate( date.toJulianDay(), year, month, day ); ++ julianDayToDate(date.toJulianDay(), year, month, day); + + return month; + } +@@ -1316,12 +1354,12 @@ int KCalendarSystem::month( const QDate &date ) const + return 0; + } + +-int KCalendarSystem::day( const QDate &date ) const ++int KCalendarSystem::day(const QDate &date) const + { +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month, day; + +- julianDayToDate( date.toJulianDay(), year, month, day ); ++ julianDayToDate(date.toJulianDay(), year, month, day); + + return day; + } +@@ -1330,15 +1368,15 @@ int KCalendarSystem::day( const QDate &date ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::eraName( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::eraName(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- if ( format == LongFormat ) { +- return d->era( date ).name( KLocale::LongName ); ++ if (isValid(date)) { ++ if (format == LongFormat) { ++ return d->era(date).name(KLocale::LongName); + } else { +- return d->era( date ).name( KLocale::ShortName ); ++ return d->era(date).name(KLocale::ShortName); + } + } + +@@ -1346,25 +1384,25 @@ QString KCalendarSystem::eraName( const QDate &date, StringFormat format ) const + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::eraYear( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::eraYear(const QDate &date, StringFormat format) const + { +- Q_UNUSED( format ) +- Q_D( const KCalendarSystem ); ++ Q_UNUSED(format) ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return formatDate( date, d->era( date ).format() ); ++ if (isValid(date)) { ++ return formatDate(date, d->era(date).format()); + } + + return QString(); + } + + // NOT VIRTUAL - If override needed use shared-d +-int KCalendarSystem::yearInEra( const QDate &date ) const ++int KCalendarSystem::yearInEra(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->era( date ).yearInEra( year( date ) ); ++ if (isValid(date)) { ++ return d->era(date).yearInEra(year(date)); + } + + return -1; +@@ -1373,48 +1411,48 @@ int KCalendarSystem::yearInEra( const QDate &date ) const + // NOT VIRTUAL - If override needed use shared-d + QList<KCalendarEra> *KCalendarSystem::eraList() const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + return d->eraList(); + } + + // NOT VIRTUAL - If override needed use shared-d +-KCalendarEra KCalendarSystem::era( const QDate &eraDate ) const ++KCalendarEra KCalendarSystem::era(const QDate &eraDate) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- return d->era( eraDate ); ++ return d->era(eraDate); + } + + // NOT VIRTUAL - If override needed use shared-d +-KCalendarEra KCalendarSystem::era( const QString &eraName, int yearInEra ) const ++KCalendarEra KCalendarSystem::era(const QString &eraName, int yearInEra) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- return d->era( eraName, yearInEra ); ++ return d->era(eraName, yearInEra); + } + +-QDate KCalendarSystem::addYears( const QDate &date, int numYears ) const ++QDate KCalendarSystem::addYears(const QDate &date, int numYears) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + + int originalYear, originalMonth, originalDay; +- julianDayToDate( date.toJulianDay(), originalYear, originalMonth, originalDay ); ++ julianDayToDate(date.toJulianDay(), originalYear, originalMonth, originalDay); + +- int newYear = d->addYears( originalYear, numYears ); ++ int newYear = d->addYears(originalYear, numYears); + int newMonth = originalMonth; + int newDay = originalDay; + + //Adjust day number if new month has fewer days than old month +- int daysInNewMonth = d->daysInMonth( newYear, newMonth ); +- if ( daysInNewMonth < originalDay ) { ++ int daysInNewMonth = d->daysInMonth(newYear, newMonth); ++ if (daysInNewMonth < originalDay) { + newDay = daysInNewMonth; + } + + QDate newDate; +- setDate( newDate, newYear, newMonth, newDay ); ++ setDate(newDate, newYear, newMonth, newDay); + return newDate; + + } +@@ -1422,38 +1460,38 @@ QDate KCalendarSystem::addYears( const QDate &date, int numYears ) const + return d->invalidDate(); + } + +-QDate KCalendarSystem::addMonths( const QDate &date, int numMonths ) const ++QDate KCalendarSystem::addMonths(const QDate &date, int numMonths) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + + int originalYear, originalMonth, originalDay; +- julianDayToDate( date.toJulianDay(), originalYear, originalMonth, originalDay ); ++ julianDayToDate(date.toJulianDay(), originalYear, originalMonth, originalDay); + +- int monthsInOriginalYear = d->monthsInYear( originalYear ); ++ int monthsInOriginalYear = d->monthsInYear(originalYear); + +- int newYear = d->addYears( originalYear, ( originalMonth + numMonths ) / monthsInOriginalYear ); +- int newMonth = ( originalMonth + numMonths ) % monthsInOriginalYear; ++ int newYear = d->addYears(originalYear, (originalMonth + numMonths) / monthsInOriginalYear); ++ int newMonth = (originalMonth + numMonths) % monthsInOriginalYear; + int newDay = originalDay; + +- if ( newMonth == 0 ) { +- newYear = d->addYears( newYear, - 1 ); ++ if (newMonth == 0) { ++ newYear = d->addYears(newYear, - 1); + newMonth = monthsInOriginalYear; + } +- if ( newMonth < 0 ) { +- newYear = d->addYears( newYear, - 1 ); ++ if (newMonth < 0) { ++ newYear = d->addYears(newYear, - 1); + newMonth = newMonth + monthsInOriginalYear; + } + + //Adjust day number if new month has fewer days than old month +- int daysInNewMonth = d->daysInMonth( newYear, newMonth ); +- if ( daysInNewMonth < originalDay ) { ++ int daysInNewMonth = d->daysInMonth(newYear, newMonth); ++ if (daysInNewMonth < originalDay) { + newDay = daysInNewMonth; + } + + QDate newDate; +- setDate( newDate, newYear, newMonth, newDay ); ++ setDate(newDate, newYear, newMonth, newDay); + return newDate; + + } +@@ -1461,15 +1499,15 @@ QDate KCalendarSystem::addMonths( const QDate &date, int numMonths ) const + return d->invalidDate(); + } + +-QDate KCalendarSystem::addDays( const QDate &date, int numDays ) const ++QDate KCalendarSystem::addDays(const QDate &date, int numDays) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + // QDate only holds a uint and has no boundary checking in addDays(), so we need to check +- if ( isValid( date ) && (long) date.toJulianDay() + (long) numDays > 0 ) { ++ if (isValid(date) && (long) date.toJulianDay() + (long) numDays > 0) { + // QDate adds straight to jd +- QDate temp = date.addDays( numDays ); +- if ( isValid( temp ) ) { ++ QDate temp = date.addDays(numDays); ++ if (isValid(temp)) { + return temp; + } + } +@@ -1478,519 +1516,517 @@ QDate KCalendarSystem::addDays( const QDate &date, int numDays ) const + } + + // NOT VIRTUAL - Uses shared-d instead +-void KCalendarSystem::dateDifference( const QDate &fromDate, const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction ) const ++void KCalendarSystem::dateDifference(const QDate &fromDate, const QDate &toDate, ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( fromDate ) && isValid( toDate ) ) { +- d->dateDifference( fromDate, toDate, yearsDiff, monthsDiff, daysDiff, direction ); ++ if (isValid(fromDate) && isValid(toDate)) { ++ d->dateDifference(fromDate, toDate, yearsDiff, monthsDiff, daysDiff, direction); + } + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::yearsDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystem::yearsDifference(const QDate &fromDate, const QDate &toDate) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( fromDate ) && isValid( toDate ) ) { +- return d->yearsDifference( fromDate, toDate ); ++ if (isValid(fromDate) && isValid(toDate)) { ++ return d->yearsDifference(fromDate, toDate); + } + + return 0; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::monthsDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystem::monthsDifference(const QDate &fromDate, const QDate &toDate) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( fromDate ) && isValid( toDate ) ) { +- return d->monthsDifference( fromDate, toDate ); ++ if (isValid(fromDate) && isValid(toDate)) { ++ return d->monthsDifference(fromDate, toDate); + } + + return 0; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::daysDifference( const QDate &fromDate, const QDate &toDate ) const ++int KCalendarSystem::daysDifference(const QDate &fromDate, const QDate &toDate) const + { +- if ( isValid( fromDate ) && isValid( toDate ) ) { ++ if (isValid(fromDate) && isValid(toDate)) { + return toDate.toJulianDay() - fromDate.toJulianDay(); + } + + return 0; + } + +-int KCalendarSystem::monthsInYear( const QDate &date ) const ++int KCalendarSystem::monthsInYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->monthsInYear( year( date ) ); ++ if (isValid(date)) { ++ return d->monthsInYear(year(date)); + } + + return -1; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::monthsInYear( int year ) const ++int KCalendarSystem::monthsInYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->monthsInYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->monthsInYear(year); + } + + return -1; + } + +-int KCalendarSystem::weeksInYear( const QDate &date ) const ++int KCalendarSystem::weeksInYear(const QDate &date) const + { +- if ( isValid( date ) ) { +- return weeksInYear( year( date ) ); +- } ++ return weeksInYear(date, KLocale::DefaultWeekNumber); ++} + +- return -1; ++int KCalendarSystem::weeksInYear(int year) const ++{ ++ return weeksInYear(year, KLocale::DefaultWeekNumber); + } + +-int KCalendarSystem::weeksInYear( int year ) const ++// NOT VIRTUAL - Uses shared-d instead ++int KCalendarSystem::weeksInYear(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem) const + { +- return weeksInYear( year, KLocale::DefaultWeekNumber ); ++ Q_D(const KCalendarSystem); ++ ++ if (isValid(date)) { ++ return d->weeksInYear(year(date), weekNumberSystem); ++ } ++ ++ return -1; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::weeksInYear( int year, KLocale::WeekNumberSystem weekNumberSystem ) const ++int KCalendarSystem::weeksInYear(int year, KLocale::WeekNumberSystem weekNumberSystem) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->weeksInYear( year, weekNumberSystem ); ++ if (isValid(year, 1, 1)) { ++ return d->weeksInYear(year, weekNumberSystem); + } + + return -1; + } + +-int KCalendarSystem::daysInYear( const QDate &date ) const ++int KCalendarSystem::daysInYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->daysInYear( year( date ) ); ++ if (isValid(date)) { ++ return d->daysInYear(year(date)); + } + + return -1; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::daysInYear( int year ) const ++int KCalendarSystem::daysInYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->daysInYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->daysInYear(year); + } + + return -1; + } + +-int KCalendarSystem::daysInMonth( const QDate &date ) const ++int KCalendarSystem::daysInMonth(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month; +- getDate( date, &year, &month, 0 ); +- return d->daysInMonth( year, month ); ++ getDate(date, &year, &month, 0); ++ return d->daysInMonth(year, month); + } + + return -1; + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::daysInMonth( int year, int month ) const ++int KCalendarSystem::daysInMonth(int year, int month) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->daysInMonth( year, month ); ++ if (isValid(year, 1, 1)) { ++ return d->daysInMonth(year, month); + } + + return -1; + } + +-int KCalendarSystem::daysInWeek( const QDate &date ) const ++int KCalendarSystem::daysInWeek(const QDate &date) const + { +- Q_UNUSED( date ) +- Q_D( const KCalendarSystem ); ++ Q_UNUSED(date) ++ Q_D(const KCalendarSystem); + return d->daysInWeek(); + } + +-int KCalendarSystem::dayOfYear( const QDate &date ) const ++int KCalendarSystem::dayOfYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->dayOfYear( date ); ++ if (isValid(date)) { ++ return d->dayOfYear(date); + } + + return -1; + } + +-int KCalendarSystem::dayOfWeek( const QDate &date ) const ++int KCalendarSystem::dayOfWeek(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->dayOfWeek( date ); ++ if (isValid(date)) { ++ return d->dayOfWeek(date); + } + + return -1; + } + +-int KCalendarSystem::weekNumber( const QDate &date, int *yearNum ) const ++int KCalendarSystem::weekNumber(const QDate &date, int *yearNum) const + { +- return week( date, KLocale::IsoWeekNumber, yearNum ); ++ return week(date, KLocale::IsoWeekNumber, yearNum); + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::week( const QDate &date, int *yearNum ) const ++int KCalendarSystem::week(const QDate &date, int *yearNum) const + { +- return week( date, KLocale::DefaultWeekNumber, yearNum ); ++ return week(date, KLocale::DefaultWeekNumber, yearNum); + } + + // NOT VIRTUAL - Uses shared-d instead +-int KCalendarSystem::week( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum ) const ++int KCalendarSystem::week(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->week( date, weekNumberSystem, yearNum ); ++ if (isValid(date)) { ++ return d->week(date, weekNumberSystem, yearNum); + } + + return -1; + } + +-bool KCalendarSystem::isLeapYear( int year ) const ++bool KCalendarSystem::isLeapYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->isLeapYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->isLeapYear(year); + } + + return false; + } + +-bool KCalendarSystem::isLeapYear( const QDate &date ) const ++bool KCalendarSystem::isLeapYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->isLeapYear( year( date ) ); ++ if (isValid(date)) { ++ return d->isLeapYear(year(date)); + } + + return false; + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::firstDayOfYear( int year ) const ++QDate KCalendarSystem::firstDayOfYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->firstDayOfYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->firstDayOfYear(year); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::lastDayOfYear( int year ) const ++QDate KCalendarSystem::lastDayOfYear(int year) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, 1, 1 ) ) { +- return d->lastDayOfYear( year ); ++ if (isValid(year, 1, 1)) { ++ return d->lastDayOfYear(year); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::firstDayOfYear( const QDate &date ) const ++QDate KCalendarSystem::firstDayOfYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->firstDayOfYear( year( date ) ); ++ if (isValid(date)) { ++ return d->firstDayOfYear(year(date)); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::lastDayOfYear( const QDate &date ) const ++QDate KCalendarSystem::lastDayOfYear(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { +- return d->lastDayOfYear( year( date ) ); ++ if (isValid(date)) { ++ return d->lastDayOfYear(year(date)); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::firstDayOfMonth( int year, int month ) const ++QDate KCalendarSystem::firstDayOfMonth(int year, int month) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, month, 1 ) ) { +- return d->firstDayOfMonth( year, month ); ++ if (isValid(year, month, 1)) { ++ return d->firstDayOfMonth(year, month); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::lastDayOfMonth( int year, int month ) const ++QDate KCalendarSystem::lastDayOfMonth(int year, int month) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( year, month, 1 ) ) { +- return d->lastDayOfMonth( year, month ); ++ if (isValid(year, month, 1)) { ++ return d->lastDayOfMonth(year, month); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::firstDayOfMonth( const QDate &date ) const ++QDate KCalendarSystem::firstDayOfMonth(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month; +- getDate( date, &year, &month, 0 ); +- return d->firstDayOfMonth( year, month ); ++ getDate(date, &year, &month, 0); ++ return d->firstDayOfMonth(year, month); + } + + return QDate(); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::lastDayOfMonth( const QDate &date ) const ++QDate KCalendarSystem::lastDayOfMonth(const QDate &date) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month; +- getDate( date, &year, &month, 0 ); +- return d->lastDayOfMonth( year, month ); ++ getDate(date, &year, &month, 0); ++ return d->lastDayOfMonth(year, month); + } + + return QDate(); + } + +-QString KCalendarSystem::monthName( int month, int year, KCalendarSystem::MonthNameFormat format ) const ++QString KCalendarSystem::monthName(int month, int year, KCalendarSystem::MonthNameFormat format) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( !isValid( year, month, 1 ) ) { ++ if (!isValid(year, month, 1)) { + return QString(); + } + +- if ( format == KCalendarSystem::NarrowName ) { +- return d->monthName( month, year, KLocale::NarrowName, false ); ++ if (format == KCalendarSystem::NarrowName) { ++ return d->monthName(month, year, KLocale::NarrowName, false); + } + +- if ( format == KCalendarSystem::ShortNamePossessive ) { +- return d->monthName( month, year, KLocale::ShortName, true ); ++ if (format == KCalendarSystem::ShortNamePossessive) { ++ return d->monthName(month, year, KLocale::ShortName, true); + } + +- if ( format == KCalendarSystem::ShortName ) { +- return d->monthName( month, year, KLocale::ShortName, false ); ++ if (format == KCalendarSystem::ShortName) { ++ return d->monthName(month, year, KLocale::ShortName, false); + } + +- if ( format == KCalendarSystem::LongNamePossessive ) { +- return d->monthName( month, year, KLocale::LongName, true ); ++ if (format == KCalendarSystem::LongNamePossessive) { ++ return d->monthName(month, year, KLocale::LongName, true); + } + + // KCalendarSystem::LongName or any other +- return d->monthName( month, year, KLocale::LongName, false ); ++ return d->monthName(month, year, KLocale::LongName, false); + } + +-QString KCalendarSystem::monthName( const QDate &date, MonthNameFormat format ) const ++QString KCalendarSystem::monthName(const QDate &date, MonthNameFormat format) const + { +- if ( isValid( date ) ) { ++ if (isValid(date)) { + int year, month; +- getDate( date, &year, &month, 0 ); +- return monthName( month, year, format ); ++ getDate(date, &year, &month, 0); ++ return monthName(month, year, format); + } + + return QString(); + } + +-QString KCalendarSystem::weekDayName( int weekDay, KCalendarSystem::WeekDayNameFormat format ) const ++QString KCalendarSystem::weekDayName(int weekDay, KCalendarSystem::WeekDayNameFormat format) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( weekDay < 1 || weekDay > d->daysInWeek() ) { ++ if (weekDay < 1 || weekDay > d->daysInWeek()) { + return QString(); + } + +- if ( format == KCalendarSystem::NarrowDayName ) { +- return d->weekDayName( weekDay, KLocale::NarrowName ); ++ if (format == KCalendarSystem::NarrowDayName) { ++ return d->weekDayName(weekDay, KLocale::NarrowName); + } + +- if ( format == KCalendarSystem::ShortDayName ) { +- return d->weekDayName( weekDay, KLocale::ShortName ); ++ if (format == KCalendarSystem::ShortDayName) { ++ return d->weekDayName(weekDay, KLocale::ShortName); + } + +- if ( format == KCalendarSystem::ShortDayName ) { +- return d->weekDayName( weekDay, KLocale::ShortName ); ++ if (format == KCalendarSystem::ShortDayName) { ++ return d->weekDayName(weekDay, KLocale::ShortName); + } + +- return d->weekDayName( weekDay, KLocale::LongName ); ++ return d->weekDayName(weekDay, KLocale::LongName); + } + +-QString KCalendarSystem::weekDayName( const QDate &date, WeekDayNameFormat format ) const ++QString KCalendarSystem::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- if ( isValid( date ) ) { +- return weekDayName( dayOfWeek( date ), format ); ++ if (isValid(date)) { ++ return weekDayName(dayOfWeek(date), format); + } + + return QString(); + } + +-QString KCalendarSystem::yearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::yearString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%y") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::Year, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%Y") ); ++ return formatDate(date, KLocale::Year, KLocale::LongNumber); + } + } + +-QString KCalendarSystem::monthString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::monthString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%n") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::Month, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%m") ); ++ return formatDate(date, KLocale::Month, KLocale::LongNumber); + } + } + +-QString KCalendarSystem::dayString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::dayString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%e") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::Day, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%d") ); ++ return formatDate(date, KLocale::Day, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::yearInEraString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::yearInEraString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%Ey") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::YearInEra, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%4Ey") ); ++ return formatDate(date, KLocale::YearInEra, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::dayOfYearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::dayOfYearString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%-j") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::DayOfYear, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%j") ); ++ return formatDate(date, KLocale::DayOfYear, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::dayOfWeekString( const QDate &date ) const ++QString KCalendarSystem::dayOfWeekString(const QDate &date) const + { +- return formatDate( date, QLatin1String("%-u") ); ++ return formatDate(date, KLocale::DayOfWeek, KLocale::ShortNumber); + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::weekNumberString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::weekNumberString(const QDate &date, StringFormat format) const + { +- if ( format == ShortFormat ) { +- return formatDate( date, QLatin1String("%-V") ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::Week, KLocale::ShortNumber); + } else { +- return formatDate( date, QLatin1String("%V") ); ++ return formatDate(date, KLocale::Week, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::monthsInYearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::monthsInYearString(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); +- +- if ( format == ShortFormat ) { +- return d->stringFromInteger( monthsInYear( date ), 0, QLatin1Char('0') ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::MonthsInYear, KLocale::ShortNumber); + } else { +- return d->stringFromInteger( monthsInYear( date ), 2, QLatin1Char('0') ); ++ return formatDate(date, KLocale::MonthsInYear, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::weeksInYearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::weeksInYearString(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); +- +- if ( format == ShortFormat ) { +- return d->stringFromInteger( weeksInYear( date ), 0, QLatin1Char('0') ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::WeeksInYear, KLocale::ShortNumber); + } else { +- return d->stringFromInteger( weeksInYear( date ), 2, QLatin1Char('0') ); ++ return formatDate(date, KLocale::WeeksInYear, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::daysInYearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::daysInYearString(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); +- +- if ( format == ShortFormat ) { +- return d->stringFromInteger( daysInYear( date ), 0, QLatin1Char('0') ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::DaysInYear, KLocale::ShortNumber); + } else { +- return d->stringFromInteger( daysInYear( date ), 3, QLatin1Char('0') ); ++ return formatDate(date, KLocale::DaysInYear, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::daysInMonthString( const QDate &date, StringFormat format ) const ++QString KCalendarSystem::daysInMonthString(const QDate &date, StringFormat format) const + { +- Q_D( const KCalendarSystem ); +- +- if ( format == ShortFormat ) { +- return d->stringFromInteger( daysInMonth( date ), 0, QLatin1Char('0') ); ++ if (format == ShortFormat) { ++ return formatDate(date, KLocale::DaysInMonth, KLocale::ShortNumber); + } else { +- return d->stringFromInteger( daysInMonth( date ), 2, QLatin1Char('0') ); ++ return formatDate(date, KLocale::DaysInMonth, KLocale::LongNumber); + } + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::daysInWeekString( const QDate &date) const ++QString KCalendarSystem::daysInWeekString(const QDate &date) const + { +- Q_D( const KCalendarSystem ); +- Q_UNUSED( date ); +- return d->stringFromInteger( d->daysInWeek(), 0 ); ++ return formatDate(date, KLocale::DaysInWeek, KLocale::ShortNumber); + } + +-int KCalendarSystem::yearStringToInteger( const QString &yearString, int &readLength ) const ++int KCalendarSystem::yearStringToInteger(const QString &yearString, int &readLength) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- QString minus = i18nc( "Negative symbol as used for year numbers, e.g. -5 = 5 BC", "-" ); +- if ( yearString.startsWith( minus ) ) { +- int value = d->integerFromString( yearString.mid( minus.length() ), 4, readLength ); +- if ( readLength > 0 && value >= 0 ) { ++ QString minus = i18nc("Negative symbol as used for year numbers, e.g. -5 = 5 BC", "-"); ++ if (yearString.startsWith(minus)) { ++ int value = d->integerFromString(yearString.mid(minus.length()), 4, readLength); ++ if (readLength > 0 && value >= 0) { + readLength = readLength + minus.length(); + return value * -1; + } else { +@@ -1998,31 +2034,31 @@ int KCalendarSystem::yearStringToInteger( const QString &yearString, int &readLe + } + } + +- return d->integerFromString( yearString, 4, readLength ); ++ return d->integerFromString(yearString, 4, readLength); + } + +-int KCalendarSystem::monthStringToInteger( const QString &monthString, int &readLength ) const ++int KCalendarSystem::monthStringToInteger(const QString &monthString, int &readLength) const + { +- Q_D( const KCalendarSystem ); +- return d->integerFromString( monthString, 2, readLength ); ++ Q_D(const KCalendarSystem); ++ return d->integerFromString(monthString, 2, readLength); + } + +-int KCalendarSystem::dayStringToInteger( const QString &dayString, int &readLength ) const ++int KCalendarSystem::dayStringToInteger(const QString &dayString, int &readLength) const + { +- Q_D( const KCalendarSystem ); +- return d->integerFromString( dayString, 2, readLength ); ++ Q_D(const KCalendarSystem); ++ return d->integerFromString(dayString, 2, readLength); + } + +-QString KCalendarSystem::formatDate( const QDate &fromDate, KLocale::DateFormat toFormat ) const ++QString KCalendarSystem::formatDate(const QDate &fromDate, KLocale::DateFormat toFormat) const + { +- if ( !fromDate.isValid() ) { ++ if (!fromDate.isValid()) { + return QString(); + } + +- if ( toFormat == KLocale::FancyShortDate || toFormat == KLocale::FancyLongDate ) { ++ if (toFormat == KLocale::FancyShortDate || toFormat == KLocale::FancyLongDate) { + QDate now = KDateTime::currentLocalDate(); +- int daysToNow = fromDate.daysTo( now ); +- switch ( daysToNow ) { ++ int daysToNow = fromDate.daysTo(now); ++ switch (daysToNow) { + case 0: + return i18n("Today"); + case 1: +@@ -2032,47 +2068,47 @@ QString KCalendarSystem::formatDate( const QDate &fromDate, KLocale::DateFormat + case 4: + case 5: + case 6: +- return weekDayName( fromDate ); ++ return weekDayName(fromDate); + default: + break; + } + } + +- switch ( toFormat ) { ++ switch (toFormat) { + case KLocale::LongDate: + case KLocale::FancyLongDate: +- return formatDate( fromDate, locale()->dateFormat() ); ++ return formatDate(fromDate, locale()->dateFormat()); + case KLocale::IsoDate: +- return formatDate( fromDate, QLatin1String("%Y-%m-%d") ); ++ return formatDate(fromDate, QLatin1String("%Y-%m-%d")); + case KLocale::IsoWeekDate: +- return formatDate( fromDate, QLatin1String("%Y-W%V-%u") ); ++ return formatDate(fromDate, QLatin1String("%Y-W%V-%u")); + case KLocale::IsoOrdinalDate: +- return formatDate( fromDate, QLatin1String("%Y-%j") ); ++ return formatDate(fromDate, QLatin1String("%Y-%j")); + case KLocale::ShortDate: + case KLocale::FancyShortDate: + default: +- return formatDate( fromDate, locale()->dateFormatShort() ); ++ return formatDate(fromDate, locale()->dateFormatShort()); + } + + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::formatDate( const QDate &fromDate, const QString &toFormat, +- KLocale::DateTimeFormatStandard standard ) const ++QString KCalendarSystem::formatDate(const QDate &fromDate, const QString &toFormat, ++ KLocale::DateTimeFormatStandard standard) const + { +- return formatDate( fromDate, toFormat, locale()->dateTimeDigitSet(), standard ); ++ return formatDate(fromDate, toFormat, locale()->dateTimeDigitSet(), standard); + } + + // NOT VIRTUAL - If override needed use shared-d +-QString KCalendarSystem::formatDate( const QDate &fromDate, const QString &toFormat, KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KCalendarSystem::formatDate(const QDate &fromDate, const QString &toFormat, KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { +- if ( !isValid( fromDate ) || toFormat.isEmpty() ) { ++ if (!isValid(fromDate) || toFormat.isEmpty()) { + return QString(); + } + + KDateTimeFormatter formatter; +- return formatter.formatDate( fromDate, toFormat, this, locale(), digitSet, formatStandard ); ++ return formatter.formatDate(fromDate, toFormat, this, locale(), digitSet, formatStandard); + } + + // NOT VIRTUAL - If override needed use shared-d +@@ -2080,25 +2116,24 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + KLocale::DateTimeComponentFormat format, + KLocale::WeekNumberSystem weekNumberSystem) const + { +- Q_D( const KCalendarSystem ); +- Q_UNUSED( weekNumberSystem ); ++ Q_D(const KCalendarSystem); + +- switch ( component ) { ++ switch (component) { + case KLocale::Year: + case KLocale::YearName: +- switch ( format ) { ++ switch (format) { + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: +- return yearString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%y")); + case KLocale::LongNumber: + case KLocale::LongName: + case KLocale::DefaultComponentFormat: + default: +- return yearString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%Y")); + } + case KLocale::Month: +- switch ( format ) { ++ switch (format) { + case KLocale::LongName: + return monthName(date, KCalendarSystem::LongName); + case KLocale::ShortName: +@@ -2106,14 +2141,14 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + case KLocale::NarrowName: + return monthName(date, KCalendarSystem::NarrowName); + case KLocale::LongNumber: +- return monthString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%m")); + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return monthString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%n")); + } + case KLocale::MonthName: +- switch ( format ) { ++ switch (format) { + case KLocale::NarrowName: + return monthName(date, KCalendarSystem::NarrowName); + case KLocale::ShortName: +@@ -2130,16 +2165,16 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return dayString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%d")); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return dayString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%e")); + } + case KLocale::JulianDay: +- return d->stringFromInteger( date.toJulianDay(), 0 ); ++ return d->stringFromInteger(date.toJulianDay(), 0); + case KLocale::EraName: + switch (format) { + case KLocale::LongNumber: +@@ -2168,26 +2203,26 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return yearInEraString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%4Ey")); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return yearInEraString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%Ey")); + } + case KLocale::DayOfYear: + case KLocale::DayOfYearName: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return dayOfYearString(date, KCalendarSystem::LongFormat); ++ return formatDate(date, QLatin1String("%j")); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return dayOfYearString(date, KCalendarSystem::ShortFormat); ++ return formatDate(date, QLatin1String("%-j")); + } + case KLocale::DayOfWeek: + switch (format) { +@@ -2201,10 +2236,10 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return dayOfWeekString(date); ++ return formatDate(date, QLatin1String("%-u")); + } + case KLocale::DayOfWeekName: +- switch ( format ) { ++ switch (format) { + case KLocale::NarrowName: + return weekDayName(date, KCalendarSystem::NarrowDayName); + case KLocale::ShortName: +@@ -2220,69 +2255,68 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return weekNumberString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(week(date, weekNumberSystem, 0), 2, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return weekNumberString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(week(date, weekNumberSystem, 0), 0, QLatin1Char('0')); + } +- case KLocale::WeekYear: +- { ++ case KLocale::WeekYear: { + int weekYear; + QDate yearDate; +- weekNumber( date, &weekYear ); +- setDate( yearDate, weekYear, 1, 1 ); +- return formatDate( yearDate, KLocale::Year, format ); ++ week(date, weekNumberSystem, &weekYear); ++ setDate(yearDate, weekYear, 1, 1); ++ return formatDate(yearDate, KLocale::Year, format); + } + case KLocale::MonthsInYear: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return monthsInYearString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(monthsInYear(date), 2, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return monthsInYearString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(monthsInYear(date), 0, QLatin1Char('0')); + } + case KLocale::WeeksInYear: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return weeksInYearString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(weeksInYear(date), 2, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return weeksInYearString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(weeksInYear(date), 0, QLatin1Char('0')); + } + case KLocale::DaysInYear: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return daysInYearString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(daysInYear(date), 3, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return daysInYearString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(daysInYear(date), 0, QLatin1Char('0')); + } + case KLocale::DaysInMonth: + switch (format) { + case KLocale::LongNumber: + case KLocale::LongName: +- return daysInMonthString(date, KCalendarSystem::LongFormat); ++ return d->stringFromInteger(daysInMonth(date), 2, QLatin1Char('0')); + case KLocale::ShortName: + case KLocale::NarrowName: + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return daysInMonthString(date, KCalendarSystem::ShortFormat); ++ return d->stringFromInteger(daysInMonth(date), 0, QLatin1Char('0')); + } + case KLocale::DaysInWeek: + switch (format) { +@@ -2293,26 +2327,26 @@ QString KCalendarSystem::formatDate(const QDate &date, KLocale::DateTimeComponen + case KLocale::ShortNumber: + case KLocale::DefaultComponentFormat: + default: +- return daysInWeekString(date); ++ return d->stringFromInteger(d->daysInWeek(), 0); + } + default: + return QString(); + } + } + +-QDate KCalendarSystem::readDate( const QString &str, bool *ok ) const ++QDate KCalendarSystem::readDate(const QString &str, bool *ok) const + { + //Try each standard format in turn, start with the locale ones, + //then the well defined standards +- QDate date = readDate( str, KLocale::ShortFormat, ok); +- if ( !isValid( date ) ) { +- date = readDate( str, KLocale::NormalFormat, ok); +- if ( !isValid( date )) { +- date = readDate( str, KLocale::IsoFormat, ok); +- if ( !isValid( date ) ) { +- date = readDate( str, KLocale::IsoWeekFormat, ok); +- if ( !isValid( date ) ) { +- date = readDate( str, KLocale::IsoOrdinalFormat, ok); ++ QDate date = readDate(str, KLocale::ShortFormat, ok); ++ if (!isValid(date)) { ++ date = readDate(str, KLocale::NormalFormat, ok); ++ if (!isValid(date)) { ++ date = readDate(str, KLocale::IsoFormat, ok); ++ if (!isValid(date)) { ++ date = readDate(str, KLocale::IsoWeekFormat, ok); ++ if (!isValid(date)) { ++ date = readDate(str, KLocale::IsoOrdinalFormat, ok); + } + } + } +@@ -2321,35 +2355,35 @@ QDate KCalendarSystem::readDate( const QString &str, bool *ok ) const + return date; + } + +-QDate KCalendarSystem::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const ++QDate KCalendarSystem::readDate(const QString &str, KLocale::ReadDateFlags flags, bool *ok) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- if ( flags & KLocale::ShortFormat ) { +- return readDate( str, locale()->dateFormatShort(), ok ); +- } else if ( flags & KLocale::NormalFormat ) { +- return readDate( str, locale()->dateFormat(), ok ); +- } else if ( flags & KLocale::IsoFormat ) { +- return readDate( str, QLatin1String("%Y-%m-%d"), ok ); +- } else if ( flags & KLocale::IsoWeekFormat ) { +- return readDate( str, QLatin1String("%Y-W%V-%u"), ok ); +- } else if ( flags & KLocale::IsoOrdinalFormat ) { +- return readDate( str, QLatin1String("%Y-%j"), ok ); ++ if (flags & KLocale::ShortFormat) { ++ return readDate(str, locale()->dateFormatShort(), ok); ++ } else if (flags & KLocale::NormalFormat) { ++ return readDate(str, locale()->dateFormat(), ok); ++ } else if (flags & KLocale::IsoFormat) { ++ return readDate(str, QLatin1String("%Y-%m-%d"), ok); ++ } else if (flags & KLocale::IsoWeekFormat) { ++ return readDate(str, QLatin1String("%Y-W%V-%u"), ok); ++ } else if (flags & KLocale::IsoOrdinalFormat) { ++ return readDate(str, QLatin1String("%Y-%j"), ok); + } + return d->invalidDate(); + } + +-QDate KCalendarSystem::readDate( const QString &inputString, const QString &formatString, bool *ok ) const ++QDate KCalendarSystem::readDate(const QString &inputString, const QString &formatString, bool *ok) const + { +- return readDate( inputString, formatString, ok, KLocale::KdeFormat ); ++ return readDate(inputString, formatString, ok, KLocale::KdeFormat); + } + + // NOT VIRTUAL - If override needed use shared-d +-QDate KCalendarSystem::readDate( const QString &inputString, const QString &formatString, bool *ok, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QDate KCalendarSystem::readDate(const QString &inputString, const QString &formatString, bool *ok, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + KDateTimeParser parser; +- QDate resultDate = parser.parseDate( inputString, formatString, this, locale(), locale()->dateTimeDigitSet(), formatStandard ); ++ QDate resultDate = parser.parseDate(inputString, formatString, this, locale(), locale()->dateTimeDigitSet(), formatStandard); + if (ok) { + *ok = resultDate.isValid(); + } +@@ -2359,17 +2393,17 @@ QDate KCalendarSystem::readDate( const QString &inputString, const QString &form + // NOT VIRTUAL - If override needed use shared-d + int KCalendarSystem::shortYearWindowStartYear() const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + return d->shortYearWindowStartYear(); + } + + // NOT VIRTUAL - If override needed use shared-d +-int KCalendarSystem::applyShortYearWindow( int inputYear ) const ++int KCalendarSystem::applyShortYearWindow(int inputYear) const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + +- return d->applyShortYearWindow( inputYear ); ++ return d->applyShortYearWindow(inputYear); + } + + int KCalendarSystem::weekStartDay() const +@@ -2383,7 +2417,7 @@ int KCalendarSystem::weekStartDay() const + // instead be wrapped in validity checks, as sometimes we want this to work outside the public valid + // range, i.e. to allow us to internally set dates of 1/1/10000 which are not publically valid but + // are required for internal maths +-bool KCalendarSystem::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystem::julianDayToDate(int jd, int &year, int &month, int &day) const + { + // Formula from The Calendar FAQ by Claus Tondering + // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +@@ -2391,18 +2425,18 @@ bool KCalendarSystem::julianDayToDate( int jd, int &year, int &month, int &day ) + // the Boost licensed source code + + int a = jd + 32044; +- int b = ( ( 4 * a ) + 3 ) / 146097; +- int c = a - ( ( 146097 * b ) / 4 ); +- int d = ( ( 4 * c ) + 3 ) / 1461; +- int e = c - ( ( 1461 * d ) / 4 ); +- int m = ( ( 5 * e ) + 2 ) / 153; +- day = e - ( ( (153 * m ) + 2 ) / 5 ) + 1; +- month = m + 3 - ( 12 * ( m / 10 ) ); +- year = ( 100 * b ) + d - 4800 + ( m / 10 ); ++ int b = ((4 * a) + 3) / 146097; ++ int c = a - ((146097 * b) / 4); ++ int d = ((4 * c) + 3) / 1461; ++ int e = c - ((1461 * d) / 4); ++ int m = ((5 * e) + 2) / 153; ++ day = e - (((153 * m) + 2) / 5) + 1; ++ month = m + 3 - (12 * (m / 10)); ++ year = (100 * b) + d - 4800 + (m / 10); + + // If year is -ve then is BC. In Gregorian there is no year 0, but the maths + // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside +- if ( year < 1 ) { ++ if (year < 1) { + year = year - 1; + } + +@@ -2415,7 +2449,7 @@ bool KCalendarSystem::julianDayToDate( int jd, int &year, int &month, int &day ) + // instead be wrapped in validity checks, as sometimes we want this to work outside the public valid + // range, i.e. to allow us to internally set dates of 1/1/10000 which are not publically valid but + // are required for internal maths +-bool KCalendarSystem::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystem::dateToJulianDay(int year, int month, int day, int &jd) const + { + // Formula from The Calendar FAQ by Claus Tondering + // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +@@ -2425,22 +2459,22 @@ bool KCalendarSystem::dateToJulianDay( int year, int month, int day, int &jd ) c + // If year is -ve then is BC. In Gregorian there is no year 0, but the maths + // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally + int y; +- if ( year < 1 ) { ++ if (year < 1) { + y = year + 1; + } else { + y = year; + } + +- int a = ( 14 - month ) / 12; ++ int a = (14 - month) / 12; + y = y + 4800 - a; +- int m = month + ( 12 * a ) - 3; ++ int m = month + (12 * a) - 3; + + jd = day +- + ( ( ( 153 * m ) + 2 ) / 5 ) +- + ( 365 * y ) +- + ( y / 4 ) +- - ( y / 100 ) +- + ( y / 400 ) ++ + (((153 * m) + 2) / 5) ++ + (365 * y) ++ + (y / 4) ++ - (y / 100) ++ + (y / 400) + - 32045; + + return true; +@@ -2448,25 +2482,25 @@ bool KCalendarSystem::dateToJulianDay( int year, int month, int day, int &jd ) c + + const KLocale * KCalendarSystem::locale() const + { +- Q_D( const KCalendarSystem ); ++ Q_D(const KCalendarSystem); + + return d->locale(); + } + + // Deprecated +-void KCalendarSystem::setMaxMonthsInYear( int maxMonths ) ++void KCalendarSystem::setMaxMonthsInYear(int maxMonths) + { +- Q_UNUSED( maxMonths ) ++ Q_UNUSED(maxMonths) + } + + // Deprecated +-void KCalendarSystem::setMaxDaysInWeek( int maxDays ) ++void KCalendarSystem::setMaxDaysInWeek(int maxDays) + { +- Q_UNUSED( maxDays ) ++ Q_UNUSED(maxDays) + } + + // Deprecated +-void KCalendarSystem::setHasYear0( bool hasYear0 ) ++void KCalendarSystem::setHasYear0(bool hasYear0) + { +- Q_UNUSED( hasYear0 ) ++ Q_UNUSED(hasYear0) + } +diff --git a/kdecore/date/kcalendarsystem.h b/kdecore/date/kcalendarsystem.h +index 318e2d3..4dfda62 100644 +--- a/kdecore/date/kcalendarsystem.h ++++ b/kdecore/date/kcalendarsystem.h +@@ -45,28 +45,28 @@ public: + * Format for returned year number / month number / day number as string. + */ + enum StringFormat { +- ShortFormat, /**< Short string format, e.g. 2000 = "00" or 6 = "6" */ +- LongFormat /**< Long string format, e.g. 2000 = "2000" or 6 = "06" */ ++ ShortFormat, /**< Short string format, e.g. 2000 = "00" or 6 = "6" */ ++ LongFormat /**< Long string format, e.g. 2000 = "2000" or 6 = "06" */ + }; + + /** + * Format for returned month / day name. + */ + enum MonthNameFormat { +- ShortName, /**< Short name format, e.g. "Dec" */ +- LongName, /**< Long name format, e.g. "December" */ +- ShortNamePossessive, /**< Short name possessive format, e.g. "of Dec" */ +- LongNamePossessive, /**< Long name possessive format, e.g. "of December" */ +- NarrowName /**< Narrow name format, e.g. "D". @since 4.7 */ ++ ShortName, /**< Short name format, e.g. "Dec" */ ++ LongName, /**< Long name format, e.g. "December" */ ++ ShortNamePossessive, /**< Short name possessive format, e.g. "of Dec" */ ++ LongNamePossessive, /**< Long name possessive format, e.g. "of December" */ ++ NarrowName /**< Narrow name format, e.g. "D". @since 4.7 */ + }; + + /** + * Format for returned month / day name. + */ + enum WeekDayNameFormat { +- ShortDayName, /**< Short name format, e.g. "Fri" */ +- LongDayName, /**< Long name format, e.g. "Friday" */ +- NarrowDayName /**< Narrow name format, e.g. "F". @since 4.7 */ ++ ShortDayName, /**< Short name format, e.g. "Fri" */ ++ LongDayName, /**< Long name format, e.g. "Friday" */ ++ NarrowDayName /**< Narrow name format, e.g. "F". @since 4.7 */ + }; + + //KDE5 remove +@@ -80,8 +80,8 @@ public: + * @param locale locale to use for translations. The global locale is used if null. + * @return a KCalendarSystem object + */ +- static KCalendarSystem *create( const QString & calType = QLatin1String( "gregorian" ), +- const KLocale * locale = 0 ); ++ KDE_DEPRECATED static KCalendarSystem *create(const QString & calType = QLatin1String("gregorian"), ++ const KLocale * locale = 0); + + //KDE5 remove + /** +@@ -98,8 +98,8 @@ public: + * @param locale locale to use for translations. The global locale is used if null. + * @return a KCalendarSystem object + */ +- static KCalendarSystem *create( const QString & calType, KSharedConfig::Ptr config, +- const KLocale * locale = 0 ); ++ KDE_DEPRECATED static KCalendarSystem *create(const QString & calType, KSharedConfig::Ptr config, ++ const KLocale * locale = 0); + + //KDE5 add default value to calendarSystem + /** +@@ -111,8 +111,8 @@ public: + * @param locale locale to use for translations. The global locale is used if null. + * @return a KCalendarSystem object + */ +- static KCalendarSystem *create( KLocale::CalendarSystem calendarSystem, +- const KLocale *locale = 0 ); ++ static KCalendarSystem *create(KLocale::CalendarSystem calendarSystem, ++ const KLocale *locale = 0); + + /** + * @since 4.6 +@@ -126,8 +126,8 @@ public: + * @param locale locale to use for translations. The global locale is used if null. + * @return a KCalendarSystem object + */ +- static KCalendarSystem *create( KLocale::CalendarSystem calendarSystem, KSharedConfig::Ptr config, +- const KLocale *locale = 0 ); ++ static KCalendarSystem *create(KLocale::CalendarSystem calendarSystem, KSharedConfig::Ptr config, ++ const KLocale *locale = 0); + + //KDE5 remove + /** +@@ -137,7 +137,7 @@ public: + * + * @return list of names + */ +- static QStringList calendarSystems(); ++ KDE_DEPRECATED static QStringList calendarSystems(); + + /** + * @since 4.6 +@@ -160,23 +160,25 @@ public: + * + * @return label for calendar + */ +- static QString calendarLabel( const QString &calendarType ); ++ KDE_DEPRECATED static QString calendarLabel(const QString &calendarType); + + /** + * @since 4.6 + * + * Returns a localized label to display for the required Calendar System type. + * +- * Use with calendarSystemsList() to populate selction lists of available ++ * Use with calendarSystemsList() to populate selection lists of available + * calendar systems. + * +- * @param calendarType the specific calendar type to return the label for ++ * @param calendarSystem the specific calendar type to return the label for + * @param locale the locale to use for the label, defaults to global + * @return label for calendar + */ +- static QString calendarLabel( KLocale::CalendarSystem calendarSystem, const KLocale *locale = KGlobal::locale() ); ++ static QString calendarLabel(KLocale::CalendarSystem calendarSystem, const KLocale *locale = KGlobal::locale()); + ++ //KDE5 Remove + /** ++ * @deprecated use calendarSystem(const QString &calendarType) instead + * @since 4.6 + * + * Returns the Calendar System enum value for a given Calendar Type, +@@ -185,14 +187,38 @@ public: + * @param calendarType the calendar type to convert + * @return calendar system for calendar type + */ +- static KLocale::CalendarSystem calendarSystemForCalendarType( const QString &calendarType ); ++ KDE_DEPRECATED static KLocale::CalendarSystem calendarSystemForCalendarType(const QString &calendarType); ++ ++ //KDE5 Remove ++ /** ++ * @since 4.7 ++ * ++ * Returns the Calendar System enum value for a given Calendar Type, ++ * e.g. KLocale::QDateCalendar for "gregorian" ++ * ++ * @param calendarType the calendar type to convert ++ * @return calendar system for calendar type ++ */ ++ static KLocale::CalendarSystem calendarSystem(const QString &calendarType); ++ ++ //KDE5 remove ++ /** ++ * @since 4.7 ++ * ++ * Returns the deprecated Calendar Type for a given Calendar System enum value, ++ * e.g. "gregorian" for KLocale::QDateCalendar ++ * ++ * @param calendarSystem the calendar system to convert ++ * @return calendar type for calendar system ++ */ ++ static QString calendarType(KLocale::CalendarSystem calendarSystem); + + /** + * Constructor of abstract calendar class. This will be called by derived classes. + * + * @param locale locale to use for translations. The global locale is used if null. + */ +- explicit KCalendarSystem( const KLocale *locale = 0 ); ++ explicit KCalendarSystem(const KLocale *locale = 0); + + /** + * Constructor of abstract calendar class. This will be called by derived classes. +@@ -202,7 +228,7 @@ public: + if null. + * @param locale locale to use for translations. The global locale is used if null. + */ +- explicit KCalendarSystem( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystem(const KSharedConfig::Ptr config, const KLocale *locale = 0); + + /** + * Destructor. +@@ -216,7 +242,7 @@ public: + * + * @return type of calendar system + */ +- virtual QString calendarType() const = 0; ++ KDE_DEPRECATED virtual QString calendarType() const = 0; + + //KDE5 make virtual? + /** +@@ -285,7 +311,7 @@ public: + * @param day the day portion of the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool isValid( int year, int month, int day ) const = 0; ++ virtual bool isValid(int year, int month, int day) const = 0; + + //KDE5 make virtual? + /** +@@ -297,7 +323,7 @@ public: + * @param dayOfYear the day of year portion of the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- bool isValid( int year, int dayOfYear ) const; ++ bool isValid(int year, int dayOfYear) const; + + //KDE5 make virtual? + /** +@@ -305,13 +331,13 @@ public: + * + * Returns whether a given date is valid in this calendar system. + * +- * @param era the Era Name portion of the date to check ++ * @param eraName the Era Name portion of the date to check + * @param yearInEra the Year In Era portion of the date to check + * @param month the Month portion of the date to check + * @param day the Day portion of the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- bool isValid( const QString &eraName, int yearInEra, int month, int day ) const; ++ bool isValid(const QString &eraName, int yearInEra, int month, int day) const; + + //KDE5 make virtual? + /** +@@ -324,7 +350,7 @@ public: + * @param dayOfIsoWeek the day of week portion of the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- bool isValidIsoWeekDate( int year, int isoWeekNumber, int dayOfIsoWeek ) const; ++ bool isValidIsoWeekDate(int year, int isoWeekNumber, int dayOfIsoWeek) const; + + /** + * Returns whether a given date is valid in this calendar system. +@@ -332,7 +358,7 @@ public: + * @param date the date to check + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(const QDate &date) const; + + /** + * Changes the date's year, month and day. The range of the year, month +@@ -346,7 +372,7 @@ public: + * @param day day of month + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool setDate( QDate &date, int year, int month, int day ) const; ++ virtual bool setDate(QDate &date, int year, int month, int day) const; + + //KDE5 make virtual? + /** +@@ -359,7 +385,7 @@ public: + * @param dayOfYear day of year + * @return @c true if the date is valid, @c false otherwise + */ +- bool setDate( QDate &date, int year, int dayOfYear ) const; ++ bool setDate(QDate &date, int year, int dayOfYear) const; + + //KDE5 make virtual? + /** +@@ -369,12 +395,12 @@ public: + * + * @param date date to change + * @param eraName Era string +- * @param year Year In Era number ++ * @param yearInEra Year In Era number + * @param month Month number + * @param day Day Of Month number + * @return @c true if the date is valid, @c false otherwise + */ +- bool setDate( QDate &date, QString eraName, int yearInEra, int month, int day ) const; ++ bool setDate(QDate &date, QString eraName, int yearInEra, int month, int day) const; + + //KDE5 make virtual? + /** +@@ -388,14 +414,10 @@ public: + * @param dayOfIsoWeek day of week Mon..Sun (1..7) + * @return @c true if the date is valid, @c false otherwise + */ +- bool setDateIsoWeek( QDate &date, int year, int isoWeekNumber, int dayOfIsoWeek ) const; ++ bool setDateIsoWeek(QDate &date, int year, int isoWeekNumber, int dayOfIsoWeek) const; + + /** +- * @deprecated +- * +- * Use setDate instead +- * +- * @see KCalendarSystem::setDate ++ * @deprecated Use setDate() instead + * + * Some implementations reject year range 00 to 99, but extended date + * ranges now require these to be accepted. Equivalent in QDate is +@@ -410,7 +432,7 @@ public: + * @param d Day of month + * @return true if the date is valid; otherwise returns false. + */ +- virtual bool setYMD( QDate &date, int y, int m, int d ) const; ++ KDE_DEPRECATED virtual bool setYMD(QDate &date, int y, int m, int d) const; + + //KDE5 make virtual? + /** +@@ -423,7 +445,7 @@ public: + * @param month month number returned in this variable + * @param day day of month returned in this variable + */ +- void getDate( const QDate date, int *year, int *month, int *day ) const; ++ void getDate(const QDate date, int *year, int *month, int *day) const; + + /** + * Returns the year portion of a given date in the current calendar system +@@ -431,7 +453,7 @@ public: + * @param date date to return year for + * @return year, 0 if input date is invalid + */ +- virtual int year( const QDate &date ) const; ++ virtual int year(const QDate &date) const; + + /** + * Returns the month portion of a given date in the current calendar system +@@ -439,7 +461,7 @@ public: + * @param date date to return month for + * @return month of year, 0 if input date is invalid + */ +- virtual int month( const QDate &date ) const; ++ virtual int month(const QDate &date) const; + + /** + * Returns the day portion of a given date in the current calendar system +@@ -447,7 +469,7 @@ public: + * @param date date to return day for + * @return day of the month, 0 if input date is invalid + */ +- virtual int day( const QDate &date ) const; ++ virtual int day(const QDate &date) const; + + //KDE5 make virtual? + /** +@@ -460,7 +482,7 @@ public: + * @param format format to return, either short or long + * @return era name, empty string if input date is invalid + */ +- QString eraName( const QDate &date, StringFormat format = ShortFormat ) const; ++ QString eraName(const QDate &date, StringFormat format = ShortFormat) const; + + //KDE5 make virtual? + /** +@@ -473,7 +495,7 @@ public: + * @param format format to return, either short or long + * @return era name, empty string if input date is invalid + */ +- QString eraYear( const QDate &date, StringFormat format = ShortFormat ) const; ++ QString eraYear(const QDate &date, StringFormat format = ShortFormat) const; + + //KDE5 make virtual? + /** +@@ -485,7 +507,7 @@ public: + * @param date date to return Year In Era for + * @return Year In Era, -1 if input date is invalid + */ +- int yearInEra( const QDate &date ) const; ++ int yearInEra(const QDate &date) const; + + /** + * Returns a QDate containing a date @p nyears years later. +@@ -494,7 +516,7 @@ public: + * @param nyears The number of years to add + * @return The new date, null date if any errors + */ +- virtual QDate addYears( const QDate &date, int nyears ) const; ++ virtual QDate addYears(const QDate &date, int nyears) const; + + /** + * Returns a QDate containing a date @p nmonths months later. +@@ -503,7 +525,7 @@ public: + * @param nmonths number of months to add + * @return The new date, null date if any errors + */ +- virtual QDate addMonths( const QDate &date, int nmonths ) const; ++ virtual QDate addMonths(const QDate &date, int nmonths) const; + + /** + * Returns a QDate containing a date @p ndays days later. +@@ -512,7 +534,7 @@ public: + * @param ndays number of days to add + * @return The new date, null date if any errors + */ +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QDate addDays(const QDate &date, int ndays) const; + + //KDE5 make virtual? + /** +@@ -533,8 +555,8 @@ public: + * @param daysDiff Returns number of days difference + * @param direction Returns direction of difference, 1 if fromDate <= toDate, -1 otherwise + */ +- void dateDifference( const QDate &fromDate, const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction ) const; ++ void dateDifference(const QDate &fromDate, const QDate &toDate, ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const; + + //KDE5 make virtual? + /** +@@ -547,7 +569,7 @@ public: + * @param toDate The date to end at + * @return The number of years difference + */ +- int yearsDifference( const QDate &fromDate, const QDate &toDate ) const; ++ int yearsDifference(const QDate &fromDate, const QDate &toDate) const; + + //KDE5 make virtual? + /** +@@ -562,7 +584,7 @@ public: + * @param toDate The date to end at + * @return The number of months difference + */ +- int monthsDifference( const QDate &fromDate, const QDate &toDate ) const; ++ int monthsDifference(const QDate &fromDate, const QDate &toDate) const; + + //KDE5 make virtual? + /** +@@ -573,7 +595,7 @@ public: + * @param toDate The date to end at + * @return The number of days difference + */ +- int daysDifference( const QDate &fromDate, const QDate &toDate ) const; ++ int daysDifference(const QDate &fromDate, const QDate &toDate) const; + + /** + * Returns number of months in the given year +@@ -581,7 +603,7 @@ public: + * @param date the date to obtain year from + * @return number of months in the year, -1 if input date invalid + */ +- virtual int monthsInYear( const QDate &date ) const; ++ virtual int monthsInYear(const QDate &date) const; + + //KDE5 make virtual? + /** +@@ -592,7 +614,7 @@ public: + * @param year the required year + * @return number of months in the year, -1 if input date invalid + */ +- int monthsInYear( int year ) const; ++ int monthsInYear(int year) const; + + /** + * Returns the number of localized weeks in the given year. +@@ -600,7 +622,7 @@ public: + * @param date the date to obtain year from + * @return number of weeks in the year, -1 if input date invalid + */ +- virtual int weeksInYear( const QDate &date ) const; ++ virtual int weeksInYear(const QDate &date) const; + + //KDE5 Merge with virtual weeksInYear with default + /** +@@ -617,7 +639,7 @@ public: + * @param weekNumberSystem the week number system to use + * @return number of weeks in the year, -1 if date invalid + */ +- int weeksInYear( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem ) const; ++ int weeksInYear(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem) const; + + /** + * Returns the number of localized weeks in the given year. +@@ -625,7 +647,7 @@ public: + * @param year the year + * @return number of weeks in the year, -1 if input date invalid + */ +- virtual int weeksInYear( int year ) const; ++ virtual int weeksInYear(int year) const; + + //KDE5 Merge with virtual weeksInYear with default + /** +@@ -642,7 +664,7 @@ public: + * @param weekNumberSystem the week number system to use + * @return number of weeks in the year, -1 if date invalid + */ +- int weeksInYear( int year, KLocale::WeekNumberSystem weekNumberSystem ) const; ++ int weeksInYear(int year, KLocale::WeekNumberSystem weekNumberSystem) const; + + /** + * Returns the number of days in the given year. +@@ -650,7 +672,7 @@ public: + * @param date the date to obtain year from + * @return number of days in year, -1 if input date invalid + */ +- virtual int daysInYear( const QDate &date ) const; ++ virtual int daysInYear(const QDate &date) const; + + //KDE5 make virtual? + /** +@@ -661,7 +683,7 @@ public: + * @param year the year + * @return number of days in year, -1 if input date invalid + */ +- int daysInYear( int year ) const; ++ int daysInYear(int year) const; + + /** + * Returns the number of days in the given month. +@@ -669,7 +691,7 @@ public: + * @param date the date to obtain month from + * @return number of days in month, -1 if input date invalid + */ +- virtual int daysInMonth( const QDate &date ) const; ++ virtual int daysInMonth(const QDate &date) const; + + //KDE5 make virtual? + /** +@@ -681,7 +703,7 @@ public: + * @param month the month + * @return number of days in month, -1 if input date invalid + */ +- int daysInMonth( int year, int month ) const; ++ int daysInMonth(int year, int month) const; + + /** + * Returns the number of days in the given week. +@@ -689,7 +711,7 @@ public: + * @param date the date to obtain week from + * @return number of days in week, -1 if input date invalid + */ +- virtual int daysInWeek( const QDate &date ) const; ++ virtual int daysInWeek(const QDate &date) const; + + /** + * Returns the day number of year for the given date +@@ -699,7 +721,7 @@ public: + * @param date the date to obtain day from + * @return day of year number, -1 if input date not valid + */ +- virtual int dayOfYear( const QDate &date ) const; ++ virtual int dayOfYear(const QDate &date) const; + + /** + * Returns the weekday number for the given date +@@ -711,10 +733,10 @@ public: + * @param date the date to obtain day from + * @return day of week number, -1 if input date not valid + */ +- virtual int dayOfWeek( const QDate &date ) const; ++ virtual int dayOfWeek(const QDate &date) const; + + /** +- * @deprecated ++ * @deprecated use week() instead + * + * Returns the ISO week number for the given date. + * +@@ -728,7 +750,7 @@ public: + * @param yearNum returns the year the date belongs to + * @return ISO week number, -1 if input date invalid + */ +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; ++ KDE_DEPRECATED virtual int weekNumber(const QDate &date, int *yearNum = 0) const; + + //KDE5 Make virtual? + /** +@@ -748,7 +770,7 @@ public: + * @param yearNum returns the year the date belongs to + * @return localized week number, -1 if input date invalid + */ +- int week( const QDate &date, int *yearNum = 0 ) const; ++ int week(const QDate &date, int *yearNum = 0) const; + + //KDE5 Make virtual? + /** +@@ -771,7 +793,7 @@ public: + * @param yearNum returns the year the date belongs to + * @return week number, -1 if input date invalid + */ +- int week( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum = 0) const; ++ int week(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum = 0) const; + + /** + * Returns whether a given year is a leap year. +@@ -782,7 +804,7 @@ public: + * @param year the year to check + * @return @c true if the year is a leap year, @c false otherwise + */ +- virtual bool isLeapYear( int year ) const = 0; ++ virtual bool isLeapYear(int year) const = 0; + + /** + * Returns whether a given date falls in a leap year. +@@ -793,7 +815,7 @@ public: + * @param date the date to check + * @return @c true if the date falls in a leap year, @c false otherwise + */ +- virtual bool isLeapYear( const QDate &date ) const; ++ virtual bool isLeapYear(const QDate &date) const; + + //KDE5 Make virtual? + /** +@@ -801,10 +823,10 @@ public: + * + * Returns a QDate containing the first day of the year + * +- * @param date The year to return the date for ++ * @param year The year to return the date for + * @return The first day of the year + */ +- QDate firstDayOfYear( int year ) const; ++ QDate firstDayOfYear(int year) const; + + //KDE5 Make virtual? + /** +@@ -812,10 +834,10 @@ public: + * + * Returns a QDate containing the last day of the year + * +- * @param date The year to return the date for ++ * @param year The year to return the date for + * @return The last day of the year + */ +- QDate lastDayOfYear( int year ) const; ++ QDate lastDayOfYear(int year) const; + + //KDE5 Make virtual? + /** +@@ -826,7 +848,7 @@ public: + * @param date The year to return the date for, defaults to today + * @return The first day of the year + */ +- QDate firstDayOfYear( const QDate &date = QDate::currentDate() ) const; ++ QDate firstDayOfYear(const QDate &date = QDate::currentDate()) const; + + //KDE5 Make virtual? + /** +@@ -837,7 +859,7 @@ public: + * @param date The year to return the date for, defaults to today + * @return The last day of the year + */ +- QDate lastDayOfYear( const QDate &date = QDate::currentDate() ) const; ++ QDate lastDayOfYear(const QDate &date = QDate::currentDate()) const; + + //KDE5 Make virtual? + /** +@@ -845,10 +867,11 @@ public: + * + * Returns a QDate containing the first day of the month + * +- * @param date The month to return the date for, defaults to today ++ * @param year The year to return the date for ++ * @param month The month to return the date for + * @return The first day of the month + */ +- QDate firstDayOfMonth( int year, int month ) const; ++ QDate firstDayOfMonth(int year, int month) const; + + //KDE5 Make virtual? + /** +@@ -856,10 +879,11 @@ public: + * + * Returns a QDate containing the last day of the month + * +- * @param date The month to return the date for, defaults to today ++ * @param year The year to return the date for ++ * @param month The month to return the date for + * @return The last day of the month + */ +- QDate lastDayOfMonth( int year, int month ) const; ++ QDate lastDayOfMonth(int year, int month) const; + + //KDE5 Make virtual? + /** +@@ -870,7 +894,7 @@ public: + * @param date The month to return the date for, defaults to today + * @return The first day of the month + */ +- QDate firstDayOfMonth( const QDate &date = QDate::currentDate() ) const; ++ QDate firstDayOfMonth(const QDate &date = QDate::currentDate()) const; + + //KDE5 Make virtual? + /** +@@ -881,7 +905,7 @@ public: + * @param date The month to return the date for, defaults to today + * @return The last day of the month + */ +- QDate lastDayOfMonth( const QDate &date = QDate::currentDate() ) const; ++ QDate lastDayOfMonth(const QDate &date = QDate::currentDate()) const; + + /** + * Gets specific calendar type month name for a given month number +@@ -892,7 +916,7 @@ public: + * @param format specifies whether the short month name or long month name should be used + * @return name of the month, empty string if any error + */ +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const = 0; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const = 0; + + /** + * Gets specific calendar type month name for a given date +@@ -901,7 +925,7 @@ public: + * @param format specifies whether the short month name or long month name should be used + * @return name of the month, empty string if any error + */ +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + + /** + * Gets specific calendar type week day name. +@@ -911,7 +935,7 @@ public: + * @param format specifies whether the short month name or long month name should be used + * @return day name, empty string if any error + */ +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const = 0; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const = 0; + + /** + * Gets specific calendar type week day name. +@@ -920,9 +944,11 @@ public: + * @param format specifies whether the short month name or long month name should be used + * @return day name, empty string if any error + */ +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * Converts a date into a year literal + * + * @param date date to convert +@@ -930,9 +956,11 @@ public: + * @return year literal of the date, empty string if any error + * @see year() + */ +- virtual QString yearString( const QDate &date, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED virtual QString yearString(const QDate &date, StringFormat format = LongFormat) const; + + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * Converts a date into a month literal + * + * @param pDate The date to convert +@@ -940,9 +968,11 @@ public: + * @return The month literal of the date, empty string if any error + * @see month() + */ +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED virtual QString monthString(const QDate &pDate, StringFormat format = LongFormat) const; + + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * Converts a date into a day literal + * + * @param pDate The date to convert +@@ -950,10 +980,12 @@ public: + * @return The day literal of the date, empty string if any error + * @see day() + */ +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED virtual QString dayString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.5 + * + * Converts a date into a Year In Era literal +@@ -962,10 +994,12 @@ public: + * @param format format to return, either short or long + * @return Year In Era literal of the date, empty string if any error + */ +- QString yearInEraString( const QDate &date, StringFormat format = ShortFormat ) const; ++ KDE_DEPRECATED QString yearInEraString(const QDate &date, StringFormat format = ShortFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Converts a date into a day of year literal +@@ -975,10 +1009,12 @@ public: + * @return The day of year literal of the date, empty string if any error + * @see dayOfYear() + */ +- QString dayOfYearString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString dayOfYearString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Converts a date into a day of week literal +@@ -987,10 +1023,12 @@ public: + * @return The day of week literal of the date, empty string if any error + * @see dayOfWeek() + */ +- QString dayOfWeekString( const QDate &pDate ) const; ++ KDE_DEPRECATED QString dayOfWeekString(const QDate &pDate) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Converts a date into a week number literal +@@ -1000,10 +1038,12 @@ public: + * @return The day literal of the date, empty string if any error + * @see weekNumber() + */ +- QString weekNumberString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString weekNumberString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the months in year for a date as a numeric string +@@ -1013,10 +1053,12 @@ public: + * @return The months in year literal of the date, empty string if any error + * @see monthsInYear() + */ +- QString monthsInYearString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString monthsInYearString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the weeks in year for a date as a numeric string +@@ -1026,10 +1068,12 @@ public: + * @return The weeks in year literal of the date, empty string if any error + * @see weeksInYear() + */ +- QString weeksInYearString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString weeksInYearString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the days in year for a date as a numeric string +@@ -1039,10 +1083,12 @@ public: + * @return The days in year literal of the date, empty string if any error + * @see daysInYear() + */ +- QString daysInYearString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString daysInYearString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the days in month for a date as a numeric string +@@ -1052,10 +1098,12 @@ public: + * @return The days in month literal of the date, empty string if any error + * @see daysInMonth() + */ +- QString daysInMonthString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ KDE_DEPRECATED QString daysInMonthString(const QDate &pDate, StringFormat format = LongFormat) const; + + //KDE5 make virtual? + /** ++ * @deprecated use formatDate(QDate, KLocale::DateTimeComponant, KLocale::DateTimeComponentFormat) ++ * + * @since 4.4 + * + * Returns the days in week for a date as a numeric string +@@ -1064,11 +1112,11 @@ public: + * @return The days in week literal of the date, empty string if any error + * @see daysInWeek() + */ +- QString daysInWeekString( const QDate &date ) const; ++ KDE_DEPRECATED QString daysInWeekString(const QDate &date) const; + + //KDE5 make protected or remove? + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Converts a year literal of a part of a string into a integer starting at the beginning of the string + * +@@ -1076,11 +1124,11 @@ public: + * @param iLength The number of QChars used, and 0 if no valid symbols was found in the string + * @return An integer corresponding to the year + */ +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; ++ virtual int yearStringToInteger(const QString &sNum, int &iLength) const; + + //KDE5 make protected or remove? + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Converts a month literal of a part of a string into a integer starting at the beginning of the string + * +@@ -1088,11 +1136,11 @@ public: + * @param iLength The number of QChars used, and 0 if no valid symbols was found in the string + * @return An integer corresponding to the month + */ +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; ++ virtual int monthStringToInteger(const QString &sNum, int &iLength) const; + + //KDE5 make protected or remove? + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Converts a day literal of a part of a string into a integer starting at the beginning of the string + * +@@ -1100,7 +1148,7 @@ public: + * @param iLength The number of QChars used, and 0 if no valid symbols was found in the string + * @return An integer corresponding to the day + */ +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; ++ virtual int dayStringToInteger(const QString &sNum, int &iLength) const; + + /** + * Returns a string formatted to the current locale's conventions +@@ -1118,7 +1166,7 @@ public: + * + * @return The date as a string + */ +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; ++ virtual QString formatDate(const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate) const; + + //KDE5 Make virtual + /** +@@ -1237,8 +1285,8 @@ public: + * + * @return The date as a string + */ +- QString formatDate( const QDate &fromDate, const QString &toFormat, +- KLocale::DateTimeFormatStandard formatStandard = KLocale::KdeFormat ) const; ++ QString formatDate(const QDate &fromDate, const QString &toFormat, ++ KLocale::DateTimeFormatStandard formatStandard = KLocale::KdeFormat) const; + + //KDE5 Make virtual + /** +@@ -1257,8 +1305,8 @@ public: + * + * @return The date as a string + */ +- QString formatDate( const QDate &fromDate, const QString &toFormat, KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard = KLocale::KdeFormat ) const; ++ QString formatDate(const QDate &fromDate, const QString &toFormat, KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard = KLocale::KdeFormat) const; + + //KDE5 Make virtual + /** +@@ -1299,7 +1347,7 @@ public: + * + * @return the string converted to a QDate + */ +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; ++ virtual QDate readDate(const QString &str, bool *ok = 0) const; + + /** + * Converts a localized date string to a QDate. +@@ -1319,7 +1367,7 @@ public: + * + * @return the string converted to a QDate + */ +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; ++ virtual QDate readDate(const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0) const; + + /** + * Converts a localized date string to a QDate, using the specified @p format. +@@ -1334,7 +1382,7 @@ public: + * @see formatDate + * @see KLocale::readDate + */ +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; ++ virtual QDate readDate(const QString &dateString, const QString &dateFormat, bool *ok = 0) const; + + //KDE5 Make virtual + /** +@@ -1396,8 +1444,8 @@ public: + * @see formatDate + * @see KLocale::readDate + */ +- QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok, +- KLocale::DateTimeFormatStandard formatStandard ) const; ++ QDate readDate(const QString &dateString, const QString &dateFormat, bool *ok, ++ KLocale::DateTimeFormatStandard formatStandard) const; + + //KDE5 Make virtual + /** +@@ -1448,7 +1496,7 @@ public: + * @param inputYear the year number to apply the year window to + * @return the year number after applying the year window + */ +- int applyShortYearWindow( int inputYear ) const; ++ int applyShortYearWindow(int inputYear) const; + + /** + * Use this to determine which day is the first day of the week. +@@ -1465,6 +1513,8 @@ public: + virtual int weekStartDay() const; + + /** ++ * @deprecated use KLocale::weekDayOfPray() instead ++ * + * Returns the day of the week traditionally associated with religious + * observance for this calendar system. Note this may not be accurate + * for the users locale, e.g. Gregorian calendar used in non-Christian +@@ -1473,7 +1523,7 @@ public: + * + * @return day number (None = 0, Monday = 1, ..., Sunday = 7) + */ +- virtual int weekDayOfPray() const = 0; ++ KDE_DEPRECATED virtual int weekDayOfPray() const = 0; + + /** + * Returns whether the calendar is lunar based. +@@ -1524,7 +1574,7 @@ protected: + * @param day day of month returned in this variable + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const = 0; ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const = 0; + + /** + * Internal method to convert YMD values for this calendar system into a +@@ -1542,7 +1592,7 @@ protected: + * @param jd Julian day number returned in this variable + * @return @c true if the date is valid, @c false otherwise + */ +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const = 0; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const = 0; + + /** + * Returns the locale used for translations and formats for this +@@ -1569,25 +1619,25 @@ protected: + const KLocale *locale() const; + + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Sets the maximum number of months in a year + * + * Only for internal calendar system use + */ +- void setMaxMonthsInYear( int maxMonths ); ++ KDE_DEPRECATED void setMaxMonthsInYear(int maxMonths); + + /** +- * @deprecated ++ * @deprecated for internal use only + * + * Sets the maximum number of days in a week + * + * Only for internal calendar system use + */ +- void setMaxDaysInWeek( int maxDays ); ++ KDE_DEPRECATED void setMaxDaysInWeek(int maxDays); + + /** +- * @deprecated ++ * @deprecated for internal use only + * + * @since 4.4 + * +@@ -1595,7 +1645,7 @@ protected: + * + * Only for internal calendar system use + */ +- void setHasYear0( bool hasYear0 ); ++ KDE_DEPRECATED void setHasYear0(bool hasYear0); + + /** + * Constructor of abstract calendar class. This will be called by derived classes. +@@ -1606,36 +1656,38 @@ protected: + if null. + * @param locale locale to use for translations. The global locale is used if null. + */ +- KCalendarSystem( KCalendarSystemPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ KCalendarSystem(KCalendarSystemPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + //Required for shared d-pointer as already private, remove in KDE5 + friend class KCalendarSystemCoptic; + friend class KCalendarSystemEthiopian; + friend class KCalendarSystemGregorian; +- friend class KCalendarSystemGregorianProleptic; + friend class KCalendarSystemHebrew; +- friend class KCalendarSystemHijri; + friend class KCalendarSystemIndianNational; ++ friend class KCalendarSystemIslamicCivil; + friend class KCalendarSystemJalali; + friend class KCalendarSystemJapanese; + friend class KCalendarSystemJulian; + friend class KCalendarSystemMinguo; ++ friend class KCalendarSystemQDate; + friend class KCalendarSystemThai; ++ //Other friends that need access to protected/private functions + friend class KLocalizedDate; + friend class KLocalizedDatePrivate; + friend class KDateTimeParser; ++ friend class KDateTable; + + // Era functions needed by friends, may be made public later if needed in KCM + QList<KCalendarEra> *eraList() const; +- KCalendarEra era( const QDate &eraDate ) const; +- KCalendarEra era( const QString &eraName, int yearInEra ) const; ++ KCalendarEra era(const QDate &eraDate) const; ++ KCalendarEra era(const QString &eraName, int yearInEra) const; + +- Q_DISABLE_COPY( KCalendarSystem ) ++ Q_DISABLE_COPY(KCalendarSystem) + KCalendarSystemPrivate * const d_ptr; // KDE5 make protected +- Q_DECLARE_PRIVATE( KCalendarSystem ) ++ Q_DECLARE_PRIVATE(KCalendarSystem) + }; + + #endif +diff --git a/kdecore/date/kcalendarsystemcoptic.cpp b/kdecore/date/kcalendarsystemcoptic.cpp +index d8ed426..25f4f0d 100644 +--- a/kdecore/date/kcalendarsystemcoptic.cpp ++++ b/kdecore/date/kcalendarsystemcoptic.cpp +@@ -29,8 +29,8 @@ + + // Shared d pointer implementations + +-KCalendarSystemCopticPrivate::KCalendarSystemCopticPrivate( KCalendarSystemCoptic *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemCopticPrivate::KCalendarSystemCopticPrivate(KCalendarSystemCoptic *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -47,22 +47,22 @@ void KCalendarSystemCopticPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // AM for Anno Martyrum or "Year of the Martyrs" +- name = i18nc( "Calendar Era: Coptic Era of Martyrs, years > 0, LongFormat", "Anno Martyrum" ); +- shortName = i18nc( "Calendar Era: Coptic Era of Martyrs, years > 0, ShortFormat", "AM" ); +- format = i18nc( "(kdedt-format) Coptic, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Coptic Era of Martyrs, years > 0, LongFormat", "Anno Martyrum"); ++ shortName = i18nc("Calendar Era: Coptic Era of Martyrs, years > 0, ShortFormat", "AM"); ++ format = i18nc("(kdedt-format) Coptic, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemCopticPrivate::monthsInYear( int year ) const ++int KCalendarSystemCopticPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 13; + } + +-int KCalendarSystemCopticPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemCopticPrivate::daysInMonth(int year, int month) const + { +- if ( month == 13 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 13) { ++ if (isLeapYear(year)) { + return 6; + } else { + return 5; +@@ -72,9 +72,9 @@ int KCalendarSystemCopticPrivate::daysInMonth( int year, int month ) const + return 30; + } + +-int KCalendarSystemCopticPrivate::daysInYear( int year ) const ++int KCalendarSystemCopticPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -86,16 +86,16 @@ int KCalendarSystemCopticPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemCopticPrivate::isLeapYear( int year ) const ++bool KCalendarSystemCopticPrivate::isLeapYear(int year) const + { + //Uses same rule as Julian but offset by 1 year with year 3 being first leap year +- if ( year < 1 ) { ++ if (year < 1) { + year = year + 2; + } else { + year = year + 1; + } + +- if ( year % 4 == 0 ) { ++ if (year % 4 == 0) { + return true; + } + return false; +@@ -156,170 +156,170 @@ int KCalendarSystemCopticPrivate::latestValidYear() const + // * Mesore Mesori Mesorē Mesra Mesra + // * Kouji nabot Pi Kogi Enavot Epagomenē Nasie + // * +-QString KCalendarSystemCopticPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemCopticPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::NarrowName", "T").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::NarrowName", "P").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::NarrowName", "H" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::NarrowName", "H").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::NarrowName", "K").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::NarrowName", "T").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::NarrowName", "M").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::NarrowName", "P").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::NarrowName", "P").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::NarrowName", "P").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::NarrowName", "P").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::NarrowName", "E" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::NarrowName", "E").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::NarrowName", "M").toString(locale()); + case 13: +- return ki18nc( "Coptic month 13 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Coptic month 13 - KLocale::NarrowName", "K").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::ShortName Possessive", "of Tho" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::ShortName Possessive", "of Tho").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::ShortName Possessive", "of Pao" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::ShortName Possessive", "of Pao").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::ShortName Possessive", "of Hat" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::ShortName Possessive", "of Hat").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::ShortName Possessive", "of Kia" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::ShortName Possessive", "of Kia").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::ShortName Possessive", "of Tob" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::ShortName Possessive", "of Tob").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::ShortName Possessive", "of Mes" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::ShortName Possessive", "of Mes").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::ShortName Possessive", "of Par" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::ShortName Possessive", "of Par").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::ShortName Possessive", "of Pam" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::ShortName Possessive", "of Pam").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::ShortName Possessive", "of Pas" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::ShortName Possessive", "of Pas").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::ShortName Possessive", "of Pan" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::ShortName Possessive", "of Pan").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::ShortName Possessive", "of Epe" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::ShortName Possessive", "of Epe").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::ShortName Possessive", "of Meo" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::ShortName Possessive", "of Meo").toString(locale()); + case 13: +- return ki18nc( "Coptic month 13 - KLocale::ShortName Possessive", "of Kou" ).toString( locale() ); ++ return ki18nc("Coptic month 13 - KLocale::ShortName Possessive", "of Kou").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::ShortName", "Tho" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::ShortName", "Tho").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::ShortName", "Pao" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::ShortName", "Pao").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::ShortName", "Hat" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::ShortName", "Hat").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::ShortName", "Kia" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::ShortName", "Kia").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::ShortName", "Tob" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::ShortName", "Tob").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::ShortName", "Mes" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::ShortName", "Mes").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::ShortName", "Par" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::ShortName", "Par").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::ShortName", "Pam" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::ShortName", "Pam").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::ShortName", "Pas" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::ShortName", "Pas").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::ShortName", "Pan" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::ShortName", "Pan").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::ShortName", "Epe" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::ShortName", "Epe").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::ShortName", "Meo" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::ShortName", "Meo").toString(locale()); + case 13: +- return ki18nc( "Coptic month 12 - KLocale::ShortName", "Kou" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::ShortName", "Kou").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::LongName Possessive", "of Thoout" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::LongName Possessive", "of Thoout").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::LongName Possessive", "of Paope" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::LongName Possessive", "of Paope").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::LongName Possessive", "of Hathor" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::LongName Possessive", "of Hathor").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::LongName Possessive", "of Kiahk" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::LongName Possessive", "of Kiahk").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::LongName Possessive", "of Tobe" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::LongName Possessive", "of Tobe").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::LongName Possessive", "of Meshir" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::LongName Possessive", "of Meshir").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::LongName Possessive", "of Paremhotep" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::LongName Possessive", "of Paremhotep").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::LongName Possessive", "of Parmoute" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::LongName Possessive", "of Parmoute").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::LongName Possessive", "of Pashons" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::LongName Possessive", "of Pashons").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::LongName Possessive", "of Paone" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::LongName Possessive", "of Paone").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::LongName Possessive", "of Epep" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::LongName Possessive", "of Epep").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::LongName Possessive", "of Mesore" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::LongName Possessive", "of Mesore").toString(locale()); + case 13: +- return ki18nc( "Coptic month 12 - KLocale::LongName Possessive", "of Kouji nabot" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::LongName Possessive", "of Kouji nabot").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Coptic month 1 - KLocale::LongName", "Thoout" ).toString( locale() ); ++ return ki18nc("Coptic month 1 - KLocale::LongName", "Thoout").toString(locale()); + case 2: +- return ki18nc( "Coptic month 2 - KLocale::LongName", "Paope" ).toString( locale() ); ++ return ki18nc("Coptic month 2 - KLocale::LongName", "Paope").toString(locale()); + case 3: +- return ki18nc( "Coptic month 3 - KLocale::LongName", "Hathor" ).toString( locale() ); ++ return ki18nc("Coptic month 3 - KLocale::LongName", "Hathor").toString(locale()); + case 4: +- return ki18nc( "Coptic month 4 - KLocale::LongName", "Kiahk" ).toString( locale() ); ++ return ki18nc("Coptic month 4 - KLocale::LongName", "Kiahk").toString(locale()); + case 5: +- return ki18nc( "Coptic month 5 - KLocale::LongName", "Tobe" ).toString( locale() ); ++ return ki18nc("Coptic month 5 - KLocale::LongName", "Tobe").toString(locale()); + case 6: +- return ki18nc( "Coptic month 6 - KLocale::LongName", "Meshir" ).toString( locale() ); ++ return ki18nc("Coptic month 6 - KLocale::LongName", "Meshir").toString(locale()); + case 7: +- return ki18nc( "Coptic month 7 - KLocale::LongName", "Paremhotep" ).toString( locale() ); ++ return ki18nc("Coptic month 7 - KLocale::LongName", "Paremhotep").toString(locale()); + case 8: +- return ki18nc( "Coptic month 8 - KLocale::LongName", "Parmoute" ).toString( locale() ); ++ return ki18nc("Coptic month 8 - KLocale::LongName", "Parmoute").toString(locale()); + case 9: +- return ki18nc( "Coptic month 9 - KLocale::LongName", "Pashons" ).toString( locale() ); ++ return ki18nc("Coptic month 9 - KLocale::LongName", "Pashons").toString(locale()); + case 10: +- return ki18nc( "Coptic month 10 - KLocale::LongName", "Paone" ).toString( locale() ); ++ return ki18nc("Coptic month 10 - KLocale::LongName", "Paone").toString(locale()); + case 11: +- return ki18nc( "Coptic month 11 - KLocale::LongName", "Epep" ).toString( locale() ); ++ return ki18nc("Coptic month 11 - KLocale::LongName", "Epep").toString(locale()); + case 12: +- return ki18nc( "Coptic month 12 - KLocale::LongName", "Mesore" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::LongName", "Mesore").toString(locale()); + case 13: +- return ki18nc( "Coptic month 12 - KLocale::LongName", "Kouji nabot" ).toString( locale() ); ++ return ki18nc("Coptic month 12 - KLocale::LongName", "Kouji nabot").toString(locale()); + default: + return QString(); + } +@@ -327,115 +327,111 @@ QString KCalendarSystemCopticPrivate::monthName( int month, int year, KLocale::D + + // Names taken from from the Sahidic dialect transliterations used in Dershowitz & Reingold which went out of use in the 11th centuary + // Boharic or Arabic transliterations would be preferred but none could be found +-QString KCalendarSystemCopticPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemCopticPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Coptic weekday 1 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 1 - KLocale::NarrowName", "P").toString(locale()); + case 2: +- return ki18nc( "Coptic weekday 2 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 2 - KLocale::NarrowName", "P").toString(locale()); + case 3: +- return ki18nc( "Coptic weekday 3 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 3 - KLocale::NarrowName", "P").toString(locale()); + case 4: +- return ki18nc( "Coptic weekday 4 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 4 - KLocale::NarrowName", "P").toString(locale()); + case 5: +- return ki18nc( "Coptic weekday 5 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 5 - KLocale::NarrowName", "P").toString(locale()); + case 6: +- return ki18nc( "Coptic weekday 6 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Coptic weekday 6 - KLocale::NarrowName", "P").toString(locale()); + case 7: +- return ki18nc( "Coptic weekday 7 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Coptic weekday 7 - KLocale::NarrowName", "T").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Coptic weekday 1 - KLocale::ShortName", "Pes" ).toString( locale() ); ++ return ki18nc("Coptic weekday 1 - KLocale::ShortName", "Pes").toString(locale()); + case 2: +- return ki18nc( "Coptic weekday 2 - KLocale::ShortName", "Psh" ).toString( locale() ); ++ return ki18nc("Coptic weekday 2 - KLocale::ShortName", "Psh").toString(locale()); + case 3: +- return ki18nc( "Coptic weekday 3 - KLocale::ShortName", "Pef" ).toString( locale() ); ++ return ki18nc("Coptic weekday 3 - KLocale::ShortName", "Pef").toString(locale()); + case 4: +- return ki18nc( "Coptic weekday 4 - KLocale::ShortName", "Pti" ).toString( locale() ); ++ return ki18nc("Coptic weekday 4 - KLocale::ShortName", "Pti").toString(locale()); + case 5: +- return ki18nc( "Coptic weekday 5 - KLocale::ShortName", "Pso" ).toString( locale() ); ++ return ki18nc("Coptic weekday 5 - KLocale::ShortName", "Pso").toString(locale()); + case 6: +- return ki18nc( "Coptic weekday 6 - KLocale::ShortName", "Psa" ).toString( locale() ); ++ return ki18nc("Coptic weekday 6 - KLocale::ShortName", "Psa").toString(locale()); + case 7: +- return ki18nc( "Coptic weekday 7 - KLocale::ShortName", "Tky" ).toString( locale() ); ++ return ki18nc("Coptic weekday 7 - KLocale::ShortName", "Tky").toString(locale()); + default: + return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Coptic weekday 1 - KLocale::LongName", "Pesnau" ).toString( locale() ); ++ return ki18nc("Coptic weekday 1 - KLocale::LongName", "Pesnau").toString(locale()); + case 2: +- return ki18nc( "Coptic weekday 2 - KLocale::LongName", "Pshoment" ).toString( locale() ); ++ return ki18nc("Coptic weekday 2 - KLocale::LongName", "Pshoment").toString(locale()); + case 3: +- return ki18nc( "Coptic weekday 3 - KLocale::LongName", "Peftoou" ).toString( locale() ); ++ return ki18nc("Coptic weekday 3 - KLocale::LongName", "Peftoou").toString(locale()); + case 4: +- return ki18nc( "Coptic weekday 4 - KLocale::LongName", "Ptiou" ).toString( locale() ); ++ return ki18nc("Coptic weekday 4 - KLocale::LongName", "Ptiou").toString(locale()); + case 5: +- return ki18nc( "Coptic weekday 5 - KLocale::LongName", "Psoou" ).toString( locale() ); ++ return ki18nc("Coptic weekday 5 - KLocale::LongName", "Psoou").toString(locale()); + case 6: +- return ki18nc( "Coptic weekday 6 - KLocale::LongName", "Psabbaton" ).toString( locale() ); ++ return ki18nc("Coptic weekday 6 - KLocale::LongName", "Psabbaton").toString(locale()); + case 7: +- return ki18nc( "Coptic weekday 7 - KLocale::LongName", "Tkyriakē" ).toString( locale() ); ++ return ki18nc("Coptic weekday 7 - KLocale::LongName", "Tkyriakē").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemCoptic::KCalendarSystemCoptic( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemCopticPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemCoptic::KCalendarSystemCoptic(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemCopticPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemCoptic::KCalendarSystemCoptic( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemCopticPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemCoptic::KCalendarSystemCoptic(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemCopticPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemCoptic::KCalendarSystemCoptic( KCalendarSystemCopticPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemCoptic::KCalendarSystemCoptic(KCalendarSystemCopticPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemCoptic::~KCalendarSystemCoptic() + { +- delete dont_use; + } + + QString KCalendarSystemCoptic::calendarType() const + { +- return QLatin1String( "coptic" ); ++ return QLatin1String("coptic"); + } + + QDate KCalendarSystemCoptic::epoch() const + { + //0001-01-01, no Year 0. + //0284-08-29 AD Julian +- return QDate::fromJulianDay( 1825030 ); ++ return QDate::fromJulianDay(1825030); + } + + QDate KCalendarSystemCoptic::earliestValidDate() const + { + //0001-01-01, no Year 0. + //0284-08-29 AD Julian +- return QDate::fromJulianDay( 1825030 ); ++ return QDate::fromJulianDay(1825030); + } + + QDate KCalendarSystemCoptic::latestValidDate() const +@@ -443,188 +439,47 @@ QDate KCalendarSystemCoptic::latestValidDate() const + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + //9999-12-30 + //10283-08-29 AD Julian +- return QDate::fromJulianDay( 5477164 ); ++ return QDate::fromJulianDay(5477164); + } + +-bool KCalendarSystemCoptic::isValid( int year, int month, int day ) const ++bool KCalendarSystemCoptic::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemCoptic::isValid( const QDate &date ) const ++bool KCalendarSystemCoptic::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemCoptic::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemCoptic::isLeapYear(int year) const + { +- return KCalendarSystem::setDate( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemCoptic::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemCoptic::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::setDate( date, y, m, d ); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemCoptic::year( const QDate &date ) const ++QString KCalendarSystemCoptic::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::year( date ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemCoptic::month( const QDate &date ) const ++QString KCalendarSystemCoptic::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::month( date ); ++ return KCalendarSystem::monthName(date, format); + } + +-int KCalendarSystemCoptic::day( const QDate &date ) const ++QString KCalendarSystemCoptic::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::day( date ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemCoptic::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemCoptic::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemCoptic::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemCoptic::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemCoptic::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemCoptic::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemCoptic::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemCoptic::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemCoptic::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemCoptic::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemCoptic::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemCoptic::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemCoptic::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemCoptic::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemCoptic::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemCoptic::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemCoptic::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemCoptic::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemCoptic::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemCoptic::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemCoptic::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemCoptic::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemCoptic::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemCoptic::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemCoptic::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemCoptic::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemCoptic::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemCoptic::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemCoptic::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemCoptic::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::weekDayName(date, format); + } + + int KCalendarSystemCoptic::weekDayOfPray() const +@@ -652,7 +507,7 @@ bool KCalendarSystemCoptic::isProleptic() const + return false; + } + +-bool KCalendarSystemCoptic::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemCoptic::julianDayToDate(int jd, int &year, int &month, int &day) const + { + //The Coptic calendar has 12 months of 30 days, a 13th month of 5 or 6 days, + //and a leap year every 4th year without fail that falls on the last day of +@@ -663,32 +518,32 @@ bool KCalendarSystemCoptic::julianDayToDate( int jd, int &year, int &month, int + //pattern of 365/365/365/366 with the leap day the very last day makes the maths easier. + + //Day number in the fake epoch, 0 indexed +- int dayInEpoch = jd - ( epoch().toJulianDay() - 365 ); ++ int dayInEpoch = jd - (epoch().toJulianDay() - 365); + //How many full 4 year leap cycles have been completed, 1461 = (365*3)+366 + int leapCyclesCompleted = dayInEpoch / 1461; + //Which year are we in the current 4 year leap cycle, 0 indexed + //Need the qMin as day 366 of 4th year of cycle returns following year (max 3 as 0 index) +- int yearInCurrentLeapCycle = qMin( 3, ( dayInEpoch % 1461 ) / 365 ); ++ int yearInCurrentLeapCycle = qMin(3, (dayInEpoch % 1461) / 365); + //Calculate the year +- year = ( leapCyclesCompleted * 4 ) + yearInCurrentLeapCycle; ++ year = (leapCyclesCompleted * 4) + yearInCurrentLeapCycle; + //Days since the fake epoch up to 1st day of this year +- int daysBeforeThisYear = ( year * 365 ) + ( year / 4 ); ++ int daysBeforeThisYear = (year * 365) + (year / 4); + //Gives the day number in this year, 0 indexed + int dayOfThisYear = dayInEpoch - daysBeforeThisYear; + //Then just calculate month and day from that based on regular 30 day months +- month = ( ( dayOfThisYear ) / 30 ) + 1; +- day = dayOfThisYear - ( ( month - 1 ) * 30 ) + 1; ++ month = ((dayOfThisYear) / 30) + 1; ++ day = dayOfThisYear - ((month - 1) * 30) + 1; + + // If year is -ve then is BC. In Coptic there is no year 0, but the maths + // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside +- if ( year < 1 ) { ++ if (year < 1) { + year = year - 1; + } + + return true; + } + +-bool KCalendarSystemCoptic::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemCoptic::dateToJulianDay(int year, int month, int day, int &jd) const + { + //The Coptic calendar has 12 months of 30 days, a 13th month of 5 or 6 days, + //and a leap year every 4th year without fail that falls on the last day of +@@ -699,17 +554,17 @@ bool KCalendarSystemCoptic::dateToJulianDay( int year, int month, int day, int & + // If year is -ve then is 'BC'. In Coptic there is no year 0, but the maths + // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally + int y; +- if ( year < 1 ) { ++ if (year < 1) { + y = year + 1; + } else { + y = year; + } + + jd = epoch().toJulianDay() - 1 // jd of day before Epoch +- + ( ( y - 1 ) * 365 ) // Add all normal days in years preceding +- + ( y / 4 ) // Add all leap days in years preceding +- + ( ( month - 1 ) * 30 ) // Add days this year in months preceding +- + day; // Add days in this month ++ + ((y - 1) * 365) // Add all normal days in years preceding ++ + (y / 4) // Add all leap days in years preceding ++ + ((month - 1) * 30) // Add days this year in months preceding ++ + day; // Add days in this month + + return true; + } +diff --git a/kdecore/date/kcalendarsystemcoptic_p.h b/kdecore/date/kcalendarsystemcoptic_p.h +index e62c0e2..d7498a4 100644 +--- a/kdecore/date/kcalendarsystemcoptic_p.h ++++ b/kdecore/date/kcalendarsystemcoptic_p.h +@@ -37,8 +37,8 @@ class KCalendarSystemCopticPrivate; + class KCalendarSystemCoptic: public KCalendarSystem + { + public: +- explicit KCalendarSystemCoptic( const KLocale *locale = 0 ); +- explicit KCalendarSystemCoptic( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemCoptic(const KLocale *locale = 0); ++ explicit KCalendarSystemCoptic(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemCoptic(); + + virtual QString calendarType() const; +@@ -46,58 +46,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -105,14 +66,13 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemCoptic( KCalendarSystemCopticPrivate &dd, const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemCoptic(KCalendarSystemCopticPrivate &dd, const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemCoptic ) +- KCalendarSystemCopticPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemCoptic) + }; + + #endif // KCALENDARSYSTEMCOPTIC_H +diff --git a/kdecore/date/kcalendarsystemcopticprivate_p.h b/kdecore/date/kcalendarsystemcopticprivate_p.h +index e2a15ca..d30bd6a 100644 +--- a/kdecore/date/kcalendarsystemcopticprivate_p.h ++++ b/kdecore/date/kcalendarsystemcopticprivate_p.h +@@ -25,26 +25,26 @@ + class KCalendarSystemCopticPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemCopticPrivate( KCalendarSystemCoptic *q ); ++ explicit KCalendarSystemCopticPrivate(KCalendarSystemCoptic *q); + + virtual ~KCalendarSystemCopticPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + }; + + #endif // KCALENDARSYSTEMCOPTICPRIVATE_H +diff --git a/kdecore/date/kcalendarsystemethiopian.cpp b/kdecore/date/kcalendarsystemethiopian.cpp +index 967c356..d337003 100644 +--- a/kdecore/date/kcalendarsystemethiopian.cpp ++++ b/kdecore/date/kcalendarsystemethiopian.cpp +@@ -30,18 +30,16 @@ + class KCalendarSystemEthiopianPrivate : public KCalendarSystemCopticPrivate + { + public: +- explicit KCalendarSystemEthiopianPrivate( KCalendarSystemEthiopian *q ) : KCalendarSystemCopticPrivate( q ) +- { ++ explicit KCalendarSystemEthiopianPrivate(KCalendarSystemEthiopian *q) : KCalendarSystemCopticPrivate(q) { + } + +- virtual ~KCalendarSystemEthiopianPrivate() +- { ++ virtual ~KCalendarSystemEthiopianPrivate() { + } + + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + }; + + KLocale::CalendarSystem KCalendarSystemEthiopianPrivate::calendarSystem() const +@@ -53,291 +51,287 @@ void KCalendarSystemEthiopianPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // Incarnation Era, Amätä Mehrät, "Year of Mercy". +- name = i18nc( "Calendar Era: Ethiopian Incarnation Era, years > 0, LongFormat", "Amata Mehrat" ); +- shortName = i18nc( "Calendar Era: Ethiopian Incarnation Era, years > 0, ShortFormat", "AM" ); +- format = i18nc( "(kdedt-format) Ethiopian, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Ethiopian Incarnation Era, years > 0, LongFormat", "Amata Mehrat"); ++ shortName = i18nc("Calendar Era: Ethiopian Incarnation Era, years > 0, ShortFormat", "AM"); ++ format = i18nc("(kdedt-format) Ethiopian, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + + // Names taken from http://www.ethiopianembassy.at/dates_cycles.htm, alternative transliterations exist +-QString KCalendarSystemEthiopianPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemEthiopianPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::NarrowName", "M").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::NarrowName", "T").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::NarrowName", "H" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::NarrowName", "H").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::NarrowName", "T").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::NarrowName", "T").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::NarrowName", "Y" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::NarrowName", "Y").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::NarrowName", "M").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::NarrowName", "M").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::NarrowName", "G" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::NarrowName", "G").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::NarrowName", "S").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::NarrowName", "H" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::NarrowName", "H").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::NarrowName", "N" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::NarrowName", "N").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::NarrowName", "P").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::ShortName Possessive", "of Mes" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::ShortName Possessive", "of Mes").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::ShortName Possessive", "of Teq" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::ShortName Possessive", "of Teq").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::ShortName Possessive", "of Hed" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::ShortName Possessive", "of Hed").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::ShortName Possessive", "of Tah" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::ShortName Possessive", "of Tah").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::ShortName Possessive", "of Ter" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::ShortName Possessive", "of Ter").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::ShortName Possessive", "of Yak" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::ShortName Possessive", "of Yak").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::ShortName Possessive", "of Mag" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::ShortName Possessive", "of Mag").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::ShortName Possessive", "of Miy" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::ShortName Possessive", "of Miy").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::ShortName Possessive", "of Gen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::ShortName Possessive", "of Gen").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::ShortName Possessive", "of Sen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::ShortName Possessive", "of Sen").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::ShortName Possessive", "of Ham" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::ShortName Possessive", "of Ham").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::ShortName Possessive", "of Neh" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::ShortName Possessive", "of Neh").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::ShortName Possessive", "of Pag" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::ShortName Possessive", "of Pag").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::ShortName", "Mes" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::ShortName", "Mes").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::ShortName", "Teq" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::ShortName", "Teq").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::ShortName", "Hed" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::ShortName", "Hed").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::ShortName", "Tah" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::ShortName", "Tah").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::ShortName", "Ter" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::ShortName", "Ter").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::ShortName", "Yak" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::ShortName", "Yak").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::ShortName", "Mag" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::ShortName", "Mag").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::ShortName", "Miy" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::ShortName", "Miy").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::ShortName", "Gen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::ShortName", "Gen").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::ShortName", "Sen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::ShortName", "Sen").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::ShortName", "Ham" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::ShortName", "Ham").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::ShortName", "Neh" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::ShortName", "Neh").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::ShortName", "Pag" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::ShortName", "Pag").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::LongName Possessive", "of Meskerem" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::LongName Possessive", "of Meskerem").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::LongName Possessive", "of Tequemt" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::LongName Possessive", "of Tequemt").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::LongName Possessive", "of Hedar" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::LongName Possessive", "of Hedar").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::LongName Possessive", "of Tahsas" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::LongName Possessive", "of Tahsas").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::LongName Possessive", "of Ter" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::LongName Possessive", "of Ter").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::LongName Possessive", "of Yakatit" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::LongName Possessive", "of Yakatit").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::LongName Possessive", "of Magabit" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::LongName Possessive", "of Magabit").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::LongName Possessive", "of Miyazya" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::LongName Possessive", "of Miyazya").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::LongName Possessive", "of Genbot" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::LongName Possessive", "of Genbot").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::LongName Possessive", "of Sene" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::LongName Possessive", "of Sene").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::LongName Possessive", "of Hamle" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::LongName Possessive", "of Hamle").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::LongName Possessive", "of Nehase" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::LongName Possessive", "of Nehase").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::LongName Possessive", "of Pagumen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::LongName Possessive", "of Pagumen").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Ethiopian month 1 - KLocale::LongName", "Meskerem" ).toString( locale() ); ++ return ki18nc("Ethiopian month 1 - KLocale::LongName", "Meskerem").toString(locale()); + case 2: +- return ki18nc( "Ethiopian month 2 - KLocale::LongName", "Tequemt" ).toString( locale() ); ++ return ki18nc("Ethiopian month 2 - KLocale::LongName", "Tequemt").toString(locale()); + case 3: +- return ki18nc( "Ethiopian month 3 - KLocale::LongName", "Hedar" ).toString( locale() ); ++ return ki18nc("Ethiopian month 3 - KLocale::LongName", "Hedar").toString(locale()); + case 4: +- return ki18nc( "Ethiopian month 4 - KLocale::LongName", "Tahsas" ).toString( locale() ); ++ return ki18nc("Ethiopian month 4 - KLocale::LongName", "Tahsas").toString(locale()); + case 5: +- return ki18nc( "Ethiopian month 5 - KLocale::LongName", "Ter" ).toString( locale() ); ++ return ki18nc("Ethiopian month 5 - KLocale::LongName", "Ter").toString(locale()); + case 6: +- return ki18nc( "Ethiopian month 6 - KLocale::LongName", "Yakatit" ).toString( locale() ); ++ return ki18nc("Ethiopian month 6 - KLocale::LongName", "Yakatit").toString(locale()); + case 7: +- return ki18nc( "Ethiopian month 7 - KLocale::LongName", "Magabit" ).toString( locale() ); ++ return ki18nc("Ethiopian month 7 - KLocale::LongName", "Magabit").toString(locale()); + case 8: +- return ki18nc( "Ethiopian month 8 - KLocale::LongName", "Miyazya" ).toString( locale() ); ++ return ki18nc("Ethiopian month 8 - KLocale::LongName", "Miyazya").toString(locale()); + case 9: +- return ki18nc( "Ethiopian month 9 - KLocale::LongName", "Genbot" ).toString( locale() ); ++ return ki18nc("Ethiopian month 9 - KLocale::LongName", "Genbot").toString(locale()); + case 10: +- return ki18nc( "Ethiopian month 10 - KLocale::LongName", "Sene" ).toString( locale() ); ++ return ki18nc("Ethiopian month 10 - KLocale::LongName", "Sene").toString(locale()); + case 11: +- return ki18nc( "Ethiopian month 11 - KLocale::LongName", "Hamle" ).toString( locale() ); ++ return ki18nc("Ethiopian month 11 - KLocale::LongName", "Hamle").toString(locale()); + case 12: +- return ki18nc( "Ethiopian month 12 - KLocale::LongName", "Nehase" ).toString( locale() ); ++ return ki18nc("Ethiopian month 12 - KLocale::LongName", "Nehase").toString(locale()); + case 13: +- return ki18nc( "Ethiopian month 13 - KLocale::LongName", "Pagumen" ).toString( locale() ); ++ return ki18nc("Ethiopian month 13 - KLocale::LongName", "Pagumen").toString(locale()); + default: + return QString(); + } + } + + // Names taken from http://www.ethiopianembassy.at/dates_cycles.htm, alternative transliterations exist +-QString KCalendarSystemEthiopianPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemEthiopianPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Ethiopian weekday 1 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 1 - KLocale::NarrowName ", "S").toString(locale()); + case 2: +- return ki18nc( "Ethiopian weekday 2 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 2 - KLocale::NarrowName ", "M").toString(locale()); + case 3: +- return ki18nc( "Ethiopian weekday 3 - KLocale::NarrowName ", "R" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 3 - KLocale::NarrowName ", "R").toString(locale()); + case 4: +- return ki18nc( "Ethiopian weekday 4 - KLocale::NarrowName ", "H" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 4 - KLocale::NarrowName ", "H").toString(locale()); + case 5: +- return ki18nc( "Ethiopian weekday 5 - KLocale::NarrowName ", "A" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 5 - KLocale::NarrowName ", "A").toString(locale()); + case 6: +- return ki18nc( "Ethiopian weekday 6 - KLocale::NarrowName ", "Q" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 6 - KLocale::NarrowName ", "Q").toString(locale()); + case 7: +- return ki18nc( "Ethiopian weekday 7 - KLocale::NarrowName ", "E" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 7 - KLocale::NarrowName ", "E").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Ethiopian weekday 1 - KLocale::ShortName", "Seg" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 1 - KLocale::ShortName", "Seg").toString(locale()); + case 2: +- return ki18nc( "Ethiopian weekday 2 - KLocale::ShortName", "Mak" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 2 - KLocale::ShortName", "Mak").toString(locale()); + case 3: +- return ki18nc( "Ethiopian weekday 3 - KLocale::ShortName", "Rob" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 3 - KLocale::ShortName", "Rob").toString(locale()); + case 4: +- return ki18nc( "Ethiopian weekday 4 - KLocale::ShortName", "Ham" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 4 - KLocale::ShortName", "Ham").toString(locale()); + case 5: +- return ki18nc( "Ethiopian weekday 5 - KLocale::ShortName", "Arb" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 5 - KLocale::ShortName", "Arb").toString(locale()); + case 6: +- return ki18nc( "Ethiopian weekday 6 - KLocale::ShortName", "Qed" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 6 - KLocale::ShortName", "Qed").toString(locale()); + case 7: +- return ki18nc( "Ethiopian weekday 7 - KLocale::ShortName", "Ehu" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 7 - KLocale::ShortName", "Ehu").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Ethiopian weekday 1 - KLocale::LongName", "Segno" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 1 - KLocale::LongName", "Segno").toString(locale()); + case 2: +- return ki18nc( "Ethiopian weekday 2 - KLocale::LongName", "Maksegno" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 2 - KLocale::LongName", "Maksegno").toString(locale()); + case 3: +- return ki18nc( "Ethiopian weekday 3 - KLocale::LongName", "Rob" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 3 - KLocale::LongName", "Rob").toString(locale()); + case 4: +- return ki18nc( "Ethiopian weekday 4 - KLocale::LongName", "Hamus" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 4 - KLocale::LongName", "Hamus").toString(locale()); + case 5: +- return ki18nc( "Ethiopian weekday 5 - KLocale::LongName", "Arb" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 5 - KLocale::LongName", "Arb").toString(locale()); + case 6: +- return ki18nc( "Ethiopian weekday 6 - KLocale::LongName", "Qedame" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 6 - KLocale::LongName", "Qedame").toString(locale()); + case 7: +- return ki18nc( "Ethiopian weekday 7 - KLocale::LongName", "Ehud" ).toString( locale() ); ++ return ki18nc("Ethiopian weekday 7 - KLocale::LongName", "Ehud").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemEthiopian::KCalendarSystemEthiopian( const KLocale *locale ) +- : KCalendarSystemCoptic( *new KCalendarSystemEthiopianPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemEthiopian::KCalendarSystemEthiopian(const KLocale *locale) ++ : KCalendarSystemCoptic(*new KCalendarSystemEthiopianPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemEthiopian::KCalendarSystemEthiopian( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemCoptic( *new KCalendarSystemEthiopianPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemEthiopian::KCalendarSystemEthiopian(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemCoptic(*new KCalendarSystemEthiopianPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemEthiopian::KCalendarSystemEthiopian( KCalendarSystemEthiopianPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemCoptic( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemEthiopian::KCalendarSystemEthiopian(KCalendarSystemEthiopianPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemCoptic(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemEthiopian::~KCalendarSystemEthiopian() + { +- delete dont_use; + } + + QString KCalendarSystemEthiopian::calendarType() const + { +- return QLatin1String( "ethiopian" ); ++ return QLatin1String("ethiopian"); + } + + QDate KCalendarSystemEthiopian::epoch() const + { + //0001-01-01, no Year 0. + //0008-08-29 AD Julian +- return QDate::fromJulianDay( 1724221 ); ++ return QDate::fromJulianDay(1724221); + } + + QDate KCalendarSystemEthiopian::earliestValidDate() const + { + //0001-01-01, no Year 0. + //0008-08-29 AD Julian +- return QDate::fromJulianDay( 1724221 ); ++ return QDate::fromJulianDay(1724221); + } + + QDate KCalendarSystemEthiopian::latestValidDate() const +@@ -345,188 +339,47 @@ QDate KCalendarSystemEthiopian::latestValidDate() const + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + //9999-12-30 + //100008-08-29 AD Julian +- return QDate::fromJulianDay( 5376721 ); ++ return QDate::fromJulianDay(5376721); + } + +-bool KCalendarSystemEthiopian::isValid( int year, int month, int day ) const ++bool KCalendarSystemEthiopian::isValid(int year, int month, int day) const + { +- return KCalendarSystemCoptic::isValid( year, month, day ); ++ return KCalendarSystemCoptic::isValid(year, month, day); + } + +-bool KCalendarSystemEthiopian::isValid( const QDate &date ) const ++bool KCalendarSystemEthiopian::isValid(const QDate &date) const + { +- return KCalendarSystemCoptic::isValid( date ); ++ return KCalendarSystemCoptic::isValid(date); + } + +-bool KCalendarSystemEthiopian::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemEthiopian::isLeapYear(int year) const + { +- return KCalendarSystemCoptic::setDate( date, year, month, day ); ++ return KCalendarSystemCoptic::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemEthiopian::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemEthiopian::isLeapYear(const QDate &date) const + { +- return KCalendarSystemCoptic::setDate( date, y, m, d ); ++ return KCalendarSystemCoptic::isLeapYear(date); + } + +-int KCalendarSystemEthiopian::year( const QDate &date ) const ++QString KCalendarSystemEthiopian::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystemCoptic::year( date ); ++ return KCalendarSystemCoptic::monthName(month, year, format); + } + +-int KCalendarSystemEthiopian::month( const QDate &date ) const ++QString KCalendarSystemEthiopian::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystemCoptic::month( date ); ++ return KCalendarSystemCoptic::monthName(date, format); + } + +-int KCalendarSystemEthiopian::day( const QDate &date ) const ++QString KCalendarSystemEthiopian::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystemCoptic::day( date ); ++ return KCalendarSystemCoptic::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemEthiopian::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemEthiopian::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystemCoptic::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemEthiopian::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystemCoptic::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemEthiopian::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystemCoptic::addDays( date, ndays ); +-} +- +-int KCalendarSystemEthiopian::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::monthsInYear( date ); +-} +- +-int KCalendarSystemEthiopian::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::weeksInYear( date ); +-} +- +-int KCalendarSystemEthiopian::weeksInYear( int year ) const +-{ +- return KCalendarSystemCoptic::weeksInYear( year ); +-} +- +-int KCalendarSystemEthiopian::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::daysInYear( date ); +-} +- +-int KCalendarSystemEthiopian::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::daysInMonth( date ); +-} +- +-int KCalendarSystemEthiopian::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::daysInWeek( date ); +-} +- +-int KCalendarSystemEthiopian::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::dayOfYear( date ); +-} +- +-int KCalendarSystemEthiopian::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::dayOfWeek( date ); +-} +- +-int KCalendarSystemEthiopian::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystemCoptic::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemEthiopian::isLeapYear( int year ) const +-{ +- return KCalendarSystemCoptic::isLeapYear( year ); +-} +- +-bool KCalendarSystemEthiopian::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystemCoptic::isLeapYear( date ); +-} +- +-QString KCalendarSystemEthiopian::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystemCoptic::monthName( month, year, format ); +-} +- +-QString KCalendarSystemEthiopian::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystemCoptic::monthName( date, format ); +-} +- +-QString KCalendarSystemEthiopian::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemCoptic::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemEthiopian::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemCoptic::weekDayName( date, format ); +-} +- +-QString KCalendarSystemEthiopian::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemCoptic::yearString( pDate, format ); +-} +- +-QString KCalendarSystemEthiopian::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemCoptic::monthString( pDate, format ); +-} +- +-QString KCalendarSystemEthiopian::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemCoptic::dayString( pDate, format ); +-} +- +-int KCalendarSystemEthiopian::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemCoptic::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemEthiopian::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemCoptic::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemEthiopian::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemCoptic::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemEthiopian::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystemCoptic::formatDate( date, format ); +-} +- +-QDate KCalendarSystemEthiopian::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystemCoptic::readDate( str, ok ); +-} +- +-QDate KCalendarSystemEthiopian::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystemCoptic::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemEthiopian::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystemCoptic::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemEthiopian::weekStartDay() const +-{ +- return KCalendarSystemCoptic::weekStartDay(); ++ return KCalendarSystemCoptic::weekDayName(date, format); + } + + int KCalendarSystemEthiopian::weekDayOfPray() const +@@ -554,12 +407,12 @@ bool KCalendarSystemEthiopian::isProleptic() const + return false; + } + +-bool KCalendarSystemEthiopian::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemEthiopian::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- return KCalendarSystemCoptic::julianDayToDate( jd, year, month, day ); ++ return KCalendarSystemCoptic::julianDayToDate(jd, year, month, day); + } + +-bool KCalendarSystemEthiopian::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemEthiopian::dateToJulianDay(int year, int month, int day, int &jd) const + { +- return KCalendarSystemCoptic::dateToJulianDay( year, month, day, jd ); ++ return KCalendarSystemCoptic::dateToJulianDay(year, month, day, jd); + } +diff --git a/kdecore/date/kcalendarsystemethiopian_p.h b/kdecore/date/kcalendarsystemethiopian_p.h +index 002c2c5..8394f07 100644 +--- a/kdecore/date/kcalendarsystemethiopian_p.h ++++ b/kdecore/date/kcalendarsystemethiopian_p.h +@@ -38,8 +38,8 @@ class KCalendarSystemEthiopianPrivate; + class KCalendarSystemEthiopian: public KCalendarSystemCoptic + { + public: +- explicit KCalendarSystemEthiopian( const KLocale *locale = 0 ); +- explicit KCalendarSystemEthiopian( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemEthiopian(const KLocale *locale = 0); ++ explicit KCalendarSystemEthiopian(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemEthiopian(); + + virtual QString calendarType() const; +@@ -47,58 +47,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -106,15 +67,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemEthiopian( KCalendarSystemEthiopianPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemEthiopian(KCalendarSystemEthiopianPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + Q_DECLARE_PRIVATE(KCalendarSystemEthiopian) +- KCalendarSystemEthiopianPrivate * const dont_use; // KDE5 remove, use shared d + }; + + #endif // KCALENDARSYSTEMETHIOPIAN_H +diff --git a/kdecore/date/kcalendarsystemgregorian.cpp b/kdecore/date/kcalendarsystemgregorian.cpp +index 26132dc..57ba552 100644 +--- a/kdecore/date/kcalendarsystemgregorian.cpp ++++ b/kdecore/date/kcalendarsystemgregorian.cpp +@@ -1,7 +1,5 @@ + /* +- Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> +- Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> +- Copyright 2007, 2010 John Layt <john@layt.net> ++ Copyright 2009, 2010 John Layt <john@layt.net> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public +@@ -22,7 +20,7 @@ + // Derived gregorian kde calendar class + + #include "kcalendarsystemgregorian_p.h" +-#include "kcalendarsystemprivate_p.h" ++#include "kcalendarsystemgregorianprivate_p.h" + #include "kcalendarera_p.h" + + #include "kdebug.h" +@@ -33,39 +31,10 @@ + #include <QtCore/QDate> + #include <QtCore/QCharRef> + +-class KCalendarSystemGregorianPrivate : public KCalendarSystemPrivate +-{ +-public: +- explicit KCalendarSystemGregorianPrivate( KCalendarSystemGregorian *q ); +- +- virtual ~KCalendarSystemGregorianPrivate(); +- +- // Virtual methods each calendar system must re-implement +- virtual KLocale::CalendarSystem calendarSystem() const; +- virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; +- virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; +- virtual bool hasLeapMonths() const; +- virtual bool hasYearZero() const; +- virtual int maxDaysInWeek() const; +- virtual int maxMonthsInYear() const; +- virtual int earliestValidYear() const; +- virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; +- +- bool m_useCommonEra; +-}; +- +-// Shared d pointer implementations +- +-KCalendarSystemGregorianPrivate::KCalendarSystemGregorianPrivate( KCalendarSystemGregorian *q ) +- :KCalendarSystemPrivate( q ), +- m_useCommonEra( false ) ++// Shared d pointer base class definitions + ++KCalendarSystemGregorianPrivate::KCalendarSystemGregorianPrivate(KCalendarSystemGregorian *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -75,54 +44,69 @@ KCalendarSystemGregorianPrivate::~KCalendarSystemGregorianPrivate() + + KLocale::CalendarSystem KCalendarSystemGregorianPrivate::calendarSystem() const + { +- return KLocale::QDateCalendar; ++ return KLocale::GregorianCalendar; + } + ++// Dummy version using Gregorian as an example ++// This method MUST be re-implemented in any new Calendar System + void KCalendarSystemGregorianPrivate::loadDefaultEraList() + { + QString name, shortName, format; + +- KConfigGroup lcg( config(), QString::fromLatin1( "Locale" ) ); +- KConfigGroup cg = lcg.group( QString::fromLatin1( "KCalendarSystem %1" ).arg( q->calendarType() ) ); +- m_useCommonEra = cg.readEntry( "UseCommonEra", false ); ++ KConfigGroup cg(config(), QString::fromLatin1("KCalendarSystem %1").arg(q->calendarType(q->calendarSystem()))); ++ m_useCommonEra = cg.readEntry("UseCommonEra", false); + +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Gregorian Common Era, years < 0, LongFormat", "Before Common Era" ); +- shortName = i18nc( "Calendar Era: Gregorian Common Era, years < 0, ShortFormat", "BCE" ); ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Gregorian Common Era, years < 0, LongFormat", "Before Common Era"); ++ shortName = i18nc("Calendar Era: Gregorian Common Era, years < 0, ShortFormat", "BCE"); + } else { +- name = i18nc( "Calendar Era: Gregorian Christian Era, years < 0, LongFormat", "Before Christ" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years < 0, ShortFormat", "BC" ); ++ name = i18nc("Calendar Era: Gregorian Christian Era, years < 0, LongFormat", "Before Christ"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years < 0, ShortFormat", "BC"); + } +- format = i18nc( "(kdedt-format) Gregorian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC" ); +- addEra( '-', 1, q->epoch().addDays( -1 ), -1, q->earliestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Gregorian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC"); ++ addEra('-', 1, q->epoch().addDays(-1), -1, q->earliestValidDate(), name, shortName, format); + +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Gregorian Common Era, years > 0, LongFormat", "Common Era" ); +- shortName = i18nc( "Calendar Era: Gregorian Common Era, years > 0, ShortFormat", "CE" ); ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Gregorian Common Era, years > 0, LongFormat", "Common Era"); ++ shortName = i18nc("Calendar Era: Gregorian Common Era, years > 0, ShortFormat", "CE"); + } else { +- name = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD" ); ++ name = i18nc("Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD"); + } +- format = i18nc( "(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemGregorianPrivate::monthsInYear( int year ) const ++int KCalendarSystemGregorianPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + +-int KCalendarSystemGregorianPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemGregorianPrivate::daysInMonth(int year, int month) const + { +- QDate tempDate( year, month, 1 ); +- return tempDate.daysInMonth(); ++ if (month == 2) { ++ if (isLeapYear(year)) { ++ return 29; ++ } else { ++ return 28; ++ } ++ } ++ ++ if (month == 4 || month == 6 || month == 9 || month == 11) { ++ return 30; ++ } ++ ++ return 31; + } + +-int KCalendarSystemGregorianPrivate::daysInYear( int year ) const ++int KCalendarSystemGregorianPrivate::daysInYear(int year) const + { +- QDate tempDate( year, 1, 1 ); +- return tempDate.daysInYear(); ++ if (isLeapYear(year)) { ++ return 366; ++ } else { ++ return 365; ++ } + } + + int KCalendarSystemGregorianPrivate::daysInWeek() const +@@ -130,9 +114,21 @@ int KCalendarSystemGregorianPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemGregorianPrivate::isLeapYear( int year ) const ++bool KCalendarSystemGregorianPrivate::isLeapYear(int year) const + { +- return QDate::isLeapYear( year ); ++ if (!hasYearZero() && year < 1) { ++ year = year + 1; ++ } ++ ++ if (year % 4 == 0) { ++ if (year % 100 != 0) { ++ return true; ++ } else if (year % 400 == 0) { ++ return true; ++ } ++ } ++ ++ return false; + } + + bool KCalendarSystemGregorianPrivate::hasLeapMonths() const +@@ -157,7 +153,7 @@ int KCalendarSystemGregorianPrivate::maxMonthsInYear() const + + int KCalendarSystemGregorianPrivate::earliestValidYear() const + { +- return -4712; ++ return -4713; + } + + int KCalendarSystemGregorianPrivate::latestValidYear() const +@@ -165,465 +161,321 @@ int KCalendarSystemGregorianPrivate::latestValidYear() const + return 9999; + } + +-QString KCalendarSystemGregorianPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemGregorianPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::NarrowName", "J").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::NarrowName", "F" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::NarrowName", "F").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::NarrowName", "M").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::NarrowName", "A").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::NarrowName", "M").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::NarrowName", "J").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::NarrowName", "J").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::NarrowName", "A").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::NarrowName", "S").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::NarrowName", "O" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::NarrowName", "O").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::NarrowName", "N" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::NarrowName", "N").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::NarrowName", "D" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::NarrowName", "D").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::ShortName Possessive", "of Jan" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::ShortName Possessive", "of Jan").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::ShortName Possessive", "of Feb" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::ShortName Possessive", "of Feb").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::ShortName Possessive", "of Mar" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::ShortName Possessive", "of Mar").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::ShortName Possessive", "of Apr" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::ShortName Possessive", "of Apr").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::ShortName Possessive", "of May" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::ShortName Possessive", "of May").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::ShortName Possessive", "of Jun" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::ShortName Possessive", "of Jun").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::ShortName Possessive", "of Jul" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::ShortName Possessive", "of Jul").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::ShortName Possessive", "of Aug" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::ShortName Possessive", "of Aug").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::ShortName Possessive", "of Sep" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::ShortName Possessive", "of Sep").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::ShortName Possessive", "of Oct" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::ShortName Possessive", "of Oct").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::ShortName Possessive", "of Nov" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::ShortName Possessive", "of Nov").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::ShortName Possessive", "of Dec" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::ShortName Possessive", "of Dec").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::ShortName", "Jan" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::ShortName", "Jan").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::ShortName", "Feb" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::ShortName", "Feb").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::ShortName", "Mar" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::ShortName", "Mar").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::ShortName", "Apr" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::ShortName", "Apr").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::ShortName", "May" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::ShortName", "May").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::ShortName", "Jun" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::ShortName", "Jun").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::ShortName", "Jul" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::ShortName", "Jul").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::ShortName", "Aug" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::ShortName", "Aug").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::ShortName", "Sep" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::ShortName", "Sep").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::ShortName", "Oct" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::ShortName", "Oct").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::ShortName", "Nov" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::ShortName", "Nov").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::ShortName", "Dec" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::ShortName", "Dec").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::LongName Possessive", "of January" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::LongName Possessive", "of January").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::LongName Possessive", "of February" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::LongName Possessive", "of February").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::LongName Possessive", "of March" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::LongName Possessive", "of March").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::LongName Possessive", "of April" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::LongName Possessive", "of April").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::LongName Possessive", "of May" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::LongName Possessive", "of May").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::LongName Possessive", "of June" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::LongName Possessive", "of June").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::LongName Possessive", "of July" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::LongName Possessive", "of July").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::LongName Possessive", "of August" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::LongName Possessive", "of August").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::LongName Possessive", "of September" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::LongName Possessive", "of September").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::LongName Possessive", "of October" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::LongName Possessive", "of October").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::LongName Possessive", "of November" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::LongName Possessive", "of November").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::LongName Possessive", "of December" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::LongName Possessive", "of December").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Gregorian month 1 - KLocale::LongName", "January" ).toString( locale() ); ++ return ki18nc("Gregorian month 1 - KLocale::LongName", "January").toString(locale()); + case 2: +- return ki18nc( "Gregorian month 2 - KLocale::LongName", "February" ).toString( locale() ); ++ return ki18nc("Gregorian month 2 - KLocale::LongName", "February").toString(locale()); + case 3: +- return ki18nc( "Gregorian month 3 - KLocale::LongName", "March" ).toString( locale() ); ++ return ki18nc("Gregorian month 3 - KLocale::LongName", "March").toString(locale()); + case 4: +- return ki18nc( "Gregorian month 4 - KLocale::LongName", "April" ).toString( locale() ); ++ return ki18nc("Gregorian month 4 - KLocale::LongName", "April").toString(locale()); + case 5: +- return ki18nc( "Gregorian month 5 - KLocale::LongName", "May" ).toString( locale() ); ++ return ki18nc("Gregorian month 5 - KLocale::LongName", "May").toString(locale()); + case 6: +- return ki18nc( "Gregorian month 6 - KLocale::LongName", "June" ).toString( locale() ); ++ return ki18nc("Gregorian month 6 - KLocale::LongName", "June").toString(locale()); + case 7: +- return ki18nc( "Gregorian month 7 - KLocale::LongName", "July" ).toString( locale() ); ++ return ki18nc("Gregorian month 7 - KLocale::LongName", "July").toString(locale()); + case 8: +- return ki18nc( "Gregorian month 8 - KLocale::LongName", "August" ).toString( locale() ); ++ return ki18nc("Gregorian month 8 - KLocale::LongName", "August").toString(locale()); + case 9: +- return ki18nc( "Gregorian month 9 - KLocale::LongName", "September" ).toString( locale() ); ++ return ki18nc("Gregorian month 9 - KLocale::LongName", "September").toString(locale()); + case 10: +- return ki18nc( "Gregorian month 10 - KLocale::LongName", "October" ).toString( locale() ); ++ return ki18nc("Gregorian month 10 - KLocale::LongName", "October").toString(locale()); + case 11: +- return ki18nc( "Gregorian month 11 - KLocale::LongName", "November" ).toString( locale() ); ++ return ki18nc("Gregorian month 11 - KLocale::LongName", "November").toString(locale()); + case 12: +- return ki18nc( "Gregorian month 12 - KLocale::LongName", "December" ).toString( locale() ); ++ return ki18nc("Gregorian month 12 - KLocale::LongName", "December").toString(locale()); + default: + return QString(); + } + } + +-QString KCalendarSystemGregorianPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemGregorianPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::NarrowName ", "M").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::NarrowName ", "T").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::NarrowName ", "W" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::NarrowName ", "W").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::NarrowName ", "T").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::NarrowName ", "F" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::NarrowName ", "F").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::NarrowName ", "S").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::ShortName", "Mon" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::ShortName", "Mon").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::ShortName", "Tue" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::ShortName", "Tue").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::ShortName", "Wed" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::ShortName", "Wed").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::ShortName", "Thu" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::ShortName", "Thu").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::ShortName", "Fri" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::ShortName", "Fri").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::ShortName", "Sat" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::ShortName", "Sat").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::ShortName", "Sun" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::ShortName", "Sun").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::LongName", "Monday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::LongName", "Monday").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::LongName", "Tuesday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::LongName", "Tuesday").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::LongName", "Wednesday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::LongName", "Wednesday").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::LongName", "Thursday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::LongName", "Thursday").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::LongName", "Friday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::LongName", "Friday").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::LongName", "Saturday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::LongName", "Saturday").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::LongName", "Sunday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::LongName", "Sunday").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemGregorian::KCalendarSystemGregorian( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemGregorianPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemGregorian::KCalendarSystemGregorian(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemGregorianPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemGregorian::KCalendarSystemGregorian( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemGregorianPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemGregorian::KCalendarSystemGregorian(const KSharedConfig::Ptr config, ++ const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemGregorianPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemGregorian::KCalendarSystemGregorian( KCalendarSystemGregorianPrivate &dd, const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemGregorian::KCalendarSystemGregorian(KCalendarSystemGregorianPrivate &dd, ++ const KSharedConfig::Ptr config, ++ const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemGregorian::~KCalendarSystemGregorian() + { +- delete dont_use; + } + + QString KCalendarSystemGregorian::calendarType() const + { +- return QLatin1String( "gregorian" ); ++ return QLatin1String("gregorian-proleptic"); + } + + QDate KCalendarSystemGregorian::epoch() const + { +- // 1 Jan 1 AD in Julian +- return QDate::fromJulianDay( 1721424 ); ++ return QDate::fromJulianDay(1721426); + } + + QDate KCalendarSystemGregorian::earliestValidDate() const + { +- // 1 Jan 4712 BC, no year zero, cant be 4713BC due to error in QDate that day 0 is not valid +- // and we really need the first in each year to be valid for the date maths +- return QDate::fromJulianDay( 366 ); ++ // Gregorian 1 Jan 4713 BC, no year zero ++ return QDate::fromJulianDay(38); + } + + QDate KCalendarSystemGregorian::latestValidDate() const + { +- // Set to last day of year 9999 until confirm date formats & widets support > 9999 ++ // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // In Gregorian this is 9999-12-31, which is is jd 5373484 + // Can't call setDate( 9999, 12, 31 ) as it creates circular reference! +- return QDate::fromJulianDay( 5373484 ); +-} +- +-bool KCalendarSystemGregorian::isValid( int year, int month, int day ) const +-{ +- // Limit to max year 9999 for now, QDate allows to be greater +- if ( year <= 9999 ) { +- return QDate::isValid( year, month, day ); +- } +- +- return false; +-} +- +-bool KCalendarSystemGregorian::isValid( const QDate &date ) const +-{ +- return KCalendarSystem::isValid( date ); +-} +- +-bool KCalendarSystemGregorian::setDate( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setDate( date, year, month, day ); +-} +- +-// Deprecated +-bool KCalendarSystemGregorian::setYMD( QDate &date, int y, int m, int d ) const +-{ +- return KCalendarSystem::setDate( date, y, m, d ); +-} +- +-int KCalendarSystemGregorian::year( const QDate &date ) const +-{ +- return date.year(); +-} +- +-int KCalendarSystemGregorian::month( const QDate &date ) const +-{ +- return date.month(); +-} +- +-int KCalendarSystemGregorian::day( const QDate &date ) const +-{ +- return date.day(); +-} +- +-QDate KCalendarSystemGregorian::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemGregorian::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemGregorian::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemGregorian::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemGregorian::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemGregorian::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); ++ return QDate::fromJulianDay(5373484); + } + +-int KCalendarSystemGregorian::daysInYear( const QDate &date ) const ++bool KCalendarSystemGregorian::isValid(int year, int month, int day) const + { +- return date.daysInYear(); ++ return KCalendarSystem::isValid(year, month, day); + } + +-int KCalendarSystemGregorian::daysInMonth( const QDate &date ) const ++bool KCalendarSystemGregorian::isValid(const QDate &date) const + { +- return date.daysInMonth(); ++ return KCalendarSystem::isValid(date); + } + +-int KCalendarSystemGregorian::daysInWeek( const QDate &date ) const ++bool KCalendarSystemGregorian::isLeapYear(int year) const + { +- return KCalendarSystem::daysInWeek( date ); ++ return KCalendarSystem::isLeapYear(year); + } + +-int KCalendarSystemGregorian::dayOfYear( const QDate &date ) const ++bool KCalendarSystemGregorian::isLeapYear(const QDate &date) const + { +- return date.dayOfYear(); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemGregorian::dayOfWeek( const QDate &date ) const ++QString KCalendarSystemGregorian::monthName(int month, int year, MonthNameFormat format) const + { +- return date.dayOfWeek(); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemGregorian::weekNumber( const QDate &date, int * yearNum ) const ++QString KCalendarSystemGregorian::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::weekNumber( date, yearNum ); ++ return KCalendarSystem::monthName(date, format); + } + +-bool KCalendarSystemGregorian::isLeapYear( int year ) const ++QString KCalendarSystemGregorian::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return QDate::isLeapYear( year ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-bool KCalendarSystemGregorian::isLeapYear( const QDate &date ) const ++QString KCalendarSystemGregorian::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return QDate::isLeapYear( date.year() ); ++ return KCalendarSystem::weekDayName(date, format); + } + +-QString KCalendarSystemGregorian::monthName( int month, int year, MonthNameFormat format ) const ++int KCalendarSystemGregorian::yearStringToInteger(const QString &sNum, int &iLength) const + { +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemGregorian::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemGregorian::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemGregorian::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemGregorian::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemGregorian::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemGregorian::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemGregorian::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemGregorian::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemGregorian::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemGregorian::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemGregorian::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemGregorian::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemGregorian::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemGregorian::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::yearStringToInteger(sNum, iLength); + } + + int KCalendarSystemGregorian::weekDayOfPray() const +@@ -648,24 +500,67 @@ bool KCalendarSystemGregorian::isSolar() const + + bool KCalendarSystemGregorian::isProleptic() const + { +- return false; ++ return true; + } + +-bool KCalendarSystemGregorian::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemGregorian::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- QDate date = QDate::fromJulianDay( jd ); ++ Q_D(const KCalendarSystemGregorian); ++ ++ // Formula from The Calendar FAQ by Claus Tondering ++ // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 ++ // NOTE: Coded from scratch from mathematical formulas, not copied from ++ // the Boost licensed source code + +- date.getDate( &year, &month, &day ); ++ int a = jd + 32044; ++ int b = ((4 * a) + 3) / 146097; ++ int c = a - ((146097 * b) / 4); ++ int dd = ((4 * c) + 3) / 1461; ++ int e = c - ((1461 * dd) / 4); ++ int m = ((5 * e) + 2) / 153; ++ day = e - (((153 * m) + 2) / 5) + 1; ++ month = m + 3 - (12 * (m / 10)); ++ year = (100 * b) + dd - 4800 + (m / 10); + +- return date.isValid(); ++ // If year is -ve then is BC. In Gregorian there is no year 0, but the maths ++ // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside ++ // Check for Year 0 support as some Gregorian based calendars do have it, e.g. Thai and ISO ++ if (!d->hasYearZero() && year < 1) { ++ year = year - 1; ++ } ++ return true; + } + +-bool KCalendarSystemGregorian::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemGregorian::dateToJulianDay(int year, int month, int day, int &jd) const + { +- QDate date; ++ Q_D(const KCalendarSystemGregorian); ++ ++ // Formula from The Calendar FAQ by Claus Tondering ++ // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 ++ // NOTE: Coded from scratch from mathematical formulas, not copied from ++ // the Boost licensed source code + +- date.setDate( year, month, day ); +- jd = date.toJulianDay(); ++ // If year is -ve then is BC. In Gregorian there is no year 0, but the maths ++ // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally ++ // Check for Year 0 support as some Gregorian based calendars do have it, e.g. Thai and ISO ++ int y; ++ if (!d->hasYearZero() && year < 1) { ++ y = year + 1; ++ } else { ++ y = year; ++ } + +- return date.isValid(); ++ int a = (14 - month) / 12; ++ y = y + 4800 - a; ++ int m = month + (12 * a) - 3; ++ ++ jd = day ++ + (((153 * m) + 2) / 5) ++ + (365 * y) ++ + (y / 4) ++ - (y / 100) ++ + (y / 400) ++ - 32045; ++ ++ return true; + } +diff --git a/kdecore/date/kcalendarsystemgregorian_p.h b/kdecore/date/kcalendarsystemgregorian_p.h +index 31f861b..c173ea9 100644 +--- a/kdecore/date/kcalendarsystemgregorian_p.h ++++ b/kdecore/date/kcalendarsystemgregorian_p.h +@@ -1,7 +1,5 @@ + /* +- Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> +- Copyright (c) 2002 Hans Petter Bieker <bieker@kde.org> +- Copyright 2007, 2010 John Layt <john@layt.net> ++ Copyright 2009, 2010 John Layt <john@layt.net> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public +@@ -28,84 +26,46 @@ class KCalendarSystemGregorianPrivate; + + /** + * @internal +- * This is the Gregorian calendar implementation. ++ * This is the pure Gregorian calendar implementation. + * +- * The Gregorian calendar is the most used calendar today. The first year in +- * the calendar is set to the birth of Christ. ++ * Note: This is a proleptic version of the Gregorian calendar, it does not ++ * copy the QDate method of using the Julian Calendar for dates before 15 ++ * October 1582. This is the traditional proleptic Gregorian calendar ++ * that does not have a year 0, unlike the ISO version which does. + * +- * WARNING: This is not a pure Gregorian calendar, it copies the QDate method +- * of using the Julian Calendar for dates before 15 October 1582. +- * +- * @b license GNU-GPL v.2 ++ * @b license GNU-LGPL v.2 or later + * + * @see KLocale,KCalendarSystem + * +- * @author Carlos Moro <cfmoro@correo.uniovi.es> ++ * @author John Layt <john@layt.net> + */ + class KCalendarSystemGregorian: public KCalendarSystem + { + public: +- explicit KCalendarSystemGregorian ( const KLocale *locale = 0 ); +- explicit KCalendarSystemGregorian( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); +- virtual ~KCalendarSystemGregorian (); ++ explicit KCalendarSystemGregorian(const KLocale *locale = 0); ++ explicit KCalendarSystemGregorian(const KSharedConfig::Ptr config, const KLocale *locale = 0); ++ virtual ~KCalendarSystemGregorian(); + + virtual QString calendarType() const; + + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; +- +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; +- +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; +- +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; +- +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; ++ virtual int yearStringToInteger(const QString &sNum, int &iLength) const; + +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -113,15 +73,15 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemGregorian( KCalendarSystemGregorianPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemGregorian(KCalendarSystemGregorianPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemGregorian ) +- KCalendarSystemGregorianPrivate * const dont_use; // KDE5 remove, use shared d ++ friend class KCalendarSystemIndianNational; // To allow access to julianDayToDate() and dateToJulianDay() ++ Q_DECLARE_PRIVATE(KCalendarSystemGregorian) + }; + +-#endif ++#endif // KCALENDARSYSTEMGREGORIAN_H +diff --git a/kdecore/date/kcalendarsystemgregorianprivate_p.h b/kdecore/date/kcalendarsystemgregorianprivate_p.h +new file mode 100644 +index 0000000..61d6646 +--- /dev/null ++++ b/kdecore/date/kcalendarsystemgregorianprivate_p.h +@@ -0,0 +1,54 @@ ++/* ++ Copyright 2009, 2010 John Layt <john@layt.net> ++ ++ 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; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++#ifndef KCALENDARSYSTEMGREGORIANPRIVATE_H ++#define KCALENDARSYSTEMGREGORIANPRIVATE_H ++ ++// Derived gregorian kde calendar class ++ ++#include "kcalendarsystemprivate_p.h" ++ ++class KCalendarSystemGregorianPrivate : public KCalendarSystemPrivate ++{ ++public: ++ explicit KCalendarSystemGregorianPrivate(KCalendarSystemGregorian *q); ++ ++ virtual ~KCalendarSystemGregorianPrivate(); ++ ++ // Virtual methods each calendar system must re-implement ++ virtual KLocale::CalendarSystem calendarSystem() const; ++ virtual void loadDefaultEraList(); ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; ++ virtual int daysInWeek() const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool hasLeapMonths() const; ++ virtual bool hasYearZero() const; ++ virtual int maxDaysInWeek() const; ++ virtual int maxMonthsInYear() const; ++ virtual int earliestValidYear() const; ++ virtual int latestValidYear() const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; ++ ++ bool m_useCommonEra; ++}; ++ ++#endif // KCALENDARSYSTEMGREGORIANPRIVATE_H +diff --git a/kdecore/date/kcalendarsystemgregorianproleptic.cpp b/kdecore/date/kcalendarsystemgregorianproleptic.cpp +deleted file mode 100644 +index 32ffeb4..0000000 +--- a/kdecore/date/kcalendarsystemgregorianproleptic.cpp ++++ /dev/null +@@ -1,706 +0,0 @@ +-/* +- Copyright 2009, 2010 John Layt <john@layt.net> +- +- 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; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-// Derived gregorian kde calendar class +- +-#include "kcalendarsystemgregorianproleptic_p.h" +-#include "kcalendarsystemgregorianprolepticprivate_p.h" +-#include "kcalendarera_p.h" +- +-#include "kdebug.h" +-#include "klocale.h" +-#include "kglobal.h" +-#include "kconfiggroup.h" +- +-#include <QtCore/QDate> +-#include <QtCore/QCharRef> +- +-// Shared d pointer base class definitions +- +-KCalendarSystemGregorianProlepticPrivate::KCalendarSystemGregorianProlepticPrivate( KCalendarSystemGregorianProleptic *q ) +- :KCalendarSystemPrivate( q ) +-{ +-} +- +-KCalendarSystemGregorianProlepticPrivate::~KCalendarSystemGregorianProlepticPrivate() +-{ +-} +- +-KLocale::CalendarSystem KCalendarSystemGregorianProlepticPrivate::calendarSystem() const +-{ +- return KLocale::GregorianCalendar; +-} +- +-// Dummy version using Gregorian as an example +-// This method MUST be re-implemented in any new Calendar System +-void KCalendarSystemGregorianProlepticPrivate::loadDefaultEraList() +-{ +- QString name, shortName, format; +- +- KConfigGroup cg( config(), QString::fromLatin1( "KCalendarSystem %1" ).arg( q->calendarType() ) ); +- m_useCommonEra = cg.readEntry( "UseCommonEra", false ); +- +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Gregorian Common Era, years < 0, LongFormat", "Before Common Era" ); +- shortName = i18nc( "Calendar Era: Gregorian Common Era, years < 0, ShortFormat", "BCE" ); +- } else { +- name = i18nc( "Calendar Era: Gregorian Christian Era, years < 0, LongFormat", "Before Christ" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years < 0, ShortFormat", "BC" ); +- } +- format = i18nc( "(kdedt-format) Gregorian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC" ); +- addEra( '-', 1, q->epoch().addDays( -1 ), -1, q->earliestValidDate(), name, shortName, format ); +- +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Gregorian Common Era, years > 0, LongFormat", "Common Era" ); +- shortName = i18nc( "Calendar Era: Gregorian Common Era, years > 0, ShortFormat", "CE" ); +- } else { +- name = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD" ); +- } +- format = i18nc( "(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); +-} +- +-int KCalendarSystemGregorianProlepticPrivate::monthsInYear( int year ) const +-{ +- Q_UNUSED( year ) +- return 12; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::daysInMonth( int year, int month ) const +-{ +- if ( month == 2 ) { +- if ( isLeapYear( year ) ) { +- return 29; +- } else { +- return 28; +- } +- } +- +- if ( month == 4 || month == 6 || month == 9 || month == 11 ) { +- return 30; +- } +- +- return 31; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::daysInYear( int year ) const +-{ +- if ( isLeapYear( year ) ) { +- return 366; +- } else { +- return 365; +- } +-} +- +-int KCalendarSystemGregorianProlepticPrivate::daysInWeek() const +-{ +- return 7; +-} +- +-bool KCalendarSystemGregorianProlepticPrivate::isLeapYear( int year ) const +-{ +- if ( !hasYearZero() && year < 1 ) { +- year = year + 1; +- } +- +- if ( year % 4 == 0 ) { +- if ( year % 100 != 0 ) { +- return true; +- } else if ( year % 400 == 0 ) { +- return true; +- } +- } +- +- return false; +-} +- +-bool KCalendarSystemGregorianProlepticPrivate::hasLeapMonths() const +-{ +- return false; +-} +- +-bool KCalendarSystemGregorianProlepticPrivate::hasYearZero() const +-{ +- return false; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::maxDaysInWeek() const +-{ +- return 7; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::maxMonthsInYear() const +-{ +- return 12; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::earliestValidYear() const +-{ +- return -4713; +-} +- +-int KCalendarSystemGregorianProlepticPrivate::latestValidYear() const +-{ +- return 9999; +-} +- +-QString KCalendarSystemGregorianProlepticPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const +-{ +- Q_UNUSED( year ); +- +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::NarrowName", "J" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::NarrowName", "F" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::NarrowName", "M" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::NarrowName", "A" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::NarrowName", "M" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::NarrowName", "J" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::NarrowName", "J" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::NarrowName", "A" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::NarrowName", "S" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::NarrowName", "O" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::NarrowName", "N" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::NarrowName", "D" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::ShortName Possessive", "of Jan" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::ShortName Possessive", "of Feb" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::ShortName Possessive", "of Mar" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::ShortName Possessive", "of Apr" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::ShortName Possessive", "of May" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::ShortName Possessive", "of Jun" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::ShortName Possessive", "of Jul" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::ShortName Possessive", "of Aug" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::ShortName Possessive", "of Sep" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::ShortName Possessive", "of Oct" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::ShortName Possessive", "of Nov" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::ShortName Possessive", "of Dec" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::ShortName", "Jan" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::ShortName", "Feb" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::ShortName", "Mar" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::ShortName", "Apr" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::ShortName", "May" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::ShortName", "Jun" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::ShortName", "Jul" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::ShortName", "Aug" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::ShortName", "Sep" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::ShortName", "Oct" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::ShortName", "Nov" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::ShortName", "Dec" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::LongName Possessive", "of January" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::LongName Possessive", "of February" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::LongName Possessive", "of March" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::LongName Possessive", "of April" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::LongName Possessive", "of May" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::LongName Possessive", "of June" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::LongName Possessive", "of July" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::LongName Possessive", "of August" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::LongName Possessive", "of September" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::LongName Possessive", "of October" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::LongName Possessive", "of November" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::LongName Possessive", "of December" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- // Default to LongName +- switch ( month ) { +- case 1: +- return ki18nc( "Gregorian month 1 - KLocale::LongName", "January" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian month 2 - KLocale::LongName", "February" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian month 3 - KLocale::LongName", "March" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian month 4 - KLocale::LongName", "April" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian month 5 - KLocale::LongName", "May" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian month 6 - KLocale::LongName", "June" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian month 7 - KLocale::LongName", "July" ).toString( locale() ); +- case 8: +- return ki18nc( "Gregorian month 8 - KLocale::LongName", "August" ).toString( locale() ); +- case 9: +- return ki18nc( "Gregorian month 9 - KLocale::LongName", "September" ).toString( locale() ); +- case 10: +- return ki18nc( "Gregorian month 10 - KLocale::LongName", "October" ).toString( locale() ); +- case 11: +- return ki18nc( "Gregorian month 11 - KLocale::LongName", "November" ).toString( locale() ); +- case 12: +- return ki18nc( "Gregorian month 12 - KLocale::LongName", "December" ).toString( locale() ); +- default: +- return QString(); +- } +-} +- +-QString KCalendarSystemGregorianProlepticPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const +-{ +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::NarrowName ", "M" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::NarrowName ", "W" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::NarrowName ", "T" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::NarrowName ", "F" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::NarrowName ", "S" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::ShortName", "Mon" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::ShortName", "Tue" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::ShortName", "Wed" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::ShortName", "Thu" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::ShortName", "Fri" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::ShortName", "Sat" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::ShortName", "Sun" ).toString( locale() ); +- default: return QString(); +- } +- } +- +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::LongName", "Monday" ).toString( locale() ); +- case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::LongName", "Tuesday" ).toString( locale() ); +- case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::LongName", "Wednesday" ).toString( locale() ); +- case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::LongName", "Thursday" ).toString( locale() ); +- case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::LongName", "Friday" ).toString( locale() ); +- case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::LongName", "Saturday" ).toString( locale() ); +- case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::LongName", "Sunday" ).toString( locale() ); +- default: +- return QString(); +- } +-} +- +- +-KCalendarSystemGregorianProleptic::KCalendarSystemGregorianProleptic( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemGregorianProlepticPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemGregorianProleptic::KCalendarSystemGregorianProleptic( const KSharedConfig::Ptr config, +- const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemGregorianProlepticPrivate( this ), config, locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemGregorianProleptic::KCalendarSystemGregorianProleptic( KCalendarSystemGregorianProlepticPrivate &dd, +- const KSharedConfig::Ptr config, +- const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemGregorianProleptic::~KCalendarSystemGregorianProleptic() +-{ +- delete dont_use; +-} +- +-QString KCalendarSystemGregorianProleptic::calendarType() const +-{ +- return QLatin1String( "gregorian-proleptic" ); +-} +- +-QDate KCalendarSystemGregorianProleptic::epoch() const +-{ +- return QDate::fromJulianDay( 1721426 ); +-} +- +-QDate KCalendarSystemGregorianProleptic::earliestValidDate() const +-{ +- // Gregorian 1 Jan 4713 BC, no year zero +- return QDate::fromJulianDay( 38 ); +-} +- +-QDate KCalendarSystemGregorianProleptic::latestValidDate() const +-{ +- // Set to last day of year 9999 until confirm date formats & widgets support > 9999 +- // In Gregorian this is 9999-12-31, which is is jd 5373484 +- // Can't call setDate( 9999, 12, 31 ) as it creates circular reference! +- return QDate::fromJulianDay( 5373484 ); +-} +- +-bool KCalendarSystemGregorianProleptic::isValid( int year, int month, int day ) const +-{ +- return KCalendarSystem::isValid( year, month, day ); +-} +- +-bool KCalendarSystemGregorianProleptic::isValid( const QDate &date ) const +-{ +- return KCalendarSystem::isValid( date ); +-} +- +-bool KCalendarSystemGregorianProleptic::setDate( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setDate( date, year, month, day ); +-} +- +-// Deprecated +-bool KCalendarSystemGregorianProleptic::setYMD( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setYMD( date, year, month, day ); +-} +- +-int KCalendarSystemGregorianProleptic::year( const QDate &date ) const +-{ +- return KCalendarSystem::year( date ); +-} +- +-int KCalendarSystemGregorianProleptic::month( const QDate &date ) const +-{ +- return KCalendarSystem::month( date ); +-} +- +-int KCalendarSystemGregorianProleptic::day( const QDate &date ) const +-{ +- return KCalendarSystem::day( date ); +-} +- +-QDate KCalendarSystemGregorianProleptic::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemGregorianProleptic::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemGregorianProleptic::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemGregorianProleptic::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemGregorianProleptic::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemGregorianProleptic::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemGregorianProleptic::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemGregorianProleptic::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemGregorianProleptic::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemGregorianProleptic::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemGregorianProleptic::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemGregorianProleptic::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemGregorianProleptic::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemGregorianProleptic::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemGregorianProleptic::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemGregorianProleptic::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemGregorianProleptic::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemGregorianProleptic::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemGregorianProleptic::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemGregorianProleptic::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemGregorianProleptic::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemGregorianProleptic::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemGregorianProleptic::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemGregorianProleptic::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); +-} +- +-int KCalendarSystemGregorianProleptic::weekDayOfPray() const +-{ +- return 7; // sunday +-} +- +-bool KCalendarSystemGregorianProleptic::isLunar() const +-{ +- return false; +-} +- +-bool KCalendarSystemGregorianProleptic::isLunisolar() const +-{ +- return false; +-} +- +-bool KCalendarSystemGregorianProleptic::isSolar() const +-{ +- return true; +-} +- +-bool KCalendarSystemGregorianProleptic::isProleptic() const +-{ +- return true; +-} +- +-bool KCalendarSystemGregorianProleptic::julianDayToDate( int jd, int &year, int &month, int &day ) const +-{ +- Q_D( const KCalendarSystemGregorianProleptic ); +- +- // Formula from The Calendar FAQ by Claus Tondering +- // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +- // NOTE: Coded from scratch from mathematical formulas, not copied from +- // the Boost licensed source code +- +- int a = jd + 32044; +- int b = ( ( 4 * a ) + 3 ) / 146097; +- int c = a - ( ( 146097 * b ) / 4 ); +- int dd = ( ( 4 * c ) + 3 ) / 1461; +- int e = c - ( ( 1461 * dd ) / 4 ); +- int m = ( ( 5 * e ) + 2 ) / 153; +- day = e - ( ( (153 * m ) + 2 ) / 5 ) + 1; +- month = m + 3 - ( 12 * ( m / 10 ) ); +- year = ( 100 * b ) + dd - 4800 + ( m / 10 ); +- +- // If year is -ve then is BC. In Gregorian there is no year 0, but the maths +- // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside +- // Check for Year 0 support as some Gregorian based calendars do have it, e.g. Thai and ISO +- if ( !d->hasYearZero() && year < 1 ) { +- year = year - 1; +- } +- return true; +-} +- +-bool KCalendarSystemGregorianProleptic::dateToJulianDay( int year, int month, int day, int &jd ) const +-{ +- Q_D( const KCalendarSystemGregorianProleptic ); +- +- // Formula from The Calendar FAQ by Claus Tondering +- // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +- // NOTE: Coded from scratch from mathematical formulas, not copied from +- // the Boost licensed source code +- +- // If year is -ve then is BC. In Gregorian there is no year 0, but the maths +- // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally +- // Check for Year 0 support as some Gregorian based calendars do have it, e.g. Thai and ISO +- int y; +- if ( !d->hasYearZero() && year < 1 ) { +- y = year + 1; +- } else { +- y = year; +- } +- +- int a = ( 14 - month ) / 12; +- y = y + 4800 - a; +- int m = month + ( 12 * a ) - 3; +- +- jd = day +- + ( ( ( 153 * m ) + 2 ) / 5 ) +- + ( 365 * y ) +- + ( y / 4 ) +- - ( y / 100 ) +- + ( y / 400 ) +- - 32045; +- +- return true; +-} +diff --git a/kdecore/date/kcalendarsystemgregorianproleptic_p.h b/kdecore/date/kcalendarsystemgregorianproleptic_p.h +deleted file mode 100644 +index bbb2f2f..0000000 +--- a/kdecore/date/kcalendarsystemgregorianproleptic_p.h ++++ /dev/null +@@ -1,125 +0,0 @@ +-/* +- Copyright 2009, 2010 John Layt <john@layt.net> +- +- 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; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#ifndef KCALENDARSYSTEMGREGORIANPROLEPTIC_H +-#define KCALENDARSYSTEMGREGORIANPROLEPTIC_H +- +-#include "kcalendarsystem.h" +- +-class KCalendarSystemGregorianProlepticPrivate; +- +-/** +- * @internal +- * This is the pure Gregorian calendar implementation. +- * +- * Note: This is a proleptic version of the Gregorian calendar, it does not +- * copy the QDate method of using the Julian Calendar for dates before 15 +- * October 1582. This is the traditional proleptic Gregorian calendar +- * that does not have a year 0, unlike the ISO version which does. +- * +- * @b license GNU-LGPL v.2 or later +- * +- * @see KLocale,KCalendarSystem +- * +- * @author John Layt <john@layt.net> +- */ +-class KCalendarSystemGregorianProleptic: public KCalendarSystem +-{ +-public: +- explicit KCalendarSystemGregorianProleptic( const KLocale *locale = 0 ); +- explicit KCalendarSystemGregorianProleptic( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); +- virtual ~KCalendarSystemGregorianProleptic(); +- +- virtual QString calendarType() const; +- +- virtual QDate epoch() const; +- virtual QDate earliestValidDate() const; +- virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; +- +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; +- +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; +- +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; +- +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; +- +- virtual bool isLunar() const; +- virtual bool isLunisolar() const; +- virtual bool isSolar() const; +- virtual bool isProleptic() const; +- +-protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemGregorianProleptic( KCalendarSystemGregorianProlepticPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); +- +-private: +- friend class KCalendarSystemIndianNational; // To allow access to julianDayToDate() and dateToJulianDay() +- Q_DECLARE_PRIVATE( KCalendarSystemGregorianProleptic ) +- KCalendarSystemGregorianProlepticPrivate * const dont_use; // KDE5 remove, use shared d +-}; +- +-#endif // KCALENDARSYSTEMGREGORIANPROLEPTIC_H +diff --git a/kdecore/date/kcalendarsystemgregorianprolepticprivate_p.h b/kdecore/date/kcalendarsystemgregorianprolepticprivate_p.h +deleted file mode 100644 +index e463b92..0000000 +--- a/kdecore/date/kcalendarsystemgregorianprolepticprivate_p.h ++++ /dev/null +@@ -1,54 +0,0 @@ +-/* +- Copyright 2009, 2010 John Layt <john@layt.net> +- +- 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; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#ifndef KCALENDARSYSTEMGREGORIANPROLEPTICPRIVATE_H +-#define KCALENDARSYSTEMGREGORIANPROLEPTICPRIVATE_H +- +-// Derived gregorian kde calendar class +- +-#include "kcalendarsystemprivate_p.h" +- +-class KCalendarSystemGregorianProlepticPrivate : public KCalendarSystemPrivate +-{ +-public: +- explicit KCalendarSystemGregorianProlepticPrivate( KCalendarSystemGregorianProleptic *q ); +- +- virtual ~KCalendarSystemGregorianProlepticPrivate(); +- +- // Virtual methods each calendar system must re-implement +- virtual KLocale::CalendarSystem calendarSystem() const; +- virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; +- virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; +- virtual bool hasLeapMonths() const; +- virtual bool hasYearZero() const; +- virtual int maxDaysInWeek() const; +- virtual int maxMonthsInYear() const; +- virtual int earliestValidYear() const; +- virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; +- +- bool m_useCommonEra; +-}; +- +-#endif // KCALENDARSYSTEMGREGORIANPROLEPTICPRIVATE_H +diff --git a/kdecore/date/kcalendarsystemhebrew.cpp b/kdecore/date/kcalendarsystemhebrew.cpp +index b55c6ec..8620055 100644 +--- a/kdecore/date/kcalendarsystemhebrew.cpp ++++ b/kdecore/date/kcalendarsystemhebrew.cpp +@@ -31,7 +31,7 @@ + #include <QtCore/QDate> + #include <QtCore/QCharRef> + +-static int hebrewDaysElapsed( int y ); ++static int hebrewDaysElapsed(int y); + + class h_date + { +@@ -46,26 +46,26 @@ public: + /* + * compute general date structure from hebrew date + */ +-static class h_date * hebrewToGregorian( int y, int m, int d ) ++static class h_date * hebrewToGregorian(int y, int m, int d) + { + static class h_date h; + int s; + + y -= 3744; +- s = hebrewDaysElapsed( y ); ++ s = hebrewDaysElapsed(y); + d += s; +- s = hebrewDaysElapsed( y + 1 ) - s; /* length of year */ ++ s = hebrewDaysElapsed(y + 1) - s; /* length of year */ + +- if ( s > 365 && m > 6 ) { ++ if (s > 365 && m > 6) { + --m; + d += 30; + } +- d += ( 59 * ( m - 1 ) + 1 ) / 2; /* regular months */ ++ d += (59 * (m - 1) + 1) / 2; /* regular months */ + /* special cases */ +- if ( s % 10 > 4 && m > 2 ) { /* long Heshvan */ ++ if (s % 10 > 4 && m > 2) { /* long Heshvan */ + d++; + } +- if ( s % 10 < 4 && m > 3 ) { /* short Kislev */ ++ if (s % 10 < 4 && m > 3) { /* short Kislev */ + d--; + } + // ### HPB: Broken in leap years +@@ -73,53 +73,53 @@ static class h_date * hebrewToGregorian( int y, int m, int d ) + // d += 30; + d -= 6002; + +- y = ( d + 36525 ) * 4 / 146097 - 1; +- d -= y / 4 * 146097 + ( y % 4 ) * 36524; ++ y = (d + 36525) * 4 / 146097 - 1; ++ d -= y / 4 * 146097 + (y % 4) * 36524; + y *= 100; + + /* compute year */ +- s = ( d + 366 )*4 / 1461 - 1; +- d -= s / 4*1461 + ( s % 4 )*365; ++ s = (d + 366) * 4 / 1461 - 1; ++ d -= s / 4 * 1461 + (s % 4) * 365; + y += s; + /* compute month */ +- m = ( d + 245 )*12 / 367 - 7; +- d -= m*367 / 12 - 30; +- if ( ++m >= 12 ) { ++ m = (d + 245) * 12 / 367 - 7; ++ d -= m * 367 / 12 - 30; ++ if (++m >= 12) { + m -= 12; + y++; + } + h.hd_day = d; + h.hd_mon = m; + h.hd_year = y; +- return( &h ); ++ return(&h); + } + + /* + * compute date structure from no. of days since 1 Tishrei 3744 + */ +-static class h_date * gregorianToHebrew( int y, int m, int d ) ++static class h_date * gregorianToHebrew(int y, int m, int d) + { + static class h_date h; + int s; + +- if ( ( m -= 2 ) <= 0 ) { ++ if ((m -= 2) <= 0) { + m += 12; + y--; + } + /* no. of days, Julian calendar */ +- d += 365*y + y / 4 + 367*m / 12 + 5968; ++ d += 365 * y + y / 4 + 367 * m / 12 + 5968; + /* Gregorian calendar */ + d -= y / 100 - y / 400 - 2; +- h.hd_dw = ( d + 1 ) % 7; ++ h.hd_dw = (d + 1) % 7; + + /* compute the year */ + y += 16; +- s = hebrewDaysElapsed( y ); +- m = hebrewDaysElapsed( y + 1 ); +- while( d >= m ) { /* computed year was underestimated */ ++ s = hebrewDaysElapsed(y); ++ m = hebrewDaysElapsed(y + 1); ++ while (d >= m) { /* computed year was underestimated */ + s = m; + y++; +- m = hebrewDaysElapsed( y + 1 ); ++ m = hebrewDaysElapsed(y + 1); + } + d -= s; + s = m - s; /* size of current year */ +@@ -128,31 +128,31 @@ static class h_date * gregorianToHebrew( int y, int m, int d ) + h.hd_flg = s % 10 - 4; + + /* compute day and month */ +- if ( d >= s - 236 ) { /* last 8 months are regular */ ++ if (d >= s - 236) { /* last 8 months are regular */ + d -= s - 236; + m = d * 2 / 59; +- d -= ( m * 59 + 1 ) / 2; ++ d -= (m * 59 + 1) / 2; + m += 4; +- if ( s > 365 && m <= 5 ) { /* Adar of Meuberet */ ++ if (s > 365 && m <= 5) { /* Adar of Meuberet */ + m += 8; + } + } else { + /* first 4 months have 117-119 days */ + s = 114 + s % 10; + m = d * 4 / s; +- d -= ( m * s + 3 ) / 4; ++ d -= (m * s + 3) / 4; + } + + h.hd_day = d; + h.hd_mon = m; + h.hd_year = y; +- return( &h ); ++ return(&h); + } + + /* constants, in 1/18th of minute */ + static const int HOUR = 1080; +-static const int DAY = 24*HOUR; +-static const int WEEK = 7*DAY; ++static const int DAY = 24 * HOUR; ++static const int WEEK = 7 * DAY; + #define M(h,p) ((h)*HOUR+p) + #define MONTH (DAY+M(12,793)) + +@@ -160,14 +160,14 @@ static const int WEEK = 7*DAY; + * @internal + * no. of days in y years + */ +-static int hebrewDaysElapsed( int y ) ++static int hebrewDaysElapsed(int y) + { + int m, nm, dw, s, l; + + l = y * 7 + 1; // no. of leap months + m = y * 12 + l / 19; // total no. of months + l %= 19; +- nm = m * MONTH + M( 1 + 6, 779 ); // molad new year 3744 (16BC) + 6 hours ++ nm = m * MONTH + M(1 + 6, 779); // molad new year 3744 (16BC) + 6 hours + s = m * 28 + nm / DAY - 2; + + nm %= WEEK; +@@ -175,13 +175,13 @@ static int hebrewDaysElapsed( int y ) + nm %= DAY; + + // special cases of Molad Zaken +- if ( (l < 12 && dw == 3 && nm >= M( 9 + 6, 204 )) || +- (l < 7 && dw == 2 && nm >= M( 15 + 6, 589 )) ) { ++ if ((l < 12 && dw == 3 && nm >= M(9 + 6, 204)) || ++ (l < 7 && dw == 2 && nm >= M(15 + 6, 589))) { + s++, dw++; + } + + /* ADU */ +- if ( dw == 1 || dw == 4 || dw == 6 ) { ++ if (dw == 1 || dw == 4 || dw == 6) { + s++; + } + return s; +@@ -191,44 +191,44 @@ static int hebrewDaysElapsed( int y ) + * @internal + * true if long Cheshvan + */ +-static int long_cheshvan( int year ) ++static int long_cheshvan(int year) + { + QDate first, last; + class h_date *gd; + +- gd = hebrewToGregorian( year, 1, 1 ); +- first.setYMD( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ gd = hebrewToGregorian(year, 1, 1); ++ first.setYMD(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + +- gd = hebrewToGregorian( year + 1, 1, 1 ); +- last.setYMD( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ gd = hebrewToGregorian(year + 1, 1, 1); ++ last.setYMD(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + +- return ( first.daysTo( last ) % 10 == 5 ); ++ return (first.daysTo(last) % 10 == 5); + } + + /** + * @internal + * true if short Kislev + */ +-static int short_kislev( int year ) ++static int short_kislev(int year) + { + QDate first, last; + class h_date * gd; + +- gd = hebrewToGregorian( year, 1, 1 ); +- first.setYMD( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ gd = hebrewToGregorian(year, 1, 1); ++ first.setYMD(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + +- gd = hebrewToGregorian( year + 1, 1, 1 ); +- last.setYMD( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ gd = hebrewToGregorian(year + 1, 1, 1); ++ last.setYMD(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + +- return ( first.daysTo( last ) % 10 == 3 ); ++ return (first.daysTo(last) % 10 == 3); + } + + // Ok +-static class h_date *toHebrew( const QDate &date ) ++static class h_date *toHebrew(const QDate &date) + { + class h_date *sd; + +- sd = gregorianToHebrew( date.year(), date.month(), date.day() ); ++ sd = gregorianToHebrew(date.year(), date.month(), date.day()); + ++sd->hd_mon; + ++sd->hd_day; + +@@ -238,38 +238,38 @@ static class h_date *toHebrew( const QDate &date ) + class KCalendarSystemHebrewPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemHebrewPrivate( KCalendarSystemHebrew *q ); ++ explicit KCalendarSystemHebrewPrivate(KCalendarSystemHebrew *q); + + virtual ~KCalendarSystemHebrewPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + +- virtual int integerFromString( const QString &string, int maxLength, int &readLength ) const; +- virtual QString stringFromInteger( int number, int padWidth = 0, QChar padChar = QLatin1Char('0') ) const; +- virtual QString stringFromInteger( int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet ) const; ++ virtual int integerFromString(const QString &string, int maxLength, int &readLength) const; ++ virtual QString stringFromInteger(int number, int padWidth = 0, QChar padChar = QLatin1Char('0')) const; ++ virtual QString stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const; + +- virtual int monthNumberToMonthIndex( int year, int month ) const; ++ virtual int monthNumberToMonthIndex(int year, int month) const; + }; + + // Shared d pointer base class definitions + +-KCalendarSystemHebrewPrivate::KCalendarSystemHebrewPrivate( KCalendarSystemHebrew *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemHebrewPrivate::KCalendarSystemHebrewPrivate(KCalendarSystemHebrew *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -286,55 +286,55 @@ void KCalendarSystemHebrewPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // Jewish Era, Anno Mundi, "Year of the World". +- name = i18nc( "Calendar Era: Hebrew Era, years > 0, LongFormat", "Anno Mundi" ); +- shortName = i18nc( "Calendar Era: Hebrew Era, years > 0, ShortFormat", "AM" ); +- format = i18nc( "(kdedt-format) Hebrew, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Hebrew Era, years > 0, LongFormat", "Anno Mundi"); ++ shortName = i18nc("Calendar Era: Hebrew Era, years > 0, ShortFormat", "AM"); ++ format = i18nc("(kdedt-format) Hebrew, AM, full era year format used for %EY, e.g. 2000 AM", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemHebrewPrivate::monthsInYear( int year ) const ++int KCalendarSystemHebrewPrivate::monthsInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 13; + } else { + return 12; + } + } + +-int KCalendarSystemHebrewPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemHebrewPrivate::daysInMonth(int year, int month) const + { +- int mi = monthNumberToMonthIndex( year, month ); ++ int mi = monthNumberToMonthIndex(year, month); + +- if ( mi == 2 && long_cheshvan( year ) ) { ++ if (mi == 2 && long_cheshvan(year)) { + return 30; + } + +- if ( mi == 3 && short_kislev( year ) ) { ++ if (mi == 3 && short_kislev(year)) { + return 29; + } + +- if ( mi % 2 == 0 ) { // Even number months have 29 days ++ if (mi % 2 == 0) { // Even number months have 29 days + return 29; + } else { // Odd number months have 30 days + return 30; + } + } + +-int KCalendarSystemHebrewPrivate::daysInYear( int year ) const ++int KCalendarSystemHebrewPrivate::daysInYear(int year) const + { + int days; + + // Get Regular year length +- if ( isLeapYear( year ) ) { // Has 13 months ++ if (isLeapYear(year)) { // Has 13 months + days = 384; + } else { // Has 12 months + days = 354; + } + + // Check if is Deficient or Abundant year +- if ( short_kislev( year ) ) { // Deficient ++ if (short_kislev(year)) { // Deficient + days = days - 1; +- } else if ( long_cheshvan( year ) ) { // Abundant ++ } else if (long_cheshvan(year)) { // Abundant + days = days + 1; + } + +@@ -346,9 +346,9 @@ int KCalendarSystemHebrewPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemHebrewPrivate::isLeapYear( int year ) const ++bool KCalendarSystemHebrewPrivate::isLeapYear(int year) const + { +- return ( ( ( ( 7 * year ) + 1 ) % 19 ) < 7 ); ++ return ((((7 * year) + 1) % 19) < 7); + } + + bool KCalendarSystemHebrewPrivate::hasLeapMonths() const +@@ -381,9 +381,9 @@ int KCalendarSystemHebrewPrivate::latestValidYear() const + return 8119; + } + +-int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, int maxLength, int &readLength ) const ++int KCalendarSystemHebrewPrivate::integerFromString(const QString &inputString, int maxLength, int &readLength) const + { +- if ( locale()->language() == QLatin1String("he") ) { ++ if (locale()->language() == QLatin1String("he")) { + + // Hebrew numbers are composed of combinations of normal letters which have a numeric value. + // This is a non-positional system, the numeric values are simply added together, however +@@ -420,18 +420,18 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + int result = 0; + int value = 0; + +- for ( ; position < stringLength ; ++position ) { ++ for (; position < stringLength ; ++position) { + + thisChar = string[position]; + +- if ( position + 1 < stringLength ) { ++ if (position + 1 < stringLength) { + nextChar = string[position + 1]; + // Ignore any geresh or gershayim chars, we don't bother checking they are in the right place +- if ( nextChar == QLatin1Char('\'') || nextChar == QChar( 0x05F3 ) || // geresh +- nextChar == QLatin1Char('\"') || nextChar == QChar( 0x05F4 ) ) { // gershayim +- string.remove( position + 1, 1 ); ++ if (nextChar == QLatin1Char('\'') || nextChar == QChar(0x05F3) || // geresh ++ nextChar == QLatin1Char('\"') || nextChar == QChar(0x05F4)) { // gershayim ++ string.remove(position + 1, 1); + stringLength = string.length(); +- if ( position + 1 < stringLength ) { ++ if (position + 1 < stringLength) { + nextChar = string[position + 1]; + } else { + nextChar = QChar(); +@@ -442,7 +442,7 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + nextChar = QChar(); + } + +- if ( thisChar >= QChar( 0x05D0 ) && thisChar <= QChar( 0x05D7 ) ) { ++ if (thisChar >= QChar(0x05D0) && thisChar <= QChar(0x05D7)) { + + // If this char Alef to Het, 1 to 8, א to ח + +@@ -450,13 +450,13 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + // then this char is a thousands digit + // else this char is a ones digit + +- if ( nextChar >= QChar( 0x05D0 ) && nextChar <= QChar( 0x05EA ) ) { +- value = ( thisChar.unicode() - 0x05D0 + 1 ) * 1000; ++ if (nextChar >= QChar(0x05D0) && nextChar <= QChar(0x05EA)) { ++ value = (thisChar.unicode() - 0x05D0 + 1) * 1000; + } else { + value = thisChar.unicode() - 0x05D0 + 1; + } + +- } else if ( thisChar == QChar( 0x05D8 ) ) { ++ } else if (thisChar == QChar(0x05D8)) { + + // If this char is Tet, 9, ט + +@@ -465,31 +465,31 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + // and next char not 7 (Special case for 97 = 16) + // then is a thousands digit else is 9 + +- if ( nextChar >= QChar( 0x05D0 ) && nextChar <= QChar( 0x05EA ) && +- nextChar != QChar( 0x05D5 ) && nextChar != QChar( 0x05D6 ) ) { ++ if (nextChar >= QChar(0x05D0) && nextChar <= QChar(0x05EA) && ++ nextChar != QChar(0x05D5) && nextChar != QChar(0x05D6)) { + value = 9000; + } else { + value = 9; + } + +- } else if ( thisChar >= QChar( 0x05D9 ) && thisChar <= QChar( 0x05E6 ) ) { ++ } else if (thisChar >= QChar(0x05D9) && thisChar <= QChar(0x05E6)) { + + // If this char Yod to Tsadi, 10 to 90, י to צ + + // If next char is a tens or hundreds char then is an error + // Else is a tens digit + +- if ( nextChar >= QChar( 0x05D9 ) ) { ++ if (nextChar >= QChar(0x05D9)) { + return -1; + } else { + value = decadeValues[thisChar.unicode() - 0x05D9]; + } + +- } else if ( thisChar >= QChar( 0x05E7 ) && thisChar <= QChar( 0x05EA ) ) { ++ } else if (thisChar >= QChar(0x05E7) && thisChar <= QChar(0x05EA)) { + + // If this char Qof to Tav, 100 to 400, ק to ת, then is hundreds digit + +- value = ( thisChar.unicode() - 0x05E7 + 1 ) * 100; ++ value = (thisChar.unicode() - 0x05E7 + 1) * 100; + + } else { + +@@ -508,18 +508,18 @@ int KCalendarSystemHebrewPrivate::integerFromString( const QString &inputString, + return result; + + } else { +- return KCalendarSystemPrivate::integerFromString( inputString, maxLength, readLength ); ++ return KCalendarSystemPrivate::integerFromString(inputString, maxLength, readLength); + } + } + +-QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidth, QChar padChar ) const ++QString KCalendarSystemHebrewPrivate::stringFromInteger(int number, int padWidth, QChar padChar) const + { +- return KCalendarSystemPrivate::stringFromInteger( number, padWidth, padChar ); ++ return KCalendarSystemPrivate::stringFromInteger(number, padWidth, padChar); + } + +-QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet ) const ++QString KCalendarSystemHebrewPrivate::stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const + { +- if ( locale()->language() == QLatin1String("he") ) { ++ if (locale()->language() == QLatin1String("he")) { + + // Hebrew numbers are composed of combinations of normal letters which have a numeric value. + // This is a non-positional system, the numeric values are simply added together, however +@@ -546,8 +546,8 @@ QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidt + */ + + const QChar decade[] = { +- // Tet = ט, Yod = י, Kaf = כ, Lamed = ל, Mem = מ +- // Nun = נ, Samekh = ס, Ayin = ע, Pe = פ, Tsadi = צ ++ // Tet = ט, Yod = י, Kaf = כ, Lamed = ל, Mem = מ ++ // Nun = נ, Samekh = ס, Ayin = ע, Pe = פ, Tsadi = צ + 0x05D8, 0x05D9, 0x05DB, 0x05DC, 0x05DE, + 0x05E0, 0x05E1, 0x05E2, 0x05E4, 0x05E6 + }; +@@ -555,15 +555,15 @@ QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidt + QString result; + + // We have no rules for coping with numbers outside this range +- if ( number < 1 || number > 9999 ) { +- return KCalendarSystemPrivate::stringFromInteger( number, padWidth, padChar, digitSet ); ++ if (number < 1 || number > 9999) { ++ return KCalendarSystemPrivate::stringFromInteger(number, padWidth, padChar, digitSet); + } + + // Translate the thousands digit, just uses letter for number 1..9 ( א to ט, Alef to Tet ) + // Years 5001-5999 do not have the thousands by convention +- if ( number >= 1000 ) { +- if ( number <= 5000 || number >= 6000 ) { +- result += QChar( 0x05D0 - 1 + number / 1000 ); // Alef א to Tet ט ++ if (number >= 1000) { ++ if (number <= 5000 || number >= 6000) { ++ result += QChar(0x05D0 - 1 + number / 1000); // Alef א to Tet ט + } + number %= 1000; + } +@@ -571,28 +571,28 @@ QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidt + // Translate the hundreds digit + // Use traditional method where we only have letters assigned values for 100, 200, 300 and 400 + // so may need to repeat 400 twice to make up the required number +- if ( number >= 100 ) { +- while ( number >= 500 ) { +- result += QChar( 0x05EA ); // Tav = ת ++ if (number >= 100) { ++ while (number >= 500) { ++ result += QChar(0x05EA); // Tav = ת + number -= 400; + } +- result += QChar( 0x05E7 - 1 + number / 100 ); // Qof = ק to xxx ++ result += QChar(0x05E7 - 1 + number / 100); // Qof = ק to xxx + number %= 100; + } + + // Translate the tens digit + // The numbers 15 and 16 translate to letters that spell out the name of God which is + // forbidden, so require special treatment where 15 = 9 + 6 and 1 = 9 + 7. +- if ( number >= 10 ) { +- if ( number == 15 || number == 16 ) ++ if (number >= 10) { ++ if (number == 15 || number == 16) + number -= 9; + result += decade[number / 10]; + number %= 10; + } + + // Translate the ones digit, uses letter for number 1..9 ( א to ט, Alef to Tet ) +- if ( number > 0 ) { +- result += QChar( 0x05D0 - 1 + number ); // Alef = א to xxx ++ if (number > 0) { ++ result += QChar(0x05D0 - 1 + number); // Alef = א to xxx + } + + // When used in a string with mixed names and numbers the numbers need special chars to +@@ -601,27 +601,27 @@ QString KCalendarSystemHebrewPrivate::stringFromInteger( int number, int padWidt + // single quote for convenience. + // Multiple digit numbers have a gershayim symbol ? (Unicode = 0x05F4) as second-to-last + // char, but we use double quote for convenience. +- if ( result.length() == 1 ) { ++ if (result.length() == 1) { + result += QLatin1Char('\''); + } else { +- result.insert( result.length() - 1, QLatin1Char('\"') ); ++ result.insert(result.length() - 1, QLatin1Char('\"')); + } + + return result; + + } else { +- return KCalendarSystemPrivate::stringFromInteger( number, padWidth, padChar, digitSet ); ++ return KCalendarSystemPrivate::stringFromInteger(number, padWidth, padChar, digitSet); + } + } + +-int KCalendarSystemHebrewPrivate::monthNumberToMonthIndex( int year, int month ) const ++int KCalendarSystemHebrewPrivate::monthNumberToMonthIndex(int year, int month) const + { +- if ( isLeapYear( year ) ) { +- if ( month == 6 ) { ++ if (isLeapYear(year)) { ++ if (month == 6) { + return 13; // Adar I +- } else if ( month == 7 ) { ++ } else if (month == 7) { + return 14; // Adar II +- } else if ( month > 7 ) { ++ } else if (month > 7) { + return month - 1; // Because of Adar II + } + } +@@ -629,181 +629,181 @@ int KCalendarSystemHebrewPrivate::monthNumberToMonthIndex( int year, int month ) + return month; + } + +-QString KCalendarSystemHebrewPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemHebrewPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { + // We must map month number to month index +- int monthIndex = monthNumberToMonthIndex( year, month ); ++ int monthIndex = monthNumberToMonthIndex(year, month); + +- if ( format == KLocale::NarrowName ) { +- switch ( monthIndex ) { ++ if (format == KLocale::NarrowName) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::NarrowName", "T").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::NarrowName", "H" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::NarrowName", "H").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::NarrowName", "K").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::NarrowName", "T").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::NarrowName", "S").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::NarrowName", "A").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::NarrowName", "N" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::NarrowName", "N").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::NarrowName", "I" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::NarrowName", "I").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::NarrowName", "S").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::NarrowName", "T").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::NarrowName", "A").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::NarrowName", "E" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::NarrowName", "E").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::NarrowName", "A").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::NarrowName", "A").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( monthIndex ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::ShortName Possessive", "of Tis" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::ShortName Possessive", "of Tis").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::ShortName Possessive", "of Hes" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::ShortName Possessive", "of Hes").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::ShortName Possessive", "of Kis" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::ShortName Possessive", "of Kis").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::ShortName Possessive", "of Tev" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::ShortName Possessive", "of Tev").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::ShortName Possessive", "of Shv" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::ShortName Possessive", "of Shv").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::ShortName Possessive", "of Ada" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::ShortName Possessive", "of Ada").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::ShortName Possessive", "of Nis" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::ShortName Possessive", "of Nis").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::ShortName Possessive", "of Iya" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::ShortName Possessive", "of Iya").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::ShortName Possessive", "of Siv" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::ShortName Possessive", "of Siv").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::ShortName Possessive", "of Tam" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::ShortName Possessive", "of Tam").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::ShortName Possessive", "of Av" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::ShortName Possessive", "of Av").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::ShortName Possessive", "of Elu" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::ShortName Possessive", "of Elu").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::ShortName Possessive", "of Ad1" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::ShortName Possessive", "of Ad1").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::ShortName Possessive", "of Ad2" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::ShortName Possessive", "of Ad2").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( monthIndex ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::ShortName", "Tis" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::ShortName", "Tis").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::ShortName", "Hes" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::ShortName", "Hes").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::ShortName", "Kis" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::ShortName", "Kis").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::ShortName", "Tev" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::ShortName", "Tev").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::ShortName", "Shv" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::ShortName", "Shv").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::ShortName", "Ada" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::ShortName", "Ada").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::ShortName", "Nis" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::ShortName", "Nis").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::ShortName", "Iya" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::ShortName", "Iya").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::ShortName", "Siv" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::ShortName", "Siv").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::ShortName", "Tam" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::ShortName", "Tam").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::ShortName", "Av" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::ShortName", "Av").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::ShortName", "Elu" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::ShortName", "Elu").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::ShortName", "Ad1" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::ShortName", "Ad1").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::ShortName", "Ad2" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::ShortName", "Ad2").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( monthIndex ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::LongName Possessive", "of Tishrey" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::LongName Possessive", "of Tishrey").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::LongName Possessive", "of Heshvan" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::LongName Possessive", "of Heshvan").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::LongName Possessive", "of Kislev" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::LongName Possessive", "of Kislev").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::LongName Possessive", "of Tevet" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::LongName Possessive", "of Tevet").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::LongName Possessive", "of Shvat" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::LongName Possessive", "of Shvat").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::LongName Possessive", "of Adar" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::LongName Possessive", "of Adar").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::LongName Possessive", "of Nisan" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::LongName Possessive", "of Nisan").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::LongName Possessive", "of Iyar" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::LongName Possessive", "of Iyar").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::LongName Possessive", "of Sivan" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::LongName Possessive", "of Sivan").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::LongName Possessive", "of Tamuz" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::LongName Possessive", "of Tamuz").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::LongName Possessive", "of Av" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::LongName Possessive", "of Av").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::LongName Possessive", "of Elul" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::LongName Possessive", "of Elul").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::LongName Possessive", "of Adar I" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::LongName Possessive", "of Adar I").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::LongName Possessive", "of Adar II" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::LongName Possessive", "of Adar II").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( monthIndex ) { ++ switch (monthIndex) { + case 1: +- return ki18nc( "Hebrew month 1 - KLocale::LongName", "Tishrey" ).toString( locale() ); ++ return ki18nc("Hebrew month 1 - KLocale::LongName", "Tishrey").toString(locale()); + case 2: +- return ki18nc( "Hebrew month 2 - KLocale::LongName", "Heshvan" ).toString( locale() ); ++ return ki18nc("Hebrew month 2 - KLocale::LongName", "Heshvan").toString(locale()); + case 3: +- return ki18nc( "Hebrew month 3 - KLocale::LongName", "Kislev" ).toString( locale() ); ++ return ki18nc("Hebrew month 3 - KLocale::LongName", "Kislev").toString(locale()); + case 4: +- return ki18nc( "Hebrew month 4 - KLocale::LongName", "Tevet" ).toString( locale() ); ++ return ki18nc("Hebrew month 4 - KLocale::LongName", "Tevet").toString(locale()); + case 5: +- return ki18nc( "Hebrew month 5 - KLocale::LongName", "Shvat" ).toString( locale() ); ++ return ki18nc("Hebrew month 5 - KLocale::LongName", "Shvat").toString(locale()); + case 6: +- return ki18nc( "Hebrew month 6 - KLocale::LongName", "Adar" ).toString( locale() ); ++ return ki18nc("Hebrew month 6 - KLocale::LongName", "Adar").toString(locale()); + case 7: +- return ki18nc( "Hebrew month 7 - KLocale::LongName", "Nisan" ).toString( locale() ); ++ return ki18nc("Hebrew month 7 - KLocale::LongName", "Nisan").toString(locale()); + case 8: +- return ki18nc( "Hebrew month 8 - KLocale::LongName", "Iyar" ).toString( locale() ); ++ return ki18nc("Hebrew month 8 - KLocale::LongName", "Iyar").toString(locale()); + case 9: +- return ki18nc( "Hebrew month 9 - KLocale::LongName", "Sivan" ).toString( locale() ); ++ return ki18nc("Hebrew month 9 - KLocale::LongName", "Sivan").toString(locale()); + case 10: +- return ki18nc( "Hebrew month 10 - KLocale::LongName", "Tamuz" ).toString( locale() ); ++ return ki18nc("Hebrew month 10 - KLocale::LongName", "Tamuz").toString(locale()); + case 11: +- return ki18nc( "Hebrew month 11 - KLocale::LongName", "Av" ).toString( locale() ); ++ return ki18nc("Hebrew month 11 - KLocale::LongName", "Av").toString(locale()); + case 12: +- return ki18nc( "Hebrew month 12 - KLocale::LongName", "Elul" ).toString( locale() ); ++ return ki18nc("Hebrew month 12 - KLocale::LongName", "Elul").toString(locale()); + case 13: +- return ki18nc( "Hebrew month 13 - KLocale::LongName", "Adar I" ).toString( locale() ); ++ return ki18nc("Hebrew month 13 - KLocale::LongName", "Adar I").toString(locale()); + case 14: +- return ki18nc( "Hebrew month 14 - KLocale::LongName", "Adar II" ).toString( locale() ); ++ return ki18nc("Hebrew month 14 - KLocale::LongName", "Adar II").toString(locale()); + default: + return QString(); + } +@@ -812,106 +812,102 @@ QString KCalendarSystemHebrewPrivate::monthName( int month, int year, KLocale::D + // Use Western day names for now as that's what the old version did, + // but wouldn't it be better to use the right Hebrew names like Shabbat? + // Could make it switchable by adding new enums to WeekDayFormat, e.g. ShortNameWestern? +-QString KCalendarSystemHebrewPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemHebrewPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::NarrowName ", "M").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::NarrowName ", "T").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::NarrowName ", "W" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::NarrowName ", "W").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::NarrowName ", "T").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::NarrowName ", "F" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::NarrowName ", "F").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::NarrowName ", "S").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::ShortName", "Mon" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::ShortName", "Mon").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::ShortName", "Tue" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::ShortName", "Tue").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::ShortName", "Wed" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::ShortName", "Wed").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::ShortName", "Thu" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::ShortName", "Thu").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::ShortName", "Fri" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::ShortName", "Fri").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::ShortName", "Sat" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::ShortName", "Sat").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::ShortName", "Sun" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::ShortName", "Sun").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Gregorian weekday 1 - KLocale::LongName", "Monday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 1 - KLocale::LongName", "Monday").toString(locale()); + case 2: +- return ki18nc( "Gregorian weekday 2 - KLocale::LongName", "Tuesday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 2 - KLocale::LongName", "Tuesday").toString(locale()); + case 3: +- return ki18nc( "Gregorian weekday 3 - KLocale::LongName", "Wednesday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 3 - KLocale::LongName", "Wednesday").toString(locale()); + case 4: +- return ki18nc( "Gregorian weekday 4 - KLocale::LongName", "Thursday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 4 - KLocale::LongName", "Thursday").toString(locale()); + case 5: +- return ki18nc( "Gregorian weekday 5 - KLocale::LongName", "Friday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 5 - KLocale::LongName", "Friday").toString(locale()); + case 6: +- return ki18nc( "Gregorian weekday 6 - KLocale::LongName", "Saturday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 6 - KLocale::LongName", "Saturday").toString(locale()); + case 7: +- return ki18nc( "Gregorian weekday 7 - KLocale::LongName", "Sunday" ).toString( locale() ); ++ return ki18nc("Gregorian weekday 7 - KLocale::LongName", "Sunday").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemHebrew::KCalendarSystemHebrew( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemHebrewPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemHebrew::KCalendarSystemHebrew(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemHebrewPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemHebrew::KCalendarSystemHebrew( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemHebrewPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemHebrew::KCalendarSystemHebrew(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemHebrewPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemHebrew::KCalendarSystemHebrew( KCalendarSystemHebrewPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemHebrew::KCalendarSystemHebrew(KCalendarSystemHebrewPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemHebrew::~KCalendarSystemHebrew() + { +- delete dont_use; + } + + QString KCalendarSystemHebrew::calendarType() const + { +- return QLatin1String( "hebrew" ); ++ return QLatin1String("hebrew"); + } + + QDate KCalendarSystemHebrew::epoch() const + { + // Hebrew 0001-01-01 (Gregorian -3760-09-07, Julian -3761-10-07) +- return QDate::fromJulianDay( 347998 ); ++ return QDate::fromJulianDay(347998); + } + + QDate KCalendarSystemHebrew::earliestValidDate() const +@@ -919,219 +915,88 @@ QDate KCalendarSystemHebrew::earliestValidDate() const + // Current formulas using direct Gregorian <-> Hebrew conversion using Qt + // will return invalid results prior to the Gregorian switchover in 1582 + // Next valid Hebrew year starts 5344-01-01 (Gregorian 1583-09-17) +- return QDate::fromJulianDay( 2299498 ); ++ return QDate::fromJulianDay(2299498); + } + + QDate KCalendarSystemHebrew::latestValidDate() const + { + // Testing shows current formulas only work up to 8119-13-29 (Gregorian 4359-10-07) +- return QDate::fromJulianDay( 3313431 ); ++ return QDate::fromJulianDay(3313431); + } + +-bool KCalendarSystemHebrew::isValid( int year, int month, int day ) const ++bool KCalendarSystemHebrew::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemHebrew::isValid( const QDate &date ) const ++bool KCalendarSystemHebrew::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemHebrew::setDate( QDate &date, int year, int month, int day ) const ++int KCalendarSystemHebrew::dayOfWeek(const QDate &date) const + { +- return KCalendarSystem::setDate( date, year, month, day ); +-} +- +-// Deprecated +-bool KCalendarSystemHebrew::setYMD( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setYMD( date, year, month, day ); +-} +- +-int KCalendarSystemHebrew::year( const QDate &date ) const +-{ +- return KCalendarSystem::year( date ); +-} +- +-int KCalendarSystemHebrew::month( const QDate &date ) const +-{ +- return KCalendarSystem::month( date ); +-} +- +-int KCalendarSystemHebrew::day( const QDate &date ) const +-{ +- return KCalendarSystem::day( date ); +-} +- +-QDate KCalendarSystemHebrew::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemHebrew::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemHebrew::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemHebrew::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemHebrew::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemHebrew::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemHebrew::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemHebrew::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemHebrew::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemHebrew::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemHebrew::dayOfWeek( const QDate &date ) const +-{ +- class h_date * sd = toHebrew( date ); +- if ( sd->hd_dw == 0 ) { ++ class h_date * sd = toHebrew(date); ++ if (sd->hd_dw == 0) { + return 7; + } else { +- return ( sd->hd_dw ); ++ return (sd->hd_dw); + } + } + +-int KCalendarSystemHebrew::weekNumber( const QDate &date, int *yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemHebrew::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemHebrew::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemHebrew::monthName( int month, int year, MonthNameFormat format ) const ++bool KCalendarSystemHebrew::isLeapYear(int year) const + { +- return KCalendarSystem::monthName( month, year, format ); ++ return KCalendarSystem::isLeapYear(year); + } + +-QString KCalendarSystemHebrew::monthName( const QDate &date, MonthNameFormat format ) const ++bool KCalendarSystemHebrew::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::monthName( date, format ); ++ return KCalendarSystem::isLeapYear(date); + } + +-QString KCalendarSystemHebrew::weekDayName( int weekDay, WeekDayNameFormat format ) const ++QString KCalendarSystemHebrew::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::weekDayName( weekDay, format ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-QString KCalendarSystemHebrew::weekDayName( const QDate &date, WeekDayNameFormat format ) const ++QString KCalendarSystemHebrew::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::weekDayName( date, format ); ++ return KCalendarSystem::monthName(date, format); + } + +-QString KCalendarSystemHebrew::yearString( const QDate &date, StringFormat format ) const ++QString KCalendarSystemHebrew::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::yearString( date, format ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-QString KCalendarSystemHebrew::monthString( const QDate &date, StringFormat format ) const ++QString KCalendarSystemHebrew::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::monthString( date, format ); ++ return KCalendarSystem::weekDayName(date, format); + } + +-QString KCalendarSystemHebrew::dayString( const QDate &date, StringFormat format ) const ++int KCalendarSystemHebrew::yearStringToInteger(const QString &string, int &readLength) const + { +- return KCalendarSystem::dayString( date, format ); +-} +- +-int KCalendarSystemHebrew::yearStringToInteger( const QString &string, int &readLength ) const +-{ +- int result = KCalendarSystem::yearStringToInteger( string, readLength ); ++ int result = KCalendarSystem::yearStringToInteger(string, readLength); + + // Hebrew has no letter for 0, so 5 and 5000 are written the same + // Assume if less than 10 then we are in an exact multiple of 1000 +- if ( result < 10 ) { ++ if (result < 10) { + result = result * 1000; + } + + // Not good just assuming, make configurable +- if ( result < 1000 ) { ++ if (result < 1000) { + result += 5000; // assume we're in the 6th millenium (y6k bug) + } + + return result; + } + +-int KCalendarSystemHebrew::monthStringToInteger( const QString &string, int &readLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( string, readLength ); +-} +- +-int KCalendarSystemHebrew::dayStringToInteger( const QString &string, int &readLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( string, readLength ); +-} +- +-QString KCalendarSystemHebrew::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemHebrew::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemHebrew::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemHebrew::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- + int KCalendarSystemHebrew::weekDayOfPray() const + { + return 6; // Saturday + } + +-int KCalendarSystemHebrew::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); +-} +- + bool KCalendarSystemHebrew::isLunar() const + { + return false; +@@ -1152,19 +1017,19 @@ bool KCalendarSystemHebrew::isProleptic() const + return false; + } + +-bool KCalendarSystemHebrew::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemHebrew::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- class h_date * sd = toHebrew( QDate::fromJulianDay( jd ) ); ++ class h_date * sd = toHebrew(QDate::fromJulianDay(jd)); + + year = sd->hd_year; + + month = sd->hd_mon; +- if ( isLeapYear( sd->hd_year ) ) { +- if( month == 13 /*AdarI*/ ) { ++ if (isLeapYear(sd->hd_year)) { ++ if (month == 13 /*AdarI*/) { + month = 6; +- } else if( month == 14 /*AdarII*/ ) { ++ } else if (month == 14 /*AdarII*/) { + month = 7; +- } else if ( month > 6 && month < 13 ) { ++ } else if (month > 6 && month < 13) { + ++month; + } + } +@@ -1174,11 +1039,11 @@ bool KCalendarSystemHebrew::julianDayToDate( int jd, int &year, int &month, int + return true; + } + +-bool KCalendarSystemHebrew::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemHebrew::dateToJulianDay(int year, int month, int day, int &jd) const + { +- class h_date * gd = hebrewToGregorian( year, month, day ); ++ class h_date * gd = hebrewToGregorian(year, month, day); + +- QDate tempDate( gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1 ); ++ QDate tempDate(gd->hd_year, gd->hd_mon + 1, gd->hd_day + 1); + + jd = tempDate.toJulianDay(); + +diff --git a/kdecore/date/kcalendarsystemhebrew_p.h b/kdecore/date/kcalendarsystemhebrew_p.h +index 72e82ec..3c3f7fb 100644 +--- a/kdecore/date/kcalendarsystemhebrew_p.h ++++ b/kdecore/date/kcalendarsystemhebrew_p.h +@@ -41,8 +41,8 @@ class KCalendarSystemHebrewPrivate; + class KCalendarSystemHebrew : public KCalendarSystem + { + public: +- explicit KCalendarSystemHebrew( const KLocale * locale = 0 ); +- explicit KCalendarSystemHebrew( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemHebrew(const KLocale * locale = 0); ++ explicit KCalendarSystemHebrew(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemHebrew(); + + virtual QString calendarType() const; +@@ -50,58 +50,23 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual int dayOfWeek(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; ++ virtual int yearStringToInteger(const QString &sNum, int &iLength) const; + +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -109,15 +74,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemHebrew( KCalendarSystemHebrewPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemHebrew(KCalendarSystemHebrewPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemHebrew ) +- KCalendarSystemHebrewPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemHebrew) + }; + + #endif // KCALENDARSYSTEMHEBREW_H +diff --git a/kdecore/date/kcalendarsystemhijri.cpp b/kdecore/date/kcalendarsystemhijri.cpp +deleted file mode 100644 +index 2af04ea..0000000 +--- a/kdecore/date/kcalendarsystemhijri.cpp ++++ /dev/null +@@ -1,741 +0,0 @@ +-/* +- Copyright (c) 2002-2003 Carlos Moro <cfmoro@correo.uniovi.es> +- Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> +- Copyright 2007, 2008, 2009, 2010 John Layt <john@layt.net> +- +- 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; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#include "kcalendarsystemhijri_p.h" +-#include "kcalendarsystemprivate_p.h" +- +-#include <QtCore/QDate> +- +-class KCalendarSystemHijriPrivate : public KCalendarSystemPrivate +-{ +-public: +- explicit KCalendarSystemHijriPrivate( KCalendarSystemHijri *q ); +- +- virtual ~KCalendarSystemHijriPrivate(); +- +- // Virtual methods each calendar system must re-implement +- virtual KLocale::CalendarSystem calendarSystem() const; +- virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; +- virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; +- virtual bool hasLeapMonths() const; +- virtual bool hasYearZero() const; +- virtual int maxDaysInWeek() const; +- virtual int maxMonthsInYear() const; +- virtual int earliestValidYear() const; +- virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; +-}; +- +-// Shared d pointer base class definitions +- +-KCalendarSystemHijriPrivate::KCalendarSystemHijriPrivate( KCalendarSystemHijri *q ) +- :KCalendarSystemPrivate( q ) +-{ +-} +- +-KCalendarSystemHijriPrivate::~KCalendarSystemHijriPrivate() +-{ +-} +- +-KLocale::CalendarSystem KCalendarSystemHijriPrivate::calendarSystem() const +-{ +- return KLocale::IslamicCivilCalendar; +-} +- +-void KCalendarSystemHijriPrivate::loadDefaultEraList() +-{ +- QString name, shortName, format; +- // Islamic Era, Anno Hegirae, "Year of the Hijra". +- name = i18nc( "Calendar Era: Hijri Islamic Era, years > 0, LongFormat", "Anno Hegirae" ); +- shortName = i18nc( "Calendar Era: Hijri Islamic Era, years > 0, ShortFormat", "AH" ); +- format = i18nc( "(kdedt-format) Hijri, AH, full era year format used for %EY, e.g. 2000 AH", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); +-} +- +-int KCalendarSystemHijriPrivate::monthsInYear( int year ) const +-{ +- Q_UNUSED( year ) +- return 12; +-} +- +-int KCalendarSystemHijriPrivate::daysInMonth( int year, int month ) const +-{ +- if ( month == 12 && isLeapYear( year ) ) { +- return 30; +- } +- +- if ( month % 2 == 0 ) { // Even number months have 29 days +- return 29; +- } else { // Odd number months have 30 days +- return 30; +- } +-} +- +-int KCalendarSystemHijriPrivate::daysInYear( int year ) const +-{ +- if ( isLeapYear( year ) ) { +- return 355; +- } else { +- return 354; +- } +-} +- +-int KCalendarSystemHijriPrivate::daysInWeek() const +-{ +- return 7; +-} +- +-bool KCalendarSystemHijriPrivate::isLeapYear( int year ) const +-{ +- // Years 2, 5, 7, 10, 13, 16, 18, 21, 24, 26, 29 of the 30 year cycle +- +- /* +- The following C++ code is translated from the Lisp code +- in ``Calendrical Calculations'' by Nachum Dershowitz and +- Edward M. Reingold, Software---Practice & Experience, +- vol. 20, no. 9 (September, 1990), pp. 899--928. +- +- This code is in the public domain, but any use of it +- should publically acknowledge its source. +- */ +- +- if ( ( ( ( 11 * year ) + 14 ) % 30 ) < 11 ) { +- return true; +- } else { +- return false; +- } +- +- // The following variations will be implemented in separate classes in 4.5 +- // May be cleaner to formally define using a case statement switch on (year % 30) +- +- // Variation used by Bar Habraeus / Graves / Birashk / Some Microsoft products +- // Years 2, 5, 7, 10, 13, 15, 18, 21, 24, 26, 29 of the 30 year cycle +- // if ( ( ( ( 11 * year ) + 15 ) % 30 ) < 11 ) { +- +- // Variation used by Bohras / Sahifa with epoch 15 July 622 jd = 1948440 +- // Years 2, 5, 8, 10, 13, 16, 19, 21, 24, 27, 29 of the 30 year cycle +- // if ( ( ( ( 11 * year ) + 1 ) % 30 ) < 11 ) { +-} +- +-bool KCalendarSystemHijriPrivate::hasLeapMonths() const +-{ +- return false; +-} +- +-bool KCalendarSystemHijriPrivate::hasYearZero() const +-{ +- return false; +-} +- +-int KCalendarSystemHijriPrivate::maxDaysInWeek() const +-{ +- return 7; +-} +- +-int KCalendarSystemHijriPrivate::maxMonthsInYear() const +-{ +- return 12; +-} +- +-int KCalendarSystemHijriPrivate::earliestValidYear() const +-{ +- return 1; +-} +- +-int KCalendarSystemHijriPrivate::latestValidYear() const +-{ +- return 9999; +-} +- +-QString KCalendarSystemHijriPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const +-{ +- Q_UNUSED( year ); +- +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::NarrowName", "M" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::NarrowName", "S" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::NarrowName", "A" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::NarrowName", "T" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::NarrowName", "A" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::NarrowName", "T" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::NarrowName", "R" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::NarrowName", "S" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::NarrowName", "R" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::NarrowName", "S" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::NarrowName", "Q" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::NarrowName", "H" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::ShortName Possessive", "of Muh" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::ShortName Possessive", "of Saf" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::ShortName Possessive", "of R.A" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::ShortName Possessive", "of R.T" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::ShortName Possessive", "of J.A" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::ShortName Possessive", "of J.T" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::ShortName Possessive", "of Raj" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::ShortName Possessive", "of Sha" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::ShortName Possessive", "of Ram" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::ShortName Possessive", "of Shw" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::ShortName Possessive", "of Qid" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::ShortName Possessive", "of Hij" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::ShortName", "Muh" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::ShortName", "Saf" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::ShortName", "R.A" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::ShortName", "R.T" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::ShortName", "J.A" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::ShortName", "J.T" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::ShortName", "Raj" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::ShortName", "Sha" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::ShortName", "Ram" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::ShortName", "Shw" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::ShortName", "Qid" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::ShortName", "Hij" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::LongName Possessive", "of Muharram" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::LongName Possessive", "of Safar" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::LongName Possessive", "of Rabi` al-Awal" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::LongName Possessive", "of Rabi` al-Thaani" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::LongName Possessive", "of Jumaada al-Awal" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::LongName Possessive", "of Jumaada al-Thaani" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::LongName Possessive", "of Rajab" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::LongName Possessive", "of Sha`ban" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::LongName Possessive", "of Ramadan" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::LongName Possessive", "of Shawwal" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::LongName Possessive", "of Thu al-Qi`dah" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::LongName Possessive", "of Thu al-Hijjah" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- // Default to LongName +- switch ( month ) { +- case 1: +- return ki18nc( "Hijri month 1 - KLocale::LongName", "Muharram" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri month 2 - KLocale::LongName", "Safar" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri month 3 - KLocale::LongName", "Rabi` al-Awal" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri month 4 - KLocale::LongName", "Rabi` al-Thaani" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri month 5 - KLocale::LongName", "Jumaada al-Awal" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri month 6 - KLocale::LongName", "Jumaada al-Thaani" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri month 7 - KLocale::LongName", "Rajab" ).toString( locale() ); +- case 8: +- return ki18nc( "Hijri month 8 - KLocale::LongName", "Sha`ban" ).toString( locale() ); +- case 9: +- return ki18nc( "Hijri month 9 - KLocale::LongName", "Ramadan" ).toString( locale() ); +- case 10: +- return ki18nc( "Hijri month 10 - KLocale::LongName", "Shawwal" ).toString( locale() ); +- case 11: +- return ki18nc( "Hijri month 11 - KLocale::LongName", "Thu al-Qi`dah" ).toString( locale() ); +- case 12: +- return ki18nc( "Hijri month 12 - KLocale::LongName", "Thu al-Hijjah" ).toString( locale() ); +- default: +- return QString(); +- } +-} +- +-QString KCalendarSystemHijriPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const +-{ +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Hijri weekday 1 - KLocale::NarrowName ", "I" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri weekday 3 - KLocale::NarrowName ", "A" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri weekday 4 - KLocale::NarrowName ", "K" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri weekday 5 - KLocale::NarrowName ", "J" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri weekday 7 - KLocale::NarrowName ", "A" ).toString( locale() ); +- default: +- return QString(); +- } +- } +- +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Hijri weekday 1 - KLocale::ShortName", "Ith" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri weekday 2 - KLocale::ShortName", "Thl" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri weekday 3 - KLocale::ShortName", "Arb" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri weekday 4 - KLocale::ShortName", "Kha" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri weekday 5 - KLocale::ShortName", "Jum" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri weekday 6 - KLocale::ShortName", "Sab" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri weekday 7 - KLocale::ShortName", "Ahd" ).toString( locale() ); +- default: return QString(); +- } +- } +- +- switch ( weekDay ) { +- case 1: +- return ki18nc( "Hijri weekday 1 - KLocale::LongName", "Yaum al-Ithnain" ).toString( locale() ); +- case 2: +- return ki18nc( "Hijri weekday 2 - KLocale::LongName", "Yau al-Thulatha" ).toString( locale() ); +- case 3: +- return ki18nc( "Hijri weekday 3 - KLocale::LongName", "Yaum al-Arbi'a" ).toString( locale() ); +- case 4: +- return ki18nc( "Hijri weekday 4 - KLocale::LongName", "Yaum al-Khamees" ).toString( locale() ); +- case 5: +- return ki18nc( "Hijri weekday 5 - KLocale::LongName", "Yaum al-Jumma" ).toString( locale() ); +- case 6: +- return ki18nc( "Hijri weekday 6 - KLocale::LongName", "Yaum al-Sabt" ).toString( locale() ); +- case 7: +- return ki18nc( "Hijri weekday 7 - KLocale::LongName", "Yaum al-Ahad" ).toString( locale() ); +- default: +- return QString(); +- } +-} +- +- +-KCalendarSystemHijri::KCalendarSystemHijri( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemHijriPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemHijri::KCalendarSystemHijri( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemHijriPrivate( this ), config, locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemHijri::KCalendarSystemHijri( KCalendarSystemHijriPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) +-{ +- d_ptr->loadConfig( calendarType() ); +-} +- +-KCalendarSystemHijri::~KCalendarSystemHijri() +-{ +- delete dont_use; +-} +- +-QString KCalendarSystemHijri::calendarType() const +-{ +- return QLatin1String( "hijri" ); +-} +- +-QDate KCalendarSystemHijri::epoch() const +-{ +- // 16 July 622 in the Julian calendar +- return QDate::fromJulianDay( 1948440 ); +-} +- +-QDate KCalendarSystemHijri::earliestValidDate() const +-{ +- return epoch(); +-} +- +-QDate KCalendarSystemHijri::latestValidDate() const +-{ +- // Set to last day of year 9999 +- // Last day of Hijri year 9999 is 9999-12-29 +- return QDate::fromJulianDay( 5491751 ); +-} +- +-bool KCalendarSystemHijri::isValid( int year, int month, int day ) const +-{ +- return KCalendarSystem::isValid( year, month, day ); +-} +- +-bool KCalendarSystemHijri::isValid( const QDate &date ) const +-{ +- return KCalendarSystem::isValid( date ); +-} +- +-bool KCalendarSystemHijri::setDate( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setDate( date, year, month, day ); +-} +- +-// Deprecated +-bool KCalendarSystemHijri::setYMD( QDate &date, int year, int month, int day ) const +-{ +- return KCalendarSystem::setYMD( date, year, month, day ); +-} +- +-int KCalendarSystemHijri::year( const QDate &date ) const +-{ +- return KCalendarSystem::year( date ); +-} +- +-int KCalendarSystemHijri::month( const QDate &date ) const +-{ +- return KCalendarSystem::month( date ); +-} +- +-int KCalendarSystemHijri::day( const QDate &date ) const +-{ +- return KCalendarSystem::day( date ); +-} +- +-QDate KCalendarSystemHijri::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemHijri::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemHijri::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemHijri::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemHijri::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemHijri::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemHijri::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemHijri::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemHijri::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemHijri::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemHijri::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemHijri::weekNumber( const QDate &date, int *yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemHijri::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemHijri::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemHijri::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemHijri::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemHijri::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemHijri::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemHijri::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemHijri::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemHijri::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemHijri::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemHijri::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemHijri::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemHijri::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemHijri::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemHijri::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemHijri::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemHijri::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); +-} +- +-int KCalendarSystemHijri::weekDayOfPray() const +-{ +- return 5; // Friday +-} +- +-bool KCalendarSystemHijri::isLunar() const +-{ +- return true; +-} +- +-bool KCalendarSystemHijri::isLunisolar() const +-{ +- return false; +-} +- +-bool KCalendarSystemHijri::isSolar() const +-{ +- return false; +-} +- +-bool KCalendarSystemHijri::isProleptic() const +-{ +- return false; +-} +- +-bool KCalendarSystemHijri::julianDayToDate( int jd, int &year, int &month, int &day ) const +-{ +- Q_D( const KCalendarSystemHijri ); +- +- /* +- The following C++ code is translated from the Lisp code +- in ``Calendrical Calculations'' by Nachum Dershowitz and +- Edward M. Reingold, Software---Practice & Experience, +- vol. 20, no. 9 (September, 1990), pp. 899--928. +- +- This code is in the public domain, but any use of it +- should publically acknowledge its source. +- */ +- +- // Search forward year by year from approximate year +- year = ( jd - epoch().toJulianDay() ) / 355; +- int testJd; +- dateToJulianDay( year, 12, d->daysInMonth( year, 12 ), testJd ); +- while ( jd > testJd ) { +- year++; +- dateToJulianDay( year, 12, d->daysInMonth( year, 12 ), testJd ); +- } +- +- // Search forward month by month from Muharram +- month = 1; +- dateToJulianDay( year, month, d->daysInMonth( year, month ), testJd ); +- while ( jd > testJd ) { +- month++; +- dateToJulianDay( year, month, d->daysInMonth( year, month ), testJd ); +- } +- +- dateToJulianDay( year, month, 1, testJd ); +- day = jd - testJd + 1; +- +- return true; +- +- // Alternative implementations +- +- // More recent editions of "Calendrical Calculations" by Dershowitz & Reingold have a more +- // efficient direct calculation without recusrion, but this cannot be used due to licensing +- +- /* +- Formula from "Explanatory Supplement to the Astronomical Almanac" 2006, derived from Fliegel & Van Flandern 1968 +- int L = jd - epoch().toJulianDay() + 10632; +- int N = ( L - 1 ) / 10631; +- L = L - 10631 * N + 354; +- int J = ( ( 10985 - L ) / 5316 ) x ( ( 50* L ) / 17719 ) + ( L / 5670 ) * ( ( 43 * L ) / 15238 ); +- L = L - ( ( 30 - J ) / 15 ) * ( ( 17719 * J ) / 50 ) - ( J / 16 ) * ( ( 15238 * J ) / 43 ) + 29; +- year = ( 30 * N ) + J - 30; +- month = ( 24 * L ) / 709; +- day = L - ( ( 709 * month ) / 24 ); +- */ +- +- /* +- Formula from Fourmilab website +- jd = Math.floor(jd) + 0.5; +- year = Math.floor(((30 * (jd - epoch().toJulianDay())) + 10646) / 10631); +- month = qMin(12, Math.ceil((jd - (29 + islamic_to_jd(year, 1, 1))) / 29.5) + 1); +- day = (jd - islamic_to_jd(year, month, 1)) + 1; +- */ +-} +- +-bool KCalendarSystemHijri::dateToJulianDay( int year, int month, int day, int &jd ) const +-{ +- /* +- The following C++ code is translated from the Lisp code +- in ``Calendrical Calculations'' by Nachum Dershowitz and +- Edward M. Reingold, Software---Practice & Experience, +- vol. 20, no. 9 (September, 1990), pp. 899--928. +- +- This code is in the public domain, but any use of it +- should publically acknowledge its source. +- */ +- +- jd = epoch().toJulianDay() - 1 + // days before start of calendar +- ( year - 1 ) * 354 + // non-leap days in prior years +- ( 3 + ( 11 * year ) ) / 30 + // leap days in prior years +- 29 * ( month - 1 ) + // days so far... +- month / 2 + // ...this year +- day; // days so far this month +- +- return true; +- +- // Alternative implementations +- +- /* +- Formula from "Explanatory Supplement to the Astronomical Almanac" 2006, derived from Fliegel & Van Flandern 1968 +- jd = ( 3 + ( 11 * year ) ) / 30 + 354 * year + 30 * month - ( month - 1 ) / 2 + day + epoch().toJulianDay() - 385; +- */ +-} +diff --git a/kdecore/date/kcalendarsystemhijri_p.h b/kdecore/date/kcalendarsystemhijri_p.h +deleted file mode 100644 +index 8204683..0000000 +--- a/kdecore/date/kcalendarsystemhijri_p.h ++++ /dev/null +@@ -1,124 +0,0 @@ +-/* +- Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> +- Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> +- Copyright 2007, 2010 John Layt <john@layt.net> +- +- 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; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#ifndef KCALENDARSYSTEMHIJRI_H +-#define KCALENDARSYSTEMHIJRI_H +- +-#include "kcalendarsystem.h" +- +-class KCalendarSystemHijriPrivate; +- +-/** +- * @internal +- * This is the Hijri calendar implementation. +- * +- * The Hijri calendar is the traditional Islamic calendar used in the Middle +- * East. +- * +- * @b license GNU-LGPL v2+ +- * +- * @see KLocale,KCalendarSystem +- * +- * @author Carlos Moro <cfmoro@correo.uniovi.es> +- */ +-class KCalendarSystemHijri : public KCalendarSystem +-{ +-public: +- explicit KCalendarSystemHijri( const KLocale *locale = 0 ); +- explicit KCalendarSystemHijri( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); +- virtual ~KCalendarSystemHijri(); +- +- virtual QString calendarType() const; +- +- virtual QDate epoch() const; +- virtual QDate earliestValidDate() const; +- virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; +- +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; +- +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; +- +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; +- +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; +- +- virtual bool isLunar() const; +- virtual bool isLunisolar() const; +- virtual bool isSolar() const; +- virtual bool isProleptic() const; +- +-protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemHijri( KCalendarSystemHijriPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); +- +-private: +- Q_DECLARE_PRIVATE( KCalendarSystemHijri ) +- KCalendarSystemHijriPrivate * const dont_use; // KDE5 remove, use shared d +-}; +- +-#endif // KCALENDARSYSTEMHIJRI_H +diff --git a/kdecore/date/kcalendarsystemindiannational.cpp b/kdecore/date/kcalendarsystemindiannational.cpp +index 2bd3643..f5b79f2 100644 +--- a/kdecore/date/kcalendarsystemindiannational.cpp ++++ b/kdecore/date/kcalendarsystemindiannational.cpp +@@ -29,32 +29,32 @@ + class KCalendarSystemIndianNationalPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemIndianNationalPrivate( KCalendarSystemIndianNational *q ); ++ explicit KCalendarSystemIndianNationalPrivate(KCalendarSystemIndianNational *q); + + virtual ~KCalendarSystemIndianNationalPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + }; + + // Shared d pointer base class definitions + +-KCalendarSystemIndianNationalPrivate::KCalendarSystemIndianNationalPrivate( KCalendarSystemIndianNational *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemIndianNationalPrivate::KCalendarSystemIndianNationalPrivate(KCalendarSystemIndianNational *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -71,38 +71,38 @@ void KCalendarSystemIndianNationalPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // Saka Era +- name = i18nc( "Calendar Era: Indian National Saka Era, years > 0, LongFormat", "Saka Era" ); +- shortName = i18nc( "Calendar Era: Indian National Saka Era, years > 0, ShortFormat", "SE" ); +- format = i18nc( "(kdedt-format) Indian National, SE, full era year format used for %EY, e.g. 2000 SE", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Indian National Saka Era, years > 0, LongFormat", "Saka Era"); ++ shortName = i18nc("Calendar Era: Indian National Saka Era, years > 0, ShortFormat", "SE"); ++ format = i18nc("(kdedt-format) Indian National, SE, full era year format used for %EY, e.g. 2000 SE", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemIndianNationalPrivate::monthsInYear( int year ) const ++int KCalendarSystemIndianNationalPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + +-int KCalendarSystemIndianNationalPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemIndianNationalPrivate::daysInMonth(int year, int month) const + { +- if ( month == 1 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 1) { ++ if (isLeapYear(year)) { + return 31; + } else { + return 30; + } + } + +- if ( month >= 2 && month <= 6 ) { ++ if (month >= 2 && month <= 6) { + return 31; + } + + return 30; + } + +-int KCalendarSystemIndianNationalPrivate::daysInYear( int year ) const ++int KCalendarSystemIndianNationalPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -114,19 +114,19 @@ int KCalendarSystemIndianNationalPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemIndianNationalPrivate::isLeapYear( int year ) const ++bool KCalendarSystemIndianNationalPrivate::isLeapYear(int year) const + { + //Uses same rule as Gregorian, and is explicitly synchronized to Gregorian + //so add 78 years to get Gregorian year and apply Gregorian calculation + year = year + 78; +- if ( !hasYearZero() && year < 1 ) { ++ if (!hasYearZero() && year < 1) { + year = year + 1; + } + +- if ( year % 4 == 0 ) { +- if ( year % 100 != 0 ) { ++ if (year % 4 == 0) { ++ if (year % 100 != 0) { + return true; +- } else if ( year % 400 == 0 ) { ++ } else if (year % 400 == 0) { + return true; + } + } +@@ -164,267 +164,263 @@ int KCalendarSystemIndianNationalPrivate::latestValidYear() const + return 9999; + } + +-QString KCalendarSystemIndianNationalPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemIndianNationalPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::NarrowName", "C" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::NarrowName", "C").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::NarrowName", "V" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::NarrowName", "V").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::NarrowName", "J").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::NarrowName", "Ā" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::NarrowName", "Ā").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::NarrowName", "S").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::NarrowName", "B" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::NarrowName", "B").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::NarrowName", "Ā" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::NarrowName", "Ā").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::NarrowName", "K").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::NarrowName", "A").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::NarrowName", "P").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::NarrowName", "M").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::NarrowName", "P" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::NarrowName", "P").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::ShortName Possessive", "of Cha" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::ShortName Possessive", "of Cha").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::ShortName Possessive", "of Vai" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::ShortName Possessive", "of Vai").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::ShortName Possessive", "of Jya" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::ShortName Possessive", "of Jya").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::ShortName Possessive", "of Āsh" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::ShortName Possessive", "of Āsh").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::ShortName Possessive", "of Shr" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::ShortName Possessive", "of Shr").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::ShortName Possessive", "of Bhā" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::ShortName Possessive", "of Bhā").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::ShortName Possessive", "of Āsw" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::ShortName Possessive", "of Āsw").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::ShortName Possessive", "of Kār" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::ShortName Possessive", "of Kār").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::ShortName Possessive", "of Agr" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::ShortName Possessive", "of Agr").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::ShortName Possessive", "of Pau" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::ShortName Possessive", "of Pau").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::ShortName Possessive", "of Māg" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::ShortName Possessive", "of Māg").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::ShortName Possessive", "of Phā" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::ShortName Possessive", "of Phā").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::ShortName", "Cha" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::ShortName", "Cha").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::ShortName", "Vai" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::ShortName", "Vai").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::ShortName", "Jya" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::ShortName", "Jya").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::ShortName", "Āsh" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::ShortName", "Āsh").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::ShortName", "Shr" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::ShortName", "Shr").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::ShortName", "Bhā" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::ShortName", "Bhā").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::ShortName", "Āsw" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::ShortName", "Āsw").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::ShortName", "Kār" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::ShortName", "Kār").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::ShortName", "Agr" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::ShortName", "Agr").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::ShortName", "Pau" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::ShortName", "Pau").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::ShortName", "Māg" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::ShortName", "Māg").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::ShortName", "Phā" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::ShortName", "Phā").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::LongName Possessive", "of Chaitra" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::LongName Possessive", "of Chaitra").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::LongName Possessive", "of Vaishākh" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::LongName Possessive", "of Vaishākh").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::LongName Possessive", "of Jyaishtha" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::LongName Possessive", "of Jyaishtha").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::LongName Possessive", "of Āshādha" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::LongName Possessive", "of Āshādha").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::LongName Possessive", "of Shrāvana" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::LongName Possessive", "of Shrāvana").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::LongName Possessive", "of Bhādrapad" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::LongName Possessive", "of Bhādrapad").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::LongName Possessive", "of Āshwin" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::LongName Possessive", "of Āshwin").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::LongName Possessive", "of Kārtik" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::LongName Possessive", "of Kārtik").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::LongName Possessive", "of Agrahayana" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::LongName Possessive", "of Agrahayana").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::LongName Possessive", "of Paush" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::LongName Possessive", "of Paush").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::LongName Possessive", "of Māgh" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::LongName Possessive", "of Māgh").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::LongName Possessive", "of Phālgun" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::LongName Possessive", "of Phālgun").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Indian National month 1 - KLocale::LongName", "Chaitra" ).toString( locale() ); ++ return ki18nc("Indian National month 1 - KLocale::LongName", "Chaitra").toString(locale()); + case 2: +- return ki18nc( "Indian National month 2 - KLocale::LongName", "Vaishākh" ).toString( locale() ); ++ return ki18nc("Indian National month 2 - KLocale::LongName", "Vaishākh").toString(locale()); + case 3: +- return ki18nc( "Indian National month 3 - KLocale::LongName", "Jyaishtha" ).toString( locale() ); ++ return ki18nc("Indian National month 3 - KLocale::LongName", "Jyaishtha").toString(locale()); + case 4: +- return ki18nc( "Indian National month 4 - KLocale::LongName", "Āshādha" ).toString( locale() ); ++ return ki18nc("Indian National month 4 - KLocale::LongName", "Āshādha").toString(locale()); + case 5: +- return ki18nc( "Indian National month 5 - KLocale::LongName", "Shrāvana" ).toString( locale() ); ++ return ki18nc("Indian National month 5 - KLocale::LongName", "Shrāvana").toString(locale()); + case 6: +- return ki18nc( "Indian National month 6 - KLocale::LongName", "Bhādrapad" ).toString( locale() ); ++ return ki18nc("Indian National month 6 - KLocale::LongName", "Bhādrapad").toString(locale()); + case 7: +- return ki18nc( "Indian National month 7 - KLocale::LongName", "Āshwin" ).toString( locale() ); ++ return ki18nc("Indian National month 7 - KLocale::LongName", "Āshwin").toString(locale()); + case 8: +- return ki18nc( "Indian National month 8 - KLocale::LongName", "Kārtik" ).toString( locale() ); ++ return ki18nc("Indian National month 8 - KLocale::LongName", "Kārtik").toString(locale()); + case 9: +- return ki18nc( "Indian National month 9 - KLocale::LongName", "Agrahayana" ).toString( locale() ); ++ return ki18nc("Indian National month 9 - KLocale::LongName", "Agrahayana").toString(locale()); + case 10: +- return ki18nc( "Indian National month 10 - KLocale::LongName", "Paush" ).toString( locale() ); ++ return ki18nc("Indian National month 10 - KLocale::LongName", "Paush").toString(locale()); + case 11: +- return ki18nc( "Indian National month 11 - KLocale::LongName", "Māgh" ).toString( locale() ); ++ return ki18nc("Indian National month 11 - KLocale::LongName", "Māgh").toString(locale()); + case 12: +- return ki18nc( "Indian National month 12 - KLocale::LongName", "Phālgun" ).toString( locale() ); ++ return ki18nc("Indian National month 12 - KLocale::LongName", "Phālgun").toString(locale()); + default: + return QString(); + } + } + +-QString KCalendarSystemIndianNationalPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemIndianNationalPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Indian National weekday 1 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Indian National weekday 1 - KLocale::NarrowName ", "S").toString(locale()); + case 2: +- return ki18nc( "Indian National weekday 2 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Indian National weekday 2 - KLocale::NarrowName ", "M").toString(locale()); + case 3: +- return ki18nc( "Indian National weekday 3 - KLocale::NarrowName ", "B" ).toString( locale() ); ++ return ki18nc("Indian National weekday 3 - KLocale::NarrowName ", "B").toString(locale()); + case 4: +- return ki18nc( "Indian National weekday 4 - KLocale::NarrowName ", "G" ).toString( locale() ); ++ return ki18nc("Indian National weekday 4 - KLocale::NarrowName ", "G").toString(locale()); + case 5: +- return ki18nc( "Indian National weekday 5 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Indian National weekday 5 - KLocale::NarrowName ", "S").toString(locale()); + case 6: +- return ki18nc( "Indian National weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Indian National weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Indian National weekday 7 - KLocale::NarrowName ", "R" ).toString( locale() ); ++ return ki18nc("Indian National weekday 7 - KLocale::NarrowName ", "R").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Indian National weekday 1 - KLocale::ShortName", "Som" ).toString( locale() ); ++ return ki18nc("Indian National weekday 1 - KLocale::ShortName", "Som").toString(locale()); + case 2: +- return ki18nc( "Indian National weekday 2 - KLocale::ShortName", "Mañ" ).toString( locale() ); ++ return ki18nc("Indian National weekday 2 - KLocale::ShortName", "Mañ").toString(locale()); + case 3: +- return ki18nc( "Indian National weekday 3 - KLocale::ShortName", "Bud" ).toString( locale() ); ++ return ki18nc("Indian National weekday 3 - KLocale::ShortName", "Bud").toString(locale()); + case 4: +- return ki18nc( "Indian National weekday 4 - KLocale::ShortName", "Gur" ).toString( locale() ); ++ return ki18nc("Indian National weekday 4 - KLocale::ShortName", "Gur").toString(locale()); + case 5: +- return ki18nc( "Indian National weekday 5 - KLocale::ShortName", "Suk" ).toString( locale() ); ++ return ki18nc("Indian National weekday 5 - KLocale::ShortName", "Suk").toString(locale()); + case 6: +- return ki18nc( "Indian National weekday 6 - KLocale::ShortName", "San" ).toString( locale() ); ++ return ki18nc("Indian National weekday 6 - KLocale::ShortName", "San").toString(locale()); + case 7: +- return ki18nc( "Indian National weekday 7 - KLocale::ShortName", "Rav" ).toString( locale() ); ++ return ki18nc("Indian National weekday 7 - KLocale::ShortName", "Rav").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Indian National weekday 1 - KLocale::LongName", "Somavãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 1 - KLocale::LongName", "Somavãra").toString(locale()); + case 2: +- return ki18nc( "Indian National weekday 2 - KLocale::LongName", "Mañgalvã" ).toString( locale() ); ++ return ki18nc("Indian National weekday 2 - KLocale::LongName", "Mañgalvã").toString(locale()); + case 3: +- return ki18nc( "Indian National weekday 3 - KLocale::LongName", "Budhavãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 3 - KLocale::LongName", "Budhavãra").toString(locale()); + case 4: +- return ki18nc( "Indian National weekday 4 - KLocale::LongName", "Guruvãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 4 - KLocale::LongName", "Guruvãra").toString(locale()); + case 5: +- return ki18nc( "Indian National weekday 5 - KLocale::LongName", "Sukravãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 5 - KLocale::LongName", "Sukravãra").toString(locale()); + case 6: +- return ki18nc( "Indian National weekday 6 - KLocale::LongName", "Sanivãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 6 - KLocale::LongName", "Sanivãra").toString(locale()); + case 7: +- return ki18nc( "Indian National weekday 7 - KLocale::LongName", "Raviãra" ).toString( locale() ); ++ return ki18nc("Indian National weekday 7 - KLocale::LongName", "Raviãra").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemIndianNational::KCalendarSystemIndianNational( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemIndianNationalPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemIndianNational::KCalendarSystemIndianNational(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemIndianNationalPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemIndianNational::KCalendarSystemIndianNational( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemIndianNationalPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemIndianNational::KCalendarSystemIndianNational(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemIndianNationalPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemIndianNational::KCalendarSystemIndianNational( KCalendarSystemIndianNationalPrivate &dd, +- const KSharedConfig::Ptr config, +- const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemIndianNational::KCalendarSystemIndianNational(KCalendarSystemIndianNationalPrivate &dd, ++ const KSharedConfig::Ptr config, ++ const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemIndianNational::~KCalendarSystemIndianNational() + { +- delete dont_use; + } + + QString KCalendarSystemIndianNational::calendarType() const + { +- return QLatin1String( "indian-national" ); ++ return QLatin1String("indian-national"); + } + + QDate KCalendarSystemIndianNational::epoch() const + { + //0000-01-01, has Year 0. + //0078-03-22 AD Gregorian / 0078-03-24 AD Julian +- return QDate::fromJulianDay( 1749994 ); ++ return QDate::fromJulianDay(1749994); + } + + QDate KCalendarSystemIndianNational::earliestValidDate() const +@@ -432,7 +428,7 @@ QDate KCalendarSystemIndianNational::earliestValidDate() const + //0000-01-01, has Year 0. + //0078-03-22 AD Gregorian / 0078-03-24 AD Julian + //Don't do proleptic yet, need to check +- return QDate::fromJulianDay( 1749630 ); ++ return QDate::fromJulianDay(1749630); + } + + QDate KCalendarSystemIndianNational::latestValidDate() const +@@ -440,188 +436,47 @@ QDate KCalendarSystemIndianNational::latestValidDate() const + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + //9999-12-30 + //10078-03-21 AD Gregorian +- return QDate::fromJulianDay( 5402054 ); ++ return QDate::fromJulianDay(5402054); + } + +-bool KCalendarSystemIndianNational::isValid( int year, int month, int day ) const ++bool KCalendarSystemIndianNational::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemIndianNational::isValid( const QDate &date ) const ++bool KCalendarSystemIndianNational::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemIndianNational::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemIndianNational::isLeapYear(int year) const + { +- return KCalendarSystem::setDate( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemIndianNational::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemIndianNational::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::setDate( date, y, m, d ); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemIndianNational::year( const QDate &date ) const ++QString KCalendarSystemIndianNational::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::year( date ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemIndianNational::month( const QDate &date ) const ++QString KCalendarSystemIndianNational::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::month( date ); ++ return KCalendarSystem::monthName(date, format); + } + +-int KCalendarSystemIndianNational::day( const QDate &date ) const ++QString KCalendarSystemIndianNational::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::day( date ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemIndianNational::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemIndianNational::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemIndianNational::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemIndianNational::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemIndianNational::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemIndianNational::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemIndianNational::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemIndianNational::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemIndianNational::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemIndianNational::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemIndianNational::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemIndianNational::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemIndianNational::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemIndianNational::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemIndianNational::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemIndianNational::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemIndianNational::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemIndianNational::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemIndianNational::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemIndianNational::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemIndianNational::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemIndianNational::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemIndianNational::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemIndianNational::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemIndianNational::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemIndianNational::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemIndianNational::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemIndianNational::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemIndianNational::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemIndianNational::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::weekDayName(date, format); + } + + int KCalendarSystemIndianNational::weekDayOfPray() const +@@ -649,22 +504,22 @@ bool KCalendarSystemIndianNational::isProleptic() const + return false; + } + +-bool KCalendarSystemIndianNational::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemIndianNational::julianDayToDate(int jd, int &year, int &month, int &day) const + { + int L, N, I, J, D, M, Y; + + // "Explanatory Supplement to the Astronomical Almanac" 2006 section 12.94 pp 605-606 + // Originally from "Report of the Calendar Reform Committee" 1955 + L = jd + 68518; +- N = ( 4 * L ) / 146097; +- L = L - ( 146097 * N + 3 ) / 4; +- I = ( 4000 * ( L + 1 ) ) / 1461001; +- L = L - ( 1461 * I ) / 4 + 1; +- J = ( ( L - 1 ) / 31 ) * ( 1 - L / 185 ) + ( L / 185 ) * ( ( L - 156 ) / 30 + 5 ) - L / 366; +- D = L - 31 * J + ( ( J + 2 ) / 8 ) * ( J - 5 ); ++ N = (4 * L) / 146097; ++ L = L - (146097 * N + 3) / 4; ++ I = (4000 * (L + 1)) / 1461001; ++ L = L - (1461 * I) / 4 + 1; ++ J = ((L - 1) / 31) * (1 - L / 185) + (L / 185) * ((L - 156) / 30 + 5) - L / 366; ++ D = L - 31 * J + ((J + 2) / 8) * (J - 5); + L = J / 11; + M = J + 2 - 12 * L; +- Y = 100 * ( N - 49 ) + L + I - 78; ++ Y = 100 * (N - 49) + L + I - 78; + + day = D; + month = M; +@@ -673,7 +528,7 @@ bool KCalendarSystemIndianNational::julianDayToDate( int jd, int &year, int &mon + return true; + } + +-bool KCalendarSystemIndianNational::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemIndianNational::dateToJulianDay(int year, int month, int day, int &jd) const + { + int Y = year; + int M = month; +@@ -682,11 +537,11 @@ bool KCalendarSystemIndianNational::dateToJulianDay( int year, int month, int da + // "Explanatory Supplement to the Astronomical Almanac" 2006 section 12.94 pp 605-606 + // Originally from "Report of the Calendar Reform Committee" 1955 + jd = 365 * Y +- + ( Y + 78 - 1 / M ) / 4 ++ + (Y + 78 - 1 / M) / 4 + + 31 * M +- - ( M + 9 ) / 11 +- - ( M / 7 ) * ( M - 7 ) +- - ( 3 * ( ( Y + 78 - 1 / M ) / 100 + 1 ) ) / 4 ++ - (M + 9) / 11 ++ - (M / 7) * (M - 7) ++ - (3 * ((Y + 78 - 1 / M) / 100 + 1)) / 4 + + D + + 1749579; + +diff --git a/kdecore/date/kcalendarsystemindiannational_p.h b/kdecore/date/kcalendarsystemindiannational_p.h +index 7399a39..0e8e036 100644 +--- a/kdecore/date/kcalendarsystemindiannational_p.h ++++ b/kdecore/date/kcalendarsystemindiannational_p.h +@@ -41,8 +41,8 @@ class KCalendarSystemIndianNationalPrivate; + class KCalendarSystemIndianNational: public KCalendarSystem + { + public: +- explicit KCalendarSystemIndianNational( const KLocale *locale = 0 ); +- explicit KCalendarSystemIndianNational( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemIndianNational(const KLocale *locale = 0); ++ explicit KCalendarSystemIndianNational(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemIndianNational(); + + virtual QString calendarType() const; +@@ -50,58 +50,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -109,15 +70,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemIndianNational( KCalendarSystemIndianNationalPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemIndianNational(KCalendarSystemIndianNationalPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemIndianNational ) +- KCalendarSystemIndianNationalPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemIndianNational) + }; + + #endif // KCALENDARSYSTEMINDIANNATIONAL_H +diff --git a/kdecore/date/kcalendarsystemislamiccivil.cpp b/kdecore/date/kcalendarsystemislamiccivil.cpp +new file mode 100644 +index 0000000..053ec55 +--- /dev/null ++++ b/kdecore/date/kcalendarsystemislamiccivil.cpp +@@ -0,0 +1,596 @@ ++/* ++ Copyright (c) 2002-2003 Carlos Moro <cfmoro@correo.uniovi.es> ++ Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> ++ Copyright 2007, 2008, 2009, 2010 John Layt <john@layt.net> ++ ++ 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; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++#include "kcalendarsystemislamiccivil_p.h" ++#include "kcalendarsystemprivate_p.h" ++ ++#include <QtCore/QDate> ++ ++class KCalendarSystemIslamicCivilPrivate : public KCalendarSystemPrivate ++{ ++public: ++ explicit KCalendarSystemIslamicCivilPrivate(KCalendarSystemIslamicCivil *q); ++ ++ virtual ~KCalendarSystemIslamicCivilPrivate(); ++ ++ // Virtual methods each calendar system must re-implement ++ virtual KLocale::CalendarSystem calendarSystem() const; ++ virtual void loadDefaultEraList(); ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; ++ virtual int daysInWeek() const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool hasLeapMonths() const; ++ virtual bool hasYearZero() const; ++ virtual int maxDaysInWeek() const; ++ virtual int maxMonthsInYear() const; ++ virtual int earliestValidYear() const; ++ virtual int latestValidYear() const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; ++}; ++ ++// Shared d pointer base class definitions ++ ++KCalendarSystemIslamicCivilPrivate::KCalendarSystemIslamicCivilPrivate(KCalendarSystemIslamicCivil *q) ++ : KCalendarSystemPrivate(q) ++{ ++} ++ ++KCalendarSystemIslamicCivilPrivate::~KCalendarSystemIslamicCivilPrivate() ++{ ++} ++ ++KLocale::CalendarSystem KCalendarSystemIslamicCivilPrivate::calendarSystem() const ++{ ++ return KLocale::IslamicCivilCalendar; ++} ++ ++void KCalendarSystemIslamicCivilPrivate::loadDefaultEraList() ++{ ++ QString name, shortName, format; ++ // Islamic Era, Anno Hegirae, "Year of the Hijra". ++ name = i18nc("Calendar Era: Hijri Islamic Era, years > 0, LongFormat", "Anno Hegirae"); ++ shortName = i18nc("Calendar Era: Hijri Islamic Era, years > 0, ShortFormat", "AH"); ++ format = i18nc("(kdedt-format) Hijri, AH, full era year format used for %EY, e.g. 2000 AH", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); ++} ++ ++int KCalendarSystemIslamicCivilPrivate::monthsInYear(int year) const ++{ ++ Q_UNUSED(year) ++ return 12; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::daysInMonth(int year, int month) const ++{ ++ if (month == 12 && isLeapYear(year)) { ++ return 30; ++ } ++ ++ if (month % 2 == 0) { // Even number months have 29 days ++ return 29; ++ } else { // Odd number months have 30 days ++ return 30; ++ } ++} ++ ++int KCalendarSystemIslamicCivilPrivate::daysInYear(int year) const ++{ ++ if (isLeapYear(year)) { ++ return 355; ++ } else { ++ return 354; ++ } ++} ++ ++int KCalendarSystemIslamicCivilPrivate::daysInWeek() const ++{ ++ return 7; ++} ++ ++bool KCalendarSystemIslamicCivilPrivate::isLeapYear(int year) const ++{ ++ // Years 2, 5, 7, 10, 13, 16, 18, 21, 24, 26, 29 of the 30 year cycle ++ ++ /* ++ The following C++ code is translated from the Lisp code ++ in ``Calendrical Calculations'' by Nachum Dershowitz and ++ Edward M. Reingold, Software---Practice & Experience, ++ vol. 20, no. 9 (September, 1990), pp. 899--928. ++ ++ This code is in the public domain, but any use of it ++ should publically acknowledge its source. ++ */ ++ ++ if ((((11 * year) + 14) % 30) < 11) { ++ return true; ++ } else { ++ return false; ++ } ++ ++ // The following variations will be implemented in separate classes in 4.5 ++ // May be cleaner to formally define using a case statement switch on (year % 30) ++ ++ // Variation used by Bar Habraeus / Graves / Birashk / Some Microsoft products ++ // Years 2, 5, 7, 10, 13, 15, 18, 21, 24, 26, 29 of the 30 year cycle ++ // if ( ( ( ( 11 * year ) + 15 ) % 30 ) < 11 ) { ++ ++ // Variation used by Bohras / Sahifa with epoch 15 July 622 jd = 1948440 ++ // Years 2, 5, 8, 10, 13, 16, 19, 21, 24, 27, 29 of the 30 year cycle ++ // if ( ( ( ( 11 * year ) + 1 ) % 30 ) < 11 ) { ++} ++ ++bool KCalendarSystemIslamicCivilPrivate::hasLeapMonths() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemIslamicCivilPrivate::hasYearZero() const ++{ ++ return false; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::maxDaysInWeek() const ++{ ++ return 7; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::maxMonthsInYear() const ++{ ++ return 12; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::earliestValidYear() const ++{ ++ return 1; ++} ++ ++int KCalendarSystemIslamicCivilPrivate::latestValidYear() const ++{ ++ return 9999; ++} ++ ++QString KCalendarSystemIslamicCivilPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const ++{ ++ Q_UNUSED(year); ++ ++ if (format == KLocale::NarrowName) { ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::NarrowName", "M").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::NarrowName", "S").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::NarrowName", "A").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::NarrowName", "T").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::NarrowName", "A").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::NarrowName", "T").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::NarrowName", "R").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::NarrowName", "S").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::NarrowName", "R").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::NarrowName", "S").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::NarrowName", "Q").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::NarrowName", "H").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::ShortName Possessive", "of Muh").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::ShortName Possessive", "of Saf").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::ShortName Possessive", "of R.A").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::ShortName Possessive", "of R.T").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::ShortName Possessive", "of J.A").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::ShortName Possessive", "of J.T").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::ShortName Possessive", "of Raj").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::ShortName Possessive", "of Sha").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::ShortName Possessive", "of Ram").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::ShortName Possessive", "of Shw").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::ShortName Possessive", "of Qid").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::ShortName Possessive", "of Hij").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::ShortName", "Muh").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::ShortName", "Saf").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::ShortName", "R.A").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::ShortName", "R.T").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::ShortName", "J.A").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::ShortName", "J.T").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::ShortName", "Raj").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::ShortName", "Sha").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::ShortName", "Ram").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::ShortName", "Shw").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::ShortName", "Qid").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::ShortName", "Hij").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::LongName Possessive", "of Muharram").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::LongName Possessive", "of Safar").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::LongName Possessive", "of Rabi` al-Awal").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::LongName Possessive", "of Rabi` al-Thaani").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::LongName Possessive", "of Jumaada al-Awal").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::LongName Possessive", "of Jumaada al-Thaani").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::LongName Possessive", "of Rajab").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::LongName Possessive", "of Sha`ban").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::LongName Possessive", "of Ramadan").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::LongName Possessive", "of Shawwal").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::LongName Possessive", "of Thu al-Qi`dah").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::LongName Possessive", "of Thu al-Hijjah").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ // Default to LongName ++ switch (month) { ++ case 1: ++ return ki18nc("Hijri month 1 - KLocale::LongName", "Muharram").toString(locale()); ++ case 2: ++ return ki18nc("Hijri month 2 - KLocale::LongName", "Safar").toString(locale()); ++ case 3: ++ return ki18nc("Hijri month 3 - KLocale::LongName", "Rabi` al-Awal").toString(locale()); ++ case 4: ++ return ki18nc("Hijri month 4 - KLocale::LongName", "Rabi` al-Thaani").toString(locale()); ++ case 5: ++ return ki18nc("Hijri month 5 - KLocale::LongName", "Jumaada al-Awal").toString(locale()); ++ case 6: ++ return ki18nc("Hijri month 6 - KLocale::LongName", "Jumaada al-Thaani").toString(locale()); ++ case 7: ++ return ki18nc("Hijri month 7 - KLocale::LongName", "Rajab").toString(locale()); ++ case 8: ++ return ki18nc("Hijri month 8 - KLocale::LongName", "Sha`ban").toString(locale()); ++ case 9: ++ return ki18nc("Hijri month 9 - KLocale::LongName", "Ramadan").toString(locale()); ++ case 10: ++ return ki18nc("Hijri month 10 - KLocale::LongName", "Shawwal").toString(locale()); ++ case 11: ++ return ki18nc("Hijri month 11 - KLocale::LongName", "Thu al-Qi`dah").toString(locale()); ++ case 12: ++ return ki18nc("Hijri month 12 - KLocale::LongName", "Thu al-Hijjah").toString(locale()); ++ default: ++ return QString(); ++ } ++} ++ ++QString KCalendarSystemIslamicCivilPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const ++{ ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Hijri weekday 1 - KLocale::NarrowName ", "I").toString(locale()); ++ case 2: ++ return ki18nc("Hijri weekday 2 - KLocale::NarrowName ", "T").toString(locale()); ++ case 3: ++ return ki18nc("Hijri weekday 3 - KLocale::NarrowName ", "A").toString(locale()); ++ case 4: ++ return ki18nc("Hijri weekday 4 - KLocale::NarrowName ", "K").toString(locale()); ++ case 5: ++ return ki18nc("Hijri weekday 5 - KLocale::NarrowName ", "J").toString(locale()); ++ case 6: ++ return ki18nc("Hijri weekday 6 - KLocale::NarrowName ", "S").toString(locale()); ++ case 7: ++ return ki18nc("Hijri weekday 7 - KLocale::NarrowName ", "A").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Hijri weekday 1 - KLocale::ShortName", "Ith").toString(locale()); ++ case 2: ++ return ki18nc("Hijri weekday 2 - KLocale::ShortName", "Thl").toString(locale()); ++ case 3: ++ return ki18nc("Hijri weekday 3 - KLocale::ShortName", "Arb").toString(locale()); ++ case 4: ++ return ki18nc("Hijri weekday 4 - KLocale::ShortName", "Kha").toString(locale()); ++ case 5: ++ return ki18nc("Hijri weekday 5 - KLocale::ShortName", "Jum").toString(locale()); ++ case 6: ++ return ki18nc("Hijri weekday 6 - KLocale::ShortName", "Sab").toString(locale()); ++ case 7: ++ return ki18nc("Hijri weekday 7 - KLocale::ShortName", "Ahd").toString(locale()); ++ default: return QString(); ++ } ++ } ++ ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Hijri weekday 1 - KLocale::LongName", "Yaum al-Ithnain").toString(locale()); ++ case 2: ++ return ki18nc("Hijri weekday 2 - KLocale::LongName", "Yau al-Thulatha").toString(locale()); ++ case 3: ++ return ki18nc("Hijri weekday 3 - KLocale::LongName", "Yaum al-Arbi'a").toString(locale()); ++ case 4: ++ return ki18nc("Hijri weekday 4 - KLocale::LongName", "Yaum al-Khamees").toString(locale()); ++ case 5: ++ return ki18nc("Hijri weekday 5 - KLocale::LongName", "Yaum al-Jumma").toString(locale()); ++ case 6: ++ return ki18nc("Hijri weekday 6 - KLocale::LongName", "Yaum al-Sabt").toString(locale()); ++ case 7: ++ return ki18nc("Hijri weekday 7 - KLocale::LongName", "Yaum al-Ahad").toString(locale()); ++ default: ++ return QString(); ++ } ++} ++ ++ ++KCalendarSystemIslamicCivil::KCalendarSystemIslamicCivil(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemIslamicCivilPrivate(this), KSharedConfig::Ptr(), locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemIslamicCivil::KCalendarSystemIslamicCivil(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemIslamicCivilPrivate(this), config, locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemIslamicCivil::KCalendarSystemIslamicCivil(KCalendarSystemIslamicCivilPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemIslamicCivil::~KCalendarSystemIslamicCivil() ++{ ++} ++ ++QString KCalendarSystemIslamicCivil::calendarType() const ++{ ++ return QLatin1String("hijri"); ++} ++ ++QDate KCalendarSystemIslamicCivil::epoch() const ++{ ++ // 16 July 622 in the Julian calendar ++ return QDate::fromJulianDay(1948440); ++} ++ ++QDate KCalendarSystemIslamicCivil::earliestValidDate() const ++{ ++ return epoch(); ++} ++ ++QDate KCalendarSystemIslamicCivil::latestValidDate() const ++{ ++ // Set to last day of year 9999 ++ // Last day of Islamic Civil year 9999 is 9999-12-29 ++ return QDate::fromJulianDay(5491751); ++} ++ ++bool KCalendarSystemIslamicCivil::isValid(int year, int month, int day) const ++{ ++ return KCalendarSystem::isValid(year, month, day); ++} ++ ++bool KCalendarSystemIslamicCivil::isValid(const QDate &date) const ++{ ++ return KCalendarSystem::isValid(date); ++} ++ ++bool KCalendarSystemIslamicCivil::isLeapYear(int year) const ++{ ++ return KCalendarSystem::isLeapYear(year); ++} ++ ++bool KCalendarSystemIslamicCivil::isLeapYear(const QDate &date) const ++{ ++ return KCalendarSystem::isLeapYear(date); ++} ++ ++QString KCalendarSystemIslamicCivil::monthName(int month, int year, MonthNameFormat format) const ++{ ++ return KCalendarSystem::monthName(month, year, format); ++} ++ ++QString KCalendarSystemIslamicCivil::monthName(const QDate &date, MonthNameFormat format) const ++{ ++ return KCalendarSystem::monthName(date, format); ++} ++ ++QString KCalendarSystemIslamicCivil::weekDayName(int weekDay, WeekDayNameFormat format) const ++{ ++ return KCalendarSystem::weekDayName(weekDay, format); ++} ++ ++QString KCalendarSystemIslamicCivil::weekDayName(const QDate &date, WeekDayNameFormat format) const ++{ ++ return KCalendarSystem::weekDayName(date, format); ++} ++ ++int KCalendarSystemIslamicCivil::weekDayOfPray() const ++{ ++ return 5; // Friday ++} ++ ++bool KCalendarSystemIslamicCivil::isLunar() const ++{ ++ return true; ++} ++ ++bool KCalendarSystemIslamicCivil::isLunisolar() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemIslamicCivil::isSolar() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemIslamicCivil::isProleptic() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemIslamicCivil::julianDayToDate(int jd, int &year, int &month, int &day) const ++{ ++ Q_D(const KCalendarSystemIslamicCivil); ++ ++ /* ++ The following C++ code is translated from the Lisp code ++ in ``Calendrical Calculations'' by Nachum Dershowitz and ++ Edward M. Reingold, Software---Practice & Experience, ++ vol. 20, no. 9 (September, 1990), pp. 899--928. ++ ++ This code is in the public domain, but any use of it ++ should publically acknowledge its source. ++ */ ++ ++ // Search forward year by year from approximate year ++ year = (jd - epoch().toJulianDay()) / 355; ++ int testJd; ++ dateToJulianDay(year, 12, d->daysInMonth(year, 12), testJd); ++ while (jd > testJd) { ++ year++; ++ dateToJulianDay(year, 12, d->daysInMonth(year, 12), testJd); ++ } ++ ++ // Search forward month by month from Muharram ++ month = 1; ++ dateToJulianDay(year, month, d->daysInMonth(year, month), testJd); ++ while (jd > testJd) { ++ month++; ++ dateToJulianDay(year, month, d->daysInMonth(year, month), testJd); ++ } ++ ++ dateToJulianDay(year, month, 1, testJd); ++ day = jd - testJd + 1; ++ ++ return true; ++ ++ // Alternative implementations ++ ++ // More recent editions of "Calendrical Calculations" by Dershowitz & Reingold have a more ++ // efficient direct calculation without recusrion, but this cannot be used due to licensing ++ ++ /* ++ Formula from "Explanatory Supplement to the Astronomical Almanac" 2006, derived from Fliegel & Van Flandern 1968 ++ int L = jd - epoch().toJulianDay() + 10632; ++ int N = ( L - 1 ) / 10631; ++ L = L - 10631 * N + 354; ++ int J = ( ( 10985 - L ) / 5316 ) x ( ( 50* L ) / 17719 ) + ( L / 5670 ) * ( ( 43 * L ) / 15238 ); ++ L = L - ( ( 30 - J ) / 15 ) * ( ( 17719 * J ) / 50 ) - ( J / 16 ) * ( ( 15238 * J ) / 43 ) + 29; ++ year = ( 30 * N ) + J - 30; ++ month = ( 24 * L ) / 709; ++ day = L - ( ( 709 * month ) / 24 ); ++ */ ++ ++ /* ++ Formula from Fourmilab website ++ jd = Math.floor(jd) + 0.5; ++ year = Math.floor(((30 * (jd - epoch().toJulianDay())) + 10646) / 10631); ++ month = qMin(12, Math.ceil((jd - (29 + islamic_to_jd(year, 1, 1))) / 29.5) + 1); ++ day = (jd - islamic_to_jd(year, month, 1)) + 1; ++ */ ++} ++ ++bool KCalendarSystemIslamicCivil::dateToJulianDay(int year, int month, int day, int &jd) const ++{ ++ /* ++ The following C++ code is translated from the Lisp code ++ in ``Calendrical Calculations'' by Nachum Dershowitz and ++ Edward M. Reingold, Software---Practice & Experience, ++ vol. 20, no. 9 (September, 1990), pp. 899--928. ++ ++ This code is in the public domain, but any use of it ++ should publically acknowledge its source. ++ */ ++ ++ jd = epoch().toJulianDay() - 1 + // days before start of calendar ++ (year - 1) * 354 + // non-leap days in prior years ++ (3 + (11 * year)) / 30 + // leap days in prior years ++ 29 * (month - 1) + // days so far... ++ month / 2 + // ...this year ++ day; // days so far this month ++ ++ return true; ++ ++ // Alternative implementations ++ ++ /* ++ Formula from "Explanatory Supplement to the Astronomical Almanac" 2006, derived from Fliegel & Van Flandern 1968 ++ jd = ( 3 + ( 11 * year ) ) / 30 + 354 * year + 30 * month - ( month - 1 ) / 2 + day + epoch().toJulianDay() - 385; ++ */ ++} +diff --git a/kdecore/date/kcalendarsystemislamiccivil_p.h b/kdecore/date/kcalendarsystemislamiccivil_p.h +new file mode 100644 +index 0000000..59629cc +--- /dev/null ++++ b/kdecore/date/kcalendarsystemislamiccivil_p.h +@@ -0,0 +1,85 @@ ++/* ++ Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> ++ Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> ++ Copyright 2007, 2010 John Layt <john@layt.net> ++ ++ 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; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++#ifndef KCALENDARSYSTEMISLAMICCIVIL_H ++#define KCALENDARSYSTEMISLAMICCIVIL_H ++ ++#include "kcalendarsystem.h" ++ ++class KCalendarSystemIslamicCivilPrivate; ++ ++/** ++ * @internal ++ * This is the Islamic Civil calendar implementation. ++ * ++ * The Islamic or Hijri calendar is the traditional calendar used in the Middle ++ * East. This implementation is of the civil calculation that does not take ++ * observed sunset into account and so may vary from actual dates by 1-2 days. ++ * ++ * @b license GNU-LGPL v2+ ++ * ++ * @see KLocale,KCalendarSystem ++ * ++ * @author Carlos Moro <cfmoro@correo.uniovi.es> ++ */ ++class KCalendarSystemIslamicCivil : public KCalendarSystem ++{ ++public: ++ explicit KCalendarSystemIslamicCivil(const KLocale *locale = 0); ++ explicit KCalendarSystemIslamicCivil(const KSharedConfig::Ptr config, const KLocale *locale = 0); ++ virtual ~KCalendarSystemIslamicCivil(); ++ ++ virtual QString calendarType() const; ++ ++ virtual QDate epoch() const; ++ virtual QDate earliestValidDate() const; ++ virtual QDate latestValidDate() const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; ++ ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; ++ ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; ++ ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; ++ ++ virtual int weekDayOfPray() const; ++ ++ virtual bool isLunar() const; ++ virtual bool isLunisolar() const; ++ virtual bool isSolar() const; ++ virtual bool isProleptic() const; ++ ++protected: ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemIslamicCivil(KCalendarSystemIslamicCivilPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); ++ ++private: ++ Q_DECLARE_PRIVATE(KCalendarSystemIslamicCivil) ++}; ++ ++#endif // KCALENDARSYSTEMISLAMICCIVIL_H +diff --git a/kdecore/date/kcalendarsystemjalali.cpp b/kdecore/date/kcalendarsystemjalali.cpp +index 543ba5a..1aaa804 100644 +--- a/kdecore/date/kcalendarsystemjalali.cpp ++++ b/kdecore/date/kcalendarsystemjalali.cpp +@@ -35,32 +35,32 @@ + class KCalendarSystemJalaliPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemJalaliPrivate( KCalendarSystemJalali *q ); ++ explicit KCalendarSystemJalaliPrivate(KCalendarSystemJalali *q); + + virtual ~KCalendarSystemJalaliPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + }; + + // Shared d pointer base class definitions + +-KCalendarSystemJalaliPrivate::KCalendarSystemJalaliPrivate( KCalendarSystemJalali *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemJalaliPrivate::KCalendarSystemJalaliPrivate(KCalendarSystemJalali *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -77,38 +77,38 @@ void KCalendarSystemJalaliPrivate::loadDefaultEraList() + { + QString name, shortName, format; + // Islamic Era (Hijri), Anno Persico. +- name = i18nc( "Calendar Era: Jalali Islamic Era, years > 0, LongFormat", "Anno Persico" ); +- shortName = i18nc( "Calendar Era: Jalali Islamic Era, years > 0, ShortFormat", "AP" ); +- format = i18nc( "(kdedt-format) Jalali, AP, full era year format used for %EY, e.g. 2000 AP", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Jalali Islamic Era, years > 0, LongFormat", "Anno Persico"); ++ shortName = i18nc("Calendar Era: Jalali Islamic Era, years > 0, ShortFormat", "AP"); ++ format = i18nc("(kdedt-format) Jalali, AP, full era year format used for %EY, e.g. 2000 AP", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemJalaliPrivate::monthsInYear( int year ) const ++int KCalendarSystemJalaliPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + +-int KCalendarSystemJalaliPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemJalaliPrivate::daysInMonth(int year, int month) const + { +- if ( month == 12 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 12) { ++ if (isLeapYear(year)) { + return 30; + } else { + return 29; + } + } + +- if ( month <= 6 ) { ++ if (month <= 6) { + return 31; + } + + return 30; + } + +-int KCalendarSystemJalaliPrivate::daysInYear( int year ) const ++int KCalendarSystemJalaliPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -120,26 +120,26 @@ int KCalendarSystemJalaliPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemJalaliPrivate::isLeapYear( int year ) const ++bool KCalendarSystemJalaliPrivate::isLeapYear(int year) const + { + // From formilab Public Domain code http://www.fourmilab.ch/documents/calendar/ + // Use Birashk algorithm as it matches the to/from jd code below + + // Birashk algorithm is incorrect in two years in period AP 1244 to 1531, + // 1403/1404 and 1436/1437, and so catch them here first +- if ( year == 1403 || year == 1436 ) { ++ if (year == 1403 || year == 1436) { + return true; +- } else if ( year == 1404 || year == 1437 ) { ++ } else if (year == 1404 || year == 1437) { + return false; + } + +- if ( year >= 0 ) { ++ if (year >= 0) { + year = year - 474; + } else { + year = year - 473; + } + +- if ( ( ( ( ( ( year % 2820 ) + 474 ) + 38 ) * 682 ) % 2816 ) < 682 ) { ++ if ((((((year % 2820) + 474) + 38) * 682) % 2816) < 682) { + return true; + } else { + return false; +@@ -176,461 +176,315 @@ int KCalendarSystemJalaliPrivate::latestValidYear() const + return 1530; + } + +-QString KCalendarSystemJalaliPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemJalaliPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::NarrowName", "F" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::NarrowName", "F").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::NarrowName", "O" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::NarrowName", "O").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::NarrowName", "K" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::NarrowName", "K").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::NarrowName", "T" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::NarrowName", "T").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::NarrowName", "M").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::NarrowName", "S").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::NarrowName", "M").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::NarrowName", "A").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::NarrowName", "A").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::NarrowName", "D" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::NarrowName", "D").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::NarrowName", "B" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::NarrowName", "B").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::NarrowName", "E" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::NarrowName", "E").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::ShortName Possessive", "of Far" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::ShortName Possessive", "of Far").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::ShortName Possessive", "of Ord" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::ShortName Possessive", "of Ord").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::ShortName Possessive", "of Kho" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::ShortName Possessive", "of Kho").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::ShortName Possessive", "of Tir" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::ShortName Possessive", "of Tir").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::ShortName Possessive", "of Mor" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::ShortName Possessive", "of Mor").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::ShortName Possessive", "of Sha" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::ShortName Possessive", "of Sha").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::ShortName Possessive", "of Meh" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::ShortName Possessive", "of Meh").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::ShortName Possessive", "of Aba" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::ShortName Possessive", "of Aba").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::ShortName Possessive", "of Aza" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::ShortName Possessive", "of Aza").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::ShortName Possessive", "of Dei" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::ShortName Possessive", "of Dei").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::ShortName Possessive", "of Bah" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::ShortName Possessive", "of Bah").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::ShortName Possessive", "of Esf" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::ShortName Possessive", "of Esf").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::ShortName", "Far" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::ShortName", "Far").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::ShortName", "Ord" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::ShortName", "Ord").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::ShortName", "Kho" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::ShortName", "Kho").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::ShortName", "Tir" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::ShortName", "Tir").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::ShortName", "Mor" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::ShortName", "Mor").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::ShortName", "Sha" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::ShortName", "Sha").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::ShortName", "Meh" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::ShortName", "Meh").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::ShortName", "Aba" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::ShortName", "Aba").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::ShortName", "Aza" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::ShortName", "Aza").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::ShortName", "Dei" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::ShortName", "Dei").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::ShortName", "Bah" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::ShortName", "Bah").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::ShortName", "Esf" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::ShortName", "Esf").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::LongName Possessive", "of Farvardin" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::LongName Possessive", "of Farvardin").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::LongName Possessive", "of Ordibehesht" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::LongName Possessive", "of Ordibehesht").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::LongName Possessive", "of Khordad" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::LongName Possessive", "of Khordad").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::LongName Possessive", "of Tir" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::LongName Possessive", "of Tir").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::LongName Possessive", "of Mordad" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::LongName Possessive", "of Mordad").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::LongName Possessive", "of Shahrivar" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::LongName Possessive", "of Shahrivar").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::LongName Possessive", "of Mehr" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::LongName Possessive", "of Mehr").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::LongName Possessive", "of Aban" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::LongName Possessive", "of Aban").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::LongName Possessive", "of Azar" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::LongName Possessive", "of Azar").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::LongName Possessive", "of Dei" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::LongName Possessive", "of Dei").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::LongName Possessive", "of Bahman" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::LongName Possessive", "of Bahman").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::LongName Possessive", "of Esfand" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::LongName Possessive", "of Esfand").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Jalali month 1 - KLocale::LongName", "Farvardin" ).toString( locale() ); ++ return ki18nc("Jalali month 1 - KLocale::LongName", "Farvardin").toString(locale()); + case 2: +- return ki18nc( "Jalali month 2 - KLocale::LongName", "Ordibehesht" ).toString( locale() ); ++ return ki18nc("Jalali month 2 - KLocale::LongName", "Ordibehesht").toString(locale()); + case 3: +- return ki18nc( "Jalali month 3 - KLocale::LongName", "Khordad" ).toString( locale() ); ++ return ki18nc("Jalali month 3 - KLocale::LongName", "Khordad").toString(locale()); + case 4: +- return ki18nc( "Jalali month 4 - KLocale::LongName", "Tir" ).toString( locale() ); ++ return ki18nc("Jalali month 4 - KLocale::LongName", "Tir").toString(locale()); + case 5: +- return ki18nc( "Jalali month 5 - KLocale::LongName", "Mordad" ).toString( locale() ); ++ return ki18nc("Jalali month 5 - KLocale::LongName", "Mordad").toString(locale()); + case 6: +- return ki18nc( "Jalali month 6 - KLocale::LongName", "Shahrivar" ).toString( locale() ); ++ return ki18nc("Jalali month 6 - KLocale::LongName", "Shahrivar").toString(locale()); + case 7: +- return ki18nc( "Jalali month 7 - KLocale::LongName", "Mehr" ).toString( locale() ); ++ return ki18nc("Jalali month 7 - KLocale::LongName", "Mehr").toString(locale()); + case 8: +- return ki18nc( "Jalali month 8 - KLocale::LongName", "Aban" ).toString( locale() ); ++ return ki18nc("Jalali month 8 - KLocale::LongName", "Aban").toString(locale()); + case 9: +- return ki18nc( "Jalali month 9 - KLocale::LongName", "Azar" ).toString( locale() ); ++ return ki18nc("Jalali month 9 - KLocale::LongName", "Azar").toString(locale()); + case 10: +- return ki18nc( "Jalali month 10 - KLocale::LongName", "Dei" ).toString( locale() ); ++ return ki18nc("Jalali month 10 - KLocale::LongName", "Dei").toString(locale()); + case 11: +- return ki18nc( "Jalali month 11 - KLocale::LongName", "Bahman" ).toString( locale() ); ++ return ki18nc("Jalali month 11 - KLocale::LongName", "Bahman").toString(locale()); + case 12: +- return ki18nc( "Jalali month 12 - KLocale::LongName", "Esfand" ).toString( locale() ); ++ return ki18nc("Jalali month 12 - KLocale::LongName", "Esfand").toString(locale()); + default: + return QString(); + } + } + +-QString KCalendarSystemJalaliPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemJalaliPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Jalali weekday 1 - KLocale::NarrowName ", "2" ).toString( locale() ); ++ return ki18nc("Jalali weekday 1 - KLocale::NarrowName ", "2").toString(locale()); + case 2: +- return ki18nc( "Jalali weekday 2 - KLocale::NarrowName ", "3" ).toString( locale() ); ++ return ki18nc("Jalali weekday 2 - KLocale::NarrowName ", "3").toString(locale()); + case 3: +- return ki18nc( "Jalali weekday 3 - KLocale::NarrowName ", "4" ).toString( locale() ); ++ return ki18nc("Jalali weekday 3 - KLocale::NarrowName ", "4").toString(locale()); + case 4: +- return ki18nc( "Jalali weekday 4 - KLocale::NarrowName ", "5" ).toString( locale() ); ++ return ki18nc("Jalali weekday 4 - KLocale::NarrowName ", "5").toString(locale()); + case 5: +- return ki18nc( "Jalali weekday 5 - KLocale::NarrowName ", "J" ).toString( locale() ); ++ return ki18nc("Jalali weekday 5 - KLocale::NarrowName ", "J").toString(locale()); + case 6: +- return ki18nc( "Jalali weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Jalali weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Jalali weekday 7 - KLocale::NarrowName ", "1" ).toString( locale() ); ++ return ki18nc("Jalali weekday 7 - KLocale::NarrowName ", "1").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Jalali weekday 1 - KLocale::ShortName", "2sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 1 - KLocale::ShortName", "2sh").toString(locale()); + case 2: +- return ki18nc( "Jalali weekday 2 - KLocale::ShortName", "3sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 2 - KLocale::ShortName", "3sh").toString(locale()); + case 3: +- return ki18nc( "Jalali weekday 3 - KLocale::ShortName", "4sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 3 - KLocale::ShortName", "4sh").toString(locale()); + case 4: +- return ki18nc( "Jalali weekday 4 - KLocale::ShortName", "5sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 4 - KLocale::ShortName", "5sh").toString(locale()); + case 5: +- return ki18nc( "Jalali weekday 5 - KLocale::ShortName", "Jom" ).toString( locale() ); ++ return ki18nc("Jalali weekday 5 - KLocale::ShortName", "Jom").toString(locale()); + case 6: +- return ki18nc( "Jalali weekday 6 - KLocale::ShortName", "Shn" ).toString( locale() ); ++ return ki18nc("Jalali weekday 6 - KLocale::ShortName", "Shn").toString(locale()); + case 7: +- return ki18nc( "Jalali weekday 7 - KLocale::ShortName", "1sh" ).toString( locale() ); ++ return ki18nc("Jalali weekday 7 - KLocale::ShortName", "1sh").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Jalali weekday 1 - KLocale::LongName", "Do shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 1 - KLocale::LongName", "Do shanbe").toString(locale()); + case 2: +- return ki18nc( "Jalali weekday 2 - KLocale::LongName", "Se shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 2 - KLocale::LongName", "Se shanbe").toString(locale()); + case 3: +- return ki18nc( "Jalali weekday 3 - KLocale::LongName", "Chahar shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 3 - KLocale::LongName", "Chahar shanbe").toString(locale()); + case 4: +- return ki18nc( "Jalali weekday 4 - KLocale::LongName", "Panj shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 4 - KLocale::LongName", "Panj shanbe").toString(locale()); + case 5: +- return ki18nc( "Jalali weekday 5 - KLocale::LongName", "Jumee" ).toString( locale() ); ++ return ki18nc("Jalali weekday 5 - KLocale::LongName", "Jumee").toString(locale()); + case 6: +- return ki18nc( "Jalali weekday 6 - KLocale::LongName", "Shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 6 - KLocale::LongName", "Shanbe").toString(locale()); + case 7: +- return ki18nc( "Jalali weekday 7 - KLocale::LongName", "Yek-shanbe" ).toString( locale() ); ++ return ki18nc("Jalali weekday 7 - KLocale::LongName", "Yek-shanbe").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemJalali::KCalendarSystemJalali( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemJalaliPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemJalali::KCalendarSystemJalali(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemJalaliPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJalali::KCalendarSystemJalali( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemJalaliPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemJalali::KCalendarSystemJalali(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemJalaliPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJalali::KCalendarSystemJalali( KCalendarSystemJalaliPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemJalali::KCalendarSystemJalali(KCalendarSystemJalaliPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemJalali::~KCalendarSystemJalali() + { +- delete dont_use; + } + + QString KCalendarSystemJalali::calendarType() const + { +- return QLatin1String( "jalali" ); ++ return QLatin1String("jalali"); + } + + QDate KCalendarSystemJalali::epoch() const + { + // 19 March 622 in the Julian calendar +- return QDate::fromJulianDay( 1948321 ); ++ return QDate::fromJulianDay(1948321); + } + + QDate KCalendarSystemJalali::earliestValidDate() const + { + // Using the Birashk formula which is accurate in period AP 1244 to 1530 (AD 1865 to 2152) + // 1244-01-01 Jalali 1865-03-21 Gregorian +- return QDate::fromJulianDay( 2402317 ); ++ return QDate::fromJulianDay(2402317); + } + + QDate KCalendarSystemJalali::latestValidDate() const + { + // Using the Birashk formula which is accurate in period AP 1244 to 1530 (AD 1865 to 2152) + // 1530-12-29 Jalali 2152-03-19 Gregorian +- return QDate::fromJulianDay( 2507140 ); ++ return QDate::fromJulianDay(2507140); + } + +-bool KCalendarSystemJalali::isValid( int year, int month, int day ) const ++bool KCalendarSystemJalali::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemJalali::isValid( const QDate &date ) const ++bool KCalendarSystemJalali::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemJalali::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemJalali::isLeapYear(int year) const + { +- return KCalendarSystem::setDate( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemJalali::setYMD( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemJalali::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::setYMD( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemJalali::year( const QDate &date ) const ++QString KCalendarSystemJalali::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::year( date ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemJalali::month ( const QDate& date ) const +- +-{ +- return KCalendarSystem::month( date ); +-} +- +-int KCalendarSystemJalali::day( const QDate &date ) const +-{ +- return KCalendarSystem::day( date ); +-} +- +-QDate KCalendarSystemJalali::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemJalali::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemJalali::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemJalali::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemJalali::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemJalali::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemJalali::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemJalali::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemJalali::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemJalali::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemJalali::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemJalali::weekNumber( const QDate &date, int *yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemJalali::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemJalali::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemJalali::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemJalali::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemJalali::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemJalali::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemJalali::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemJalali::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemJalali::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemJalali::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJalali::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJalali::dayStringToInteger( const QString & sNum, int & iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemJalali::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemJalali::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemJalali::readDate( const QString &intstr, const QString &fmt, bool *ok ) const ++QString KCalendarSystemJalali::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::readDate( intstr, fmt, ok ); ++ return KCalendarSystem::monthName(date, format); + } + +-QDate KCalendarSystemJalali::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const ++QString KCalendarSystemJalali::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::readDate( str, flags, ok ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-int KCalendarSystemJalali::weekStartDay() const ++QString KCalendarSystemJalali::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::weekDayName(date, format); + } + + int KCalendarSystemJalali::weekDayOfPray() const +@@ -658,20 +512,20 @@ bool KCalendarSystemJalali::isProleptic() const + return false; + } + +-bool KCalendarSystemJalali::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemJalali::julianDayToDate(int jd, int &year, int &month, int &day) const + { + // Birashk algorithm is incorrect in two years in period AP 1244 to 1531. + // This results in a leap day being added to the end of 1404 instead of 1403 + // and to the end of 1437 instead of 1436. Check for these dates first and + // return accordingly. Relies on later use of dateToJulianDay() to correctly + // calculate firstDayOfYear in 1404 and 1437, so no other adjustments needed. +- if ( jd == 2460755 ) { ++ if (jd == 2460755) { + year = 1403; + month = 12; + day = 30; + return true; + } +- if ( jd == 2472808 ) { ++ if (jd == 2472808) { + year = 1436; + month = 12; + day = 30; +@@ -686,54 +540,54 @@ bool KCalendarSystemJalali::julianDayToDate( int jd, int &year, int &month, int + int cycle; + int dayInCycle; + int yearInCycle; +- dateToJulianDay( 475, 1, 1, jdCycleStart ); ++ dateToJulianDay(475, 1, 1, jdCycleStart); + daysSinceCycleStart = jd - jdCycleStart; + cycle = daysSinceCycleStart / 1029983; + dayInCycle = daysSinceCycleStart % 1029983; +- if ( dayInCycle == 1029982 ) { ++ if (dayInCycle == 1029982) { + yearInCycle = 2820; + } else { + int aux1 = dayInCycle / 366; + int aux2 = dayInCycle % 366; +- yearInCycle = ( ( ( 2134 * aux1 ) + ( 2816 * aux2 ) + 2815 ) / 1028522 ) + aux1 + 1; ++ yearInCycle = (((2134 * aux1) + (2816 * aux2) + 2815) / 1028522) + aux1 + 1; + } +- year = yearInCycle + ( 2820 * cycle ) + 474; +- if ( year <= 0 ) { ++ year = yearInCycle + (2820 * cycle) + 474; ++ if (year <= 0) { + year = year - 1; + } + + int firstDayOfYear; +- dateToJulianDay( year, 1, 1, firstDayOfYear ); ++ dateToJulianDay(year, 1, 1, firstDayOfYear); + int dayinYear = jd - firstDayOfYear + 1; +- if( dayinYear <= 186 ) { +- month = ( ( dayinYear - 1 ) / 31 ) + 1; +- day = dayinYear - ( ( month - 1 ) * 31 ); ++ if (dayinYear <= 186) { ++ month = ((dayinYear - 1) / 31) + 1; ++ day = dayinYear - ((month - 1) * 31); + } else { +- month = ( ( dayinYear - 7 ) / 30 ) + 1; +- day = dayinYear - ( ( month - 1 ) * 30 ) - 6; ++ month = ((dayinYear - 7) / 30) + 1; ++ day = dayinYear - ((month - 1) * 30) - 6; + } + + return true; + } + +-bool KCalendarSystemJalali::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemJalali::dateToJulianDay(int year, int month, int day, int &jd) const + { +- Q_D( const KCalendarSystemJalali ); ++ Q_D(const KCalendarSystemJalali); + + // Birashk algorithm is incorrect in two years in period AP 1244 to 1531. + // This results in a leap day being added to the end of 1404 instead of 1403 + // and to the end of 1437 instead of 1436. Thus all dates in 1404 and 1437 + // are off by 1 JD. Check for these dates first and adjust accordingly. +- if ( year == 1403 && month == 12 && day == 30 ) { ++ if (year == 1403 && month == 12 && day == 30) { + jd = 2460755; + return true; + } +- if ( year == 1436 && month == 12 && day == 30 ) { ++ if (year == 1436 && month == 12 && day == 30) { + jd = 2472808; + return true; + } +- if ( year == 1404 || year == 1437 ) { +- if ( month < 12 && day + 1 > d->daysInMonth( year, month ) ) { ++ if (year == 1404 || year == 1437) { ++ if (month < 12 && day + 1 > d->daysInMonth(year, month)) { + day = 1; + month = month + 1; + } else { +@@ -747,24 +601,24 @@ bool KCalendarSystemJalali::dateToJulianDay( int year, int month, int day, int & + long epyear; + long monthDays; + +- if ( year >= 0 ) { ++ if (year >= 0) { + epbase = year - 474; + } else { + epbase = year - 473; + } + +- epyear = 474 + ( epbase % 2820 ); ++ epyear = 474 + (epbase % 2820); + +- if ( month <= 7 ) { +- monthDays = ( month - 1 ) * 31; ++ if (month <= 7) { ++ monthDays = (month - 1) * 31; + } else { +- monthDays = ( ( month - 1 ) * 30 ) + 6; ++ monthDays = ((month - 1) * 30) + 6; + } + +- jd = ( epoch().toJulianDay() - 1 ) + // days before epoch +- ( epyear - 1 ) * 365 + // normal days in previous years +- ( ( ( epyear * 682 ) - 110 ) / 2816 ) + // leap days in previous years +- ( epbase / 2820 ) * 1029983 + ++ jd = (epoch().toJulianDay() - 1) + // days before epoch ++ (epyear - 1) * 365 + // normal days in previous years ++ (((epyear * 682) - 110) / 2816) + // leap days in previous years ++ (epbase / 2820) * 1029983 + + monthDays + // days in previous months this year + day; // days in this month + +diff --git a/kdecore/date/kcalendarsystemjalali_p.h b/kdecore/date/kcalendarsystemjalali_p.h +index d1b8350..6ae44ea 100644 +--- a/kdecore/date/kcalendarsystemjalali_p.h ++++ b/kdecore/date/kcalendarsystemjalali_p.h +@@ -32,8 +32,8 @@ class KCalendarSystemJalaliPrivate; + class KCalendarSystemJalali : public KCalendarSystem + { + public: +- explicit KCalendarSystemJalali( const KLocale * locale = 0 ); +- explicit KCalendarSystemJalali( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemJalali(const KLocale * locale = 0); ++ explicit KCalendarSystemJalali(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemJalali(); + + virtual QString calendarType() const; +@@ -41,58 +41,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -100,15 +61,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemJalali( KCalendarSystemJalaliPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemJalali(KCalendarSystemJalaliPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemJalali ) +- KCalendarSystemJalaliPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemJalali) + }; + + #endif // KCALENDARSYSTEMJALALI_H +diff --git a/kdecore/date/kcalendarsystemjapanese.cpp b/kdecore/date/kcalendarsystemjapanese.cpp +index feabd38..4d4e58a 100644 +--- a/kdecore/date/kcalendarsystemjapanese.cpp ++++ b/kdecore/date/kcalendarsystemjapanese.cpp +@@ -18,18 +18,18 @@ + */ + + #include "kcalendarsystemjapanese_p.h" +-#include "kcalendarsystemgregorianprolepticprivate_p.h" ++#include "kcalendarsystemgregorianprivate_p.h" + + #include "kdebug.h" + #include "klocale.h" + + #include <QtCore/QDate> + +-//Reuse the Gregorian Proleptic private implementation +-class KCalendarSystemJapanesePrivate : public KCalendarSystemGregorianProlepticPrivate ++//Reuse the Gregorian private implementation ++class KCalendarSystemJapanesePrivate : public KCalendarSystemGregorianPrivate + { + public: +- explicit KCalendarSystemJapanesePrivate( KCalendarSystemJapanese *q ); ++ explicit KCalendarSystemJapanesePrivate(KCalendarSystemJapanese *q); + virtual ~KCalendarSystemJapanesePrivate(); + + virtual KLocale::CalendarSystem calendarSystem() const; +@@ -37,10 +37,10 @@ public: + virtual int earliestValidYear() const; + }; + +-//Override only a few of the Gregorian Proleptic private methods ++//Override only a few of the Gregorian private methods + +-KCalendarSystemJapanesePrivate::KCalendarSystemJapanesePrivate( KCalendarSystemJapanese *q ) +- : KCalendarSystemGregorianProlepticPrivate( q ) ++KCalendarSystemJapanesePrivate::KCalendarSystemJapanesePrivate(KCalendarSystemJapanese *q) ++ : KCalendarSystemGregorianPrivate(q) + { + } + +@@ -60,38 +60,38 @@ void KCalendarSystemJapanesePrivate::loadDefaultEraList() + // Nengō, Only do most recent for now, use AD for the rest. + // Feel free to add more, but have mercy on the translators :-) + +- name = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini" ); +- shortName = i18nc( "Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD" ); +- format = i18nc( "(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, QDate( 1868, 9, 7 ), name, shortName, format ); ++ name = i18nc("Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD"); ++ format = i18nc("(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, QDate(1868, 9, 7), name, shortName, format); + +- name = i18nc( "Calendar Era: Japanese Nengō, Meiji Era, LongFormat", "Meiji" ); ++ name = i18nc("Calendar Era: Japanese Nengō, Meiji Era, LongFormat", "Meiji"); + shortName = name; +- format = i18nc( "(kdedt-format) Japanese, Meiji, full era year format used for %EY, year = 1, e.g. Meiji 1", "%EC Gannen" ); +- addEra( '+', 1, QDate( 1868, 9, 8 ), 1868, QDate( 1868, 12, 31 ), name, shortName, format ); +- format = i18nc( "(kdedt-format) Japanese, Meiji, full era year format used for %EY, year > 1, e.g. Meiji 22", "%EC %Ey" ); +- addEra( '+', 2, QDate( 1869, 1, 1 ), 1869, QDate( 1912, 7, 29 ), name, shortName, format ); ++ format = i18nc("(kdedt-format) Japanese, Meiji, full era year format used for %EY, year = 1, e.g. Meiji 1", "%EC Gannen"); ++ addEra('+', 1, QDate(1868, 9, 8), 1868, QDate(1868, 12, 31), name, shortName, format); ++ format = i18nc("(kdedt-format) Japanese, Meiji, full era year format used for %EY, year > 1, e.g. Meiji 22", "%EC %Ey"); ++ addEra('+', 2, QDate(1869, 1, 1), 1869, QDate(1912, 7, 29), name, shortName, format); + +- name = i18nc( "Calendar Era: Japanese Nengō, Taishō Era, LongFormat", "Taishō" ); ++ name = i18nc("Calendar Era: Japanese Nengō, Taishō Era, LongFormat", "Taishō"); + shortName = name; +- format = i18nc( "(kdedt-format) Japanese, Taishō, full era year format used for %EY, year = 1, e.g. Taishō 1", "%EC Gannen" ); +- addEra( '+', 1, QDate( 1912, 7, 30 ), 1912, QDate( 1912, 12, 31 ), name, shortName, format ); +- format = i18nc( "(kdedt-format) Japanese, Taishō, full era year format used for %EY, year > 1, e.g. Taishō 22", "%EC %Ey" ); +- addEra( '+', 2, QDate( 1913, 1, 1 ), 1913, QDate( 1926, 12, 24 ), name, shortName, format ); ++ format = i18nc("(kdedt-format) Japanese, Taishō, full era year format used for %EY, year = 1, e.g. Taishō 1", "%EC Gannen"); ++ addEra('+', 1, QDate(1912, 7, 30), 1912, QDate(1912, 12, 31), name, shortName, format); ++ format = i18nc("(kdedt-format) Japanese, Taishō, full era year format used for %EY, year > 1, e.g. Taishō 22", "%EC %Ey"); ++ addEra('+', 2, QDate(1913, 1, 1), 1913, QDate(1926, 12, 24), name, shortName, format); + +- name = i18nc( "Calendar Era: Japanese Nengō, Shōwa Era, LongFormat", "Shōwa" ); ++ name = i18nc("Calendar Era: Japanese Nengō, Shōwa Era, LongFormat", "Shōwa"); + shortName = name; +- format = i18nc( "(kdedt-format) Japanese, Shōwa, full era year format used for %EY, year = 1, e.g. Shōwa 1", "%EC Gannen" ); +- addEra( '+', 1, QDate( 1926, 12, 25 ), 1926, QDate( 1926, 12, 31 ), name, shortName, format ); +- format = i18nc( "(kdedt-format) Japanese, Shōwa, full era year format used for %EY, year > 1, e.g. Shōwa 22", "%EC %Ey" ); +- addEra( '+', 2, QDate( 1927, 1, 1 ), 1927, QDate( 1989, 1, 7 ), name, shortName, format ); ++ format = i18nc("(kdedt-format) Japanese, Shōwa, full era year format used for %EY, year = 1, e.g. Shōwa 1", "%EC Gannen"); ++ addEra('+', 1, QDate(1926, 12, 25), 1926, QDate(1926, 12, 31), name, shortName, format); ++ format = i18nc("(kdedt-format) Japanese, Shōwa, full era year format used for %EY, year > 1, e.g. Shōwa 22", "%EC %Ey"); ++ addEra('+', 2, QDate(1927, 1, 1), 1927, QDate(1989, 1, 7), name, shortName, format); + +- name = i18nc( "Calendar Era: Japanese Nengō, Heisei Era, LongFormat", "Heisei" ); ++ name = i18nc("Calendar Era: Japanese Nengō, Heisei Era, LongFormat", "Heisei"); + shortName = name; +- format = i18nc( "(kdedt-format) Japanese, Heisei, full era year format used for %EY, year = 1, e.g. Heisei 1", "%EC Gannen" ); +- addEra( '+', 1, QDate( 1989, 1, 8 ), 1989, QDate( 1989, 12, 31 ), name, shortName, format ); +- format = i18nc( "(kdedt-format) Japanese, Heisei, full era year format used for %EY, year > 1, e.g. Heisei 22", "%EC %Ey" ); +- addEra( '+', 2, QDate( 1990, 1, 1 ), 1990, q->latestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Japanese, Heisei, full era year format used for %EY, year = 1, e.g. Heisei 1", "%EC Gannen"); ++ addEra('+', 1, QDate(1989, 1, 8), 1989, QDate(1989, 12, 31), name, shortName, format); ++ format = i18nc("(kdedt-format) Japanese, Heisei, full era year format used for %EY, year > 1, e.g. Heisei 22", "%EC %Ey"); ++ addEra('+', 2, QDate(1990, 1, 1), 1990, q->latestValidDate(), name, shortName, format); + } + + int KCalendarSystemJapanesePrivate::earliestValidYear() const +@@ -100,23 +100,23 @@ int KCalendarSystemJapanesePrivate::earliestValidYear() const + } + + +-KCalendarSystemJapanese::KCalendarSystemJapanese( const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemJapanesePrivate( this ), KSharedConfig::Ptr(), locale ) ++KCalendarSystemJapanese::KCalendarSystemJapanese(const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemJapanesePrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJapanese::KCalendarSystemJapanese( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemJapanesePrivate( this ), config, locale ) ++KCalendarSystemJapanese::KCalendarSystemJapanese(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemJapanesePrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJapanese::KCalendarSystemJapanese( KCalendarSystemJapanesePrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( dd, config, locale ) ++KCalendarSystemJapanese::KCalendarSystemJapanese(KCalendarSystemJapanesePrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemJapanese::~KCalendarSystemJapanese() +@@ -125,215 +125,79 @@ KCalendarSystemJapanese::~KCalendarSystemJapanese() + + QString KCalendarSystemJapanese::calendarType() const + { +- return QLatin1String( "japanese" ); ++ return QLatin1String("japanese"); + } + + QDate KCalendarSystemJapanese::epoch() const + { + // 0001-01-01 Gregorian for now +- return QDate::fromJulianDay( 1721426 ); ++ return QDate::fromJulianDay(1721426); + } + + QDate KCalendarSystemJapanese::earliestValidDate() const + { + // 0001-01-01 Gregorian for now +- return QDate::fromJulianDay( 1721426 ); ++ return QDate::fromJulianDay(1721426); + } + + QDate KCalendarSystemJapanese::latestValidDate() const + { + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // 9999-12-31 Gregorian +- return QDate::fromJulianDay( 5373484 ); ++ return QDate::fromJulianDay(5373484); + } + +-bool KCalendarSystemJapanese::isValid( int year, int month, int day ) const ++bool KCalendarSystemJapanese::isValid(int year, int month, int day) const + { +- return KCalendarSystemGregorianProleptic::isValid( year, month, day ); ++ return KCalendarSystemGregorian::isValid(year, month, day); + } + +-bool KCalendarSystemJapanese::isValid( const QDate &date ) const ++bool KCalendarSystemJapanese::isValid(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::isValid( date ); ++ return KCalendarSystemGregorian::isValid(date); + } + +-bool KCalendarSystemJapanese::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemJapanese::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, year, month, day ); ++ return KCalendarSystemGregorian::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemJapanese::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemJapanese::isLeapYear(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, y, m, d ); ++ return KCalendarSystemGregorian::isLeapYear(date); + } + +-int KCalendarSystemJapanese::year( const QDate &date ) const ++QString KCalendarSystemJapanese::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::year( date ); ++ return KCalendarSystemGregorian::monthName(month, year, format); + } + +-int KCalendarSystemJapanese::month( const QDate &date ) const ++QString KCalendarSystemJapanese::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::month( date ); ++ return KCalendarSystemGregorian::monthName(date, format); + } + +-int KCalendarSystemJapanese::day( const QDate &date ) const ++QString KCalendarSystemJapanese::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::day( date ); ++ return KCalendarSystemGregorian::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemJapanese::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemJapanese::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::addYears( date, nyears ); ++ return KCalendarSystemGregorian::weekDayName(date, format); + } + +-QDate KCalendarSystemJapanese::addMonths( const QDate &date, int nmonths ) const ++int KCalendarSystemJapanese::yearStringToInteger(const QString &sNum, int &iLength) const + { +- return KCalendarSystemGregorianProleptic::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemJapanese::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystemGregorianProleptic::addDays( date, ndays ); +-} +- +-int KCalendarSystemJapanese::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::monthsInYear( date ); +-} +- +-int KCalendarSystemJapanese::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( date ); +-} +- +-int KCalendarSystemJapanese::weeksInYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( year ); +-} +- +-int KCalendarSystemJapanese::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInYear( date ); +-} +- +-int KCalendarSystemJapanese::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInMonth( date ); +-} +- +-int KCalendarSystemJapanese::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInWeek( date ); +-} +- +-int KCalendarSystemJapanese::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfYear( date ); +-} +- +-int KCalendarSystemJapanese::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfWeek( date ); +-} +- +-int KCalendarSystemJapanese::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystemGregorianProleptic::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemJapanese::isLeapYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( year ); +-} +- +-bool KCalendarSystemJapanese::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( date ); +-} +- +-QString KCalendarSystemJapanese::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( month, year, format ); +-} +- +-QString KCalendarSystemJapanese::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( date, format ); +-} +- +-QString KCalendarSystemJapanese::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemJapanese::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( date, format ); +-} +- +-QString KCalendarSystemJapanese::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::yearString( pDate, format ); +-} +- +-QString KCalendarSystemJapanese::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthString( pDate, format ); +-} +- +-QString KCalendarSystemJapanese::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::dayString( pDate, format ); +-} +- +-int KCalendarSystemJapanese::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- QString gannen = i18nc( "Japanese year 1 of era", "Gannen" ); +- if ( sNum.startsWith( gannen, Qt::CaseInsensitive ) ) { ++ QString gannen = i18nc("Japanese year 1 of era", "Gannen"); ++ if (sNum.startsWith(gannen, Qt::CaseInsensitive)) { + iLength = gannen.length(); + return 1; + } else { +- return KCalendarSystemGregorianProleptic::yearStringToInteger( sNum, iLength ); ++ return KCalendarSystemGregorian::yearStringToInteger(sNum, iLength); + } + } + +-int KCalendarSystemJapanese::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJapanese::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemJapanese::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::formatDate( date, format ); +-} +- +-QDate KCalendarSystemJapanese::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, ok ); +-} +- +-QDate KCalendarSystemJapanese::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemJapanese::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemJapanese::weekStartDay() const +-{ +- return KCalendarSystemGregorianProleptic::weekStartDay(); +-} +- + int KCalendarSystemJapanese::weekDayOfPray() const + { + return 7; // TODO JPL ??? +@@ -341,17 +205,17 @@ int KCalendarSystemJapanese::weekDayOfPray() const + + bool KCalendarSystemJapanese::isLunar() const + { +- return KCalendarSystemGregorianProleptic::isLunar(); ++ return KCalendarSystemGregorian::isLunar(); + } + + bool KCalendarSystemJapanese::isLunisolar() const + { +- return KCalendarSystemGregorianProleptic::isLunisolar(); ++ return KCalendarSystemGregorian::isLunisolar(); + } + + bool KCalendarSystemJapanese::isSolar() const + { +- return KCalendarSystemGregorianProleptic::isSolar(); ++ return KCalendarSystemGregorian::isSolar(); + } + + bool KCalendarSystemJapanese::isProleptic() const +@@ -359,12 +223,12 @@ bool KCalendarSystemJapanese::isProleptic() const + return false; + } + +-bool KCalendarSystemJapanese::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemJapanese::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- return KCalendarSystemGregorianProleptic::julianDayToDate( jd, year, month, day ); ++ return KCalendarSystemGregorian::julianDayToDate(jd, year, month, day); + } + +-bool KCalendarSystemJapanese::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemJapanese::dateToJulianDay(int year, int month, int day, int &jd) const + { +- return KCalendarSystemGregorianProleptic::dateToJulianDay( year, month, day, jd ); ++ return KCalendarSystemGregorian::dateToJulianDay(year, month, day, jd); + } +diff --git a/kdecore/date/kcalendarsystemjapanese_p.h b/kdecore/date/kcalendarsystemjapanese_p.h +index 5409dfc..1781f8e 100644 +--- a/kdecore/date/kcalendarsystemjapanese_p.h ++++ b/kdecore/date/kcalendarsystemjapanese_p.h +@@ -20,7 +20,7 @@ + #ifndef KCALENDARSYSTEMJAPANESE_H + #define KCALENDARSYSTEMJAPANESE_H + +-#include "kcalendarsystemgregorianproleptic_p.h" ++#include "kcalendarsystemgregorian_p.h" + + class KCalendarSystemJapanesePrivate; + +@@ -35,11 +35,11 @@ class KCalendarSystemJapanesePrivate; + * + * @author John Layt <john@layt.net> + */ +-class KCalendarSystemJapanese: public KCalendarSystemGregorianProleptic ++class KCalendarSystemJapanese: public KCalendarSystemGregorian + { + public: +- explicit KCalendarSystemJapanese( const KLocale *locale = 0 ); +- explicit KCalendarSystemJapanese( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemJapanese(const KLocale *locale = 0); ++ explicit KCalendarSystemJapanese(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemJapanese(); + + virtual QString calendarType() const; +@@ -47,58 +47,21 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; ++ virtual int yearStringToInteger(const QString &sNum, int &iLength) const; + +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -106,11 +69,11 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemJapanese( KCalendarSystemJapanesePrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemJapanese(KCalendarSystemJapanesePrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + Q_DECLARE_PRIVATE(KCalendarSystemJapanese) +diff --git a/kdecore/date/kcalendarsystemjulian.cpp b/kdecore/date/kcalendarsystemjulian.cpp +index 5dbb71e..3372bb5 100644 +--- a/kdecore/date/kcalendarsystemjulian.cpp ++++ b/kdecore/date/kcalendarsystemjulian.cpp +@@ -31,34 +31,34 @@ + class KCalendarSystemJulianPrivate : public KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemJulianPrivate( KCalendarSystemJulian *q ); ++ explicit KCalendarSystemJulianPrivate(KCalendarSystemJulian *q); + + virtual ~KCalendarSystemJulianPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + + bool m_useCommonEra; + }; + + // Shared d pointer base class definitions + +-KCalendarSystemJulianPrivate::KCalendarSystemJulianPrivate( KCalendarSystemJulian *q ) +- :KCalendarSystemPrivate( q ) ++KCalendarSystemJulianPrivate::KCalendarSystemJulianPrivate(KCalendarSystemJulian *q) ++ : KCalendarSystemPrivate(q) + { + } + +@@ -75,56 +75,56 @@ void KCalendarSystemJulianPrivate::loadDefaultEraList() + { + QString name, shortName, format; + +- KConfigGroup cg( config(), QString::fromLatin1( "KCalendarSystem %1" ).arg( q->calendarType() ) ); +- m_useCommonEra = cg.readEntry( "UseCommonEra", false ); ++ KConfigGroup cg(config(), QString::fromLatin1("KCalendarSystem %1").arg(q->calendarType(q->calendarSystem()))); ++ m_useCommonEra = cg.readEntry("UseCommonEra", false); + +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Julian Common Era, years < 0, LongFormat", "Before Common Era" ); +- shortName = i18nc( "Calendar Era: Julian Common Era, years < 0, ShortFormat", "BCE" ); ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Julian Common Era, years < 0, LongFormat", "Before Common Era"); ++ shortName = i18nc("Calendar Era: Julian Common Era, years < 0, ShortFormat", "BCE"); + } else { +- name = i18nc( "Calendar Era: Julian Christian Era, years < 0, LongFormat", "Before Christ" ); +- shortName = i18nc( "Calendar Era: Julian Christian Era, years < 0, ShortFormat", "BC" ); ++ name = i18nc("Calendar Era: Julian Christian Era, years < 0, LongFormat", "Before Christ"); ++ shortName = i18nc("Calendar Era: Julian Christian Era, years < 0, ShortFormat", "BC"); + } +- format = i18nc( "(kdedt-format) Julian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC" ); +- addEra( '-', 1, q->epoch().addDays( -1 ), -1, q->earliestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Julian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC"); ++ addEra('-', 1, q->epoch().addDays(-1), -1, q->earliestValidDate(), name, shortName, format); + +- if ( m_useCommonEra ) { +- name = i18nc( "Calendar Era: Julian Common Era, years > 0, LongFormat", "Common Era" ); +- shortName = i18nc( "Calendar Era: Julian Common Era, years > 0, ShortFormat", "CE" ); ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Julian Common Era, years > 0, LongFormat", "Common Era"); ++ shortName = i18nc("Calendar Era: Julian Common Era, years > 0, ShortFormat", "CE"); + } else { +- name = i18nc( "Calendar Era: Julian Christian Era, years > 0, LongFormat", "Anno Domini" ); +- shortName = i18nc( "Calendar Era: Julian Christian Era, years > 0, ShortFormat", "AD" ); ++ name = i18nc("Calendar Era: Julian Christian Era, years > 0, LongFormat", "Anno Domini"); ++ shortName = i18nc("Calendar Era: Julian Christian Era, years > 0, ShortFormat", "AD"); + } +- format = i18nc( "(kdedt-format) Julian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ format = i18nc("(kdedt-format) Julian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-int KCalendarSystemJulianPrivate::monthsInYear( int year ) const ++int KCalendarSystemJulianPrivate::monthsInYear(int year) const + { +- Q_UNUSED( year ) ++ Q_UNUSED(year) + return 12; + } + +-int KCalendarSystemJulianPrivate::daysInMonth( int year, int month ) const ++int KCalendarSystemJulianPrivate::daysInMonth(int year, int month) const + { +- if ( month == 2 ) { +- if ( isLeapYear( year ) ) { ++ if (month == 2) { ++ if (isLeapYear(year)) { + return 29; + } else { + return 28; + } + } + +- if ( month == 4 || month == 6 || month == 9 || month == 11 ) { ++ if (month == 4 || month == 6 || month == 9 || month == 11) { + return 30; + } + + return 31; + } + +-int KCalendarSystemJulianPrivate::daysInYear( int year ) const ++int KCalendarSystemJulianPrivate::daysInYear(int year) const + { +- if ( isLeapYear( year ) ) { ++ if (isLeapYear(year)) { + return 366; + } else { + return 365; +@@ -136,13 +136,13 @@ int KCalendarSystemJulianPrivate::daysInWeek() const + return 7; + } + +-bool KCalendarSystemJulianPrivate::isLeapYear( int year ) const ++bool KCalendarSystemJulianPrivate::isLeapYear(int year) const + { +- if ( year < 1 ) { ++ if (year < 1) { + year = year + 1; + } + +- if ( year % 4 == 0 ) { ++ if (year % 4 == 0) { + return true; + } + +@@ -179,459 +179,314 @@ int KCalendarSystemJulianPrivate::latestValidYear() const + return 9999; + } + +-QString KCalendarSystemJulianPrivate::monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive ) const ++QString KCalendarSystemJulianPrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const + { +- Q_UNUSED( year ); ++ Q_UNUSED(year); + +- if ( format == KLocale::NarrowName ) { +- switch ( month ) { ++ if (format == KLocale::NarrowName) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::NarrowName", "J").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::NarrowName", "F" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::NarrowName", "F").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::NarrowName", "M").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::NarrowName", "A").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::NarrowName", "M" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::NarrowName", "M").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::NarrowName", "J").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::NarrowName", "J" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::NarrowName", "J").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::NarrowName", "A" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::NarrowName", "A").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::NarrowName", "S" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::NarrowName", "S").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::NarrowName", "O" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::NarrowName", "O").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::NarrowName", "N" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::NarrowName", "N").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::NarrowName", "D" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::NarrowName", "D").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::ShortName Possessive", "of Jan" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::ShortName Possessive", "of Jan").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::ShortName Possessive", "of Feb" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::ShortName Possessive", "of Feb").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::ShortName Possessive", "of Mar" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::ShortName Possessive", "of Mar").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::ShortName Possessive", "of Apr" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::ShortName Possessive", "of Apr").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::ShortName Possessive", "of May" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::ShortName Possessive", "of May").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::ShortName Possessive", "of Jun" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::ShortName Possessive", "of Jun").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::ShortName Possessive", "of Jul" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::ShortName Possessive", "of Jul").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::ShortName Possessive", "of Aug" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::ShortName Possessive", "of Aug").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::ShortName Possessive", "of Sep" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::ShortName Possessive", "of Sep").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::ShortName Possessive", "of Oct" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::ShortName Possessive", "of Oct").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::ShortName Possessive", "of Nov" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::ShortName Possessive", "of Nov").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::ShortName Possessive", "of Dec" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::ShortName Possessive", "of Dec").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName && !possessive ) { +- switch ( month ) { ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::ShortName", "Jan" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::ShortName", "Jan").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::ShortName", "Feb" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::ShortName", "Feb").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::ShortName", "Mar" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::ShortName", "Mar").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::ShortName", "Apr" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::ShortName", "Apr").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::ShortName", "May" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::ShortName", "May").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::ShortName", "Jun" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::ShortName", "Jun").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::ShortName", "Jul" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::ShortName", "Jul").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::ShortName", "Aug" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::ShortName", "Aug").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::ShortName", "Sep" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::ShortName", "Sep").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::ShortName", "Oct" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::ShortName", "Oct").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::ShortName", "Nov" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::ShortName", "Nov").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::ShortName", "Dec" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::ShortName", "Dec").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::LongName && possessive ) { +- switch ( month ) { ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::LongName Possessive", "of January" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::LongName Possessive", "of January").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::LongName Possessive", "of February" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::LongName Possessive", "of February").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::LongName Possessive", "of March" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::LongName Possessive", "of March").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::LongName Possessive", "of April" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::LongName Possessive", "of April").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::LongName Possessive", "of May" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::LongName Possessive", "of May").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::LongName Possessive", "of June" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::LongName Possessive", "of June").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::LongName Possessive", "of July" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::LongName Possessive", "of July").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::LongName Possessive", "of August" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::LongName Possessive", "of August").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::LongName Possessive", "of September" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::LongName Possessive", "of September").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::LongName Possessive", "of October" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::LongName Possessive", "of October").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::LongName Possessive", "of November" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::LongName Possessive", "of November").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::LongName Possessive", "of December" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::LongName Possessive", "of December").toString(locale()); + default: + return QString(); + } + } + + // Default to LongName +- switch ( month ) { ++ switch (month) { + case 1: +- return ki18nc( "Julian month 1 - KLocale::LongName", "January" ).toString( locale() ); ++ return ki18nc("Julian month 1 - KLocale::LongName", "January").toString(locale()); + case 2: +- return ki18nc( "Julian month 2 - KLocale::LongName", "February" ).toString( locale() ); ++ return ki18nc("Julian month 2 - KLocale::LongName", "February").toString(locale()); + case 3: +- return ki18nc( "Julian month 3 - KLocale::LongName", "March" ).toString( locale() ); ++ return ki18nc("Julian month 3 - KLocale::LongName", "March").toString(locale()); + case 4: +- return ki18nc( "Julian month 4 - KLocale::LongName", "April" ).toString( locale() ); ++ return ki18nc("Julian month 4 - KLocale::LongName", "April").toString(locale()); + case 5: +- return ki18nc( "Julian month 5 - KLocale::LongName", "May" ).toString( locale() ); ++ return ki18nc("Julian month 5 - KLocale::LongName", "May").toString(locale()); + case 6: +- return ki18nc( "Julian month 6 - KLocale::LongName", "June" ).toString( locale() ); ++ return ki18nc("Julian month 6 - KLocale::LongName", "June").toString(locale()); + case 7: +- return ki18nc( "Julian month 7 - KLocale::LongName", "July" ).toString( locale() ); ++ return ki18nc("Julian month 7 - KLocale::LongName", "July").toString(locale()); + case 8: +- return ki18nc( "Julian month 8 - KLocale::LongName", "August" ).toString( locale() ); ++ return ki18nc("Julian month 8 - KLocale::LongName", "August").toString(locale()); + case 9: +- return ki18nc( "Julian month 9 - KLocale::LongName", "September" ).toString( locale() ); ++ return ki18nc("Julian month 9 - KLocale::LongName", "September").toString(locale()); + case 10: +- return ki18nc( "Julian month 10 - KLocale::LongName", "October" ).toString( locale() ); ++ return ki18nc("Julian month 10 - KLocale::LongName", "October").toString(locale()); + case 11: +- return ki18nc( "Julian month 11 - KLocale::LongName", "November" ).toString( locale() ); ++ return ki18nc("Julian month 11 - KLocale::LongName", "November").toString(locale()); + case 12: +- return ki18nc( "Julian month 12 - KLocale::LongName", "December" ).toString( locale() ); ++ return ki18nc("Julian month 12 - KLocale::LongName", "December").toString(locale()); + default: + return QString(); + } + } + +-QString KCalendarSystemJulianPrivate::weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const ++QString KCalendarSystemJulianPrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const + { +- if ( format == KLocale::NarrowName ) { +- switch ( weekDay ) { ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Julian weekday 1 - KLocale::NarrowName ", "M" ).toString( locale() ); ++ return ki18nc("Julian weekday 1 - KLocale::NarrowName ", "M").toString(locale()); + case 2: +- return ki18nc( "Julian weekday 2 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Julian weekday 2 - KLocale::NarrowName ", "T").toString(locale()); + case 3: +- return ki18nc( "Julian weekday 3 - KLocale::NarrowName ", "W" ).toString( locale() ); ++ return ki18nc("Julian weekday 3 - KLocale::NarrowName ", "W").toString(locale()); + case 4: +- return ki18nc( "Julian weekday 4 - KLocale::NarrowName ", "T" ).toString( locale() ); ++ return ki18nc("Julian weekday 4 - KLocale::NarrowName ", "T").toString(locale()); + case 5: +- return ki18nc( "Julian weekday 5 - KLocale::NarrowName ", "F" ).toString( locale() ); ++ return ki18nc("Julian weekday 5 - KLocale::NarrowName ", "F").toString(locale()); + case 6: +- return ki18nc( "Julian weekday 6 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Julian weekday 6 - KLocale::NarrowName ", "S").toString(locale()); + case 7: +- return ki18nc( "Julian weekday 7 - KLocale::NarrowName ", "S" ).toString( locale() ); ++ return ki18nc("Julian weekday 7 - KLocale::NarrowName ", "S").toString(locale()); + default: + return QString(); + } + } + +- if ( format == KLocale::ShortName || format == KLocale:: ShortNumber ) { +- switch ( weekDay ) { ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Julian weekday 1 - KLocale::ShortName", "Mon" ).toString( locale() ); ++ return ki18nc("Julian weekday 1 - KLocale::ShortName", "Mon").toString(locale()); + case 2: +- return ki18nc( "Julian weekday 2 - KLocale::ShortName", "Tue" ).toString( locale() ); ++ return ki18nc("Julian weekday 2 - KLocale::ShortName", "Tue").toString(locale()); + case 3: +- return ki18nc( "Julian weekday 3 - KLocale::ShortName", "Wed" ).toString( locale() ); ++ return ki18nc("Julian weekday 3 - KLocale::ShortName", "Wed").toString(locale()); + case 4: +- return ki18nc( "Julian weekday 4 - KLocale::ShortName", "Thu" ).toString( locale() ); ++ return ki18nc("Julian weekday 4 - KLocale::ShortName", "Thu").toString(locale()); + case 5: +- return ki18nc( "Julian weekday 5 - KLocale::ShortName", "Fri" ).toString( locale() ); ++ return ki18nc("Julian weekday 5 - KLocale::ShortName", "Fri").toString(locale()); + case 6: +- return ki18nc( "Julian weekday 6 - KLocale::ShortName", "Sat" ).toString( locale() ); ++ return ki18nc("Julian weekday 6 - KLocale::ShortName", "Sat").toString(locale()); + case 7: +- return ki18nc( "Julian weekday 7 - KLocale::ShortName", "Sun" ).toString( locale() ); ++ return ki18nc("Julian weekday 7 - KLocale::ShortName", "Sun").toString(locale()); + default: return QString(); + } + } + +- switch ( weekDay ) { ++ switch (weekDay) { + case 1: +- return ki18nc( "Julian weekday 1 - KLocale::LongName", "Monday" ).toString( locale() ); ++ return ki18nc("Julian weekday 1 - KLocale::LongName", "Monday").toString(locale()); + case 2: +- return ki18nc( "Julian weekday 2 - KLocale::LongName", "Tuesday" ).toString( locale() ); ++ return ki18nc("Julian weekday 2 - KLocale::LongName", "Tuesday").toString(locale()); + case 3: +- return ki18nc( "Julian weekday 3 - KLocale::LongName", "Wednesday" ).toString( locale() ); ++ return ki18nc("Julian weekday 3 - KLocale::LongName", "Wednesday").toString(locale()); + case 4: +- return ki18nc( "Julian weekday 4 - KLocale::LongName", "Thursday" ).toString( locale() ); ++ return ki18nc("Julian weekday 4 - KLocale::LongName", "Thursday").toString(locale()); + case 5: +- return ki18nc( "Julian weekday 5 - KLocale::LongName", "Friday" ).toString( locale() ); ++ return ki18nc("Julian weekday 5 - KLocale::LongName", "Friday").toString(locale()); + case 6: +- return ki18nc( "Julian weekday 6 - KLocale::LongName", "Saturday" ).toString( locale() ); ++ return ki18nc("Julian weekday 6 - KLocale::LongName", "Saturday").toString(locale()); + case 7: +- return ki18nc( "Julian weekday 7 - KLocale::LongName", "Sunday" ).toString( locale() ); ++ return ki18nc("Julian weekday 7 - KLocale::LongName", "Sunday").toString(locale()); + default: + return QString(); + } + } + + +-KCalendarSystemJulian::KCalendarSystemJulian( const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemJulianPrivate( this ), KSharedConfig::Ptr(), locale ), +- dont_use( 0 ) ++KCalendarSystemJulian::KCalendarSystemJulian(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemJulianPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJulian::KCalendarSystemJulian( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( *new KCalendarSystemJulianPrivate( this ), config, locale ), +- dont_use( 0 ) ++KCalendarSystemJulian::KCalendarSystemJulian(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemJulianPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemJulian::KCalendarSystemJulian( KCalendarSystemJulianPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystem( dd, config, locale ), +- dont_use( 0 ) ++KCalendarSystemJulian::KCalendarSystemJulian(KCalendarSystemJulianPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemJulian::~KCalendarSystemJulian() + { +- delete dont_use; + } + + QString KCalendarSystemJulian::calendarType() const + { +- return QLatin1String( "julian" ); ++ return QLatin1String("julian"); + } + + QDate KCalendarSystemJulian::epoch() const + { +- return QDate::fromJulianDay( 1721426 ); ++ return QDate::fromJulianDay(1721426); + } + + QDate KCalendarSystemJulian::earliestValidDate() const + { + // 1 Jan 4712 BC, no year zero, cant be 4713BC due to error in QDate that day 0 is not valid + // and we really need the first in each year to be valid for the date maths +- return QDate::fromJulianDay( 366 ); ++ return QDate::fromJulianDay(366); + } + + QDate KCalendarSystemJulian::latestValidDate() const + { + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // 31 Dec 9999 AD, no year zero +- return QDate::fromJulianDay( 5373557 ); ++ return QDate::fromJulianDay(5373557); + } + +-bool KCalendarSystemJulian::isValid( int year, int month, int day ) const ++bool KCalendarSystemJulian::isValid(int year, int month, int day) const + { +- return KCalendarSystem::isValid( year, month, day ); ++ return KCalendarSystem::isValid(year, month, day); + } + +-bool KCalendarSystemJulian::isValid( const QDate &date ) const ++bool KCalendarSystemJulian::isValid(const QDate &date) const + { +- return KCalendarSystem::isValid( date ); ++ return KCalendarSystem::isValid(date); + } + +-bool KCalendarSystemJulian::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemJulian::isLeapYear(int year) const + { +- return KCalendarSystem::setDate( date, year, month, day ); ++ return KCalendarSystem::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemJulian::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemJulian::isLeapYear(const QDate &date) const + { +- return KCalendarSystem::setDate( date, y, m, d ); ++ return KCalendarSystem::isLeapYear(date); + } + +-int KCalendarSystemJulian::year( const QDate &date ) const ++QString KCalendarSystemJulian::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystem::year( date ); ++ return KCalendarSystem::monthName(month, year, format); + } + +-int KCalendarSystemJulian::month( const QDate &date ) const ++QString KCalendarSystemJulian::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystem::month( date ); ++ return KCalendarSystem::monthName(date, format); + } + +-int KCalendarSystemJulian::day( const QDate &date ) const ++QString KCalendarSystemJulian::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystem::day( date ); ++ return KCalendarSystem::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemJulian::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemJulian::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystem::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemJulian::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystem::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemJulian::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystem::addDays( date, ndays ); +-} +- +-int KCalendarSystemJulian::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystem::monthsInYear( date ); +-} +- +-int KCalendarSystemJulian::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystem::weeksInYear( date ); +-} +- +-int KCalendarSystemJulian::weeksInYear( int year ) const +-{ +- return KCalendarSystem::weeksInYear( year ); +-} +- +-int KCalendarSystemJulian::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystem::daysInYear( date ); +-} +- +-int KCalendarSystemJulian::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystem::daysInMonth( date ); +-} +- +-int KCalendarSystemJulian::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystem::daysInWeek( date ); +-} +- +-int KCalendarSystemJulian::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfYear( date ); +-} +- +-int KCalendarSystemJulian::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystem::dayOfWeek( date ); +-} +- +-int KCalendarSystemJulian::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystem::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemJulian::isLeapYear( int year ) const +-{ +- return KCalendarSystem::isLeapYear( year ); +-} +- +-bool KCalendarSystemJulian::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystem::isLeapYear( date ); +-} +- +-QString KCalendarSystemJulian::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( month, year, format ); +-} +- +-QString KCalendarSystemJulian::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystem::monthName( date, format ); +-} +- +-QString KCalendarSystemJulian::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemJulian::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystem::weekDayName( date, format ); +-} +- +-QString KCalendarSystemJulian::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::yearString( pDate, format ); +-} +- +-QString KCalendarSystemJulian::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::monthString( pDate, format ); +-} +- +-QString KCalendarSystemJulian::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystem::dayString( pDate, format ); +-} +- +-int KCalendarSystemJulian::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJulian::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemJulian::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystem::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemJulian::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystem::formatDate( date, format ); +-} +- +-QDate KCalendarSystemJulian::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, ok ); +-} +- +-QDate KCalendarSystemJulian::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystem::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemJulian::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystem::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemJulian::weekStartDay() const +-{ +- return KCalendarSystem::weekStartDay(); ++ return KCalendarSystem::weekDayName(date, format); + } + + int KCalendarSystemJulian::weekDayOfPray() const +@@ -659,7 +514,7 @@ bool KCalendarSystemJulian::isProleptic() const + return true; + } + +-bool KCalendarSystemJulian::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemJulian::julianDayToDate(int jd, int &year, int &month, int &day) const + { + // Formula from The Calendar FAQ by Claus Tondering + // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +@@ -668,23 +523,23 @@ bool KCalendarSystemJulian::julianDayToDate( int jd, int &year, int &month, int + + int b = 0; + int c = jd + 32082; +- int d = ( ( 4 * c ) + 3 ) / 1461; +- int e = c - ( ( 1461 * d ) / 4 ); +- int m = ( ( 5 * e ) + 2 ) / 153; +- day = e - ( ( (153 * m ) + 2 ) / 5 ) + 1; +- month = m + 3 - ( 12 * ( m / 10 ) ); +- year = ( 100 * b ) + d - 4800 + ( m / 10 ); ++ int d = ((4 * c) + 3) / 1461; ++ int e = c - ((1461 * d) / 4); ++ int m = ((5 * e) + 2) / 153; ++ day = e - (((153 * m) + 2) / 5) + 1; ++ month = m + 3 - (12 * (m / 10)); ++ year = (100 * b) + d - 4800 + (m / 10); + + // If year is -ve then is BC. In Julian there is no year 0, but the maths + // is easier if we pretend there is, so internally year of 0 = 1BC = -1 outside +- if ( year < 1 ) { ++ if (year < 1) { + year = year - 1; + } + + return true; + } + +-bool KCalendarSystemJulian::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemJulian::dateToJulianDay(int year, int month, int day, int &jd) const + { + // Formula from The Calendar FAQ by Claus Tondering + // http://www.tondering.dk/claus/cal/node3.html#SECTION003161000000000000000 +@@ -694,20 +549,20 @@ bool KCalendarSystemJulian::dateToJulianDay( int year, int month, int day, int & + // If year is -ve then is BC. In Julian there is no year 0, but the maths + // is easier if we pretend there is, so internally year of -1 = 1BC = 0 internally + int y; +- if ( year < 1 ) { ++ if (year < 1) { + y = year + 1; + } else { + y = year; + } + +- int a = ( 14 - month ) / 12; ++ int a = (14 - month) / 12; + y = y + 4800 - a; +- int m = month + ( 12 * a ) - 3; ++ int m = month + (12 * a) - 3; + + jd = day +- + ( ( ( 153 * m ) + 2 ) / 5 ) +- + ( 365 * y ) +- + ( y / 4 ) ++ + (((153 * m) + 2) / 5) ++ + (365 * y) ++ + (y / 4) + - 32083; + + return true; +diff --git a/kdecore/date/kcalendarsystemjulian_p.h b/kdecore/date/kcalendarsystemjulian_p.h +index 5976567..ebcad4a 100644 +--- a/kdecore/date/kcalendarsystemjulian_p.h ++++ b/kdecore/date/kcalendarsystemjulian_p.h +@@ -41,8 +41,8 @@ class KCalendarSystemJulianPrivate; + class KCalendarSystemJulian: public KCalendarSystem + { + public: +- explicit KCalendarSystemJulian( const KLocale *locale = 0 ); +- explicit KCalendarSystemJulian( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemJulian(const KLocale *locale = 0); ++ explicit KCalendarSystemJulian(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemJulian(); + + virtual QString calendarType() const; +@@ -50,58 +50,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -109,15 +70,14 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemJulian( KCalendarSystemJulianPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemJulian(KCalendarSystemJulianPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: +- Q_DECLARE_PRIVATE( KCalendarSystemJulian ) +- KCalendarSystemJulianPrivate * const dont_use; // KDE5 remove, use shared d ++ Q_DECLARE_PRIVATE(KCalendarSystemJulian) + }; + + #endif // KCALENDARSYSTEMJULIAN_H +diff --git a/kdecore/date/kcalendarsystemminguo.cpp b/kdecore/date/kcalendarsystemminguo.cpp +index 0230f93..66aea58 100644 +--- a/kdecore/date/kcalendarsystemminguo.cpp ++++ b/kdecore/date/kcalendarsystemminguo.cpp +@@ -18,30 +18,30 @@ + */ + + #include "kcalendarsystemminguo_p.h" +-#include "kcalendarsystemgregorianprolepticprivate_p.h" ++#include "kcalendarsystemgregorianprivate_p.h" + + #include "kdebug.h" + #include "klocale.h" + + #include <QtCore/QDate> + +-//Reuse the Gregorian Proleptic private implementation +-class KCalendarSystemMinguoPrivate : public KCalendarSystemGregorianProlepticPrivate ++//Reuse the Gregorian private implementation ++class KCalendarSystemMinguoPrivate : public KCalendarSystemGregorianPrivate + { + public: +- explicit KCalendarSystemMinguoPrivate( KCalendarSystemMinguo *q ); ++ explicit KCalendarSystemMinguoPrivate(KCalendarSystemMinguo *q); + virtual ~KCalendarSystemMinguoPrivate(); + + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual int earliestValidYear() const; + }; + +-//Override only a few of the Gregorian Proleptic private methods ++//Override only a few of the Gregorian private methods + +-KCalendarSystemMinguoPrivate::KCalendarSystemMinguoPrivate( KCalendarSystemMinguo *q ) +- : KCalendarSystemGregorianProlepticPrivate( q ) ++KCalendarSystemMinguoPrivate::KCalendarSystemMinguoPrivate(KCalendarSystemMinguo *q) ++ : KCalendarSystemGregorianPrivate(q) + { + } + +@@ -58,15 +58,15 @@ void KCalendarSystemMinguoPrivate::loadDefaultEraList() + { + QString name, shortName, format; + +- name = i18nc( "Calendar Era: Taiwan Republic of China Era, years > 0, LongFormat", "Republic of China Era" ); +- shortName = i18nc( "Calendar Era: Taiwan Republic of China Era, years > 0, ShortFormat", "ROC" ); +- format = i18nc( "(kdedt-format) Taiwan, ROC, full era year format used for %EY, e.g. ROC 99", "%EC %Ey" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Taiwan Republic of China Era, years > 0, LongFormat", "Republic of China Era"); ++ shortName = i18nc("Calendar Era: Taiwan Republic of China Era, years > 0, ShortFormat", "ROC"); ++ format = i18nc("(kdedt-format) Taiwan, ROC, full era year format used for %EY, e.g. ROC 99", "%EC %Ey"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-bool KCalendarSystemMinguoPrivate::isLeapYear( int year ) const ++bool KCalendarSystemMinguoPrivate::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProlepticPrivate::isLeapYear( year + 1911 ); ++ return KCalendarSystemGregorianPrivate::isLeapYear(year + 1911); + } + + int KCalendarSystemMinguoPrivate::earliestValidYear() const +@@ -75,23 +75,23 @@ int KCalendarSystemMinguoPrivate::earliestValidYear() const + } + + +-KCalendarSystemMinguo::KCalendarSystemMinguo( const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemMinguoPrivate( this ), KSharedConfig::Ptr(), locale ) ++KCalendarSystemMinguo::KCalendarSystemMinguo(const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemMinguoPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemMinguo::KCalendarSystemMinguo( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemMinguoPrivate( this ), config, locale ) ++KCalendarSystemMinguo::KCalendarSystemMinguo(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemMinguoPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemMinguo::KCalendarSystemMinguo( KCalendarSystemMinguoPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( dd, config, locale ) ++KCalendarSystemMinguo::KCalendarSystemMinguo(KCalendarSystemMinguoPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemMinguo::~KCalendarSystemMinguo() +@@ -100,13 +100,13 @@ KCalendarSystemMinguo::~KCalendarSystemMinguo() + + QString KCalendarSystemMinguo::calendarType() const + { +- return QLatin1String( "minguo" ); ++ return QLatin1String("minguo"); + } + + QDate KCalendarSystemMinguo::epoch() const + { + // 0001-01-01 = 1912-01-01 AD Gregorian +- return QDate::fromJulianDay( 2419403 ); ++ return QDate::fromJulianDay(2419403); + } + + QDate KCalendarSystemMinguo::earliestValidDate() const +@@ -118,188 +118,47 @@ QDate KCalendarSystemMinguo::latestValidDate() const + { + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // 9999-12-31 = 11910-12-31 AD Gregorian +- return QDate::fromJulianDay( 6071462 ); ++ return QDate::fromJulianDay(6071462); + } + +-bool KCalendarSystemMinguo::isValid( int year, int month, int day ) const ++bool KCalendarSystemMinguo::isValid(int year, int month, int day) const + { +- return KCalendarSystemGregorianProleptic::isValid( year, month, day ); ++ return KCalendarSystemGregorian::isValid(year, month, day); + } + +-bool KCalendarSystemMinguo::isValid( const QDate &date ) const ++bool KCalendarSystemMinguo::isValid(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::isValid( date ); ++ return KCalendarSystemGregorian::isValid(date); + } + +-bool KCalendarSystemMinguo::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemMinguo::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, year, month, day ); ++ return KCalendarSystemGregorian::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemMinguo::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemMinguo::isLeapYear(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, y, m, d ); ++ return KCalendarSystemGregorian::isLeapYear(date); + } + +-int KCalendarSystemMinguo::year( const QDate &date ) const ++QString KCalendarSystemMinguo::monthName(int month, int year, MonthNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::year( date ); ++ return KCalendarSystemGregorian::monthName(month, year, format); + } + +-int KCalendarSystemMinguo::month( const QDate &date ) const ++QString KCalendarSystemMinguo::monthName(const QDate &date, MonthNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::month( date ); ++ return KCalendarSystemGregorian::monthName(date, format); + } + +-int KCalendarSystemMinguo::day( const QDate &date ) const ++QString KCalendarSystemMinguo::weekDayName(int weekDay, WeekDayNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::day( date ); ++ return KCalendarSystemGregorian::weekDayName(weekDay, format); + } + +-QDate KCalendarSystemMinguo::addYears( const QDate &date, int nyears ) const ++QString KCalendarSystemMinguo::weekDayName(const QDate &date, WeekDayNameFormat format) const + { +- return KCalendarSystemGregorianProleptic::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemMinguo::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystemGregorianProleptic::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemMinguo::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystemGregorianProleptic::addDays( date, ndays ); +-} +- +-int KCalendarSystemMinguo::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::monthsInYear( date ); +-} +- +-int KCalendarSystemMinguo::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( date ); +-} +- +-int KCalendarSystemMinguo::weeksInYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( year ); +-} +- +-int KCalendarSystemMinguo::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInYear( date ); +-} +- +-int KCalendarSystemMinguo::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInMonth( date ); +-} +- +-int KCalendarSystemMinguo::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInWeek( date ); +-} +- +-int KCalendarSystemMinguo::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfYear( date ); +-} +- +-int KCalendarSystemMinguo::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfWeek( date ); +-} +- +-int KCalendarSystemMinguo::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystemGregorianProleptic::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemMinguo::isLeapYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( year ); +-} +- +-bool KCalendarSystemMinguo::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( date ); +-} +- +-QString KCalendarSystemMinguo::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( month, year, format ); +-} +- +-QString KCalendarSystemMinguo::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( date, format ); +-} +- +-QString KCalendarSystemMinguo::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemMinguo::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( date, format ); +-} +- +-QString KCalendarSystemMinguo::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::yearString( pDate, format ); +-} +- +-QString KCalendarSystemMinguo::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthString( pDate, format ); +-} +- +-QString KCalendarSystemMinguo::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::dayString( pDate, format ); +-} +- +-int KCalendarSystemMinguo::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemMinguo::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemMinguo::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemMinguo::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::formatDate( date, format ); +-} +- +-QDate KCalendarSystemMinguo::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, ok ); +-} +- +-QDate KCalendarSystemMinguo::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemMinguo::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemMinguo::weekStartDay() const +-{ +- return KCalendarSystemGregorianProleptic::weekStartDay(); ++ return KCalendarSystemGregorian::weekDayName(date, format); + } + + int KCalendarSystemMinguo::weekDayOfPray() const +@@ -309,17 +168,17 @@ int KCalendarSystemMinguo::weekDayOfPray() const + + bool KCalendarSystemMinguo::isLunar() const + { +- return KCalendarSystemGregorianProleptic::isLunar(); ++ return KCalendarSystemGregorian::isLunar(); + } + + bool KCalendarSystemMinguo::isLunisolar() const + { +- return KCalendarSystemGregorianProleptic::isLunisolar(); ++ return KCalendarSystemGregorian::isLunisolar(); + } + + bool KCalendarSystemMinguo::isSolar() const + { +- return KCalendarSystemGregorianProleptic::isSolar(); ++ return KCalendarSystemGregorian::isSolar(); + } + + bool KCalendarSystemMinguo::isProleptic() const +@@ -327,15 +186,15 @@ bool KCalendarSystemMinguo::isProleptic() const + return false; + } + +-bool KCalendarSystemMinguo::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemMinguo::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- bool result = KCalendarSystemGregorianProleptic::julianDayToDate( jd, year, month, day ); ++ bool result = KCalendarSystemGregorian::julianDayToDate(jd, year, month, day); + year = year - 1911; + return result; + } + +-bool KCalendarSystemMinguo::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemMinguo::dateToJulianDay(int year, int month, int day, int &jd) const + { +- return KCalendarSystemGregorianProleptic::dateToJulianDay( year + 1911, month, day, jd ); ++ return KCalendarSystemGregorian::dateToJulianDay(year + 1911, month, day, jd); + } + +diff --git a/kdecore/date/kcalendarsystemminguo_p.h b/kdecore/date/kcalendarsystemminguo_p.h +index a3f0acc..6e257af 100644 +--- a/kdecore/date/kcalendarsystemminguo_p.h ++++ b/kdecore/date/kcalendarsystemminguo_p.h +@@ -20,7 +20,7 @@ + #ifndef KCALENDARSYSTEMMINGUO_H + #define KCALENDARSYSTEMMINGUO_H + +-#include "kcalendarsystemgregorianproleptic_p.h" ++#include "kcalendarsystemgregorian_p.h" + + class KCalendarSystemMinguoPrivate; + +@@ -35,11 +35,11 @@ class KCalendarSystemMinguoPrivate; + * + * @author John Layt <john@layt.net> + */ +-class KCalendarSystemMinguo: public KCalendarSystemGregorianProleptic ++class KCalendarSystemMinguo: public KCalendarSystemGregorian + { + public: +- explicit KCalendarSystemMinguo( const KLocale *locale = 0 ); +- explicit KCalendarSystemMinguo( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemMinguo(const KLocale *locale = 0); ++ explicit KCalendarSystemMinguo(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemMinguo(); + + virtual QString calendarType() const; +@@ -47,58 +47,19 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; + +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; + +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -106,11 +67,11 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemMinguo( KCalendarSystemMinguoPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemMinguo(KCalendarSystemMinguoPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + Q_DECLARE_PRIVATE(KCalendarSystemMinguo) +diff --git a/kdecore/date/kcalendarsystemprivate_p.h b/kdecore/date/kcalendarsystemprivate_p.h +index ce3a6bc..406fece 100644 +--- a/kdecore/date/kcalendarsystemprivate_p.h ++++ b/kdecore/date/kcalendarsystemprivate_p.h +@@ -28,8 +28,7 @@ class KCalendarSystem; + class KCalendarEra; + class KLocale; + +-struct DateComponents +-{ ++struct DateComponents { + int day; + int month; + int year; +@@ -47,74 +46,74 @@ struct DateComponents + class KCalendarSystemPrivate + { + public: +- explicit KCalendarSystemPrivate( KCalendarSystem *q ); ++ explicit KCalendarSystemPrivate(KCalendarSystem *q); + + virtual ~KCalendarSystemPrivate(); + + // Virtual methods each calendar system must re-implement + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual int monthsInYear( int year ) const; +- virtual int daysInMonth( int year, int month ) const; +- virtual int daysInYear( int year ) const; ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; + virtual int daysInWeek() const; +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasLeapMonths() const; + virtual bool hasYearZero() const; + virtual int maxDaysInWeek() const; + virtual int maxMonthsInYear() const; + virtual int earliestValidYear() const; + virtual int latestValidYear() const; +- virtual QString monthName( int month, int year, KLocale::DateTimeComponentFormat format, bool possessive = false ) const; +- virtual QString weekDayName( int weekDay, KLocale::DateTimeComponentFormat format ) const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive = false) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; + + // Virtual methods to re-implement if special maths needed +- virtual int week( const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum ) const; +- virtual int isoWeekNumber( const QDate &date, int *yearNum ) const; +- virtual int regularWeekNumber( const QDate &date, int weekStartDay, int firstWeekNumber, int *weekYear ) const; +- virtual int simpleWeekNumber( const QDate &date, int *yearNum ) const; +- virtual int weeksInYear( int year, KLocale::WeekNumberSystem weekNumberSystem ) const; +- virtual int isoWeeksInYear( int year ) const; +- virtual int regularWeeksInYear( int year, int weekStartDay, int firstWeekNumber ) const; +- virtual int simpleWeeksInYear( int year ) const; ++ virtual int week(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem, int *yearNum) const; ++ virtual int isoWeekNumber(const QDate &date, int *yearNum) const; ++ virtual int regularWeekNumber(const QDate &date, int weekStartDay, int firstWeekNumber, int *weekYear) const; ++ virtual int simpleWeekNumber(const QDate &date, int *yearNum) const; ++ virtual int weeksInYear(int year, KLocale::WeekNumberSystem weekNumberSystem) const; ++ virtual int isoWeeksInYear(int year) const; ++ virtual int regularWeeksInYear(int year, int weekStartDay, int firstWeekNumber) const; ++ virtual int simpleWeeksInYear(int year) const; + + // Virtual methods to re-implement if special maths needed + // Currently only Hebrew may need special conversion, rest should be OK +- virtual int yearsDifference( const QDate &fromDate, const QDate &toDate ) const; +- virtual int monthsDifference( const QDate &fromDate, const QDate &toDate ) const; +- virtual void dateDifference( const QDate &fromDate, const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction ) const; ++ virtual int yearsDifference(const QDate &fromDate, const QDate &toDate) const; ++ virtual int monthsDifference(const QDate &fromDate, const QDate &toDate) const; ++ virtual void dateDifference(const QDate &fromDate, const QDate &toDate, ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const; + + // Virtual methods to re-implement if special number/string conversion needed + // Currently only Hebrew needs special conversion, rest use KLocale DigitSet +- virtual int integerFromString( const QString &string, int maxLength, int &readLength ) const; +- virtual QString stringFromInteger( int number, int padWidth = 0, QChar padChar = QLatin1Char('0') ) const; +- virtual QString stringFromInteger( int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet ) const; ++ virtual int integerFromString(const QString &string, int maxLength, int &readLength) const; ++ virtual QString stringFromInteger(int number, int padWidth = 0, QChar padChar = QLatin1Char('0')) const; ++ virtual QString stringFromInteger(int number, int padWidth, QChar padChar, KLocale::DigitSet digitSet) const; + + // Utility functions +- bool setAnyDate( QDate &date, int year, int month, int day ) const; +- int addYears( int startYear, int yearsToAdd ) const; +- int differenceYearNumbers( int fromYear, int toYear ) const; ++ bool setAnyDate(QDate &date, int year, int month, int day) const; ++ int addYears(int startYear, int yearsToAdd) const; ++ int differenceYearNumbers(int fromYear, int toYear) const; + QDate invalidDate() const; +- QString simpleDateString( const QString &str ) const; +- int dayOfYear( const QDate &date ) const; +- int dayOfWeek( const QDate &date ) const; +- QDate firstDayOfYear( int year ) const; +- QDate lastDayOfYear( int year ) const; +- QDate firstDayOfMonth( int year, int month ) const; +- QDate lastDayOfMonth( int year, int month ) const; ++ QString simpleDateString(const QString &str) const; ++ int dayOfYear(const QDate &date) const; ++ int dayOfWeek(const QDate &date) const; ++ QDate firstDayOfYear(int year) const; ++ QDate lastDayOfYear(int year) const; ++ QDate firstDayOfMonth(int year, int month) const; ++ QDate lastDayOfMonth(int year, int month) const; + const KLocale *locale() const; +- void loadEraList( const KConfigGroup & cg ); +- void addEra( char direction, int offset, const QDate &startDate, int startYear, const QDate &endDate, +- const QString &name, const QString &shortName, const QString &format ); ++ void loadEraList(const KConfigGroup & cg); ++ void addEra(char direction, int offset, const QDate &startDate, int startYear, const QDate &endDate, ++ const QString &name, const QString &shortName, const QString &format); + QList<KCalendarEra> *eraList() const; +- KCalendarEra era( const QDate &eraDate ) const; +- KCalendarEra era( const QString &eraName, int yearInEra ) const; ++ KCalendarEra era(const QDate &eraDate) const; ++ KCalendarEra era(const QString &eraName, int yearInEra) const; + int shortYearWindowStartYear() const; +- int applyShortYearWindow( int inputYear ) const; +- void loadShortYearWindowStartYear( const KConfigGroup & cg ); ++ int applyShortYearWindow(int inputYear) const; ++ void loadShortYearWindowStartYear(const KConfigGroup & cg); + KSharedConfig::Ptr config(); +- void loadConfig( const QString & calendarType ); ++ void loadConfig(const QString & calendarType); + + // Global variables each calendar system must initialise + const KCalendarSystem *q; +diff --git a/kdecore/date/kcalendarsystemqdate.cpp b/kdecore/date/kcalendarsystemqdate.cpp +new file mode 100644 +index 0000000..1acf3be +--- /dev/null ++++ b/kdecore/date/kcalendarsystemqdate.cpp +@@ -0,0 +1,561 @@ ++/* ++ Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> ++ Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org> ++ Copyright 2007, 2010 John Layt <john@layt.net> ++ ++ 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; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++// Derived QDate kde calendar class ++ ++#include "kcalendarsystemqdate_p.h" ++#include "kcalendarsystemprivate_p.h" ++#include "kcalendarera_p.h" ++ ++#include "kdebug.h" ++#include "klocale.h" ++#include "kglobal.h" ++#include "kconfiggroup.h" ++ ++#include <QtCore/QDate> ++#include <QtCore/QCharRef> ++ ++class KCalendarSystemQDatePrivate : public KCalendarSystemPrivate ++{ ++public: ++ explicit KCalendarSystemQDatePrivate(KCalendarSystemQDate *q); ++ ++ virtual ~KCalendarSystemQDatePrivate(); ++ ++ // Virtual methods each calendar system must re-implement ++ virtual KLocale::CalendarSystem calendarSystem() const; ++ virtual void loadDefaultEraList(); ++ virtual int monthsInYear(int year) const; ++ virtual int daysInMonth(int year, int month) const; ++ virtual int daysInYear(int year) const; ++ virtual int daysInWeek() const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool hasLeapMonths() const; ++ virtual bool hasYearZero() const; ++ virtual int maxDaysInWeek() const; ++ virtual int maxMonthsInYear() const; ++ virtual int earliestValidYear() const; ++ virtual int latestValidYear() const; ++ virtual QString monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const; ++ virtual QString weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const; ++ ++ bool m_useCommonEra; ++}; ++ ++// Shared d pointer implementations ++ ++KCalendarSystemQDatePrivate::KCalendarSystemQDatePrivate(KCalendarSystemQDate *q) ++ : KCalendarSystemPrivate(q), ++ m_useCommonEra(false) ++ ++{ ++} ++ ++KCalendarSystemQDatePrivate::~KCalendarSystemQDatePrivate() ++{ ++} ++ ++KLocale::CalendarSystem KCalendarSystemQDatePrivate::calendarSystem() const ++{ ++ return KLocale::QDateCalendar; ++} ++ ++void KCalendarSystemQDatePrivate::loadDefaultEraList() ++{ ++ QString name, shortName, format; ++ ++ KConfigGroup lcg(config(), QString::fromLatin1("Locale")); ++ KConfigGroup cg = lcg.group(QString::fromLatin1("KCalendarSystem %1").arg(q->calendarType(q->calendarSystem()))); ++ m_useCommonEra = cg.readEntry("UseCommonEra", false); ++ ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Gregorian Common Era, years < 0, LongFormat", "Before Common Era"); ++ shortName = i18nc("Calendar Era: Gregorian Common Era, years < 0, ShortFormat", "BCE"); ++ } else { ++ name = i18nc("Calendar Era: Gregorian Christian Era, years < 0, LongFormat", "Before Christ"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years < 0, ShortFormat", "BC"); ++ } ++ format = i18nc("(kdedt-format) Gregorian, BC, full era year format used for %EY, e.g. 2000 BC", "%Ey %EC"); ++ addEra('-', 1, q->epoch().addDays(-1), -1, q->earliestValidDate(), name, shortName, format); ++ ++ if (m_useCommonEra) { ++ name = i18nc("Calendar Era: Gregorian Common Era, years > 0, LongFormat", "Common Era"); ++ shortName = i18nc("Calendar Era: Gregorian Common Era, years > 0, ShortFormat", "CE"); ++ } else { ++ name = i18nc("Calendar Era: Gregorian Christian Era, years > 0, LongFormat", "Anno Domini"); ++ shortName = i18nc("Calendar Era: Gregorian Christian Era, years > 0, ShortFormat", "AD"); ++ } ++ format = i18nc("(kdedt-format) Gregorian, AD, full era year format used for %EY, e.g. 2000 AD", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); ++} ++ ++int KCalendarSystemQDatePrivate::monthsInYear(int year) const ++{ ++ Q_UNUSED(year) ++ return 12; ++} ++ ++int KCalendarSystemQDatePrivate::daysInMonth(int year, int month) const ++{ ++ QDate tempDate(year, month, 1); ++ return tempDate.daysInMonth(); ++} ++ ++int KCalendarSystemQDatePrivate::daysInYear(int year) const ++{ ++ QDate tempDate(year, 1, 1); ++ return tempDate.daysInYear(); ++} ++ ++int KCalendarSystemQDatePrivate::daysInWeek() const ++{ ++ return 7; ++} ++ ++bool KCalendarSystemQDatePrivate::isLeapYear(int year) const ++{ ++ return QDate::isLeapYear(year); ++} ++ ++bool KCalendarSystemQDatePrivate::hasLeapMonths() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemQDatePrivate::hasYearZero() const ++{ ++ return false; ++} ++ ++int KCalendarSystemQDatePrivate::maxDaysInWeek() const ++{ ++ return 7; ++} ++ ++int KCalendarSystemQDatePrivate::maxMonthsInYear() const ++{ ++ return 12; ++} ++ ++int KCalendarSystemQDatePrivate::earliestValidYear() const ++{ ++ return -4712; ++} ++ ++int KCalendarSystemQDatePrivate::latestValidYear() const ++{ ++ return 9999; ++} ++ ++QString KCalendarSystemQDatePrivate::monthName(int month, int year, KLocale::DateTimeComponentFormat format, bool possessive) const ++{ ++ Q_UNUSED(year); ++ ++ if (format == KLocale::NarrowName) { ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::NarrowName", "J").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::NarrowName", "F").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::NarrowName", "M").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::NarrowName", "A").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::NarrowName", "M").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::NarrowName", "J").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::NarrowName", "J").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::NarrowName", "A").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::NarrowName", "S").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::NarrowName", "O").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::NarrowName", "N").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::NarrowName", "D").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName && possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::ShortName Possessive", "of Jan").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::ShortName Possessive", "of Feb").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::ShortName Possessive", "of Mar").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::ShortName Possessive", "of Apr").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::ShortName Possessive", "of May").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::ShortName Possessive", "of Jun").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::ShortName Possessive", "of Jul").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::ShortName Possessive", "of Aug").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::ShortName Possessive", "of Sep").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::ShortName Possessive", "of Oct").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::ShortName Possessive", "of Nov").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::ShortName Possessive", "of Dec").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName && !possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::ShortName", "Jan").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::ShortName", "Feb").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::ShortName", "Mar").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::ShortName", "Apr").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::ShortName", "May").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::ShortName", "Jun").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::ShortName", "Jul").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::ShortName", "Aug").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::ShortName", "Sep").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::ShortName", "Oct").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::ShortName", "Nov").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::ShortName", "Dec").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::LongName && possessive) { ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::LongName Possessive", "of January").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::LongName Possessive", "of February").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::LongName Possessive", "of March").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::LongName Possessive", "of April").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::LongName Possessive", "of May").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::LongName Possessive", "of June").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::LongName Possessive", "of July").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::LongName Possessive", "of August").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::LongName Possessive", "of September").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::LongName Possessive", "of October").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::LongName Possessive", "of November").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::LongName Possessive", "of December").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ // Default to LongName ++ switch (month) { ++ case 1: ++ return ki18nc("Gregorian month 1 - KLocale::LongName", "January").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian month 2 - KLocale::LongName", "February").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian month 3 - KLocale::LongName", "March").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian month 4 - KLocale::LongName", "April").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian month 5 - KLocale::LongName", "May").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian month 6 - KLocale::LongName", "June").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian month 7 - KLocale::LongName", "July").toString(locale()); ++ case 8: ++ return ki18nc("Gregorian month 8 - KLocale::LongName", "August").toString(locale()); ++ case 9: ++ return ki18nc("Gregorian month 9 - KLocale::LongName", "September").toString(locale()); ++ case 10: ++ return ki18nc("Gregorian month 10 - KLocale::LongName", "October").toString(locale()); ++ case 11: ++ return ki18nc("Gregorian month 11 - KLocale::LongName", "November").toString(locale()); ++ case 12: ++ return ki18nc("Gregorian month 12 - KLocale::LongName", "December").toString(locale()); ++ default: ++ return QString(); ++ } ++} ++ ++QString KCalendarSystemQDatePrivate::weekDayName(int weekDay, KLocale::DateTimeComponentFormat format) const ++{ ++ if (format == KLocale::NarrowName) { ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Gregorian weekday 1 - KLocale::NarrowName ", "M").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian weekday 2 - KLocale::NarrowName ", "T").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian weekday 3 - KLocale::NarrowName ", "W").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian weekday 4 - KLocale::NarrowName ", "T").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian weekday 5 - KLocale::NarrowName ", "F").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian weekday 6 - KLocale::NarrowName ", "S").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian weekday 7 - KLocale::NarrowName ", "S").toString(locale()); ++ default: ++ return QString(); ++ } ++ } ++ ++ if (format == KLocale::ShortName || format == KLocale:: ShortNumber) { ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Gregorian weekday 1 - KLocale::ShortName", "Mon").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian weekday 2 - KLocale::ShortName", "Tue").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian weekday 3 - KLocale::ShortName", "Wed").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian weekday 4 - KLocale::ShortName", "Thu").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian weekday 5 - KLocale::ShortName", "Fri").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian weekday 6 - KLocale::ShortName", "Sat").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian weekday 7 - KLocale::ShortName", "Sun").toString(locale()); ++ default: return QString(); ++ } ++ } ++ ++ switch (weekDay) { ++ case 1: ++ return ki18nc("Gregorian weekday 1 - KLocale::LongName", "Monday").toString(locale()); ++ case 2: ++ return ki18nc("Gregorian weekday 2 - KLocale::LongName", "Tuesday").toString(locale()); ++ case 3: ++ return ki18nc("Gregorian weekday 3 - KLocale::LongName", "Wednesday").toString(locale()); ++ case 4: ++ return ki18nc("Gregorian weekday 4 - KLocale::LongName", "Thursday").toString(locale()); ++ case 5: ++ return ki18nc("Gregorian weekday 5 - KLocale::LongName", "Friday").toString(locale()); ++ case 6: ++ return ki18nc("Gregorian weekday 6 - KLocale::LongName", "Saturday").toString(locale()); ++ case 7: ++ return ki18nc("Gregorian weekday 7 - KLocale::LongName", "Sunday").toString(locale()); ++ default: ++ return QString(); ++ } ++} ++ ++ ++KCalendarSystemQDate::KCalendarSystemQDate(const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemQDatePrivate(this), KSharedConfig::Ptr(), locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemQDate::KCalendarSystemQDate(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(*new KCalendarSystemQDatePrivate(this), config, locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemQDate::KCalendarSystemQDate(KCalendarSystemQDatePrivate &dd, const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystem(dd, config, locale) ++{ ++ d_ptr->loadConfig(calendarType()); ++} ++ ++KCalendarSystemQDate::~KCalendarSystemQDate() ++{ ++} ++ ++QString KCalendarSystemQDate::calendarType() const ++{ ++ return QLatin1String("gregorian"); ++} ++ ++QDate KCalendarSystemQDate::epoch() const ++{ ++ // 1 Jan 1 AD in Julian ++ return QDate::fromJulianDay(1721424); ++} ++ ++QDate KCalendarSystemQDate::earliestValidDate() const ++{ ++ // 1 Jan 4712 BC, no year zero, cant be 4713BC due to error in QDate that day 0 is not valid ++ // and we really need the first in each year to be valid for the date maths ++ return QDate::fromJulianDay(366); ++} ++ ++QDate KCalendarSystemQDate::latestValidDate() const ++{ ++ // Set to last day of year 9999 until confirm date formats & widets support > 9999 ++ // In Gregorian this is 9999-12-31, which is is jd 5373484 ++ // Can't call setDate( 9999, 12, 31 ) as it creates circular reference! ++ return QDate::fromJulianDay(5373484); ++} ++ ++bool KCalendarSystemQDate::isValid(int year, int month, int day) const ++{ ++ // Limit to max year 9999 for now, QDate allows to be greater ++ if (year <= 9999) { ++ return QDate::isValid(year, month, day); ++ } ++ ++ return false; ++} ++ ++bool KCalendarSystemQDate::isValid(const QDate &date) const ++{ ++ return KCalendarSystem::isValid(date); ++} ++ ++int KCalendarSystemQDate::year(const QDate &date) const ++{ ++ return date.year(); ++} ++ ++int KCalendarSystemQDate::month(const QDate &date) const ++{ ++ return date.month(); ++} ++ ++int KCalendarSystemQDate::day(const QDate &date) const ++{ ++ return date.day(); ++} ++ ++int KCalendarSystemQDate::daysInYear(const QDate &date) const ++{ ++ return date.daysInYear(); ++} ++ ++int KCalendarSystemQDate::daysInMonth(const QDate &date) const ++{ ++ return date.daysInMonth(); ++} ++ ++int KCalendarSystemQDate::dayOfYear(const QDate &date) const ++{ ++ return date.dayOfYear(); ++} ++ ++int KCalendarSystemQDate::dayOfWeek(const QDate &date) const ++{ ++ return date.dayOfWeek(); ++} ++ ++bool KCalendarSystemQDate::isLeapYear(int year) const ++{ ++ return QDate::isLeapYear(year); ++} ++ ++bool KCalendarSystemQDate::isLeapYear(const QDate &date) const ++{ ++ return QDate::isLeapYear(date.year()); ++} ++ ++QString KCalendarSystemQDate::monthName(int month, int year, MonthNameFormat format) const ++{ ++ return KCalendarSystem::monthName(month, year, format); ++} ++ ++QString KCalendarSystemQDate::monthName(const QDate &date, MonthNameFormat format) const ++{ ++ return KCalendarSystem::monthName(date, format); ++} ++ ++QString KCalendarSystemQDate::weekDayName(int weekDay, WeekDayNameFormat format) const ++{ ++ return KCalendarSystem::weekDayName(weekDay, format); ++} ++ ++QString KCalendarSystemQDate::weekDayName(const QDate &date, WeekDayNameFormat format) const ++{ ++ return KCalendarSystem::weekDayName(date, format); ++} ++ ++int KCalendarSystemQDate::weekDayOfPray() const ++{ ++ return 7; // sunday ++} ++ ++bool KCalendarSystemQDate::isLunar() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemQDate::isLunisolar() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemQDate::isSolar() const ++{ ++ return true; ++} ++ ++bool KCalendarSystemQDate::isProleptic() const ++{ ++ return false; ++} ++ ++bool KCalendarSystemQDate::julianDayToDate(int jd, int &year, int &month, int &day) const ++{ ++ QDate date = QDate::fromJulianDay(jd); ++ ++ date.getDate(&year, &month, &day); ++ ++ return date.isValid(); ++} ++ ++bool KCalendarSystemQDate::dateToJulianDay(int year, int month, int day, int &jd) const ++{ ++ QDate date; ++ ++ date.setDate(year, month, day); ++ jd = date.toJulianDay(); ++ ++ return date.isValid(); ++} +diff --git a/kdecore/date/kcalendarsystemqdate_p.h b/kdecore/date/kcalendarsystemqdate_p.h +new file mode 100644 +index 0000000..5d86bd6 +--- /dev/null ++++ b/kdecore/date/kcalendarsystemqdate_p.h +@@ -0,0 +1,93 @@ ++/* ++ Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es> ++ Copyright (c) 2002 Hans Petter Bieker <bieker@kde.org> ++ Copyright 2007, 2010 John Layt <john@layt.net> ++ ++ 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; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++*/ ++ ++#ifndef KCALENDARSYSTEMQDATE_H ++#define KCALENDARSYSTEMQDATE_H ++ ++#include "kcalendarsystem.h" ++ ++class KCalendarSystemQDatePrivate; ++ ++/** ++ * @internal ++ * This is the QDate calendar implementation which combines the Julian and Gregorian ++ * calculations into a single calendar. It should always be used by default in Qt ++ * applications for consistency. ++ * ++ * @b license GNU-LGPL v.2+ ++ * ++ * @see KLocale,KCalendarSystem ++ * ++ * @author John Layt <john@layt.net> ++ */ ++class KCalendarSystemQDate: public KCalendarSystem ++{ ++public: ++ explicit KCalendarSystemQDate(const KLocale *locale = 0); ++ explicit KCalendarSystemQDate(const KSharedConfig::Ptr config, const KLocale *locale = 0); ++ virtual ~KCalendarSystemQDate(); ++ ++ virtual QString calendarType() const; ++ ++ virtual QDate epoch() const; ++ virtual QDate earliestValidDate() const; ++ virtual QDate latestValidDate() const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; ++ ++ virtual int year(const QDate &date) const; ++ virtual int month(const QDate &date) const; ++ virtual int day(const QDate &date) const; ++ ++ virtual int daysInYear(const QDate &date) const; ++ virtual int daysInMonth(const QDate &date) const; ++ ++ virtual int dayOfYear(const QDate &date) const; ++ virtual int dayOfWeek(const QDate &date) const; ++ ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; ++ ++ virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const; ++ virtual QString monthName(const QDate &date, MonthNameFormat format = LongName) const; ++ ++ virtual QString weekDayName(int weekDay, WeekDayNameFormat format = LongDayName) const; ++ virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const; ++ ++ virtual int weekDayOfPray() const; ++ ++ virtual bool isLunar() const; ++ virtual bool isLunisolar() const; ++ virtual bool isSolar() const; ++ virtual bool isProleptic() const; ++ ++protected: ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemQDate(KCalendarSystemQDatePrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); ++ ++private: ++ Q_DECLARE_PRIVATE(KCalendarSystemQDate) ++}; ++ ++#endif +diff --git a/kdecore/date/kcalendarsystemthai.cpp b/kdecore/date/kcalendarsystemthai.cpp +index ab51aaa..9a1ca5a 100644 +--- a/kdecore/date/kcalendarsystemthai.cpp ++++ b/kdecore/date/kcalendarsystemthai.cpp +@@ -18,31 +18,31 @@ + */ + + #include "kcalendarsystemthai_p.h" +-#include "kcalendarsystemgregorianprolepticprivate_p.h" ++#include "kcalendarsystemgregorianprivate_p.h" + + #include "kdebug.h" + #include "klocale.h" + + #include <QtCore/QDate> + +-//Reuse the Gregorian Proleptic private implementation +-class KCalendarSystemThaiPrivate : public KCalendarSystemGregorianProlepticPrivate ++//Reuse the Gregorian private implementation ++class KCalendarSystemThaiPrivate : public KCalendarSystemGregorianPrivate + { + public: +- explicit KCalendarSystemThaiPrivate( KCalendarSystemThai *q ); ++ explicit KCalendarSystemThaiPrivate(KCalendarSystemThai *q); + virtual ~KCalendarSystemThaiPrivate(); + + virtual KLocale::CalendarSystem calendarSystem() const; + virtual void loadDefaultEraList(); +- virtual bool isLeapYear( int year ) const; ++ virtual bool isLeapYear(int year) const; + virtual bool hasYearZero() const; + virtual int earliestValidYear() const; + }; + +-//Override only a few of the Gregorian Proleptic private methods ++//Override only a few of the Gregorian private methods + +-KCalendarSystemThaiPrivate::KCalendarSystemThaiPrivate( KCalendarSystemThai *q ) +- : KCalendarSystemGregorianProlepticPrivate( q ) ++KCalendarSystemThaiPrivate::KCalendarSystemThaiPrivate(KCalendarSystemThai *q) ++ : KCalendarSystemGregorianPrivate(q) + { + } + +@@ -59,15 +59,15 @@ void KCalendarSystemThaiPrivate::loadDefaultEraList() + { + QString name, shortName, format; + +- name = i18nc( "Calendar Era: Thai Buddhist Era, years > 0, LongFormat", "Buddhist Era" ); +- shortName = i18nc( "Calendar Era: Thai Buddhist Era, years > 0, ShortFormat", "BE" ); +- format = i18nc( "(kdedt-format) Thai, BE, full era year format used for %EY, e.g. 2000 BE", "%Ey %EC" ); +- addEra( '+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format ); ++ name = i18nc("Calendar Era: Thai Buddhist Era, years > 0, LongFormat", "Buddhist Era"); ++ shortName = i18nc("Calendar Era: Thai Buddhist Era, years > 0, ShortFormat", "BE"); ++ format = i18nc("(kdedt-format) Thai, BE, full era year format used for %EY, e.g. 2000 BE", "%Ey %EC"); ++ addEra('+', 1, q->epoch(), 1, q->latestValidDate(), name, shortName, format); + } + +-bool KCalendarSystemThaiPrivate::isLeapYear( int year ) const ++bool KCalendarSystemThaiPrivate::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProlepticPrivate::isLeapYear( year - 543 ); ++ return KCalendarSystemGregorianPrivate::isLeapYear(year - 543); + } + + bool KCalendarSystemThaiPrivate::hasYearZero() const +@@ -81,23 +81,23 @@ int KCalendarSystemThaiPrivate::earliestValidYear() const + } + + +-KCalendarSystemThai::KCalendarSystemThai( const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemThaiPrivate( this ), KSharedConfig::Ptr(), locale ) ++KCalendarSystemThai::KCalendarSystemThai(const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemThaiPrivate(this), KSharedConfig::Ptr(), locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemThai::KCalendarSystemThai( const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( *new KCalendarSystemThaiPrivate( this ), config, locale ) ++KCalendarSystemThai::KCalendarSystemThai(const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(*new KCalendarSystemThaiPrivate(this), config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + +-KCalendarSystemThai::KCalendarSystemThai( KCalendarSystemThaiPrivate &dd, +- const KSharedConfig::Ptr config, const KLocale *locale ) +- : KCalendarSystemGregorianProleptic( dd, config, locale ) ++KCalendarSystemThai::KCalendarSystemThai(KCalendarSystemThaiPrivate &dd, ++ const KSharedConfig::Ptr config, const KLocale *locale) ++ : KCalendarSystemGregorian(dd, config, locale) + { +- d_ptr->loadConfig( calendarType() ); ++ d_ptr->loadConfig(calendarType()); + } + + KCalendarSystemThai::~KCalendarSystemThai() +@@ -106,13 +106,13 @@ KCalendarSystemThai::~KCalendarSystemThai() + + QString KCalendarSystemThai::calendarType() const + { +- return QLatin1String( "thai" ); ++ return QLatin1String("thai"); + } + + QDate KCalendarSystemThai::epoch() const + { + // 0000-01-01 = 0544-01-01 BC Gregorian = 0544-01-07 BC Julian +- return QDate::fromJulianDay( 1522734 ); ++ return QDate::fromJulianDay(1522734); + } + + QDate KCalendarSystemThai::earliestValidDate() const +@@ -124,188 +124,27 @@ QDate KCalendarSystemThai::latestValidDate() const + { + // Set to last day of year 9999 until confirm date formats & widgets support > 9999 + // 9999-12-31 = 9456-12-31 AD Gregorian +- return QDate::fromJulianDay( 5175158 ); ++ return QDate::fromJulianDay(5175158); + } + +-bool KCalendarSystemThai::isValid( int year, int month, int day ) const ++bool KCalendarSystemThai::isValid(int year, int month, int day) const + { +- return KCalendarSystemGregorianProleptic::isValid( year, month, day ); ++ return KCalendarSystemGregorian::isValid(year, month, day); + } + +-bool KCalendarSystemThai::isValid( const QDate &date ) const ++bool KCalendarSystemThai::isValid(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::isValid( date ); ++ return KCalendarSystemGregorian::isValid(date); + } + +-bool KCalendarSystemThai::setDate( QDate &date, int year, int month, int day ) const ++bool KCalendarSystemThai::isLeapYear(int year) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, year, month, day ); ++ return KCalendarSystemGregorian::isLeapYear(year); + } + +-// Deprecated +-bool KCalendarSystemThai::setYMD( QDate &date, int y, int m, int d ) const ++bool KCalendarSystemThai::isLeapYear(const QDate &date) const + { +- return KCalendarSystemGregorianProleptic::setDate( date, y, m, d ); +-} +- +-int KCalendarSystemThai::year( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::year( date ); +-} +- +-int KCalendarSystemThai::month( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::month( date ); +-} +- +-int KCalendarSystemThai::day( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::day( date ); +-} +- +-QDate KCalendarSystemThai::addYears( const QDate &date, int nyears ) const +-{ +- return KCalendarSystemGregorianProleptic::addYears( date, nyears ); +-} +- +-QDate KCalendarSystemThai::addMonths( const QDate &date, int nmonths ) const +-{ +- return KCalendarSystemGregorianProleptic::addMonths( date, nmonths ); +-} +- +-QDate KCalendarSystemThai::addDays( const QDate &date, int ndays ) const +-{ +- return KCalendarSystemGregorianProleptic::addDays( date, ndays ); +-} +- +-int KCalendarSystemThai::monthsInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::monthsInYear( date ); +-} +- +-int KCalendarSystemThai::weeksInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( date ); +-} +- +-int KCalendarSystemThai::weeksInYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::weeksInYear( year ); +-} +- +-int KCalendarSystemThai::daysInYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInYear( date ); +-} +- +-int KCalendarSystemThai::daysInMonth( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInMonth( date ); +-} +- +-int KCalendarSystemThai::daysInWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::daysInWeek( date ); +-} +- +-int KCalendarSystemThai::dayOfYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfYear( date ); +-} +- +-int KCalendarSystemThai::dayOfWeek( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::dayOfWeek( date ); +-} +- +-int KCalendarSystemThai::weekNumber( const QDate &date, int * yearNum ) const +-{ +- return KCalendarSystemGregorianProleptic::weekNumber( date, yearNum ); +-} +- +-bool KCalendarSystemThai::isLeapYear( int year ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( year ); +-} +- +-bool KCalendarSystemThai::isLeapYear( const QDate &date ) const +-{ +- return KCalendarSystemGregorianProleptic::isLeapYear( date ); +-} +- +-QString KCalendarSystemThai::monthName( int month, int year, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( month, year, format ); +-} +- +-QString KCalendarSystemThai::monthName( const QDate &date, MonthNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthName( date, format ); +-} +- +-QString KCalendarSystemThai::weekDayName( int weekDay, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( weekDay, format ); +-} +- +-QString KCalendarSystemThai::weekDayName( const QDate &date, WeekDayNameFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::weekDayName( date, format ); +-} +- +-QString KCalendarSystemThai::yearString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::yearString( pDate, format ); +-} +- +-QString KCalendarSystemThai::monthString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::monthString( pDate, format ); +-} +- +-QString KCalendarSystemThai::dayString( const QDate &pDate, StringFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::dayString( pDate, format ); +-} +- +-int KCalendarSystemThai::yearStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::yearStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemThai::monthStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::monthStringToInteger( sNum, iLength ); +-} +- +-int KCalendarSystemThai::dayStringToInteger( const QString &sNum, int &iLength ) const +-{ +- return KCalendarSystemGregorianProleptic::dayStringToInteger( sNum, iLength ); +-} +- +-QString KCalendarSystemThai::formatDate( const QDate &date, KLocale::DateFormat format ) const +-{ +- return KCalendarSystemGregorianProleptic::formatDate( date, format ); +-} +- +-QDate KCalendarSystemThai::readDate( const QString &str, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, ok ); +-} +- +-QDate KCalendarSystemThai::readDate( const QString &intstr, const QString &fmt, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( intstr, fmt, ok ); +-} +- +-QDate KCalendarSystemThai::readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok ) const +-{ +- return KCalendarSystemGregorianProleptic::readDate( str, flags, ok ); +-} +- +-int KCalendarSystemThai::weekStartDay() const +-{ +- return KCalendarSystemGregorianProleptic::weekStartDay(); ++ return KCalendarSystemGregorian::isLeapYear(date); + } + + int KCalendarSystemThai::weekDayOfPray() const +@@ -315,17 +154,17 @@ int KCalendarSystemThai::weekDayOfPray() const + + bool KCalendarSystemThai::isLunar() const + { +- return KCalendarSystemGregorianProleptic::isLunar(); ++ return KCalendarSystemGregorian::isLunar(); + } + + bool KCalendarSystemThai::isLunisolar() const + { +- return KCalendarSystemGregorianProleptic::isLunisolar(); ++ return KCalendarSystemGregorian::isLunisolar(); + } + + bool KCalendarSystemThai::isSolar() const + { +- return KCalendarSystemGregorianProleptic::isSolar(); ++ return KCalendarSystemGregorian::isSolar(); + } + + bool KCalendarSystemThai::isProleptic() const +@@ -333,15 +172,15 @@ bool KCalendarSystemThai::isProleptic() const + return false; + } + +-bool KCalendarSystemThai::julianDayToDate( int jd, int &year, int &month, int &day ) const ++bool KCalendarSystemThai::julianDayToDate(int jd, int &year, int &month, int &day) const + { +- bool result = KCalendarSystemGregorianProleptic::julianDayToDate( jd, year, month, day ); ++ bool result = KCalendarSystemGregorian::julianDayToDate(jd, year, month, day); + year = year + 543; + return result; + } + +-bool KCalendarSystemThai::dateToJulianDay( int year, int month, int day, int &jd ) const ++bool KCalendarSystemThai::dateToJulianDay(int year, int month, int day, int &jd) const + { +- return KCalendarSystemGregorianProleptic::dateToJulianDay( year - 543, month, day, jd ); ++ return KCalendarSystemGregorian::dateToJulianDay(year - 543, month, day, jd); + } + +diff --git a/kdecore/date/kcalendarsystemthai_p.h b/kdecore/date/kcalendarsystemthai_p.h +index c0007c0..9aa02a2 100644 +--- a/kdecore/date/kcalendarsystemthai_p.h ++++ b/kdecore/date/kcalendarsystemthai_p.h +@@ -20,7 +20,7 @@ + #ifndef KCALENDARSYSTEMTHAI_H + #define KCALENDARSYSTEMTHAI_H + +-#include "kcalendarsystemgregorianproleptic_p.h" ++#include "kcalendarsystemgregorian_p.h" + + class KCalendarSystemThaiPrivate; + +@@ -35,11 +35,11 @@ class KCalendarSystemThaiPrivate; + * + * @author John Layt <john@layt.net> + */ +-class KCalendarSystemThai: public KCalendarSystemGregorianProleptic ++class KCalendarSystemThai: public KCalendarSystemGregorian + { + public: +- explicit KCalendarSystemThai( const KLocale *locale = 0 ); +- explicit KCalendarSystemThai( const KSharedConfig::Ptr config, const KLocale *locale = 0 ); ++ explicit KCalendarSystemThai(const KLocale *locale = 0); ++ explicit KCalendarSystemThai(const KSharedConfig::Ptr config, const KLocale *locale = 0); + virtual ~KCalendarSystemThai(); + + virtual QString calendarType() const; +@@ -47,58 +47,13 @@ public: + virtual QDate epoch() const; + virtual QDate earliestValidDate() const; + virtual QDate latestValidDate() const; +- virtual bool isValid( int year, int month, int day ) const; +- virtual bool isValid( const QDate &date ) const; ++ virtual bool isValid(int year, int month, int day) const; ++ virtual bool isValid(const QDate &date) const; + +- virtual bool setDate( QDate &date, int year, int month, int day ) const; +- /** @deprecated */ +- virtual bool setYMD( QDate &date, int year, int month, int day ) const; ++ virtual bool isLeapYear(int year) const; ++ virtual bool isLeapYear(const QDate &date) const; + +- virtual int year( const QDate &date ) const; +- virtual int month( const QDate &date ) const; +- virtual int day( const QDate &date ) const; +- +- virtual QDate addYears( const QDate &date, int nyears ) const; +- virtual QDate addMonths( const QDate &date, int nmonths ) const; +- virtual QDate addDays( const QDate &date, int ndays ) const; +- +- virtual int monthsInYear( const QDate &date ) const; +- virtual int weeksInYear( const QDate &date ) const; +- virtual int weeksInYear( int year ) const; +- virtual int daysInYear( const QDate &date ) const; +- virtual int daysInMonth( const QDate &date ) const; +- virtual int daysInWeek( const QDate &date ) const; +- +- virtual int dayOfYear( const QDate &date ) const; +- virtual int dayOfWeek( const QDate &date ) const; +- +- virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const; +- +- virtual bool isLeapYear( int year ) const; +- virtual bool isLeapYear( const QDate &date ) const; +- +- virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const; +- virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const; +- +- virtual QString weekDayName( int weekDay, WeekDayNameFormat format = LongDayName ) const; +- virtual QString weekDayName( const QDate &date, WeekDayNameFormat format = LongDayName ) const; +- +- virtual QString yearString( const QDate & pDate, StringFormat format = LongFormat ) const; +- virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const; +- virtual QString dayString( const QDate &pDate, StringFormat format = LongFormat ) const; +- +- virtual int yearStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int monthStringToInteger( const QString &sNum, int &iLength ) const; +- virtual int dayStringToInteger( const QString &sNum, int &iLength ) const; +- +- virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const; +- +- virtual QDate readDate( const QString &str, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &dateString, const QString &dateFormat, bool *ok = 0 ) const; +- virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flags, bool *ok = 0 ) const; +- +- virtual int weekStartDay() const; +- virtual int weekDayOfPray () const; ++ virtual int weekDayOfPray() const; + + virtual bool isLunar() const; + virtual bool isLunisolar() const; +@@ -106,11 +61,11 @@ public: + virtual bool isProleptic() const; + + protected: +- virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const; +- virtual bool dateToJulianDay( int year, int month, int day, int &jd ) const; +- KCalendarSystemThai( KCalendarSystemThaiPrivate &dd, +- const KSharedConfig::Ptr config = KSharedConfig::Ptr(), +- const KLocale *locale = 0 ); ++ virtual bool julianDayToDate(int jd, int &year, int &month, int &day) const; ++ virtual bool dateToJulianDay(int year, int month, int day, int &jd) const; ++ KCalendarSystemThai(KCalendarSystemThaiPrivate &dd, ++ const KSharedConfig::Ptr config = KSharedConfig::Ptr(), ++ const KLocale *locale = 0); + + private: + Q_DECLARE_PRIVATE(KCalendarSystemThai) +diff --git a/kdecore/date/kdatetime.cpp b/kdecore/date/kdatetime.cpp +index 5d24fdf..4ba627b 100644 +--- a/kdecore/date/kdatetime.cpp ++++ b/kdecore/date/kdatetime.cpp +@@ -39,7 +39,7 @@ + + #include <kglobal.h> + #include <klocale.h> +-#include "kcalendarsystemgregorian_p.h" ++#include "kcalendarsystemqdate_p.h" + #include <ksystemtimezone.h> + #include <kdebug.h> + +@@ -1427,7 +1427,7 @@ QString KDateTime::toString(const QString &format) const + return QString(); + enum { TZNone, UTCOffsetShort, UTCOffset, UTCOffsetColon, TZAbbrev, TZName }; + KLocale *locale = KGlobal::locale(); +- KCalendarSystemGregorian calendar(locale); ++ KCalendarSystemQDate calendar(locale); + QString result; + QString s; + int num, numLength, zone; +@@ -2484,7 +2484,7 @@ QDateTime fromStr(const QString& string, const QString& format, int& utcOffset, + + enum { TZNone, UTCOffset, UTCOffsetColon, TZAbbrev, TZName }; + KLocale *locale = KGlobal::locale(); +- KCalendarSystemGregorian calendar(locale); ++ KCalendarSystemQDate calendar(locale); + int zone; + int s = 0; + int send = str.length(); +diff --git a/kdecore/date/kdatetimeformatter.cpp b/kdecore/date/kdatetimeformatter.cpp +index 9d8e271..82bbe9e 100644 +--- a/kdecore/date/kdatetimeformatter.cpp ++++ b/kdecore/date/kdatetimeformatter.cpp +@@ -33,8 +33,8 @@ + #include "kdebug.h" + + KDateTimeFormatter::KDateTimeFormatter() +- : m_englishLocale(0), +- m_englishCalendar(0) ++ : m_englishLocale(0), ++ m_englishCalendar(0) + { + } + +@@ -44,70 +44,70 @@ KDateTimeFormatter::~KDateTimeFormatter() + delete m_englishLocale; + } + +-QString KDateTimeFormatter::formatDate( const QDate &fromDate, +- const QString &toFormat, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KDateTimeFormatter::formatDate(const QDate &fromDate, ++ const QString &toFormat, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + // If not valid input, don't waste our time +- if ( !calendar->isValid( fromDate ) || toFormat.isEmpty() ) { ++ if (!calendar->isValid(fromDate) || toFormat.isEmpty()) { + return QString(); + } + +- return formatDateTime( KDateTime( fromDate ), toFormat, 0, calendar, locale, digitSet, formatStandard ); ++ return formatDateTime(KDateTime(fromDate), toFormat, 0, calendar, locale, digitSet, formatStandard); + } + +-QString KDateTimeFormatter::formatTime( const QTime &fromTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KDateTimeFormatter::formatTime(const QTime &fromTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + // If not valid input, don't waste our time +- if ( fromTime.isValid() || toFormat.isEmpty() ) { ++ if (fromTime.isValid() || toFormat.isEmpty()) { + return QString(); + } + +- return formatDateTime( KDateTime( QDate::currentDate(), fromTime ), toFormat, timeOptions, calendar, locale, digitSet, formatStandard ); ++ return formatDateTime(KDateTime(QDate::currentDate(), fromTime), toFormat, timeOptions, calendar, locale, digitSet, formatStandard); + } + + // Format an input date to match a POSIX date format string +-QString KDateTimeFormatter::formatDateTime( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KDateTimeFormatter::formatDateTime(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + // If not valid input, don't waste our time +- if ( !fromDateTime.isValid() || !calendar->isValid( fromDateTime.date() ) || toFormat.isEmpty() ) { ++ if (!fromDateTime.isValid() || !calendar->isValid(fromDateTime.date()) || toFormat.isEmpty()) { + return QString(); + } + +- if ( formatStandard == KLocale::UnicodeFormat ) { +- return formatDateTimeUnicode( fromDateTime, toFormat, timeOptions, calendar, locale, digitSet ); ++ if (formatStandard == KLocale::UnicodeFormat) { ++ return formatDateTimeUnicode(fromDateTime, toFormat, timeOptions, calendar, locale, digitSet); + } else { +- return formatDateTimePosix( fromDateTime, toFormat, timeOptions, calendar, locale, digitSet, formatStandard ); ++ return formatDateTimePosix(fromDateTime, toFormat, timeOptions, calendar, locale, digitSet, formatStandard); + } + } + + // Format an input date to match a POSIX date format string +-QString KDateTimeFormatter::formatDateTimePosix( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QString KDateTimeFormatter::formatDateTimePosix(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + //kDebug() << "formatDateTimePosix(" << fromDateTime << toFormat << ")"; + // If not valid input, don't waste our time +- if ( !fromDateTime.isValid() || toFormat.isEmpty() ) { ++ if (!fromDateTime.isValid() || toFormat.isEmpty()) { + return QString(); + } + +@@ -131,55 +131,55 @@ QString KDateTimeFormatter::formatDateTimePosix( const KDateTime &fromDateTime, + // Pre-fetch the core date components as they get used a lot + // and it is 1/3rd more efficient than 3 separatre calls + int year, month, day; +- calendar->getDate( fromDateTime.date(), &year, &month, &day ); ++ calendar->getDate(fromDateTime.date(), &year, &month, &day); + +- for ( int formatIndex = 0; formatIndex < toFormat.length(); ++formatIndex ) { ++ for (int formatIndex = 0; formatIndex < toFormat.length(); ++formatIndex) { + +- thisChar = toFormat.at( formatIndex ); ++ thisChar = toFormat.at(formatIndex); + +- if ( !escape ) { ++ if (!escape) { + +- if ( thisChar == QLatin1Char('%') ) { ++ if (thisChar == QLatin1Char('%')) { + escape = true; + escapeIndex = formatIndex; + } else { +- result.append( toFormat.at( formatIndex ) ); ++ result.append(toFormat.at(formatIndex)); + } + +- } else if ( !escapeMod && !escapeWidth && thisChar == QLatin1Char('-') ) { // no padding ++ } else if (!escapeMod && !escapeWidth && thisChar == QLatin1Char('-')) { // no padding + + padChar = QChar(); + escapePad = true; + +- } else if ( !escapeMod && !escapeWidth && thisChar == QLatin1Char('_') ) { // space padding ++ } else if (!escapeMod && !escapeWidth && thisChar == QLatin1Char('_')) { // space padding + + padChar = QLatin1Char(' '); + escapePad = true; + +- } else if ( !escapeMod && !escapeWidth && thisChar == QLatin1Char('0') ) { // 0 padding ++ } else if (!escapeMod && !escapeWidth && thisChar == QLatin1Char('0')) { // 0 padding + + padChar = QLatin1Char('0'); + escapePad = true; + +- } else if ( !escapeMod && !escapeWidth && ( thisChar == QLatin1Char('^') || thisChar == QLatin1Char('#') ) ) { // Change case ++ } else if (!escapeMod && !escapeWidth && (thisChar == QLatin1Char('^') || thisChar == QLatin1Char('#'))) { // Change case + + caseChar = thisChar; + +- } else if ( !escapeMod && +- ( ( !escapeWidth && thisChar >= QLatin1Char('1') && thisChar <= QLatin1Char('9') ) || +- ( escapeWidth && thisChar >= QLatin1Char('0') && thisChar <= QLatin1Char('9') ) ) ) { // Change width ++ } else if (!escapeMod && ++ ((!escapeWidth && thisChar >= QLatin1Char('1') && thisChar <= QLatin1Char('9')) || ++ (escapeWidth && thisChar >= QLatin1Char('0') && thisChar <= QLatin1Char('9')))) { // Change width + +- if ( escapeWidth ) { ++ if (escapeWidth) { + padWidth = padWidth * 10; + } +- padWidth = padWidth + QString( thisChar ).toInt(); ++ padWidth = padWidth + QString(thisChar).toInt(); + escapeWidth = true; + +- } else if ( !escapeMod && ( thisChar == QLatin1Char('E') || thisChar == QLatin1Char('O') || thisChar == QLatin1Char(':') ) ) { // Set modifier ++ } else if (!escapeMod && (thisChar == QLatin1Char('E') || thisChar == QLatin1Char('O') || thisChar == QLatin1Char(':'))) { // Set modifier + + escapeMod = true; + modifierChar = thisChar; +- if ( thisChar == QLatin1Char(':') ) { ++ if (thisChar == QLatin1Char(':')) { + invalidModifier = true; + } + +@@ -196,414 +196,414 @@ QString KDateTimeFormatter::formatDateTimePosix( const KDateTime &fromDateTime, + //Default settings unless overridden by pad and case flags and width: are 0 pad to 0 width no sign + //Names will override 0 pad with no pad unless flagged + //Numbers will override with correct width unless flagged +- QChar thisChar = toFormat.at( formatIndex ).unicode(); +- switch ( thisChar.unicode() ) { +- case '%': //Literal % +- if ( modifierChar != QLatin1Char(':') ) { // E and O mods are ignored if not used, but : is treated as literal +- componentString = QLatin1Char('%'); +- if ( !escapePad ) { +- padChar = QChar(); +- } ++ QChar thisChar = toFormat.at(formatIndex).unicode(); ++ switch (thisChar.unicode()) { ++ case '%': //Literal % ++ if (modifierChar != QLatin1Char(':')) { // E and O mods are ignored if not used, but : is treated as literal ++ componentString = QLatin1Char('%'); ++ if (!escapePad) { ++ padChar = QChar(); + } +- break; +- case 't': //Tab +- if ( modifierChar != QLatin1Char(':') ) { +- componentString = QString::fromLatin1("\t"); +- if ( !escapePad ) { +- padChar = QChar(); +- } ++ } ++ break; ++ case 't': //Tab ++ if (modifierChar != QLatin1Char(':')) { ++ componentString = QString::fromLatin1("\t"); ++ if (!escapePad) { ++ padChar = QChar(); + } +- break; +- case 'Y': +- if ( modifierChar == QLatin1Char('E') ) { //Era Year, default no pad to 0 places no sign +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } +- componentString = calendar->eraYear( fromDateTime.date() ); +- } else if ( modifierChar != QLatin1Char(':') ) { //Long year numeric, default 0 pad to 4 places with sign +- componentInteger = qAbs( year ); +- minWidth = 4; +- if ( year < 0 ) { +- signChar = QLatin1Char('-'); +- } ++ } ++ break; ++ case 'Y': ++ if (modifierChar == QLatin1Char('E')) { //Era Year, default no pad to 0 places no sign ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); + } +- break; +- case 'C': +- if ( modifierChar == QLatin1Char('E') ) { //Era name, default no pad to 0 places no sign +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } +- componentString = calendar->eraName( fromDateTime.date() ); +- } else if ( modifierChar != QLatin1Char(':') ) { //Century numeric, default 0 pad to 2 places with sign +- componentInteger = qAbs( year ) / 100 ; +- minWidth = 2; +- if ( year < 0 ) { +- signChar = QLatin1Char('-'); +- } ++ componentString = calendar->eraYear(fromDateTime.date()); ++ } else if (modifierChar != QLatin1Char(':')) { //Long year numeric, default 0 pad to 4 places with sign ++ componentInteger = qAbs(year); ++ minWidth = 4; ++ if (year < 0) { ++ signChar = QLatin1Char('-'); + } +- break; +- case 'y': +- if ( modifierChar == QLatin1Char('E') ) { //Year in Era number, default 0 pad to 1 places no sign +- componentInteger = calendar->yearInEra( fromDateTime.date() ); +- minWidth = 1; +- } else if ( modifierChar != QLatin1Char(':') ) { //Short year numeric, default 0 pad to 2 places with sign +- componentInteger = qAbs( year ) % 100; +- minWidth = 2; +- if ( year < 0 ) { +- signChar = QLatin1Char('-'); +- } ++ } ++ break; ++ case 'C': ++ if (modifierChar == QLatin1Char('E')) { //Era name, default no pad to 0 places no sign ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); + } +- break; +- case 'm': // Month numeric ++ componentString = calendar->eraName(fromDateTime.date()); ++ } else if (modifierChar != QLatin1Char(':')) { //Century numeric, default 0 pad to 2 places with sign ++ componentInteger = qAbs(year) / 100 ; ++ minWidth = 2; ++ if (year < 0) { ++ signChar = QLatin1Char('-'); ++ } ++ } ++ break; ++ case 'y': ++ if (modifierChar == QLatin1Char('E')) { //Year in Era number, default 0 pad to 1 places no sign ++ componentInteger = calendar->yearInEra(fromDateTime.date()); ++ minWidth = 1; ++ } else if (modifierChar != QLatin1Char(':')) { //Short year numeric, default 0 pad to 2 places with sign ++ componentInteger = qAbs(year) % 100; ++ minWidth = 2; ++ if (year < 0) { ++ signChar = QLatin1Char('-'); ++ } ++ } ++ break; ++ case 'm': // Month numeric ++ componentInteger = month; ++ if (modifierChar == QLatin1Char(':')) { //Short month numeric, default no pad to 1 places no sign ++ minWidth = 1; ++ if (!escapePad) { ++ padChar = QChar(); ++ } ++ invalidModifier = false; ++ } else { //Long month numeric, default 0 pad to 2 places no sign + componentInteger = month; +- if ( modifierChar == QLatin1Char(':') ) { //Short month numeric, default no pad to 1 places no sign ++ minWidth = 2; ++ } ++ break; ++ case 'n': ++ //PosixFormat %n is newline ++ //KdeFormat %n is short month numeric ++ if (modifierChar != QLatin1Char(':')) { ++ if (formatStandard == KLocale::KdeFormat) { ++ //Copy what %e does, no padding by default ++ //Short month numeric, default no pad to 1 places no sign ++ componentInteger = month; + minWidth = 1; +- if ( !escapePad ) { ++ if (!escapePad) { + padChar = QChar(); + } +- invalidModifier = false; +- } else { //Long month numeric, default 0 pad to 2 places no sign +- componentInteger = month; +- minWidth = 2; ++ } else { // formatStandard == KLocale::PosixFormat ++ componentString = QLatin1Char('\n'); + } +- break; +- case 'n': +- //PosixFormat %n is newline +- //KdeFormat %n is short month numeric +- if ( modifierChar != QLatin1Char(':') ) { +- if ( formatStandard == KLocale::KdeFormat ) { +- //Copy what %e does, no padding by default +- //Short month numeric, default no pad to 1 places no sign +- componentInteger = month; +- minWidth = 1; +- if ( !escapePad ) { +- padChar = QChar(); +- } +- } else { // formatStandard == KLocale::PosixFormat +- componentString = QLatin1Char('\n'); ++ } ++ break; ++ case 'd': //Long day numeric, default 0 pad to 2 places no sign ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = day; ++ minWidth = 2; ++ } ++ break; ++ case 'e': //Short day numeric, default no sign ++ //PosixFormat %e is space pad to 2 places ++ //KdeFormat %e is no pad to 1 place ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = day; ++ if (formatStandard == KLocale::KdeFormat) { ++ minWidth = 1; ++ if (!escapePad) { ++ padChar = QChar(); + } +- } +- break; +- case 'd': //Long day numeric, default 0 pad to 2 places no sign +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = day; ++ } else { // formatStandard == KLocale::PosixFormat + minWidth = 2; +- } +- break; +- case 'e': //Short day numeric, default no sign +- //PosixFormat %e is space pad to 2 places +- //KdeFormat %e is no pad to 1 place +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = day; +- if ( formatStandard == KLocale::KdeFormat ) { +- minWidth = 1; +- if ( !escapePad ) { +- padChar = QChar(); +- } +- } else { // formatStandard == KLocale::PosixFormat +- minWidth = 2; +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); + } + } +- break; +- case 'B': //Long month name, default space pad to 0 places no sign +- if ( locale->dateMonthNamePossessive() ) { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->monthName( month, year, KCalendarSystem::LongNamePossessive ); +- } else { +- componentString = calendar->monthName( month, year, KCalendarSystem::LongNamePossessive ); +- } ++ } ++ break; ++ case 'B': //Long month name, default space pad to 0 places no sign ++ if (locale->dateMonthNamePossessive()) { ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->monthName(month, year, KCalendarSystem::LongNamePossessive); + } else { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->monthName( month, year, KCalendarSystem::LongName ); +- } else { +- componentString = calendar->monthName( month, year, KCalendarSystem::LongName ); +- } +- } +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); ++ componentString = calendar->monthName(month, year, KCalendarSystem::LongNamePossessive); + } +- break; +- case 'h': //Short month name, default space pad to 0 places no sign +- case 'b': //Short month name, default space pad to 0 places no sign +- if ( locale->dateMonthNamePossessive() ) { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->monthName( month, year, KCalendarSystem::ShortNamePossessive ); +- } else { +- componentString = calendar->monthName( month, year, KCalendarSystem::ShortNamePossessive ); +- } ++ } else { ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->monthName(month, year, KCalendarSystem::LongName); + } else { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->monthName( month, year, KCalendarSystem::ShortName ); +- } else { +- componentString = calendar->monthName( month, year, KCalendarSystem::ShortName ); +- } ++ componentString = calendar->monthName(month, year, KCalendarSystem::LongName); + } +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } +- break; +- case 'A': //Long weekday name, default space pad to 0 places no sign +- if ( modifierChar == QLatin1Char(':') ) { ++ } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); ++ } ++ break; ++ case 'h': //Short month name, default space pad to 0 places no sign ++ case 'b': //Short month name, default space pad to 0 places no sign ++ if (locale->dateMonthNamePossessive()) { ++ if (modifierChar == QLatin1Char(':')) { + invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->weekDayName( fromDateTime.date(), KCalendarSystem::LongDayName ); ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->monthName(month, year, KCalendarSystem::ShortNamePossessive); + } else { +- componentString = calendar->weekDayName( fromDateTime.date(), KCalendarSystem::LongDayName ); ++ componentString = calendar->monthName(month, year, KCalendarSystem::ShortNamePossessive); + } +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); +- } +- break; +- case 'a': //Short weekday name, default space pad to 0 places no sign +- if ( modifierChar == QLatin1Char(':') ) { ++ } else { ++ if (modifierChar == QLatin1Char(':')) { + invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishCalendar->weekDayName( fromDateTime.date(), KCalendarSystem::ShortDayName ); ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->monthName(month, year, KCalendarSystem::ShortName); + } else { +- componentString = calendar->weekDayName( fromDateTime.date(), KCalendarSystem::ShortDayName ); +- } +- if ( !escapePad ) { +- padChar = QLatin1Char(' '); ++ componentString = calendar->monthName(month, year, KCalendarSystem::ShortName); + } +- break; +- case 'j': //Long day of year numeric, default 0 pad to 3 places no sign +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = calendar->dayOfYear( fromDateTime.date() ); +- minWidth = 3; ++ } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); ++ } ++ break; ++ case 'A': //Long weekday name, default space pad to 0 places no sign ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->weekDayName(fromDateTime.date(), KCalendarSystem::LongDayName); ++ } else { ++ componentString = calendar->weekDayName(fromDateTime.date(), KCalendarSystem::LongDayName); ++ } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); ++ } ++ break; ++ case 'a': //Short weekday name, default space pad to 0 places no sign ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishCalendar->weekDayName(fromDateTime.date(), KCalendarSystem::ShortDayName); ++ } else { ++ componentString = calendar->weekDayName(fromDateTime.date(), KCalendarSystem::ShortDayName); ++ } ++ if (!escapePad) { ++ padChar = QLatin1Char(' '); ++ } ++ break; ++ case 'j': //Long day of year numeric, default 0 pad to 3 places no sign ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = calendar->dayOfYear(fromDateTime.date()); ++ minWidth = 3; ++ } ++ break; ++ case 'V': //Long ISO week of year numeric, default 0 pad to 2 places no sign ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = calendar->week(fromDateTime.date(), KLocale::IsoWeekNumber); ++ minWidth = 2; ++ } ++ break; ++ case 'G': //Long year of ISO week of year numeric, default 0 pad to 4 places with sign ++ if (modifierChar != QLatin1Char(':')) { ++ calendar->week(fromDateTime.date(), KLocale::IsoWeekNumber, &isoWeekYear); ++ calendar->setDate(yearDate, isoWeekYear, 1, 1); ++ componentInteger = qAbs(isoWeekYear); ++ minWidth = 4; ++ if (isoWeekYear < 0) { ++ signChar = QLatin1Char('-'); + } +- break; +- case 'V': //Long ISO week of year numeric, default 0 pad to 2 places no sign +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = calendar->weekNumber( fromDateTime.date() ); +- minWidth = 2; ++ } ++ break; ++ case 'g': //Short year of ISO week of year numeric, default 0 pad to 2 places with sign ++ if (modifierChar != QLatin1Char(':')) { ++ calendar->week(fromDateTime.date(), KLocale::IsoWeekNumber, &isoWeekYear); ++ calendar->setDate(yearDate, isoWeekYear, 1, 1); ++ componentInteger = qAbs(isoWeekYear) % 100; ++ minWidth = 2; ++ if (isoWeekYear < 0) { ++ signChar = QLatin1Char('-'); + } +- break; +- case 'G': //Long year of ISO week of year numeric, default 0 pad to 4 places with sign +- if ( modifierChar != QLatin1Char(':') ) { +- calendar->weekNumber( fromDateTime.date(), &isoWeekYear ); +- calendar->setDate( yearDate, isoWeekYear, 1, 1 ); +- componentInteger = qAbs( isoWeekYear ); +- minWidth = 4; +- if ( isoWeekYear < 0 ) { ++ } ++ break; ++ case 'u': ++ if (modifierChar == QLatin1Char(':')) { // TZ UTC offset hours ++ invalidModifier = false; ++ KDateTime::SpecType timeSpecType = fromDateTime.timeType(); ++ if (timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone || ++ timeSpecType == KDateTime::OffsetFromUTC) { ++ componentInteger = fromDateTime.utcOffset() / 3600; ++ if (componentInteger >= 0) { ++ signChar = QLatin1Char('+'); ++ } else { ++ componentInteger = -componentInteger; + signChar = QLatin1Char('-'); + } +- } +- break; +- case 'g': //Short year of ISO week of year numeric, default 0 pad to 2 places with sign +- if ( modifierChar != QLatin1Char(':') ) { +- calendar->weekNumber( fromDateTime.date(), &isoWeekYear ); +- calendar->setDate( yearDate, isoWeekYear, 1, 1 ); +- componentInteger = qAbs( isoWeekYear ) % 100; + minWidth = 2; +- if ( isoWeekYear < 0 ) { +- signChar = QLatin1Char('-'); +- } + } +- break; +- case 'u': +- if ( modifierChar == QLatin1Char(':') ) { // TZ UTC offset hours +- invalidModifier = false; +- KDateTime::SpecType timeSpecType = fromDateTime.timeType(); +- if ( timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone || +- timeSpecType == KDateTime::OffsetFromUTC ) { +- componentInteger = fromDateTime.utcOffset() / 3600; +- if ( componentInteger >= 0 ) { +- signChar = QLatin1Char('+'); +- } else { +- componentInteger = -componentInteger; +- signChar = QLatin1Char('-'); +- } +- minWidth = 2; +- } +- } else { // Short day of week numeric +- componentInteger = calendar->dayOfWeek( fromDateTime.date() ); +- minWidth = 1; +- } +- break; +- case 'D': // US short date format, ignore any overrides +- if ( modifierChar != QLatin1Char(':') ) { +- componentString = formatDateTimePosix( fromDateTime, QString::fromLatin1("%m/%d/%y"), timeOptions, calendar, locale, digitSet, formatStandard ); +- padWidth = 0; +- padChar = QChar(); +- caseChar = QChar(); +- } +- break; +- case 'F': // Full or ISO short date format, ignore any overrides +- if ( modifierChar != QLatin1Char(':') ) { +- componentString = formatDateTimePosix( fromDateTime, QString::fromLatin1("%Y-%m-%d"), timeOptions, calendar, locale, digitSet, formatStandard ); +- padWidth = 0; +- padChar = QChar(); +- caseChar = QChar(); +- } +- break; +- case 'x': // Locale short date format, ignore any overrides +- if ( modifierChar != QLatin1Char(':') ) { +- componentString = formatDateTimePosix( fromDateTime, locale->dateFormatShort(), timeOptions, calendar, locale, digitSet, formatStandard ); +- padWidth = 0; ++ } else { // Short day of week numeric ++ componentInteger = calendar->dayOfWeek(fromDateTime.date()); ++ minWidth = 1; ++ } ++ break; ++ case 'D': // US short date format, ignore any overrides ++ if (modifierChar != QLatin1Char(':')) { ++ componentString = formatDateTimePosix(fromDateTime, QString::fromLatin1("%m/%d/%y"), timeOptions, calendar, locale, digitSet, formatStandard); ++ padWidth = 0; ++ padChar = QChar(); ++ caseChar = QChar(); ++ } ++ break; ++ case 'F': // Full or ISO short date format, ignore any overrides ++ if (modifierChar != QLatin1Char(':')) { ++ componentString = formatDateTimePosix(fromDateTime, QString::fromLatin1("%Y-%m-%d"), timeOptions, calendar, locale, digitSet, formatStandard); ++ padWidth = 0; ++ padChar = QChar(); ++ caseChar = QChar(); ++ } ++ break; ++ case 'x': // Locale short date format, ignore any overrides ++ if (modifierChar != QLatin1Char(':')) { ++ componentString = formatDateTimePosix(fromDateTime, locale->dateFormatShort(), timeOptions, calendar, locale, digitSet, formatStandard); ++ padWidth = 0; ++ padChar = QChar(); ++ caseChar = QChar(); ++ } ++ break; ++ case 'H': // Long 24 hour ++ case 'k': // Short 24 hour ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = fromDateTime.time().hour(); ++ minWidth = 1; ++ if (!escapePad) { + padChar = QChar(); +- caseChar = QChar(); + } +- break; +- case 'H': // Long 24 hour +- case 'k': // Short 24 hour +- if ( modifierChar != QLatin1Char(':') ) { ++ } ++ break; ++ case 'I': // Long 12 hour ++ case 'l': // Short 12 hour ++ if (modifierChar != QLatin1Char(':')) { ++ if ((timeOptions & KLocale::TimeDuration) == KLocale::TimeDuration) { + componentInteger = fromDateTime.time().hour(); ++ } else { ++ componentInteger = locale->d->dayPeriodForTime(fromDateTime.time()).hourInPeriod(fromDateTime.time()); ++ } ++ if (thisChar == QLatin1Char('I')) { ++ minWidth = 2; ++ } else { + minWidth = 1; +- if ( !escapePad ) { ++ if (!escapePad) { + padChar = QChar(); + } + } +- break; +- case 'I': // Long 12 hour +- case 'l': // Short 12 hour +- if ( modifierChar != QLatin1Char(':') ) { +- if ( (timeOptions & KLocale::TimeDuration) == KLocale::TimeDuration ) { +- componentInteger = fromDateTime.time().hour(); +- } else { +- componentInteger = locale->d->dayPeriodForTime( fromDateTime.time() ).hourInPeriod( fromDateTime.time() ); +- } +- if ( thisChar == QLatin1Char('I') ) { ++ } ++ break; ++ case 'M': // Long minutes ++ if (modifierChar != QLatin1Char(':')) { ++ componentInteger = fromDateTime.time().minute(); ++ minWidth = 2; ++ } ++ break; ++ case 'S': // Long seconds ++ invalidModifier = false; ++ if ((timeOptions & KLocale::TimeWithoutSeconds) == KLocale::TimeWithoutSeconds) { ++ //TODO strip the preceding/following punctuation ++ } else { ++ componentInteger = fromDateTime.time().second(); ++ if (modifierChar == QLatin1Char(':')) { // Only if not 00 seconds ++ if (componentInteger > 0 || fromDateTime.time().msec() > 0) { ++ result.append(QLatin1Char(':')); + minWidth = 2; +- } else { +- minWidth = 1; +- if ( !escapePad ) { +- padChar = QChar(); +- } + } +- } +- break; +- case 'M': // Long minutes +- if ( modifierChar != QLatin1Char(':') ) { +- componentInteger = fromDateTime.time().minute(); ++ } else { + minWidth = 2; + } +- break; +- case 'S': // Long seconds ++ } ++ break; ++ case 's': ++ if (modifierChar == QLatin1Char(':')) { // Milliseconds + invalidModifier = false; +- if ( (timeOptions & KLocale::TimeWithoutSeconds) == KLocale::TimeWithoutSeconds ) { +- //TODO strip the preceeding/following punctuation ++ componentInteger = fromDateTime.time().msec(); ++ minWidth = 3; ++ } else { // Whole seconds since Unix Epoch ++ KDateTime unixEpoch; ++ unixEpoch.setTime_t(0); ++ componentInteger = unixEpoch.secsTo(fromDateTime); ++ } ++ break; ++ case 'p': // AM/PM symbol ++ case 'P': // AM/PM symbol in lowercase ++ if ((timeOptions & KLocale::TimeWithoutAmPm) == KLocale::TimeWithoutAmPm) { ++ //TODO strip the preceding/following punctuation ++ } else { ++ if (modifierChar == QLatin1Char(':')) { ++ invalidModifier = false; ++ initEnglish(calendar, locale); ++ componentString = m_englishLocale->d->dayPeriodForTime(fromDateTime.time()).periodName(KLocale::ShortName); + } else { +- componentInteger = fromDateTime.time().second(); +- if ( modifierChar == QLatin1Char(':') ) { // Only if not 00 seconds +- if ( componentInteger > 0 || fromDateTime.time().msec() > 0 ) { +- result.append( QLatin1Char(':') ); +- minWidth = 2; +- } +- } else { +- minWidth = 2; +- } ++ componentString = locale->d->dayPeriodForTime(fromDateTime.time()).periodName(KLocale::ShortName); + } +- break; +- case 's': +- if ( modifierChar == QLatin1Char(':') ) { // Milliseconds +- invalidModifier = false; +- componentInteger = fromDateTime.time().msec(); +- minWidth = 3; +- } else { // Whole seconds since Unix Epoch +- KDateTime unixEpoch; +- unixEpoch.setTime_t( 0 ); +- componentInteger = unixEpoch.secsTo( fromDateTime ); ++ if (thisChar == QLatin1Char('P')) { ++ componentString = componentString.toLower(); + } +- break; +- case 'p': // AM/PM symbol +- case 'P': // AM/PM symbol in lowercase +- if ( (timeOptions & KLocale::TimeWithoutAmPm) == KLocale::TimeWithoutAmPm ) { +- //TODO strip the preceeding/following punctuation +- } else { +- if ( modifierChar == QLatin1Char(':') ) { +- invalidModifier = false; +- initEnglish( calendar, locale ); +- componentString = m_englishLocale->d->dayPeriodForTime( fromDateTime.time() ).periodName( KLocale::ShortName ); ++ } ++ break; ++ case 'z': // TZ UTC Offset ++ invalidModifier = false; ++ timeSpecType = fromDateTime.timeType(); ++ if (timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone || ++ timeSpecType == KDateTime::OffsetFromUTC) { ++ if (modifierChar == QLatin1Char(':')) { // TZ UTC offset hours & minutes with colon ++ int offsetInSeconds = fromDateTime.utcOffset(); ++ if (offsetInSeconds >= 0) { ++ signChar = QLatin1Char('+'); + } else { +- componentString = locale->d->dayPeriodForTime( fromDateTime.time() ).periodName( KLocale::ShortName ); +- } +- if ( thisChar == QLatin1Char('P') ) { +- componentString = componentString.toLower(); ++ offsetInSeconds = -offsetInSeconds; ++ signChar = QLatin1Char('-'); + } +- } +- break; +- case 'z': // TZ UTC Offset +- invalidModifier = false; +- timeSpecType = fromDateTime.timeType(); +- if ( timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone || +- timeSpecType == KDateTime::OffsetFromUTC ) { +- if ( modifierChar == QLatin1Char(':') ) { // TZ UTC offset hours & minutes with colon +- int offsetInSeconds = fromDateTime.utcOffset(); +- if ( offsetInSeconds >= 0 ) { +- signChar = QLatin1Char('+'); +- } else { +- offsetInSeconds = -offsetInSeconds; +- signChar = QLatin1Char('-'); +- } +- int offsetHours = offsetInSeconds / 3600; +- int offsetMinutes = ( offsetInSeconds / 60 ) % 60; +- //int offsetSeconds = offsetInSeconds % 60; +- QString hourComponent = stringFromInteger( offsetHours, 2, QLatin1Char('0'), signChar, digitSet, locale ); +- QString minuteComponent = stringFromInteger( offsetMinutes, 2, QLatin1Char('0'), QChar(), digitSet, locale ); +- componentString = hourComponent + QLatin1Char(':') + minuteComponent; +- minWidth = 0; +- padChar = QChar(); +- padWidth = 0; +- } else { // TZ UTC offset hours & minutes +- componentInteger = fromDateTime.utcOffset() / 60; +- if ( componentInteger >= 0 ) { +- signChar = QLatin1Char('+'); +- } else { +- componentInteger = -componentInteger; +- signChar = QLatin1Char('-'); +- } +- minWidth = 4; ++ int offsetHours = offsetInSeconds / 3600; ++ int offsetMinutes = (offsetInSeconds / 60) % 60; ++ //int offsetSeconds = offsetInSeconds % 60; ++ QString hourComponent = stringFromInteger(offsetHours, 2, QLatin1Char('0'), signChar, digitSet, locale); ++ QString minuteComponent = stringFromInteger(offsetMinutes, 2, QLatin1Char('0'), QChar(), digitSet, locale); ++ componentString = hourComponent + QLatin1Char(':') + minuteComponent; ++ minWidth = 0; ++ padChar = QChar(); ++ padWidth = 0; ++ } else { // TZ UTC offset hours & minutes ++ componentInteger = fromDateTime.utcOffset() / 60; ++ if (componentInteger >= 0) { ++ signChar = QLatin1Char('+'); ++ } else { ++ componentInteger = -componentInteger; ++ signChar = QLatin1Char('-'); + } ++ minWidth = 4; + } +- break; +- case 'Z': // TZ Name +- invalidModifier = false; +- timeSpecType = fromDateTime.timeType(); +- if ( timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone ) { +- KTimeZone tz = fromDateTime.timeZone(); +- if ( tz.isValid() ) { +- if ( modifierChar == QLatin1Char(':') ) { // TZ full name +- componentString = QString::fromLatin1(tz.abbreviation(fromDateTime.toUtc().dateTime())); +- } else { // TZ abbreviated name +- componentString = tz.name(); +- } ++ } ++ break; ++ case 'Z': // TZ Name ++ invalidModifier = false; ++ timeSpecType = fromDateTime.timeType(); ++ if (timeSpecType == KDateTime::UTC || timeSpecType == KDateTime::TimeZone) { ++ KTimeZone tz = fromDateTime.timeZone(); ++ if (tz.isValid()) { ++ if (modifierChar == QLatin1Char(':')) { // TZ full name ++ componentString = QString::fromLatin1(tz.abbreviation(fromDateTime.toUtc().dateTime())); ++ } else { // TZ abbreviated name ++ componentString = tz.name(); + } + } +- break; +- default: //No valid format code, treat as literal +- invalidComponent = true; +- break; ++ } ++ break; ++ default: //No valid format code, treat as literal ++ invalidComponent = true; ++ break; + } + +- if ( invalidComponent || invalidModifier ) { // If escape sequence invalid treat as literal +- componentString = toFormat.mid( escapeIndex, formatIndex ); +- } else if ( componentString.isEmpty() ) { //i.e. is a number component +- padWidth = qMax( minWidth, padWidth ); +- componentString = stringFromInteger( componentInteger, padWidth, padChar, signChar, digitSet, locale ); ++ if (invalidComponent || invalidModifier) { // If escape sequence invalid treat as literal ++ componentString = toFormat.mid(escapeIndex, formatIndex); ++ } else if (componentString.isEmpty()) { //i.e. is a number component ++ padWidth = qMax(minWidth, padWidth); ++ componentString = stringFromInteger(componentInteger, padWidth, padChar, signChar, digitSet, locale); + } else { //i.e. is a string component +- if ( padChar != QChar() && padWidth != 0 ) { +- componentString = componentString.rightJustified( padWidth, padChar ); ++ if (padChar != QChar() && padWidth != 0) { ++ componentString = componentString.rightJustified(padWidth, padChar); + } + +- if ( caseChar == QLatin1Char('^') ) { ++ if (caseChar == QLatin1Char('^')) { + componentString = componentString.toUpper(); +- } else if ( caseChar == QLatin1Char('#') ) { ++ } else if (caseChar == QLatin1Char('#')) { + componentString = componentString.toUpper(); // JPL ??? + } + } + +- result.append( componentString ); ++ result.append(componentString); + + escape = false; + escapePad = false; +@@ -623,16 +623,16 @@ QString KDateTimeFormatter::formatDateTimePosix( const KDateTime &fromDateTime, + return result; + } + +-void KDateTimeFormatter::initEnglish( const KCalendarSystem *calendar, const KLocale *locale ) const ++void KDateTimeFormatter::initEnglish(const KCalendarSystem *calendar, const KLocale *locale) const + { +- if ( !m_englishCalendar || m_englishCalendar->calendarType() != calendar->calendarType() ) { +- // Set up an English locale and calendar for use with ':' modifier which forces English names +- if ( !m_englishLocale ) { +- m_englishLocale = new KLocale( *locale ); +- m_englishLocale->setLanguage( QStringList() << QString::fromLatin1("en_US") ); +- } +- delete m_englishCalendar; +- m_englishCalendar = KCalendarSystem::create( calendar->calendarType(), m_englishLocale ); ++ if (!m_englishCalendar || m_englishCalendar->calendarSystem() != calendar->calendarSystem()) { ++ // Set up an English locale and calendar for use with ':' modifier which forces English names ++ if (!m_englishLocale) { ++ m_englishLocale = new KLocale(*locale); ++ m_englishLocale->setLanguage(QStringList() << QString::fromLatin1("en_US")); ++ } ++ delete m_englishCalendar; ++ m_englishCalendar = KCalendarSystem::create(calendar->calendarSystem(), m_englishLocale); + } + } + +@@ -640,12 +640,12 @@ void KDateTimeFormatter::initEnglish( const KCalendarSystem *calendar, const KLo + // Format an input date to match a UNICODE date format string + // Original QDate::fmtDateTime() code taken from Qt 4.7 under LGPL, now heavily modifed + // Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +-QString KDateTimeFormatter::formatDateTimeUnicode( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const ++QString KDateTimeFormatter::formatDateTimeUnicode(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const + { + const QLatin1Char quote('\''); + +@@ -661,7 +661,7 @@ QString KDateTimeFormatter::formatDateTimeUnicode( const KDateTime &fromDateTime + status = QLatin1Char('0'); + } else { + if (!format.isEmpty()) { +- result += getUnicodeString( fromDateTime, format, timeOptions, calendar, locale, digitSet ); ++ result += getUnicodeString(fromDateTime, format, timeOptions, calendar, locale, digitSet); + format.clear(); + } + status = quote; +@@ -669,27 +669,27 @@ QString KDateTimeFormatter::formatDateTimeUnicode( const KDateTime &fromDateTime + } else if (status == quote) { + result += toFormat.at(i); + } else if (toFormat.at(i) == status) { +- if ( toFormat.at(i) == QLatin1Char('P') || +- toFormat.at(i) == QLatin1Char('p') ) { ++ if (toFormat.at(i) == QLatin1Char('P') || ++ toFormat.at(i) == QLatin1Char('p')) { + status = QLatin1Char('0'); + } +- format += toFormat.at( i ); ++ format += toFormat.at(i); + } else { +- result += getUnicodeString( fromDateTime, format, timeOptions, calendar, locale, digitSet ); ++ result += getUnicodeString(fromDateTime, format, timeOptions, calendar, locale, digitSet); + format.clear(); +- if ( ( toFormat.at(i) == QLatin1Char('d') ) || +- ( toFormat.at(i) == QLatin1Char('M') ) || +- ( toFormat.at(i) == QLatin1Char('y') ) ) { +- status = toFormat.at( i ); +- format += toFormat.at( i ); ++ if ((toFormat.at(i) == QLatin1Char('d')) || ++ (toFormat.at(i) == QLatin1Char('M')) || ++ (toFormat.at(i) == QLatin1Char('y'))) { ++ status = toFormat.at(i); ++ format += toFormat.at(i); + } else { +- result += toFormat.at( i ); ++ result += toFormat.at(i); + status = QLatin1Char('0'); + } + } + } + +- result += getUnicodeString( fromDateTime, format, timeOptions, calendar, locale, digitSet ); ++ result += getUnicodeString(fromDateTime, format, timeOptions, calendar, locale, digitSet); + + return result; + } +@@ -697,99 +697,98 @@ QString KDateTimeFormatter::formatDateTimeUnicode( const KDateTime &fromDateTime + // Original QDate::getFmtString() code taken from Qt 4.7 under LGPL, now heavily modifed + // Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + // Replaces tokens by their value. See QDateTime::toString() for a list of valid tokens +-QString KDateTimeFormatter::getUnicodeString( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const ++QString KDateTimeFormatter::getUnicodeString(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const + { +- if ( toFormat.isEmpty() ) { ++ if (toFormat.isEmpty()) { + return QString(); + } + + QString result = toFormat; + int removed = 0; + +- if ( toFormat.startsWith( QLatin1String( "dddd" ) ) ) { +- result = calendar->weekDayName( fromDateTime.date(), KCalendarSystem::LongDayName ); ++ if (toFormat.startsWith(QLatin1String("dddd"))) { ++ result = calendar->weekDayName(fromDateTime.date(), KCalendarSystem::LongDayName); + removed = 4; +- } else if ( toFormat.startsWith(QLatin1String( "ddd" ) ) ) { +- result = calendar->weekDayName( fromDateTime.date(), KCalendarSystem::ShortDayName ); ++ } else if (toFormat.startsWith(QLatin1String("ddd"))) { ++ result = calendar->weekDayName(fromDateTime.date(), KCalendarSystem::ShortDayName); + removed = 3; +- } else if ( toFormat.startsWith( QLatin1String( "dd" ) ) ) { +- result = QString::number( calendar->day( fromDateTime.date() ) ).rightJustified( 2, QLatin1Char('0'), true ); ++ } else if (toFormat.startsWith(QLatin1String("dd"))) { ++ result = QString::number(calendar->day(fromDateTime.date())).rightJustified(2, QLatin1Char('0'), true); + removed = 2; +- } else if ( toFormat.at(0) == QLatin1Char('d') ) { +- result = QString::number( calendar->day( fromDateTime.date() ) ); ++ } else if (toFormat.at(0) == QLatin1Char('d')) { ++ result = QString::number(calendar->day(fromDateTime.date())); + removed = 1; + } else if (toFormat.startsWith(QLatin1String("MMMM"))) { +- result = calendar->monthName( calendar->month( fromDateTime.date() ), calendar->year( fromDateTime.date() ), KCalendarSystem::LongName ); ++ result = calendar->monthName(calendar->month(fromDateTime.date()), calendar->year(fromDateTime.date()), KCalendarSystem::LongName); + removed = 4; + } else if (toFormat.startsWith(QLatin1String("MMM"))) { +- result = calendar->monthName( calendar->month( fromDateTime.date() ), calendar->year( fromDateTime.date() ), KCalendarSystem::ShortName ); ++ result = calendar->monthName(calendar->month(fromDateTime.date()), calendar->year(fromDateTime.date()), KCalendarSystem::ShortName); + removed = 3; + } else if (toFormat.startsWith(QLatin1String("MM"))) { +- result = QString::number( calendar->month( fromDateTime.date() ) ).rightJustified( 2, QLatin1Char('0'), true ); ++ result = QString::number(calendar->month(fromDateTime.date())).rightJustified(2, QLatin1Char('0'), true); + removed = 2; + } else if (toFormat.at(0) == QLatin1Char('M')) { +- result = QString::number( calendar->month( fromDateTime.date() ) ); ++ result = QString::number(calendar->month(fromDateTime.date())); + removed = 1; + } else if (toFormat.startsWith(QLatin1String("yyyy"))) { +- const int year = calendar->year( fromDateTime.date() ); +- result = QString::number( qAbs( year ) ).rightJustified( 4, QLatin1Char('0') ); +- if( year > 0 ) ++ const int year = calendar->year(fromDateTime.date()); ++ result = QString::number(qAbs(year)).rightJustified(4, QLatin1Char('0')); ++ if (year > 0) + removed = 4; +- else +- { +- result.prepend( QLatin1Char('-') ); ++ else { ++ result.prepend(QLatin1Char('-')); + removed = 5; + } +- } else if ( toFormat.startsWith( QLatin1String("yy") ) ) { +- result = QString::number( calendar->year(fromDateTime.date()) ).right( 2 ).rightJustified( 2, QLatin1Char('0') ); ++ } else if (toFormat.startsWith(QLatin1String("yy"))) { ++ result = QString::number(calendar->year(fromDateTime.date())).right(2).rightJustified(2, QLatin1Char('0')); + removed = 2; + } + +- if ( removed == 0 || removed >= toFormat.size() ) { ++ if (removed == 0 || removed >= toFormat.size()) { + return result; + } + +- return result + getUnicodeString( fromDateTime, toFormat.mid( removed ), timeOptions, calendar, locale, digitSet ); ++ return result + getUnicodeString(fromDateTime, toFormat.mid(removed), timeOptions, calendar, locale, digitSet); + } + + // Reimplement if special integer to string handling required, e.g. Hebrew. + // Utility to convert an integer into the correct display string form +-QString KDateTimeFormatter::stringFromInteger( int number, int padWidth, QChar padChar, QChar signChar, +- KLocale::DigitSet digitSet, const KLocale *locale ) const ++QString KDateTimeFormatter::stringFromInteger(int number, int padWidth, QChar padChar, QChar signChar, ++ KLocale::DigitSet digitSet, const KLocale *locale) const + { +-if ( padChar == QChar() && signChar == QChar() ) { ++ if (padChar == QChar() && signChar == QChar()) { + //kDebug() << " stringFromInteger(" << number << padWidth << "null" << "null" << ")"; +-} else if ( padChar == QChar() ) { ++ } else if (padChar == QChar()) { + //kDebug() << " stringFromInteger(" << number << padWidth << "null" << signChar << ")"; +-} else if ( signChar == QChar() ) { ++ } else if (signChar == QChar()) { + //kDebug() << " stringFromInteger(" << number << padWidth << padChar << "null" << ")"; +-} else if ( signChar == QChar() ) { ++ } else if (signChar == QChar()) { + //kDebug() << " stringFromInteger(" << number << padWidth << padChar << signChar << ")"; +-} ++ } + QString result; +- if ( padChar == QChar() || padWidth == 0 ) { // If null pad char or 0 width don't bother padding ++ if (padChar == QChar() || padWidth == 0) { // If null pad char or 0 width don't bother padding + //kDebug() << " no pad"; +- if ( signChar == QChar() ) { +- result = locale->convertDigits( QString::number( number ), digitSet ); ++ if (signChar == QChar()) { ++ result = locale->convertDigits(QString::number(number), digitSet); + } else { +- result = locale->convertDigits( QString::number( number ).prepend( signChar ), digitSet ); ++ result = locale->convertDigits(QString::number(number).prepend(signChar), digitSet); + } +- } else if ( signChar != QChar() ) { // If sign required +- if ( padChar == QLatin1Char('0') ) { // If zero-padded, zero considered part of the number, so pad the number then prepend the sign ++ } else if (signChar != QChar()) { // If sign required ++ if (padChar == QLatin1Char('0')) { // If zero-padded, zero considered part of the number, so pad the number then prepend the sign + //kDebug() << " zero pad with sign"; +- result = locale->convertDigits( QString::number( number ).rightJustified( padWidth, padChar ).prepend( signChar ), digitSet ); ++ result = locale->convertDigits(QString::number(number).rightJustified(padWidth, padChar).prepend(signChar), digitSet); + } else { // If space-padded space not considered part of the number, so prepend the sign and then pad the number + //kDebug() << " space pad with sign"; +- result = locale->convertDigits( QString::number( number ).prepend( signChar ).rightJustified( padWidth, padChar ), digitSet ); ++ result = locale->convertDigits(QString::number(number).prepend(signChar).rightJustified(padWidth, padChar), digitSet); + } + } else { // No sign required so just pad + //kDebug() << " pad no sign"; +- result = locale->convertDigits( QString::number( number ).rightJustified( padWidth, padChar ), digitSet ); ++ result = locale->convertDigits(QString::number(number).rightJustified(padWidth, padChar), digitSet); + } + //kDebug() << " result = " << result; + return result; +diff --git a/kdecore/date/kdatetimeformatter_p.h b/kdecore/date/kdatetimeformatter_p.h +index 7f64e08..bfa04dc 100644 +--- a/kdecore/date/kdatetimeformatter_p.h ++++ b/kdecore/date/kdatetimeformatter_p.h +@@ -38,56 +38,56 @@ public: + + virtual ~KDateTimeFormatter(); + +- virtual QString formatDate( const QDate &fromDate, +- const QString &toFormat, +- const KCalendarSystem *calendar = KGlobal::locale()->calendar(), +- const KLocale *locale = KGlobal::locale(), +- KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), +- KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat ) const; +- +- virtual QString formatTime( const QTime &fromTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions = 0, +- const KCalendarSystem *calendar = KGlobal::locale()->calendar(), +- const KLocale *locale = KGlobal::locale(), +- KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), +- KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat ) const; +- +- virtual QString formatDateTime( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions = 0, +- const KCalendarSystem *calendar = KGlobal::locale()->calendar(), +- const KLocale *locale = KGlobal::locale(), +- KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), +- KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat ) const; ++ virtual QString formatDate(const QDate &fromDate, ++ const QString &toFormat, ++ const KCalendarSystem *calendar = KGlobal::locale()->calendar(), ++ const KLocale *locale = KGlobal::locale(), ++ KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), ++ KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat) const; ++ ++ virtual QString formatTime(const QTime &fromTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions = 0, ++ const KCalendarSystem *calendar = KGlobal::locale()->calendar(), ++ const KLocale *locale = KGlobal::locale(), ++ KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), ++ KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat) const; ++ ++ virtual QString formatDateTime(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions = 0, ++ const KCalendarSystem *calendar = KGlobal::locale()->calendar(), ++ const KLocale *locale = KGlobal::locale(), ++ KLocale::DigitSet digitSet = KGlobal::locale()->dateTimeDigitSet(), ++ KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat) const; + + private: +- virtual QString formatDateTimePosix( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard standard ) const; +- +- virtual void initEnglish( const KCalendarSystem *calendar, const KLocale *locale ) const; +- +- virtual QString formatDateTimeUnicode( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const; +- +- virtual QString getUnicodeString( const KDateTime &fromDateTime, +- const QString &toFormat, +- KLocale::TimeFormatOptions timeOptions, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const; +- +- virtual QString stringFromInteger( int number, int padWidth, QChar padChar, QChar signChar, +- KLocale::DigitSet digitSet, const KLocale *locale ) const; ++ virtual QString formatDateTimePosix(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard standard) const; ++ ++ virtual void initEnglish(const KCalendarSystem *calendar, const KLocale *locale) const; ++ ++ virtual QString formatDateTimeUnicode(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const; ++ ++ virtual QString getUnicodeString(const KDateTime &fromDateTime, ++ const QString &toFormat, ++ KLocale::TimeFormatOptions timeOptions, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const; ++ ++ virtual QString stringFromInteger(int number, int padWidth, QChar padChar, QChar signChar, ++ KLocale::DigitSet digitSet, const KLocale *locale) const; + + // Is private class, but if ever made public need to move these into a d-> + // Some format modifiers force English names to be returned +diff --git a/kdecore/date/kdatetimeparser.cpp b/kdecore/date/kdatetimeparser.cpp +index ba50373..a416808 100644 +--- a/kdecore/date/kdatetimeparser.cpp ++++ b/kdecore/date/kdatetimeparser.cpp +@@ -34,46 +34,46 @@ KDateTimeParser::~KDateTimeParser() + } + + // Parse a DateTime input string and return just the Date component +-QDate KDateTimeParser::parseDate( const QString &inputString, +- const QString &formatString, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard formatStandard ) const ++QDate KDateTimeParser::parseDate(const QString &inputString, ++ const QString &formatString, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard formatStandard) const + { + DateTimeComponents result; +- if ( formatStandard == KLocale::UnicodeFormat ) { +- result = parseDateUnicode( inputString, formatString, calendar, locale, digitSet ); ++ if (formatStandard == KLocale::UnicodeFormat) { ++ result = parseDateUnicode(inputString, formatString, calendar, locale, digitSet); + } else { +- result = parseDatePosix( inputString, formatString, calendar, locale, digitSet, formatStandard ); ++ result = parseDatePosix(inputString, formatString, calendar, locale, digitSet, formatStandard); + } + + QDate resultDate; + +- if ( !result.error && +- formatString.simplified().length() <= result.formatPosition && +- inputString.simplified().length() <= result.inputPosition ) { ++ if (!result.error && ++ formatString.simplified().length() <= result.formatPosition && ++ inputString.simplified().length() <= result.inputPosition) { + + // If there were no parsing errors, and we have reached the end of both the input and + // format strings, then see if we have a valid date based on the components parsed + + // If we haven't parsed a year component, then assume this year +- if ( !result.parsedYear ) { +- result.year = calendar->year( QDate::currentDate() ); ++ if (!result.parsedYear) { ++ result.year = calendar->year(QDate::currentDate()); + } + +- if ( ( !result.eraName.isEmpty() || result.yearInEra > -1 ) && result.month > 0 && result.day > 0 ) { ++ if ((!result.eraName.isEmpty() || result.yearInEra > -1) && result.month > 0 && result.day > 0) { + // Have parsed Era components as well as month and day components +- calendar->setDate( resultDate, result.eraName, result.yearInEra, result.month, result.day ); +- } else if ( result.month > 0 && result.day > 0 ) { ++ calendar->setDate(resultDate, result.eraName, result.yearInEra, result.month, result.day); ++ } else if (result.month > 0 && result.day > 0) { + // Have parsed month and day components +- calendar->setDate( resultDate, result.year, result.month, result.day ); +- } else if ( result.dayInYear > 0 ) { ++ calendar->setDate(resultDate, result.year, result.month, result.day); ++ } else if (result.dayInYear > 0) { + // Have parsed Day In Year component +- calendar->setDate( resultDate, result.year, result.dayInYear ); +- } else if ( result.isoWeekNumber > 0 && result.dayOfIsoWeek > 0 ) { ++ calendar->setDate(resultDate, result.year, result.dayInYear); ++ } else if (result.isoWeekNumber > 0 && result.dayOfIsoWeek > 0) { + // Have parsed ISO Week components +- calendar->setDateIsoWeek( resultDate, result.year, result.isoWeekNumber, result.dayOfIsoWeek ); ++ calendar->setDateIsoWeek(resultDate, result.year, result.isoWeekNumber, result.dayOfIsoWeek); + } + + } +@@ -81,12 +81,12 @@ QDate KDateTimeParser::parseDate( const QString &inputString, + return resultDate; + } + +-DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, +- const QString &formatString, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard standard ) const ++DateTimeComponents KDateTimeParser::parseDatePosix(const QString &inputString, ++ const QString &formatString, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard standard) const + { + QString str = inputString.simplified().toLower(); + QString fmt = formatString.simplified(); +@@ -104,15 +104,15 @@ DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, + int readLength; // Temporary variable used when reading input + bool error = false; + +- while ( fmt.length() > fmtpos && str.length() > strpos && !error ) { ++ while (fmt.length() > fmtpos && str.length() > strpos && !error) { + +- QChar fmtChar = fmt.at( fmtpos++ ); ++ QChar fmtChar = fmt.at(fmtpos++); + +- if ( fmtChar != QLatin1Char('%') ) { ++ if (fmtChar != QLatin1Char('%')) { + +- if ( fmtChar.isSpace() && str.at(strpos).isSpace() ) { ++ if (fmtChar.isSpace() && str.at(strpos).isSpace()) { + strpos++; +- } else if ( fmtChar.toLower() == str.at(strpos) ) { ++ } else if (fmtChar.toLower() == str.at(strpos)) { + strpos++; + } else { + error = true; +@@ -123,169 +123,168 @@ DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, + QString shortName, longName; + QChar modifierChar; + // remove space at the beginning +- if ( str.length() > strpos && str.at( strpos ).isSpace() ) { ++ if (str.length() > strpos && str.at(strpos).isSpace()) { + strpos++; + } + +- fmtChar = fmt.at( fmtpos++ ); +- if ( fmtChar == QLatin1Char('E') ) { ++ fmtChar = fmt.at(fmtpos++); ++ if (fmtChar == QLatin1Char('E')) { + modifierChar = fmtChar; +- fmtChar = fmt.at( fmtpos++ ); ++ fmtChar = fmt.at(fmtpos++); + } + +- switch ( fmtChar.unicode() ) +- { +- case 'a': // Weekday Name Short +- case 'A': // Weekday Name Long +- error = true; +- j = 1; +- while ( error && j <= calendar->d_ptr->maxDaysInWeek() ) { +- shortName = calendar->weekDayName( j, KCalendarSystem::ShortDayName ).toLower(); +- longName = calendar->weekDayName( j, KCalendarSystem::LongDayName ).toLower(); +- if ( str.mid( strpos, longName.length() ) == longName ) { +- strpos += longName.length(); +- error = false; +- } else if ( str.mid( strpos, shortName.length() ) == shortName ) { +- strpos += shortName.length(); +- error = false; +- } +- ++j; ++ switch (fmtChar.unicode()) { ++ case 'a': // Weekday Name Short ++ case 'A': // Weekday Name Long ++ error = true; ++ j = 1; ++ while (error && j <= calendar->d_ptr->maxDaysInWeek()) { ++ shortName = calendar->weekDayName(j, KCalendarSystem::ShortDayName).toLower(); ++ longName = calendar->weekDayName(j, KCalendarSystem::LongDayName).toLower(); ++ if (str.mid(strpos, longName.length()) == longName) { ++ strpos += longName.length(); ++ error = false; ++ } else if (str.mid(strpos, shortName.length()) == shortName) { ++ strpos += shortName.length(); ++ error = false; + } +- break; +- case 'b': // Month Name Short +- case 'h': // Month Name Short +- case 'B': // Month Name Long +- error = true; +- j = 1; +- while ( error && j <= calendar->d_ptr->maxMonthsInYear() ) { +- // This may be a problem in calendar systems with variable number of months +- // in the year and/or names of months that change depending on the year, e.g +- // Hebrew. We really need to know the correct year first, but we may not have +- // read it yet and will be using the current year instead +- int monthYear; +- if ( parsedYear ) { +- monthYear = yy; +- } else { +- monthYear = calendar->year( QDate::currentDate() ); +- } +- if ( calendar->locale()->dateMonthNamePossessive() ) { +- shortName = calendar->monthName( j, monthYear, KCalendarSystem::ShortNamePossessive ).toLower(); +- longName = calendar->monthName( j, monthYear, KCalendarSystem::LongNamePossessive ).toLower(); +- } else { +- shortName = calendar->monthName( j, monthYear, KCalendarSystem::ShortName ).toLower(); +- longName = calendar->monthName( j, monthYear, KCalendarSystem::LongName ).toLower(); +- } +- if ( str.mid( strpos, longName.length() ) == longName ) { +- mm = j; +- strpos += longName.length(); +- error = false; +- } else if ( str.mid( strpos, shortName.length() ) == shortName ) { +- mm = j; +- strpos += shortName.length(); +- error = false; +- } +- ++j; ++ ++j; ++ } ++ break; ++ case 'b': // Month Name Short ++ case 'h': // Month Name Short ++ case 'B': // Month Name Long ++ error = true; ++ j = 1; ++ while (error && j <= calendar->d_ptr->maxMonthsInYear()) { ++ // This may be a problem in calendar systems with variable number of months ++ // in the year and/or names of months that change depending on the year, e.g ++ // Hebrew. We really need to know the correct year first, but we may not have ++ // read it yet and will be using the current year instead ++ int monthYear; ++ if (parsedYear) { ++ monthYear = yy; ++ } else { ++ monthYear = calendar->year(QDate::currentDate()); + } +- break; +- case 'd': // Day Number Long +- case 'e': // Day Number Short +- dd = calendar->dayStringToInteger( str.mid( strpos ), readLength ); +- strpos += readLength; +- error = readLength <= 0; +- break; +- case 'n': +- // PosixFormat %n is Newline +- // KdeFormat %n is Month Number Short +- if ( standard == KLocale::KdeFormat ) { +- mm = calendar->monthStringToInteger( str.mid( strpos ), readLength ); +- strpos += readLength; +- error = readLength <= 0; ++ if (calendar->locale()->dateMonthNamePossessive()) { ++ shortName = calendar->monthName(j, monthYear, KCalendarSystem::ShortNamePossessive).toLower(); ++ longName = calendar->monthName(j, monthYear, KCalendarSystem::LongNamePossessive).toLower(); ++ } else { ++ shortName = calendar->monthName(j, monthYear, KCalendarSystem::ShortName).toLower(); ++ longName = calendar->monthName(j, monthYear, KCalendarSystem::LongName).toLower(); + } +- // standard == KLocale::PosixFormat +- // all whitespace already 'eaten', no action required +- break; +- case 'm': // Month Number Long +- mm = calendar->monthStringToInteger( str.mid( strpos ), readLength ); ++ if (str.mid(strpos, longName.length()) == longName) { ++ mm = j; ++ strpos += longName.length(); ++ error = false; ++ } else if (str.mid(strpos, shortName.length()) == shortName) { ++ mm = j; ++ strpos += shortName.length(); ++ error = false; ++ } ++ ++j; ++ } ++ break; ++ case 'd': // Day Number Long ++ case 'e': // Day Number Short ++ dd = calendar->dayStringToInteger(str.mid(strpos), readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; ++ case 'n': ++ // PosixFormat %n is Newline ++ // KdeFormat %n is Month Number Short ++ if (standard == KLocale::KdeFormat) { ++ mm = calendar->monthStringToInteger(str.mid(strpos), readLength); + strpos += readLength; + error = readLength <= 0; +- break; +- case 'Y': // Year Number Long +- case 'y': // Year Number Short +- if ( modifierChar == QLatin1Char('E') ) { // Year In Era +- if ( fmtChar == QLatin1Char('y') ) { +- ey = calendar->yearStringToInteger( str.mid( strpos ), readLength ); +- strpos += readLength; +- error = readLength <= 0; +- } else { +- error = true; +- j = calendar->eraList()->count() -1; // Start with the most recent +- while ( error && j >= 0 ) { +- QString subFormat = calendar->eraList()->at( j ).format(); +- QString subInput = str.mid( strpos ); +- DateTimeComponents subResult = parseDatePosix( subInput, subFormat, calendar, locale, digitSet, standard ); +- if ( !subResult.error ) { +- if ( subResult.parsedYear ) { +- yy = subResult.year; +- parsedYear = true; +- error = false; +- strpos += subResult.inputPosition; +- } else if ( !subResult.eraName.isEmpty() && subResult.yearInEra >= 0 ) { +- ee = subResult.eraName; +- ey = subResult.yearInEra; +- error = false; +- strpos += subResult.inputPosition; +- } +- } +- --j; +- } +- } +- } else { +- yy = calendar->yearStringToInteger( str.mid( strpos ), readLength ); ++ } ++ // standard == KLocale::PosixFormat ++ // all whitespace already 'eaten', no action required ++ break; ++ case 'm': // Month Number Long ++ mm = calendar->monthStringToInteger(str.mid(strpos), readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; ++ case 'Y': // Year Number Long ++ case 'y': // Year Number Short ++ if (modifierChar == QLatin1Char('E')) { // Year In Era ++ if (fmtChar == QLatin1Char('y')) { ++ ey = calendar->yearStringToInteger(str.mid(strpos), readLength); + strpos += readLength; +- if ( fmtChar == QLatin1Char('y') ) { +- yy = calendar->applyShortYearWindow( yy ); +- } + error = readLength <= 0; +- if ( !error ) { +- parsedYear = true; +- } +- } +- break; +- case 'C': // Era +- error = true; +- if ( modifierChar == QLatin1Char('E') ) { +- j = calendar->eraList()->count() -1; // Start with the most recent +- while ( error && j >= 0 ) { +- shortName = calendar->d_ptr->m_eraList->at( j ).name( KLocale::ShortName ).toLower(); +- longName = calendar->eraList()->at( j ).name( KLocale::LongName ).toLower(); +- if ( str.mid( strpos, longName.length() ) == longName ) { +- strpos += longName.length(); +- ee = longName; +- error = false; +- } else if ( str.mid( strpos, shortName.length() ) == shortName ) { +- strpos += shortName.length(); +- ee = shortName; +- error = false; ++ } else { ++ error = true; ++ j = calendar->eraList()->count() - 1; // Start with the most recent ++ while (error && j >= 0) { ++ QString subFormat = calendar->eraList()->at(j).format(); ++ QString subInput = str.mid(strpos); ++ DateTimeComponents subResult = parseDatePosix(subInput, subFormat, calendar, locale, digitSet, standard); ++ if (!subResult.error) { ++ if (subResult.parsedYear) { ++ yy = subResult.year; ++ parsedYear = true; ++ error = false; ++ strpos += subResult.inputPosition; ++ } else if (!subResult.eraName.isEmpty() && subResult.yearInEra >= 0) { ++ ee = subResult.eraName; ++ ey = subResult.yearInEra; ++ error = false; ++ strpos += subResult.inputPosition; ++ } + } + --j; + } + } +- break; +- case 'j': // Day Of Year Number +- dayInYear = integerFromString( str.mid( strpos ), 3, readLength ); +- strpos += readLength; +- error = readLength <= 0; +- break; +- case 'V': // ISO Week Number +- isoWeekNumber = integerFromString( str.mid( strpos ), 2, readLength ); +- strpos += readLength; +- error = readLength <= 0; +- break; +- case 'u': // ISO Day Of Week +- dayOfIsoWeek = integerFromString( str.mid( strpos ), 1, readLength ); ++ } else { ++ yy = calendar->yearStringToInteger(str.mid(strpos), readLength); + strpos += readLength; ++ if (fmtChar == QLatin1Char('y')) { ++ yy = calendar->applyShortYearWindow(yy); ++ } + error = readLength <= 0; +- break; ++ if (!error) { ++ parsedYear = true; ++ } ++ } ++ break; ++ case 'C': // Era ++ error = true; ++ if (modifierChar == QLatin1Char('E')) { ++ j = calendar->eraList()->count() - 1; // Start with the most recent ++ while (error && j >= 0) { ++ shortName = calendar->d_ptr->m_eraList->at(j).name(KLocale::ShortName).toLower(); ++ longName = calendar->eraList()->at(j).name(KLocale::LongName).toLower(); ++ if (str.mid(strpos, longName.length()) == longName) { ++ strpos += longName.length(); ++ ee = longName; ++ error = false; ++ } else if (str.mid(strpos, shortName.length()) == shortName) { ++ strpos += shortName.length(); ++ ee = shortName; ++ error = false; ++ } ++ --j; ++ } ++ } ++ break; ++ case 'j': // Day Of Year Number ++ dayInYear = integerFromString(str.mid(strpos), 3, readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; ++ case 'V': // ISO Week Number ++ isoWeekNumber = integerFromString(str.mid(strpos), 2, readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; ++ case 'u': // ISO Day Of Week ++ dayOfIsoWeek = integerFromString(str.mid(strpos), 1, readLength); ++ strpos += readLength; ++ error = readLength <= 0; ++ break; + } + } + } +@@ -294,12 +293,12 @@ DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, + result.error = error; + result.inputPosition = strpos; + result.formatPosition = fmtpos; +- if ( error ) { ++ if (error) { + result.day = -1; + result.month = -1; + result.year = 0; + result.parsedYear = false; +- result.eraName = QString(); ++ result.eraName.clear(); + result.yearInEra = -1; + result.dayInYear = -1; + result.isoWeekNumber = -1; +@@ -319,12 +318,15 @@ DateTimeComponents KDateTimeParser::parseDatePosix( const QString &inputString, + } + + // Parse an input string to match a UNICODE DateTime format string and return any components found +-DateTimeComponents KDateTimeParser::parseDateUnicode( const QString &inputString, +- const QString &formatString, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const ++DateTimeComponents KDateTimeParser::parseDateUnicode(const QString &inputString, ++ const QString &formatString, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const + { ++ Q_UNUSED(calendar); ++ Q_UNUSED(locale); ++ Q_UNUSED(digitSet); + QString str = inputString.simplified().toLower(); + QString fmt = formatString.simplified(); + int dd = -1; +@@ -338,19 +340,19 @@ DateTimeComponents KDateTimeParser::parseDateUnicode( const QString &inputString + int dayOfIsoWeek = -1; + int strpos = 0; + int fmtpos = 0; +- int readLength; // Temporary variable used when reading input ++ //int readLength; // Temporary variable used when reading input + bool error = false; + + DateTimeComponents result; + result.error = error; + result.inputPosition = strpos; + result.formatPosition = fmtpos; +- if ( error ) { ++ if (error) { + result.day = -1; + result.month = -1; + result.year = 0; + result.parsedYear = false; +- result.eraName = QString(); ++ result.eraName.clear(); + result.yearInEra = -1; + result.dayInYear = -1; + result.isoWeekNumber = -1; +@@ -371,26 +373,26 @@ DateTimeComponents KDateTimeParser::parseDateUnicode( const QString &inputString + + // Peel a number off the front of a string which may have other trailing chars after the number + // Stop either at either maxLength, eos, or first non-digit char +-int KDateTimeParser::integerFromString( const QString &string, int maxLength, int &readLength ) const ++int KDateTimeParser::integerFromString(const QString &string, int maxLength, int &readLength) const + { + int value = -1; + int position = 0; + readLength = 0; + bool ok = false; + +- if ( maxLength < 0 ) { ++ if (maxLength < 0) { + maxLength = string.length(); + } + +- while ( position < string.length() && ++ while (position < string.length() && + position < maxLength && +- string.at( position ).isDigit() ) { ++ string.at(position).isDigit()) { + position++; + } + +- if ( position > 0 ) { +- value = string.left( position ).toInt( &ok ); +- if ( ok ) { ++ if (position > 0) { ++ value = string.left(position).toInt(&ok); ++ if (ok) { + readLength = position; + } else { + value = -1; +diff --git a/kdecore/date/kdatetimeparser_p.h b/kdecore/date/kdatetimeparser_p.h +index 7a47c3a..4a25b34 100644 +--- a/kdecore/date/kdatetimeparser_p.h ++++ b/kdecore/date/kdatetimeparser_p.h +@@ -31,8 +31,7 @@ class QTime; + class KDateTime; + class KCalendarSystem; + +-struct DateTimeComponents +-{ ++struct DateTimeComponents { + int day; + int month; + int year; +@@ -54,28 +53,28 @@ public: + + virtual ~KDateTimeParser(); + +- virtual QDate parseDate( const QString &dateString, +- const QString &format, +- const KCalendarSystem *calendar = KGlobal::locale()->calendar(), +- const KLocale *locale = KGlobal::locale(), +- KLocale::DigitSet digitSet = KLocale::ArabicDigits, +- KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat ) const; ++ virtual QDate parseDate(const QString &dateString, ++ const QString &format, ++ const KCalendarSystem *calendar = KGlobal::locale()->calendar(), ++ const KLocale *locale = KGlobal::locale(), ++ KLocale::DigitSet digitSet = KLocale::ArabicDigits, ++ KLocale::DateTimeFormatStandard standard = KLocale::KdeFormat) const; + + private: +- virtual DateTimeComponents parseDatePosix( const QString &dateString, +- const QString &format, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet, +- KLocale::DateTimeFormatStandard standard ) const; ++ virtual DateTimeComponents parseDatePosix(const QString &dateString, ++ const QString &format, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet, ++ KLocale::DateTimeFormatStandard standard) const; + +- virtual DateTimeComponents parseDateUnicode( const QString &inputString, +- const QString &format, +- const KCalendarSystem *calendar, +- const KLocale *locale, +- KLocale::DigitSet digitSet ) const; ++ virtual DateTimeComponents parseDateUnicode(const QString &inputString, ++ const QString &format, ++ const KCalendarSystem *calendar, ++ const KLocale *locale, ++ KLocale::DigitSet digitSet) const; + +- virtual int integerFromString( const QString &string, int maxLength, int &readLength ) const; ++ virtual int integerFromString(const QString &string, int maxLength, int &readLength) const; + }; + + #endif // KDATETIMEPARSER_H +diff --git a/kdecore/date/kdayperiod.cpp b/kdecore/date/kdayperiod.cpp +index 84170b4..c810552 100644 +--- a/kdecore/date/kdayperiod.cpp ++++ b/kdecore/date/kdayperiod.cpp +@@ -167,8 +167,8 @@ QTime KDayPeriod::time(int hip, int minute, int second, int millisecond) const + } + int hour; + if (periodStart() <= periodEnd() || +- (hip >= hourInPeriod(periodStart()) && +- hip <= hourInPeriod(QTime(23, 59, 59, 999)))) { ++ (hip >= hourInPeriod(periodStart()) && ++ hip <= hourInPeriod(QTime(23, 59, 59, 999)))) { + hour = hip + periodStart().hour() - d->m_offsetFromStart; + } else { + hour = hip; +@@ -197,7 +197,7 @@ bool KDayPeriod::isValid(const QTime &time) const + return time >= periodStart() && time <= periodEnd(); + } else { + return ((time >= periodStart() && time <= QTime(23, 59, 59, 999)) || +- (time >= QTime( 0, 0, 0 ) && time <= periodEnd())); ++ (time >= QTime(0, 0, 0) && time <= periodEnd())); + } + } else { + return false; +diff --git a/kdecore/date/klocalizeddate.cpp b/kdecore/date/klocalizeddate.cpp +index b624a34..b918e9e 100644 +--- a/kdecore/date/klocalizeddate.cpp ++++ b/kdecore/date/klocalizeddate.cpp +@@ -42,22 +42,22 @@ public: + }; + + KLocalizedDatePrivate::KLocalizedDatePrivate(const QDate &date, const KCalendarSystem *calendar, bool manageCalendar) +- : QSharedData(), +- m_date(date), +- m_calendar(calendar), +- m_manageCalendar(manageCalendar) ++ : QSharedData(), ++ m_date(date), ++ m_calendar(calendar), ++ m_manageCalendar(manageCalendar) + { + } + + KLocalizedDatePrivate::KLocalizedDatePrivate(const KLocalizedDatePrivate &rhs) +- : QSharedData(rhs), +- m_date(rhs.m_date), +- m_calendar(rhs.m_calendar), +- m_manageCalendar(rhs.m_manageCalendar) ++ : QSharedData(rhs), ++ m_date(rhs.m_date), ++ m_calendar(rhs.m_calendar), ++ m_manageCalendar(rhs.m_manageCalendar) + { + // If we're managing the calendar object, then take a copy, + // i.e. user called setCalendarSystem() rather than passing a custom one into the constructor +- if(m_manageCalendar) { ++ if (m_manageCalendar) { + m_calendar = KCalendarSystem::create(m_calendar->calendarSystem(), new KLocale(*m_calendar->locale())); + } + } +@@ -69,7 +69,7 @@ KLocalizedDatePrivate &KLocalizedDatePrivate::operator=(const KLocalizedDatePriv + m_manageCalendar = rhs.m_manageCalendar; + // If we're managing the calendar object, then take a copy, + // i.e. user called setCalendarSystem() rather than passing a custom one into the constructor +- if(rhs.m_manageCalendar) { ++ if (rhs.m_manageCalendar) { + m_calendar = KCalendarSystem::create(m_calendar->calendarSystem(), new KLocale(*m_calendar->locale())); + } + return *this; +@@ -91,18 +91,18 @@ KLocalizedDatePrivate::~KLocalizedDatePrivate() + *****************************************************************************/ + + KLocalizedDate::KLocalizedDate(const QDate &date, const KCalendarSystem *calendarSystem) +- : d(new KLocalizedDatePrivate(date, calendarSystem, false)) ++ : d(new KLocalizedDatePrivate(date, calendarSystem, false)) + { + } + + KLocalizedDate::KLocalizedDate(int year, int month, int day, const KCalendarSystem *calendarSystem) +- : d(new KLocalizedDatePrivate(QDate(), calendarSystem, false)) ++ : d(new KLocalizedDatePrivate(QDate(), calendarSystem, false)) + { + setDate(year, month, day); + } + + KLocalizedDate::KLocalizedDate(const KLocalizedDate &rhs) +- : d(new KLocalizedDatePrivate(*rhs.d)) ++ : d(new KLocalizedDatePrivate(*rhs.d)) + { + } + +@@ -148,7 +148,7 @@ KLocale::CalendarSystem KLocalizedDate::calendarSystem() + + const KCalendarSystem *KLocalizedDate::calendar() const + { +- if ( d->m_calendar ) { ++ if (d->m_calendar) { + return d->m_calendar; + } + return KGlobal::locale()->calendar(); +@@ -167,7 +167,7 @@ bool KLocalizedDate::isNull() const + + bool KLocalizedDate::isValid() const + { +- return calendar()->isValid( date() ); ++ return calendar()->isValid(date()); + } + + /***************************************************************************** +@@ -297,13 +297,12 @@ int KLocalizedDate::dayOfWeek() const + + int KLocalizedDate::week(int *yearNum) const + { +- return calendar()->weekNumber(date(), yearNum); ++ return calendar()->week(date(), yearNum); + } + + int KLocalizedDate::week(KLocale::WeekNumberSystem weekNumberSystem, int *yearNum) const + { +- Q_UNUSED(weekNumberSystem); +- return calendar()->weekNumber(date(), yearNum); ++ return calendar()->week(date(), weekNumberSystem, yearNum); + } + + int KLocalizedDate::monthsInYear() const +@@ -318,8 +317,7 @@ int KLocalizedDate::weeksInYear() const + + int KLocalizedDate::weeksInYear(KLocale::WeekNumberSystem weekNumberSystem) const + { +- Q_UNUSED(weekNumberSystem); +- return calendar()->weeksInYear(date()); ++ return calendar()->weeksInYear(date(), weekNumberSystem); + } + + int KLocalizedDate::daysInYear() const +@@ -454,13 +452,13 @@ bool KLocalizedDate::addDaysTo(int days) + } + + void KLocalizedDate::dateDifference(const KLocalizedDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const + { + dateDifference(toDate.date(), yearsDiff, monthsDiff, daysDiff, direction); + } + + void KLocalizedDate::dateDifference(const QDate &toDate, +- int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const ++ int *yearsDiff, int *monthsDiff, int *daysDiff, int *direction) const + { + calendar()->dateDifference(date(), toDate, yearsDiff, monthsDiff, daysDiff, direction); + } +@@ -606,7 +604,7 @@ QDataStream &operator>>(QDataStream &in, KLocalizedDate &date) + + QDebug operator<<(QDebug dbg, const KLocalizedDate &date) + { +- if (date.calendar()->calendarType() == QLatin1String("gregorian")) { ++ if (date.calendar()->calendarSystem() == KLocale::QDateCalendar) { + dbg.nospace() << "KLocalizedDate(" << date.formatDate(KLocale::IsoDate) << ", " + << date.calendar()->calendarLabel() << ')'; + } else { +diff --git a/kdecore/date/klocalizeddate.h b/kdecore/date/klocalizeddate.h +index 2d1d611..6842577 100644 +--- a/kdecore/date/klocalizeddate.h ++++ b/kdecore/date/klocalizeddate.h +@@ -17,8 +17,8 @@ + Boston, MA 02110-1301, USA. + */ + +-#ifndef KDATE_H +-#define KDATE_H ++#ifndef KLOCALIZEDDATE_H ++#define KLOCALIZEDDATE_H + + #include <QtCore/QString> + #include <QtCore/QDate> +@@ -151,7 +151,7 @@ public: + * See @ref custom for more details on using custom Calendar Systems. + * + * @param date the QDate to set the KLocalizedDate to, defaults to invalid date +- * @param locale the locale to use for date formats, defaults to the global ++ * @param calendar the calendar system to use, defaults to the global + */ + explicit KLocalizedDate(const QDate &date = QDate(), const KCalendarSystem *calendar = 0); + +@@ -169,6 +169,7 @@ public: + * @param year the year to set the KLocalizedDate to + * @param month the month to set the KLocalizedDate to + * @param day the day to set the KLocalizedDate to ++ * @param calendar the calendar system to use, defaults to the global + */ + KLocalizedDate(int year, int month, int day, const KCalendarSystem *calendar = 0); + +@@ -297,7 +298,7 @@ public: + * @see eraName() + * @see yearInEra() + * @param eraName Era string +- * @param year Year In Era number ++ * @param yearInEra Year In Era number + * @param month Month number + * @param day Day Of Month number + * @return @c true if the date is valid, @c false otherwise +@@ -421,7 +422,6 @@ public: + * See @ref formatting for more details on Date Formatting. + * + * @see formatDate() +- * @param format format to return, either short or long + * @return the localized era name, empty string if date is invalid + */ + QString eraName() const; +@@ -433,7 +433,6 @@ public: + * See @ref formatting for more details on Date Formatting. + * + * @see formatDate() +- * @param format format to return, either short or long + * @return the localized era year string, empty string if date is invalid + */ + QString eraYear() const; +@@ -1166,22 +1165,25 @@ Q_DECLARE_METATYPE(KLocalizedDate) + /** + * Data stream output operator + * +- * @param other the date to compare ++ * @param out the datastream to write to ++ * @param date the date to write to the stream + */ + QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KLocalizedDate &date); + + /** + * Data stream input operator + * +- * @param other the date to compare ++ * @param out the datastream to read from ++ * @param date the date to read from the stream + */ + QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date); + + /** + * Debug stream output operator + * +- * @param other the date to print ++ * @param out the debug datastream to write to ++ * @param date the date to write to the stream + */ +-QDebug KDECORE_EXPORT operator<<(QDebug, const KLocalizedDate &); ++QDebug KDECORE_EXPORT operator<<(QDebug debug, const KLocalizedDate &date); + +-#endif // KDATE_H ++#endif // KLOCALIZEDDATE_H +diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt +index f78c115..276f005 100644 +--- a/kdecore/CMakeLists.txt ++++ b/kdecore/CMakeLists.txt +@@ -184,9 +184,9 @@ set(kdecore_LIB_SRCS + date/kcalendarsystem.cpp + date/kcalendarsystemcoptic.cpp + date/kcalendarsystemethiopian.cpp ++ date/kcalendarsystemqdate.cpp + date/kcalendarsystemgregorian.cpp +- date/kcalendarsystemgregorianproleptic.cpp +- date/kcalendarsystemhijri.cpp ++ date/kcalendarsystemislamiccivil.cpp + date/kcalendarsystemhebrew.cpp + date/kcalendarsystemindiannational.cpp + date/kcalendarsystemjalali.cpp diff --git a/kde-unstable/kdelibs/kde-applications-menu.patch b/kde-unstable/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/kde-unstable/kdelibs/kde-applications-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 ++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 +@@ -69,7 +69,7 @@ + if (WIN32) + install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) + else (WIN32) +-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) ++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) + endif (WIN32) + install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 ++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 +@@ -302,7 +302,7 @@ + if (!m_trackId.isEmpty()) + g_vfolder->setTrackId(m_trackId); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); + entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/kde-unstable/kdelibs/kdelibs.install b/kde-unstable/kdelibs/kdelibs.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/kde-unstable/kdelibs/kdelibs.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD new file mode 100644 index 000000000..44d684966 --- /dev/null +++ b/kde-unstable/kdemultimedia/PKGBUILD @@ -0,0 +1,109 @@ +# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdemultimedia +pkgname=('kdemultimedia-dragonplayer' + 'kdemultimedia-ffmpegthumbs' + 'kdemultimedia-juk' + 'kdemultimedia-kioslave' + 'kdemultimedia-kmix' + 'kdemultimedia-kscd' + 'kdemultimedia-mplayerthumbs') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp' + 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'mplayerthumbs.config') +sha1sums=('60fa25d125aa77b66fd1c1e9e043df48abf35bd4' + 'ba016fa2563c14ffcba852c62506b66bfc6ee683') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xine=OFF + make +} + +package_kdemultimedia-dragonplayer() { + pkgdesc='Video Player' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/dragonplayer/" + install='kdemultimedia.install' + cd $srcdir/build/dragonplayer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dragonplayer + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-ffmpegthumbs() { + pkgdesc='Video Files (ffmpegthumbs)' + depends=('kdebase-runtime' 'ffmpeg') + install='kdemultimedia.install' + cd $srcdir/build/ffmpegthumbs + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-juk() { + pkgdesc='Music Player' + depends=('kdebase-runtime' 'tunepimp') + url="http://kde.org/applications/multimedia/juk" + install='kdemultimedia.install' + cd $srcdir/build/juk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/juk + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kioslave() { + pkgdesc='Audio CD Browser' + depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') + conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + for i in kioslave doc/kioslave libkcddb libkcompactdisc; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdemultimedia-kmix() { + pkgdesc='Sound Mixer' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/kmix" + install='kdemultimedia.install' + cd $srcdir/build/kmix + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmix + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kscd() { + pkgdesc='CD Player' + depends=('kdebase-runtime' 'libmusicbrainz3') + url="http://kde.org/applications/multimedia/kscd" + install='kdemultimedia.install' + cd $srcdir/build/kscd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/cddbretrieval + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-mplayerthumbs() { + pkgdesc='Video Files (MPlayerThumbs)' + depends=('kdebase-runtime' 'mplayer') + replaces=('mplayerthumbs') + conflicts=('mplayerthumbs') + cd $srcdir/build/mplayerthumbs + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs +} diff --git a/kde-unstable/kdemultimedia/kdemultimedia.install b/kde-unstable/kdemultimedia/kdemultimedia.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdemultimedia/kdemultimedia.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdemultimedia/mplayerthumbs.config b/kde-unstable/kdemultimedia/mplayerthumbs.config new file mode 100644 index 000000000..761a17953 --- /dev/null +++ b/kde-unstable/kdemultimedia/mplayerthumbs.config @@ -0,0 +1,2 @@ +[MPlayerThumbsCfg] +backend=0 diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD new file mode 100644 index 000000000..763acd722 --- /dev/null +++ b/kde-unstable/kdenetwork/PKGBUILD @@ -0,0 +1,114 @@ +# $Id: PKGBUILD 124770 2011-05-24 10:05:32Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdenetwork +pkgname=('kdenetwork-filesharing' + 'kdenetwork-kdnssd' + 'kdenetwork-kget' + 'kdenetwork-kopete' + 'kdenetwork-kppp' + 'kdenetwork-krdc' + 'kdenetwork-krfb') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdenetwork') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' + 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp' + 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' + 'telepathy-qt4' 'libktorrent' 'libmms') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('8afe1547ea6f9f7acbdaf73b3ade4e3c752e645e') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ + -DWITH_Xmms=OFF \ + -DWITH_LibMeanwhile=OFF + make +} + +package_kdenetwork-filesharing() { + pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' + depends=('kdelibs' 'smbclient') + install='kdenetwork.install' + cd $srcdir/build/filesharing + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kdnssd() { + pkgdesc='Monitors the network for DNS-SD services' + depends=('kdelibs') + cd $srcdir/build/kdnssd + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kget() { + pkgdesc='Download Manager' + depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms') + optdepends=('python2: YouTube plugin') + url="http://kde.org/applications/internet/kget/" + install='kdenetwork.install' + cd $srcdir/build/kget + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kget + make DESTDIR=$pkgdir install + + # Use the python2 executable + find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdenetwork-kopete() { + pkgdesc='Instant Messenger' + depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' + 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu') + url="http://kde.org/applications/internet/kopete/" + install='kdenetwork.install' + cd $srcdir/build/kopete + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kopete + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kppp() { + pkgdesc='Internet Dial-Up Tool' + depends=('kdebase-runtime' 'ppp') + url="http://kde.org/applications/internet/kppp/" + install='kdenetwork.install' + cd $srcdir/build/kppp + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kppp + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krdc() { + pkgdesc='Remote Desktop Client' + depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4') + optdepends=('kdebase-keditbookmarks: to edit bookmarks') + url="http://kde.org/applications/internet/krdc/" + cd $srcdir/build/krdc + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krdc + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krfb() { + pkgdesc='Desktop Sharing' + # note on libxdamage: + # not detected by namcap because libgl depends on it + # but nvidia providing libgl does not depend on libxdamage + depends=('kdebase-runtime' 'libvncserver' 'libxdamage') + cd $srcdir/build/krfb + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krfb + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdenetwork/kdenetwork.install b/kde-unstable/kdenetwork/kdenetwork.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdenetwork/kdenetwork.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD index 55d038f9e..b3e328a75 100644 --- a/kde-unstable/kdepim-runtime/PKGBUILD +++ b/kde-unstable/kdepim-runtime/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.5.96 +pkgver=4.6.80 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64' 'mips64el') @@ -12,16 +12,10 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdepimlibs' 'kdebase-runtime') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install=${pkgname}.install -#source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -source=("http://download.kde.org/unstable/kdepim/${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'disable-l10n.patch') -sha1sums=('fd1cf58d5b62c647a7920dfc1d79126843750b1e' - '991d81435205185dcb2285a6e728f7756ae92b0d') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('18cb10ea5a7373c4eea859b0d0518b6a9c0e6a4e') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np0 -i "${srcdir}"/disable-l10n.patch - cd "${srcdir}" mkdir build cd build diff --git a/kde-unstable/kdepim-runtime/disable-l10n.patch b/kde-unstable/kdepim-runtime/disable-l10n.patch deleted file mode 100644 index 3ac9bc0e5..000000000 --- a/kde-unstable/kdepim-runtime/disable-l10n.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt~ 2011-01-30 06:27:14.403350537 -0800 -+++ CMakeLists.txt 2011-01-30 06:27:58.130017204 -0800 -@@ -192,7 +192,3 @@ - update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) - - macro_display_feature_log() -- --find_package(Msgfmt REQUIRED) --find_package(Gettext REQUIRED) --add_subdirectory(po) diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD index 6e8e692ee..378ef6a39 100644 --- a/kde-unstable/kdepim/PKGBUILD +++ b/kde-unstable/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123823 2011-05-13 18:23:10Z andrea $ +# $Id: PKGBUILD 124768 2011-05-24 09:38:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,25 +20,24 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.5.96 +pkgver=4.6.80 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' - 'pilot-link' 'kde-agent' 'docbook-xsl') -#source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -source=("http://download.kde.org/unstable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'disable-l10n.patch') -sha1sums=('f425f143fe3381be2bb018bab92d89fd112595f0' - '25e36f160ced051268e59fad6ed2de33a9c7657a') + 'pilot-link' 'kde-agent') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'fix-console-build.patch') +sha1sums=('dc32fee3332df3bdb4395f3a229d88de34ae4de1' + 'e4b82bcee6c46aad39196a5bb2732fed72ff4541') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np0 -i "${srcdir}"/disable-l10n.patch + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-console-build.patch - cd "${srcdir}" + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/kde-unstable/kdepim/disable-l10n.patch b/kde-unstable/kdepim/disable-l10n.patch deleted file mode 100644 index 3f218d532..000000000 --- a/kde-unstable/kdepim/disable-l10n.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt~ 2011-01-30 06:31:02.180017202 -0800 -+++ CMakeLists.txt 2011-01-30 06:31:26.093350537 -0800 -@@ -423,7 +423,3 @@ - endif(NOT QGPGME_FOUND) - # All done, let's display what we found... - macro_display_feature_log() --find_package(Msgfmt REQUIRED) --find_package(Gettext REQUIRED) --add_subdirectory(po) --add_subdirectory(doc-translations) diff --git a/kde-unstable/kdepim/fix-console-build.patch b/kde-unstable/kdepim/fix-console-build.patch new file mode 100644 index 000000000..552b8c0c1 --- /dev/null +++ b/kde-unstable/kdepim/fix-console-build.patch @@ -0,0 +1,11 @@ +--- a/console/kabcclient/src/main.cpp ++++ b/console/kabcclient/src/main.cpp +@@ -117,7 +117,7 @@ int main(int argc, char** argv) + + cmdLineOptions.add("match-case", ki18n("Match key fields case sensitive. UID is always matched case sensitive")); + +- cmdLineOptions.add(ki18n("+[input data]"), ki18n("Input to use instead of reading stdin")); ++ cmdLineOptions.add("+[input data]", ki18n("Input to use instead of reading stdin")); + + KCmdLineArgs::addCmdLineOptions(cmdLineOptions); + KCmdLineArgs::init(argc, argv, &aboutData); diff --git a/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD new file mode 100644 index 000000000..2fff6052c --- /dev/null +++ b/kde-unstable/kdepimlibs/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124655 2011-05-23 19:42:19Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdepimlibs +pkgver=4.6.80 +pkgrel=1 +pkgdesc="KDE PIM Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'gpgme' 'akonadi' 'libical' ) +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') +install='kdepimlibs.install' +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('e07ba03177775ee6db6669123b944dd7c3b362f1') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdepimlibs/kdepimlibs.install b/kde-unstable/kdepimlibs/kdepimlibs.install new file mode 100644 index 000000000..99262607c --- /dev/null +++ b/kde-unstable/kdepimlibs/kdepimlibs.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD new file mode 100644 index 000000000..567e16086 --- /dev/null +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -0,0 +1,603 @@ +# $Id: PKGBUILD 124813 2011-05-24 15:14:21Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeplasma-addons +pkgname=('kdeplasma-addons-applets-bball' + 'kdeplasma-addons-applets-binary-clock' + 'kdeplasma-addons-applets-blackboard' + 'kdeplasma-addons-applets-bookmarks' + 'kdeplasma-addons-applets-bubblemon' + 'kdeplasma-addons-applets-calculator' + 'kdeplasma-addons-applets-charselect' + 'kdeplasma-addons-applets-comic' + 'kdeplasma-addons-applets-community' + 'kdeplasma-addons-applets-dict' + 'kdeplasma-addons-applets-eyes' + 'kdeplasma-addons-applets-fifteenpuzzle' + 'kdeplasma-addons-applets-filewatcher' + 'kdeplasma-addons-applets-frame' + 'kdeplasma-addons-applets-fuzzy-clock' + 'kdeplasma-addons-applets-incomingmsg' + 'kdeplasma-addons-applets-kdeobservatory' + 'kdeplasma-addons-applets-kimpanel' + 'kdeplasma-addons-applets-knowledgebase' + 'kdeplasma-addons-applets-kolourpicker' + 'kdeplasma-addons-applets-konqprofiles' + 'kdeplasma-addons-applets-konsoleprofiles' + 'kdeplasma-addons-applets-lancelot' + 'kdeplasma-addons-applets-leavenote' + 'kdeplasma-addons-applets-life' + 'kdeplasma-addons-applets-luna' + 'kdeplasma-addons-applets-magnifique' + 'kdeplasma-addons-applets-mediaplayer' + 'kdeplasma-addons-applets-microblog' + 'kdeplasma-addons-applets-news' + 'kdeplasma-addons-applets-notes' + 'kdeplasma-addons-applets-nowplaying' + 'kdeplasma-addons-applets-paste' + 'kdeplasma-addons-applets-pastebin' + 'kdeplasma-addons-applets-plasmaboard' + 'kdeplasma-addons-applets-previewer' + 'kdeplasma-addons-applets-qalculate' + 'kdeplasma-addons-applets-rememberthemilk' + 'kdeplasma-addons-applets-rssnow' + 'kdeplasma-addons-applets-showdashboard' + 'kdeplasma-addons-applets-showdesktop' + 'kdeplasma-addons-applets-social-news' + 'kdeplasma-addons-applets-spellcheck' + 'kdeplasma-addons-applets-systemloadviewer' + 'kdeplasma-addons-applets-timer' + 'kdeplasma-addons-applets-unitconverter' + 'kdeplasma-addons-applets-weather' + 'kdeplasma-addons-applets-weatherstation' + 'kdeplasma-addons-applets-webslice' + 'kdeplasma-addons-containments' + 'kdeplasma-addons-libs' + 'kdeplasma-addons-runners-audioplayercontrol' + 'kdeplasma-addons-runners-browserhistory' + 'kdeplasma-addons-runners-characters' + 'kdeplasma-addons-runners-contacts' + 'kdeplasma-addons-runners-converter' + 'kdeplasma-addons-runners-datetime' + 'kdeplasma-addons-runners-events' + 'kdeplasma-addons-runners-katesessions' + 'kdeplasma-addons-runners-konquerorsessions' + 'kdeplasma-addons-runners-konsolesessions' + 'kdeplasma-addons-runners-kopete' + 'kdeplasma-addons-runners-mediawiki' + 'kdeplasma-addons-runners-spellchecker' + 'kdeplasma-addons-wallpapers-mandelbrot' + 'kdeplasma-addons-wallpapers-marble' + 'kdeplasma-addons-wallpapers-pattern' + 'kdeplasma-addons-wallpapers-virus' + 'kdeplasma-addons-wallpapers-weather') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +groups=('kde' 'kdeplasma-addons') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' + 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('09b97248aa576991f9f5e9ddaa3392618e2337e7') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeplasma-addons-applets-bball() { + pkgdesc='A bouncy ball for plasma' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/bball + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-binary-clock() { + pkgdesc='Time displayed in binary format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/binary-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-blackboard() { + pkgdesc='Black Board' + depends=('kdebase-workspace') + cd $srcdir/build/applets/blackboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bookmarks() { + pkgdesc='Quick Access to the Bookmarks' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bookmarks + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bubblemon() { + pkgdesc='A pretty bubble that monitors your system.' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bubblemon + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-calculator() { + pkgdesc='Calculate simple sums' + depends=('kdebase-workspace') + cd $srcdir/build/applets/calculator + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-charselect() { + pkgdesc='View, select, and copy characters from a font collection' + depends=('kdebase-workspace') + cd $srcdir/build/applets/charselect + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-comic() { + pkgdesc='View comic strips from the Internet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/comic + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-community() { + pkgdesc='Communicate using the Social Desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/community + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-dict() { + pkgdesc='Look up the meaning of words and their translation into different languages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/dict + make DESTDIR=$pkgdir install + # FIXME + # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz + rm -rf $pkgdir/usr/share/icons +} + +package_kdeplasma-addons-applets-eyes() { + pkgdesc='XEyes clone' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/eyes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fifteenpuzzle() { + pkgdesc='Put the pieces in order' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/fifteenPuzzle + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-filewatcher() { + pkgdesc='Watch for changes in specified files' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fileWatcher + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-frame() { + pkgdesc='Display your favorite pictures' + depends=('kdebase-workspace' 'libkexiv2') + cd $srcdir/build/applets/frame + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fuzzy-clock() { + pkgdesc='Time displayed in a less precise format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fuzzy-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-incomingmsg() { + pkgdesc='Notification of new messages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/incomingmsg + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kdeobservatory() { + pkgdesc='Visualize the KDE ecosystem' + depends=('kdebase-workspace' 'qwt') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/kdeobservatory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kimpanel() { + pkgdesc='A generic input method panel for Oriental languages' + depends=('kdebase-workspace') + optdepends=('scim: SCIM backend' + 'fcitx: FCITX backend') + cd $srcdir/build/applets/kimpanel + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-knowledgebase() { + pkgdesc='Opendesktop Knowledgebase' + depends=('kdebase-workspace') + cd $srcdir/build/applets/knowledgebase + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kolourpicker() { + pkgdesc='Pick a color from the desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/kolourpicker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konqprofiles() { + pkgdesc='List and launch Konqueror profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konqprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konsoleprofiles() { + pkgdesc='List and launch Konsole profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konsoleprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-lancelot() { + pkgdesc='Launcher to start applications' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + replaces=('lancelot') + provides=('lancelot') + conflicts=('lancelot') + install='kdeplasma-addons-applets-lancelot.install' + cd $srcdir/build/applets/lancelot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-leavenote() { + pkgdesc='Leave notes for users while they are away' + depends=('kdebase-workspace') + cd $srcdir/build/applets/leavenote + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-life() { + pkgdesc='Life' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/life + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-luna() { + pkgdesc='Display moon phases for your location' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/luna + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-magnifique() { + pkgdesc='A magnification glass for the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/magnifique + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-mediaplayer() { + pkgdesc='Widget that can play video and sound' + depends=('kdebase-workspace') + cd $srcdir/build/applets/mediaplayer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-microblog() { + pkgdesc='Update and view your microblog status.' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/microblog + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-news() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-notes() { + pkgdesc='Desktop sticky notes' + depends=('kdebase-workspace') + cd $srcdir/build/applets/notes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-nowplaying() { + pkgdesc='Displays currently playing audio' + depends=('kdebase-workspace') + cd $srcdir/build/applets/nowplaying + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-paste() { + pkgdesc='Paste text snippets' + depends=('kdebase-workspace') + cd $srcdir/build/applets/paste + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-pastebin() { + pkgdesc='Paste text/images to a remote server' + depends=('kdebase-workspace') + cd $srcdir/build/applets/pastebin + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-plasmaboard() { + pkgdesc='A virtual, on-screen keyboard' + depends=('kdebase-workspace') + cd $srcdir/build/applets/plasmaboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-previewer() { + pkgdesc='Preview This File' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/previewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-qalculate() { + pkgdesc='A powerful mathematical equation solver' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/qalculate + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rememberthemilk() { + pkgdesc='Remember The Milk Todo list applet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/rememberthemilk + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rssnow() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/rssnow + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdashboard() { + pkgdesc='Show the Plasma widget dashboard above other windows' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdashboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdesktop() { + pkgdesc='Show the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdesktop + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-social-news() { + pkgdesc='Stay informed with the Social Desktop' + replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + depends=('kdebase-workspace') + cd $srcdir/build/applets/social-news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-spellcheck() { + pkgdesc='Fast spell checking' + depends=('kdebase-workspace') + cd $srcdir/build/applets/spellcheck + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-systemloadviewer() { + pkgdesc='Tiny CPU/RAM/Swap monitor' + depends=('kdebase-workspace') + cd $srcdir/build/applets/systemloadviewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-timer() { + pkgdesc='Countdown over a specified time period' + depends=('kdebase-workspace') + cd $srcdir/build/applets/timer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-unitconverter() { + pkgdesc='Plasmoid for converting units' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/unitconverter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weather() { + pkgdesc='Displays Weather information' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weather + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weatherstation() { + pkgdesc='Weather reports with an LCD display style' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weatherstation + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-webslice() { + pkgdesc='Show a part of a webpage' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/webslice + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-containments() { + pkgdesc='Activities types for Plasma shells' + depends=('kdebase-workspace') + cd $srcdir/build/containments + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-libs() { + pkgdesc='Plasma Addon Library' + depends=('kdebase-workspace') + groups=() + replaces=('kdeplasma-addons-dataengines') + provides=('kdeplasma-addons-dataengines') + conflicts=('kdeplasma-addons-dataengines') + cd $srcdir/build/libs + make DESTDIR=$pkgdir install + cd $srcdir/build/dataengines + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-audioplayercontrol() { + pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)' + depends=('kdebase-workspace') + cd $srcdir/build/runners/audioplayercontrol + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-browserhistory() { + pkgdesc='Searches in Konqueror´s history' + depends=('kdebase-workspace') + cd $srcdir/build/runners/browserhistory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-characters() { + pkgdesc='special Characters' + depends=('kdebase-workspace') + cd $srcdir/build/runners/characters + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-contacts() { + pkgdesc='Finds entries in your address book' + depends=('kdebase-workspace') + cd $srcdir/build/runners/contacts + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-converter() { + pkgdesc='Convert values to different units' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/runners/converter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-datetime() { + pkgdesc='The current date and time, locally or in any timezone' + depends=('kdebase-workspace') + cd $srcdir/build/runners/datetime + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-events() { + pkgdesc='Calendar Events runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/events + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-katesessions() { + pkgdesc='Matches Kate Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/katesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konquerorsessions() { + pkgdesc='Matches Konqueror Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konquerorsessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konsolesessions() { + pkgdesc='Matches Konsole Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konsolesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-kopete() { + pkgdesc='Kopete Contact runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/kopete + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-mediawiki() { + pkgdesc='Search on Wikitravel' + depends=('kdebase-workspace') + cd $srcdir/build/runners/mediawiki + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-spellchecker() { + pkgdesc='Check the spelling of a word' + depends=('kdebase-workspace') + cd $srcdir/build/runners/spellchecker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-mandelbrot() { + pkgdesc='Mandelbrot' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/mandelbrot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-marble() { + pkgdesc='Globe' + depends=('kdebase-workspace' 'kdeedu-marble') + cd $srcdir/build/wallpapers/marble + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-pattern() { + pkgdesc='Pattern' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/pattern + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-virus() { + pkgdesc='Virus' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/virus + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-weather() { + pkgdesc='Weather' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/wallpapers/weather + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install new file mode 100644 index 000000000..c4ef46ba8 --- /dev/null +++ b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD new file mode 100644 index 000000000..c64df1df3 --- /dev/null +++ b/kde-unstable/kdesdk-kate/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 124689 2011-05-23 21:22:48Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgbase=kdesdk-kate +pkgname=('kdebase-kwrite' + 'kdesdk-kate') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +makedepends=('kdelibs ''cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.bz2" + 'pkgbuild-syntax-highlight.patch') +sha1sums=('9c95690b9f967a0ed52afcf6c4d7ace3ef9284ff' + 'ab0c5d2a796b0f283154799add161c99f48ffcd5') + +build() { + cd "${srcdir}"/kate-${pkgver} + patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../kate-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_KTEXTEDITOR=OFF + make +} + +package_kdebase-kwrite() { + pkgdesc="Text Editor" + depends=('kdebase-runtime') + groups=('kde' 'kdebase') + install='kdebase-kwrite.install' + + cd "${srcdir}"/build/kwrite + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/part + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/kwrite + make DESTDIR="${pkgdir}" install +} + +package_kdesdk-kate() { + pkgdesc="Advanced Text Editor" + depends=('kdebase-kwrite') + groups=('kde' 'kdesdk') + install='kdesdk-kate.install' + + cd "${srcdir}"/build/kate + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/kate + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdesdk-kate/kdebase-kwrite.install b/kde-unstable/kdesdk-kate/kdebase-kwrite.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdesdk-kate/kdebase-kwrite.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdesdk-kate/kdesdk-kate.install b/kde-unstable/kdesdk-kate/kdesdk-kate.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/kdesdk-kate/kdesdk-kate.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch b/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch new file mode 100644 index 000000000..3c43eca0f --- /dev/null +++ b/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch @@ -0,0 +1,11 @@ +--- kate-4.6.80/part/syntax/data/bash.xml~ 2011-05-23 21:20:34.295137123 +0000 ++++ kate-4.6.80/part/syntax/data/bash.xml 2011-05-23 21:20:54.581993368 +0000 +@@ -8,7 +8,7 @@ + <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following --> + <!ENTITY pathpart "([\w_@.%*?+-]|\\ )"> <!-- valid character in a file name --> + ]> +-<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> ++<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> + + <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl) + Changes by Matthew Woehlke (mw_triad@users.sourceforge.net) diff --git a/kde-unstable/kdesdk/PKGBUILD b/kde-unstable/kdesdk/PKGBUILD new file mode 100644 index 000000000..c01ad1d6e --- /dev/null +++ b/kde-unstable/kdesdk/PKGBUILD @@ -0,0 +1,247 @@ +# $Id: PKGBUILD 124846 2011-05-24 18:38:10Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdesdk +pkgname=('kdesdk-cervisia' + 'kdesdk-dolphin-plugins' + 'kdesdk-kapptemplate' + 'kdesdk-kcachegrind' + 'kdesdk-kdeaccounts-plugin' + 'kdesdk-kdepalettes' + 'kdesdk-kioslave' + 'kdesdk-kmtrace' + 'kdesdk-kompare' + 'kdesdk-kpartloader' + 'kdesdk-kprofilemethod' +# 'kdesdk-kspy' + 'kdesdk-kstartperf' + 'kdesdk-kuiviewer' + 'kdesdk-lokalize' + 'kdesdk-okteta' + 'kdesdk-poxml' +# 'kdesdk-scheck' + 'kdesdk-scripts' + 'kdesdk-strigi-analyzer' + 'kdesdk-umbrello') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdesdk') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2' + 'kdepimlibs' 'kdebase-lib') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'fix-python2-path.patch') +sha1sums=('2193e14b8373b833221dbf08ecdb0075e86abe44' + 'd05ca0231869c484fd3861955d960a60aff7dcfb') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + + # Fix python2 path + patch -Np1 -i ${srcdir}/fix-python2-path.patch + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdesdk-cervisia() { + pkgdesc='CVS Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/cervisia/" + install='kdesdk.install' + cd $srcdir/build/cervisia + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/cervisia + make DESTDIR=$pkgdir install +} + +package_kdesdk-dolphin-plugins() { + pkgdesc='Extra Dolphin plugins' + depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare') + install='kdesdk.install' + cd $srcdir/build/dolphin-plugins/git + make DESTDIR=$pkgdir install + cd $srcdir/build/dolphin-plugins/svn + make DESTDIR=$pkgdir install +} + +package_kdesdk-kapptemplate() { + pkgdesc='KDE Template Generator' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kapptemplate/" + install='kdesdk.install' + cd $srcdir/build/kapptemplate + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kapptemplate + make DESTDIR=$pkgdir install +} + +package_kdesdk-kcachegrind() { + pkgdesc='Visualization of Performance Profiling Data' + depends=('kdebase-runtime' 'python2') + optdepends=('php: PHP support') + url="http://kde.org/applications/development/kcachegrind/" + install='kdesdk.install' + cd $srcdir/build/kcachegrind + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcachegrind + make DESTDIR=$pkgdir install +} + +package_kdesdk-kdeaccounts-plugin() { + pkgdesc='KDE Repository Accounts' + depends=('kdepim-runtime') + cd $srcdir/build/kdeaccounts-plugin + make DESTDIR=$pkgdir install +} + +package_kdesdk-kdepalettes() { + pkgdesc='Palettes for the Gimp that match the KDE standard color palette' + optdepends=('gimp') + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \ + $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl +} + +package_kdesdk-kioslave() { + pkgdesc='KDED Subversion Module' + depends=('kdebase-runtime' 'subversion') + cd $srcdir/build/kioslave + make DESTDIR=$pkgdir install +} + +package_kdesdk-kmtrace() { + pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality' + depends=('kdebase-runtime') + cd $srcdir/build/kmtrace + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmtrace + make DESTDIR=$pkgdir install +} + +package_kdesdk-kompare() { + pkgdesc='Diff/Patch Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kompare/" + install='kdesdk.install' + cd $srcdir/build/kompare + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kompare + make DESTDIR=$pkgdir install +} + +package_kdesdk-kpartloader() { + pkgdesc='A test application for KParts' + depends=('kdebase-runtime') + install='kdesdk.install' + cd $srcdir/build/kpartloader + make DESTDIR=$pkgdir install +} + +package_kdesdk-kprofilemethod() { + pkgdesc='Macros helping to profile' + cd $srcdir/build/kprofilemethod + make DESTDIR=$pkgdir install +} + +package_kdesdk-kspy() { + pkgdesc='An Object Inspector for Qt/KDE applications' + depends=('kdebase-runtime') + cd $srcdir/build/kspy + make DESTDIR=$pkgdir install +} + +package_kdesdk-kstartperf() { + pkgdesc='Startup time measurement tool for KDE applications' + depends=('kdebase-runtime') + cd $srcdir/build/kstartperf + make DESTDIR=$pkgdir install +} + +package_kdesdk-kuiviewer() { + pkgdesc='Qt Designer UI File Viewer' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kuiviewer/" + install='kdesdk.install' + cd $srcdir/build/kuiviewer + make DESTDIR=$pkgdir install +} + +package_kdesdk-lokalize() { + pkgdesc='Computer-Aided Translation System' + depends=('kdebase-runtime' 'kdebindings-python') + url="http://kde.org/applications/development/lokalize/" + optdepends=('translate-toolkit: enable extra python script') + install='kdesdk.install' + cd $srcdir/build/lokalize + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/lokalize + make DESTDIR=$pkgdir install +} + +package_kdesdk-okteta() { + pkgdesc='Hex Editor' + depends=('kdebase-runtime') + replaces=('kdeutils-okteta') + conflicts=('kdeutils-okteta') + url="http://kde.org/applications/utilities/okteta" + install='kdesdk-okteta.install' + cd $srcdir/build/okteta + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/okteta + make DESTDIR=$pkgdir install +} + +package_kdesdk-poxml() { + pkgdesc='Translates DocBook XML files using gettext po files' + depends=('qt' 'antlr2') + cd $srcdir/build/poxml + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/poxml + make DESTDIR=$pkgdir install +} + +package_kdesdk-scheck() { + pkgdesc='An interface style to highlight accel and style guide conflicts' + depends=('kdebase-runtime') + cd $srcdir/build/scheck + make DESTDIR=$pkgdir install +} + +package_kdesdk-scripts() { + pkgdesc='KDE SDK scripts' + depends=('python2') + cd $srcdir/build/scripts + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/scripts + make DESTDIR=$pkgdir install +} + +package_kdesdk-strigi-analyzer() { + pkgdesc='Strigi-Analyzer for KDE SDK' + depends=('kdelibs') + cd $srcdir/build/strigi-analyzer + make DESTDIR=$pkgdir install +} + +package_kdesdk-umbrello() { + pkgdesc='UML Modeller' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/umbrello/" + install='kdesdk.install' + cd $srcdir/build/umbrello + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/umbrello + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdesdk/fix-python2-path.patch b/kde-unstable/kdesdk/fix-python2-path.patch new file mode 100644 index 000000000..c2c0745d1 --- /dev/null +++ b/kde-unstable/kdesdk/fix-python2-path.patch @@ -0,0 +1,64 @@ +--- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~ 2010-11-24 11:53:38.586666671 +0100 ++++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree 2010-11-24 11:53:38.623333337 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # _*_ coding: latin1 _*_ + + # +--- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100 ++++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100 +@@ -114,7 +114,7 @@ + print >>sys.stderr, "Execution failed:", e + + cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname) +- if os.name!='nt': cmd='python '+cmd ++ if os.name!='nt': cmd='python2 '+cmd + else: cmd=cmd.replace('/','\\') + os.system(cmd) + +--- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100 ++++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100 +@@ -42,7 +42,7 @@ + xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf) + + ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0] +- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) ++ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) + + try: convert() + except: print 'error occured' +--- kdesdk-4.5.80/scripts/rename_source_files~ 2010-11-24 11:45:41.040000004 +0100 ++++ kdesdk-4.5.80/scripts/rename_source_files 2010-11-24 11:45:41.093333336 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python2 + # + # Copyright David Faure <faure@kde.org>, License LGPL v2 + # +--- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100 ++++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100 +@@ -17,6 +17,6 @@ + svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID + + echo "Creating changelog..."; +-svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 ++svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 + + rm /tmp/accounts.$PPID +--- kdesdk-4.5.80/scripts/kde_generate_export_header~ 2010-11-24 11:48:49.696666669 +0100 ++++ kdesdk-4.5.80/scripts/kde_generate_export_header 2010-11-24 11:48:49.753333338 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python2 + + import os, sys, string + +--- kdesdk-4.5.80/scripts/reviewboarddiff~ 2010-11-24 11:49:37.686666670 +0100 ++++ kdesdk-4.5.80/scripts/reviewboarddiff 2010-11-24 11:49:37.740000003 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # encoding: utf-8 + # + # Generates reviewboard compatible diffs from git-svn repositories. diff --git a/kde-unstable/kdesdk/kdesdk-okteta.install b/kde-unstable/kdesdk/kdesdk-okteta.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/kde-unstable/kdesdk/kdesdk-okteta.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdesdk/kdesdk.install b/kde-unstable/kdesdk/kdesdk.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdesdk/kdesdk.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdetoys/PKGBUILD b/kde-unstable/kdetoys/PKGBUILD new file mode 100644 index 000000000..1eba40691 --- /dev/null +++ b/kde-unstable/kdetoys/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 124780 2011-05-24 12:05:42Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdetoys +pkgname=('kdetoys-amor' + 'kdetoys-kteatime' + 'kdetoys-ktux') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdetoys') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('b268bb38f84199d33d3be1fe3e0389c0abb35e69') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdetoys-amor() { + pkgdesc='On-Screen Creature' + depends=('kdebase-runtime') + install='kdetoys.install' + cd $srcdir/build/amor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/amor + make DESTDIR=$pkgdir install +} + +package_kdetoys-kteatime() { + pkgdesc='Tea Cooker' + depends=('kdebase-runtime') + install='kdetoys.install' + cd $srcdir/build/kteatime + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kteatime + make DESTDIR=$pkgdir install +} + +package_kdetoys-ktux() { + pkgdesc='KTux' + depends=('kdebase-workspace' ) + install='kdetoys.install' + cd $srcdir/build/ktux + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdetoys/kdetoys.install b/kde-unstable/kdetoys/kdetoys.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdetoys/kdetoys.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdeutils/PKGBUILD b/kde-unstable/kdeutils/PKGBUILD new file mode 100644 index 000000000..89915c6f6 --- /dev/null +++ b/kde-unstable/kdeutils/PKGBUILD @@ -0,0 +1,180 @@ +# $Id: PKGBUILD 124777 2011-05-24 11:52:41Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeutils +pkgname=('kdeutils-ark' + 'kdeutils-filelight' + 'kdeutils-kcalc' + 'kdeutils-kcharselect' + 'kdeutils-kdf' + 'kdeutils-kfloppy' + 'kdeutils-kgpg' + 'kdeutils-kremotecontrol' + 'kdeutils-ktimer' + 'kdeutils-kwallet' + 'kdeutils-printer-applet' + 'kdeutils-superkaramba' + 'kdeutils-sweeper') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeutils') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' + 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' + 'qjson') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('90b5e5bd95ec2de2d36db20c6155d23dbeab2d60') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeutils-ark() { + pkgdesc='Archiving Tool' + depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') + optdepends=('p7zip' 'zip' 'unzip' 'unrar') + url="http://kde.org/applications/utilities/ark/" + cd $srcdir/build/ark + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ark + make DESTDIR=$pkgdir install +} + +package_kdeutils-filelight() { + pkgdesc='View disk usage information' + depends=('kdebase-runtime' 'qimageblitz') + replaces=('filelight') + conflicts=('filelight') + install='kdeutils.install' + url="http://methylblue.com/filelight/" + cd $srcdir/build/filelight + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/filelight + make DESTDIR=$pkgdir install +} + +package_kdeutils-kcalc() { + pkgdesc='Scientific Calculator' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kcalc/" + cd $srcdir/build/kcalc + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcalc + make DESTDIR=$pkgdir install +} + +package_kdeutils-kcharselect() { + pkgdesc='Character Selector' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kcharselect/" + cd $srcdir/build/kcharselect + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcharselect + make DESTDIR=$pkgdir install +} + +package_kdeutils-kdf() { + pkgdesc='View Disk Usage' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/kdiskfree/" + install='kdeutils.install' + cd $srcdir/build/kdf + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdf + make DESTDIR=$pkgdir install +} + +package_kdeutils-kfloppy() { + pkgdesc='Floppy Formatter' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kfloppy/" + install='kdeutils.install' + cd $srcdir/build/kfloppy + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfloppy + make DESTDIR=$pkgdir install +} + +package_kdeutils-kgpg() { + pkgdesc='A GnuPG frontend' + depends=('kdepim-runtime' 'kde-agent') + url="http://kde.org/applications/utilities/kgpg" + install='kdeutils.install' + cd $srcdir/build/kgpg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgpg + make DESTDIR=$pkgdir install +} + +package_kdeutils-kremotecontrol() { + pkgdesc='Configure your remote controls for use with applications' + replaces=('kdeutils-kdelirc') + conflicts=('kdeutils-kdelirc') + depends=('kdebase-workspace') + url="http://kde.org/applications/utilities/kremotecontrol" + install='kdeutils.install' + cd $srcdir/build/kremotecontrol + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/kremotecontrol + make DESTDIR=$pkgdir install +} + +package_kdeutils-ktimer() { + pkgdesc='Countdown Launcher' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/ktimer" + install='kdeutils.install' + cd $srcdir/build/ktimer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktimer + make DESTDIR=$pkgdir install +} + +package_kdeutils-kwallet() { + pkgdesc='Wallet Management Tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/kwalletmanager/" + install='kdeutils.install' + cd $srcdir/build/kwallet + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kwallet + make DESTDIR=$pkgdir install +} + +package_kdeutils-printer-applet() { + pkgdesc='System tray icon for managing print jobs' + depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common') + url="http://kde.org/applications/system/printerapplet/" + cd $srcdir/build/printer-applet + make DESTDIR=$pkgdir install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdeutils-superkaramba() { + pkgdesc='An engine for cool desktop eyecandy' + depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz') + url="http://kde.org/applications/utilities/superkaramba" + install='kdeutils.install' + cd $srcdir/build/superkaramba + make DESTDIR=$pkgdir install +} + +package_kdeutils-sweeper() { + pkgdesc='System Cleaner' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/sweeper/" + cd $srcdir/build/sweeper + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdeutils/kdeutils.install b/kde-unstable/kdeutils/kdeutils.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdeutils/kdeutils.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/kdewebdev/PKGBUILD b/kde-unstable/kdewebdev/PKGBUILD new file mode 100644 index 000000000..d70b92ee0 --- /dev/null +++ b/kde-unstable/kdewebdev/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 124779 2011-05-24 12:04:03Z andrea $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdewebdev +pkgname=('kdewebdev-kfilereplace' + 'kdewebdev-kimagemapeditor' + 'kdewebdev-klinkstatus' + 'kdewebdev-kommander') +pkgver=4.6.80 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdewebdev') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' + 'boost') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('d5e35391eb64265f66d81c5bdd8d95abf11d474a') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdewebdev-kfilereplace() { + pkgdesc='Search & Replace Tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kfilereplace/" + install='kdewebdev.install' + cd $srcdir/build/kfilereplace + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfilereplace + make DESTDIR=$pkgdir install +} + +package_kdewebdev-kimagemapeditor() { + pkgdesc='HTML Image Map Editor' + depends=('kdebase-runtime') + install='kdewebdev.install' + cd $srcdir/build/kimagemapeditor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kimagemapeditor + make DESTDIR=$pkgdir install +} + +package_kdewebdev-klinkstatus() { + pkgdesc='Link Checker' + depends=('kdepim-runtime' 'tidyhtml') + install='kdewebdev.install' + cd $srcdir/build/klinkstatus + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klinkstatus + make DESTDIR=$pkgdir install +} + +package_kdewebdev-kommander() { + pkgdesc='Executor for Kommander dialogs' + depends=('kdebase-runtime') + cd $srcdir/build/kommander + make DESTDIR=$pkgdir install +} diff --git a/kde-unstable/kdewebdev/kdewebdev.install b/kde-unstable/kdewebdev/kdewebdev.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/kdewebdev/kdewebdev.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/libkdcraw/PKGBUILD b/kde-unstable/libkdcraw/PKGBUILD new file mode 100644 index 000000000..95daa4280 --- /dev/null +++ b/kde-unstable/libkdcraw/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkdcraw +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A C++ interface used to decode RAW picture" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs' 'lcms') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('19fe60a51ede7bf5b4047f8fff22cd8361ebd90c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkdcraw/libkdcraw.install b/kde-unstable/libkdcraw/libkdcraw.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/libkdcraw/libkdcraw.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/libkdeedu/PKGBUILD b/kde-unstable/libkdeedu/PKGBUILD new file mode 100644 index 000000000..fa4986b87 --- /dev/null +++ b/kde-unstable/libkdeedu/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124792 2011-05-24 13:04:47Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkdeedu +pkgver=4.6.80 +pkgrel=1 +pkgdesc="Libraries used by KDE Education applications" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +replaces=('kdeedu-libkdeedu' 'kdeedu-data') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('2349b0a1676b61c7915a272030d6388e8bd6c3b1') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkdeedu/libkdeedu.install b/kde-unstable/libkdeedu/libkdeedu.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/libkdeedu/libkdeedu.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/libkexiv2/PKGBUILD b/kde-unstable/libkexiv2/PKGBUILD new file mode 100644 index 000000000..c80f8cd71 --- /dev/null +++ b/kde-unstable/libkexiv2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkexiv2 +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A library to manipulate pictures metadata" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('cff979e2bcc604ec422feff0bc1fee3483955e5d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkface/PKGBUILD b/kde-unstable/libkface/PKGBUILD new file mode 100644 index 000000000..9bdcab86b --- /dev/null +++ b/kde-unstable/libkface/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124682 2011-05-23 20:54:29Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkface +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A library to perform face recognition and detection over pictures" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs' 'opencv') +makedepends=('cmake' 'automoc4') +#install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('197b7c26e70c45339745efc839698c3ad276bb65') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkipi/PKGBUILD b/kde-unstable/libkipi/PKGBUILD new file mode 100644 index 000000000..b11e5a1cf --- /dev/null +++ b/kde-unstable/libkipi/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkipi +pkgver=4.6.80 +pkgrel=1 +pkgdesc="An interface to use kipi-plugins from a KDE application" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('f87620e1eaa795129447473c3b89dbc5a27da161') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libkipi/libkipi.install b/kde-unstable/libkipi/libkipi.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/libkipi/libkipi.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/libkmap/PKGBUILD b/kde-unstable/libkmap/PKGBUILD new file mode 100644 index 000000000..b2ae07a94 --- /dev/null +++ b/kde-unstable/libkmap/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124764 2011-05-24 08:23:10Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkmap +pkgver=4.6.80 +pkgrel=1 +pkgdesc="A library to browse and arrange photos over a map" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdeedu-marble') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('87a91c4076e4c8867d129679494a4de19ba2e1bd') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Kexiv2=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libksane/PKGBUILD b/kde-unstable/libksane/PKGBUILD new file mode 100644 index 000000000..b1f117368 --- /dev/null +++ b/kde-unstable/libksane/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libksane +pkgver=4.6.80 +pkgrel=1 +pkgdesc="An image scanning library" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs' 'sane') +makedepends=('cmake' 'automoc4') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('19cf8532f5ea046343fcaa51b9a9c0df7aae2978') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/libksane/libksane.install b/kde-unstable/libksane/libksane.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/libksane/libksane.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/phonon/PKGBUILD b/kde-unstable/phonon/PKGBUILD new file mode 100644 index 000000000..ad7852355 --- /dev/null +++ b/kde-unstable/phonon/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 125369 2011-05-26 10:11:37Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=phonon +pkgver=4.5.55 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://phonon.kde.org" +license=('LGPL') +pkgdesc="The multimedia framework for KDE4" +depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') +optdepends=('pulseaudio: PulseAudio support') +makedepends=('cmake' 'automoc4' 'pulseaudio') +source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=phonon.git&a=snapshot&h=37ec84753af68c4f30041d080b37f1a49a89197c&fmt=tbz2") +#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('ce1316c88df988320e75a2b4c3cb8804') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON + make +} + +package(){ + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/qt/PKGBUILD b/kde-unstable/qt/PKGBUILD new file mode 100644 index 000000000..89e96034f --- /dev/null +++ b/kde-unstable/qt/PKGBUILD @@ -0,0 +1,222 @@ +# $Id: PKGBUILD 125344 2011-05-26 00:12:04Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=qt +pkgname=('qt' 'qt-private-headers') +pkgver=4.7.3 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://qt.nokia.com/' +license=('GPL3' 'LGPL') +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' + 'mysql' 'unixodbc' 'cups' 'gtk2') +options=('!libtool') +_pkgfqn="qt-everywhere-opensource-src-${pkgver}" +source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop' + 'qtbug-16292.patch') +md5sums=('49b96eefb1224cc529af6fe5608654fe' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd' + 'dc7ed8c2e8c68a175f7f05a34dccc937') + +build() { + unset QMAKESPEC + export QT4DIR=$srcdir/$_pkgfqn + export PATH=${QT4DIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + cd $srcdir/$_pkgfqn + + # Already fixed upstream + patch -p1 -i "${srcdir}"/qtbug-16292.patch + + sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf + sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -largefile \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ + -system-sqlite \ + -xmlpatterns \ + -no-phonon \ + -no-phonon-backend \ + -svg \ + -webkit \ + -script \ + -scripttools \ + -system-zlib \ + -system-libtiff \ + -system-libpng \ + -system-libmng \ + -system-libjpeg \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -no-rpath \ + -openssl-linked \ + -silent \ + -optimized-qmake \ + -dbus \ + -reduce-relocations \ + -no-separate-debug-info \ + -gtkstyle \ + -opengl \ + -no-openvg \ + -glib + make +} + +package_qt() { + pkgdesc='A cross-platform application and UI framework' + depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') + install='qt.install' + + cd $srcdir/$_pkgfqn + make INSTALL_ROOT=$pkgdir install + + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png + install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png + install -d ${pkgdir}/usr/share/applications + install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/ + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + # Fix wrong path in prl files + find ${pkgdir}/usr/lib -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt-private-headers(){ + pkgdesc="Qt private headers for development" + depends=("qt=${pkgver}") + + install -d ${pkgdir}/usr/include/phonon/private + cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/Qt3Support/private + cd ${srcdir}/$_pkgfqn/src/qt3support/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtCore/private + cd ${srcdir}/$_pkgfqn/src/corelib/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtDBus/private + cd ${srcdir}/$_pkgfqn/src/dbus/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtDeclarative/private + cd ${srcdir}/$_pkgfqn/src/declarative/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtDesigner/private + cd ${srcdir}/$_pkgfqn/tools/designer/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtGui/private + cd ${srcdir}/$_pkgfqn/src/gui/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtHelp/private + cd ${srcdir}/$_pkgfqn/tools/assistant/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtMultimedia/private + cd ${srcdir}/$_pkgfqn/src/multimedia/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtNetwork/private + cd ${srcdir}/$_pkgfqn/src/network/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtNetwork/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtOpenGL/private + cd ${srcdir}/$_pkgfqn/src/opengl/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtOpenGL/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtScript/private + cd ${srcdir}/$_pkgfqn/src/script/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtScript/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtScriptTools/private + cd ${srcdir}/$_pkgfqn/src/scripttools/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtScriptTools/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtSql/private + cd ${srcdir}/$_pkgfqn/src/sql/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtSql/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtSvg/private + cd ${srcdir}/$_pkgfqn/src/svg/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtSvg/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtTest/private + cd ${srcdir}/$_pkgfqn/src/testlib/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtTest/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtUiTools/private + cd ${srcdir}/$_pkgfqn/tools/designer/src/uitools + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtUiTools/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtWebKit/private + cd ${srcdir}/$_pkgfqn/src/3rdparty/webkit + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtWebKit/private/ \; &> /dev/null + + install -d ${pkgdir}/usr/include/QtXmlPatterns/private + cd ${srcdir}/$_pkgfqn/src/xmlpatterns/ + find . -name "*_p.h" -exec install -m644 {} \ + ${pkgdir}/usr/include/QtXmlPatterns/private/ \; &> /dev/null +} diff --git a/kde-unstable/qt/assistant.desktop b/kde-unstable/qt/assistant.desktop new file mode 100644 index 000000000..a9e98c44b --- /dev/null +++ b/kde-unstable/qt/assistant.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples +Exec=/usr/bin/assistant +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/kde-unstable/qt/designer.desktop b/kde-unstable/qt/designer.desktop new file mode 100644 index 000000000..9b7b6e9aa --- /dev/null +++ b/kde-unstable/qt/designer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/kde-unstable/qt/linguist.desktop b/kde-unstable/qt/linguist.desktop new file mode 100644 index 000000000..8cbe86599 --- /dev/null +++ b/kde-unstable/qt/linguist.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications +Exec=/usr/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/kde-unstable/qt/qt.install b/kde-unstable/qt/qt.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/qt/qt.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/qt/qtbug-16292.patch b/kde-unstable/qt/qtbug-16292.patch new file mode 100644 index 000000000..9728e28f5 --- /dev/null +++ b/kde-unstable/qt/qtbug-16292.patch @@ -0,0 +1,62 @@ +From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001 +From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> +Date: Tue, 15 Feb 2011 11:19:26 +0100 +Subject: [PATCH] Fix crash in KPackageKit + +QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex +after calling QTreeView::indexRowSizeHint(). + +Same thing inside QTreeView::indexRowSizeHint(), since +QHeaderView::count() will call +QAbstractItemViewPrivate::executePostedLayout() which may invalidate +all the QModelIndex. + +Reviewed-by: Olivier +Task-number: QTBUG-16292 +--- + src/gui/itemviews/qtreeview.cpp | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp +index f1f3236..c0573bb 100644 +--- a/src/gui/itemviews/qtreeview.cpp ++++ b/src/gui/itemviews/qtreeview.cpp +@@ -2753,6 +2753,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const + + int start = -1; + int end = -1; ++ int indexRow = index.row(); + int count = d->header->count(); + bool emptyHeader = (count == 0); + QModelIndex parent = index.parent(); +@@ -2789,7 +2790,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const + int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column); + if (d->header->isSectionHidden(logicalColumn)) + continue; +- QModelIndex idx = d->model->index(index.row(), logicalColumn, parent); ++ QModelIndex idx = d->model->index(indexRow, logicalColumn, parent); + if (idx.isValid()) { + QWidget *editor = d->editorForIndex(idx).editor; + if (editor && d->persistent.contains(editor)) { +@@ -3224,14 +3225,14 @@ int QTreeViewPrivate::itemHeight(int item) const + if (viewItems.isEmpty()) + return 0; + const QModelIndex &index = viewItems.at(item).index; ++ if (!index.isValid()) ++ return 0; + int height = viewItems.at(item).height; +- if (height <= 0 && index.isValid()) { ++ if (height <= 0) { + height = q_func()->indexRowSizeHint(index); + viewItems[item].height = height; + } +- if (!index.isValid() || height < 0) +- return 0; +- return height; ++ return qMax(height, 0); + } + + +-- +1.6.1 + diff --git a/kde-unstable/qt/qtconfig.desktop b/kde-unstable/qt/qtconfig.desktop new file mode 100644 index 000000000..46dcf9e3d --- /dev/null +++ b/kde-unstable/qt/qtconfig.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Config +Comment=Configure Qt behavior, styles, fonts +Exec=/usr/bin/qtconfig +Icon=qtlogo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 7f859fa3f..b3cd5d781 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -36,6 +36,7 @@ build() { package() { install -d ${pkgdir}/usr/bin install -d ${pkgdir}/usr/sbin + install -d ${pkgdir}/usr/share/pacman install -d ${pkgdir}/etc install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ @@ -46,10 +47,12 @@ package() { install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/ install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin + install -m755 ${_gitname}/fullpkg-ng ${pkgdir}/usr/bin install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/ + install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/bin/ install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/ install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin @@ -59,6 +62,5 @@ package() { install -m755 ${_gitname}/toru ${pkgdir}/usr/bin install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin - install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/ - + install -m444 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman }
\ No newline at end of file diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index a8a124b45..dcf69d7e6 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47149 2011-05-17 17:48:52Z lcarlier $ +# $Id: PKGBUILD 48014 2011-05-27 05:54:14Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -10,7 +10,7 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110429 + pkgver=7.10.99.git20110526 else pkgver=7.10.2 fi @@ -22,9 +22,9 @@ makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf8 url="http://mesa3d.sourceforge.net" license=('custom') if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0 - source=('ftp://ftp.archlinux.org/other/mesa/mesa-608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0.tar.bz2') - md5sums=('8d1a895110a6d3b7c51b3521f794bae2') + # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7b3f40b70dc7dd602897d364011089047583c5d + source=('ftp://ftp.archlinux.org/other/mesa/mesa-f7b3f40b70dc7dd602897d364011089047583c5d.tar.bz2') + md5sums=('ca2b343a0b8077fda38077c547b80fc3') else source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') diff --git a/multilib-testing/lib32-udev/PKGBUILD b/multilib-testing/lib32-udev/PKGBUILD new file mode 100644 index 000000000..081db8c4a --- /dev/null +++ b/multilib-testing/lib32-udev/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=('lib32-udev') +pkgver=171 +pkgrel=1 +arch=('x86_64') +pkgdesc="The userspace dev tools (udev) (32-bit)" +url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" +license=('GPL') +options=(!makeflags !libtool) +depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') +makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') +source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) +md5sums=('bdf4617284be2ecac11767437417e209') + +build() { + export CC="gcc -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd $srcdir/udev-$pkgver + + ./configure --libdir=/usr/lib32 + make +} + +package() { + + cd $srcdir/udev-$pkgver + + make DESTDIR=${pkgdir} install + rm -rf ${pkgdir}/usr/{etc,include,lib,libexec,sbin,share} + rm -rf ${pkgdir}/usr/lib32/girepository* +} diff --git a/multilib/lib32-libcap/PKGBUILD b/multilib/lib32-libcap/PKGBUILD index 53a6d7de3..85be7ae08 100644 --- a/multilib/lib32-libcap/PKGBUILD +++ b/multilib/lib32-libcap/PKGBUILD @@ -3,8 +3,8 @@ _pkgbasename=libcap pkgname=lib32-$_pkgbasename -pkgver=2.19 -pkgrel=4 +pkgver=2.21 +pkgrel=1 pkgdesc="POSIX 1003.1e capabilities (32-bit)" arch=(x86_64 'mips64el') url="http://www.kernel.org/pub/linux/libs/security/linux-privs/" @@ -12,7 +12,7 @@ license=('GPL') depends=('lib32-attr' $_pkgbasename) makedepends=('gcc-multilib') source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('9caa6dafc9e3db4cbaecdb8e48f23fa2') +md5sums=('61966ef40f2dee8731b69db895e4548d') build() { cd ${srcdir}/${_pkgbasename}-${pkgver} diff --git a/multilib/lib32-libjpeg-turbo/PKGBUILD b/multilib/lib32-libjpeg-turbo/PKGBUILD new file mode 100644 index 000000000..09102ad96 --- /dev/null +++ b/multilib/lib32-libjpeg-turbo/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 48100 2011-05-28 16:27:44Z bluewind $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> + +_pkgbasename=libjpeg-turbo +pkgname=lib32-$_pkgbasename +pkgver=1.1.1 +pkgrel=1 +pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)" +arch=('x86_64') +url="http://libjpeg-turbo.virtualgl.org/" +license=('GPL' 'custom') +depends=('lib32-glibc' $_pkgbasename) +makedepends=('nasm' gcc-multilib) +provides=('lib32-libjpeg=8.0.2') +conflicts=('lib32-libjpeg') +replaces=('lib32-libjpeg') +options=('!libtool') +source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz) +md5sums=('03b9c1406c7bfdc204313c2917ce6962') + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure + ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --libdir=/usr/lib32 --without-simd + make +} + +package() { + cd "$srcdir/$_pkgbasename-$pkgver" + + make DESTDIR="$pkgdir/" install + rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD index 3545cd2b4..6099cd8c2 100644 --- a/multilib/lib32-udev/PKGBUILD +++ b/multilib/lib32-udev/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=('lib32-udev') -pkgver=166 +pkgver=171 pkgrel=1 arch=('x86_64' 'mips64el') pkgdesc="The userspace dev tools (udev) (32-bit)" @@ -14,7 +14,7 @@ options=(!makeflags !libtool) depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) -md5sums=('4db27d73fdbe94f47fd89fdd105c2dfb') +md5sums=('bdf4617284be2ecac11767437417e209') build() { export CC="gcc -m32" diff --git a/multilib/nspluginwrapper/nspluginwrapper-native-windows.patch b/multilib/nspluginwrapper/nspluginwrapper-native-windows.patch deleted file mode 100644 index 0f6eba68e..000000000 --- a/multilib/nspluginwrapper/nspluginwrapper-native-windows.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/npw-viewer.sh -+++ src/npw-viewer.sh -@@ -5,6 +5,11 @@ - OS="`uname -s | tr '[A-Z]' '[a-z]'`" - ARCH="`uname -m`" - -+# Adobe Flash can be confised by by a recent GTK+ that may use custom -+# window structure instead of native X Window. Revert to the old dumb -+# behavior and use native X window for all objects. (bnc#537788) -+export GDK_NATIVE_WINDOWS=1 -+ - if test -z "$TARGET_OS"; then - echo "*** NSPlugin Viewer *** error, TARGET_OS not initialized" - exit 1 diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 60b95fce0..bdd3d02d8 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 46925 2011-05-13 19:38:18Z bluewind $ +# $Id: PKGBUILD 48109 2011-05-28 20:43:37Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.20 -pkgrel=1 +pkgver=1.3.21 +pkgrel=2 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('2d9fe8755172a21ddc453d720a497ad9') +md5sums=('dfcefe48a9aae82f7f1aa4d2c6617961') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -26,6 +26,7 @@ depends=( libxrandr lib32-libxrandr libxdamage lib32-libxdamage libxxf86dga lib32-libxxf86dga + libxi lib32-libxi alsa-lib lib32-alsa-lib desktop-file-utils ) diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD deleted file mode 100644 index 3e181dafa..000000000 --- a/staging/akonadi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124793 2011-05-24 13:10:03Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=akonadi -pkgver=1.5.3 -pkgrel=2 -pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" -arch=('i686' 'x86_64') -url='http://pim.kde.org/akonadi' -license=('LGPL') -depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') -install="${pkgname}.install" -source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ad342acca61c2af27be4cce61b2d925a') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD deleted file mode 100644 index 6f1a6baf5..000000000 --- a/staging/avogadro/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124796 2011-05-24 13:18:50Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Nick B <Shirakawasuna at gmail _dot_com> - -pkgname=avogadro -pkgver=1.0.3 -pkgrel=2 -pkgdesc="An advanced molecular editor based on Qt" -arch=('i686' 'x86_64') -url="http://avogadro.openmolecules.net/wiki/Main_Page" -license=('GPL2') -depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('92c2702c1980f70fb6d87a1a58147911') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} diff --git a/staging/boost/4994-compile-fix-for-Python32-v2.patch b/staging/boost/4994-compile-fix-for-Python32-v2.patch deleted file mode 100644 index 22613b3f2..000000000 --- a/staging/boost/4994-compile-fix-for-Python32-v2.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: libs/python/src/converter/builtin_converters.cpp -=================================================================== ---- libs/python/src/converter/builtin_converters.cpp (revision 67279) -+++ libs/python/src/converter/builtin_converters.cpp (working copy) -@@ -431,7 +431,11 @@ - if (!result.empty()) - { - int err = PyUnicode_AsWideChar( -+#if PY_VERSION_HEX >= 0x03020000 -+ intermediate -+#else - (PyUnicodeObject *)intermediate -+#endif - , &result[0] - , result.size()); - diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD deleted file mode 100644 index d95541e63..000000000 --- a/staging/boost/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# $Id: PKGBUILD 124783 2011-05-24 12:31:42Z ibiru $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Kritoke <kritoke@gamebox.net> -# Contributor: Luca Roccia <little_rock@users.sourceforge.net> - -pkgbase=boost -pkgname=('boost-libs' 'boost') -pkgver=1.46.1 -_boostver=${pkgver//./_} -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.boost.org/" -makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz - 4994-compile-fix-for-Python32-v2.patch - boost-1.46.0-spirit.patch) -license=('custom') -md5sums=('341e5d993b19d099bf1a548495ea91ec' - 'cb59e8adbf2a45ef9264a2f4ab92b849' - '9d6e2f13fef23bf27d7bdddc104e182a') - -_stagedir="${srcdir}/stagedir" - -build() { - # set python path for bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools" - echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam - echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam - echo "using mpi ;" >> build/v2/user-config.jam - - # build bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine/src" - ./build.sh cc - - _bindir="bin.linuxx86" - [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - - install -d "${_stagedir}"/usr/bin - install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - - # build bcp - cd "${srcdir}/${pkgbase}_${_boostver}/tools/bcp" - ../build/v2/engine/src/${_bindir}/bjam --toolset=gcc - install -m755 "${srcdir}/${pkgbase}_${_boostver}/dist/bin/bcp" \ - ${_stagedir}/usr/bin/bcp - - # build libs - cd "${srcdir}/${pkgbase}_${_boostver}" - #python 3.2 support - #https://svn.boost.org/trac/boost/ticket/4994 - patch -Np0 -i "${srcdir}/4994-compile-fix-for-Python32-v2.patch" - patch -Np0 -i "${srcdir}/boost-1.46.0-spirit.patch" - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - - ./tools/build/v2/engine/src/${_bindir}/bjam \ - release debug-symbols=off threading=multi \ - runtime-link=shared link=shared,static \ - cflags=-fno-strict-aliasing \ - toolset=gcc \ - --prefix="${_stagedir}" \ - -sTOOLS=gcc \ - --layout=system \ - ${MAKEFLAGS} \ - install - - # pyste is unmaintained: http://www.boost.org/doc/libs/1_46_0/libs/python/doc/index.html - # build pyste - #cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install" - #python2 setup.py install --root=${_stagedir} --optimize=1 -} - -package_boost() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Development" - depends=("boost-libs=${pkgver}") - optdepends=('python: for python bindings' - 'python2: for python2 bindings') - - install -d "${pkgdir}"/usr/{include,lib} - # headers/source files - cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ - - # static libs - cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - - # utilities (bjam, bcp, pyste) - cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt -} - -package_boost-libs() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" - depends=('gcc-libs' 'bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') - - install -d "${pkgdir}/usr/lib" - #shared libs - cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt -} diff --git a/staging/boost/boost-1.46.0-spirit.patch b/staging/boost/boost-1.46.0-spirit.patch deleted file mode 100644 index 6fae331ee..000000000 --- a/staging/boost/boost-1.46.0-spirit.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: boost/spirit/home/qi/nonterminal/detail/parameterized.hpp -=================================================================== ---- boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68724) -+++ boost/spirit/home/qi/nonterminal/detail/parameterized.hpp (revision 68725) -@@ -14,6 +14,7 @@ - - #include <boost/ref.hpp> - -+#include <boost/spirit/home/support/handles_container.hpp> - #include <boost/spirit/home/qi/parser.hpp> - - namespace boost { namespace spirit { namespace qi -@@ -59,4 +60,16 @@ namespace boost { namespace spirit { nam - }; - }}} - -+namespace boost { namespace spirit { namespace traits -+{ -+ /////////////////////////////////////////////////////////////////////////// -+ template <typename Subject, typename Params, typename Attribute -+ , typename Context, typename Iterator> -+ struct handles_container<qi::parameterized_nonterminal<Subject, Params> -+ , Attribute, Context, Iterator> -+ : handles_container<typename remove_const<Subject>::type -+ , Attribute, Context, Iterator> -+ {}; -+}}} -+ - #endif -Index: boost/spirit/home/karma/nonterminal/detail/parameterized.hpp -=================================================================== ---- boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68724) -+++ boost/spirit/home/karma/nonterminal/detail/parameterized.hpp (revision 68725) -@@ -14,6 +14,7 @@ - - #include <boost/ref.hpp> - -+#include <boost/spirit/home/support/handles_container.hpp> - #include <boost/spirit/home/karma/generator.hpp> - - namespace boost { namespace spirit { namespace karma -@@ -60,4 +61,17 @@ namespace boost { namespace spirit { nam - }; - }}} - -+ -+namespace boost { namespace spirit { namespace traits -+{ -+ /////////////////////////////////////////////////////////////////////////// -+ template <typename Subject, typename Params, typename Attribute -+ , typename Context, typename Iterator> -+ struct handles_container<karma::parameterized_nonterminal<Subject, Params> -+ , Attribute, Context, Iterator> -+ : handles_container<typename remove_const<Subject>::type -+ , Attribute, Context, Iterator> -+ {}; -+}}} -+ - #endif diff --git a/staging/claws-mail-extra-plugins/PKGBUILD b/staging/claws-mail-extra-plugins/PKGBUILD new file mode 100644 index 000000000..9d233d726 --- /dev/null +++ b/staging/claws-mail-extra-plugins/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 125144 2011-05-25 19:01:27Z foutrelis $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Mildred <mildred593 at online dot fr> + +pkgname=claws-mail-extra-plugins +pkgver=3.7.9 +pkgrel=4 +pkgdesc="Extra plugins for claws-mail" +url="http://www.claws-mail.org/plugins.php?branch=EXT" +license=('GPL3') +arch=('i686' 'x86_64') +depends=('claws-mail>=3.7.8') +makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' + 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.3.13' + 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra') +optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' + 'perl: for perl plugin' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus-core: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin' + 'libytnef: for tnef_parse plugin' + 'libwebkit: for the fancy webkit html plugin' + 'libsoup-gnome: for the fancy webkit html plugin' + 'python2: for python plugin') +conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' + 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' + 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' + 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') +replaces=('sylpheed-claws-extra-plugins') +options=('!libtool' '!strip') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2 + claws-mail-notification-0.26-libnotify-0.7.patch) +md5sums=('3d1ebc48f686ab10702380c776b5d5d0' + 'a02be84594ebd28b18811ccc358509be') + +build() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + + # fix for python2 + export PYTHON="/usr/bin/python2" + + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && ( + cd $dir + + [[ $dir == notification_plugin-* ]] && + patch -Np2 -i "$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch" + + ./configure --prefix=/usr --disable-static + make + ) + done +} + +package() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && + make -C $dir DESTDIR="$pkgdir" install + done + + # fix fileconflict with libical, #11485 + rm -f "$pkgdir/usr/include/ical.h" +} diff --git a/staging/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/staging/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch new file mode 100644 index 000000000..efc06a472 --- /dev/null +++ b/staging/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch @@ -0,0 +1,25 @@ +diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c +--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c 2009-04-26 03:05:05.000000000 +0200 ++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c 2010-11-12 13:39:02.363909583 +0100 +@@ -339,7 +339,7 @@ + break; + } + +- ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL); ++ ppopup->notification = notify_notification_new(summary, utf8_str, NULL); + g_free(utf8_str); + if(ppopup->notification == NULL) { + debug_print("Notification Plugin: Failed to create a new " +diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c +--- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c 2010-03-25 09:56:34.000000000 +0100 ++++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c 2010-11-12 13:38:30.809340907 +0100 +@@ -589,8 +589,7 @@ + summary = notification_trayicon_popup_assemble_summary(); + utf8_str = notification_trayicon_popup_assemble_body(msginfo); + +- popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL); +- notify_notification_attach_to_status_icon(popup.notification, trayicon); ++ popup.notification = notify_notification_new(summary, utf8_str, NULL); + + g_free(summary); + g_free(utf8_str); diff --git a/staging/dvdrip/PKGBUILD b/staging/dvdrip/PKGBUILD new file mode 100644 index 000000000..17838b169 --- /dev/null +++ b/staging/dvdrip/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 125147 2011-05-25 19:02:09Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> + +pkgname=dvdrip +pkgver=0.98.11 +pkgrel=7 +pkgdesc="A Gtk frontend for transcode writen in Perl" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.exit1.org/dvdrip/" +install=${pkgname}.install +depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick' + 'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow') +optdepends=('ogmtools: for ogm/odd video creation' + 'lsdvd: fast reading of DVD table') +source=(http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz \ + ${pkgname}.desktop) +options=('!emptydirs' '!makeflags') +md5sums=('6dfa4199d451757a37eea233a07da4c0' + 'e91cf411928fd0500d07a0022b4ef546') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install DESTDIR="${pkgdir}" + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete + + install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/dvdrip/dvdrip.desktop b/staging/dvdrip/dvdrip.desktop new file mode 100644 index 000000000..dd19b4aae --- /dev/null +++ b/staging/dvdrip/dvdrip.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=dvd::rip +Comment=DVD Ripper and Encoder - Backup and compression utility for DVDs +Exec=/usr/bin/vendor_perl/dvdrip +Icon=/usr/share/perl5/vendor_perl/Video/DVDRip/icon.xpm +Terminal=false +Type=Application +Categories=Application;AudioVideo;Video; diff --git a/community/evolution-rss/evolution-rss.install b/staging/dvdrip/dvdrip.install index da4969355..4cd6160c4 100644 --- a/community/evolution-rss/evolution-rss.install +++ b/staging/dvdrip/dvdrip.install @@ -1,25 +1,19 @@ -pkgname=evolution-rss +# this is the scrollkeeper handling sample file post_install() { - usr/sbin/gconfpkg --install $pkgname + echo "update desktop mime database..." update-desktop-database -q } -pre_upgrade() { - pre_remove $1 -} - post_upgrade() { post_install $1 } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + /bin/true } post_remove() { + echo "update desktop mime database..." update-desktop-database -q } - -op=$1 -shift diff --git a/staging/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD deleted file mode 100644 index 7d4d83910..000000000 --- a/staging/ekiga/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 124817 2011-05-24 15:39:18Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tom K <tomk@runbox.com> - -pkgname=ekiga -pkgver=3.3.0 -pkgrel=4 -pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" -url="http://www.ekiga.org" -license=(GPL) -arch=(i686 x86_64) -depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') -makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') -optdepends=('evolution-data-server: Evolution integration') -provides=('gnomemeeting') -replaces=('gnomemeeting') -options=(!emptydirs) -groups=('gnome-extra') -install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('3fb22704e44afebf4294632505fb7a13f3eccb152fcb5878e97aa556d9486d2c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-schemas-install \ - --disable-scrollkeeper --enable-dbus - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/staging/git/ChangeLog b/staging/git/ChangeLog new file mode 100644 index 000000000..76298e68f --- /dev/null +++ b/staging/git/ChangeLog @@ -0,0 +1,53 @@ +Simple version bumps are omitted from the following ChangeLog. + +2011-05-05 Dan McGee <dan@archlinux.org> + Version 1.7.5.1-1 + * Byte compile emacs files (FS#20874) + * Respect CFLAGS/LDFLAGS (FS#23963) + +2011-04-27 Dan McGee <dan@archlinux.org> + Version 1.7.5-1 + * Add missing optdepends for git send-email (FS#20923) + +2011-01-05 Dan McGee <dan@archlinux.org> + Version 1.7.3.5-1 + * More flexible git-daemon RC scripts (FS#20575) + +2010-10-01 Allan McRae <allan@archlinux.org> + Version 1.7.3.1-2 + * Python 2/3 rebuild + +2010-06-29 Dan McGee <dan@archlinux.org> + Version 1.7.1.1-1 + * Add emacs completion files (FS#17968) + * Add git-daemon RC scripts (FS#19291) + +2009-06-05 Dan McGee <dan@archlinux.org> + Version 1.6.3.2-1 + * Remove gitweb from /usr/share; it needs customization to be helpful + * Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683) + +2008-09-14 Dan McGee <dan@archlinux.org> + Version 1.6.0.2-1 + * Moved optional depends from install file to optdepends array + +2008-06-15 Dan McGee <dan@archlinux.org> + Version 1.5.6-1 + * Removed 'cpio' dependency, clone is now a builtin and no longer needs it + +2008-02-02 Dan McGee <dan@archlinux.org> + Version 1.5.4-1 + * Upstream version 1.5.4 + * Enable pthreads support in pack-objects. To use, set the pack.threads + git config option. Read manpages of pack-objects and config for more + details. + * Changelog added (with entries going back a bit). + +2008-01-28 Kevin Piche <kevin@archlinux.org> + Version 1.5.3.7-2 + * Updated for new perl policy (vendor dirs) + * Change license to GPL2 + +2007-11-01 Eric Belanger <eric@archlinux.org> + Version 1.5.3.5-2 + * Fix Perl module location diff --git a/staging/git/PKGBUILD b/staging/git/PKGBUILD new file mode 100644 index 000000000..0a96745dd --- /dev/null +++ b/staging/git/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 125150 2011-05-25 19:02:49Z foutrelis $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=git +pkgver=1.7.5.2 +pkgrel=2 +pkgdesc="the fast distributed version control system" +arch=(i686 x86_64) +url="http://git-scm.com/" +license=('GPL2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.12.2') +makedepends=('python2' 'emacs') +optdepends=('tk: gitk and git gui' + 'perl-libwww: git svn' + 'perl-term-readkey: git svn' + 'perl-mime-tools: git send-email' + 'perl-net-smtp-ssl: git send-email TLS support' + 'perl-authen-sasl: git send-email TLS support' + 'python2: various helper scripts' + 'subversion: git svn' + 'cvsps: git cvsimport') +replaces=('git-core') +provides=('git-core') +backup=('etc/conf.d/git-daemon.conf') +source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" \ + "http://kernel.org/pub/software/scm/git/git-manpages-${pkgver}.tar.bz2" + git-daemon + git-daemon.conf) +changelog=ChangeLog + +build() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" + + cd contrib/emacs + make prefix=/usr +} + +package() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + INSTALLDIRS=vendor DESTDIR="$pkgdir" install + + # bash completion + mkdir -p $pkgdir/etc/bash_completion.d/ + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git + # more contrib stuff + cp -a ./contrib $pkgdir/usr/share/git/ + # scripts are for python 2.x + sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ + $(find "$pkgdir" -name '*.py') \ + "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview} + + # emacs interface + cd contrib/emacs + make prefix=/usr DESTDIR="$pkgdir" install + + # how 'bout some manpages? + for mansect in man1 man5 man7; do + for manpage in "$srcdir"/$mansect/*; do + install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) + done + done + + # remove perllocal.pod, .packlist, and empty directories. + rm -rf "$pkgdir"/usr/lib/perl5 + + # git daemon script + install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon + install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf +} + +md5sums=('f79ab8fe79b35346b499f131cbf381a4' + '43fc5538f137231f5c96e7da5eb6c934' + '8e2648910fd5dd4f1c41d3c7fa9e9156' + '2e42bf97779a1c6411d89043334c9e78') +sha256sums=('65dbb9789a1ff8aa7e4f7e156b9ce36ef101810608ed55a297156348d70f9349' + '8521210a77809d189a3fe72e2bd13df50ecf8ec58e7098ec1655dfdb4086b6ca' + '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' + 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/staging/git/git-daemon b/staging/git/git-daemon new file mode 100644 index 000000000..21ba73ed5 --- /dev/null +++ b/staging/git/git-daemon @@ -0,0 +1,70 @@ +#!/bin/bash + +daemon_bin="/usr/lib/git-core/git-daemon" +daemon_name=$(basename $daemon_bin) +PIDF="/var/run/$daemon_name.pid" + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f $PIDF ] && rm -f $PIDF + # RUN + $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > $PIDF + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f $PIDF &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/staging/git/git-daemon.conf b/staging/git/git-daemon.conf new file mode 100644 index 000000000..3f9a12060 --- /dev/null +++ b/staging/git/git-daemon.conf @@ -0,0 +1,5 @@ +# path to git repositories served +GIT_REPO="/srv/git/" +# see `man git-daemon` for all available options +# $GIT_REPO will be present twice in most configs +GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO" diff --git a/staging/glade-perl/PKGBUILD b/staging/glade-perl/PKGBUILD new file mode 100644 index 000000000..96d77bced --- /dev/null +++ b/staging/glade-perl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 125153 2011-05-25 19:04:01Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=glade-perl +_realname=Gtk2-GladeXML +pkgver=1.007 +pkgrel=4 +pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" +arch=(i686 x86_64) +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('libglade' 'gtk2-perl' 'perl') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('e6ca234e2a9f0221263acd2a593c583b') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make + make DESTDIR="${pkgdir}" install +} diff --git a/staging/glew/PKGBUILD b/staging/glew/PKGBUILD new file mode 100644 index 000000000..6270e8c8f --- /dev/null +++ b/staging/glew/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 125318 2011-05-25 20:28:27Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: SleepyDog + +pkgname=glew +pkgver=1.6.0 +pkgrel=1 +pkgdesc="The OpenGL Extension Wrangler Library" +arch=('i686' 'x86_64') +url="http://glew.sourceforge.net" +license=('BSD' 'MIT' 'GPL') +depends=('libxmu' 'libxi' 'mesa') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) +sha1sums=('ed555d15d0f01239b262c4cf803e97d60d8a18b6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|lib64|lib|' config/Makefile.linux + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GLEW_DEST="${pkgdir}/usr" install.all + install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a + chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} +} diff --git a/staging/gnome-perl/PKGBUILD b/staging/gnome-perl/PKGBUILD new file mode 100644 index 000000000..81f68ee25 --- /dev/null +++ b/staging/gnome-perl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 125159 2011-05-25 19:04:51Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-perl +_realname=Gnome2 +pkgver=1.042 +pkgrel=6 +pkgdesc="Perl bindings for libgnome" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('gnomecanvas-perl' 'gnome-vfs-perl' 'libgnomeui' 'perl') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('eb7b624114e45e54e022a633ffc1cce6') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gnome-vfs-perl/PKGBUILD b/staging/gnome-vfs-perl/PKGBUILD new file mode 100644 index 000000000..3960f5285 --- /dev/null +++ b/staging/gnome-vfs-perl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 125162 2011-05-25 19:05:23Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-vfs-perl +_realname=Gnome2-VFS +pkgver=1.081 +pkgrel=4 +pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" +arch=(i686 x86_64) +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('gtk2-perl' 'gnome-vfs' 'perl') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('3d220cbbe9f1ebc78d7047593f9cd633') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gnomecanvas-perl/PKGBUILD b/staging/gnomecanvas-perl/PKGBUILD new file mode 100644 index 000000000..2563caae4 --- /dev/null +++ b/staging/gnomecanvas-perl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 125156 2011-05-25 19:04:24Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnomecanvas-perl +_realname=Gnome2-Canvas +pkgver=1.002 +pkgrel=8 +pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('gtk2-perl' 'libgnomecanvas' 'perl') +options=(!emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('93405a987ba4bbd03c2f91592b88f5cb') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR="${pkgdir}" +} diff --git a/staging/gnumeric/PKGBUILD b/staging/gnumeric/PKGBUILD new file mode 100644 index 000000000..2fd9e4799 --- /dev/null +++ b/staging/gnumeric/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 125165 2011-05-25 19:05:49Z foutrelis $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Kritoke <typeolinux@yahoo.com> + +pkgname=gnumeric +pkgver=1.10.15 +pkgrel=2 +pkgdesc="A GNOME Spreadsheet Program" +arch=('i686' 'x86_64') +url="http://www.gnome.org/projects/gnumeric/" +license=('GPL') +depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'python2' 'gnome-doc-utils' 'pygobject' 'psiconv') +optdepends=('pygobject: for python plugin support' + 'psiconv: for Psion 5 file support' + 'yelp: for viewing the help manual') +install=gnumeric.install +options=('libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('4343a8e72bd19380d83ab5d4937388b2327e0dbb6187296e66dc7ca2d2b9025a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-install --enable-ssindex + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnumeric "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -rf "${pkgdir}/etc/gconf" +} diff --git a/testing/gnome-panel/gnome-panel.install b/staging/gnumeric/gnumeric.install index e3175df5e..50ee0a7e2 100644 --- a/testing/gnome-panel/gnome-panel.install +++ b/staging/gnumeric/gnumeric.install @@ -1,17 +1,18 @@ -pkgname=gnome-panel +pkgname=gnumeric post_install() { - usr/sbin/gconfpkg --install ${pkgname} usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + usr/sbin/gconfpkg --install ${pkgname} gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } pre_upgrade() { - pre_remove + pre_remove $1 } post_upgrade() { - post_install + post_install $1 } pre_remove() { @@ -20,5 +21,6 @@ pre_remove() { post_remove() { usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD new file mode 100644 index 000000000..d09e302dd --- /dev/null +++ b/staging/hugin/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 125347 2011-05-26 02:15:23Z eric $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=hugin +pkgver=2010.4.0 +pkgrel=4 +pkgdesc="A frontend to the panorama-tools" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('LGPL') +depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' + 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') +makedepends=('zip' 'cmake' 'boost') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) +md5sums=('bfd716655461987312b2f2f00c90dcc5' + '4393c7b31da60f230c85e63a6a2e43a0') +sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' + '52798a155a037f853f41402f797e8a4cb6bb3e07') + +build() { + cd "${srcdir}" + (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) + mkdir build && cd build + + cmake "${srcdir}/${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ + -DENABLE_LAPACK=yes + + make +} + +package(){ + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/hugin/hugin-gcc46.patch b/staging/hugin/hugin-gcc46.patch new file mode 100644 index 000000000..98a70ad50 --- /dev/null +++ b/staging/hugin/hugin-gcc46.patch @@ -0,0 +1,16 @@ + +diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx +--- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 ++++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + + + + + diff --git a/community-staging/glom/glom.install b/staging/hugin/hugin.install index 1ad77f9aa..362749233 100644 --- a/community-staging/glom/glom.install +++ b/staging/hugin/hugin.install @@ -1,5 +1,5 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/icons/gnome update-desktop-database -q update-mime-database usr/share/mime > /dev/null } @@ -9,7 +9,7 @@ post_upgrade() { } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/icons/gnome update-desktop-database -q update-mime-database usr/share/mime > /dev/null } diff --git a/staging/irssi/PKGBUILD b/staging/irssi/PKGBUILD new file mode 100644 index 000000000..bba878633 --- /dev/null +++ b/staging/irssi/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 125226 2011-05-25 19:11:10Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dan McGee <dan@archlinux.org> + +pkgname=irssi +pkgver=0.8.15 +pkgrel=5 +pkgdesc="Modular text mode IRC client with Perl scripting" +arch=('i686' 'x86_64') +url="http://irssi.org/" +license=('GPL') +depends=('glib2' 'openssl' 'perl') +optdepends=('perl-libwww: for the scriptassist script') +backup=(etc/irssi.conf) +source=(http://irssi.org/files/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool') +md5sums=('1dcb3f511b88df94b0c996f36668c7da') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --enable-ipv6 \ + --with-proxy \ + --sysconfdir=/etc \ + --with-perl-lib=vendor + make + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdeedu/PKGBUILD b/staging/kdeedu/PKGBUILD deleted file mode 100644 index a5a24fb20..000000000 --- a/staging/kdeedu/PKGBUILD +++ /dev/null @@ -1,280 +0,0 @@ -# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeedu -pkgname=('kdeedu-blinken' - 'kdeedu-cantor' - 'kdeedu-data' - 'kdeedu-kalgebra' - 'kdeedu-kalzium' - 'kdeedu-kanagram' - 'kdeedu-kbruch' - 'kdeedu-kgeography' - 'kdeedu-khangman' - 'kdeedu-kig' - 'kdeedu-kiten' - 'kdeedu-klettres' - 'kdeedu-kmplot' - 'kdeedu-kstars' - 'kdeedu-ktouch' - 'kdeedu-kturtle' - 'kdeedu-kwordquiz' - 'kdeedu-libkdeedu' - 'kdeedu-marble' - 'kdeedu-parley' - 'kdeedu-rocs' - 'kdeedu-step') -pkgver=4.6.3 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd' - 'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre' - 'python2' 'avogadro') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'gpsd-2.96.patch') -sha1sums=('4b27e6e1670760982dae13dc8c51c814c6853396' - 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np1 -i ${srcdir}/gpsd-2.96.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdeedu-blinken() { - pkgdesc='A memory enhancement game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu') - install='kdeedu.install' - cd $srcdir/build/blinken - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/blinken - make DESTDIR=$pkgdir install -} - -package_kdeedu-cantor() { - pkgdesc='KDE Frontend to Mathematical Software' - depends=('kdeedu-libkdeedu' 'libspectre') - optdepends=('kdeedu-kalgebra: backend' - 'maxima: backend' - 'r: backend') - install='kdeedu.install' - cd $srcdir/build/cantor - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/cantor - make DESTDIR=$pkgdir install -} - -package_kdeedu-data() { - pkgdesc='Data for KDE Educational Software' - groups=() - cd $srcdir/build/data - make DESTDIR=$pkgdir install -} - -package_kdeedu-kalgebra() { - pkgdesc='Math Expression Solver and Plotter' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kalgebra - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalgebra - make DESTDIR=$pkgdir install -} - -package_kdeedu-kalzium() { - pkgdesc='KDE Periodic Table of Elements' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'avogadro') - install='kdeedu.install' - cd $srcdir/build/kalzium - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalzium - make DESTDIR=$pkgdir install -} - -package_kdeedu-kanagram() { - pkgdesc='KDE Letter Order Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') - install='kdeedu.install' - cd $srcdir/build/kanagram - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kanagram - make DESTDIR=$pkgdir install -} - -package_kdeedu-kbruch() { - pkgdesc='Practice exercises with fractions' - depends=('kdelibs' 'kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kbruch - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbruch - make DESTDIR=$pkgdir install -} - -package_kdeedu-kgeography() { - pkgdesc='A Geography Learning Program' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kgeography - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kgeography - make DESTDIR=$pkgdir install -} - -package_kdeedu-khangman() { - pkgdesc='KDE Hangman Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') - install='kdeedu.install' - cd $srcdir/build/khangman - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/khangman - make DESTDIR=$pkgdir install -} - -package_kdeedu-kig() { - pkgdesc='Explore Geometric Constructions' - depends=('kdebase-runtime' 'boost-libs' 'python2') - install='kdeedu.install' - cd $srcdir/build/kig - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kig - make DESTDIR=$pkgdir install - - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py -} - -package_kdeedu-kiten() { - pkgdesc='Japanese Reference and Study Tool' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kiten - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kiten - make DESTDIR=$pkgdir install -} - -package_kdeedu-klettres() { - pkgdesc='a KDE program to learn the alphabet' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/klettres - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klettres - make DESTDIR=$pkgdir install -} - -package_kdeedu-kmplot() { - pkgdesc='Function Plotter' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kmplot - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmplot - make DESTDIR=$pkgdir install -} - -package_kdeedu-kstars() { - pkgdesc='Desktop Planetarium' - depends=('kdebase-runtime' 'libindi') - install='kdeedu.install' - cd $srcdir/build/kstars - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kstars - make DESTDIR=$pkgdir install -} - -package_kdeedu-ktouch() { - pkgdesc='Touch Typing Tutor' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/ktouch - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktouch - make DESTDIR=$pkgdir install -} - -package_kdeedu-kturtle() { - pkgdesc='Educational Programming Environment' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kturtle - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kturtle - make DESTDIR=$pkgdir install -} - -package_kdeedu-kwordquiz() { - pkgdesc='A flashcard and vocabulary learning program' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') - install='kdeedu.install' - cd $srcdir/build/kwordquiz - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kwordquiz - make DESTDIR=$pkgdir install -} - -package_kdeedu-libkdeedu() { - pkgdesc='Support library for KDE Educational Software' - groups=() - depends=('kdelibs') - install='kdeedu.install' - cd $srcdir/build/libkdeedu - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake -} - -package_kdeedu-marble() { - pkgdesc='Desktop Globe' - depends=('kdebase-runtime' 'gpsd') - install='kdeedu.install' - cd $srcdir/build/marble - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/marble - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake -} - -package_kdeedu-parley() { - pkgdesc='Vocabulary Trainer' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python') - install='kdeedu.install' - cd $srcdir/build/parley - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/parley - make DESTDIR=$pkgdir install -} - -package_kdeedu-rocs() { - pkgdesc='Graph Theory Tool for Professors and Students.' - depends=('kdebase-runtime' 'kdeedu-libkdeedu') - install='kdeedu.install' - cd $srcdir/build/rocs - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/rocs - make DESTDIR=$pkgdir install -} - -package_kdeedu-step() { - pkgdesc='Simulate physics experiments' - depends=('kdebase-runtime' 'gsl' 'libqalculate') - install='kdeedu.install' - cd $srcdir/build/step - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/step - make DESTDIR=$pkgdir install -} diff --git a/staging/koffice/PKGBUILD b/staging/koffice/PKGBUILD new file mode 100644 index 000000000..1884dd92c --- /dev/null +++ b/staging/koffice/PKGBUILD @@ -0,0 +1,301 @@ +# $Id: PKGBUILD 125678 2011-05-28 00:58:39Z andrea $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > + +pkgbase=koffice +pkgname=( + 'koffice-filters' + 'koffice-interfaces' + 'koffice-libs' + 'koffice-plugins' + 'koffice-pics' + 'koffice-servicetypes' + 'koffice-templates' + 'koffice-tools' + 'koffice-karbon' + 'koffice-karbon-doc' +# 'koffice-kchart' +# 'koffice-kchart-doc' + 'koffice-kexi' + 'koffice-kexi-doc' + 'koffice-kformula' + 'koffice-kformula-doc' + 'koffice-kounavail' + 'koffice-kplato' +# 'koffice-kplato-doc' + 'koffice-kpresenter' + 'koffice-kpresenter-doc' + 'koffice-krita' +# 'koffice-krita-doc' # no krita-doc anymore upstream + 'koffice-kspread' + 'koffice-kspread-doc' + 'koffice-kword' +# 'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources) + 'koffice-handbook' + 'koffice-thesaurus-doc' +# 'koffice-kdgantt' # still an empty package +) +pkgver=2.3.3 +pkgrel=4 +arch=('i686' 'x86_64') +url='http://koffice.kde.org' +license=('GPL' 'LGPL' 'FDL') +makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' + 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' + 'libwpg' 'opengtl' 'kdegraphics-libs') +groups=('koffice') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" + 'kde4-koffice-libwpg02.patch' 'gcc46.patch') +sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' + '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' + 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" + patch -p1 -i "${srcdir}"/gcc46.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +##### 1st package common files, depends, optdepends of the koffice applications ##### + +package_koffice-filters(){ + pkgdesc="Filters for the KDE office suite" + optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' + 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' + 'kdegraphics-libs: support for raw images') + install=filters.install + cd "${srcdir}/build/filters" + make DESTDIR="${pkgdir}" install +} + +package_koffice-interfaces(){ + pkgdesc="Interfaces for the KDE office suite" + depends=('kdelibs' 'koffice-libs') + cd "${srcdir}/build/interfaces" + make DESTDIR="${pkgdir}" install +} + +package_koffice-libs(){ + pkgdesc="Libs for the KDE office suite" + depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes') + cd "${srcdir}/build/libs" + make DESTDIR="${pkgdir}" install +} + +package_koffice-plugins(){ + pkgdesc="Plugins for the KDE office suite" + depends=('koffice-libs') + replaces=('koffice-kchart') + conflicts=('koffice-kchart') + cd "${srcdir}/build/plugins" + make DESTDIR="${pkgdir}" install +} + +package_koffice-pics(){ + pkgdesc="Icons for the KDE office suite" + install=koffice.install + cd "${srcdir}/build/pics" + make DESTDIR="${pkgdir}" install +} + +package_koffice-servicetypes(){ + pkgdesc="Servicetypes for the KDE office suite" + cd "${srcdir}/build/servicetypes" + make DESTDIR="${pkgdir}" install +} + +package_koffice-templates(){ + pkgdesc="Templates for the KDE office suite" + cd "${srcdir}/build/templates" + make DESTDIR="${pkgdir}" install +} + +package_koffice-tools(){ + pkgdesc="Tools for the KDE office suite" + depends=('koffice-libs') + cd "${srcdir}/build/tools" + make DESTDIR="${pkgdir}" install +} + +#### package common files done ##### + +#### package apps and their docs ##### + +package_koffice-karbon(){ + pkgdesc="Vector drawing application for KDE" + depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') + optdepends=('koffice-filters: import/export filters') + install=koffice.install + cd "${srcdir}/build/karbon" + make DESTDIR="${pkgdir}" install +} + +package_koffice-karbon-doc(){ + pkgdesc="Documentation for karbon" + cd "${srcdir}/build/doc/karbon" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kexi(){ + pkgdesc="Integrated data management application for the KDE office suite" + depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3') + cd "${srcdir}/build/kexi" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kexi-doc(){ + pkgdesc="Documentation for kexi" + cd "${srcdir}/build/doc/kexi" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kformula(){ + pkgdesc="Formula editor for the KDE office suite" + depends=('kdelibs' 'koffice-libs') + cd "${srcdir}/build/kformula" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kformula-doc() { + pkgdesc="Documentation for koffice-kformula" + cd "${srcdir}/build/doc/kformula" + make DESTDIR="${pkgdir}" install +} + + +package_koffice-kounavail(){ + pkgdesc="Kounavail for the KDE office suite" + depends=('kdelibs' 'koffice-libs') + cd "${srcdir}/build/kounavail" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kplato(){ + pkgdesc="Project management application for KDE" + depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \ + 'koffice-plugins' 'koffice-kword') + install=koffice.install + cd "${srcdir}/build/kplato" + make DESTDIR="${pkgdir}" install +} + +#package_koffice-kplato-doc(){ +# pkgdesc="Documentation for kplato" +# cd ${srcdir}/build/doc/kplato +# make DESTDIR="${pkgdir}" install +#} + +package_koffice-kpresenter(){ + pkgdesc="Presentation tool for KDE" + depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') + optdepends=('koffice-filters: import/export filters') + install=koffice.install + cd "${srcdir}/build/kpresenter" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kpresenter-doc(){ + pkgdesc="Documentation for kpresenter" + cd "${srcdir}/build/doc/kpresenter" + make DESTDIR="${pkgdir}" install +} + +package_koffice-krita(){ + pkgdesc="Graphics editor for KDE" + depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \ + 'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \ + 'openexr' 'opengtl') + optdepends=('koffice-filters: import/export filters') + install=krita.install + cd "${srcdir}/build/krita" + make DESTDIR="${pkgdir}" install +} + +#package_koffice-krita-doc(){ +# pkgdesc="Documentation for krita" +# cd ${srcdir}/build/doc/krita +# make DESTDIR="${pkgdir}" install +#} + + +package_koffice-kspread(){ + pkgdesc="Spreadsheet application for KDE" + depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins') + optdepends=('koffice-filters: import/export filters') + install=koffice.install + cd "${srcdir}/build/kspread" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kspread-doc(){ + pkgdesc="Documentation for kspread" + cd "${srcdir}/build/doc/kspread" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kword(){ + pkgdesc="Wordprocessor for KDE" + depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \ + 'koffice-kounavail' 'koffice-plugins') + optdepends=('koffice-filters: import/export filters') + install=koffice.install + cd "${srcdir}/build/kword" + make DESTDIR="${pkgdir}" install + + # some sed lines to have python2 in extension scripts + sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py" + sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py" + sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py" +} + +#package_koffice-kword-doc(){ +# pkgdesc="Documentation for kword" +# cd ${srcdir}/build/doc/kword +# make DESTDIR="${pkgdir}" install +#} + +##### package apps done ##### + +#package_koffice-kchart(){ +# pkgdesc="Charting tool for KDE" +# depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates') +# optdepends=('koffice-filters: import/export filters') +# install=koffice.install +# cd "${srcdir}/build/kchart" +# make DESTDIR="${pkgdir}" install +#} + +#package_koffice-kchart-doc(){ +# pkgdesc="Documentation for kchart" +# cd "${srcdir}/build/doc/kchart" +# make DESTDIR="${pkgdir}" install +#} + +#package_koffice-kdgantt(){ +# pkgdesc="Gantt for KDE" +# cd "${srcdir}/build/kdgantt" +# make DESTDIR="${pkgdir}" install +#} + +package_koffice-handbook() { + pkgdesc="Documentation for koffice" + cd "${srcdir}/build/doc/koffice" + make DESTDIR="${pkgdir}" install +} + +package_koffice-thesaurus-doc(){ + pkgdesc="Documentation for koffice-thesaurus" + cd "${srcdir}/build/doc/thesaurus" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/akonadi/akonadi.install b/staging/koffice/filters.install index 7c8a8bd2b..7c8a8bd2b 100644 --- a/staging/akonadi/akonadi.install +++ b/staging/koffice/filters.install diff --git a/staging/koffice/gcc46.patch b/staging/koffice/gcc46.patch new file mode 100644 index 000000000..dcf8a4f85 --- /dev/null +++ b/staging/koffice/gcc46.patch @@ -0,0 +1,23 @@ +diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc +--- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 2011-02-17 06:13:40.000000000 -0600 ++++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc 2011-02-19 21:15:56.597142885 -0600 +@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp + return IT_FLOAT16; + case Imf::FLOAT: + return IT_FLOAT32; ++ default: ++ // shouldn't reach here ++ return IT_UNSUPPORTED; + } + } + +@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace( + case IT_UNKNOWN: + case IT_UNSUPPORTED: + return 0; ++ default: ++ // shouldn't reach here ++ return 0; + } + } + diff --git a/staging/koffice/kde4-koffice-libwpg02.patch b/staging/koffice/kde4-koffice-libwpg02.patch new file mode 100644 index 000000000..e2a55a216 --- /dev/null +++ b/staging/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<std::pair<std::string, std::string> > &xPropList) +-{ +- if (mbIsTagOpened) +- { +- mContentStream << ">"; +- mbIsTagOpened = false; +- } +- mContentStream << "<" << psName; +- +- for (std::vector<std::pair<std::string, std::string> >::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 << "</" << psName << ">"; +- mbIsTagOpened = false; +- } +- } +- else +- { +- mContentStream << "</" << psName << ">"; +- 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 <iostream> +-#include <sstream> +-#include <string> +-#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<std::pair<std::string, std::string> > &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 <string.h> +- +-#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<std::string, std::string> 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 <string> +-#include <map> +-#include <vector> +- +-#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<std::pair<std::string, std::string> > 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 <string> +-#include <map> +-#include <vector> +- +-class GraphicsHandler +-{ +-public: +- virtual ~GraphicsHandler() {} +- virtual void startDocument() = 0; +- virtual void endDocument() = 0; +- virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &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 <locale.h> +- +-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 <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin(); +- iterStroke != mStrokeDashElements.end(); iterStroke++) +- delete (*iterStroke); +- +- for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin(); +- iterGradient != mGradientElements.end(); iterGradient++) +- delete (*iterGradient); +- +- for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); +- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) +- delete (*iterAutomaticStyles); +- +- for (std::vector<GraphicsElement *>::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 <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin(); +- iterStroke != mStrokeDashElements.end(); iterStroke++) +- (*iterStroke)->write(mpHandler); +- +- for (std::vector <GraphicsElement *>::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 <GraphicsElement *>::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<GraphicsElement *>::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<GraphicsElement *>(pDrawRectElement)); +- mBodyElements.push_back(static_cast<GraphicsElement *>(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<GraphicsElement *>(pDrawEllipseElement)); +- mBodyElements.push_back(static_cast<GraphicsElement *>(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<GraphicsElement *>(pDrawLineElement)); +- mBodyElements.push_back(static_cast<GraphicsElement *>(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<GraphicsElement *>(pDrawPathElement)); +- mBodyElements.push_back(static_cast<GraphicsElement *>(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<GraphicsElement *>(pDrawFrameElement)); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); +- +- libwpg::WPGString base64Binary; +- bitmap.generateBase64DIB(base64Binary); +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(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<GraphicsElement *>(pDrawFrameElement)); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); +- +- libwpg::WPGString base64Binary = binaryData.getBase64Data(); +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(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<GraphicsElement *>(tmpDrawStrokeDashElement)); +- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(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<GraphicsElement *>(tmpDrawGradientElement)); +- mGradientElements.push_back(static_cast<GraphicsElement *>(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<GraphicsElement *>(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<GraphicsElement *>(tmpStyleGraphicPropertiesElement)); +- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties"))); +- +- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(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 <iostream> +-#include <sstream> +-#include <string> +- +-#include <libwpg/libwpg.h> +-#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 <GraphicsElement *> mBodyElements; +- std::vector <GraphicsElement *> mAutomaticStylesElements; +- std::vector <GraphicsElement *> mStrokeDashElements; +- std::vector <GraphicsElement *> 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 <GraphicsElement *> mBodyElements; +- std::vector <GraphicsElement *> mAutomaticStylesElements; +- std::vector <GraphicsElement *> mStrokeDashElements; +- std::vector <GraphicsElement *> 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 <WPGImport.h> + #include <WPGImport.moc> + +-#include <QBuffer> +-#include <QByteArray> +-#include <QString> +- +-#include <kdebug.h> + #include <KoFilterChain.h> + #include <KoGlobal.h> + #include <KoUnit.h> ++#include <KoXmlWriter.h> ++ + #include <kpluginfactory.h> ++#include <KDebug> + +-#include <KoXmlWriter.h> ++ ++#include <QtCore/QString> ++#include <QtCore/QFile> + + #include <libwpg/libwpg.h> + #if LIBWPG_VERSION_MINOR<2 + #include <libwpg/WPGStreamImplementation.h> + #else + #include <libwpd-stream/libwpd-stream.h> ++#include <libwpd/libwpd.h> + #endif + +-#include "FileOutputHandler.hxx" +-#include "OdgExporter.hxx" +- + #include <iostream> + + K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();) +@@ -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; + } + diff --git a/staging/koffice/koffice.install b/staging/koffice/koffice.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/koffice/koffice.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/koffice/krita.install b/staging/koffice/krita.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/staging/koffice/krita.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/libproxy/PKGBUILD b/staging/libproxy/PKGBUILD new file mode 100644 index 000000000..7fde7ae6d --- /dev/null +++ b/staging/libproxy/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libproxy +pkgver=0.4.6 +pkgrel=7 +pkgdesc="A library that provides automatic proxy configuration management" +arch=(i686 x86_64) +license=('LGPL') +depends=('gcc-libs') +optdepends=('gconf: GNOME configuration module' + 'kdelibs: KDE configuration module' + 'networkmanager: NetworkManager configuration module' + 'perl: Perl bindings' + 'python2: Python bindings') +makedepends=('gconf' 'cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl') +url="http://libproxy.googlecode.com" +source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +options=('!libtool') +md5sums=('199c6b120baf1f7258a55f38d5ec74f5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \ + -DCMAKE_SKIP_RPATH=ON \ + -DPERL_VENDORINSTALL=yes \ + -DCMAKE_BUILD_TYPE=None \ + -DWITH_WEBKIT=OFF \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ + -DCMAKE_C_FLAGS="${CFLAGS}" \ + .. + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD deleted file mode 100644 index 275c56431..000000000 --- a/staging/libtorrent-rasterbar/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 124787 2011-05-24 12:59:08Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=libtorrent-rasterbar -pkgver=0.15.6 -pkgrel=2 -pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" -url="http://www.rasterbar.com/products/libtorrent/" -arch=('i686' 'x86_64') -license=('custom') -depends=('boost-libs' 'python2') -makedepends=('boost') -source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('e6f33b139933ec245e8850558efe52e88081fc6d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-python-binding - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/staging/mod_perl/PKGBUILD b/staging/mod_perl/PKGBUILD new file mode 100644 index 000000000..33f4e7901 --- /dev/null +++ b/staging/mod_perl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 125232 2011-05-25 19:12:54Z foutrelis $ +# Maintainer: Firmicus <francois.archlinux.org> +# Contributor: Tom K <tomk@runbox.com> + +pkgname=mod_perl +pkgver=2.0.5 +pkgrel=2 +pkgdesc="Apache module that embeds the Perl interpreter within the server" +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl=5.12.3' 'apache' 'db' 'apr-util') +license=('APACHE') +arch=('i686' 'x86_64') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz) +md5sums=('03d01d135a122bd8cebd0cd5b185d674') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/staging/net-snmp/PKGBUILD b/staging/net-snmp/PKGBUILD new file mode 100644 index 000000000..42faa88a3 --- /dev/null +++ b/staging/net-snmp/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 125239 2011-05-25 19:13:43Z foutrelis $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Dale Blount <dale@archlinux.org> + +pkgname=net-snmp +pkgver=5.6.1 +pkgrel=2 +pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" +arch=('i686' 'x86_64') +url="http://www.net-snmp.org/" +license=('custom') +depends=('openssl' 'tcp_wrappers' 'libnl') +makedepends=('setuptools') +optdepends=('perl-term-readkey: for snmpcheck application' + 'perl-tk: for snmpcheck and tkmib applications' + 'python2: for the python modules') +provides=('ucd-snmp') +options=('!libtool' '!makeflags' '!emptydirs') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'snmpd.rc') +md5sums=('b4e30ead5783b0bb1d280172c6095ea4' + '9f0d13676ba1fae1eb7eb178edd85b43') +sha1sums=('45bbf1295253d5379a5d1efd918593160387fd00' '2c679b564a2c319d9ce2714a9776aa0e6d89c60a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ + --enable-ucd-snmp-compatibility --enable-ipv6 --with-libwrap --with-python-modules \ + --with-default-snmp-version="3" --with-sys-contact="root@localhost" \ + --with-sys-location="Unknown" --with-logfile="/var/log/snmpd.log" \ + --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ + --with-persistent-directory="/var/net-snmp" \ + PYTHONPROG=/usr/bin/python2 + make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath -Wl,/usr/lib/perl5/core_perl/CORE" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install + install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/staging/net-snmp/libnl-2.patch b/staging/net-snmp/libnl-2.patch new file mode 100644 index 000000000..7c140fe83 --- /dev/null +++ b/staging/net-snmp/libnl-2.patch @@ -0,0 +1,67 @@ +diff -Nur net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c +--- net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c 2009-06-13 04:02:02.000000000 +0200 ++++ net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c 2011-01-15 10:31:03.579735957 +0100 +@@ -555,8 +555,10 @@ + static int + tcpTable_load_netlink() + { ++ int err; ++ + /* TODO: perhaps use permanent nl handle? */ +- struct nl_handle *nl = nl_handle_alloc(); ++ struct nl_sock *nl = nl_socket_alloc(); + + if (nl == NULL) { + DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); +@@ -564,10 +566,10 @@ + return -1; + } + +- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + +@@ -579,10 +581,10 @@ + struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); + nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); + +- if (nl_send_auto_complete(nl, nm) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_send_auto_complete(nl, nm)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + nlmsg_free(nm); +@@ -593,9 +595,9 @@ + + while (running) { + if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); ++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); ++ nl_socket_free(nl); + return -1; + } + +@@ -644,7 +646,7 @@ + free(buf); + } + +- nl_handle_destroy(nl); ++ nl_socket_free(nl); + + if (tcp_head) { + DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); diff --git a/testing/gdm/gdm b/staging/net-snmp/snmpd.rc index c3e635a6d..9f1b83f64 100755..100644 --- a/testing/gdm/gdm +++ b/staging/net-snmp/snmpd.rc @@ -3,25 +3,27 @@ . /etc/rc.conf . /etc/rc.d/functions +PID=`pidof -o %PPID /usr/sbin/snmpd` case "$1" in start) - stat_busy "Starting GDM" - /usr/sbin/gdm & + stat_busy "Starting Net-SNMP" + [ -z "$PID" ] && /usr/sbin/snmpd if [ $? -gt 0 ]; then stat_fail else - - add_daemon gdm + echo $PID > /var/run/snmpd.pid + add_daemon snmpd stat_done fi ;; stop) - stat_busy "Stopping GDM" - [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null + stat_busy "Stopping Net-SNMP" + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon gdm + rm /var/run/snmpd.pid + rm_daemon snmpd stat_done fi ;; diff --git a/staging/perl-bit-vector/PKGBUILD b/staging/perl-bit-vector/PKGBUILD new file mode 100644 index 000000000..ebdc0719d --- /dev/null +++ b/staging/perl-bit-vector/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125243 2011-05-25 19:15:01Z foutrelis $ +# Maintainer: Kevin Piche <kevin@archlinux.org> +# Contributor: K. Piche <kpiche@rogers.com> + +pkgname=perl-bit-vector +_cpanname=Bit-Vector +pkgver=7.1 +pkgrel=3 +pkgdesc='Efficient bit vector, set of integers and "big int" math library' +arch=(i686 x86_64) +license=('GPL' 'LGPL' 'PerlArtistic') +url="http://search.cpan.org/dist/${_cpanname}/" +depends=('perl-carp-clan' 'perl>=5.10.0') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/${_cpanname}-${pkgver}.tar.gz) +md5sums=('164c8574b728f6171b2a6f564fcd2e50') + +build() { + cd ${srcdir}/${_cpanname}-$pkgver + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_cpanname}-$pkgver + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-crypt-ssleay/PKGBUILD b/staging/perl-crypt-ssleay/PKGBUILD new file mode 100644 index 000000000..37f315f89 --- /dev/null +++ b/staging/perl-crypt-ssleay/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 125246 2011-05-25 19:15:29Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-crypt-ssleay +pkgver=0.58 +pkgrel=3 +pkgdesc="OpenSSL glue that provides LWP https support" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/Crypt-SSLeay" +license=('GPL' 'PerlArtistic') +depends=('openssl') +options=('!emptydirs') +source=(http://www.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-$pkgver.tar.gz) +md5sums=('fbf3d12e58462cee00ea63239c0b13c7') + +build() { + cd "${srcdir}/Crypt-SSLeay-${pkgver}" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/Crypt-SSLeay-${pkgver}" + make install DESTDIR="${pkgdir}" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/staging/perl-dbd-mysql/PKGBUILD b/staging/perl-dbd-mysql/PKGBUILD new file mode 100644 index 000000000..42d22d211 --- /dev/null +++ b/staging/perl-dbd-mysql/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 125309 2011-05-25 19:54:00Z remy $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Eric Johnson <eric@coding-zone.com> + +pkgname=perl-dbd-mysql +_realname=DBD-mysql +pkgver=4.019 +pkgrel=1 +pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" +arch=(i686 x86_64) +license=('GPL' 'PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('libmysqlclient' 'perl-dbi' 'perl>=5.14.0') +makedepends=('mysql') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) +md5sums=('566d98ab8ffac9626a31f6f6d455558e') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql + make +} + +check() { + cd ${srcdir}/${_realname}-${pkgver} + mkdir -p /tmp/mysql_test + mysql_install_db \ + --basedir=/usr \ + --datadir=/tmp/mysql_test + mysqld -P 17999 \ + --socket=/tmp/socket.mysql \ + --datadir=/tmp/mysql_test & + sleep 10 + DAEMON_PORT=$! + make test || true + kill -9 $DAEMON_PORT +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-dbd-sqlite/PKGBUILD b/staging/perl-dbd-sqlite/PKGBUILD new file mode 100644 index 000000000..298cc2008 --- /dev/null +++ b/staging/perl-dbd-sqlite/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 125249 2011-05-25 19:15:53Z foutrelis $ +# Contributor: Tom Killian <tomk@runbox.com> +# Contributor: francois at archlinux dot org + +pkgname=perl-dbd-sqlite +_cpanname=DBD-SQLite +pkgver=1.31 +pkgrel=2 +pkgdesc="Self-contained RDBMS in a DBI driver" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/${_cpanname}" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi>=1.61' 'sqlite3') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) +md5sums=('67b3575104efd606c8093bc416e3338d') + +build() { + cd "${srcdir}/${_cpanname}-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_cpanname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-dbi/PKGBUILD b/staging/perl-dbi/PKGBUILD new file mode 100644 index 000000000..42f7a5770 --- /dev/null +++ b/staging/perl-dbi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 124915 2011-05-25 07:47:08Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Matt Thompson <mattt@defunct.ca> + +pkgname=perl-dbi +_realname=DBI +pkgver=1.616 +pkgrel=2 +pkgdesc="Database independent interface for Perl" +arch=(i686 x86_64) +license=('GPL' 'PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.12.1') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) +md5sums=('799313e54a693beb635b47918458f7c4') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} + +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-digest-nilsimsa/PKGBUILD b/staging/perl-digest-nilsimsa/PKGBUILD new file mode 100644 index 000000000..40e9ae353 --- /dev/null +++ b/staging/perl-digest-nilsimsa/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 125252 2011-05-25 19:16:38Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-digest-nilsimsa +_realname=Digest-Nilsimsa +pkgver=0.06 +pkgrel=7 +pkgdesc="Perl version of Nilsimsa code." +arch=('i686' 'x86_64') +license=('LGPL') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.10.0') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) +replaces=('digest-nilsimsa') +provides=('digest-nilsimsa') +md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-digest-sha1/PKGBUILD b/staging/perl-digest-sha1/PKGBUILD new file mode 100644 index 000000000..eaae5e528 --- /dev/null +++ b/staging/perl-digest-sha1/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 125255 2011-05-25 19:17:02Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-digest-sha1 +_realname=Digest-SHA1 +pkgver=2.13 +pkgrel=2 +pkgdesc="Perl interface to the SHA-1 Algorithm" +arch=(i686 x86_64) +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.10.0') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) +replaces=('digest-sha1') +provides=('digest-sha1') +md5sums=('bd22388f268434f2b24f64e28bf1aa35') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-event/PKGBUILD b/staging/perl-event/PKGBUILD new file mode 100644 index 000000000..3e20ec4c2 --- /dev/null +++ b/staging/perl-event/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 125258 2011-05-25 19:17:24Z foutrelis $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Contributor: François Charette <francois.archlinux.org> + +pkgname=perl-event +_srcname=Event +pkgver=1.17 +pkgrel=1 +pkgdesc="Framework for GUI events" +arch=('i686' 'x86_64') +license=('PerlArtistic' 'GPL') +url="http://search.cpan.org/dist/${_srcname}/" +depends=('perl') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz) +md5sums=('c58cdf7c56cd5f10a58b234d2c81295f') + +build() { + cd "${srcdir}/${_srcname}-${pkgver}" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_srcname}-${pkgver}" + + make install DESTDIR="${pkgdir}" + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-fcgi/PKGBUILD b/staging/perl-fcgi/PKGBUILD new file mode 100644 index 000000000..d44eddf2a --- /dev/null +++ b/staging/perl-fcgi/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 125303 2011-05-25 19:27:52Z remy $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-fcgi +pkgver=0.72 +pkgrel=1 +pkgdesc="Fast CGI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/FCGI" +license=('GPL' 'PerlArtistic') +depends=('perl>=5.14') +options=('!emptydirs') +source=(http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz) +md5sums=('7b793e177caa93d972c6fb7ebe7c7ae1') + +build() { + cd "${srcdir}/FCGI-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/FCGI-${pkgver}" + make test +} + +package() { + cd "${srcdir}/FCGI-${pkgver}" + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-html-parser/PKGBUILD b/staging/perl-html-parser/PKGBUILD new file mode 100644 index 000000000..7e3b0a701 --- /dev/null +++ b/staging/perl-html-parser/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 125261 2011-05-25 19:17:47Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis +# Contributor: Firmicus <francois.archlinux.org> + +pkgname=perl-html-parser +_realname=HTML-Parser +pkgver=3.68 +pkgrel=2 +pkgdesc="Perl HTML parser class" +arch=('i686' 'x86_64') +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl-html-tagset' 'perl>=5.12.1') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) +md5sums=('5550b2da7aa94341f1e8a17a4ac20c68') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-libintl-perl/PKGBUILD b/staging/perl-libintl-perl/PKGBUILD new file mode 100644 index 000000000..af266d871 --- /dev/null +++ b/staging/perl-libintl-perl/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125264 2011-05-25 19:18:10Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=perl-libintl-perl +_realname=libintl-perl +pkgver=1.20 +pkgrel=3 +pkgdesc="Perl Module: Localization support" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://search.cpan.org/dist/${_realname}/" +depends=('gettext' 'perl>=5.10.0') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz) +md5sums=('cb36f58a7d2e15974f25b35381548b1b') + +build() { + cd ${srcdir}/${_realname}-$pkgver + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-$pkgver + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-locale-gettext/PKGBUILD b/staging/perl-locale-gettext/PKGBUILD new file mode 100644 index 000000000..6f916e28e --- /dev/null +++ b/staging/perl-locale-gettext/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 125267 2011-05-25 19:18:48Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Mark Rosenstand <mark@borkware.net> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=perl-locale-gettext +_realname=gettext +pkgver=1.05 +pkgrel=7 +pkgdesc="Permits access from Perl to the gettext() family of functions" +arch=('i686' 'x86_64') +license=('GPL' 'PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('gettext' 'perl>=5.10.0') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz + compatibility-with-POSIX-module.patch) +md5sums=('f3d3f474a1458f37174c410dfef61a46' + '854302f34d01a2f8ae739187788973dd') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + patch -Np1 -i ${srcdir}/compatibility-with-POSIX-module.patch + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" + + # remove perllocal.pod and .packlist + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete +} diff --git a/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch b/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch new file mode 100644 index 000000000..ad675516b --- /dev/null +++ b/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch @@ -0,0 +1,10 @@ +--- a/gettext.pm 2005-05-31 20:11:16.000000000 -0700 ++++ b/gettext.pm 2009-10-07 12:39:42.000000000 -0700 +@@ -32,6 +32,7 @@ + =cut + + use Carp; ++use POSIX qw(:locale_h); + + require Exporter; + require DynaLoader; diff --git a/staging/perl-net-dns/PKGBUILD b/staging/perl-net-dns/PKGBUILD new file mode 100644 index 000000000..1a4f7c0cc --- /dev/null +++ b/staging/perl-net-dns/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125273 2011-05-25 19:19:34Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-net-dns +_realname=Net-DNS +pkgver=0.66 +pkgrel=4 +pkgdesc="Perl Module: Interface to the DNS resolver." +arch=(i686 x86_64) +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl-digest-hmac' 'perl-net-ip' 'perl>=5.10.0') +source=(http://www.cpan.org/authors/id/O/OL/OLAF/${_realname}-$pkgver.tar.gz) +options=(!emptydirs) + +build() { + cd $srcdir/${_realname}-${pkgver} + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd $srcdir/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} +# vim: ts=2 sw=2 et ft=sh +md5sums=('1635d876324e3c2f6e277d5778bfe94c') diff --git a/staging/perl-net-ssleay/PKGBUILD b/staging/perl-net-ssleay/PKGBUILD new file mode 100644 index 000000000..6620fbd6f --- /dev/null +++ b/staging/perl-net-ssleay/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125276 2011-05-25 19:20:00Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-net-ssleay +_cpanname=Net-SSLeay +pkgver=1.36 +pkgrel=5 +pkgdesc="Perl extension for using OpenSSL" +arch=('i686' 'x86_64') +license=('custom:BSD') +url="http://search.cpan.org/dist/${_cpanname}/" +depends=('perl' 'openssl') +options=(!emptydirs) +replaces=('net-ssleay') +provides=('net-ssleay') +source=(http://www.cpan.org/authors/id/F/FL/FLORA/${_cpanname}-${pkgver}.tar.gz) +md5sums=('54061638720dd6a325395331c77f21d8') + +build() { + cd ${srcdir}/${_cpanname}-${pkgver} + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor + make + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete + + install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-net-upnp/PKGBUILD b/staging/perl-net-upnp/PKGBUILD new file mode 100644 index 000000000..e54c70917 --- /dev/null +++ b/staging/perl-net-upnp/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 125279 2011-05-25 19:20:27Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Drew Gilbert <gilbert dot drew at gmail dot com> + +pkgname=perl-net-upnp +pkgver=1.4.2 +pkgrel=3 +pkgdesc="Perl Module UPnP" +arch=('i686' 'x86_64') +url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/" +license=('BSD' 'PerlArtistic') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/Net-UPnP-${pkgver}.tar.gz") +depends=('perl') +md5sums=('bc009fd76b565df40a70aca49af82a7d') + +build() { + cd "${srcdir}/Net-UPnP-${pkgver}" + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make install DESTDIR="${pkgdir}" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/staging/perl-netaddr-ip/PKGBUILD b/staging/perl-netaddr-ip/PKGBUILD new file mode 100644 index 000000000..fa6549515 --- /dev/null +++ b/staging/perl-netaddr-ip/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 125270 2011-05-25 19:19:11Z foutrelis $ +# Maintainer: Dale Blount <dale@archlinux.org> +# Contributor: Dale Blount <dale@archlinux.org> +# Contributor: Francois Charette <francois.archlinux.org> + +pkgname=perl-netaddr-ip +_realname=NetAddr-IP +pkgver=4.037 +pkgrel=2 +pkgdesc="Perl module to manage IP addresses and subnets" +arch=(i686 x86_64) +license=('PerlArtistic' 'GPL') +depends=('perl>=5.10.0') +options=(!emptydirs) +url="http://search.cpan.org/dist/${_realname}/" +source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz) +md5sums=('d966eac6b5941af3f7c1fad839569cb4') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-template-toolkit/PKGBUILD b/staging/perl-template-toolkit/PKGBUILD new file mode 100644 index 000000000..d955edfdd --- /dev/null +++ b/staging/perl-template-toolkit/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Firmicus <francois.archlinux.org> +# Contributor: Tom Killian <tomk@runbox.com> +# Contributor: FJ <joostef@gmail.com> + +pkgname=perl-template-toolkit +_realname=Template-Toolkit +pkgver=2.22 +pkgrel=4 +pkgdesc="Perl template processing system" +arch=(i686 x86_64) +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl-appconfig' 'perl>=5.10.0') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) +md5sums=('d98277f6420e5da6b93d99a8db2b3934') + +build() { + cd ${srcdir}/${_realname}-$pkgver + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd ${srcdir}/${_realname}-$pkgver + make install DESTDIR=${startdir}/pkg + + # remove perllocal.pod and .packlist + find ${startdir}/pkg -name perllocal.pod -delete + find ${startdir}/pkg -name .packlist -delete +} diff --git a/staging/perl-term-readkey/PKGBUILD b/staging/perl-term-readkey/PKGBUILD new file mode 100644 index 000000000..25f9e397d --- /dev/null +++ b/staging/perl-term-readkey/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 125285 2011-05-25 19:22:27Z foutrelis $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Francois Charette <francois.archlinux.org> + +pkgname=perl-term-readkey +_realname=TermReadKey +pkgver=2.30.01 +pkgrel=4 +pkgdesc="Provides simple control over terminal driver modes" +arch=('i686' 'x86_64') +license=('custom') +depends=('perl>=5.10.0' 'glibc') +url="http://search.cpan.org/~stsi/${_realname}/" +source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) +options=('!emptydirs') +md5sums=('6c099eddb76ec9b92179f1ed929be71a') + +build() +{ + cd ${srcdir}/TermReadKey-$pkgver + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/TermReadKey-$pkgver + make DESTDIR=${pkgdir} install + install -d ${pkgdir}/usr/share/licenses/$pkgname/ + head -7 README > ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-text-iconv/PKGBUILD b/staging/perl-text-iconv/PKGBUILD new file mode 100644 index 000000000..acd6932e2 --- /dev/null +++ b/staging/perl-text-iconv/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 125288 2011-05-25 19:22:57Z foutrelis $ +# Maintainer: +# Contributor: Francois Charette <firmicus@gmx.net> + +pkgname=perl-text-iconv +_realname=Text-Iconv +pkgver=1.7 +pkgrel=6 +pkgdesc="Interface to iconv codeset conversion" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/${_realname}/" +license=('GPL' 'PerlArtistic') +depends=('perl>=5.10.0') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/M/MP/MPIOTR/${_realname}-${pkgver}.tar.gz) +md5sums=('81b26e069eaebb084e91ea3c009b67ae') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/perl-time-hires/PKGBUILD b/staging/perl-time-hires/PKGBUILD new file mode 100644 index 000000000..db9ddcb7f --- /dev/null +++ b/staging/perl-time-hires/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 125291 2011-05-25 19:23:52Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: mezcal <fila at pruda dot com> + +pkgname=perl-time-hires +pkgver=1.9721 +pkgrel=4 +pkgdesc="Perl module: high resolution time, sleep, and alarm" +arch=('i686' 'x86_64') +license=('PerlArtistic') +url="http://search.cpan.org/dist/Time-HiRes/" +depends=('perl') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/J/JH/JHI/Time-HiRes-${pkgver}.tar.gz) +md5sums=('bf09911a36b9481537c8e0d28fbb3aaf') + +build() { + cd "${srcdir}/Time-HiRes-${pkgver}" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-unicode-string/PKGBUILD b/staging/perl-unicode-string/PKGBUILD new file mode 100644 index 000000000..c8bcd6c7a --- /dev/null +++ b/staging/perl-unicode-string/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125294 2011-05-25 19:24:14Z foutrelis $ +# Maintainer: James Rayner <iphitus@gmail.com> +# Contributor: Andrew Simmons <andrew.simmons@gmail.com> + +pkgname=perl-unicode-string +_realname=Unicode-String +pkgver=2.09 +pkgrel=6 +pkgdesc="String of Unicode characters for perl (UCS2/UTF16)" +arch=('i686' 'x86_64') +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.10.0') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) +md5sums=('553e68e603723bf7c631f8701ab0d678') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + # in stall module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete +} diff --git a/staging/perl-yaml-syck/PKGBUILD b/staging/perl-yaml-syck/PKGBUILD new file mode 100644 index 000000000..c2ab5a4f8 --- /dev/null +++ b/staging/perl-yaml-syck/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 125297 2011-05-25 19:24:39Z foutrelis $ +# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# Maintainer: kevin <kevin@archlinux.org> + +pkgname=perl-yaml-syck +_realname=YAML-Syck +pkgver=1.17 +pkgrel=2 +pkgdesc="Fast, lightweight YAML loader and dumper" +arch=('i686' 'x86_64') +license=('custom') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl>=5.10.0') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/A/AV/AVAR/${_realname}-$pkgver.tar.gz) +md5sums=('f788529ad4b2c2fd037ccdfd5e7a88ab') + +build() { + cd ${srcdir}/${_realname}-$pkgver + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make + make test +} + +package() { + cd ${srcdir}/${_realname}-$pkgver + make install DESTDIR=${pkgdir} + + # remove perllocal.pod and .packlist + find ${pkgdir} -name perllocal.pod -delete + find ${pkgdir} -name .packlist -delete + + # license. + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/staging/pidgin/PKGBUILD b/staging/pidgin/PKGBUILD index a6da4e4f2..3ed646b74 100644 --- a/staging/pidgin/PKGBUILD +++ b/staging/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124591 2011-05-23 06:05:31Z foutrelis $ +# $Id: PKGBUILD 124935 2011-05-25 09:46:33Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.7.11 -pkgrel=4 +pkgrel=6 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -16,12 +16,22 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('07c2a2535b4d7436b5ec7685fe063fec') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + nm09-pidgin.patch + nm09-more.patch) +md5sums=('07c2a2535b4d7436b5ec7685fe063fec' + '744a21b4dbaf949dba7cd3b75b12b4fe' + 'a673659d86c7a65aa710f7c8c7feda82') build() { cd "$srcdir/$pkgname-$pkgver" + # Update for NetworkManager 0.9 connection states + # (http://developer.pidgin.im/ticket/13505) + # (http://developer.pidgin.im/ticket/13859) + patch -Np1 -i "$srcdir/nm09-pidgin.patch" + patch -Np1 -i "$srcdir/nm09-more.patch" + # Use Python 2 sed -i 's/env python$/\02/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -100,3 +110,5 @@ package_finch(){ rm "$pkgdir"/usr/share/man/man1/pidgin.1 } + +# vim:set ts=2 sw=2 et: diff --git a/staging/pidgin/nm09-more.patch b/staging/pidgin/nm09-more.patch new file mode 100644 index 000000000..8c708df9a --- /dev/null +++ b/staging/pidgin/nm09-more.patch @@ -0,0 +1,49 @@ +diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c +--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500 ++++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500 +@@ -833,8 +833,20 @@ purple_network_is_available(void) + purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n"); + } + +- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED) +- return TRUE; ++ switch (nm_state) ++ { ++ case NM_STATE_UNKNOWN: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else ++ case NM_STATE_CONNECTED: ++#endif ++ return TRUE; ++ default: ++ break; ++ } + + return FALSE; + +@@ -1170,9 +1182,14 @@ purple_network_init(void) + NM_DBUS_SERVICE, + NM_DBUS_PATH, + NM_DBUS_INTERFACE); ++ /* NM 0.6 signal */ + dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID); + dbus_g_proxy_connect_signal(nm_proxy, "StateChange", + G_CALLBACK(nm_state_change_cb), NULL, NULL); ++ /* NM 0.7 and later signal */ ++ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged", ++ G_CALLBACK(nm_state_change_cb), NULL, NULL); + + dbus_proxy = dbus_g_proxy_new_for_name(nm_conn, + DBUS_SERVICE_DBUS, +@@ -1207,6 +1224,7 @@ purple_network_uninit(void) + #ifdef HAVE_NETWORKMANAGER + if (nm_proxy) { + dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL); ++ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL); + g_object_unref(G_OBJECT(nm_proxy)); + } + if (dbus_proxy) { diff --git a/staging/pidgin/nm09-pidgin.patch b/staging/pidgin/nm09-pidgin.patch new file mode 100644 index 000000000..1c2471d1f --- /dev/null +++ b/staging/pidgin/nm09-pidgin.patch @@ -0,0 +1,38 @@ +diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c +--- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600 ++++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600 +@@ -71,6 +71,10 @@ + #include <dbus/dbus-glib.h> + #include <NetworkManager.h> + ++#if !defined(NM_CHECK_VERSION) ++#define NM_CHECK_VERSION(x,y,z) 0 ++#endif ++ + static DBusGConnection *nm_conn = NULL; + static DBusGProxy *nm_proxy = NULL; + static DBusGProxy *dbus_proxy = NULL; +@@ -863,7 +867,13 @@ nm_update_state(NMState state) + + switch(state) + { ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_CONNECTED_LOCAL: ++ case NM_STATE_CONNECTED_SITE: ++ case NM_STATE_CONNECTED_GLOBAL: ++#else + case NM_STATE_CONNECTED: ++#endif + /* Call res_init in case DNS servers have changed */ + res_init(); + /* update STUN IP in case we it changed (theoretically we could +@@ -880,6 +890,9 @@ nm_update_state(NMState state) + case NM_STATE_ASLEEP: + case NM_STATE_CONNECTING: + case NM_STATE_DISCONNECTED: ++#if NM_CHECK_VERSION(0,8,992) ++ case NM_STATE_DISCONNECTING: ++#endif + if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) + break; + if (ui_ops != NULL && ui_ops->network_disconnected != NULL) diff --git a/staging/postgresql/PKGBUILD b/staging/postgresql/PKGBUILD new file mode 100644 index 000000000..d5a887585 --- /dev/null +++ b/staging/postgresql/PKGBUILD @@ -0,0 +1,141 @@ +# $Id: PKGBUILD 125329 2011-05-25 22:33:15Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgbase=postgresql +pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') +pkgver=9.0.4 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://www.postgresql.org" +license=('custom:PostgreSQL') +makedepends=('libxml2' 'python2' 'perl') +source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \ + postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate + perl-5.14-fix.patch) +install=postgresql.install + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # patch to remove regress/test make target (won't build with it present) + patch -Np1 -i ../build.patch + # fix for perl 5.14 + patch -Np1 -i ../perl-5.14-fix.patch + + # configure + ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \ + --with-openssl --with-perl \ + --with-python PYTHON=/usr/bin/python2 --with-pam \ + --with-system-tzdata=/usr/share/zoneinfo --enable-nls \ + --datadir=/usr/share/postgresql --enable-thread-safety + + sed -i -e '/interfaces/d' src/Makefile + + # build + make world + + # build libs + for dir in src/interfaces src/bin/pg_config; do + pushd ${dir} + make + popd + done +} + +package_postgresql-libs() { + pkgdesc="Libraries for use with PostgreSQL" + depends=('openssl>=1.0.0') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # install license + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE" + + # install libs + for dir in src/interfaces src/bin/pg_config; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + + install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1" + + cd src/include + + mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq} + + # these headers are needed by the public headers of the interfaces + install -m644 pg_config.h "${pkgdir}/usr/include/" + install -m644 pg_config_os.h "${pkgdir}/usr/include/" + install -m644 postgres_ext.h "${pkgdir}/usr/include/" + install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/" + install -m644 pg_config_manual.h "${pkgdir}/usr/include/" + + # these headers are needed by the not-so-public headers of the interfaces + install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/" + install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/" + install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/" + install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/" +} + +package_postgresql-docs() { + pkgdesc="HTML documentation for PostgreSQL" + options=(docs) + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # install license + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE" + + make -C doc/src/sgml DESTDIR="${pkgdir}" install-html + chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/" +} + +package_postgresql() { + pkgdesc="A sophisticated object-relational DBMS" + backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql') + depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0') + optdepends=('python2: for PL/Python support' + 'perl: for PL/Perl support') + provides=('postgresql-client') + conflicts=('postgresql-client') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # install + make DESTDIR="${pkgdir}" install + make -C contrib DESTDIR="${pkgdir}" install + make -C doc/src/sgml DESTDIR="${pkgdir}" install-man + # we don't want this, it is in the -libs package + make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall + rm "${pkgdir}/usr/share/man/man1/pg_config.1" + + # install license + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE" + + # clean up unneeded installed items + rm -rf "${pkgdir}/usr/include/postgresql/internal" + rm -rf "${pkgdir}/usr/include/libpq" + find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} + + + # install launch script + install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql" + + # install conf file + install -D -m644 ${srcdir}/postgresql.confd \ + "${pkgdir}/etc/conf.d/postgresql" + + install -D -m644 ${srcdir}/postgresql.pam \ + "${pkgdir}/etc/pam.d/postgresql" + + install -D -m644 ${srcdir}/postgresql.logrotate \ + "${pkgdir}/etc/logrotate.d/postgresql" +} + +md5sums=('80390514d568a7af5ab61db1cda27e29' + 'eacf91f987d230f2dc2d040618ea1817' + 'd63a05943cf0a2726aa2070f3033c569' + '4d74f4227dc5e12bf95b3490758d86c9' + '96f82c38f3f540b53f3e5144900acf17' + 'd28e443f9f65a5712c52018b84e27137' + '6606e4279d91fc617b5c4dae0d76c603') diff --git a/staging/postgresql/build.patch b/staging/postgresql/build.patch new file mode 100644 index 000000000..c8f665d12 --- /dev/null +++ b/staging/postgresql/build.patch @@ -0,0 +1,11 @@ +diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile +--- postgresql-8.2.3-orig/src/Makefile 2006-06-22 16:50:35.000000000 -0700 ++++ postgresql-8.2.3/src/Makefile 2007-03-05 10:46:24.000000000 -0800 +@@ -23,7 +23,6 @@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ + $(MAKE) -C makefiles $@ +- $(MAKE) -C test/regress $@ + + install: install-local + diff --git a/staging/postgresql/perl-5.14-fix.patch b/staging/postgresql/perl-5.14-fix.patch new file mode 100644 index 000000000..82ef7d688 --- /dev/null +++ b/staging/postgresql/perl-5.14-fix.patch @@ -0,0 +1,25 @@ +--- a/src/pl/plperl/plperl.c ++++ b/src/pl/plperl/plperl.c +@@ -926,7 +926,7 @@ plperl_trusted_init(void) + if (!isGV_with_GP(sv) || !GvCV(sv)) + continue; + SvREFCNT_dec(GvCV(sv)); /* free the CV */ +- GvCV(sv) = NULL; /* prevent call via GV */ ++ GvCV_set(sv, NULL); /* prevent call via GV */ + } + hv_clear(stash); + +--- a/src/pl/plperl/plperl.h ++++ b/src/pl/plperl/plperl.h +@@ -49,6 +49,11 @@ + (U32)HeKUTF8(he)) + #endif + ++/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */ ++#ifndef GvCV_set ++#define GvCV_set(gv, cv) (GvCV(gv) = cv) ++#endif ++ + /* declare routines from plperl.c for access by .xs files */ + HV *plperl_spi_exec(char *, int); + void plperl_return_next(SV *); diff --git a/staging/postgresql/postgresql b/staging/postgresql/postgresql new file mode 100755 index 000000000..0fbe94036 --- /dev/null +++ b/staging/postgresql/postgresql @@ -0,0 +1,79 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/postgresql + +# Default PGROOT if it wasn't defined in the conf.d file +PGROOT=${PGROOT:-/var/lib/postgres} +PG_CTL="/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -s -w" + +postgres_init() { + # initialization + if [ ! -d $PGROOT/data ]; then + mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT + su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data" + fi + if [ ! -e /var/log/postgresql.log ]; then + touch /var/log/postgresql.log + chown postgres /var/log/postgresql.log + fi +} + +case "$1" in + start) + postgres_init + stat_busy "Starting PostgreSQL" + su - postgres -c \ + "$PG_CTL start" + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon postgresql + stat_done + fi + ;; + stop) + stat_busy "Stopping PostgreSQL" + su - postgres -c \ + "$PG_CTL stop -m fast" + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon postgresql + stat_done + fi + ;; + reload) + stat_busy "Reloading PostgreSQL" + su - postgres -c \ + "$PG_CTL reload" + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + stat_done + fi + ;; + restart) + postgres_init + stat_busy "Restarting PostgreSQL" + su - postgres -c \ + "$PG_CTL restart -m fast" + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon postgresql + stat_done + fi + ;; + status) + stat_busy "Checking PostgreSQL status"; + ck_status postgresql + ;; + *) + echo "usage: $0 {start|stop|reload|restart|status}" +esac +exit 0 diff --git a/staging/postgresql/postgresql.confd b/staging/postgresql/postgresql.confd new file mode 100644 index 000000000..5f8fa034c --- /dev/null +++ b/staging/postgresql/postgresql.confd @@ -0,0 +1,5 @@ +# +# Parameters to be passed to postgresql +# +PGROOT="/var/lib/postgres" +INITOPTS="--locale $LANG" diff --git a/staging/postgresql/postgresql.install b/staging/postgresql/postgresql.install new file mode 100644 index 000000000..d65bb6a7f --- /dev/null +++ b/staging/postgresql/postgresql.install @@ -0,0 +1,22 @@ +post_install() { + if [ ! -d '/var/lib/postgres' ]; then + mkdir -p '/var/lib/postgres' + fi + getent group postgres >/dev/null || groupadd -g 88 postgres + getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres + passwd -l postgres >/dev/null +} + +post_upgrade() { + post_install $1 + # FS#23858, fix postgres user shell issue + postgres_shell=$(getent passwd postgres | cut -d: -f7) + if [ "$postgres_shell" = "/sbin/nologin" ]; then + chsh -s /bin/bash postgres + fi +} + +post_remove() { + getent passwd postgres >/dev/null && userdel postgres + getent group postgres >/dev/null && groupdel postgres +} diff --git a/staging/postgresql/postgresql.logrotate b/staging/postgresql/postgresql.logrotate new file mode 100644 index 000000000..9c36918be --- /dev/null +++ b/staging/postgresql/postgresql.logrotate @@ -0,0 +1,4 @@ +/var/log/postgresql.log { + copytruncate + missingok +} diff --git a/staging/postgresql/postgresql.pam b/staging/postgresql/postgresql.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/staging/postgresql/postgresql.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/staging/spamassassin/PKGBUILD b/staging/spamassassin/PKGBUILD new file mode 100644 index 000000000..6b97ea8c1 --- /dev/null +++ b/staging/spamassassin/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 125325 2011-05-25 21:40:50Z remy $ +# Maintainer: Dale Blount <dale@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=spamassassin +pkgver=3.3.1 +pkgrel=5 +pkgdesc="A mail filter to identify spam." +arch=(i686 x86_64) +license=(APACHE) +url="http://spamassassin.apache.org" +depends=('perl>=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ + 'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \ + 'perl-libwww' 'perl-mail-spf' \ + 'zlib' 're2c') + # perl-archive-tar perl-io-zlib) +makedepends=('razor' 'perl-dbi') +optdepends=('razor: to identify collaborately-flagged spam' + 'gnupg: gpg support, without this use --nogpg flag for sa-update' + 're2c: regexp compiler, for compiling rules with sa-compile') +backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \ + etc/mail/spamassassin/init.pre \ + etc/mail/spamassassin/v310.pre \ + etc/mail/spamassassin/v312.pre \ + etc/mail/spamassassin/v320.pre) +install=${pkgname}.install +options=(!emptydirs) +source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz \ + spamd.conf.d spamd) +md5sums=('5a93f81fda315411560ff5da099382d2' + 'af501c6b0bb937a2775b747cc4b6d150' + '0534d3071a526a27ddc2b297afa03b04') + +build() { + cd ${srcdir}/Mail-SpamAssassin-${pkgver} + + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor \ + CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no + /usr/bin/make +} + +check() { + cd ${srcdir}/Mail-SpamAssassin-${pkgver} + /usr/bin/make test || true +} + +package() { + cd ${srcdir}/Mail-SpamAssassin-${pkgver} + /usr/bin/make DESTDIR=${pkgdir} install + + /bin/install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd + /bin/install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd +} diff --git a/staging/spamassassin/spamassassin.install b/staging/spamassassin/spamassassin.install new file mode 100644 index 000000000..5109956c9 --- /dev/null +++ b/staging/spamassassin/spamassassin.install @@ -0,0 +1,25 @@ +# arg 1: the new package version +post_install() { + echo "You must run 'sa-update' to install spam rules before use." + /bin/true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + # Compile rules, if rules have previously been compiled, and it's possible + if [ -x /usr/bin/re2c -a -x /usr/bin/perlbin/vendor/sa-compile -a -d /var/lib/spamassassin/compiled ]; then + echo "Detected compiled rules, running sa-compile..." + sa-compile > /dev/null 2>&1 +fi +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +# arg 1: the old package version +post_remove() { + /bin/true +} diff --git a/staging/spamassassin/spamd b/staging/spamassassin/spamd new file mode 100644 index 000000000..11d35f7cd --- /dev/null +++ b/staging/spamassassin/spamd @@ -0,0 +1,49 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/vendor_perl/spamd` +case "$1" in + start) + stat_busy "Starting spamd" + [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d ${SPAMD_OPTS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon spamd + stat_done + fi + ;; + stop) + stat_busy "Stopping spamd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + # Some users report that a second attempt at stopping the process + # works. So, take a little nap and give it another whirl... + sleep 2 + kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon spamd + stat_done + fi + else + rm_daemon spamd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/spamassassin/spamd.conf.d b/staging/spamassassin/spamd.conf.d new file mode 100644 index 000000000..4295e0073 --- /dev/null +++ b/staging/spamassassin/spamd.conf.d @@ -0,0 +1 @@ +SPAMD_OPTS="-c" diff --git a/staging/vim/PKGBUILD b/staging/vim/PKGBUILD new file mode 100644 index 000000000..603de624a --- /dev/null +++ b/staging/vim/PKGBUILD @@ -0,0 +1,198 @@ +# $Id: PKGBUILD 125313 2011-05-25 20:09:55Z heftig $ +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Maintainer: tobias [ tobias at archlinux org ] +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgbase=vim +pkgname=(vim gvim vim-runtime) +_topver=7.3 +_patchlevel=206 +pkgver=${_topver}.${_patchlevel} +__hgrev=e9538cfd0d9c +pkgrel=1 +arch=('i686' 'x86_64') +license=('custom:vim') +url="http://www.vim.org" +makedepends=('gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' + 'gettext' 'pkgconfig' 'mercurial' 'rsync' 'sed') +source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 + vimrc archlinux.vim gvim.desktop) +md5sums=('6e7adfbd5d26c1d161030ec203a7f243' + 'e57777374891063b9ca48a1fe392ac05' + '10353a61aadc3f276692d0e17db1478e' + '4b83e5fe0e534c53daaba91dd1cd4cbb') + +__hgroot='http://vim.googlecode.com/hg/' +__hgrepo='vim' +__hgbranch='default' + +_versiondir="vim${_topver//./}" + +##### Build ##### + +build() { + cd ${srcdir} + + msg2 'Checking out source from Mercurial...' + + if [[ -d ${__hgrepo} ]]; then + cd ${__hgrepo} + hg pull -b ${__hgbranch}|| warning 'hg pull failed!' + hg update -r ${__hgrev} + else + hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} + cd ${__hgrepo} + fi + + if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then + warning 'You are not building the latest revision!' + warning "Consider updating __hgrev to $(hg id -r ${__hgbranch})." + sleep 10 + fi + + cd .. + rm -rf vim-build gvim-build + rsync -a --exclude='.hg/' ${__hgrepo}/ vim-build + + msg2 'Patching...' + + # define the place for the global (g)vimrc file (set to /etc/vimrc) + sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + # fix python name + sed -i -e 's|vi_cv_path_python, python|vi_cv_path_python, python2|' \ + vim-build/src/configure.in + (cd vim-build/src && autoconf) + + msg2 'Building...' + + cp -a vim-build gvim-build + + cd ${srcdir}/vim-build + + ./configure --prefix=/usr --localstatedir=/var/lib/vim \ + --mandir=/usr/share/man --with-compiledby=ArchLinux \ + --with-features=big --enable-gpm --enable-acl --with-x=no \ + --disable-gui --enable-multibyte --enable-cscope \ + --disable-netbeans --enable-perlinterp --disable-pythoninterp \ + --disable-rubyinterp + + make + + cd ${srcdir}/gvim-build + + ./configure --prefix=/usr --localstatedir=/var/lib/vim \ + --mandir=/usr/share/man --with-compiledby=ArchLinux \ + --with-features=big --enable-gpm --enable-acl --with-x=yes \ + --enable-gui=gtk2 --enable-multibyte --enable-cscope \ + --enable-netbeans --enable-perlinterp --enable-pythoninterp \ + --enable-rubyinterp + + make +} + +##### Packaging ##### + +package_vim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl') + conflicts=('gvim') + + cd ${srcdir}/vim-build + make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install + + # provided by (n)vi in core + rm ${pkgdir}/usr/bin/{ex,view} + + # delete some manpages + find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + rm -f evim.1 # this does not make sense if we have no GUI + done + + # Runtime provided by runtime package + rm -r ${pkgdir}/usr/share/vim + + # license + install -dm755 ${pkgdir}/usr/share/licenses/vim + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + ${pkgdir}/usr/share/licenses/vim/license.txt +} + +package_gvim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl' 'python2>=2.7.1' 'ruby' 'libxt' + 'desktop-file-utils' 'gtk2') + provides=("vim=${pkgver}-${pkgrel}") + conflicts=('vim') + install=gvim.install + + cd ${srcdir}/gvim-build + make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install + + # provided by (n)vi in core + rm ${pkgdir}/usr/bin/{ex,view} + + # delete some manpages + find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + done + + # Move the runtime for later packaging + mv ${pkgdir}/usr/share/vim ${srcdir}/runtime-install + + # freedesktop links + install -Dm644 ${srcdir}/gvim.desktop \ + ${pkgdir}/usr/share/applications/gvim.desktop + install -Dm644 runtime/vim48x48.png ${pkgdir}/usr/share/pixmaps/gvim.png + + # license + install -dm755 ${pkgdir}/usr/share/licenses/gvim + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + ${pkgdir}/usr/share/licenses/gvim/license.txt +} + +package_vim-runtime() { + pkgdesc='Runtime for vim and gvim' + backup=(etc/vimrc) + + # Install the runtime split from gvim + install -dm755 ${pkgdir}/usr/share + mv ${srcdir}/runtime-install ${pkgdir}/usr/share/vim + + # Don't forget logtalk.dict + install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \ + ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict + + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim + + # patch filetype.vim for better handling of pacman related files + sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ + ${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim + sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ + ${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/changelog.vim + + # make Aaron happy + install -Dm644 ${srcdir}/pythoncomplete.vim \ + ${pkgdir}/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim + + # rc files + install -Dm644 ${srcdir}/vimrc ${pkgdir}/etc/vimrc + install -Dm644 ${srcdir}/archlinux.vim \ + ${pkgdir}/usr/share/vim/vimfiles/archlinux.vim + + # license + install -dm755 ${pkgdir}/usr/share/licenses/vim-runtime + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + ${pkgdir}/usr/share/licenses/vim-runtime/license.txt +} + +# vim:set sw=2 sts=2 et: diff --git a/staging/vim/archlinux.vim b/staging/vim/archlinux.vim new file mode 100644 index 000000000..148bb930f --- /dev/null +++ b/staging/vim/archlinux.vim @@ -0,0 +1,26 @@ +" The ArchLinux global vimrc - setting only a few sane defaults +" +" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] +" +" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION +" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc + +" Normally we use vim-extensions. If you want true vi-compatibility +" remove change the following statements +set nocompatible " Use Vim defaults instead of 100% vi compatibility +set backspace=indent,eol,start " more powerful backspacing + +" Now we set some defaults for the editor +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time + +" Suffixes that get lower priority when doing tab completion for filenames. +" These are files we are not likely to want to edit or read. +set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc + + +if has('gui_running') + " Make shift-insert work like in Xterm + map <S-Insert> <MiddleMouse> + map! <S-Insert> <MiddleMouse> +endif diff --git a/staging/vim/gvim.desktop b/staging/vim/gvim.desktop new file mode 100644 index 000000000..56fd61b8f --- /dev/null +++ b/staging/vim/gvim.desktop @@ -0,0 +1,42 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Name=gVim +Name[eo]=VIM-fasado +Name[sv]=gVim +Name[xx]=xx +Comment=GTK2 enhanced vim text editor +Comment[ar]=محرر نصوص +Comment[bg]=Текст Редактор +Comment[de]=Texteditor +Comment[el]=Διορθωτής Κειμένου +Comment[eo]=Tekstredaktilo +Comment[et]=Tekstiredaktor +Comment[eu]=Testu Editorea +Comment[fi]=Tekstieditori +Comment[he]=עורך טקסט +Comment[is]=Textaritill +Comment[ja]=テキストエディタ +Comment[lt]=Teksto redaktorius +Comment[mt]=Editur tat-test +Comment[pt_BR]=Editor de Texto +Comment[ro]=Editor de text +Comment[ru]=редактор +Comment[sk]=Textový editor +Comment[sl]=Urejevalnik besedil +Comment[ta]=¯¨Ã ¦¾¡ÌôÀ¡Ç÷ +Comment[tr]=Metin Düzenleyici +Comment[uk]=Редактор текстів +Comment[vi]=Trình soạn văn bản +Comment[xx]=xx +Comment[zh_CN]=文本编辑器 +Comment[zh_TW]=文字編輯器 +GenericName=Text Editor +Type=Application +TryExec=gvim +Exec=gvim %u +Icon=gvim +Terminal=false +X-MultipleArgs=false +Categories=GTK;Application;Utility;TextEditor; +MimeType=application/mathml+xml;application/xhtml+xml;application/x-perl;application/x-python;application/x-shellscript;audio/x-mpegurl;audio/x-scpls;image/svg+xml;message/news;message/rfc822;text/calendar;text/css;text/english;text/html;text/mrml;text/plain;text/rdf;text/rss;text/rtf;text/sgml;text/vnd.wap.wml;text/x-adasrc;text/x-bibtex;text/x-chdr;text/x-c++hdr;text/x-csrc;text/x-c++src;text/x-c;text/x-objc;text/x-csv;text/x-diff;text/x-java;text/x-katefilelist;text/x-latex;text/x-log;text/x-lyx;text/x-makefile;text/xmcd;text/xml;text/x-moc;text/x-mswinurl;text/x-objcsrc;text/x-pascal;text/x-perl;text/x-php;text/x-php-source;text/x-python;text/x-tcl;text/x-tex;text/x-vcalendar;text/x-vcard;text/x-xslfo;text/x-xslt; diff --git a/community-staging/glob2/glob2.install b/staging/vim/gvim.install index 7463b6e76..0a8d3b0a9 100644 --- a/community-staging/glob2/glob2.install +++ b/staging/vim/gvim.install @@ -1,5 +1,7 @@ post_install() { + echo -n "Updating desktop and mime database..." update-desktop-database -q + echo "done." } post_upgrade() { @@ -7,6 +9,5 @@ post_upgrade() { } post_remove() { - update-desktop-database -q + post_install $1 } - diff --git a/staging/vim/vimrc b/staging/vim/vimrc new file mode 100644 index 000000000..92d3ff980 --- /dev/null +++ b/staging/vim/vimrc @@ -0,0 +1,16 @@ +" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just +" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime +" you can find below. If you wish to change any of those settings, you should +" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten +" everytime an upgrade of the vim packages is performed. It is recommended to +" make changes after sourcing archlinux.vim since it alters the value of the +" 'compatible' option. + +" This line should not be removed as it ensures that various options are +" properly set to work with the Vim-related packages. +runtime! archlinux.vim + +" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' +" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual +" and configure vim to your own liking! + diff --git a/staging/weechat/PKGBUILD b/staging/weechat/PKGBUILD new file mode 100644 index 000000000..7e2144efc --- /dev/null +++ b/staging/weechat/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 125306 2011-05-25 19:29:12Z foutrelis $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: lucke <lucke at o2 dot pl> + +pkgname=weechat +pkgver=0.3.5 +pkgrel=2 +pkgdesc="Fast, light and extensible IRC client (curses UI)" +arch=('i686' 'x86_64') +url="http://www.weechat.org/" +license=('GPL') +depends=('gnutls') +makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') +options=('!libtool') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + mkdir build + cd build + cmake .. -DPREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + + make DESTDIR="${pkgdir}/" install +} diff --git a/testing/accountsservice/PKGBUILD b/testing/accountsservice/PKGBUILD deleted file mode 100644 index 5f0c6e93a..000000000 --- a/testing/accountsservice/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124664 2011-05-23 20:15:43Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=accountsservice -pkgver=0.6.12 -pkgrel=1 -pkgdesc="D-Bus interface for user account query and manipulation" -arch=(i686 x86_64) -url="http://cgit.freedesktop.org/accountsservice/" -license=('GPL3') -depends=('dbus-glib' 'polkit') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool') -source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2fcf38a65d574dd2fe6ba182ff4de053') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/accountsservice \ - --with-systemdsystemunitdir=/lib/systemd/system \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/acpid/PKGBUILD b/testing/acpid/PKGBUILD deleted file mode 100644 index 28d94a296..000000000 --- a/testing/acpid/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 124204 2011-05-17 17:28:41Z andrea $ -# Maintainer: -# Contributor: xduugu -# Contributor: Manolis Tzanidakis -# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us - -pkgname=acpid -pkgver=2.0.9 -pkgrel=3 -pkgdesc="A daemon for delivering ACPI power management events with netlink support" -arch=('i686' 'x86_64') -url="http://tedfelix.com/linux/acpid-netlink.html" -license=('GPL') -depends=('bash') -source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz" - 'acpid' - 'anything' - 'handler.sh' - 'acpid.conf.d') -replaces=('acpid2') -backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - make -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install - - install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid" - install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything" - install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh" - install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid" - - chmod 755 "${pkgdir}"/usr/sbin/acpid -} -md5sums=('8b30aa1b31f607161745a4ac7a19699b' - '955490c4db5233ec44461db694b873a4' - '2d37b98d6e74bab815604b8b48c6cfd4' - '7b2e4c299af5eb87e1a81c07b6916c97' - '929c6d2e91295c22ed9ec6212d7eabef') diff --git a/testing/acpid/acpid b/testing/acpid/acpid deleted file mode 100644 index 9177c8207..000000000 --- a/testing/acpid/acpid +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid - -PID=`pidof -o %PPID /usr/sbin/acpid` -case "$1" in - start) - stat_busy "Starting acpid" - [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon acpid - stat_done - fi - ;; - stop) - stat_busy "Stopping acpid" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon acpid - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/acpid/acpid.conf.d b/testing/acpid/acpid.conf.d deleted file mode 100644 index b60103a2d..000000000 --- a/testing/acpid/acpid.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# -# Arguments to be passed to the acpid daemon -# - -ACPID_ARGS="" diff --git a/testing/acpid/anything b/testing/acpid/anything deleted file mode 100644 index d1828989b..000000000 --- a/testing/acpid/anything +++ /dev/null @@ -1,3 +0,0 @@ -# Pass all events to our one handler script -event=.* -action=/etc/acpi/handler.sh %e diff --git a/testing/acpid/handler.sh b/testing/acpid/handler.sh deleted file mode 100644 index 518a62dea..000000000 --- a/testing/acpid/handler.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# Default acpi script that takes an entry for all actions - -# NOTE: This is a 2.6-centric script. If you use 2.4.x, you'll have to -# modify it to not use /sys - -minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq` -maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq` -setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed" - -set $* - -case "$1" in - button/power) - #echo "PowerButton pressed!">/dev/tty5 - case "$2" in - PWRF) logger "PowerButton pressed: $2" ;; - *) logger "ACPI action undefined: $2" ;; - esac - ;; - button/sleep) - case "$2" in - SLPB) echo -n mem >/sys/power/state ;; - *) logger "ACPI action undefined: $2" ;; - esac - ;; - ac_adapter) - case "$2" in - AC|ACAD|ADP0) - case "$4" in - 00000000) - echo -n $minspeed >$setspeed - #/etc/laptop-mode/laptop-mode start - ;; - 00000001) - echo -n $maxspeed >$setspeed - #/etc/laptop-mode/laptop-mode stop - ;; - esac - ;; - *) logger "ACPI action undefined: $2" ;; - esac - ;; - battery) - case "$2" in - BAT0) - case "$4" in - 00000000) #echo "offline" >/dev/tty5 - ;; - 00000001) #echo "online" >/dev/tty5 - ;; - esac - ;; - CPU0) - ;; - *) logger "ACPI action undefined: $2" ;; - esac - ;; - button/lid) - #echo "LID switched!">/dev/tty5 - ;; - *) - logger "ACPI group/action undefined: $1 / $2" - ;; -esac diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD deleted file mode 100644 index eea7f3e07..000000000 --- a/testing/anjuta/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 124683 2011-05-23 21:00:48Z ibiru $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Harley Laue <losinggeneration@yahoo.com> - -pkgname=anjuta -pkgver=3.0.2.0 -pkgrel=1 -pkgdesc="GNOME Integrated Development Environment (IDE)" -arch=('i686' 'x86_64') -license=('GPL') -depends=('vte3' 'gdl' 'autogen' 'devhelp' 'gtksourceview3' 'glade' 'libgda' - 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'graphviz' - 'python2' 'shared-mime-info' 'desktop-file-utils') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') -url="http://anjuta.sourceforge.net/" -install=anjuta.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -options=('!libtool' '!emptydirs') -sha256sums=('5dce2cf455f9feeea31aea6bce5bae1dbd35793ba8c8009675608dae4d67bac0') - -build() { - cd "${srcdir}/anjuta-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package(){ - cd "${srcdir}/anjuta-${pkgver}" - - make DESTDIR="${pkgdir}" install - - sed -i "1s|#!/usr/bin/python$|&2|" \ - $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py -} diff --git a/testing/anjuta/anjuta.install b/testing/anjuta/anjuta.install deleted file mode 100644 index c6fcfec11..000000000 --- a/testing/anjuta/anjuta.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall anjuta - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD index 5af689c41..8df2eb03d 100644 --- a/testing/bind/PKGBUILD +++ b/testing/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124551 2011-05-22 22:52:52Z bisson $ +# $Id: PKGBUILD 125623 2011-05-27 08:34:32Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -6,9 +6,9 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P1 -_pkgver=9.8.0-P1 -pkgrel=3 +pkgver=9.8.0.P2 +_pkgver=9.8.0-P2 +pkgrel=1 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols' arch=('i686' 'x86_64') @@ -30,10 +30,10 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('aa8f308f218e437ac4bad616e0ae83a9b9c40c29' +sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' 'ee52947062c1582858187716b776afa3613608fb' - '2f737f4e81186447ac2ef370fa8dcea0b3abec31' - '5277cf4d6fbc5728c55b51c77c9347d28393fb7c' + 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' + '17444f9d759a4bde7688bdaa304dac57a138e4c1' '46232e9db243c6c05e170a1781d7a7f413be5d03' '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' '7848edbfb9a848843f57c11c02b0289eefd42d00' @@ -46,8 +46,8 @@ install=install build() { cd "${srcdir}/${pkgname}-${_pkgver}" - patch -p1 -i "${srcdir}"/so_bsdcompat.patch - patch -p1 -i "${srcdir}"/notools.patch + patch -p1 -i ../so_bsdcompat.patch + patch -p1 -i ../notools.patch ./configure \ --prefix=/usr \ diff --git a/testing/bind/notools.patch b/testing/bind/notools.patch index 2d16fdcd5..0ad083a01 100644 --- a/testing/bind/notools.patch +++ b/testing/bind/notools.patch @@ -1,5 +1,6 @@ ---- bind-9.7.0/bin/Makefile.in.orig 2010-03-14 21:19:23.000000000 -0400 -+++ bind-9.7.0/bin/Makefile.in 2010-03-14 21:19:37.000000000 -0400 +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2011-05-27 10:12:59.392416094 +0200 ++++ new/bin/Makefile.in 2011-05-27 10:13:12.372521984 +0200 @@ -19,7 +19,7 @@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ diff --git a/testing/bind/so_bsdcompat.patch b/testing/bind/so_bsdcompat.patch index cae2b835c..4d7031fcc 100644 --- a/testing/bind/so_bsdcompat.patch +++ b/testing/bind/so_bsdcompat.patch @@ -1,13 +1,12 @@ diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c ---- old/lib/isc/unix/socket.c 2010-03-12 04:25:20.000000000 +0100 -+++ new/lib/isc/unix/socket.c 2011-01-22 21:07:52.410000038 +0100 -@@ -681,6 +681,8 @@ - isc_sockstatscounter_fdwatchrecvfail - }; +--- old/lib/isc/unix/socket.c 2011-02-18 05:01:16.000000000 +0100 ++++ new/lib/isc/unix/socket.c 2011-05-27 10:12:01.685269374 +0200 +@@ -712,6 +712,8 @@ + } + #endif +#undef SO_BSDCOMPAT + static void - manager_log(isc__socketmgr_t *sockmgr, - isc_logcategory_t *category, isc_logmodule_t *module, int level, -Only in new/lib/isc/unix: socket.c.orig + socket_log(isc__socket_t *sock, isc_sockaddr_t *address, + isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD new file mode 100644 index 000000000..15d191ead --- /dev/null +++ b/testing/cryptsetup/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 125738 2011-05-28 17:14:11Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +pkgname=cryptsetup +pkgver=1.3.1 +pkgrel=1 +pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" +arch=(i686 x86_64) +license=('GPL') +url="http://code.google.com/p/cryptsetup/" +groups=('base') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') +conflicts=('mkinitcpio<0.5.99') +options=('!libtool' '!emptydirs') +source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 + encrypt_hook + encrypt_install) +sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' + '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' + '07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa') + +build() { + cd $srcdir/$pkgname-${pkgver} + ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib + make +} + +package() { + cd $srcdir/$pkgname-${pkgver} + make DESTDIR=$pkgdir install + # install hook + install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt + install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt + # Fix pkgconfig location + install -d -m755 $pkgdir/usr/lib + mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/ +} diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook new file mode 100644 index 000000000..e84bc6ed7 --- /dev/null +++ b/testing/cryptsetup/encrypt_hook @@ -0,0 +1,131 @@ +# vim: set ft=sh: +# TODO this one needs some work to work with lots of different +# encryption schemes +run_hook () +{ + /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" + + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ "x${cryptkey}" != "x" ]; then + ckdev="$(echo "${cryptkey}" | cut -d: -f1)" + ckarg1="$(echo "${cryptkey}" | cut -d: -f2)" + ckarg2="$(echo "${cryptkey}" | cut -d: -f3)" + if poll_device "${ckdev}" ${rootdelay}; then + case ${ckarg1} in + *[!0-9]*) + # Use a file on the device + # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path + mkdir /ckey + mount -r -t ${ckarg1} ${ckdev} /ckey + dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1 + umount /ckey + ;; + *) + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1 + ;; + esac + fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi + + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" + cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" + else + DEPRECATED_CRYPT=1 + cryptdev="${root}" + cryptname="root" + fi + + warn_deprecated() { + echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" + echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." + } + + if poll_device "${cryptdev}" ${rootdelay}; then + if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then + dopassphrase=0 + else + echo "Invalid keyfile. Reverting to passphrase." + fi + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo "" + echo "A password is required to access the ${cryptname} volume:" + + #loop until we get a real password + while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do + sleep 2; + done + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if [ $# -ne 5 ]; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="/sbin/cryptsetup create ${cryptname} ${cryptdev}" + tmp=$(echo "${crypto}" | cut -d: -f1) + [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f2) + [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f3) + [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f4) + [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f5) + [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\"" + if [ -f ${ckeyfile} ]; then + exe="${exe} --key-file ${ckeyfile}" + else + exe="${exe} --verify-passphrase" + echo "" + echo "A password is required to access the ${cryptname} volume:" + fi + eval "${exe} ${CSQUIET}" + + if [ $? -ne 0 ]; then + err "Non-LUKS device decryption failed. verify format: " + err " crypto=hash:cipher:keysize:offset:skip" + exit 1 + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + else + err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." + fi + fi + rm -f ${ckeyfile} + fi +} diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install new file mode 100644 index 000000000..25a2ae45c --- /dev/null +++ b/testing/cryptsetup/encrypt_install @@ -0,0 +1,27 @@ +# vim: set ft=sh: + +install () +{ + if [ -z "${CRYPTO_MODULES}" ]; then + MODULES=" dm-crypt $(all_modules "/crypto/") " + else + MODULES=" dm-crypt ${CRYPTO_MODULES} " + fi + FILES="" + SCRIPT="encrypt" + add_dir "/dev/mapper" + [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" + [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" + add_binary "/sbin/dmsetup" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook allows for an encrypted root device. +HELPEOF +} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD deleted file mode 100644 index 13048e9d9..000000000 --- a/testing/curl/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=curl -pkgver=7.21.6 -pkgrel=2 -pkgdesc="An URL retrival utility and library" -arch=('i686' 'x86_64') -url="http://curl.haxx.se" -license=('MIT') -depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') -options=('!libtool') -source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 - curlbuild.h) - -[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h -[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h -md5sums=('6611989a81ebd7b03a35adc3001ddee0' - '751bd433ede935c8fae727377625a8ae') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure \ - --with-random=/dev/urandom \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-dependency-tracking \ - --enable-ipv6 \ - --disable-ldaps \ - --disable-ldap \ - --enable-manual \ - --enable-versioned-symbols \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ - --without-libidn \ - --enable-threaded-resolver - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - install -Dm644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - install -Dm644 docs/libcurl/libcurl.m4 \ - ${pkgdir}/usr/share/aclocal/libcurl.m4 - mv "${pkgdir}/usr/include/curl/curlbuild.h" "${pkgdir}/usr/include/curl/${_curlbuild}" - install -m 644 ${srcdir}/curlbuild.h "${pkgdir}/usr/include/curl/curlbuild.h" -} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h deleted file mode 100644 index b48862696..000000000 --- a/testing/curl/curlbuild.h +++ /dev/null @@ -1,9 +0,0 @@ -#include <bits/wordsize.h> - -#if __WORDSIZE == 32 -#include "curlbuild-32.h" -#elif __WORDSIZE == 64 -#include "curlbuild-64.h" -#else -#error "Unknown word size" -#endif diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD new file mode 100644 index 000000000..12829b5d1 --- /dev/null +++ b/testing/dnsutils/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 125626 2011-05-27 10:41:33Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> +# Contributor: mario <mario_vazq@hotmail.com> + +pkgname=dnsutils + +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.8.0.P2 +_pkgver=9.8.0-P2 +pkgrel=1 + +pkgdesc='Various DNS utilities - dig host nslookup nsupdate' +arch=('i686' 'x86_64') +url='https://www.isc.org/software/bind' +license=('custom:ISC') +depends=('openssl' 'idnkit') +replaces=('bind-tools' 'host') +options=('!makeflags') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'tools-only.patch') +sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' + 'ac88c89e25c26d73095a3dd85e1ca1070d184ded') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../tools-only.patch + export STD_CDEFINES='-DDIG_SIGCHASE' + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-openssl=yes \ + --with-idn=yes \ + --disable-linux-caps \ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}/bin" + + make DESTDIR="${pkgdir}" install + + install -Dm644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/dnsutils/tools-only.patch b/testing/dnsutils/tools-only.patch new file mode 100644 index 000000000..b46b71f60 --- /dev/null +++ b/testing/dnsutils/tools-only.patch @@ -0,0 +1,25 @@ +diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in +--- bind-9.7.1-P2.orig/bin/Makefile.in 2009-10-05 08:07:08.000000000 -0400 ++++ bind-9.7.1-P2/bin/Makefile.in 2010-07-22 15:55:00.000000000 -0400 +@@ -19,8 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +- check confgen @PKCS11_TOOLS@ ++SUBDIRS = dig nsupdate + TARGETS = + + @BIND9_MAKE_RULES@ +diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in +--- bind-9.7.1-P2.orig/lib/Makefile.in 2007-06-19 19:47:13.000000000 -0400 ++++ bind-9.7.1-P2/lib/Makefile.in 2010-07-22 15:56:29.000000000 -0400 +@@ -23,7 +23,7 @@ + # Attempt to disable parallel processing. + .NOTPARALLEL: + .NO_PARALLEL: +-SUBDIRS = isc isccc dns isccfg bind9 lwres tests ++SUBDIRS = isc dns isccfg bind9 lwres + TARGETS = + + @BIND9_MAKE_RULES@ diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD deleted file mode 100644 index 8b758fd16..000000000 --- a/testing/empathy/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 124631 2011-05-23 15:09:42Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=empathy -pkgver=3.0.2 -pkgrel=1 -pkgdesc="A GNOME instant messaging client using the Telepathy framework." -arch=('i686' 'x86_64') -url="http://live.gnome.org/Empathy" -license=('GPL2') -depends=('telepathy-glib' 'telepathy-mission-control' 'folks' 'telepathy-logger' 'telepathy-farsight' 'gnome-keyring' 'gnutls' 'evolution-data-server' - 'libcanberra' 'libnotify' 'enchant' 'iso-codes' 'libwebkit3' 'dconf' 'ca-certificates') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gnome-control-center') -optdepends=('telepathy-gabble: XMPP/Jabber support' - 'telepathy-butterfly: MSN support' - 'telepathy-idle: IRC support' - 'telepathy-salut: Link-local XMPP support' - 'telepathy-sofiasip: SIP support' - 'telepathy-haze: libpurple support') -options=('!libtool') -groups=('gnome-extra') -install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/empathy \ - --disable-static \ - --disable-scrollkeeper \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install deleted file mode 100644 index 63dd6b907..000000000 --- a/testing/empathy/empathy.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo "To use Empathy you need to install at least one Telepathy connection manager." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD deleted file mode 100644 index 872b9228a..000000000 --- a/testing/eog/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 124886 2011-05-24 21:41:31Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=eog -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Eye of Gnome: An image viewing and cataloging program" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi' - 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') -makedepends=('gtk-doc' 'intltool') -install=eog.install -groups=('gnome-extra') -options=('!emptydirs' '!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('96fa5af97baba0bce8dec376d7cd49512768505f473b11b2cf61881f6be8cb60') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # remove it from Xfce menu that ships its own thingy - echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop -} diff --git a/testing/eog/eog.install b/testing/eog/eog.install deleted file mode 100644 index 284b24b18..000000000 --- a/testing/eog/eog.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall eog - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD deleted file mode 100644 index ae1141789..000000000 --- a/testing/evince/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 124739 2011-05-24 07:25:52Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evince -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Simply a document viewer" -url="http://projects.gnome.org/evince/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' - 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') -makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') -optdepends=('texlive-bin: DVI support') -groups=('gnome-extra') -install=evince.install -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - introspection-fix.patch) -sha256sums=('03abb74620caaa255f2d1369b684bbf8f62e15a4bf2d9f2a45f58e1789295a97' - '897b8c77c5cda31f4f8d860cd6a7ad8ad986dbf3cf26b56acf054cc650e94be1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/introspection-fix.patch" - autoreconf -fi - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/evince \ - --disable-static --enable-nautilus \ - --enable-pdf --enable-tiff \ - --enable-djvu --enable-dvi \ - --enable-t1lib --enable-comics \ - --disable-scrollkeeper --disable-schemas-compile \ - --enable-introspection - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/evince/evince.install b/testing/evince/evince.install deleted file mode 100644 index 9643a9ba0..000000000 --- a/testing/evince/evince.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall evince - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/evince/introspection-fix.patch b/testing/evince/introspection-fix.patch deleted file mode 100644 index 6a64517bd..000000000 --- a/testing/evince/introspection-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff a/libview/Makefile.am b/libview/Makefile.am ---- a/libview/Makefile.am -+++ b/libview/Makefile.am -@@ -136,6 +136,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filte - --output $@ \ - --pkg evince-document-$(EV_API_VERSION) \ - --pkg evince-view-$(EV_API_VERSION) \ -+ -L$(top_builddir)/libdocument/ \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -DEVINCE_COMPILATION \ diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD deleted file mode 100644 index 040385490..000000000 --- a/testing/evolution-data-server/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-data-server -pkgver=3.0.2.1 -pkgrel=1 -pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" -arch=('i686' 'x86_64') -depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') -makedepends=('intltool' 'gperf' 'gobject-introspection') -options=('!libtool') -url="http://www.gnome.org" -license=('GPL') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-openldap=yes \ - --libexecdir=/usr/lib/evolution-data-server \ - --with-krb5=/usr --with-libdb=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD deleted file mode 100644 index c494c1fba..000000000 --- a/testing/evolution-exchange/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-exchange -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Ximian Connector Exchange plugin for Evolution" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.ximian.com" -depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop' 'libunique3') -makedepends=('intltool' 'evolution') -options=('!libtool' '!emptydirs') -install=evolution-exchange.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/evolution --disable-static \ - --with-libdb=/usr --with-krb5=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/evolution-exchange/evolution-exchange.install b/testing/evolution-exchange/evolution-exchange.install deleted file mode 100644 index 1179887f9..000000000 --- a/testing/evolution-exchange/evolution-exchange.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=evolution-exchange - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD deleted file mode 100644 index 0c91802b7..000000000 --- a/testing/evolution/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 124643 2011-05-23 17:54:16Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Integrated Workgroup and Personal Information Management for Gnome" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libsm' 'gstreamer0.10' 'libunique3' 'libnotify' 'libpst' 'libytnef' - 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') -optdepends=('bogofilter: possible junk filter plugin' - 'spamassassin: possible junk filter plugin') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -install=evolution.install -url=http://www.gnome.org/projects/evolution/ -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6fdf6a39a89bb04c406225984e5b730e86a370024f30ef9cf019840be9fbe59a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ - --disable-scrollkeeper \ - --enable-nss=yes \ - --with-openldap=yes \ - --enable-smime=yes \ - --with-krb5=/usr \ - --disable-image-inline - make - make -C plugins/tnef-attachments -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install deleted file mode 100644 index a2c3aaa54..000000000 --- a/testing/evolution/evolution.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=evolution - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/file-roller/PKGBUILD b/testing/file-roller/PKGBUILD deleted file mode 100644 index 5d7d1c2ec..000000000 --- a/testing/file-roller/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=file-roller -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Archive manipulator for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus') -makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm') -optdepends=('unrar: the RAR uncompression program' - 'zip: creates PKZIP-compatible .zip files' - 'unzip: unpacks .zip archives' - 'p7zip: 7zip compression utility' - 'xz: managing LZMA and XZ compressed files' - 'arj: ARJ archiver' - 'unace: extraction tool for the proprietary ace archive format') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -install=file-roller.install -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/file-roller \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/file-roller/file-roller.install b/testing/file-roller/file-roller.install deleted file mode 100644 index 10a148241..000000000 --- a/testing/file-roller/file-roller.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=file-roller - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD deleted file mode 100644 index 9869a976c..000000000 --- a/testing/file/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=file -pkgver=5.07 -pkgrel=3 -pkgdesc="File type identification utility" -arch=('i686' 'x86_64') -license=('custom') -groups=('base') -url="http://www.darwinsys.com/file/" -depends=('glibc' 'zlib') -options=('!libtool') -source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.05-zip64.patch - file-5.07-zip-detect.patch) -md5sums=('b8d1f9a8a644067bd0a703cebf3f4858' - '385f020467debd98bd2d8df6143f93d0' - 'bcbf2e152f38003a2736298bbd0f37f8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#\$(datadir)/misc#\$(datadir)#' configure - - # identify zip64 files - patch -Np1 -i ${srcdir}/file-5.05-zip64.patch - patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch - ./configure --prefix=/usr --datadir=/usr/share/file - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR=${pkgdir} install - install -dm755 ${pkgdir}/usr/share/misc - ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc - - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} diff --git a/testing/file/file-5.05-zip64.patch b/testing/file/file-5.05-zip64.patch deleted file mode 100644 index 2c9aede5f..000000000 --- a/testing/file/file-5.05-zip64.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur file-5.05-old//magic/Magdir/archive file-5.05/magic/Magdir/archive ---- file-5.05-old//magic/Magdir/archive 2011-01-08 06:24:25.000000000 +1000 -+++ file-5.05/magic/Magdir/archive 2011-01-19 14:37:47.766673895 +1000 -@@ -688,6 +688,7 @@ - >>4 byte 0x0b \b, at least v1.1 to extract - >>0x161 string WINZIP \b, WinZIP self-extracting - >>4 byte 0x14 \b, at least v2.0 to extract -+>>4 byte 0x2d \b, at least v3.0 to extract - - # Zoo archiver - 20 lelong 0xfdc4a7dc Zoo archive data diff --git a/testing/file/file-5.07-zip-detect.patch b/testing/file/file-5.07-zip-detect.patch deleted file mode 100644 index 3e8f128d8..000000000 --- a/testing/file/file-5.07-zip-detect.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- file-5.07/magic/Magdir/archive.old 2011-04-23 17:02:48.000000000 +0200 -+++ file-5.07/magic/Magdir/archive 2011-05-15 10:14:44.509271579 +0200 -@@ -654,6 +654,10 @@ - >>>>78 string -template Template - !:mime application/vnd.oasis.opendocument.image-template - -+>26 byte x Zip archive data -+ -+ -+ - # StarView Metafile - # From Pierre Ducroquet <pinaraf@pinaraf.info> - 0 string VCLMTF StarView MetaFile diff --git a/testing/gdl/PKGBUILD b/testing/gdl/PKGBUILD deleted file mode 100644 index a20a92c9b..000000000 --- a/testing/gdl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 124671 2011-05-23 20:42:08Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gdl -pkgver=3.0.2 -pkgrel=1 -pkgdesc="GNOME Docking Library" -arch=(i686 x86_64) -license=('GPL') -url="http://www.gnome.org/" -depends=('gtk3') -makedepends=('pkgconfig' 'intltool' 'gobject-introspection') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b4a0e7539a1133afca1b370818373fb8dcf29b50f12edbfaf6c1d5560977a308') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gdm/2.91_fix_external_program_directories.patch b/testing/gdm/2.91_fix_external_program_directories.patch deleted file mode 100644 index 912b5cdae..000000000 --- a/testing/gdm/2.91_fix_external_program_directories.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nur gdm-2.91.91.orig/daemon/gdm-server.c gdm-2.91.91/daemon/gdm-server.c ---- gdm-2.91.91.orig/daemon/gdm-server.c 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/daemon/gdm-server.c 2011-02-27 16:56:51.283347074 -0800 -@@ -131,7 +131,7 @@ - g_return_val_if_fail (GDM_IS_SERVER (server), NULL); - - error = NULL; -- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", -+ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s", - server->priv->display_name); - - g_debug ("GdmServer: Running helper %s", command); -diff -Nur gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in ---- gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-26 08:43:28.700009251 -0800 -@@ -1,8 +1,8 @@ - [Desktop Entry] - Type=Application - _Name=GNOME Settings Daemon --TryExec=@LIBEXECDIR@/gnome-settings-daemon --Exec=@LIBEXECDIR@/gnome-settings-daemon -+TryExec=/usr/bin/gnome-settings-daemon -+Exec=/usr/bin/gnome-settings-daemon - OnlyShowIn=GNOME; - X-GNOME-Autostart-Phase=Initialization - X-GNOME-Autostart-Notify=true -diff -Nur gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in ---- gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-26 08:44:06.810009153 -0800 -@@ -1,5 +1,5 @@ - [Desktop Entry] - Type=Application - _Name=PolicyKit Authentication Agent --Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1 -+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 - OnlyShowIn=GNOME; -diff -Nur gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c ---- gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c 2011-02-26 08:45:01.946675918 -0800 -@@ -131,7 +131,7 @@ - ret = FALSE; - - error = NULL; -- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); -+ g_spawn_command_line_async ("/usr/bin/gnome-settings-daemon", &error); - if (error != NULL) { - g_warning ("Error starting settings daemon: %s", error->message); - g_error_free (error); diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD deleted file mode 100644 index a5768c9ec..000000000 --- a/testing/gdm/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 124668 2011-05-23 20:39:21Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=gdm -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Gnome Display Manager (a reimplementation of xdm)" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org" -backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf') -groups=('gnome-extra') -options=('!libtool') -depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb') -makedepends=('intltool' 'gnome-doc-utils' 'xorg-server') -conflicts=('fast-user-switch-applet') -replaces=('fast-user-switch-applet') -install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - 2.91_fix_external_program_directories.patch - gdm-vt-allocation-hack.patch - gdm.pam - gdm-autologin.pam - gdm) -sha256sums=('3e0d44d551230c02a00ce27e4d98a5ebd54aac81520949076ad3111658eb2a05' - '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1' - '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' - 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' - '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5' - '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch" - patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \ - --with-at-spi-registryd-directory=/usr/lib/at-spi \ - --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas - rm -r "${pkgdir}/etc/gconf/schemas/" - - install -m644 "${srcdir}/gdm.pam" "${pkgdir}/etc/pam.d/gdm" - install -m644 "${srcdir}/gdm-autologin.pam" "${pkgdir}/etc/pam.d/gdm-autologin" - - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/" - - rmdir "${pkgdir}/var/gdm" - chmod 1770 "${pkgdir}/var/log/gdm" - rm -rf "${pkgdir}/var/run" -} diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch deleted file mode 100644 index 56fa5a151..000000000 --- a/testing/gdm/gdm-vt-allocation-hack.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c -index 39def47..03488fd 100644 ---- a/daemon/gdm-server.c -+++ b/daemon/gdm-server.c -@@ -33,6 +33,8 @@ - #include <grp.h> - #include <signal.h> - #include <sys/resource.h> -+#include <sys/ioctl.h> -+#include <sys/vt.h> - - #include <glib.h> - #include <glib/gi18n.h> -@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server) - return out; - } - -+#ifndef O_NOCTTY -+# define O_NOCTTY 0 -+#endif -+ -+static int -+open_vt (int vtno) -+{ -+ char *vtname; -+ int fd; -+ -+ vtname = g_strdup_printf ("/dev/tty%d", vtno); -+ -+ do { -+ errno = 0; -+ fd = open (vtname, O_RDWR | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ g_free (vtname); -+ return fd; -+} -+ -+static gint -+find_first_probably_free_vt (void) -+{ -+ int fd, fdv; -+ int vtno; -+ unsigned short vtmask; -+ struct vt_stat vtstat; -+ guint v_state; -+ -+ fdv = -1; -+ -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) { -+ v_state = vtstat.v_state; -+ } else { -+ close (fd); -+ v_state = 0; -+ fd = -1; -+ } -+ } else { -+ v_state = 0; -+ } -+ -+ if (fd < 0) { -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) -+ v_state = vtstat.v_state; -+ } -+ } -+ -+ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) { -+ /* Is this console in use? */ -+ if (v_state & vtmask) -+ continue; -+ -+ /* No, try to open it */ -+ fdv = open_vt (vtno); -+ if (fdv >= 0) -+ break; -+ -+ /* If we're here, kernel indicated that the console was free, -+ * but we failed to open it. Just go on to higher VTs. */ -+ } -+ -+ if (fdv >= 0) -+ close (fdv); -+ else -+ vtno = -1; -+ -+ if (fd >= 0) -+ close (fd); -+ -+ return vtno; -+} -+ - char * - gdm_server_get_display_device (GdmServer *server) - { -@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server, - - if (vtarg != NULL && ! gotvtarg) { - argv[len++] = g_strdup (vtarg); -+ } else if (!query_in_arglist && !gotvtarg) { -+ gint vtnum = find_first_probably_free_vt (); -+ -+ if (vtnum > 0) -+ argv [len++] = g_strdup_printf ("vt%d", vtnum); - } - - argv[len++] = NULL; diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install deleted file mode 100644 index 6cd981d77..000000000 --- a/testing/gdm/gdm.install +++ /dev/null @@ -1,27 +0,0 @@ -pkgname=gdm - -post_install() { - getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm - getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm - passwd -l gdm > /dev/null - chown -R gdm:gdm /var/lib/gdm > /dev/null - - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gconfpkg --install ${pkgname} -} - -pre_remove() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - getent passwd gdm >/dev/null 2>&1 && userdel gdm - getent group gdm >/dev/null 2>&1 && groupdel gdm -} diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam deleted file mode 100644 index 655299cb7..000000000 --- a/testing/gdm/gdm.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -auth optional pam_gnome_keyring.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start -password required pam_unix.so diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD deleted file mode 100644 index ca799b5ba..000000000 --- a/testing/glib-networking/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124675 2011-05-23 20:43:54Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -pkgname=glib-networking -pkgver=2.28.7 -pkgrel=1 -pkgdesc="Network-related giomodules for glib" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas') -makedepends=('intltool') -options=('!libtool') -install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/glib-networking --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install deleted file mode 100644 index 595f1c75b..000000000 --- a/testing/glib-networking/glib-networking.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD deleted file mode 100644 index 24bd5dfe2..000000000 --- a/testing/glib2/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 124444 2011-05-21 07:53:58Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=glib2 -pkgver=2.28.7 -pkgrel=1 -pkgdesc="Common C routines used by GTK+ and other libs" -url="http://www.gtk.org/" -arch=(i686 x86_64) -license=('LGPL') -depends=('pcre>=8.02') -makedepends=('pkgconfig' 'python2') -options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2 - glib2.sh - glib2.csh) -sha256sums=('0e1b3816a8934371d4ea2313dfbe25d10d16c950f8d02e0a7879ae10d91b1631' - '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' - '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') - -build() { - cd "${srcdir}/glib-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-pcre=system \ - --disable-fam - make -} - -package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" - install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" - - for _i in "${pkgdir}/etc/bash_completion.d/"*; do - chmod -x "${_i}" - done -} diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh deleted file mode 100644 index 7aa3a2ffa..000000000 --- a/testing/glib2/glib2.csh +++ /dev/null @@ -1 +0,0 @@ -setenv G_BROKEN_FILENAMES 1 diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh deleted file mode 100644 index 96a056e1e..000000000 --- a/testing/glib2/glib2.sh +++ /dev/null @@ -1 +0,0 @@ -export G_BROKEN_FILENAMES=1 diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD deleted file mode 100644 index c75fc2c4a..000000000 --- a/testing/gnome-control-center/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 124765 2011-05-24 09:14:06Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-control-center -pkgver=3.0.2 -pkgrel=1 -pkgdesc="The Control Center for GNOME" -arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5') -optdepends=('mesa-demos: provides glxinfo for graphics information' - 'apg: adds password generation for user accounts') -makedepends=('gnome-doc-utils' 'intltool' 'networkmanager') -url="http://www.gnome.org" -groups=('gnome') -install=gnome-control-center.install -license=('GPL') -options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-update-mimedb - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} - diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install deleted file mode 100644 index eb703319f..000000000 --- a/testing/gnome-control-center/gnome-control-center.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=gnome-control-center - -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD deleted file mode 100644 index 65002fb58..000000000 --- a/testing/gnome-desktop/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124748 2011-05-24 07:38:40Z ibiru $ -# Maintainer: Jan de Groot <jan@archlinux.org> - -pkgname=gnome-desktop -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Library with common API for various GNOME modules" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('gsettings-desktop-schemas' 'startup-notification' 'gtk3') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --with-gnome-distributor="Arch Linux" \ - --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD deleted file mode 100644 index 853bcfe8a..000000000 --- a/testing/gnome-games/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 124637 2011-05-23 17:10:50Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-games -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Some Games for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed' 'pygobject') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') -provides=('glchess') -conflicts=('glchess') -options=('!emptydirs' '!libtool') -install=gnome-games.install -url="http://www.gnome.org" -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1b731d691806d89d411a6bfaaca05a441555adee2760b97bb80fb5ded8326cb1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-static \ - --with-scores-user=root --with-scores-group=games \ - --enable-introspection=yes - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - # Remove all scores, we generate them from postinstall - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas - - sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku -} diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install deleted file mode 100644 index 1f67c2e01..000000000 --- a/testing/gnome-games/gnome-games.install +++ /dev/null @@ -1,153 +0,0 @@ -pkgname=gnome-games -scores=(glines.Large.scores - glines.Medium.scores - glines.Small.scores - gnibbles.1.0.scores - gnibbles.1.1.scores - gnibbles.2.0.scores - gnibbles.2.1.scores - gnibbles.3.0.scores - gnibbles.3.1.scores - gnibbles.4.0.scores - gnibbles.4.1.scores - gnobots2.classic_robots-safe.scores - gnobots2.classic_robots-super-safe.scores - gnobots2.classic_robots.scores - gnobots2.nightmare-safe.scores - gnobots2.nightmare-super-safe.scores - gnobots2.nightmare.scores - gnobots2.robots2-safe.scores - gnobots2.robots2-super-safe.scores - gnobots2.robots2.scores - gnobots2.robots2_easy-safe.scores - gnobots2.robots2_easy-super-safe.scores - gnobots2.robots2_easy.scores - gnobots2.robots_with_safe_teleport-safe.scores - gnobots2.robots_with_safe_teleport-super-safe.scores - gnobots2.robots_with_safe_teleport.scores - gnomine.Custom.scores - gnomine.Large.scores - gnomine.Medium.scores - gnomine.Small.scores - gnotravex.2x2.scores - gnotravex.3x3.scores - gnotravex.4x4.scores - gnotravex.5x5.scores - gnotravex.6x6.scores - gnotski.1.scores - gnotski.10.scores - gnotski.11.scores - gnotski.12.scores - gnotski.13.scores - gnotski.14.scores - gnotski.15.scores - gnotski.16.scores - gnotski.17.scores - gnotski.18.scores - gnotski.19.scores - gnotski.2.scores - gnotski.20.scores - gnotski.21.scores - gnotski.22.scores - gnotski.23.scores - gnotski.24.scores - gnotski.25.scores - gnotski.26.scores - gnotski.27.scores - gnotski.28.scores - gnotski.29.scores - gnotski.3.scores - gnotski.30.scores - gnotski.31.scores - gnotski.32.scores - gnotski.33.scores - gnotski.34.scores - gnotski.35.scores - gnotski.36.scores - gnotski.37.scores - gnotski.4.scores - gnotski.5.scores - gnotski.6.scores - gnotski.7.scores - gnotski.8.scores - gnotski.9.scores - gtali.Colors.scores - gtali.Regular.scores - mahjongg.bridges.scores - mahjongg.cloud.scores - mahjongg.confounding.scores - mahjongg.difficult.scores - mahjongg.dragon.scores - mahjongg.easy.scores - mahjongg.pyramid.scores - mahjongg.tictactoe.scores - mahjongg.ziggurat.scores - swell-foop.Large.scores - swell-foop.Medium.scores - swell-foop.Small.scores - quadrapassel.scores) - -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - - for sz in Large Medium Small; do - if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then - mv "opt/gnome/var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - elif [ -e "var/games/same-gnome.${sz}.scores" ]; then - mv "var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - fi - done - if [ -e "opt/gnome/var/games/gnometris.scores" ]; then - mv "opt/gnome/var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - elif [ -e "var/games/gnometris.scores" ]; then - mv "var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - fi - - for score in "${scores[@]}" ; do - if [ -e "var/games/${score}" ]; then - continue - fi - if [ -e "opt/gnome/var/games/${score}" ]; then - mv "opt/gnome/var/games/${score}" var/games/ - else - touch "var/games/${score}" - fi - chown root:games "var/games/${score}" - chmod 664 "var/games/${score}" - done -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} - - if [ -f usr/share/ggz/gnect-client.dsc ]; then - ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null - fi -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -f -t usr/share/icons/hicolor - - for score in "${scores[@]}" ; do - rm -f "var/games/${score}" - done -} diff --git a/testing/gnome-panel/PKGBUILD b/testing/gnome-panel/PKGBUILD deleted file mode 100644 index 2ecec8404..000000000 --- a/testing/gnome-panel/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 124734 2011-05-24 07:14:49Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-panel -pkgver=3.0.2 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL') -pkgdesc="The GNOME Panel" -url="http://www.gnome.org" -depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') -install=gnome-panel.install -groups=('gnome') -replaces=('gnome-panel-bonobo') -provides=("gnome-panel-bonobo=${pkgver}") -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-panel \ - --disable-scrollkeeper \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD deleted file mode 100644 index e731c944b..000000000 --- a/testing/gnome-power-manager/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 124602 2011-05-23 10:33:56Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-power-manager -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system." -arch=(i686 x86_64) -url="http://www.gnome.org/projects/gnome-power-manager/" -license=('GPL') -depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower' - 'libgnome-keyring' 'dconf') -makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center') -options=(!emptydirs) -install=gnome-power-manager.install -groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d0e00fdcfbc3bfb709f9ed82a14de325c51cf0bb86eeacefcda2dd7fcf6cbc2b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-power-manager \ - --disable-scrollkeeper \ - --with-dbus-services=/usr/share/dbus-1/services \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install deleted file mode 100644 index 4666938db..000000000 --- a/testing/gnome-power-manager/gnome-power-manager.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f usr/share/icons/gnome -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.92) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-power-manager - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD deleted file mode 100644 index aefd90ecd..000000000 --- a/testing/gnome-session/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124745 2011-05-24 07:33:54Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-session -pkgver=3.0.2 -pkgrel=1 -pkgdesc="The GNOME Session Handler" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('upower' 'gtk3' 'gconf' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'librsvg' - 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf') -makedepends=('intltool' 'mesa' 'xtrans') -options=('!emptydirs') -install=gnome-session.install -url="http://www.gnome.org" -groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install deleted file mode 100644 index 74cf4ed22..000000000 --- a/testing/gnome-session/gnome-session.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.91.3-3) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-session - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD deleted file mode 100644 index 25433294c..000000000 --- a/testing/gnome-settings-daemon/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 124605 2011-05-23 10:48:57Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-settings-daemon -pkgver=3.0.2 -pkgrel=1 -pkgdesc="The GNOME Settings daemon" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' - 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' - 'dconf' 'pulseaudio' 'pulseaudio-alsa') -makedepends=('intltool' 'gtk-doc') -options=('!emptydirs' '!libtool') -install=gnome-settings-daemon.install -url="http://www.gnome.org" -groups=('gnome') -replaces=(gnome-settings-daemon-pulse) -conflicts=(gnome-settings-daemon-pulse) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/bin --disable-static --enable-pulse - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-settings-daemon/gnome-settings-daemon.install b/testing/gnome-settings-daemon/gnome-settings-daemon.install deleted file mode 100644 index 483fb9450..000000000 --- a/testing/gnome-settings-daemon/gnome-settings-daemon.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-settings-daemon - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD deleted file mode 100644 index c25d0b22b..000000000 --- a/testing/gnome-system-monitor/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 124753 2011-05-24 07:53:49Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-system-monitor -pkgver=3.0.1 -pkgrel=1 -pkgdesc="A system monitor for GNOME" -arch=(i686 x86_64) -license=('GPL') -depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme') -makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool') -options=(!emptydirs) -url="http://www.gnome.org" -groups=('gnome-extra') -install=gnome-system-monitor.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0fe6a263875b23a35fd17d8952e666e17801cb68bb664d6ce8cabcfd9ac0f972') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install deleted file mode 100644 index e2957a570..000000000 --- a/testing/gnome-system-monitor/gnome-system-monitor.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=gnome-system-monitor - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD deleted file mode 100644 index 12b8c7d90..000000000 --- a/testing/gnome-themes-standard/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 124628 2011-05-23 14:48:53Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -pkgname=gnome-themes-standard -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Default themes for the GNOME desktop" -arch=('i686' 'x86_64') -url="http://abattis.org/cantarell/" -license=('GPL2') -depends=('cantarell-fonts' 'gtk3' 'gtk-engines') -makedepends=('intltool') -groups=('gnome') -replaces=('gnome-themes') -conflicts=('gnome-themes') -source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2) -sha256sums=('1def884063aa441860e20dd9925bb7c3b6f917bae44f77b1ada999940c463809') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD deleted file mode 100644 index d2b07cf23..000000000 --- a/testing/grep/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 124062 2011-05-16 11:49:29Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=grep -pkgver=2.8 -pkgrel=1 -pkgdesc="A string search utility" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/grep/grep.html" -groups=('base') -depends=('glibc' 'pcre' 'sh') -makedepends=('texinfo') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('b59003c42b330bdabd417e00d07102da') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --bindir=/bin --without-included-regex - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/grep/grep.install b/testing/grep/grep.install deleted file mode 100644 index 7cd31301f..000000000 --- a/testing/grep/grep.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=usr/share/info -filelist=(grep.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD deleted file mode 100644 index 0daea5d15..000000000 --- a/testing/gtk3/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 124599 2011-05-23 09:25:48Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gtk3 -pkgver=3.0.10 -pkgrel=1 -pkgdesc="The GTK+ Toolkit (v3)" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -install=gtk3.install -depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'krb5' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info') -makedepends=('gobject-introspection') -options=('!libtool' '!docs') -backup=(etc/gtk-3.0/settings.ini) -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 - settings.ini) -sha256sums=('a217ed31aed9843810eabb241239e0f2c5ca0e14bd91687cf4180b3e346abc30' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') - -build() { - cd "${srcdir}/gtk+-${pkgver}" - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-gtk2-dependency \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/gtk+-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini" -} diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install deleted file mode 100644 index cd8965d1f..000000000 --- a/testing/gtk3/gtk3.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - usr/bin/gtk-query-immodules-3.0 --update-cache - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache -} -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini deleted file mode 100644 index 039000d38..000000000 --- a/testing/gtk3/settings.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Settings] -gtk-fallback-icon-theme = gnome diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD deleted file mode 100644 index 7169a5364..000000000 --- a/testing/gvfs/PKGBUILD +++ /dev/null @@ -1,101 +0,0 @@ -# $Id: PKGBUILD 124634 2011-05-23 15:36:42Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gvfs -pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.8.2 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' - 'libarchive' 'gnome-disk-utility' 'pkgconfig' 'intltool' - 'libimobiledevice') -url="http://www.gnome.org" -options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gvfs \ - --with-bash-completion-dir=/etc/bash_completion.d - make -} - -package_gvfs() { - pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('libsoup-gnome' 'gnome-disk-utility' 'libcdio' 'fuse' 'libarchive') - optdepends=('gvfs-afc: AFC (mobile devices) support' - 'gvfs-smb: SMB/CIFS (Windows client) support' - 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' - 'gvfs-obexftp: ObexFTP (bluetooth) support') - install=gvfs.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -e 's/^am__append_3/#am__append_3/' \ - -e 's/^am__append_4/#am__append_4/' \ - -i monitor/Makefile - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,gphoto2,obexftp} - rm usr/share/gvfs/mounts/{smb,smb-browse,afc,gphoto2,obexftp}.mount - rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml - rm usr/share/GConf/gsettings/gvfs-smb.convert -} - -package_gvfs-smb() { - pkgdesc="SMB/CIFS (Windows client) backend for gvfs" - depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring') - install=gvfs-smb.install - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -m755 -d "${pkgdir}/usr/lib/gvfs" - install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" - - install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/" - install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" - - install -Dm644 org.gnome.system.smb.gschema.xml \ - "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" - install -Dm644 gvfs-smb.convert \ - "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert" -} - -package_gvfs-afc() { - pkgdesc="AFC (mobile devices) backend for gvfs" - depends=("gvfs=${pkgver}" 'libimobiledevice') - install=gvfs-module.install - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc" - install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount" - - cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc" - make DESTDIR="${pkgdir}" install -} - -package_gvfs-gphoto2() { - pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" - depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev') - install=gvfs-module.install - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2" - install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount" - - cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2" - make DESTDIR="${pkgdir}" install -} - -package_gvfs-obexftp() { - pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server') - install=gvfs-module.install - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp" - install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount" -} diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install deleted file mode 100644 index 09d1f11ec..000000000 --- a/testing/gvfs/gvfs-module.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install deleted file mode 100644 index 0b8783c7b..000000000 --- a/testing/gvfs/gvfs-smb.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install deleted file mode 100644 index 9458b1513..000000000 --- a/testing/gvfs/gvfs.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD new file mode 100644 index 000000000..c26ddfb00 --- /dev/null +++ b/testing/less/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 125524 2011-05-26 14:15:10Z stephane $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=less +pkgver=443 +pkgrel=2 +pkgdesc="A terminal based program for viewing text files" +license=('GPL3') +arch=('i686' 'x86_64') +url="http://www.greenwoodsoftware.com/less" +groups=('base') +depends=('ncurses' 'pcre') +source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('47db098fb3cdaf847b3c4be05ee954fc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}"/usr install + install -dm755 "${pkgdir}"/bin + mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin +} diff --git a/testing/less/zless b/testing/less/zless new file mode 100644 index 000000000..93d560bc5 --- /dev/null +++ b/testing/less/zless @@ -0,0 +1,9 @@ +#!/bin/sh + +: ${PAGER=less} +export PAGER + +PATH="/usr/bin:$PATH" +export PATH + +exec zmore ${1+"$@"} diff --git a/testing/libgweather/01_gettext_not_xml.patch b/testing/libgweather/01_gettext_not_xml.patch deleted file mode 100644 index d5f57305e..000000000 --- a/testing/libgweather/01_gettext_not_xml.patch +++ /dev/null @@ -1,527 +0,0 @@ -only in patch2: -unchanged: -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/configure.in libgweather-2.27.91.new/configure.in ---- libgweather-2.27.91/configure.in 2009-08-25 23:56:58.000000000 +1000 -+++ libgweather-2.27.91.new/configure.in 2009-08-26 11:54:52.000000000 +1000 -@@ -40,6 +40,10 @@ - AM_MAINTAINER_MODE - GNOME_MAINTAINER_MODE_DEFINES - -+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations -+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile]) -+IT_PO_SUBDIR([po-locations]) -+ - IT_PROG_INTLTOOL([0.40.3]) - PKG_PROG_PKG_CONFIG([0.19]) - -@@ -50,13 +54,6 @@ - AM_PROG_LIBTOOL - AC_PATH_PROG(GCONFTOOL, gconftool-2) - --AC_ARG_ENABLE(all-translations-in-one-xml, -- [AC_HELP_STRING([--enable-all-translations-in-one-xml], -- [Put all translations in a big Locations.xml file (slow to parse)])], -- [enable_big_xml=yes], -- [enable_big_xml=no]) --AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes") -- - AC_ARG_ENABLE(locations-compression, - [AC_HELP_STRING([--enable-locations-compression], - [Compress Locations.xml files])], -@@ -253,7 +250,7 @@ - Makefile - doc/Makefile - po/Makefile.in --po-locations/Makefile -+po-locations/Makefile.in - libgweather/Makefile - libgweather/gweather.pc - libgweather/gweather-uninstalled.pc -@@ -261,12 +258,6 @@ - python/Makefile - ]) - --if test "x$enable_big_xml" = "xyes"; then -- LOCATIONS_XML_TRANSLATIONS="one big file" --else -- LOCATIONS_XML_TRANSLATIONS="one file per translation" --fi -- - dnl *************************************************************************** - dnl *** Display Summary *** - dnl *************************************************************************** -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/data/Makefile.am libgweather-2.27.91.new/data/Makefile.am ---- libgweather-2.27.91/data/Makefile.am 2009-07-22 03:01:11.000000000 +1000 -+++ libgweather-2.27.91.new/data/Makefile.am 2009-08-26 11:57:46.000000000 +1000 -@@ -4,55 +4,23 @@ - libgweatherlocationsdir = $(pkgdatadir) - libgweatherlocations_in_files = Locations.xml.in - --if USE_ONE_BIG_XML -- --LOCATIONS_STAMP = -- --libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) -- --%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) -- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ -- fi -- --else # USE_ONE_BIG_XML -- - LOCATIONS_STAMP = stamp-Locations.xml - --PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi) -- - # Helper variable --libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml) -- --libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT) -+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) - - # We need this step so that we merge all the make Locations.xy.xml destinations - # into one unique destination. This makes -j2 work. (Else, we end up with - # multiple and conflicting calls to intltool-merge) - $(libgweatherlocations_DATA): $(LOCATIONS_STAMP) - --$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile -- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \ -- for pofile in $(PO_LOCATIONS); do \ -- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \ -- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \ -- rm -f $$locale/$(libgweatherlocations_data); \ -- test -d $$locale && rmdir $$locale; \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force Locations.$$locale.xml; \ -- fi; \ -- done && \ -- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \ -- rm -f C/$(libgweatherlocations_data) && \ -+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile -+ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) && \ -+ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \ -+ rm -f C/$(libgweatherlocations_DATA) && \ - test -d C && rmdir C && \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force Locations.xml; \ -- fi && \ - touch $@ - --endif # USE_ONE_BIG_XML -- - check: - xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in - $(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-location.c libgweather-2.27.91.new/libgweather/gweather-location.c ---- libgweather-2.27.91/libgweather/gweather-location.c 2009-04-20 03:41:11.000000000 +1000 -+++ libgweather-2.27.91.new/libgweather/gweather-location.c 2009-08-26 11:54:52.000000000 +1000 -@@ -22,11 +22,14 @@ - #include <config.h> - #endif - -+#include "config.h" -+ - #include <string.h> - #include <math.h> - #include <locale.h> - #include <gtk/gtk.h> - #include <libxml/xmlreader.h> -+#include <libintl.h> - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE - #include "gweather-location.h" -@@ -184,10 +187,20 @@ - - tagname = (const char *) xmlTextReaderConstName (parser->xml); - if (!strcmp (tagname, "name") && !loc->name) { -- value = gweather_parser_get_localized_value (parser); -+ char *context = NULL; -+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); -+ -+ value = gweather_parser_get_value (parser); - if (!value) - goto error_out; -- loc->name = g_strdup (value); -+ -+ if (context != NULL) { -+ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value)); -+ xmlFree (context); -+ } -+ else -+ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value)); -+ - xmlFree (value); - normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); - loc->sort_name = g_utf8_casefold (normalized, -1); -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-timezone.c libgweather-2.27.91.new/libgweather/gweather-timezone.c ---- libgweather-2.27.91/libgweather/gweather-timezone.c 2009-08-12 19:00:52.000000000 +1000 -+++ libgweather-2.27.91.new/libgweather/gweather-timezone.c 2009-08-26 11:54:52.000000000 +1000 -@@ -23,6 +23,7 @@ - #endif - - #include <string.h> -+#include <libintl.h> - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE - #include "gweather-timezone.h" -@@ -152,7 +153,7 @@ - parse_timezone (GWeatherParser *parser) - { - GWeatherTimezone *zone = NULL; -- char *id = NULL, *name = NULL; -+ char *id = NULL, *name = NULL, *context = NULL; - int offset = 0, dst_offset = 0; - gboolean has_dst = FALSE; - -@@ -175,27 +176,34 @@ - continue; - } - -- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) -- name = gweather_parser_get_localized_value (parser); -+ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) { -+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); -+ name = gweather_parser_get_value (parser); -+ } - else { - if (xmlTextReaderNext (parser->xml) != 1) - break; - } - } - } -- -+ - if (parse_tzdata (id, parser->year_start, parser->year_end, - &offset, &has_dst, &dst_offset)) { - zone = g_slice_new0 (GWeatherTimezone); - zone->ref_count = 1; - zone->id = g_strdup (id); -- zone->name = g_strdup (name); -+ if (context != NULL) -+ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name)); -+ else -+ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name)); - zone->offset = offset; - zone->has_dst = has_dst; - zone->dst_offset = dst_offset; - } - - xmlFree (id); -+ if (context) -+ xmlFree (context); - if (name) - xmlFree (name); - -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/LINGUAS libgweather-2.27.91.new/po-locations/LINGUAS ---- libgweather-2.27.91/po-locations/LINGUAS 1970-01-01 10:00:00.000000000 +1000 -+++ libgweather-2.27.91.new/po-locations/LINGUAS 2009-08-26 11:54:52.000000000 +1000 -@@ -0,0 +1,78 @@ -+ang -+ar -+as -+az -+be -+be@latin -+bg -+bn_IN -+bn -+bs -+ca -+cs -+cy -+da -+de -+dz -+el -+en_CA -+en_GB -+es -+et -+eu -+fa -+fi -+fr -+ga -+gl -+gu -+he -+hi -+hr -+hu -+id -+it -+ja -+ka -+kn -+ko -+ku -+ky -+lt -+lv -+mai -+mg -+mk -+ml -+mn -+mr -+ms -+nb -+ne -+nl -+nn -+oc -+or -+pa -+pl -+pt_BR -+pt -+ro -+ru -+rw -+si -+sk -+sl -+sq -+sr@latin -+sr -+sv -+ta -+te -+th -+tr -+uk -+vi -+zh_CN -+zh_HK -+zh_TW -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/Makefile.in.in libgweather-2.27.91.new/po-locations/Makefile.in.in ---- libgweather-2.27.91/po-locations/Makefile.in.in 1970-01-01 10:00:00.000000000 +1000 -+++ libgweather-2.27.91.new/po-locations/Makefile.in.in 2009-08-26 11:54:52.000000000 +1000 -@@ -0,0 +1,217 @@ -+# Makefile for program source directory in GNU NLS utilities package. -+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> -+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com> -+# -+# This file may be copied and used freely without restrictions. It may -+# be used in projects which are not available under a GNU Public License, -+# but which still want to provide support for the GNU gettext functionality. -+# -+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE -+# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -+# -+# - Modified by jacob berkman <jacob@ximian.com> to install -+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -+# -+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool -+# -+# We have the following line for use by intltoolize: -+# INTLTOOL_MAKEFILE -+ -+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+ -+SHELL = /bin/sh -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+libdir = @libdir@ -+DATADIRNAME = @DATADIRNAME@ -+itlocaledir = $(prefix)/$(DATADIRNAME)/locale -+subdir = po-locations -+install_sh = @install_sh@ -+# Automake >= 1.8 provides @mkdir_p@. -+# Until it can be supposed, use the safe fallback: -+mkdir_p = $(install_sh) -d -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+ -+GMSGFMT = @GMSGFMT@ -+MSGFMT = @MSGFMT@ -+XGETTEXT = @XGETTEXT@ -+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot -+ -+ALL_LINGUAS = @ALL_LINGUAS@ -+ -+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) -+ -+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) -+ -+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) -+ -+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) -+ -+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS -+ -+POTFILES = \ -+# This comment gets stripped out -+ -+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) -+ -+.SUFFIXES: -+.SUFFIXES: .po .pox .gmo .mo .msg .cat -+ -+.po.pox: -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox -+ -+.po.mo: -+ $(MSGFMT) -o $@ $< -+ -+.po.gmo: -+ file=`echo $* | sed 's,.*/,,'`.gmo \ -+ && rm -f $$file && $(GMSGFMT) -o $$file $< -+ -+.po.cat: -+ sed -f ../intl/po2msg.sed < $< > $*.msg \ -+ && rm -f $@ && gencat $@ $*.msg -+ -+ -+all: all-@USE_NLS@ -+ -+all-yes: $(CATALOGS) -+all-no: -+ -+$(GETTEXT_PACKAGE).pot: $(POTFILES) -+ $(GENPOT) -+ -+install: install-data -+install-data: install-data-@USE_NLS@ -+install-data-no: all -+install-data-yes: all -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ -+ $(mkdir_p) $$dir; \ -+ if test -r $$lang.gmo; then \ -+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ -+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ -+ else \ -+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ -+ echo "installing $(srcdir)/$$lang.gmo as" \ -+ "$$dir/$(GETTEXT_PACKAGE).mo"; \ -+ fi; \ -+ if test -r $$lang.gmo.m; then \ -+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ -+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ -+ else \ -+ if test -r $(srcdir)/$$lang.gmo.m ; then \ -+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ -+ $$dir/$(GETTEXT_PACKAGE).mo.m; \ -+ echo "installing $(srcdir)/$$lang.gmo.m as" \ -+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ -+ else \ -+ true; \ -+ fi; \ -+ fi; \ -+ done -+ -+# Empty stubs to satisfy archaic automake needs -+dvi info tags TAGS ID: -+ -+# Define this as empty until I found a useful application. -+install-exec installcheck: -+ -+uninstall: -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ -+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ -+ done -+ -+check: all $(GETTEXT_PACKAGE).pot -+ rm -f missing notexist -+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m -+ if [ -r missing -o -r notexist ]; then \ -+ exit 1; \ -+ fi -+ -+mostlyclean: -+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp -+ rm -f .intltool-merge-cache -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile Makefile.in POTFILES stamp-it -+ rm -f *.mo *.msg *.cat *.cat.m *.gmo -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ rm -f Makefile.in.in -+ -+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: $(DISTFILES) -+ dists="$(DISTFILES)"; \ -+ extra_dists="$(EXTRA_DISTFILES)"; \ -+ for file in $$extra_dists; do \ -+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ -+ done; \ -+ for file in $$dists; do \ -+ test -f $$file || file="$(srcdir)/$$file"; \ -+ ln $$file $(distdir) 2> /dev/null \ -+ || cp -p $$file $(distdir); \ -+ done -+ -+update-po: Makefile -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ tmpdir=`pwd`; \ -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ echo "$$lang:"; \ -+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ -+ if $$result; then \ -+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ else \ -+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ -+ :; \ -+ else \ -+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ exit 1; \ -+ fi; \ -+ fi; \ -+ else \ -+ echo "msgmerge for $$lang.gmo failed!"; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ fi; \ -+ done -+ -+Makefile POTFILES: stamp-it -+ @if test ! -f $@; then \ -+ rm -f stamp-it; \ -+ $(MAKE) stamp-it; \ -+ fi -+ -+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in -+ cd $(top_builddir) \ -+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ -+ $(SHELL) ./config.status -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/POTFILES.in libgweather-2.27.91.new/po-locations/POTFILES.in ---- libgweather-2.27.91/po-locations/POTFILES.in 1970-01-01 10:00:00.000000000 +1000 -+++ libgweather-2.27.91.new/po-locations/POTFILES.in 2009-08-26 11:54:52.000000000 +1000 -@@ -0,0 +1,4 @@ -+# This list should contain *only* data/Locations.xml.in. -+# Everything else should be in POTFILES.skip. -+[encoding:UTF-8] -+data/Locations.xml.in diff --git a/testing/libgweather/PKGBUILD b/testing/libgweather/PKGBUILD deleted file mode 100644 index f8c1e71c4..000000000 --- a/testing/libgweather/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 124751 2011-05-24 07:48:30Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgweather -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Provides access to weather information from the net" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme') -makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org/" -install=libgweather.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - gettext-not-xml.patch) -sha256sums=('9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c' - 'f21d55ab7916a50cad10d1c0bb3785a262e8ad8f35b9fb4c02ae23f1b0783727') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/gettext-not-xml.patch" - gtkdocize - autoreconf -fi - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-locations-compression - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgweather ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/libgweather/gettext-not-xml.patch b/testing/libgweather/gettext-not-xml.patch deleted file mode 100644 index 4fd2e3aa6..000000000 --- a/testing/libgweather/gettext-not-xml.patch +++ /dev/null @@ -1,533 +0,0 @@ -diff -up libgweather-2.91.0/configure.ac.gettext libgweather-2.91.0/configure.ac ---- libgweather-2.91.0/configure.ac.gettext 2010-10-04 18:08:07.000000000 -0400 -+++ libgweather-2.91.0/configure.ac 2011-01-30 13:51:19.615635059 -0500 -@@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0 - AM_MAINTAINER_MODE - GNOME_MAINTAINER_MODE_DEFINES - -+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations -+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile]) -+IT_PO_SUBDIR([po-locations]) -+ - IT_PROG_INTLTOOL([0.40.3]) - PKG_PROG_PKG_CONFIG([0.19]) - -@@ -50,13 +54,6 @@ AC_STDC_HEADERS - AM_PROG_LIBTOOL - AC_PATH_PROG(GCONFTOOL, gconftool-2) - --AC_ARG_ENABLE(all-translations-in-one-xml, -- [AC_HELP_STRING([--enable-all-translations-in-one-xml], -- [Put all translations in a big Locations.xml file (slow to parse)])], -- [enable_big_xml=yes], -- [enable_big_xml=no]) --AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes") -- - AC_ARG_ENABLE(locations-compression, - [AC_HELP_STRING([--enable-locations-compression], - [Compress Locations.xml files])], -@@ -236,7 +233,7 @@ AC_OUTPUT([ - Makefile - doc/Makefile - po/Makefile.in --po-locations/Makefile -+po-locations/Makefile.in - libgweather/Makefile - libgweather/gweather-3.0.pc - libgweather/gweather-3.0-uninstalled.pc -@@ -244,12 +241,6 @@ data/Makefile - icons/Makefile - ]) - --if test "x$enable_big_xml" = "xyes"; then -- LOCATIONS_XML_TRANSLATIONS="one big file" --else -- LOCATIONS_XML_TRANSLATIONS="one file per translation" --fi -- - dnl *************************************************************************** - dnl *** Display Summary *** - dnl *************************************************************************** -@@ -260,6 +251,4 @@ libgweather-$VERSION configure summary: - Source code location: ${srcdir} - Compiler: ${CC} - Introspection support: ${found_introspection} -- Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS} -- Locations.xml compression: ${enable_locations_compression} - " >&2 -diff -up libgweather-2.91.0/data/Makefile.am.gettext libgweather-2.91.0/data/Makefile.am ---- libgweather-2.91.0/data/Makefile.am.gettext 2010-10-04 18:07:31.000000000 -0400 -+++ libgweather-2.91.0/data/Makefile.am 2011-01-30 13:53:12.581466339 -0500 -@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd - libgweatherlocationsdir = $(pkgdatadir) - libgweatherlocations_in_files = Locations.xml.in - --if USE_ONE_BIG_XML -- --LOCATIONS_STAMP = -- --libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) -- --%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) -- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ -- fi -- --else # USE_ONE_BIG_XML -- - LOCATIONS_STAMP = stamp-Locations.xml - --PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi) -- - # Helper variable --libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml) -- --libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT) -+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) - - # We need this step so that we merge all the make Locations.xy.xml destinations - # into one unique destination. This makes -j2 work. (Else, we end up with - # multiple and conflicting calls to intltool-merge) - $(libgweatherlocations_DATA): $(LOCATIONS_STAMP) - --$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile -- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \ -- for pofile in $(PO_LOCATIONS); do \ -- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \ -- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \ -- rm -f $$locale/$(libgweatherlocations_data); \ -- test -d $$locale && rmdir $$locale; \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force Locations.$$locale.xml; \ -- fi; \ -- done && \ -- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \ -- rm -f C/$(libgweatherlocations_data) && \ -- test -d C && rmdir C && \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force Locations.xml; \ -- fi && \ -+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile -+ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) -+ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) -+ rm -f C/$(libgweatherlocations_DATA) -+ test -d C && rmdir C - touch $@ - --endif # USE_ONE_BIG_XML -- - ### Locations.xml.in rebuild - rebuild-locations: locationdb.sqlite update-locations.py - $(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new -diff -up libgweather-2.91.0/libgweather/gweather-location.c.gettext libgweather-2.91.0/libgweather/gweather-location.c ---- libgweather-2.91.0/libgweather/gweather-location.c.gettext 2010-02-09 07:28:03.000000000 -0500 -+++ libgweather-2.91.0/libgweather/gweather-location.c 2011-01-30 13:51:19.616635049 -0500 -@@ -22,11 +22,14 @@ - #include <config.h> - #endif - -+#include "config.h" -+ - #include <string.h> - #include <math.h> - #include <locale.h> - #include <gtk/gtk.h> - #include <libxml/xmlreader.h> -+#include <libintl.h> - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE - #include "gweather-location.h" -@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p - - tagname = (const char *) xmlTextReaderConstName (parser->xml); - if (!strcmp (tagname, "name") && !loc->name) { -- value = gweather_parser_get_localized_value (parser); -+ char *context = NULL; -+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); -+ -+ value = gweather_parser_get_value (parser); - if (!value) - goto error_out; -- loc->name = g_strdup (value); -+ -+ if (context != NULL) { -+ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value)); -+ xmlFree (context); -+ } -+ else -+ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value)); -+ - xmlFree (value); - normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); - loc->sort_name = g_utf8_casefold (normalized, -1); -diff -up libgweather-2.91.0/libgweather/gweather-timezone.c.gettext libgweather-2.91.0/libgweather/gweather-timezone.c ---- libgweather-2.91.0/libgweather/gweather-timezone.c.gettext 2010-02-09 07:28:03.000000000 -0500 -+++ libgweather-2.91.0/libgweather/gweather-timezone.c 2011-01-30 13:51:19.617635039 -0500 -@@ -23,6 +23,7 @@ - #endif - - #include <string.h> -+#include <libintl.h> - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE - #include "gweather-timezone.h" -@@ -152,7 +153,7 @@ static GWeatherTimezone * - parse_timezone (GWeatherParser *parser) - { - GWeatherTimezone *zone = NULL; -- char *id = NULL, *name = NULL; -+ char *id = NULL, *name = NULL, *context = NULL; - int offset = 0, dst_offset = 0; - gboolean has_dst = FALSE; - -@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser) - continue; - } - -- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) -- name = gweather_parser_get_localized_value (parser); -+ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) { -+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); -+ name = gweather_parser_get_value (parser); -+ } - else { - if (xmlTextReaderNext (parser->xml) != 1) - break; - } - } - } -- -+ - if (parse_tzdata (id, parser->year_start, parser->year_end, - &offset, &has_dst, &dst_offset)) { - zone = g_slice_new0 (GWeatherTimezone); - zone->ref_count = 1; - zone->id = g_strdup (id); -- zone->name = g_strdup (name); -+ if (context != NULL) -+ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name)); -+ else -+ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name)); - zone->offset = offset; - zone->has_dst = has_dst; - zone->dst_offset = dst_offset; - } - - xmlFree (id); -+ if (context) -+ xmlFree (context); - if (name) - xmlFree (name); - -diff -up libgweather-2.91.0/po-locations/LINGUAS.gettext libgweather-2.91.0/po-locations/LINGUAS ---- libgweather-2.91.0/po-locations/LINGUAS.gettext 2011-01-30 13:51:19.617635039 -0500 -+++ libgweather-2.91.0/po-locations/LINGUAS 2011-01-30 13:51:19.617635039 -0500 -@@ -0,0 +1,78 @@ -+ang -+ar -+as -+az -+be -+be@latin -+bg -+bn_IN -+bn -+bs -+ca -+cs -+cy -+da -+de -+dz -+el -+en_CA -+en_GB -+es -+et -+eu -+fa -+fi -+fr -+ga -+gl -+gu -+he -+hi -+hr -+hu -+id -+it -+ja -+ka -+kn -+ko -+ku -+ky -+lt -+lv -+mai -+mg -+mk -+ml -+mn -+mr -+ms -+nb -+ne -+nl -+nn -+oc -+or -+pa -+pl -+pt_BR -+pt -+ro -+ru -+rw -+si -+sk -+sl -+sq -+sr@latin -+sr -+sv -+ta -+te -+th -+tr -+uk -+vi -+zh_CN -+zh_HK -+zh_TW -diff -up libgweather-2.91.0/po-locations/Makefile.in.in.gettext libgweather-2.91.0/po-locations/Makefile.in.in ---- libgweather-2.91.0/po-locations/Makefile.in.in.gettext 2011-01-30 13:51:19.618635028 -0500 -+++ libgweather-2.91.0/po-locations/Makefile.in.in 2011-01-30 13:51:19.618635028 -0500 -@@ -0,0 +1,217 @@ -+# Makefile for program source directory in GNU NLS utilities package. -+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> -+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com> -+# -+# This file may be copied and used freely without restrictions. It may -+# be used in projects which are not available under a GNU Public License, -+# but which still want to provide support for the GNU gettext functionality. -+# -+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE -+# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -+# -+# - Modified by jacob berkman <jacob@ximian.com> to install -+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -+# -+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool -+# -+# We have the following line for use by intltoolize: -+# INTLTOOL_MAKEFILE -+ -+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+ -+SHELL = /bin/sh -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+libdir = @libdir@ -+DATADIRNAME = @DATADIRNAME@ -+itlocaledir = $(prefix)/$(DATADIRNAME)/locale -+subdir = po-locations -+install_sh = @install_sh@ -+# Automake >= 1.8 provides @mkdir_p@. -+# Until it can be supposed, use the safe fallback: -+mkdir_p = $(install_sh) -d -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+ -+GMSGFMT = @GMSGFMT@ -+MSGFMT = @MSGFMT@ -+XGETTEXT = @XGETTEXT@ -+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot -+ -+ALL_LINGUAS = @ALL_LINGUAS@ -+ -+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) -+ -+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) -+ -+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) -+ -+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) -+ -+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS -+ -+POTFILES = \ -+# This comment gets stripped out -+ -+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) -+ -+.SUFFIXES: -+.SUFFIXES: .po .pox .gmo .mo .msg .cat -+ -+.po.pox: -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox -+ -+.po.mo: -+ $(MSGFMT) -o $@ $< -+ -+.po.gmo: -+ file=`echo $* | sed 's,.*/,,'`.gmo \ -+ && rm -f $$file && $(GMSGFMT) -o $$file $< -+ -+.po.cat: -+ sed -f ../intl/po2msg.sed < $< > $*.msg \ -+ && rm -f $@ && gencat $@ $*.msg -+ -+ -+all: all-@USE_NLS@ -+ -+all-yes: $(CATALOGS) -+all-no: -+ -+$(GETTEXT_PACKAGE).pot: $(POTFILES) -+ $(GENPOT) -+ -+install: install-data -+install-data: install-data-@USE_NLS@ -+install-data-no: all -+install-data-yes: all -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ -+ $(mkdir_p) $$dir; \ -+ if test -r $$lang.gmo; then \ -+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ -+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ -+ else \ -+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ -+ echo "installing $(srcdir)/$$lang.gmo as" \ -+ "$$dir/$(GETTEXT_PACKAGE).mo"; \ -+ fi; \ -+ if test -r $$lang.gmo.m; then \ -+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ -+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ -+ else \ -+ if test -r $(srcdir)/$$lang.gmo.m ; then \ -+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ -+ $$dir/$(GETTEXT_PACKAGE).mo.m; \ -+ echo "installing $(srcdir)/$$lang.gmo.m as" \ -+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ -+ else \ -+ true; \ -+ fi; \ -+ fi; \ -+ done -+ -+# Empty stubs to satisfy archaic automake needs -+dvi info tags TAGS ID: -+ -+# Define this as empty until I found a useful application. -+install-exec installcheck: -+ -+uninstall: -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ -+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ -+ done -+ -+check: all $(GETTEXT_PACKAGE).pot -+ rm -f missing notexist -+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m -+ if [ -r missing -o -r notexist ]; then \ -+ exit 1; \ -+ fi -+ -+mostlyclean: -+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp -+ rm -f .intltool-merge-cache -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile Makefile.in POTFILES stamp-it -+ rm -f *.mo *.msg *.cat *.cat.m *.gmo -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ rm -f Makefile.in.in -+ -+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: $(DISTFILES) -+ dists="$(DISTFILES)"; \ -+ extra_dists="$(EXTRA_DISTFILES)"; \ -+ for file in $$extra_dists; do \ -+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ -+ done; \ -+ for file in $$dists; do \ -+ test -f $$file || file="$(srcdir)/$$file"; \ -+ ln $$file $(distdir) 2> /dev/null \ -+ || cp -p $$file $(distdir); \ -+ done -+ -+update-po: Makefile -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ tmpdir=`pwd`; \ -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ echo "$$lang:"; \ -+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ -+ if $$result; then \ -+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ else \ -+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ -+ :; \ -+ else \ -+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ exit 1; \ -+ fi; \ -+ fi; \ -+ else \ -+ echo "msgmerge for $$lang.gmo failed!"; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ fi; \ -+ done -+ -+Makefile POTFILES: stamp-it -+ @if test ! -f $@; then \ -+ rm -f stamp-it; \ -+ $(MAKE) stamp-it; \ -+ fi -+ -+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in -+ cd $(top_builddir) \ -+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ -+ $(SHELL) ./config.status -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -up libgweather-2.91.0/po-locations/POTFILES.in.gettext libgweather-2.91.0/po-locations/POTFILES.in ---- libgweather-2.91.0/po-locations/POTFILES.in.gettext 2011-01-30 13:51:19.618635028 -0500 -+++ libgweather-2.91.0/po-locations/POTFILES.in 2011-01-30 13:51:19.618635028 -0500 -@@ -0,0 +1,4 @@ -+# This list should contain *only* data/Locations.xml.in. -+# Everything else should be in POTFILES.skip. -+[encoding:UTF-8] -+data/Locations.xml.in diff --git a/testing/libgweather/libgweather.install b/testing/libgweather/libgweather.install deleted file mode 100644 index 7062d4167..000000000 --- a/testing/libgweather/libgweather.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=libgweather - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/gnome -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome -} diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD deleted file mode 100644 index 7c2aa02ae..000000000 --- a/testing/libsoup/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 124678 2011-05-23 20:49:40Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=libsoup -pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.34.2 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) -options=('!libtool' '!emptydirs') -sha256sums=('1d70edc48c309528635012269733739f9cd22548913125864318a65d1b6f1261') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package_libsoup() { - pkgdesc="GNOME HTTP Library - base library" - depends=('glib2' 'libxml2' 'glib-networking') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.* - rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" - rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4" - rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" -} - -package_libsoup-gnome() { - pkgdesc="GNOME HTTP Library - GNOME libraries" - depends=("libsoup=${pkgver}" 'libgnome-keyring') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}"/usr/lib/libsoup-2.4.* - rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc" - rm -rf "${pkgdir}/usr/include/libsoup-2.4" - rm -rf "${pkgdir}/usr/share" - rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib" -} diff --git a/testing/libwnck3/PKGBUILD b/testing/libwnck3/PKGBUILD deleted file mode 100644 index d37c740ec..000000000 --- a/testing/libwnck3/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 124742 2011-05-24 07:31:15Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=libwnck3 -_pkgbasename=libwnck -pkgver=3.0.2 -pkgrel=1 -pkgdesc="Window Navigator Construction Kit (GTK+3)" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('gtk3' 'startup-notification' 'libxres') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool') -url="http://www.gnome.org/" -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('4946b612c22d53238810d431f1b05c21f073f201edfd247ff74e2fa228618083') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules new file mode 100644 index 000000000..d2c167324 --- /dev/null +++ b/testing/lvm2/11-dm-initramfs.rules @@ -0,0 +1,3 @@ +# needed with new udev/mkinitcpio and as implemented in dracut: +# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> +SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff new file mode 100644 index 000000000..e75499e8e --- /dev/null +++ b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff @@ -0,0 +1,17 @@ +Do not issue an error message when unable to remove .cache on read-only fs. +=================================================================== +RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v +retrieving revision 1.49 +retrieving revision 1.50 +diff -u -r1.49 -r1.50 +--- LVM2/lib/filters/filter-persistent.c 2011/04/22 12:05:33 1.49 ++++ LVM2/lib/filters/filter-persistent.c 2011/05/12 12:42:48 1.50 +@@ -108,7 +108,7 @@ + log_very_verbose("Obtaining device list from " + "udev. Removing obolete %s.", + pf->file); +- if (unlink(pf->file) < 0) ++ if (unlink(pf->file) < 0 && errno != EROFS) + log_sys_error("unlink", pf->file); + } + return 1; diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD new file mode 100644 index 000000000..39e3b4561 --- /dev/null +++ b/testing/lvm2/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 125735 2011-05-28 17:12:36Z thomas $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgbase=lvm2 +pkgname=('lvm2' 'device-mapper') +pkgver=2.02.85 +_pkgverlvm=${pkgver} +pkgrel=2 +arch=('i686' 'x86_64') +url="http://sourceware.org/lvm2/" +license=('GPL2' 'LGPL2.1') +groups=('base') +conflicts=('mkinitcpio<0.5.99') +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz + lvm2_install + lvm2_hook + Be-quiet-on-removing-cache-on-read-only-fs.diff + 11-dm-initramfs.rules) +md5sums=('91785ca438e5ce679dd3a386b183d552' + '9fbe01c6e3fca4634b4a38ecdc2f562f' + 'cf05f2c7281e24269ea9dcc6b4e106ba' + '6db89da27928d2415a8e26cd0a842712' + '69e40679cd8b3658bfc619e48baae125') +sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' + '3f11db76189bcbc32d6b16a1b05ca3499e3e7b47' + '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440' + '6d7dd04be291d7537235704c816a701fd5beacc0' + 'f6a554eea9557c3c236df2943bb6e7e723945c41') + +build() { + cd "${srcdir}/LVM2.${_pkgverlvm}" + sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh + patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff + unset LDFLAGS + ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + --includedir=/usr/include --with-usrlibdir=/usr/lib \ + --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ + --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules + make +} + +package_device-mapper() { + pkgdesc="Device mapper userspace library and tools" + url="http://sourceware.org/dm/" + depends=('glibc' 'udev') + + cd "${srcdir}/LVM2.${_pkgverlvm}" + make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" +} + +package_lvm2() { + pkgdesc="Logical Volume Manager 2 utilities" + depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') + conflicts=('lvm' 'mkinitcpio<0.5.99') + backup=('etc/lvm/lvm.conf') + options=('!makeflags') + + cd "${srcdir}/LVM2.${_pkgverlvm}" + make DESTDIR="${pkgdir}" install_lvm2 + # install applib + cd liblvm + make DESTDIR="${pkgdir}" install + cd .. + # /etc directories + install -d "${pkgdir}"/etc/lvm/{archive,backup} + # mkinitcpio hook + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" +} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook new file mode 100644 index 000000000..86d2ea582 --- /dev/null +++ b/testing/lvm2/lvm2_hook @@ -0,0 +1,24 @@ +# vim:set ft=sh: +run_hook () +{ + /sbin/modprobe -q dm-mod >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + + # If the lvmwait= parameter has been specified on the command line + # wait for the device(s) before trying to activate the volume group(s) + if [ -n "${lvmwait}" ]; then + for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do + poll_device ${pvdev} ${rootdelay} + done + fi + + [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" + + msg "Activating logical volumes..." + [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit + eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET + fi +} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install new file mode 100644 index 000000000..0df69f81b --- /dev/null +++ b/testing/lvm2/lvm2_install @@ -0,0 +1,30 @@ +# vim: set ft=sh: + +install () +{ + MODULES=" dm-mod dm-snapshot dm-mirror" + BINARIES="" + FILES="" + SCRIPT="lvm2" + + add_dir "/dev/mapper" + add_binary "/sbin/lvm" + add_binary "/sbin/dmsetup" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for an LVM2 root device. + + The optional lvmwait= parameter followed by a comma-separated + list of device names can be given on the command line. + It will cause the hook to wait until all given devices exist + before trying to scan and activate any volume groups. +HELPEOF +} diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index b2c0db5bd..02506cbe2 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121126 2011-04-29 05:00:59Z andyrtr $ +# $Id: PKGBUILD 125601 2011-05-26 20:48:20Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -9,7 +9,7 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110429 + pkgver=7.10.99.git20110526 else pkgver=7.10.2 fi @@ -21,12 +21,16 @@ url="http://mesa3d.sourceforge.net" license=('custom') source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch mesa-7.5-mips-wmb.patch) if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0 - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0.tar.bz2') + # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7b3f40b70dc7dd602897d364011089047583c5d + source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-f7b3f40b70dc7dd602897d364011089047583c5d.tar.bz2') else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" ) fi +md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' + '3ec78f340f9387abd7a37b195e764cbf' + '67c87b77cc2236b52a3b47dad3fbb5d4' + 'ca2b343a0b8077fda38077c547b80fc3') build() { if [ "${_git}" = "true" ]; then diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD deleted file mode 100644 index 3f1c44be4..000000000 --- a/testing/nautilus/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 124892 2011-05-24 21:49:03Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=nautilus -pkgver=3.0.2 -pkgrel=1 -pkgdesc="The GNOME shell and file manager" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info' 'gnome-icon-theme') -makedepends=('intltool' 'gobject-introspection') -replaces=('gnome-volume-manager') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool' '!emptydirs') -install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/nautilus \ - --disable-nst-extension \ - --disable-update-mimedb \ - --disable-packagekit \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install deleted file mode 100644 index 631e38649..000000000 --- a/testing/nautilus/nautilus.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall nautilus - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD new file mode 100644 index 000000000..60394a46b --- /dev/null +++ b/testing/network-manager-applet/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 125653 2011-05-27 18:09:01Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Arjan Timmerman <arjan@archlinux.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Tor Krill <tor@krill.nu> +# Contributor: Will Rea <sillywilly@gmail.com> + +pkgname=network-manager-applet +pkgver=0.8.9997 +pkgrel=1 +pkgdesc="GNOME frontends to NetWorkmanager" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' + 'notification-daemon' 'libnotify' 'gnome-icon-theme' + 'mobile-broadband-provider-info' 'gconf') +makedepends=('intltool' 'gnome-bluetooth' 'gtk-doc') +optdepends=('gnome-bluetooth: for PAN/DUN support') +options=('!libtool') +install=network-manager-applet.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('1620e52bfdba18f3640e57a3d450e913ad73a6e529dd0bad895d4c07700018ab') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static \ + --disable-maintainer-mode + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/staging/ekiga/ekiga.install b/testing/network-manager-applet/network-manager-applet.install index b1d76a4a3..9922d12b2 100644 --- a/staging/ekiga/ekiga.install +++ b/testing/network-manager-applet/network-manager-applet.install @@ -1,12 +1,8 @@ -pkgname=ekiga +pkgname=network-manager-applet post_install() { usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor } post_upgrade() { @@ -18,5 +14,5 @@ pre_remove() { } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor } diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf new file mode 100644 index 000000000..c37b59680 --- /dev/null +++ b/testing/networkmanager/NetworkManager.conf @@ -0,0 +1,2 @@ +[main] +plugins=keyfile diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD new file mode 100644 index 000000000..ecfc88f0a --- /dev/null +++ b/testing/networkmanager/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 125645 2011-05-27 17:39:58Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinxu.org> +# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Tor Krill <tor@krill.nu> +# Contributor: Will Rea <sillywilly@gmail.com> +# Contributor: Valentine Sinitsyn <e_val@inbox.ru> + +pkgname=networkmanager +pkgver=0.8.9997 +pkgrel=1 +pkgdesc="Network Management daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') +makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc') +optdepends=('modemmanager: for modem management service' + 'dhclient: alternative DHCP/DHCPv6 client' + 'iptables: Connection sharing' + 'dnsmasq: Connection sharing' + 'bluez: Bluetooth support') +options=('!libtool') +backup=('etc/NetworkManager/NetworkManager.conf') +install=networkmanager.install +source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2 + NetworkManager.conf disable_set_hostname.patch) +sha256sums=('af2e08546cfcd51731be8f4d944b77876ba2eca93cf4f15509caf5572cac6596' + '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' + '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553') + +build() { + cd "${srcdir}/NetworkManager-${pkgver}" + + patch -Np1 -i "${srcdir}/disable_set_hostname.patch" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-distro=arch \ + --with-dhclient=/usr/sbin/dhclient \ + --with-dhcpcd=/sbin/dhcpcd \ + --with-iptables=/usr/sbin/iptables \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax + + make +} + +package() { + cd "${srcdir}/NetworkManager-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" + + rm -rf "${pkgdir}/var/run/" +} diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch new file mode 100644 index 000000000..6c9e2f6c6 --- /dev/null +++ b/testing/networkmanager/disable_set_hostname.patch @@ -0,0 +1,19 @@ +diff -Nur NetworkManager-0.8.2.orig/src/nm-policy.c NetworkManager-0.8.2/src/nm-policy.c +--- NetworkManager-0.8.2.orig/src/nm-policy.c 2010-11-03 12:58:42.000000000 -0700 ++++ NetworkManager-0.8.2/src/nm-policy.c 2010-11-23 06:22:32.436707081 -0800 +@@ -342,6 +342,7 @@ + return; + } + ++#if 0 + /* Try automatically determined hostname from the best device's IP config */ + if (!best4) + best4 = get_best_ip4_device (policy->manager, &best_req4); +@@ -396,6 +397,7 @@ + } + } + ++#endif + /* If no automatically-configured hostname, try using the hostname from + * when NM started up. + */ diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install new file mode 100644 index 000000000..de40c17ed --- /dev/null +++ b/testing/networkmanager/networkmanager.install @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG +ATTENTION: + /etc/NetworkManager/nm-system-settings.conf has been replaced + by /etc/NetworkManager/NetworkManager.conf. Make sure you move + any custom settings to the new config file. +MSG + true +} diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD deleted file mode 100644 index 63be526f7..000000000 --- a/testing/sqlite3/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 124333 2011-05-19 19:31:27Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgbase="sqlite3" -pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') -_amalgamationver=3070603 -_amalgamationver2=${_amalgamationver/00/} -_docver=3070600 -pkgver=${_amalgamationver2//0/.} -pkgrel=1 -pkgdesc="A C library that implements an SQL database engine" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.sqlite.org/" -makedepends=('tcl' 'readline>=6.0.00') -source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) - http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz - #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip - http://www.sqlite.org/sqlite-doc-${_docver}.zip - license.txt) -options=('!libtool' '!emptydirs') -md5sums=('7eb41eea5ffa5cbe359a48629084c425' - '1c9b9da6f98f1da2d8958254662c393c' - 'c1cdbc5544034d9012e421e75a5e4890') - -build() { - export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" - - # build sqlite - cd "$srcdir"/sqlite-autoconf-$_amalgamationver - ./configure --prefix=/usr \ - --disable-static - make - - # build the tcl extension - cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea - ./configure --prefix=/usr \ - --with-system-sqlite - make - -} - -package_sqlite3() { - - pkgdesc="A C library that implements an SQL database engine" - depends=('readline>=6.0.00') - conflicts=('sqlite') - replaces=('sqlite') - - cd ${srcdir}/sqlite-autoconf-$_amalgamationver - make DESTDIR=${pkgdir} install - - # license - install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt -} - -package_sqlite3-tcl() { - - pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" - depends=('sqlite3>=3.7.5') - - cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea - make DESTDIR=${pkgdir} install -} - -package_sqlite3-doc() { - pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" - #arch=('any') - not yet supported - - #cd ${srcdir}/sqlite-doc-${_amalgamationver} - cd ${srcdir}/sqlite-doc-${_docver} - mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} - cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ -} diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt deleted file mode 100644 index 118c5d5e6..000000000 --- a/testing/sqlite3/license.txt +++ /dev/null @@ -1,33 +0,0 @@ -SQLite Copyright -SQLite is in the -Public Domain - - -All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. - -The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. - -All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. -Obtaining An Explicit License To Use SQLite - -Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: -You are using SQLite in a jurisdiction that does not recognize the public domain. -You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. -You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. -Your legal department tells you that you have to purchase a license. - -If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. -Contributed Code - -In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: -The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. - -We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: -Hwaci -6200 Maple Cove Lane -Charlotte, NC 28269 -USA - -A template copyright release is available in PDF or HTML. You can use this release to make future changes. - -see http://www.sqlite.org/copyright.html
\ No newline at end of file diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD index acb78e0bf..0db5f45cf 100644 --- a/testing/udev/PKGBUILD +++ b/testing/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124345 2011-05-20 06:14:46Z tomegun $ +# $Id: PKGBUILD 125635 2011-05-27 11:47:52Z tomegun $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -6,7 +6,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=170 +pkgver=171 pkgrel=1 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" @@ -18,10 +18,13 @@ makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 80-drivers.rules 81-arch.rules - load-modules.sh) + load-modules.sh + static-audio-nodes-permissions.patch) build() { cd $srcdir/$pkgbase-$pkgver + # fix https://bugs.archlinux.org/task/24362 (will be in udev-172) + patch -Np1 -i ../static-audio-nodes-permissions.patch ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\ --disable-rule-generator @@ -96,7 +99,8 @@ package_udev-compat() { install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } -md5sums=('6e132d1a3b4dae24dafd2726c5cdd982' +md5sums=('bdf4617284be2ecac11767437417e209' '4427855146513a4703ab5c7eb8a0156e' 'd8725e64fd0ce6e784ae795fae424c0a' - 'f91fddc67609b45b244a624977c4247b') + 'f91fddc67609b45b244a624977c4247b' + '4f625aea95a5597afd8cdf189421f193') diff --git a/testing/udev/static-audio-nodes-permissions.patch b/testing/udev/static-audio-nodes-permissions.patch new file mode 100644 index 000000000..b1fc4f935 --- /dev/null +++ b/testing/udev/static-audio-nodes-permissions.patch @@ -0,0 +1,27 @@ +From 3e227830ad6494700e18ae03297e8fb833ff26bf Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay.sievers@vrfy.org> +Date: Fri, 27 May 2011 02:50:29 +0200 +Subject: [PATCH] rules: apply 'audio' group of the static snd/{seq,timer} + nodes + +--- + rules/rules.d/50-udev-default.rules | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules +index cd745ef..cacb533 100644 +--- a/rules/rules.d/50-udev-default.rules ++++ b/rules/rules.d/50-udev-default.rules +@@ -38,7 +38,8 @@ SUBSYSTEM=="graphics", GROUP="video" + SUBSYSTEM=="drm", GROUP="video" + + # sound +-SUBSYSTEM=="sound", GROUP="audio" ++SUBSYSTEM=="sound", GROUP="audio", \ ++ OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" + + # DVB (video) + SUBSYSTEM=="dvb", GROUP="video" +-- +1.7.5.3 + diff --git a/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules new file mode 100644 index 000000000..67e5580cc --- /dev/null +++ b/testing/xf86-input-wacom/70-wacom.rules @@ -0,0 +1,8 @@ +ACTION!="add|change", GOTO="wacom_end" + +# Match all wacom tablets with a serial ID starting with WACf +ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" +ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" + +LABEL="wacom_end" + diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD new file mode 100644 index 000000000..f1bf57b06 --- /dev/null +++ b/testing/xf86-input-wacom/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 124965 2011-05-25 13:01:43Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: M Rawash <mrawash@gmail.com> + +pkgname=xf86-input-wacom +pkgver=0.11.0 +pkgrel=1 +pkgdesc="X.Org Wacom tablet driver" +arch=('i686' 'x86_64') +url="http://linuxwacom.sourceforge.net/" +license=('GPL') +backup=('etc/X11/xorg.conf.d/50-wacom.conf') +depends=('libxi' 'libxrandr') +makedepends=('xorg-server-devel' 'libxext' 'libxi') +conflicts=('xorg-server<1.10.0') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + 70-wacom.rules) +md5sums=('e0f6182cf7fba19c13f3db7e0da1baf3' + '4d3665bb2ef8a8190734640dffa4c6f7') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d + make + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/lib/udev/rules.d" + install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/lib/udev/rules.d/" +} diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD new file mode 100644 index 000000000..c10416455 --- /dev/null +++ b/testing/xf86-video-ati/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 125569 2011-05-26 19:49:03Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=xf86-video-ati +pkgver=6.14.2 +pkgrel=1 +pkgdesc="X.org ati video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=(libpciaccess libdrm udev pixman ati-dri) +makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') +conflicts=('xorg-server<1.10.0') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +md5sums=('111ec4aef32a4298df7e38afa8bef373') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-dri + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make "DESTDIR=${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/xf86-video-ati/ati-fix-build-1.10.patch b/testing/xf86-video-ati/ati-fix-build-1.10.patch new file mode 100644 index 000000000..75980cbf3 --- /dev/null +++ b/testing/xf86-video-ati/ati-fix-build-1.10.patch @@ -0,0 +1,38 @@ +From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001 +From: Sedat Dilek <sedat.dilek@googlemail.com> +Date: Fri, 25 Feb 2011 21:48:14 +0100 +Subject: [PATCH] UMS: Fix build against xserver 1.10-rc3 + +This issue was introduced due to last minute backout of RandR-1.4 +in xserver 1.10-rc3. + +Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard. +See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>. + +Note: +The ddx needs a rebuild as the X video driver ABI changed to version 10.0. + +Reported-by: Alex Deucher <alexdeucher@gmail.com> +CC: Keith Packard <keithp@keithp.com> +Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> +--- + src/radeon_output.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/radeon_output.c b/src/radeon_output.c +index 15cef06..ccde346 100644 +--- a/src/radeon_output.c ++++ b/src/radeon_output.c +@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output) + xf86CrtcPtr crtc = output->crtc; + + if (crtc->enabled) { +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0) ++#ifdef RANDR_14_INTERFACE + xf86CrtcSetRec crtc_set_rec; + + crtc_set_rec.flags = (XF86CrtcSetMode | +-- +1.7.1 + + diff --git a/testing/xz/PKGBUILD b/testing/xz/PKGBUILD deleted file mode 100644 index e2c47b128..000000000 --- a/testing/xz/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 124452 2011-05-21 17:48:29Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> -# Contributor: François Charette <firmicus@gmx.net> - -pkgname=xz -pkgver=5.0.3 -pkgrel=1 -pkgdesc='Library and command line tools for XZ and LZMA compressed files' -arch=('i686' 'x86_64') -url='http://tukaani.org/xz/' -license=('GPL' 'LGPL' 'custom') -depends=('sh') -provides=('lzma' 'lzma-utils' 'xz-utils') -replaces=('lzma' 'lzma-utils' 'xz-utils') -conflicts=('lzma' 'lzma-utils' 'xz-utils') -options=('!libtool') -source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('fefe52f9ecd521de2a8ce38c21a27574') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-werror - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -d -m755 ${pkgdir}/usr/share/licenses/xz/ - ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/ - ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2 -} |
