diff options
495 files changed, 0 insertions, 42517 deletions
diff --git a/community-testing/clementine/PKGBUILD b/community-testing/clementine/PKGBUILD deleted file mode 100644 index eb089f8ec..000000000 --- a/community-testing/clementine/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 49329 2011-06-14 11:51:15Z 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=6 -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-testing/clementine/clementine-0.7.1-fix-devicekit.patch b/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch deleted file mode 100644 index 797a2c864..000000000 --- a/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-testing/clementine/clementine.install b/community-testing/clementine/clementine.install deleted file mode 100644 index 2d71a7563..000000000 --- a/community-testing/clementine/clementine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} diff --git a/community-testing/collectd/PKGBUILD b/community-testing/collectd/PKGBUILD deleted file mode 100644 index 668a9cec5..000000000 --- a/community-testing/collectd/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 49792 2011-06-21 05:03:51Z foutrelis $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Gerhard Brauer <gerhard.brauer@web.de> - -pkgname=collectd -pkgver=5.0.0 -pkgrel=6 -pkgdesc='Daemon which collects system performance statistics periodically' -arch=('i686' 'x86_64') -url='http://collectd.org/' -license=('GPL') -options=('!libtool') -backup=('etc/collectd.conf') - -optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' - 'libdbi: dbi plugin' - 'libesmtp: notify_email plugin' - 'libgcrypt: encryption and authentication for network plugin' - 'iptables: iptables plugin' - 'libmemcached: memcachec plugin' - 'libmysqlclient: mysql plugin' - 'iproute2: netlink plugin' - 'net-snmp: snmp plugin' - 'libnotify: notify_desktop plugin' - 'liboping: ping plugin' - 'libpcap: dns plugin' - 'perl: perl plugin' - 'postgresql-libs: postgresql plugin' - 'python2: python plugin' - 'rrdtool: rrdtool and rrdcached plugins' - 'lm_sensors: lm_sensors and sensors plugins' - 'libvirt: libvirt plugin' - 'libxml2: ascent and libvirt plugins' - 'xmms: xmms plugin' - 'yajl: curl_json plugin') - -makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached' - 'libmysqlclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping' - 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors' - 'libvirt' 'libxml2' 'xmms' 'yajl') - -depends=('libtool') - -source=("${url}files/$pkgname-$pkgver.tar.gz" - 'libnotify-0.7.patch' - 'yajl-2.x.patch' - 'rc.d') -sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7' - 'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337' - 'd3854c39c9596b4f6dcf67a9eb8decea4d17120d' - '0f441718d5519cb043b1130e5a1d0379078adbcc') - -install=install - -build() { - cd "$srcdir/$pkgname-$pkgver" - - unset LDFLAGS # or libperl not found - patch -p1 -i ../libnotify-0.7.patch - patch -p1 -i ../yajl-2.x.patch - sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-static=no \ - --with-python=/usr/bin/python2 - - # avoid -Werror with gcc 4.6 - sed -i '/^AM_CFLAGS/s/ -Werror//' src/Makefile - - make all -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -D -m 755 ../rc.d "$pkgdir/etc/rc.d/$pkgname" - install -D -m 644 contrib/collectd2html.pl "$pkgdir"/usr/share/collectd/collectd2html.pl -} diff --git a/community-testing/collectd/install b/community-testing/collectd/install deleted file mode 100644 index 54cc0e1b3..000000000 --- a/community-testing/collectd/install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - cat <<EOF -==> Customize your /etc/collectd.conf (you really want to). -==> Then start and stop the daemon using: /etc/rc.d/collectd -==> To see some result of collected data, use the Perl script: -==> /usr/share/collectd/collectd2html.pl -EOF -} diff --git a/community-testing/collectd/libnotify-0.7.patch b/community-testing/collectd/libnotify-0.7.patch deleted file mode 100644 index 5ea67047a..000000000 --- a/community-testing/collectd/libnotify-0.7.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/src/notify_desktop.c new/src/notify_desktop.c ---- old/src/notify_desktop.c 2011-03-07 23:50:24.096691200 +0100 -+++ new/src/notify_desktop.c 2011-03-07 23:52:35.486691201 +0100 -@@ -95,7 +95,7 @@ - : (NOTIF_WARNING == n->severity) ? "WARNING" - : (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN"); - -- notification = notify_notification_new (summary, n->message, NULL, NULL); -+ notification = notify_notification_new (summary, n->message, NULL); - if (NULL == notification) { - log_err ("Failed to create a new notification."); - return -1; diff --git a/community-testing/collectd/rc.d b/community-testing/collectd/rc.d deleted file mode 100644 index 442f2324a..000000000 --- a/community-testing/collectd/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=collectd -prog="/usr/sbin/collectdmon" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && $prog \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -reload) - stat_busy "Sending SIGHUP to $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community-testing/collectd/yajl-2.x.patch b/community-testing/collectd/yajl-2.x.patch deleted file mode 100644 index b90543dfe..000000000 --- a/community-testing/collectd/yajl-2.x.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- old/src/curl_json.c 2011-04-25 20:43:00.972938855 -0400 -+++ new/src/curl_json.c 2011-04-25 20:46:03.859938860 -0400 -@@ -98,8 +98,7 @@ - return (0); - - status = yajl_parse(db->yajl, (unsigned char *)buf, len); -- if ((status != yajl_status_ok) -- && (status != yajl_status_insufficient_data)) -+ if ((status != yajl_status_ok)) - { - unsigned char *msg = - yajl_get_error(db->yajl, /* verbose = */ 1, -@@ -130,7 +129,7 @@ - /* "number" may not be null terminated, so copy it into a buffer before - * parsing. */ - static int cj_cb_number (void *ctx, -- const char *number, unsigned int number_len) -+ const char *number, size_t number_len) - { - char buffer[number_len + 1]; - -@@ -159,7 +158,7 @@ - } /* int cj_cb_number */ - - static int cj_cb_map_key (void *ctx, const unsigned char *val, -- unsigned int len) -+ size_t len) - { - cj_t *db = (cj_t *)ctx; - c_avl_tree_t *tree; -@@ -187,7 +186,7 @@ - } - - static int cj_cb_string (void *ctx, const unsigned char *val, -- unsigned int len) -+ size_t len) - { - cj_t *db = (cj_t *)ctx; - char str[len + 1]; -@@ -697,7 +696,7 @@ - char *url; - yajl_handle yprev = db->yajl; - -- db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); -+ db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db); - if (db->yajl == NULL) - { - ERROR ("curl_json plugin: yajl_alloc failed."); -@@ -730,7 +729,7 @@ - return (-1); - } - -- status = yajl_parse_complete (db->yajl); -+ status = yajl_complete_parse (db->yajl); - if (status != yajl_status_ok) - { - unsigned char *errmsg; diff --git a/community-testing/darcs/PKGBUILD b/community-testing/darcs/PKGBUILD deleted file mode 100644 index d23e917a5..000000000 --- a/community-testing/darcs/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 116991 2011-03-27 10:10:32Z remy $ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Simo Leone <neotuli@gmail.com> - -pkgname=darcs -pkgver=2.5.2 -pkgrel=1.1 -pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics" -arch=(i686 x86_64) -url="http://darcs.net/" -license=('GPL') -depends=('curl' 'gmp' 'ncurses>=5.6-7') -makedepends=('ghc' 'haskell-tar<0.4' 'haskell-text<0.12' - 'haskell-hashed-storage<0.6' 'haskell-haskeline<0.7' - 'haskell-html<1.1' 'haskell-parsec<3.2' 'haskell-regex-compat<0.94') -source=("http://darcs.net/releases/$pkgname-$pkgver.tar.gz") -md5sums=('491b6ca01dec245a16112ad2c7e07dc1') - -build() { - cd $srcdir/$pkgname-$pkgver - runhaskell Setup.lhs configure --ghc -O --prefix=/usr \ - --disable-library-for-ghci --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup.lhs build -} - -check() { - cd ${srcdir}/$pkgname-$pkgver - runhaskell Setup.lhs test -} - -package() { - cd $srcdir/$pkgname-$pkgver - runhaskell Setup.lhs copy --destdir=$pkgdir - rm -r $pkgdir/usr/lib/ - chmod 755 $pkgdir/usr/share/man/man1/$pkgname.1 -} - diff --git a/community-testing/ekg2/PKGBUILD b/community-testing/ekg2/PKGBUILD deleted file mode 100644 index 77a930762..000000000 --- a/community-testing/ekg2/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $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-testing/freeradius/PKGBUILD b/community-testing/freeradius/PKGBUILD deleted file mode 100644 index 1b3d364f0..000000000 --- a/community-testing/freeradius/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 47452 2011-05-23 15:07:24Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jason R Begley (jayray@digitalgoat.com> - -pkgname=freeradius -pkgver=2.1.10 -pkgrel=7 -pkgdesc="The premier open source RADIUS server" -arch=('i686' 'x86_64') -url="http://www.freeradius.org/" -license=("GPL") -depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' \ - 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow') -optdepends=('libpcap' 'unixodbc' 'python2') -options=('!libtool' 'emptydirs' '!makeflags') -install=$pkgname.install -source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 \ - radiusd - krb5-build-fix.patch) -md5sums=('8ea2bd39460a06212decf2c14fdf3fb8' - 'f1a6530b1b69d2fa793aa45b2de379bb' - 'c6a61de7576933f59154a53bfc12a2d2') - -build() { - cd $srcdir/freeradius-server-$pkgver - export CFLAGS="$CFLAGS -fno-strict-aliasing" - sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in - patch -p1 <$srcdir/krb5-build-fix.patch - ./configure --with-system-libtool --with-system-libltdl \ - --prefix=/usr --enable-heimdal-krb5 \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --libdir=/usr/lib/freeradius - make -} - -package() { - cd $srcdir/freeradius-server-$pkgver - make install R=$pkgdir - install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd - chmod o+r $pkgdir/etc/raddb/* - mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default - rm -rf $pkgdir/var/run -} diff --git a/community-testing/freeradius/freeradius.install b/community-testing/freeradius/freeradius.install deleted file mode 100644 index e50aa403d..000000000 --- a/community-testing/freeradius/freeradius.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - groupadd radiusd - useradd -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd - - touch /var/log/radius/radius.log - chown -R radiusd.radiusd /var/log/radius/radius.log - - [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb - - /bin/true -} - -pre_remove() { - /etc/rc.d/radiusd stop - /bin/true -} - -post_remove() { - userdel radiusd - groupdel radiusd - /bin/true -} diff --git a/community-testing/freeradius/krb5-build-fix.patch b/community-testing/freeradius/krb5-build-fix.patch deleted file mode 100644 index 11dae7090..000000000 --- a/community-testing/freeradius/krb5-build-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c ---- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000 -+++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000 -@@ -375,7 +375,7 @@ - * Heimdal krb5 verification - */ - radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n", -- *userP->name.name_string.val, -+ "-" /* *userP->name.name_string.val*/, - userP->realm); - - krb5_cc_default(context, &id); -@@ -390,7 +390,7 @@ - - radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )", - error_message(ret), -- *userP->name.name_string.val, -+ "-" /* *userP->name.name_string.val */, - userP->realm); - - return RLM_MODULE_REJECT; diff --git a/community-testing/freeradius/radiusd b/community-testing/freeradius/radiusd deleted file mode 100755 index bf872b6f2..000000000 --- a/community-testing/freeradius/radiusd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/radiusd` -case "$1" in - start) - stat_busy "Starting radiusd Server" - - [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd - [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid - chown -R radiusd.radiusd /var/run/radiusd - - [ -z "$PID" ] && /usr/sbin/radiusd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/radiusd.pid - add_daemon radiusd - stat_done - fi - ;; - stop) - stat_busy "Stopping radiusd Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/radiusd.pid - rm_daemon radiusd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/gtk2hs-buildtools/PKGBUILD b/community-testing/gtk2hs-buildtools/PKGBUILD deleted file mode 100644 index 0eebe2691..000000000 --- a/community-testing/gtk2hs-buildtools/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 50208 2011-06-26 20:13:31Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=gtk2hs-buildtools -pkgver=0.12.0 -pkgrel=3 -pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." -url="http://hackage.haskell.org/package/gtk2hs-buildtools" -license=('GPL2') -arch=('i686' 'x86_64') -makedepends=('ghc' 'alex' 'happy') -depends=('gmp') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz) -md5sums=('cbcdfd6031725d8b70ff7804f8d93648') - -build() { - cd ${srcdir}/gtk2hs-buildtools-$pkgver - runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} - runhaskell Setup build -} - -package() { - cd ${srcdir}/gtk2hs-buildtools-$pkgver - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/gtk2hs-cairo/PKGBUILD b/community-testing/gtk2hs-cairo/PKGBUILD deleted file mode 100644 index cb3fc256b..000000000 --- a/community-testing/gtk2hs-cairo/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 50211 2011-06-26 20:14:36Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -_hkgname=cairo -pkgname=gtk2hs-cairo -pkgver=0.12.0 -pkgrel=4 -pkgdesc="Binding to the cairo library for Gtk2Hs." -url="http://hackage.haskell.org/package/cairo" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc' 'cairo' 'haskell-mtl=2.0.1.0') -makedepends=(gtk2hs-buildtools) -options=('strip') -install=${pkgname}.install -source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('e17c7ce086062282dbb405bfdf68191e') - -build() { - cd ${srcdir}/${_hkgname}-$pkgver - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0') - - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/gtk2hs-cairo/gtk2hs-cairo.install b/community-testing/gtk2hs-cairo/gtk2hs-cairo.install deleted file mode 100644 index 4ec5096b6..000000000 --- a/community-testing/gtk2hs-cairo/gtk2hs-cairo.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-cairo -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/gtk2hs-glib/PKGBUILD b/community-testing/gtk2hs-glib/PKGBUILD deleted file mode 100644 index e15d65554..000000000 --- a/community-testing/gtk2hs-glib/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 50214 2011-06-26 20:15:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -_hkgname=glib -pkgname=gtk2hs-glib -pkgver=0.12.0 -pkgrel=3 -pkgdesc="Binding to the GLIB library for Gtk2Hs." -url="http://hackage.haskell.org/package/glib" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc' 'glib2') -makedepends=('gtk2hs-buildtools=0.12.0') -options=('strip') -install=gtk2hs-glib.install -source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('2f334374d14a2f3e221a2ebfce1f8817') - -build() { - cd ${srcdir}/${_hkgname}-$pkgver - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "glib2") - - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/gtk2hs-glib/gtk2hs-glib.install b/community-testing/gtk2hs-glib/gtk2hs-glib.install deleted file mode 100644 index 24025f5d8..000000000 --- a/community-testing/gtk2hs-glib/gtk2hs-glib.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-glib -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/gtk2hs-pango/PKGBUILD b/community-testing/gtk2hs-pango/PKGBUILD deleted file mode 100644 index 603918954..000000000 --- a/community-testing/gtk2hs-pango/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 50217 2011-06-26 20:24:03Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -_hkgname=pango -pkgname=gtk2hs-pango -pkgver=0.12.0 -pkgrel=4 -pkgdesc="Binding to the pango library for Gtk2Hs." -url="http://hackage.haskell.org/package/pango" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc' 'pango' 'gtk2hs-glib' 'gtk2hs-cairo') -makedepends=('gtk2hs-buildtools=0.12.0') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('0260ed21d6ca2a52ebaa0aa212390cf7') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'pango' 'gtk2hs-glib' 'gtk2hs-cairo') - - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/gtk2hs-pango/gtk2hs-pango.install b/community-testing/gtk2hs-pango/gtk2hs-pango.install deleted file mode 100644 index f2be2100f..000000000 --- a/community-testing/gtk2hs-pango/gtk2hs-pango.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-pango -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haddock/PKGBUILD b/community-testing/haddock/PKGBUILD deleted file mode 100644 index c52029b85..000000000 --- a/community-testing/haddock/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 -pkgname=haddock -pkgver=2.9.2 -pkgrel=2 -pkgdesc="Documentation-generation tool for Haskell libraries" -url="http://hackage.haskell.org/package/${pkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=(alex happy) -depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1' 'haskell-xhtml=3000.2.0.1-7.1' 'haskell-ghc-paths=0.1.0.8-4.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) -install=${pkgname}.install - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE - mv $pkgdir/usr/bin/haddock $pkgdir/usr/bin/haddock-cabal -} - -md5sums=('04928e132827a1da20ace52babb43e47') diff --git a/community-testing/haddock/haddock.install b/community-testing/haddock/haddock.install deleted file mode 100644 index 278da355e..000000000 --- a/community-testing/haddock/haddock.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haddock -post_install() { - ${HS_DIR}/register.sh &> /dev/null - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null -} -post_upgrade() { - ${HS_DIR}/register.sh &> /dev/null - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} -pre_remove() { - ${HS_DIR}/unregister.sh &> /dev/null -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} diff --git a/community-testing/haskell-binary/PKGBUILD b/community-testing/haskell-binary/PKGBUILD deleted file mode 100644 index f682bb59a..000000000 --- a/community-testing/haskell-binary/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=binary -pkgname=haskell-binary -pkgver=0.5.0.2 -pkgrel=7.1 -pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings" -url="http://hackage.haskell.org/package/binary" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-binary/haskell-binary.install b/community-testing/haskell-binary/haskell-binary.install deleted file mode 100644 index 0084ebef8..000000000 --- a/community-testing/haskell-binary/haskell-binary.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-binary -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-dataenc/PKGBUILD b/community-testing/haskell-dataenc/PKGBUILD deleted file mode 100644 index cd94ed17c..000000000 --- a/community-testing/haskell-dataenc/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=dataenc -pkgname=haskell-dataenc -pkgver=0.13.0.4 -pkgrel=3.2 -pkgdesc="Data encoding library" -url="http://hackage.haskell.org/package/dataenc" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('4764fa7f75ed3ee95a759d67d1347d46') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-dataenc/haskell-dataenc.install b/community-testing/haskell-dataenc/haskell-dataenc.install deleted file mode 100644 index 9c1bbff01..000000000 --- a/community-testing/haskell-dataenc/haskell-dataenc.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-dataenc -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-ghc-paths/PKGBUILD b/community-testing/haskell-ghc-paths/PKGBUILD deleted file mode 100644 index a7a4be130..000000000 --- a/community-testing/haskell-ghc-paths/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=ghc-paths -pkgname=haskell-ghc-paths -pkgver=0.1.0.8 -pkgrel=4.1 -pkgdesc="Knowledge of GHC's installation directories" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=(ghc=7.0.3-2) # cannot have stricter dep here due to haddock -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d2b23dc563888e380588501d2ce1d82b') -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-ghc-paths/haskell-ghc-paths.install b/community-testing/haskell-ghc-paths/haskell-ghc-paths.install deleted file mode 100644 index 4fd2c6c56..000000000 --- a/community-testing/haskell-ghc-paths/haskell-ghc-paths.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-ghc-paths -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-haskeline/PKGBUILD b/community-testing/haskell-haskeline/PKGBUILD deleted file mode 100644 index 5a6124fd3..000000000 --- a/community-testing/haskell-haskeline/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=haskeline -pkgname=haskell-haskeline -pkgver=0.6.3.2 -pkgrel=2.2 -pkgdesc="A command-line interface for user input, written in Haskell." -url="http://hackage.haskell.org/package/haskeline" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' sh 'haskell-utf8-string=0.3.6-7.2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-terminfo=0.3.1.3') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d75863f63a1cfb499d0198e4f28ac2af') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure \ - -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-haskeline/haskell-haskeline.install b/community-testing/haskell-haskeline/haskell-haskeline.install deleted file mode 100644 index 27cb4a093..000000000 --- a/community-testing/haskell-haskeline/haskell-haskeline.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-haskeline -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-hslogger/PKGBUILD b/community-testing/haskell-hslogger/PKGBUILD deleted file mode 100644 index b8d0a95a3..000000000 --- a/community-testing/haskell-hslogger/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 50221 2011-06-26 21:42:19Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=hslogger -pkgname=haskell-hslogger -pkgver=1.1.0 -pkgrel=5 -pkgdesc="Versatile logging framework" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('LGPL') -arch=('i686' 'x86_64') -depends=('ghc' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2') -options=('strip') -install=${pkgname}.install -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -md5sums=('8039e079338dae19e1273bbd73332014') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \ - --enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \ - --enable-library-profiling - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2') - - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/haskell-hslogger/haskell-hslogger.install b/community-testing/haskell-hslogger/haskell-hslogger.install deleted file mode 100644 index 2a0d98ae7..000000000 --- a/community-testing/haskell-hslogger/haskell-hslogger.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hslogger -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-mmap/PKGBUILD b/community-testing/haskell-mmap/PKGBUILD deleted file mode 100644 index b1002be46..000000000 --- a/community-testing/haskell-mmap/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=mmap -pkgname=haskell-mmap -pkgver=0.5.7 -pkgrel=3.2 -pkgdesc="Memory mapped files for POSIX and Windows" -url="http://hackage.haskell.org/package/mmap" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('1f74b3f59617332b06e277f5212423c1') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-mmap/haskell-mmap.install b/community-testing/haskell-mmap/haskell-mmap.install deleted file mode 100644 index 68fe74f4e..000000000 --- a/community-testing/haskell-mmap/haskell-mmap.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-mmap -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-tar/PKGBUILD b/community-testing/haskell-tar/PKGBUILD deleted file mode 100644 index 459f288bd..000000000 --- a/community-testing/haskell-tar/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=tar -pkgname=haskell-tar -pkgver=0.3.1.0 -pkgrel=4.2 -pkgdesc="Reading, writing and manipulating \".tar\" archive files." -url="http://hackage.haskell.org/package/tar" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('10b54856495f9ef0a42aa270085c7d5e') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-tar/haskell-tar.install b/community-testing/haskell-tar/haskell-tar.install deleted file mode 100644 index e8c2f6293..000000000 --- a/community-testing/haskell-tar/haskell-tar.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-tar -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-terminfo/PKGBUILD b/community-testing/haskell-terminfo/PKGBUILD deleted file mode 100644 index 51e968853..000000000 --- a/community-testing/haskell-terminfo/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=terminfo -pkgname=haskell-terminfo -pkgver=0.3.1.3 -pkgrel=4.2 -pkgdesc="Haskell bindings to the terminfo library." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('8c0e052340f628b76f5687fa23379628') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-terminfo/haskell-terminfo.install b/community-testing/haskell-terminfo/haskell-terminfo.install deleted file mode 100644 index 40d39f42b..000000000 --- a/community-testing/haskell-terminfo/haskell-terminfo.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-terminfo -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-utf8-string/PKGBUILD b/community-testing/haskell-utf8-string/PKGBUILD deleted file mode 100644 index e6d27dfad..000000000 --- a/community-testing/haskell-utf8-string/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=utf8-string -pkgname=haskell-utf8-string -pkgver=0.3.6 -pkgrel=7.2 -pkgdesc="Support for reading and writing UTF8 Strings" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('be8c5ef52a0824babdc89d60c1e9b600') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-utf8-string/haskell-utf8-string.install b/community-testing/haskell-utf8-string/haskell-utf8-string.install deleted file mode 100644 index 0f64366b2..000000000 --- a/community-testing/haskell-utf8-string/haskell-utf8-string.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-utf8-string -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-x11-xft/PKGBUILD b/community-testing/haskell-x11-xft/PKGBUILD deleted file mode 100644 index c8a9ae0f9..000000000 --- a/community-testing/haskell-x11-xft/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 49962 2011-06-22 19:43:36Z vegai $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -_hkgname=X11-xft -pkgname=haskell-x11-xft -pkgver=0.3 -pkgrel=19.4 -pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('LGPL') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' 'haskell-x11=1.5.0.0-7.3' 'haskell-utf8-string=0.3.6-7.2' 'libxft') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) -install=haskell-x11-xft.install -md5sums=('1b4a528a2a4fe5e9de715f6758ff9015') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-x11-xft/haskell-x11-xft.install b/community-testing/haskell-x11-xft/haskell-x11-xft.install deleted file mode 100644 index a0ff8dac8..000000000 --- a/community-testing/haskell-x11-xft/haskell-x11-xft.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=/usr/share/haskell/haskell-x11-xft -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-x11/PKGBUILD b/community-testing/haskell-x11/PKGBUILD deleted file mode 100644 index 417b6daab..000000000 --- a/community-testing/haskell-x11/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 49953 2011-06-22 19:21:47Z vegai $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: shild <sxp@bk.ru> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> - -_hkgname=X11 -pkgname=haskell-x11 -pkgver=1.5.0.0 -pkgrel=7.3 -pkgdesc="A Haskell binding to the X11 graphics library." -arch=(i686 x86_64) -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" -license=('custom:BSD3') -options=('strip') -depends=("ghc=7.0.3-2" "haskell-syb=0.3-2.1" 'libx11' 'libxinerama') -conflicts=(haskell-x11-extras) -install=hsmod.install -source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) -md5sums=('ec6670f5ce1812206903c8a0fd9df04c') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-x11/hsmod.install b/community-testing/haskell-x11/hsmod.install deleted file mode 100644 index 45c23b979..000000000 --- a/community-testing/haskell-x11/hsmod.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-x11 -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/kvirc/PKGBUILD b/community-testing/kvirc/PKGBUILD deleted file mode 100644 index a53dbed2c..000000000 --- a/community-testing/kvirc/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 47455 2011-05-23 15:33:39Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=kvirc -pkgver=4.0.4 -pkgrel=2 -pkgdesc="Qt-based IRC client" -url="http://www.kvirc.net" -depends=('python2' 'esound' 'qt' 'libxss') -optdepends=('esound: needed for snd plugin') -arch=(i686 x86_64) -makedepends=('cmake') -license=('GPL') -options=("!libtool") -install=kvirc.install -source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/kvirc-$pkgver.tar.bz2) -md5sums=('26fd24979ae4a29bac9309b3b0c98788') - -build() { - cd $srcdir/kvirc-$pkgver - [ $NOEXTRACT -eq 1 ] || cmake -DWANT_KDE4=OFF -DWANT_PERL=ON -DWANT_PHONON=OFF -DCMAKE_INSTALL_PREFIX=/usr . - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/kvirc/kvirc.install b/community-testing/kvirc/kvirc.install deleted file mode 100644 index 8f76d007f..000000000 --- a/community-testing/kvirc/kvirc.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - true -} - -post_upgrade() { - post_install -} - -pre_remove() { - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - true -} diff --git a/community-testing/libquicktime/PKGBUILD b/community-testing/libquicktime/PKGBUILD deleted file mode 100644 index 5fe871b79..000000000 --- a/community-testing/libquicktime/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 49623 2011-06-18 18:04:57Z ibiru $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=libquicktime -pkgver=1.2.2 -pkgrel=3 -pkgdesc="A library for reading and writing quicktime files." -arch=('i686' 'x86_64') -license=('GPL') -url="http://libquicktime.sourceforge.net/" -depends=('gtk2' 'ffmpeg' 'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2' 'faac') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --enable-gpl \ - --with-ffmpeg \ - --with-x264 \ - --without-doxygen - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - diff --git a/community-testing/perl-berkeleydb/PKGBUILD b/community-testing/perl-berkeleydb/PKGBUILD deleted file mode 100644 index 2476eaf71..000000000 --- a/community-testing/perl-berkeleydb/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 47458 2011-05-23 15:36:16Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-berkeleydb -pkgver=0.43 -pkgrel=5 -pkgdesc="Interface to Berkeley DB version 2, 3 or 4" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/BerkeleyDB/" -license=('GPL' 'PerlArtistic') -depends=('perl' 'db') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz) -md5sums=('3d0cf0651ed8cd3fc36e328d5924a1e9') - -build() { -_dbver=`pacman -Q db | cut -d\ -f2 | cut -d- -f1` -depends=('perl' "db=$_dbver") - - cd $srcdir/BerkeleyDB-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-class-data-inheritable/PKGBUILD b/community-testing/perl-class-data-inheritable/PKGBUILD deleted file mode 100644 index 279d6da79..000000000 --- a/community-testing/perl-class-data-inheritable/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-class-data-inheritable -pkgver=0.08 -pkgrel=4 -pkgdesc="Inheritable, overridable class data " -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Class-Data-Inheritable" -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TM/TMTM/Class-Data-Inheritable-$pkgver.tar.gz) -md5sums=('fc0fe65926eb8fb932743559feb54eb9') - -build() { - cd Class-Data-Inheritable-${pkgver} - 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/community-testing/perl-class-factory-util/PKGBUILD b/community-testing/perl-class-factory-util/PKGBUILD deleted file mode 100644 index d22f619c9..000000000 --- a/community-testing/perl-class-factory-util/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id:$ - -pkgname=perl-class-factory-util -_realname=Class-Factory-Util -pkgver=1.7 -pkgrel=3 -pkgdesc="Provide utility methods for factory classes" -arch=(i686 x86_64) -license=('GPL' 'Artistic') -url="http://search.cpan.org/~drolsky/Class-Factory-Util" -options=(!emptydirs) -depends=('perl') -provides=('class-factory-util=1.7' 'Class::Factory::Util=1.7' 'perl-class-factory-util=1.7') -source=(http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz) -md5sums=('aebd79da361b676a7ecd3245fc3d1b3f') - -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 -} diff --git a/community-testing/perl-class-methodmaker/PKGBUILD b/community-testing/perl-class-methodmaker/PKGBUILD deleted file mode 100644 index 9896a9d33..000000000 --- a/community-testing/perl-class-methodmaker/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 47471 2011-05-23 15:46:41Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-class-methodmaker -pkgver=2.18 -pkgrel=4 -pkgdesc="Create generic class methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Class-MethodMaker" -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/Class-MethodMaker-${pkgver}.tar.gz") -md5sums=('99435d78e0a1754b102fe39597c6c3df') - -build() { - cd $srcdir/Class-MethodMaker-$pkgver - 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/community-testing/perl-clone/PKGBUILD b/community-testing/perl-clone/PKGBUILD deleted file mode 100644 index ede090293..000000000 --- a/community-testing/perl-clone/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: François Charette <firmicus ατ gmx δοτ net> -# Contributor: Alex Dioso <adioso->gmail*com> - -pkgname=perl-clone -pkgver=0.31 -pkgrel=3 -pkgdesc='Recursive copy of nested objects.' -arch=('i686' 'x86_64') -url='http://search.cpan.org/~RDF/Clone' -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/R/RD/RDF/Clone-${pkgver}.tar.gz") -md5sums=('65f34e7280d7b7dfb72ab6224e5767f5') - -build() { - cd Clone-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Clone-${pkgver} - - make DESTDIR=${pkgdir} install - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-crypt-blowfish/PKGBUILD b/community-testing/perl-crypt-blowfish/PKGBUILD deleted file mode 100644 index 204a0d0f9..000000000 --- a/community-testing/perl-crypt-blowfish/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 47477 2011-05-23 15:51:28Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-crypt-blowfish -pkgver=2.12 -pkgrel=3 -pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Crypt-Blowfish" -license=("GPL" "PerlArtistic") -source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz") -md5sums=('a0eca17addc8bdaf38c044c365a8800c') - -build() { - cd $srcdir/Crypt-Blowfish-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-crypt-des/PKGBUILD b/community-testing/perl-crypt-des/PKGBUILD deleted file mode 100644 index ae854b92b..000000000 --- a/community-testing/perl-crypt-des/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -#Contributor: Pete Morris <pete dot morris at gmail dot com> -pkgname=perl-crypt-des -pkgver=2.05 -pkgrel=3 -pkgdesc="Perl DES encryption module" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~dparis/Crypt-DES" -license=("GPL" "PerlArtistic") -depends=('glibc') -source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz") -md5sums=('a8a0bea7064e11d2af434f3e468c17bb') -build() { - cd Crypt-DES-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=${pkgdir} - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete -} diff --git a/community-testing/perl-crypt-openssl-bignum/PKGBUILD b/community-testing/perl-crypt-openssl-bignum/PKGBUILD deleted file mode 100644 index 33f382066..000000000 --- a/community-testing/perl-crypt-openssl-bignum/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 47483 2011-05-23 15:54:16Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-crypt-openssl-bignum -pkgver=0.04 -pkgrel=5 -pkgdesc="OpenSSL's multiprecision integer arithmetic " -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" -depends=('perl' 'openssl') -license=('GPL') -option=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Bignum-$pkgver.tar.gz) -md5sums=('9369ef722b0705c0604998559988eb18') - -build() { - cd $startdir/src/Crypt-OpenSSL-Bignum-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$startdir/pkg - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete -} diff --git a/community-testing/perl-crypt-openssl-random/PKGBUILD b/community-testing/perl-crypt-openssl-random/PKGBUILD deleted file mode 100644 index b9a8adb52..000000000 --- a/community-testing/perl-crypt-openssl-random/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 47486 2011-05-23 15:55:23Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-crypt-openssl-random -pkgver=0.04 -pkgrel=5 -pkgdesc="Interface to OpenSSL PRNG methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" -depends=('perl' 'openssl') -license=('GPL') -option=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz) -md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a') - -build() { - cd $startdir/src/Crypt-OpenSSL-Random-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$startdir/pkg - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete -} diff --git a/community-testing/perl-crypt-openssl-rsa/PKGBUILD b/community-testing/perl-crypt-openssl-rsa/PKGBUILD deleted file mode 100644 index 23151f63e..000000000 --- a/community-testing/perl-crypt-openssl-rsa/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 47489 2011-05-23 15:56:48Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-crypt-openssl-rsa -pkgver=0.26 -pkgrel=4 -pkgdesc="Interface to OpenSSL RSA methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" -depends=('perl-crypt-openssl-random' 'perl-crypt-openssl-bignum') -license=('GPL') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-RSA-$pkgver.tar.gz) -md5sums=('baf875f01ee39b88335b8f0962fe4bbc') - -build() { - cd $startdir/src/Crypt-OpenSSL-RSA-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$startdir/pkg - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete -} - diff --git a/community-testing/perl-curses/PKGBUILD b/community-testing/perl-curses/PKGBUILD deleted file mode 100644 index 629c01041..000000000 --- a/community-testing/perl-curses/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 47492 2011-05-23 15:58:40Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-curses -pkgver=1.28 -pkgrel=3 -pkgdesc="Character screen handling and windowing" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Curses" -license=('GPL' 'PerlArtistic') -depends=('perl' 'ncurses') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/G/GI/GIRAFFED/Curses-$pkgver.tgz) -md5sums=('ed9f7ddf2d90f4266da91c3dc9fad9c9') - -build() { - cd $srcdir/Curses-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-data-structure-util/PKGBUILD b/community-testing/perl-data-structure-util/PKGBUILD deleted file mode 100644 index 765098374..000000000 --- a/community-testing/perl-data-structure-util/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 47495 2011-05-23 16:00:16Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-data-structure-util -pkgver=0.15 -pkgrel=4 -pkgdesc="Perl/CPAN Module Data::Structure::Util" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Data-Structure-Util" -license=("GPL" "PerlArtistic") -source=("http://search.cpan.org/CPAN/authors/id/A/AN/ANDYA/Data-Structure-Util-$pkgver.tar.gz") -md5sums=('e12ba777c0abfbd79a131de28d542359') - -build() { - cd $srcdir/Data-Structure-Util-$pkgver - 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/community-testing/perl-datetime-format-builder/PKGBUILD b/community-testing/perl-datetime-format-builder/PKGBUILD deleted file mode 100644 index 094777a66..000000000 --- a/community-testing/perl-datetime-format-builder/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id$ -# Contributor: Caleb Cushing <xenoterracide@gmail.com> - -pkgname=perl-datetime-format-builder -pkgver=0.8000 -pkgrel=5 -pkgdesc="Create DateTime parser classes and objects" -arch=('i686' 'x86_64') -license=('PerlArtistic' 'GPL') -options=('!emptydirs') -provides=('perl-datetime-format-builder=0.80') -depends=('perl' 'perl-class-factory-util>=1.6' 'perl-datetime>=0.12' 'perl-datetime-format-strptime>=1.04' 'perl-params-validate>=0.72') -url='http://search.cpan.org/dist/DateTime-Format-Builder' -source=('http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.80.tar.gz') -md5sums=('f6c5d5a17b5b7478ff555a2d3cce5136') - -build() { - export PERL_MM_USE_DEFAULT=1 - - cd "${srcdir}/DateTime-Format-Builder-0.80" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "${srcdir}/DateTime-Format-Builder-0.80" - make DESTDIR="$pkgdir" install - - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} diff --git a/community-testing/perl-datetime-format-mail/PKGBUILD b/community-testing/perl-datetime-format-mail/PKGBUILD deleted file mode 100644 index dc6c69605..000000000 --- a/community-testing/perl-datetime-format-mail/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-datetime-format-mail -pkgver=0.3001 -pkgrel=7 -pkgdesc="Convert between DateTime and RFC2822/822 formats " -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DateTime-Format-Mail" -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0' 'perl-datetime' 'perl-params-validate>=0.67') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Format-Mail-$pkgver.tar.gz) -md5sums=('15e36249e866463bd0237262a8e43b16') - -build() { - cd $srcdir/DateTime-Format-Mail-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} -package() { - cd $srcdir/DateTime-Format-Mail-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-datetime/PKGBUILD b/community-testing/perl-datetime/PKGBUILD deleted file mode 100644 index b5c86bd7f..000000000 --- a/community-testing/perl-datetime/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 47498 2011-05-23 16:01:46Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-datetime -pkgver=0.70 -pkgrel=2 -pkgdesc="A complete, easy to use date and time object" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DateTime" -license=('GPL' 'PerlArtistic') -depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41' - 'perl-params-validate>=0.76' 'perl-math-round') -LC_NUMERIC=C -provides=("perl-datetime=`printf %.4f $pkgver`") -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('228a3ca93b49e308fc7a3b7a47341ab3') - -build() { - cd $srcdir/DateTime-$pkgver - perl Build.PL installdirs=vendor destdir="$pkgdir/" - ./Build -} - -check() { - cd $srcdir/DateTime-$pkgver -# ./Build test - true -} - -package() { - cd $srcdir/DateTime-$pkgver - ./Build install - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-dbd-odbc/PKGBUILD b/community-testing/perl-dbd-odbc/PKGBUILD deleted file mode 100644 index d787e37b5..000000000 --- a/community-testing/perl-dbd-odbc/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $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-testing/perl-dbd-pg/PKGBUILD b/community-testing/perl-dbd-pg/PKGBUILD deleted file mode 100644 index 7af282d37..000000000 --- a/community-testing/perl-dbd-pg/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $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-testing/perl-dbd-sqlite2/PKGBUILD b/community-testing/perl-dbd-sqlite2/PKGBUILD deleted file mode 100644 index 314f129d4..000000000 --- a/community-testing/perl-dbd-sqlite2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $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-testing/perl-dbd-sybase/PKGBUILD b/community-testing/perl-dbd-sybase/PKGBUILD deleted file mode 100644 index a33488520..000000000 --- a/community-testing/perl-dbd-sybase/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $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-testing/perl-digest-md5/PKGBUILD b/community-testing/perl-digest-md5/PKGBUILD deleted file mode 100644 index c0d7a1512..000000000 --- a/community-testing/perl-digest-md5/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 48561 2011-06-02 06:48:37Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil@gmail.com> - -pkgname=perl-digest-md5 -pkgver=2.51 -pkgrel=2 -pkgdesc="Digest::MD5::Perl - Perl implementation of Ron Rivests MD5 Algorithm" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Digest-MD5" -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-MD5-$pkgver.tar.gz) -md5sums=('73967d50b9d19990a1d609fe2b1e36c3') - -build() { - cd "$srcdir/Digest-MD5-$pkgver" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "$srcdir/Digest-MD5-$pkgver" - make install DESTDIR="$pkgdir/" - # remove perllocal.pod and .packlist - find "$pkgdir" -name perllocal.pod -delete - find "$pkgdir" -name .packlist -delete -} diff --git a/community-testing/perl-fuse/PKGBUILD b/community-testing/perl-fuse/PKGBUILD deleted file mode 100644 index 079721841..000000000 --- a/community-testing/perl-fuse/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 47546 2011-05-23 19:23:45Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom K <tomk@runbox.com> - -pkgname=perl-fuse -pkgver=0.11 -pkgrel=2 -pkgdesc="write filesystems in Perl using FUSE" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Fuse" -depends=('perl' 'fuse') -license=('GPL') -source=(http://www.cpan.org/authors/id/D/DP/DPAVLIN/Fuse-$pkgver.tar.gz) -md5sums=('4b4cb2399dc409015779af0940513c97') -options=('!emptydirs') - -build() { - cd $srcdir/Fuse-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd $srcdir/Fuse-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-gd/PKGBUILD b/community-testing/perl-gd/PKGBUILD deleted file mode 100644 index b29f364b0..000000000 --- a/community-testing/perl-gd/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com> - -pkgname=perl-gd -pkgver=2.44 -pkgrel=4 -pkgdesc="Interface to Gd Graphics Library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/GD" -license=('GPL' 'PerlArtistic') -depends=('gd') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz) -md5sums=('9b9a4d78a5af0616a96264b0aa354859') - -build() { - cd $srcdir/GD-$pkgver - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} -package() { - cd $srcdir/GD-$pkgver - make install DESTDIR=$pkgdir - install -D -m0644 GD/Group.pm $pkgdir/usr/lib/perl5/vendor_perl/GD/Group.pm - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-gnome2-wnck/PKGBUILD b/community-testing/perl-gnome2-wnck/PKGBUILD deleted file mode 100644 index 25e0df822..000000000 --- a/community-testing/perl-gnome2-wnck/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 47727 2011-05-25 02:44:57Z tdziedzic $ -# Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> - -pkgname=perl-gnome2-wnck -pkgver=0.16 -pkgrel=4 -pkgdesc="Perl interface to the Window Navigator Construction Kit" -arch=('i686' 'x86_64') -license=("GPL" "Artistic") -url="http://search.cpan.org/dist/Gnome2-Wnck" -depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-${pkgver}.tar.gz") -md5sums=('439f4569ffd7af96ef1d3feaab23760e') - -build() { - cd Gnome2-Wnck-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Gnome2-Wnck-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gssapi/PKGBUILD b/community-testing/perl-gssapi/PKGBUILD deleted file mode 100644 index 714407586..000000000 --- a/community-testing/perl-gssapi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 47705 2011-05-25 02:18:24Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-gssapi -pkgver=0.28 -pkgrel=4 -pkgdesc="Perl/CPAN Module GSSAPI" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/GSSAPI" -license=("GPL" "PerlArtistic") -depends=('krb5') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-${pkgver}.tar.gz") -md5sums=('65f00a0749212af064289c8a05e59b3f') - -build() { - cd GSSAPI-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd GSSAPI-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gstreamer-interfaces/PKGBUILD b/community-testing/perl-gstreamer-interfaces/PKGBUILD deleted file mode 100644 index 61a9b62e6..000000000 --- a/community-testing/perl-gstreamer-interfaces/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 47709 2011-05-25 02:21:42Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gstreamer-interfaces -pkgver=0.06 -pkgrel=3 -pkgdesc="GStreamer::Interfaces" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/GStreamer-Interfaces" -license=('GPL' 'PerlArtistic') -depends=('glib-perl' 'gstreamer0.10-base' 'perl-extutils-pkgconfig' 'perl-gstreamer' 'perl-extutils-depends') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-Interfaces-${pkgver}.tar.gz") -md5sums=('aa9583a484fa6829935b360887ecda45') - -build() { - cd GStreamer-Interfaces-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd GStreamer-Interfaces-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gstreamer/PKGBUILD b/community-testing/perl-gstreamer/PKGBUILD deleted file mode 100644 index 84f62fa75..000000000 --- a/community-testing/perl-gstreamer/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 47702 2011-05-25 01:05:10Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gstreamer -pkgver=0.16 -pkgrel=1 -pkgdesc="Interface to the GStreamer library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/GStreamer" -license=('GPL' 'PerlArtistic') -depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-${pkgver}.tar.gz") -md5sums=('e2d51158f3c671c0e4c11a82c9171b2b') - -build() { - cd GStreamer-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd GStreamer-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gtk2-mozembed/PKGBUILD b/community-testing/perl-gtk2-mozembed/PKGBUILD deleted file mode 100644 index bc2a503a0..000000000 --- a/community-testing/perl-gtk2-mozembed/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 47713 2011-05-25 02:25:45Z tdziedzic $ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Maintainer: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gtk2-mozembed -pkgver=0.09 -pkgrel=1 -pkgdesc="Interface to the Mozilla embedding widget" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-MozEmbed" -license=('GPL' 'PerlArtistic') -depends=('perl-extutils-pkgconfig>=1.03' 'gtk2-perl>=1.081' 'perl-extutils-depends>=0.20' 'xulrunner>1.9') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-MozEmbed-${pkgver}.tar.gz") -md5sums=('8c391fbe1ebf23a0af22d5ad3b571f19') - -build() { - cd Gtk2-MozEmbed-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Gtk2-MozEmbed-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gtk2-sexy/PKGBUILD b/community-testing/perl-gtk2-sexy/PKGBUILD deleted file mode 100644 index 6b4789bd2..000000000 --- a/community-testing/perl-gtk2-sexy/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 47716 2011-05-25 02:28:38Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Charles Mauch <cmauch@gmail.com> -# Creator: Florian Ragwitz <http://search.cpan.org/~/> - -pkgname=perl-gtk2-sexy -pkgver=0.05 -pkgrel=5 -pkgdesc="Perl/CPAN Module Gtk2::Sexy" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-Sexy" -license=('GPL' 'PerlArtistic') -depends=('gtk2' 'libsexy') -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends' 'gtk2-perl') -options=(docs !emptydirs) -source=("http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-Sexy-${pkgver}.tar.gz") -md5sums=('3e291808250d7b956ba8443013a1b461') - -build() { - cd Gtk2-Sexy-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Gtk2-Sexy-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gtk2-trayicon/PKGBUILD b/community-testing/perl-gtk2-trayicon/PKGBUILD deleted file mode 100644 index a4cdb9e76..000000000 --- a/community-testing/perl-gtk2-trayicon/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 47733 2011-05-25 02:54:41Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom K <tomk@runbox.com> - -pkgname=perl-gtk2-trayicon -pkgver=0.06 -pkgrel=7 -pkgdesc="Perl interface to the EggTrayIcon library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-TrayIcon/" -depends=('gtk2-perl') -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -license=("GPL") -options=('!emptydirs') -source=("http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-TrayIcon-${pkgver}.tar.gz") -md5sums=('522c328f14681a25d76eeaf317e05049') - -build() { - cd Gtk2-TrayIcon-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Gtk2-TrayIcon-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-gtk2-webkit/PKGBUILD b/community-testing/perl-gtk2-webkit/PKGBUILD deleted file mode 100644 index 269e6080a..000000000 --- a/community-testing/perl-gtk2-webkit/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 47720 2011-05-25 02:33:54Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gtk2-webkit -pkgver=0.09 -pkgrel=1 -pkgdesc="Gtk2::WebKit" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Gtk2-WebKit" -license=('GPL' 'PerlArtistic') -depends=('perl' 'gtk2-perl' 'libwebkit' 'perl-extutils-depends' 'perl-extutils-pkgconfig') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-WebKit-${pkgver}.tar.gz) -md5sums=('e696fc2b15d6189370e19bce9a9e56f3') - -build() { - cd Gtk2-WebKit-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Gtk2-WebKit-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-html-strip/PKGBUILD b/community-testing/perl-html-strip/PKGBUILD deleted file mode 100644 index 2f93db01f..000000000 --- a/community-testing/perl-html-strip/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 47534 2011-05-23 18:42:18Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-html-strip -pkgver=1.06 -pkgrel=6 -pkgdesc="Perl/CPAN Module HTML::Strip" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~kilinrax/HTML-Strip/" -license=("GPL" "PerlArtistic") -depends=('perl') -source=("http://www.cpan.org/authors/id/K/KI/KILINRAX/HTML-Strip-$pkgver.tar.gz") -md5sums=('ceeacef0c7c31983e3a991e77bb58b45') -options=('!emptydirs') - -build() { - cd $srcdir/HTML-Strip-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} -package() { - cd $srcdir/HTML-Strip-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-inline-java/PKGBUILD b/community-testing/perl-inline-java/PKGBUILD deleted file mode 100644 index d9396fc00..000000000 --- a/community-testing/perl-inline-java/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 47531 2011-05-23 18:37:03Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> - -pkgname=perl-inline-java -pkgver=0.53 -pkgrel=2 -pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module." -arch=('i686' 'x86_64') -depends=('perl' 'perl-inline' 'java-runtime') -makedepends=('java-environment') -license=("GPL" "PerlArtistic") -url="http://search.cpan.org/dist/Inline-Java" -source=(http://search.cpan.org/CPAN/authors/id/P/PA/PATL/Inline-Java-$pkgver.tar.gz) -md5sums=('23f96c2ac4915302c3647c0abc92916f') -options=('!emptydirs') - -build() { - cd $srcdir/Inline-Java-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor J2SDK=$J2SDKDIR - make java - make -} -package() { - cd $srcdir/Inline-Java-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-io-tty/PKGBUILD b/community-testing/perl-io-tty/PKGBUILD deleted file mode 100644 index 7fe7b0b0d..000000000 --- a/community-testing/perl-io-tty/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Contributor: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-io-tty -_realname=IO-Tty -pkgver=1.08 -pkgrel=4 -pkgdesc="Provide an interface to TTYs and PTYs" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/IO-Tty/" -license=("GPL" "PerlArtistic") -depends=('glibc') -source=("http://www.cpan.org/authors/id/R/RG/RGIERSIG/${_realname}-$pkgver.tar.gz") -md5sums=('e99d819a6f8c11ae105b770cc508a4fc') -options=('!emptydirs') - -build() { - cd $srcdir/${_realname}-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} -package(){ - cd $srcdir/${_realname}-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-json-xs/PKGBUILD b/community-testing/perl-json-xs/PKGBUILD deleted file mode 100644 index 0c935e5ca..000000000 --- a/community-testing/perl-json-xs/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 47516 2011-05-23 18:15:13Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Tor Krill <tor@krill.nu> - -pkgname=perl-json-xs -pkgver=2.3 -pkgrel=3 -pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" -url="http://search.cpan.org/dist/JSON-XS/" -license=("GPL") -arch=('i686' 'x86_64') -depends=('perl' 'perl-common-sense') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz) -md5sums=('4dc2a968e41f8cf330d46be12f221a12') - -build() { - cd $srcdir/JSON-XS-$pkgver -# eval `perl -V:archname` - perl Makefile.PL INSTALLDIRS=vendor - make -} -package() { - cd $srcdir/JSON-XS-$pkgver - make DESTDIR=$pkgdir install - - find $pkgdir -name '.packlist' -delete && \ - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-libapreq2/PKGBUILD b/community-testing/perl-libapreq2/PKGBUILD deleted file mode 100644 index 21d49f90f..000000000 --- a/community-testing/perl-libapreq2/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 47519 2011-05-23 18:19:22Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom K <tomk@runbox.com> - -pkgname=perl-libapreq2 -pkgver=2.12 -pkgrel=8 -pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data." -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/libapreq2" -depends=('mod_perl' 'apr-util') -makedepends=('perl-extutils-xsbuilder' 'perl-version') -license=("GPL") -options=('!libtool' '!makeflags') -source=(http://www.cpan.org/authors/id/J/JO/JOESUF/libapreq2-$pkgver.tar.gz) -md5sums=('76e2acde0d82246dea6f2565f3746eec') - -build() { - cd $srcdir/libapreq2-$pkgver - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs - - find . -type f -name Makefile -exec sed -i 's#-ldb-4.8#-ldb-5.1#' {} \; - sed -i 's#-ldb-4.8#-ldb-5.1#' apreq2-config - - make -} -package(){ - cd $srcdir/libapreq2-$pkgver - make install DESTDIR=$pkgdir - sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/bin/apreq2-config - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-list-moreutils/PKGBUILD b/community-testing/perl-list-moreutils/PKGBUILD deleted file mode 100644 index fc399b9a7..000000000 --- a/community-testing/perl-list-moreutils/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-list-moreutils -_cpanname=List-MoreUtils -pkgver=0.22 -pkgrel=6 -pkgdesc="Provide the stuff missing in List::Util" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/List-MoreUtils" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/V/VP/VPARSEVAL/${_cpanname}-$pkgver.tar.gz) -md5sums=('3a6ec506f40662ab1296c48c5eb72016') - -build() { - cd $srcdir/${_cpanname}-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd $srcdir/${_cpanname}-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/perl-mail-box-parser-c/PKGBUILD b/community-testing/perl-mail-box-parser-c/PKGBUILD deleted file mode 100644 index cf1fc16f4..000000000 --- a/community-testing/perl-mail-box-parser-c/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 47593 2011-05-23 20:41:57Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-mail-box-parser-c -pkgver=3.006 -pkgrel=6 -pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Mail-Box-Parser-C" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/M/MA/MARKOV/Mail-Box-Parser-C-${pkgver}.tar.gz") -md5sums=('3dfb3e2729597ae33114250cbce1b884') - -build() { - cd Mail-Box-Parser-C-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Mail-Box-Parser-C-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-mail-transport-dbx/PKGBUILD b/community-testing/perl-mail-transport-dbx/PKGBUILD deleted file mode 100644 index 15244af54..000000000 --- a/community-testing/perl-mail-transport-dbx/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 47596 2011-05-23 20:45:10Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-mail-transport-dbx -pkgver=0.07 -pkgrel=6 -pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Mail-Transport-Dbx" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/V/VP/VPARSEVAL/Mail-Transport-Dbx-${pkgver}.tar.gz") -md5sums=('4dcf5346a67c0a7f861cb2bb51a7d14e') - -build() { - cd Mail-Transport-Dbx-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Mail-Transport-Dbx-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-net-dbus/PKGBUILD b/community-testing/perl-net-dbus/PKGBUILD deleted file mode 100644 index a7307c2a8..000000000 --- a/community-testing/perl-net-dbus/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 47599 2011-05-23 20:48:03Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-net-dbus -pkgver=0.33.6 -pkgrel=6 -pkgdesc="Binding for DBus messaging protocol" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Net-DBus" -license=('GPL' 'PerlArtistic') -depends=('dbus' 'perl-xml-twig') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/D/DA/DANBERR/Net-DBus-${pkgver}.tar.gz") -md5sums=('a1dbce89b1b839fd0e46d74067ae2e35') - -build() { - cd Net-DBus-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Net-DBus-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-net-libidn/PKGBUILD b/community-testing/perl-net-libidn/PKGBUILD deleted file mode 100644 index 1d2f41001..000000000 --- a/community-testing/perl-net-libidn/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 47590 2011-05-23 20:30:08Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-net-libidn -pkgver=0.12 -pkgrel=4 -pkgdesc="Perl/CPAN Module Net::LibIDN" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Net-LibIDN/" -license=("GPL" "PerlArtistic") -depends=(perl libidn) -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TH/THOR/Net-LibIDN-${pkgver}.tar.gz") -md5sums=('c3e4de2065009d67bcb1df0afb473e12') - -build() { - cd Net-LibIDN-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Net-LibIDN-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-params-validate/PKGBUILD b/community-testing/perl-params-validate/PKGBUILD deleted file mode 100644 index 2dd4124e8..000000000 --- a/community-testing/perl-params-validate/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-params-validate -pkgver=0.98 -pkgrel=2 -pkgdesc="Validate sub params against a spec" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Params-Validate" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") -md5sums=('6dacb26b1bdb6338b6eed45cd86958bb') - -build() { - cd Params-Validate-${pkgver} - - perl ./Build.PL --installdirs=vendor - - ./Build -} -package(){ - cd Params-Validate-${pkgver} - - ./Build install --destdir=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-string-crc32/PKGBUILD b/community-testing/perl-string-crc32/PKGBUILD deleted file mode 100644 index de3d39177..000000000 --- a/community-testing/perl-string-crc32/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 47584 2011-05-23 20:23:28Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-string-crc32 -pkgver=1.4 -pkgrel=6 -pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/String-CRC32" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/S/SO/SOENKE/String-CRC32-${pkgver}.tar.gz") -md5sums=('9b241bc4a482a3aa59fbb1429bc30546') - -build() { - cd String-CRC32-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd String-CRC32-${pkgver} - - make pure_install doc_install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-text-charwidth/PKGBUILD b/community-testing/perl-text-charwidth/PKGBUILD deleted file mode 100644 index db2e6d27a..000000000 --- a/community-testing/perl-text-charwidth/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 47581 2011-05-23 20:20:00Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-text-charwidth -pkgver=0.04 -pkgrel=6 -pkgdesc="Perl/CPAN Module Text::CharWidth" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Text-CharWidth" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/K/KU/KUBOTA/Text-CharWidth-${pkgver}.tar.gz") -md5sums=('37a723df0580c0758c0ee67b37336c15') - -build() { - cd Text-CharWidth-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Text-CharWidth-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-text-kakasi/ChangeLog b/community-testing/perl-text-kakasi/ChangeLog deleted file mode 100644 index 0a469fdff..000000000 --- a/community-testing/perl-text-kakasi/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2008-10-27 Allan McRae <allan@archlinux.org> - * perl-text-kakasi 2.04-4 - * fixed typo in depends diff --git a/community-testing/perl-text-kakasi/PKGBUILD b/community-testing/perl-text-kakasi/PKGBUILD deleted file mode 100644 index 78b522c7c..000000000 --- a/community-testing/perl-text-kakasi/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 47575 2011-05-23 20:14:17Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-text-kakasi -pkgver=2.04 -pkgrel=7 -pkgdesc="Perl frontend to kakasi" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Text-Kakasi" -license=('GPL' 'PerlArtistic') -depends=('perl' 'kakasi') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/D/DA/DANKOGAI/Text-Kakasi-${pkgver}.tar.gz") -md5sums=('5a9e381cb93edfd707124a63c60f96b1') - -build() { - cd Text-Kakasi-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Text-Kakasi-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-tie-hash-indexed/PKGBUILD b/community-testing/perl-tie-hash-indexed/PKGBUILD deleted file mode 100644 index 687e000c1..000000000 --- a/community-testing/perl-tie-hash-indexed/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 47578 2011-05-23 20:16:48Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-tie-hash-indexed -pkgver=0.05 -pkgrel=6 -pkgdesc="Ordered hashes for Perl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Tie-Hash-Indexed" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/M/MH/MHX/Tie-Hash-Indexed-${pkgver}.tar.gz) -md5sums=('41e2d013df8cfafdd239bc65bbada014') - -build() { - cd Tie-Hash-Indexed-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Tie-Hash-Indexed-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-tk-tablematrix/PKGBUILD b/community-testing/perl-tk-tablematrix/PKGBUILD deleted file mode 100644 index 8f9dd8986..000000000 --- a/community-testing/perl-tk-tablematrix/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 47698 2011-05-24 20:28:40Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-tk-tablematrix -pkgver=1.23 -pkgrel=7 -pkgdesc="Display data in TableSpreadsheet format" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Tk-TableMatrix" -license=("GPL" "PerlArtistic") -depends=('perl-tk') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/C/CE/CERNEY/Tk-TableMatrix-${pkgver}.tar.gz") -md5sums=('6b7653d129bf1a8327054a88b58d6364') - -build() { - cd Tk-TableMatrix-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Tk-TableMatrix-${pkgver} - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete - - rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Tk/pTk/extralibs.ld -} diff --git a/community-testing/perl-www-curl/PKGBUILD b/community-testing/perl-www-curl/PKGBUILD deleted file mode 100644 index ba9fcc3f1..000000000 --- a/community-testing/perl-www-curl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 47564 2011-05-23 19:59:27Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-www-curl -pkgver=4.15 -pkgrel=1 -pkgdesc="Perl/CPAN Module WWW::Curl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/WWW-Curl/" -license=("GPL" "PerlArtistic") -depends=("curl") -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-${pkgver}.tar.gz") -md5sums=('31c0b8c7e5e2d26bcc8213d702186d5f') - -build() { - cd WWW-Curl-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd WWW-Curl-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/perl-xml-libxml/PKGBUILD b/community-testing/perl-xml-libxml/PKGBUILD deleted file mode 100644 index 38d4fd63f..000000000 --- a/community-testing/perl-xml-libxml/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: François Charette <francois.archlinux.org> - -pkgname=perl-xml-libxml -pkgver=1.70 -pkgrel=4 -pkgdesc="Interface to the libxml library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/XML-LibXML" -license=('GPL') -depends=('libxml2' 'perl-xml-sax>=0.11' 'perl-xml-namespacesupport>=1.07') -provides=('perl-libxml' 'perl-xml-libxml-common') -replaces=('perl-libxml' 'perl-xml-libxml-common') -conflicts=('perl-libxml' 'perl-xml-libxml-common') -install=perl-xml-libxml.install -source=(http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXML-$pkgver.tar.gz) -md5sums=('33d4294f708e20c298cfe534d1166844') - -build() { - cd $srcdir/XML-LibXML-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd $srcdir/XML-LibXML-$pkgver - make test -} - -package() { - cd $srcdir/XML-LibXML-$pkgver - make pure_install doc_install DESTDIR=$pkgdir -} diff --git a/community-testing/perl-xml-libxml/perl-xml-libxml.install b/community-testing/perl-xml-libxml/perl-xml-libxml.install deleted file mode 100644 index 43c29a245..000000000 --- a/community-testing/perl-xml-libxml/perl-xml-libxml.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - echo ":: Installing SAX XML Parsers" - /usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()" - /usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()" -} - -post_upgrade() { - libxmlcount=`grep -c XML::LibXML::SAX /usr/share/perl5/vendor_perl/XML/SAX/ParserDetails.ini` - if [[ $libxmlcount == 0 ]]; then - echo ":: Installing SAX XML Parsers" - /usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()" - /usr/bin/perl -MXML::SAX -e "XML::SAX->add_parser(q(XML::LibXML::SAX))->save_parsers()" - fi -} - diff --git a/community-testing/perl-xml-libxslt/PKGBUILD b/community-testing/perl-xml-libxslt/PKGBUILD deleted file mode 100644 index de58675ec..000000000 --- a/community-testing/perl-xml-libxslt/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Id:$ -# Maintainer: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-xml-libxslt -pkgver=1.70 -pkgrel=5 -pkgdesc="Interface to the gnome libxslt library " -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/XML-LibXSLT" -license=('GPL') -depends=('perl-xml-libxml' 'libxslt') -source=(http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXSLT-$pkgver.tar.gz) -md5sums=('c63a7913999de076e5c911810f69b392') - -build() { - cd $srcdir/XML-LibXSLT-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check () { - cd $srcdir/XML-LibXSLT-$pkgver - make test -} - -package() { - cd $srcdir/XML-LibXSLT-$pkgver - make install DESTDIR=$pkgdir -} - diff --git a/community-testing/perl-xmms/PKGBUILD b/community-testing/perl-xmms/PKGBUILD deleted file mode 100644 index 053086167..000000000 --- a/community-testing/perl-xmms/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 47561 2011-05-23 19:55:02Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Georg Grabler <ggrabler@gmail.com> - -pkgname=perl-xmms -pkgver=0.12 -pkgrel=6 -pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~dougm/Xmms-Perl/" -depends=('perl' 'xmms' 'libxxf86dga') -license=('GPL' 'PerlArtistic') -source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOUGM/Xmms-Perl-${pkgver}.tar.gz") -md5sums=('d1fbf6d09330f7855dd80f3ceee8e6f7') - -build() { - cd Xmms-Perl-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Xmms-Perl-${pkgver} - - make DESTDIR=${pkgdir} install - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-testing/pork/PKGBUILD b/community-testing/pork/PKGBUILD deleted file mode 100644 index 53946b6e1..000000000 --- a/community-testing/pork/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 47556 2011-05-23 19:46:39Z tdziedzic $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=pork -pkgver=0.99.8.1 -pkgrel=4 -pkgdesc="Console-based AOL Instant Messenger & IRC client" -arch=('i686' 'x86_64') -url="http://dev.ojnk.net/" -license=('GPL') -depends=('ncurses' 'perl') -source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz) -md5sums=('0c720db7e4e843aeee0fa53ade7cdffd') - -build() { - cd $pkgname-$pkgver - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd $pkgname-$pkgver - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/wml/PKGBUILD b/community-testing/wml/PKGBUILD deleted file mode 100644 index 2f7a3781f..000000000 --- a/community-testing/wml/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $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-testing/xmonad-contrib/PKGBUILD b/community-testing/xmonad-contrib/PKGBUILD deleted file mode 100644 index 84455217a..000000000 --- a/community-testing/xmonad-contrib/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 49972 2011-06-22 19:52:11Z vegai $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: orbisvicis <gmail.com> - -pkgname=xmonad-contrib -pkgver=0.9.2 -pkgrel=2.1 -pkgdesc="Add-ons for xmonad" -arch=('i686' 'x86_64') -url="http://xmonad.org/" -license=('BSD') -depends=('ghc=7.0.3-2' 'xmonad=0.9.2-2.1' 'sh' 'haskell-x11=1.5.0.0' - 'haskell-x11-xft=0.3' 'haskell-utf8-string=0.3.6') -install='xmonad-contrib.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('616cbc632bbde5cd4cdb643ee47e74d2') - -build() { - cd $srcdir/$pkgname-$pkgver - runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh - install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh - runhaskell Setup.lhs copy --destdir=$pkgdir - install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE -} diff --git a/community-testing/xmonad-contrib/xmonad-contrib.install b/community-testing/xmonad-contrib/xmonad-contrib.install deleted file mode 100644 index e9208c833..000000000 --- a/community-testing/xmonad-contrib/xmonad-contrib.install +++ /dev/null @@ -1,17 +0,0 @@ -HS_DIR=usr/share/haskell/xmonad-contrib - -post_install() { - ${HS_DIR}/register.sh -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} diff --git a/community-testing/xmonad/PKGBUILD b/community-testing/xmonad/PKGBUILD deleted file mode 100644 index d669fc325..000000000 --- a/community-testing/xmonad/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 49967 2011-06-22 19:45:42Z vegai $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: shild <shildv@gmail.com> - -pkgname=xmonad -pkgver=0.9.2 -pkgrel=2.1 -pkgdesc="A lightweight X11 tiled window manager written in Haskell" -arch=('i686' 'x86_64') -url="http://xmonad.org/" -license=('BSD') -depends=('ghc=7.0.3' 'gmp' 'haskell-x11=1.5.0.0' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6') -install='xmonad.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz - xmonad.desktop xmonad.session xmonad.svg) - -build() { - cd $srcdir/$pkgname-$pkgver - runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh - install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh - runhaskell Setup.lhs copy --destdir=$pkgdir -# runhaskell util/GenerateManpage.hs - - install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1 - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE - - install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop - install -D -m644 $srcdir/xmonad.session $pkgdir/usr/share/gnome-session/sessions/xmonad.session - install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg -} -md5sums=('5a4117f798664d772d2a834ea6c90f1c' - 'f8e3d84a9f154d1b5d7fcffbc0a058c9' - '9d1bc84a7f32897d32f3fc71ef76228e' - '72bfa5e62e4e44fe7fa59b6a7593d993') diff --git a/community-testing/xmonad/xmonad.desktop b/community-testing/xmonad/xmonad.desktop deleted file mode 100644 index 0af0f2d9b..000000000 --- a/community-testing/xmonad/xmonad.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Xmonad GNOME -Comment=Tiling window manager -TryExec=/usr/bin/gnome-session -Exec=gnome-session --session=xmonad -Type=XSession -Icon=/usr/share/pixmaps/xmonad.svg diff --git a/community-testing/xmonad/xmonad.install b/community-testing/xmonad/xmonad.install deleted file mode 100644 index 6659247db..000000000 --- a/community-testing/xmonad/xmonad.install +++ /dev/null @@ -1,22 +0,0 @@ -HS_DIR=/usr/share/haskell/xmonad - -post_install() { - ${HS_DIR}/register.sh - echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs" - echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples" - echo - echo "If you would like to run xmonad as a window manager inside GNOME, please see" - echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad" -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} diff --git a/community-testing/xmonad/xmonad.png b/community-testing/xmonad/xmonad.png Binary files differdeleted file mode 100644 index d957f62f8..000000000 --- a/community-testing/xmonad/xmonad.png +++ /dev/null diff --git a/community-testing/xmonad/xmonad.session b/community-testing/xmonad/xmonad.session deleted file mode 100644 index c0bd16781..000000000 --- a/community-testing/xmonad/xmonad.session +++ /dev/null @@ -1,6 +0,0 @@ -[GNOME Session] -Name=Xmonad session -RequiredComponents=gnome-panel;gnome-settings-daemon; -RequiredProviders=windowmanager;notifications; -DefaultProvider-windowmanager=xmonad -DefaultProvider-notifications=notification-daemon diff --git a/community-testing/xmonad/xmonad.svg b/community-testing/xmonad/xmonad.svg deleted file mode 100644 index 5fc884213..000000000 --- a/community-testing/xmonad/xmonad.svg +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg2211" - sodipodi:version="0.32" - inkscape:version="0.45.1" - width="47" - height="73" - version="1.0" - sodipodi:docbase="/home/sjanssen/xmonad-web/images" - sodipodi:docname="logo.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <metadata - id="metadata2216"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs2214" /> - <sodipodi:namedview - inkscape:window-height="778" - inkscape:window-width="1278" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - inkscape:zoom="4" - inkscape:cx="23.5" - inkscape:cy="22.689137" - inkscape:window-x="0" - inkscape:window-y="20" - inkscape:current-layer="g3208" /> - <g - id="g3208" - transform="translate(-44.517797,4.0967298)"> - <g - id="g3212" - transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)"> - <path - style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462" - id="text2220" - sodipodi:nodetypes="cccccccc" /> - <path - id="path3206" - d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349" - style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - sodipodi:nodetypes="ccccccccc" /> - </g> - <path - style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono" - d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z " - id="text3216" - sodipodi:nodetypes="ccccccccccccccccccccccccccc" /> - </g> -</svg> diff --git a/community-testing/znc/PKGBUILD b/community-testing/znc/PKGBUILD deleted file mode 100644 index 0bc108944..000000000 --- a/community-testing/znc/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $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/dosbox/PKGBUILD b/community/dosbox/PKGBUILD deleted file mode 100644 index 1f88ecec8..000000000 --- a/community/dosbox/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $ -# Maintainer : -# Contribute : Jelle van der Waa <jelle@vdwaa.nl> -# Contributor: James Rayner <james@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=dosbox -pkgver=0.74 -pkgrel=2 -pkgdesc="An emulator with builtin DOS for running DOS Games" -arch=('i686' 'x86_64') -url="http://dosbox.sourceforge.net/" -license=('GPL') -depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') -makedepends=('mesa') -source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'dosbox.png' 'dosbox.desktop' 'gcc46.patch') - -build(){ - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i $srcdir/gcc46.patch - sed -i 's/png_check_sig/png_sig_cmp/' configure - ./configure --prefix=/usr \ - --sysconfdir=/etc/dosbox - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - - # install docs, make does not install them - install -d $pkgdir/usr/share/doc/$pkgname - install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README - install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video - - install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop -} -md5sums=('b9b240fa87104421962d14eee71351e8' - '2aac25fc06979e375953fcc36824dc5e' - '85169ca599028bee8e29e0b3b7b34dd8' - '3fba2e3c7c43290319b2928f40ed30e5') diff --git a/community/dosbox/dosbox.desktop b/community/dosbox/dosbox.desktop deleted file mode 100644 index dbaf05ced..000000000 --- a/community/dosbox/dosbox.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=dosbox Emulator -GenericName=Emulator -Comment=An emulator to run old DOS games -Icon=dosbox -Exec=dosbox -Terminal=false -Categories=Emulator;Application; diff --git a/community/dosbox/dosbox.png b/community/dosbox/dosbox.png Binary files differdeleted file mode 100644 index b8a917986..000000000 --- a/community/dosbox/dosbox.png +++ /dev/null diff --git a/community/dosbox/gcc46.patch b/community/dosbox/gcc46.patch deleted file mode 100644 index eae9ae63e..000000000 --- a/community/dosbox/gcc46.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h ---- dosbox-0.74/include/dos_inc.h 2010-05-10 17:43:54.000000000 +0000 -+++ dosbox-0.74.new//include/dos_inc.h 2011-06-17 20:42:43.982548979 +0000 -@@ -28,6 +28,8 @@ - #include "mem.h" - #endif - -+#include <stddef.h> //for offsetof -+ - #ifdef _MSC_VER - #pragma pack (1) - #endif diff --git a/community/exaile/PKGBUILD b/community/exaile/PKGBUILD deleted file mode 100644 index 5b3c1a53e..000000000 --- a/community/exaile/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 40067 2011-02-19 20:19:46Z ebelanger $ -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: Benjamin Wild <benwild@gmx.de> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=exaile -pkgver=0.3.2.1 -pkgrel=1 -pkgdesc="A full-featured media player for GTK+" -arch=('i686' 'x86_64') -url="http://www.exaile.org" -license=('GPL') -depends=('python2' \ - 'gstreamer0.10-python' \ - 'gstreamer0.10-good-plugins' \ - 'mutagen' \ - 'dbus-python' \ - 'pygtk>=2.10' \ - 'librsvg') -makedepends=('make' 'help2man') -optdepends=('pycddb: CD metadata retrieval' \ - 'hal: device autodetection' \ - 'gstreamer0.10-bad-plugins: support for more formats' \ - 'gstreamer0.10-ugly-plugins: support for more formats' \ - 'gstreamer0.10-ffmpeg: support for more formats' \ - 'python-sexy: UI enhancements') -source=(https://www.launchpad.net/exaile/${pkgver%.*}/${pkgver}/+download/exaile-${pkgver}.tar.gz) -md5sums=('7ecfa9e52a9f2882717b3483518b604b') -sha1sums=('86e1451ab9e6f96077c9dfc59eea3d4dccb00cf0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # python2 fix - for file in $(find . -name Makefile -print) tools/generate-launcher; do - sed -i 's_python_python2_' $file - done - for file in plugins/*/*.py exaile.py; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file - done - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make PREFIX=/usr DESTDIR="${pkgdir}" install - - # fix for clicking files with spaces in names from nautilus - sed -i "s#%u#%f#" "${pkgdir}/usr/share/applications/exaile.desktop" -} diff --git a/community/libquicktime/PKGBUILD b/community/libquicktime/PKGBUILD deleted file mode 100644 index 45519978e..000000000 --- a/community/libquicktime/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 43669 2011-03-28 20:04:14Z ibiru $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=libquicktime -pkgver=1.2.2 -pkgrel=2 -pkgdesc="A library for reading and writing quicktime files." -arch=('i686' 'x86_64') -license=('GPL') -url="http://libquicktime.sourceforge.net/" -depends=('gtk2' 'ffmpeg' 'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --enable-gpl \ - --with-ffmpeg \ - --with-x264 \ - --without-doxygen - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - diff --git a/community/lilypond/lilypond-gcc45.patch b/community/lilypond/lilypond-gcc45.patch deleted file mode 100644 index 6af391ff3..000000000 --- a/community/lilypond/lilypond-gcc45.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc -index 99fe982..6949458 100644 ---- a/lily/spacing-spanner.cc -+++ b/lily/spacing-spanner.cc -@@ -38,8 +38,8 @@ Spacing_spanner::get_columns (Grob *me_grob) - vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT), - &Paper_column::less_than); - -- all = vector<Grob*>::vector<Grob*> (all.begin () + start, -- all.begin () + end + 1); -+ all = vector<Grob*> (all.begin () + start, -+ all.begin () + end + 1); - return all; - } - --- diff --git a/community/mediastreamer/PKGBUILD b/community/mediastreamer/PKGBUILD deleted file mode 100644 index 3eed51d6d..000000000 --- a/community/mediastreamer/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 49670 2011-06-19 06:56:40Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Adrià Arrufat <swiftscythe@gmail.com> - -pkgname=mediastreamer -pkgver=2.7.3 -pkgrel=3 -pkgdesc="A library written in C that allows you to create and run audio and video streams." -arch=('i686' 'x86_64') -url="http://www.linphone.org" -license=('GPL') -depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg') -makedepends=('cmake' 'automoc4') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "disable-v4l1.patch") -md5sums=('5213307f557d86aa648f1a53a885138c' - '7ee15689eed1adbdcf0ddab8fadca34a') -options=('!libtool') - -build() { - cd "$srcdir"/$pkgname-$pkgver/ - patch -p2 -i "${srcdir}"/disable-v4l1.patch - ./configure --prefix=/usr --libexecdir=/usr/lib/mediastreamer/ - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/community/mediastreamer/disable-v4l1.patch b/community/mediastreamer/disable-v4l1.patch deleted file mode 100644 index 9f6cb84d4..000000000 --- a/community/mediastreamer/disable-v4l1.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am ---- linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-02-09 08:43:11.000000000 +0000 -+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am 2011-04-01 14:54:04.000000000 +0000 -@@ -117,7 +117,7 @@ - endif - - if BUILD_V4L --libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c -+libmediastreamer_la_SOURCES+=msv4l2.c - endif - - if BUILD_WIN32 -diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in ---- linphone-3.4.3/mediastreamer2/src/Makefile.in 2011-03-28 18:34:07.000000000 +0000 -+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in 2011-04-01 14:55:00.000000000 +0000 -@@ -54,7 +54,7 @@ - @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c - @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c - @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m --@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c -+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c - @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c - @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c - @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \ -@@ -135,7 +135,7 @@ - audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \ - msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \ - msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \ -- aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \ -+ aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \ - drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \ - sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \ - h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \ -@@ -156,7 +156,7 @@ - @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo - @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo - @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo --@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo -+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo - @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \ - @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo - @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo -@@ -600,7 +600,6 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@ diff --git a/community/mime-editor/PKGBUILD b/community/mime-editor/PKGBUILD deleted file mode 100644 index ca450686e..000000000 --- a/community/mime-editor/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 27254 2010-09-18 22:01:47Z schuay $ -# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.dot.org> - -pkgname=mime-editor -pkgver=0.6 -pkgrel=2 -pkgdesc='Shared-mime info database editor, useful for changing MIME-type info in rox applications' -arch=('i686' 'x86_64') -url='http://rox.sourceforge.net/mime_editor.html' -license=('GPL2') -depends=('pygtk' 'rox-lib' 'shared-mime-info') -groups=('rox-desktop') -source=("http://downloads.sourceforge.net/project/rox/MIME-Editor/${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'mime-editor') -md5sums=('bfa250d074b6a712c1fce936a5fcaae4' - '9438b0a8d591abd03099ac5961540d4a') - -build() { - cd ${pkgname}-${pkgver} - - # python2 fix - for file in $(find . -name '*.py' -print) MIME-Editor/AppRun; do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - mkdir -p ${pkgdir}/usr/share - - cp -rp MIME-Editor ${pkgdir}/usr/share - - # create a shellscript which is known in the PATH - install -D ${srcdir}/$pkgname ${pkgdir}/usr/bin/$pkgname -} diff --git a/community/mime-editor/mime-editor b/community/mime-editor/mime-editor deleted file mode 100644 index 17e1acfca..000000000 --- a/community/mime-editor/mime-editor +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/share/MIME-Editor/AppRun "$@" diff --git a/community/perl-gstreamer-interfaces/ChangeLog b/community/perl-gstreamer-interfaces/ChangeLog deleted file mode 100644 index 5fa6b829c..000000000 --- a/community/perl-gstreamer-interfaces/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2008-04-28 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 0.04 - - * ChangeLog: added diff --git a/community/perl-gstreamer/ChangeLog b/community/perl-gstreamer/ChangeLog deleted file mode 100644 index adbbf82e5..000000000 --- a/community/perl-gstreamer/ChangeLog +++ /dev/null @@ -1,13 +0,0 @@ -2009-02-28 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 0.15 - -2008-12-06 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 0.12 - -2008-04-28 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 0.10 - - * ChangeLog: added diff --git a/community/perl-gtk2-mozembed/missing-pixbuf.patch b/community/perl-gtk2-mozembed/missing-pixbuf.patch deleted file mode 100644 index f78a683e3..000000000 --- a/community/perl-gtk2-mozembed/missing-pixbuf.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up Gtk2-MozEmbed-0.08/Makefile.PL.pixbuf Gtk2-MozEmbed-0.08/Makefile.PL ---- Gtk2-MozEmbed-0.08/Makefile.PL.pixbuf 2010-08-11 13:34:16.000000000 +0200 -+++ Gtk2-MozEmbed-0.08/Makefile.PL 2010-08-11 13:35:36.000000000 +0200 -@@ -54,6 +54,8 @@ my %pkgcfg = ExtUtils::PkgConfig->find( - "firefox-gtkmozembed >= $build_reqs{'Firefox'}", - "mozilla-firefox-gtkmozembed >= $build_reqs{'Firefox'}"); - -+my %pkgcfg_pixbuf = ExtUtils::PkgConfig->find("gdk-pixbuf-2.0"); -+ - mkdir 'build', 0777; - - our @xs_files = <xs/*.xs>; -@@ -73,8 +75,8 @@ ExtUtils::PkgConfig->write_version_macro - $pkg => "GTK_MOZ_EMBED", - ); - --my $inc = $pkgcfg{cflags}; --my $libs = $pkgcfg{libs}; -+my $inc = $pkgcfg{cflags} ." ". $pkgcfg_pixbuf{cflags}; -+my $libs = $pkgcfg{libs} . " ". $pkgcfg_pixbuf{libs}; - - if ($libs =~ m#(lib|lib64)/xulrunner-(devel|sdk)-([^/]+)#) { - $inc .= qq( -DGTK_MOZ_EMBED_PERL_XULRUNNER_PATH=) diff --git a/community/perl-gtk2-webkit/ChangeLog b/community/perl-gtk2-webkit/ChangeLog deleted file mode 100644 index 9664112d0..000000000 --- a/community/perl-gtk2-webkit/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -2009-04-16 Corrado Primier <bardo@aur.archlinux.org> - - * Release bump: 2 - -2009-02-28 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 0.04 - -2008-12-01 Corrado Primier <bardo@aur.archlinux.org> - - * Release bump: 2 - - * PKGBUILD: fixed license (Artistic -> PerlArtistic) - -2008-12-01 Corrado Primier <bardo@aur.archlinux.org> - - * PKGBUILD: moved to [community] diff --git a/community/picard/picard.install b/community/picard/picard.install deleted file mode 100644 index c0797237a..000000000 --- a/community/picard/picard.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/rtorrent/ncurses58.patch b/community/rtorrent/ncurses58.patch deleted file mode 100644 index 0f742daad..000000000 --- a/community/rtorrent/ncurses58.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/display/canvas.h 2011-03-01 14:56:25.000000000 +0800
-+++ src/display/canvasfix.h 2011-03-01 14:56:10.000000000 +0800
-@@ -48,7 +48,7 @@ class Canvas {
- public:
- typedef std::vector<Attributes> attributes_list;
-
-- Canvas(int x = 0, int y = 0, int width = 0, int height = 0) :
-+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1) :
- m_window(newwin(height, width, y, x)) {}
- ~Canvas() { delwin(m_window); }
\ No newline at end of file diff --git a/community/rutilt/PKGBUILD b/community/rutilt/PKGBUILD deleted file mode 100644 index 1e8f78738..000000000 --- a/community/rutilt/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 1149 2009-08-12 22:31:02Z ibiru $ -# Maintainer: Giovanni Scafora <linuxmania@gmail.com> -# Contributor: Jesus Lazaro Plaza <jesuslazaro84@gmail.com> - -pkgname=rutilt -pkgver=0.18 -pkgrel=2 -pkgdesc="Gtk2 utility that helps you configure your wireless network devices" -arch=('i686' 'x86_64') -url="http://bonrom.cbbknet.com" -license=('GPL2') -depends=('gtk2' 'xdg-utils') -makedepends=('wireless_tools') -install=rutilt.install -source=(http://bonrom.cbbknet.com/files/RutilTv0.18.tar.gz) -md5sums=('c745af9fbadd3a843b6f8273b6eb71bd') - -build() { - cd ${startdir}/src/RutilTv${pkgver} - ./configure.sh --prefix=/usr - make || return 1 - make DESTDIR="$startdir/pkg" install -} diff --git a/community/rutilt/rutilt.install b/community/rutilt/rutilt.install deleted file mode 100644 index b8397905a..000000000 --- a/community/rutilt/rutilt.install +++ /dev/null @@ -1,24 +0,0 @@ -# arg 1: the new package version -post_install() { -which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true - -cat << EOF - -==> Remember to install "dhclient" or customize the "set_ip.sh" to match -==> your needs, don't forget that it is executed with root privileges. -==> Note: rutilt 0.16 doesn't read the old configs, so you have to -==> recreate/rename it. - -EOF -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - diff --git a/community/solfege/solfege.desktop b/community/solfege/solfege.desktop deleted file mode 100644 index 10c62089c..000000000 --- a/community/solfege/solfege.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=GNU Solfege -Exec=solfege -Terminal=false -Type=Application -Icon=solfege -Categories=Audio;Music;Education; diff --git a/community/solfege/solfege.install b/community/solfege/solfege.install deleted file mode 100644 index 003382003..000000000 --- a/community/solfege/solfege.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - echo "==> To get sound out of MIDI-based components like Rhythm:" - echo - echo "Preferences > Sound Setup > Use external MIDI player" - echo - echo "==> And make sure you have timidity++ installed and configured," - echo "==> otherwise you need a capable hardware MIDI player to use" - echo "==> the ALSA/OSS MIDI devices." -} -# vim:set ts=2 sw=2 et: diff --git a/community/synbak/PKGBUILD b/community/synbak/PKGBUILD deleted file mode 100644 index f615a51cf..000000000 --- a/community/synbak/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 24902 2010-08-29 17:21:27Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: aeolist <aeolist@hotmail.com> - -pkgname=synbak -pkgver=1.3.2 -pkgrel=1 -pkgdesc='Meant to unify several backup methods in a single application while supplying a powerful reporting system' -arch=('i686' 'x86_64') -url='http://www.initzero.it/products/opensource/synbak' -license=('GPL') -depends=('bc' 'gnu-netcat') -changelog=$pkgname.changelog -source=(http://www.initzero.it/products/opensource/${pkgname}/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('72212d57f4fa2675e3ced19936784a51') - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community/synbak/synbak.changelog b/community/synbak/synbak.changelog deleted file mode 100644 index 757f1a45c..000000000 --- a/community/synbak/synbak.changelog +++ /dev/null @@ -1,9 +0,0 @@ -2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - - * synbak 1.3.2-1 - * upstream release - -2009-11-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - - * synbak 1.2.2-1 - * upstream release diff --git a/community/thunar-thumbnailers/PKGBUILD b/community/thunar-thumbnailers/PKGBUILD deleted file mode 100755 index 4772f1339..000000000 --- a/community/thunar-thumbnailers/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 35176 2010-12-16 23:26:22Z andrea $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: boromil@gmail.com - -pkgname=thunar-thumbnailers -pkgver=0.4.1 -pkgrel=3 -pkgdesc="The thunar-thumbnailers project provides additional thumbnailers for Thunar, that also cover less common file formats" -url="http://goodies.xfce.org/projects/thunar-plugins/thunar-thumbnailers/" -license=('GPL2') -arch=('i686' 'x86_64') -groups=('xfce4-goodies') -depends=('imagemagick' 'ffmpegthumbnailer') -optdepends=('raw-thumbnailer: support for Raw Digital Camera Images' - 'dcraw: support for Raw Digital Camera Image') -makedepends=('raw-thumbnailer' 'dcraw' 'unzip') -options=('!libtool') -install=thunar-thumbnailers.install -source=(http://archive.xfce.org/src/apps/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2) -md5sums=('041b8aa0576e15491661741d1868547f') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --enable-ffmpeg --enable-raw \ - --libexecdir=/usr/lib/xfce4 - - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community/thunar-thumbnailers/thunar-thumbnailers.install b/community/thunar-thumbnailers/thunar-thumbnailers.install deleted file mode 100644 index b62faf707..000000000 --- a/community/thunar-thumbnailers/thunar-thumbnailers.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { -cat << _EOF -==> important installation notes: - ---------------------------------------- - After installing it is necessary to run: - /usr/lib/thunar-vfs-update-thumbnailers-cache-1 - as a user to regenerate the cache of thumbnailers. - You may also need to log out and back in for the new - thumbnailers to work. -_EOF - -} - -post_upgrade() { - post_install -} diff --git a/community/tripwire/ChangeLog b/community/tripwire/ChangeLog deleted file mode 100644 index 9fd3b124d..000000000 --- a/community/tripwire/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2009-05-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#13766 fixed - -2007-06-28 tardo <tardo@nagi-fanboi.net> - * Built for x86_64 diff --git a/community/tripwire/PKGBUILD b/community/tripwire/PKGBUILD deleted file mode 100644 index 6f87618d9..000000000 --- a/community/tripwire/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 14337 2010-04-02 23:17:36Z foutrelis $ -# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: eliott <eliott@cactuswax.net> - -pkgname=tripwire -pkgver=2.4.1.2 -pkgrel=2 -pkgdesc="An intrusion detection system." -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/tripwire/" -license=('GPL') -depends=('openssl') -backup=('etc/tripwire/twpol.txt' 'etc/tripwire/twcfg.txt') -install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \ - twpol.txt twcfg.txt) - -md5sums=('8a1147c278b528ed593023912c4b649a' - '82900de7500bf6a6f90d8b9f20c4ee44' - '4b44d8179e247a638ee2752543405753') - -build() { - cd ${srcdir}/$pkgname-$pkgver-src - -#build package - ./configure --prefix=/usr --sysconfdir=/etc/tripwire - make || return 1 - - # This package doesn't have a typical make install, so we do it by hand. - #make DESTDIR=${pkgdir} install || return 1 - -#create var/lib directories - install -d ${pkgdir}/var/lib || return 1 - install -d -m700 ${pkgdir}/var/lib/tripwire || return 1 - install -d -m700 ${pkgdir}/var/lib/tripwire/report || return 1 - -#install binaries - install -d ${pkgdir}/usr/sbin || return 1 - install -m755 bin/siggen ${pkgdir}/usr/sbin/ || return 1 - install -m755 bin/tripwire ${pkgdir}/usr/sbin/ || return 1 - install -m755 bin/twadmin ${pkgdir}/usr/sbin/ || return 1 - install -m755 bin/twprint ${pkgdir}/usr/sbin/ || return 1 - -#copy install files for use by user after install, and fix a path - install -d ${pkgdir}/usr/share/$pkgname || return 1 - install -m755 install/install.sh ${pkgdir}/usr/share/$pkgname/ || return 1 - install -m644 install/install.cfg ${pkgdir}/usr/share/$pkgname/ || return 1 - sed -i 's#./install/install.cfg#./install.cfg#' ${pkgdir}/usr/share/$pkgname/install.sh || return 1 - -#install man pages - FS#13766 fixed - install -d ${pkgdir}/usr/share/man/{man4,man5,man8} || return 1 - install -m644 man/man4/*.4 ${pkgdir}/usr/share/man/man4/ || return 1 - install -m644 man/man5/*.5 ${pkgdir}/usr/share/man/man5/ || return 1 - install -m644 man/man8/*.8 ${pkgdir}/usr/share/man/man8/ || return 1 - -#install configuration files - install -d ${pkgdir}/etc/$pkgname || return 1 - install -m644 ${srcdir}/twpol.txt ${pkgdir}/etc/tripwire/twpol.txt || return 1 - install -m644 ${srcdir}/twcfg.txt ${pkgdir}/etc/tripwire/twcfg.txt || return 1 -} diff --git a/community/tripwire/tripwire.install b/community/tripwire/tripwire.install deleted file mode 100644 index 6eb5fd71d..000000000 --- a/community/tripwire/tripwire.install +++ /dev/null @@ -1,9 +0,0 @@ -# arg 1: the new package version -post_install() { -/bin/cat <<END -After installing this package, edit /usr/share/tripwire/install.sh and -/usr/share/tripwire/install.cfg to your liking, run install.sh to -generate cryptographic keys, and run tripwire --init to initialize the -database. -END -} diff --git a/community/tripwire/twcfg.txt b/community/tripwire/twcfg.txt deleted file mode 100644 index d4392be0b..000000000 --- a/community/tripwire/twcfg.txt +++ /dev/null @@ -1,15 +0,0 @@ -ROOT =/usr/sbin -POLFILE =/etc/tripwire/tw.pol -DBFILE =/var/lib/tripwire/$(HOSTNAME).twd -REPORTFILE =/var/lib/tripwire/report/$(HOSTNAME)-$(DATE).twr -SITEKEYFILE =/etc/tripwire/site.key -LOCALKEYFILE =/etc/tripwire/$(HOSTNAME)-local.key -EDITOR =/usr/bin/vi -LATEPROMPTING =false -LOOSEDIRECTORYCHECKING =false -MAILNOVIOLATIONS =true -EMAILREPORTLEVEL =3 -REPORTLEVEL =3 -MAILMETHOD =SENDMAIL -SYSLOGREPORTING =false -MAILPROGRAM =/usr/sbin/sendmail -oi -t diff --git a/community/tripwire/twpol.txt b/community/tripwire/twpol.txt deleted file mode 100644 index 051804889..000000000 --- a/community/tripwire/twpol.txt +++ /dev/null @@ -1,1093 +0,0 @@ - ############################################################################## - # ## -############################################################################## # -# # # -# This is the example Tripwire Policy file. It is intended as a place to # # -# start creating your own custom Tripwire Policy file. Referring to it as # # -# well as the Tripwire Policy Guide should give you enough information to # # -# make a good custom Tripwire Policy file that better covers your # # -# configuration and security needs. A text version of this policy file is # # -# called twpol.txt. # # -# # # -# Note that this file is tuned to an 'everything' install of Red Hat Linux. # # -# If run unmodified, this file should create no errors on database # # -# creation, or violations on a subsiquent integrity check. However, it is # # -# impossible for there to be one policy file for all machines, so this # # -# existing one errs on the side of security. Your Linux configuration will # # -# most likey differ from the one our policy file was tuned to, and will # # -# therefore require some editing of the default Tripwire Policy file. # # -# # # -# The example policy file is best run with 'Loose Directory Checking' # # -# enabled. Set LOOSEDIRECTORYCHECKING=TRUE in the Tripwire Configuration # # -# file. # # -# # # -# Email support is not included and must be added to this file. # # -# Add the 'emailto=' to the rule directive section of each rule (add a comma # # -# after the 'severity=' line and add an 'emailto=' and include the email # # -# addresses you want the violation reports to go to). Addresses are # # -# semi-colon delimited. # # -# ## -############################################################################## - - - - ############################################################################## - # ## -############################################################################## # -# # # -# Global Variable Definitions # # -# # # -# These are defined at install time by the installation script. You may # # -# Manually edit these if you are using this file directly and not from the # # -# installation script itself. # # -# ## -############################################################################## - -@@section GLOBAL -TWROOT=/usr/sbin; -TWBIN=/usr/sbin; -TWPOL="/etc/tripwire"; -TWDB="/var/lib/tripwire"; -TWSKEY="/etc/tripwire"; -TWLKEY="/etc/tripwire"; -TWREPORT="/var/lib/tripwire/report"; -HOSTNAME=localhost; - -@@section FS -SEC_CRIT = $(IgnoreNone)-SHa ; # Critical files that cannot change -SEC_SUID = $(IgnoreNone)-SHa ; # Binaries with the SUID or SGID flags set -SEC_BIN = $(ReadOnly) ; # Binaries that should not change -SEC_CONFIG = $(Dynamic) ; # Config files that are changed infrequently but accessed often -SEC_LOG = $(Growing) ; # Files that grow, but that should never change ownership -SEC_INVARIANT = +tpug ; # Directories that should never change permission or ownership -SIG_LOW = 33 ; # Non-critical files that are of minimal security impact -SIG_MED = 66 ; # Non-critical files that are of significant security impact -SIG_HI = 100 ; # Critical files that are significant points of vulnerability - - -# Tripwire Binaries -( - rulename = "Tripwire Binaries", - severity = $(SIG_HI) -) -{ - $(TWBIN)/siggen -> $(SEC_BIN) ; - $(TWBIN)/tripwire -> $(SEC_BIN) ; - $(TWBIN)/twadmin -> $(SEC_BIN) ; - $(TWBIN)/twprint -> $(SEC_BIN) ; -} - -# Tripwire Data Files - Configuration Files, Policy Files, Keys, Reports, Databases -( - rulename = "Tripwire Data Files", - severity = $(SIG_HI) -) -{ - # NOTE: We remove the inode attribute because when Tripwire creates a backup, - # it does so by renaming the old file and creating a new one (which will - # have a new inode number). Inode is left turned on for keys, which shouldn't - # ever change. - - # NOTE: The first integrity check triggers this rule and each integrity check - # afterward triggers this rule until a database update is run, since the - # database file does not exist before that point. - - $(TWDB) -> $(SEC_CONFIG) -i ; - $(TWPOL)/tw.pol -> $(SEC_BIN) -i ; - $(TWPOL)/tw.cfg -> $(SEC_BIN) -i ; - $(TWLKEY)/$(HOSTNAME)-local.key -> $(SEC_BIN) ; - $(TWSKEY)/site.key -> $(SEC_BIN) ; - - #don't scan the individual reports - $(TWREPORT) -> $(SEC_CONFIG) (recurse=0) ; -} - - -# Tripwire HQ Connector Binaries -#( -# rulename = "Tripwire HQ Connector Binaries", -# severity = $(SIG_HI) -#) -#{ -# $(TWBIN)/hqagent -> $(SEC_BIN) ; -#} -# -# Tripwire HQ Connector - Configuration Files, Keys, and Logs - - ############################################################################## - # ## -############################################################################## # -# # # -# Note: File locations here are different than in a stock HQ Connector # # -# installation. This is because Tripwire 2.3 uses a different path # # -# structure than Tripwire 2.2.1. # # -# # # -# You may need to update your HQ Agent configuation file (or this policy # # -# file) to correct the paths. We have attempted to support the FHS standard # # -# here by placing the HQ Agent files similarly to the way Tripwire 2.3 # # -# places them. # # -# ## -############################################################################## - -#( -# rulename = "Tripwire HQ Connector Data Files", -# severity = $(SIG_HI) -#) -#{ -# ############################################################################# -# ############################################################################## -# # NOTE: Removing the inode attribute because when Tripwire creates a backup ## -# # it does so by renaming the old file and creating a new one (which will ## -# # have a new inode number). Leaving inode turned on for keys, which ## -# # shouldn't ever change. ## -# ############################################################################# -# -# $(TWBIN)/agent.cfg -> $(SEC_BIN) -i ; -# $(TWLKEY)/authentication.key -> $(SEC_BIN) ; -# $(TWDB)/tasks.dat -> $(SEC_CONFIG) ; -# $(TWDB)/schedule.dat -> $(SEC_CONFIG) ; -# -# # Uncomment if you have agent logging enabled. -# #/var/log/tripwire/agent.log -> $(SEC_LOG) ; -#} - - - -# Commonly accessed directories that should remain static with regards to owner and group -( - rulename = "Invariant Directories", - severity = $(SIG_MED) -) -{ - / -> $(SEC_INVARIANT) (recurse = 0) ; - /home -> $(SEC_INVARIANT) (recurse = 0) ; - /etc -> $(SEC_INVARIANT) (recurse = 0) ; -} - ################################################ - # ## -################################################ # -# # # -# File System and Disk Administration Programs # # -# ## -################################################ - -( - rulename = "File System and Disk Administraton Programs", - severity = $(SIG_HI) -) -{ - /sbin/accton -> $(SEC_CRIT) ; - /sbin/badblocks -> $(SEC_CRIT) ; - /sbin/busybox -> $(SEC_CRIT) ; - /sbin/busybox.anaconda -> $(SEC_CRIT) ; - /sbin/convertquota -> $(SEC_CRIT) ; - /sbin/dosfsck -> $(SEC_CRIT) ; - /sbin/debugfs -> $(SEC_CRIT) ; - /sbin/debugreiserfs -> $(SEC_CRIT) ; - /sbin/dumpe2fs -> $(SEC_CRIT) ; - /sbin/dump -> $(SEC_CRIT) ; - /sbin/dump.static -> $(SEC_CRIT) ; - # /sbin/e2fsadm -> $(SEC_CRIT) ; tune2fs? - /sbin/e2fsck -> $(SEC_CRIT) ; - /sbin/e2label -> $(SEC_CRIT) ; - /sbin/fdisk -> $(SEC_CRIT) ; - /sbin/fsck -> $(SEC_CRIT) ; - /sbin/fsck.ext2 -> $(SEC_CRIT) ; - /sbin/fsck.ext3 -> $(SEC_CRIT) ; - /sbin/fsck.minix -> $(SEC_CRIT) ; - /sbin/fsck.msdos -> $(SEC_CRIT) ; - /sbin/fsck.vfat -> $(SEC_CRIT) ; - /sbin/ftl_check -> $(SEC_CRIT) ; - /sbin/ftl_format -> $(SEC_CRIT) ; - /sbin/hdparm -> $(SEC_CRIT) ; - #/sbin/lvchange -> $(SEC_CRIT) ; - #/sbin/lvcreate -> $(SEC_CRIT) ; - #/sbin/lvdisplay -> $(SEC_CRIT) ; - #/sbin/lvextend -> $(SEC_CRIT) ; - #/sbin/lvmchange -> $(SEC_CRIT) ; - #/sbin/lvmcreate_initrd -> $(SEC_CRIT) ; - #/sbin/lvmdiskscan -> $(SEC_CRIT) ; - #/sbin/lvmsadc -> $(SEC_CRIT) ; - #/sbin/lvmsar -> $(SEC_CRIT) ; - #/sbin/lvreduce -> $(SEC_CRIT) ; - #/sbin/lvremove -> $(SEC_CRIT) ; - #/sbin/lvrename -> $(SEC_CRIT) ; - #/sbin/lvscan -> $(SEC_CRIT) ; - /sbin/mkbootdisk -> $(SEC_CRIT) ; - /sbin/mkdosfs -> $(SEC_CRIT) ; - /sbin/mke2fs -> $(SEC_CRIT) ; - /sbin/mkfs -> $(SEC_CRIT) ; - /sbin/mkfs.bfs -> $(SEC_CRIT) ; - /sbin/mkfs.ext2 -> $(SEC_CRIT) ; - /sbin/mkfs.minix -> $(SEC_CRIT) ; - /sbin/mkfs.msdos -> $(SEC_CRIT) ; - /sbin/mkfs.vfat -> $(SEC_CRIT) ; - /sbin/mkinitrd -> $(SEC_CRIT) ; - #/sbin/mkpv -> $(SEC_CRIT) ; - /sbin/mkraid -> $(SEC_CRIT) ; - /sbin/mkreiserfs -> $(SEC_CRIT) ; - /sbin/mkswap -> $(SEC_CRIT) ; - #/sbin/mtx -> $(SEC_CRIT) ; - /sbin/pam_console_apply -> $(SEC_CRIT) ; - /sbin/parted -> $(SEC_CRIT) ; - /sbin/pcinitrd -> $(SEC_CRIT) ; - #/sbin/pvchange -> $(SEC_CRIT) ; - #/sbin/pvcreate -> $(SEC_CRIT) ; - #/sbin/pvdata -> $(SEC_CRIT) ; - #/sbin/pvdisplay -> $(SEC_CRIT) ; - #/sbin/pvmove -> $(SEC_CRIT) ; - #/sbin/pvscan -> $(SEC_CRIT) ; - /sbin/quotacheck -> $(SEC_CRIT) ; - /sbin/quotaon -> $(SEC_CRIT) ; - /sbin/raidstart -> $(SEC_CRIT) ; - /sbin/reiserfsck -> $(SEC_CRIT) ; - /sbin/resize2fs -> $(SEC_CRIT) ; - /sbin/resize_reiserfs -> $(SEC_CRIT) ; - /sbin/restore -> $(SEC_CRIT) ; - /sbin/restore.static -> $(SEC_CRIT) ; - /sbin/scsi_info -> $(SEC_CRIT) ; - /sbin/sfdisk -> $(SEC_CRIT) ; - /sbin/stinit -> $(SEC_CRIT) ; - #/sbin/tapeinfo -> $(SEC_CRIT) ; - /sbin/tune2fs -> $(SEC_CRIT) ; - /sbin/unpack -> $(SEC_CRIT) ; - /sbin/update -> $(SEC_CRIT) ; - #/sbin/vgcfgbackup -> $(SEC_CRIT) ; - #/sbin/vgcfgrestore -> $(SEC_CRIT) ; - #/sbin/vgchange -> $(SEC_CRIT) ; - #/sbin/vgck -> $(SEC_CRIT) ; - #/sbin/vgcreate -> $(SEC_CRIT) ; - #/sbin/vgdisplay -> $(SEC_CRIT) ; - #/sbin/vgexport -> $(SEC_CRIT) ; - #/sbin/vgextend -> $(SEC_CRIT) ; - #/sbin/vgimport -> $(SEC_CRIT) ; - #/sbin/vgmerge -> $(SEC_CRIT) ; - #/sbin/vgmknodes -> $(SEC_CRIT) ; - #/sbin/vgreduce -> $(SEC_CRIT) ; - #/sbin/vgremove -> $(SEC_CRIT) ; - #/sbin/vgrename -> $(SEC_CRIT) ; - #/sbin/vgscan -> $(SEC_CRIT) ; - #/sbin/vgsplit -> $(SEC_CRIT) ; - /bin/chgrp -> $(SEC_CRIT) ; - /bin/chmod -> $(SEC_CRIT) ; - /bin/chown -> $(SEC_CRIT) ; - /bin/cp -> $(SEC_CRIT) ; - /bin/cpio -> $(SEC_CRIT) ; - /bin/mount -> $(SEC_CRIT) ; - /bin/umount -> $(SEC_CRIT) ; - /bin/mkdir -> $(SEC_CRIT) ; - /bin/mknod -> $(SEC_CRIT) ; - /bin/mktemp -> $(SEC_CRIT) ; - /bin/rm -> $(SEC_CRIT) ; - /bin/rmdir -> $(SEC_CRIT) ; - /bin/touch -> $(SEC_CRIT) ; -} - - ################################## - # ## -################################## # -# # # -# Kernel Administration Programs # # -# ## -################################## - -( - rulename = "Kernel Administration Programs", - severity = $(SIG_HI) -) -{ - /sbin/adjtimex -> $(SEC_CRIT) ; - /sbin/ctrlaltdel -> $(SEC_CRIT) ; - /sbin/depmod -> $(SEC_CRIT) ; - /sbin/insmod -> $(SEC_CRIT) ; - /sbin/insmod.static -> $(SEC_CRIT) ; - /sbin/insmod_ksymoops_clean -> $(SEC_CRIT) ; - /sbin/klogd -> $(SEC_CRIT) ; - /sbin/ldconfig -> $(SEC_CRIT) ; - /sbin/minilogd -> $(SEC_CRIT) ; - /sbin/modinfo -> $(SEC_CRIT) ; - #/sbin/nuactlun -> $(SEC_CRIT) ; - #/sbin/nuscsitcpd -> $(SEC_CRIT) ; - /sbin/pivot_root -> $(SEC_CRIT) ; - /sbin/sndconfig -> $(SEC_CRIT) ; - /sbin/sysctl -> $(SEC_CRIT) ; -} - - ####################### - # ## -####################### # -# # # -# Networking Programs # # -# ## -####################### - -( - rulename = "Networking Programs", - severity = $(SIG_HI) -) -{ - /etc/sysconfig/network-scripts/ifdown -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifdown-cipcb -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifdown-ippp -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifdown-ipv6 -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifdown-isdn -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifdown-post -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifdown-ppp -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifdown-sit -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifdown-sl -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-aliases -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-cipcb -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-ippp -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-ipv6 -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-isdn -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-plip -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-plusb -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-post -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-ppp -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-routes -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-sit -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-sl -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/ifup-wireless -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/network-functions -> $(SEC_CRIT) ; - /etc/sysconfig/network-scripts/network-functions-ipv6 -> $(SEC_CRIT) ; - /bin/ping -> $(SEC_CRIT) ; - /sbin/agetty -> $(SEC_CRIT) ; - /sbin/arp -> $(SEC_CRIT) ; - /sbin/arping -> $(SEC_CRIT) ; - /sbin/dhcpcd -> $(SEC_CRIT) ; - /sbin/ether-wake -> $(SEC_CRIT) ; - #/sbin/getty -> $(SEC_CRIT) ; - /sbin/ifcfg -> $(SEC_CRIT) ; - /sbin/ifconfig -> $(SEC_CRIT) ; - /sbin/ifdown -> $(SEC_CRIT) ; - /sbin/ifenslave -> $(SEC_CRIT) ; - /sbin/ifport -> $(SEC_CRIT) ; - /sbin/ifup -> $(SEC_CRIT) ; - /sbin/ifuser -> $(SEC_CRIT) ; - /sbin/ip -> $(SEC_CRIT) ; - /sbin/ip6tables -> $(SEC_CRIT) ; - /sbin/ipchains -> $(SEC_CRIT) ; - /sbin/ipchains-restore -> $(SEC_CRIT) ; - /sbin/ipchains-save -> $(SEC_CRIT) ; - /sbin/ipfwadm -> $(SEC_CRIT) ; - /sbin/ipmaddr -> $(SEC_CRIT) ; - /sbin/iptables -> $(SEC_CRIT) ; - /sbin/iptables-restore -> $(SEC_CRIT) ; - /sbin/iptables-save -> $(SEC_CRIT) ; - /sbin/iptunnel -> $(SEC_CRIT) ; - /sbin/ipvsadm -> $(SEC_CRIT) ; - /sbin/ipvsadm-restore -> $(SEC_CRIT) ; - /sbin/ipvsadm-save -> $(SEC_CRIT) ; - /sbin/ipx_configure -> $(SEC_CRIT) ; - /sbin/ipx_interface -> $(SEC_CRIT) ; - /sbin/ipx_internal_net -> $(SEC_CRIT) ; - /sbin/iwconfig -> $(SEC_CRIT) ; - /sbin/iwgetid -> $(SEC_CRIT) ; - /sbin/iwlist -> $(SEC_CRIT) ; - /sbin/iwpriv -> $(SEC_CRIT) ; - /sbin/iwspy -> $(SEC_CRIT) ; - /sbin/mgetty -> $(SEC_CRIT) ; - /sbin/mingetty -> $(SEC_CRIT) ; - /sbin/nameif -> $(SEC_CRIT) ; - /sbin/netreport -> $(SEC_CRIT) ; - /sbin/plipconfig -> $(SEC_CRIT) ; - /sbin/portmap -> $(SEC_CRIT) ; - /sbin/ppp-watch -> $(SEC_CRIT) ; - #/sbin/rarp -> $(SEC_CRIT) ; - /sbin/route -> $(SEC_CRIT) ; - /sbin/slattach -> $(SEC_CRIT) ; - /sbin/tc -> $(SEC_CRIT) ; - #/sbin/uugetty -> $(SEC_CRIT) ; - /sbin/vgetty -> $(SEC_CRIT) ; - /sbin/ypbind -> $(SEC_CRIT) ; -} - - ################################## - # ## -################################## # -# # # -# System Administration Programs # # -# ## -################################## - -( - rulename = "System Administration Programs", - severity = $(SIG_HI) -) -{ - /sbin/chkconfig -> $(SEC_CRIT) ; - /sbin/fuser -> $(SEC_CRIT) ; - /sbin/halt -> $(SEC_CRIT) ; - /sbin/init -> $(SEC_CRIT) ; - /sbin/initlog -> $(SEC_CRIT) ; - /sbin/install-info -> $(SEC_CRIT) ; - /sbin/killall5 -> $(SEC_CRIT) ; - #/sbin/linuxconf -> $(SEC_CRIT) ; - #/sbin/linuxconf-auth -> $(SEC_CRIT) ; - /sbin/pam_tally -> $(SEC_CRIT) ; - /sbin/pwdb_chkpwd -> $(SEC_CRIT) ; - #/sbin/remadmin -> $(SEC_CRIT) ; - /sbin/rescuept -> $(SEC_CRIT) ; - /sbin/rmt -> $(SEC_CRIT) ; - /sbin/rpc.lockd -> $(SEC_CRIT) ; - /sbin/rpc.statd -> $(SEC_CRIT) ; - /sbin/rpcdebug -> $(SEC_CRIT) ; - /sbin/service -> $(SEC_CRIT) ; - /sbin/setsysfont -> $(SEC_CRIT) ; - /sbin/shutdown -> $(SEC_CRIT) ; - /sbin/sulogin -> $(SEC_CRIT) ; - /sbin/swapon -> $(SEC_CRIT) ; - /sbin/syslogd -> $(SEC_CRIT) ; - /sbin/unix_chkpwd -> $(SEC_CRIT) ; - /bin/pwd -> $(SEC_CRIT) ; - /bin/uname -> $(SEC_CRIT) ; -} - - ######################################## - # ## -######################################## # -# # # -# Hardware and Device Control Programs # # -# ## -######################################## -( - rulename = "Hardware and Device Control Programs", - severity = $(SIG_HI) -) -{ - /bin/setserial -> $(SEC_CRIT) ; - /bin/sfxload -> $(SEC_CRIT) ; - /sbin/blockdev -> $(SEC_CRIT) ; - /sbin/cardctl -> $(SEC_CRIT) ; - /sbin/cardmgr -> $(SEC_CRIT) ; - /sbin/cbq -> $(SEC_CRIT) ; - /sbin/dump_cis -> $(SEC_CRIT) ; - /sbin/elvtune -> $(SEC_CRIT) ; - /sbin/hotplug -> $(SEC_CRIT) ; - /sbin/hwclock -> $(SEC_CRIT) ; - /sbin/ide_info -> $(SEC_CRIT) ; - #/sbin/isapnp -> $(SEC_CRIT) ; - #/sbin/kbdrate -> $(SEC_CRIT) ; - /sbin/losetup -> $(SEC_CRIT) ; - /sbin/lspci -> $(SEC_CRIT) ; - /sbin/lspnp -> $(SEC_CRIT) ; - /sbin/mii-tool -> $(SEC_CRIT) ; - /sbin/pack_cis -> $(SEC_CRIT) ; - #/sbin/pnpdump -> $(SEC_CRIT) ; - /sbin/probe -> $(SEC_CRIT) ; - #/sbin/pump -> $(SEC_CRIT) ; - /sbin/setpci -> $(SEC_CRIT) ; - /sbin/shapecfg -> $(SEC_CRIT) ; -} - - ############################### - # ## -############################### # -# # # -# System Information Programs # # -# ## -############################### -( - rulename = "System Information Programs", - severity = $(SIG_HI) -) -{ - /sbin/consoletype -> $(SEC_CRIT) ; - /sbin/kernelversion -> $(SEC_CRIT) ; - /sbin/runlevel -> $(SEC_CRIT) ; -} - - #################################### - # ## -#################################### # -# # # -# Application Information Programs # # -# ## -#################################### - -( - rulename = "Application Information Programs", - severity = $(SIG_HI) -) -{ - /sbin/genksyms -> $(SEC_CRIT) ; - #/sbin/genksyms.old -> $(SEC_CRIT) ; - /sbin/rtmon -> $(SEC_CRIT) ; -} - - ########################## - # ## -########################## # -# # # -# Shell Related Programs # # -# ## -########################## -( - rulename = "Shell Related Programs", - severity = $(SIG_HI) -) -{ - /sbin/getkey -> $(SEC_CRIT) ; - /sbin/nash -> $(SEC_CRIT) ; - /sbin/sash -> $(SEC_CRIT) ; -} - - - ################ - # ## -################ # -# # # -# OS Utilities # # -# ## -################ -( - rulename = "Operating System Utilities", - severity = $(SIG_HI) -) -{ - /bin/arch -> $(SEC_CRIT) ; - /bin/ash -> $(SEC_CRIT) ; - /bin/ash.static -> $(SEC_CRIT) ; - /bin/aumix-minimal -> $(SEC_CRIT) ; - /bin/basename -> $(SEC_CRIT) ; - /bin/cat -> $(SEC_CRIT) ; - #/bin/consolechars -> $(SEC_CRIT) ; - /bin/cut -> $(SEC_CRIT) ; - /bin/date -> $(SEC_CRIT) ; - /bin/dd -> $(SEC_CRIT) ; - /bin/df -> $(SEC_CRIT) ; - /bin/dmesg -> $(SEC_CRIT) ; - /bin/doexec -> $(SEC_CRIT) ; - /bin/echo -> $(SEC_CRIT) ; - /bin/ed -> $(SEC_CRIT) ; - /bin/egrep -> $(SEC_CRIT) ; - /bin/false -> $(SEC_CRIT) ; - /bin/fgrep -> $(SEC_CRIT) ; - /bin/gawk -> $(SEC_CRIT) ; - /bin/gawk-3.1.0 -> $(SEC_CRIT) ; - /bin/gettext -> $(SEC_CRIT) ; - /bin/grep -> $(SEC_CRIT) ; - /bin/gunzip -> $(SEC_CRIT) ; - /bin/gzip -> $(SEC_CRIT) ; - /bin/hostname -> $(SEC_CRIT) ; - /bin/igawk -> $(SEC_CRIT) ; - /bin/ipcalc -> $(SEC_CRIT) ; - /bin/kill -> $(SEC_CRIT) ; - /bin/ln -> $(SEC_CRIT) ; - /bin/loadkeys -> $(SEC_CRIT) ; - /bin/login -> $(SEC_CRIT) ; - /bin/ls -> $(SEC_CRIT) ; - /bin/mail -> $(SEC_CRIT) ; - /bin/more -> $(SEC_CRIT) ; - /bin/mt -> $(SEC_CRIT) ; - /bin/mv -> $(SEC_CRIT) ; - /bin/netstat -> $(SEC_CRIT) ; - /bin/nice -> $(SEC_CRIT) ; - /bin/pgawk -> $(SEC_CRIT) ; - /bin/ps -> $(SEC_CRIT) ; - /bin/rpm -> $(SEC_CRIT) ; - /bin/sed -> $(SEC_CRIT) ; - /bin/sleep -> $(SEC_CRIT) ; - /bin/sort -> $(SEC_CRIT) ; - /bin/stty -> $(SEC_CRIT) ; - /bin/su -> $(SEC_CRIT) ; - /bin/sync -> $(SEC_CRIT) ; - /bin/tar -> $(SEC_CRIT) ; - /bin/true -> $(SEC_CRIT) ; - /bin/usleep -> $(SEC_CRIT) ; - /bin/vi -> $(SEC_CRIT) ; - /bin/zcat -> $(SEC_CRIT) ; - /bin/zsh -> $(SEC_CRIT) ; - /bin/zsh-4.0.2 -> $(SEC_CRIT) ; - /sbin/sln -> $(SEC_CRIT) ; - /usr/bin/vimtutor -> $(SEC_CRIT) ; -} - - ############################## - # ## -############################## # -# # # -# Critical Utility Sym-Links # # -# ## -############################## -( - rulename = "Critical Utility Sym-Links", - severity = $(SIG_HI) -) -{ - #/sbin/askrunlevel -> $(SEC_CRIT) ; - /sbin/clock -> $(SEC_CRIT) ; - #/sbin/fixperm -> $(SEC_CRIT) ; - /sbin/fsck.reiserfs -> $(SEC_CRIT) ; - #/sbin/fsconf -> $(SEC_CRIT) ; - /sbin/ipfwadm-wrapper -> $(SEC_CRIT) ; - /sbin/kallsyms -> $(SEC_CRIT) ; - /sbin/ksyms -> $(SEC_CRIT) ; - /sbin/lsmod -> $(SEC_CRIT) ; - #/sbin/mailconf -> $(SEC_CRIT) ; - /sbin/mkfs.reiserfs -> $(SEC_CRIT) ; - #/sbin/modemconf -> $(SEC_CRIT) ; - /sbin/modprobe -> $(SEC_CRIT) ; - /sbin/mount.ncp -> $(SEC_CRIT) ; - /sbin/mount.ncpfs -> $(SEC_CRIT) ; - /sbin/mount.smb -> $(SEC_CRIT) ; - /sbin/mount.smbfs -> $(SEC_CRIT) ; - #/sbin/netconf -> $(SEC_CRIT) ; - /sbin/pidof -> $(SEC_CRIT) ; - /sbin/poweroff -> $(SEC_CRIT) ; - /sbin/quotaoff -> $(SEC_CRIT) ; - /sbin/raid0run -> $(SEC_CRIT) ; - /sbin/raidhotadd -> $(SEC_CRIT) ; - /sbin/raidhotgenerateerror -> $(SEC_CRIT) ; - /sbin/raidhotremove -> $(SEC_CRIT) ; - /sbin/raidstop -> $(SEC_CRIT) ; - /sbin/rdump -> $(SEC_CRIT) ; - /sbin/rdump.static -> $(SEC_CRIT) ; - /sbin/reboot -> $(SEC_CRIT) ; - /sbin/rmmod -> $(SEC_CRIT) ; - /sbin/rrestore -> $(SEC_CRIT) ; - /sbin/rrestore.static -> $(SEC_CRIT) ; - /sbin/swapoff -> $(SEC_CRIT) ; - /sbin/telinit -> $(SEC_CRIT) ; - #/sbin/userconf -> $(SEC_CRIT) ; - #/sbin/uucpconf -> $(SEC_CRIT) ; - #/sbin/vregistry -> $(SEC_CRIT) ; - /bin/awk -> $(SEC_CRIT) ; - /bin/bash2 -> $(SEC_CRIT) ; - /bin/bsh -> $(SEC_CRIT) ; - /bin/csh -> $(SEC_CRIT) ; - /bin/dnsdomainname -> $(SEC_CRIT) ; - /bin/domainname -> $(SEC_CRIT) ; - /bin/ex -> $(SEC_CRIT) ; - /bin/gtar -> $(SEC_CRIT) ; - /bin/nisdomainname -> $(SEC_CRIT) ; - /bin/red -> $(SEC_CRIT) ; - /bin/rvi -> $(SEC_CRIT) ; - /bin/rview -> $(SEC_CRIT) ; - /bin/view -> $(SEC_CRIT) ; - /bin/ypdomainname -> $(SEC_CRIT) ; -} - - - ######################### - # ## -######################### # -# # # -# Temporary directories # # -# ## -######################### -( - rulename = "Temporary directories", - recurse = false, - severity = $(SIG_LOW) -) -{ - /usr/tmp -> $(SEC_INVARIANT) ; - /var/tmp -> $(SEC_INVARIANT) ; - /tmp -> $(SEC_INVARIANT) ; -} - - ############### - # ## -############### # -# # # -# Local files # # -# ## -############### -( - rulename = "User binaries", - severity = $(SIG_MED) -) -{ - /sbin -> $(SEC_BIN) (recurse = 1) ; - /usr/bin -> $(SEC_BIN) (recurse = 1) ; - /usr/sbin -> $(SEC_BIN) (recurse = 1) ; - /usr/local/bin -> $(SEC_BIN) (recurse = 1) ; -} - -( - rulename = "Shell Binaries", - severity = $(SIG_HI) -) -{ - /bin/bash -> $(SEC_BIN) ; - /bin/ksh -> $(SEC_BIN) ; - # /bin/psh -> $(SEC_BIN) ; # No longer used? - # /bin/Rsh -> $(SEC_BIN) ; # No longer used? - /bin/sh -> $(SEC_BIN) ; - # /bin/shell -> $(SEC_SUID) ; # No longer used? - # /bin/tsh -> $(SEC_BIN) ; # No longer used? - /bin/tcsh -> $(SEC_BIN) ; - /sbin/nologin -> $(SEC_BIN) ; -} - -( - rulename = "Security Control", - severity = $(SIG_HI) -) -{ - /etc/group -> $(SEC_CRIT) ; - /etc/security -> $(SEC_CRIT) ; - #/var/spool/cron/crontabs -> $(SEC_CRIT) ; # Uncomment when this file exists -} - -#( -# rulename = "Boot Scripts", -# severity = $(SIG_HI) -#) -#{ -# /etc/rc -> $(SEC_CONFIG) ; -# /etc/rc.bsdnet -> $(SEC_CONFIG) ; -# /etc/rc.dt -> $(SEC_CONFIG) ; -# /etc/rc.net -> $(SEC_CONFIG) ; -# /etc/rc.net.serial -> $(SEC_CONFIG) ; -# /etc/rc.nfs -> $(SEC_CONFIG) ; -# /etc/rc.powerfail -> $(SEC_CONFIG) ; -# /etc/rc.tcpip -> $(SEC_CONFIG) ; -# /etc/trcfmt.Z -> $(SEC_CONFIG) ; -#} - -( - rulename = "Login Scripts", - severity = $(SIG_HI) -) -{ - /etc/bashrc -> $(SEC_CONFIG) ; - /etc/csh.cshrc -> $(SEC_CONFIG) ; - /etc/csh.login -> $(SEC_CONFIG) ; - /etc/inputrc -> $(SEC_CONFIG) ; - # /etc/tsh_profile -> $(SEC_CONFIG) ; #Uncomment when this file exists - /etc/profile -> $(SEC_CONFIG) ; -} - -# Libraries -( - rulename = "Libraries", - severity = $(SIG_MED) -) -{ - /usr/lib -> $(SEC_BIN) ; - /usr/local/lib -> $(SEC_BIN) ; -} - - - ###################################################### - # ## -###################################################### # -# # # -# Critical System Boot Files # # -# These files are critical to a correct system boot. # # -# ## -###################################################### - -( - rulename = "Critical system boot files", - severity = $(SIG_HI) -) -{ - /boot -> $(SEC_CRIT) ; - #/sbin/devfsd -> $(SEC_CRIT) ; - /sbin/grub -> $(SEC_CRIT) ; - /sbin/grub-install -> $(SEC_CRIT) ; - /sbin/grub-md5-crypt -> $(SEC_CRIT) ; - /sbin/installkernel -> $(SEC_CRIT) ; - /sbin/lilo -> $(SEC_CRIT) ; - /sbin/mkkerneldoth -> $(SEC_CRIT) ; - !/boot/System.map ; - !/boot/module-info ; - /usr/share/grub/i386-redhat/e2fs_stage1_5 -> $(SEC_CRIT) ; - /usr/share/grub/i386-redhat/fat_stage1_5 -> $(SEC_CRIT) ; - /usr/share/grub/i386-redhat/ffs_stage1_5 -> $(SEC_CRIT) ; - /usr/share/grub/i386-redhat/minix_stage1_5 -> $(SEC_CRIT) ; - /usr/share/grub/i386-redhat/reiserfs_stage1_5 -> $(SEC_CRIT) ; - /usr/share/grub/i386-redhat/stage1 -> $(SEC_CRIT) ; - /usr/share/grub/i386-redhat/stage2 -> $(SEC_CRIT) ; - /usr/share/grub/i386-redhat/vstafs_stage1_5 -> $(SEC_CRIT) ; - # other boot files may exist. Look for: - #/ufsboot -> $(SEC_CRIT) ; -} - ################################################## - ################################################### - # These files change every time the system boots ## - ################################################## -( - rulename = "System boot changes", - severity = $(SIG_HI) -) -{ - !/var/run/ftp.pids-all ; # Comes and goes on reboot. - !/root/.enlightenment ; - /dev/log -> $(SEC_CONFIG) ; - /dev/cua0 -> $(SEC_CONFIG) ; - # /dev/printer -> $(SEC_CONFIG) ; # Uncomment if you have a printer device - /dev/console -> $(SEC_CONFIG) -u ; # User ID may change on console login/logout. - /dev/tty1 -> $(SEC_CONFIG) ; # tty devices - /dev/tty2 -> $(SEC_CONFIG) ; # tty devices - /dev/tty3 -> $(SEC_CONFIG) ; # are extremely - /dev/tty4 -> $(SEC_CONFIG) ; # variable - /dev/tty5 -> $(SEC_CONFIG) ; - /dev/tty6 -> $(SEC_CONFIG) ; - /dev/urandom -> $(SEC_CONFIG) ; - /dev/initctl -> $(SEC_CONFIG) ; - /var/lock/subsys -> $(SEC_CONFIG) ; - /var/lock/subsys/amd -> $(SEC_CONFIG) ; - /var/lock/subsys/anacron -> $(SEC_CONFIG) ; - /var/lock/subsys/apmd -> $(SEC_CONFIG) ; - /var/lock/subsys/arpwatch -> $(SEC_CONFIG) ; - /var/lock/subsys/atd -> $(SEC_CONFIG) ; - /var/lock/subsys/autofs -> $(SEC_CONFIG) ; - /var/lock/subsys/bcm5820 -> $(SEC_CONFIG) ; - /var/lock/subsys/bgpd -> $(SEC_CONFIG) ; - /var/lock/subsys/bootparamd -> $(SEC_CONFIG) ; - /var/lock/subsys/canna -> $(SEC_CONFIG) ; - /var/lock/subsys/crond -> $(SEC_CONFIG) ; - /var/lock/subsys/cWnn -> $(SEC_CONFIG) ; - /var/lock/subsys/dhcpd -> $(SEC_CONFIG) ; - /var/lock/subsys/firewall -> $(SEC_CONFIG) ; - /var/lock/subsys/freeWnn -> $(SEC_CONFIG) ; - /var/lock/subsys/gated -> $(SEC_CONFIG) ; - /var/lock/subsys/gpm -> $(SEC_CONFIG) ; - /var/lock/subsys/httpd -> $(SEC_CONFIG) ; - /var/lock/subsys/identd -> $(SEC_CONFIG) ; - /var/lock/subsys/innd -> $(SEC_CONFIG) ; - /var/lock/subsys/ipchains -> $(SEC_CONFIG) ; - /var/lock/subsys/iptables -> $(SEC_CONFIG) ; - /var/lock/subsys/ipvsadm -> $(SEC_CONFIG) ; - /var/lock/subsys/irda -> $(SEC_CONFIG) ; - /var/lock/subsys/iscsi -> $(SEC_CONFIG) ; - /var/lock/subsys/isdn -> $(SEC_CONFIG) ; - /var/lock/subsys/junkbuster -> $(SEC_CONFIG) ; - /var/lock/subsys/kadmin -> $(SEC_CONFIG) ; - /var/lock/subsys/keytable -> $(SEC_CONFIG) ; - /var/lock/subsys/kprop -> $(SEC_CONFIG) ; - /var/lock/subsys/krb524 -> $(SEC_CONFIG) ; - /var/lock/subsys/krb5kdc -> $(SEC_CONFIG) ; - /var/lock/subsys/kudzu -> $(SEC_CONFIG) ; - /var/lock/subsys/kWnn -> $(SEC_CONFIG) ; - /var/lock/subsys/ldap -> $(SEC_CONFIG) ; - /var/lock/subsys/linuxconf -> $(SEC_CONFIG) ; - /var/lock/subsys/lpd -> $(SEC_CONFIG) ; - /var/lock/subsys/mars_nwe -> $(SEC_CONFIG) ; - /var/lock/subsys/mcserv -> $(SEC_CONFIG) ; - /var/lock/subsys/mysqld -> $(SEC_CONFIG) ; - /var/lock/subsys/named -> $(SEC_CONFIG) ; - /var/lock/subsys/netfs -> $(SEC_CONFIG) ; - /var/lock/subsys/network -> $(SEC_CONFIG) ; - /var/lock/subsys/nfs -> $(SEC_CONFIG) ; - /var/lock/subsys/nfslock -> $(SEC_CONFIG) ; - /var/lock/subsys/nscd -> $(SEC_CONFIG) ; - /var/lock/subsys/ntpd -> $(SEC_CONFIG) ; - /var/lock/subsys/ospf6d -> $(SEC_CONFIG) ; - /var/lock/subsys/ospfd -> $(SEC_CONFIG) ; - /var/lock/subsys/pcmcia -> $(SEC_CONFIG) ; - /var/lock/subsys/portmap -> $(SEC_CONFIG) ; - /var/lock/subsys/postgresql -> $(SEC_CONFIG) ; - /var/lock/subsys/pxe -> $(SEC_CONFIG) ; - /var/lock/subsys/radvd -> $(SEC_CONFIG) ; - /var/lock/subsys/random -> $(SEC_CONFIG) ; - /var/lock/subsys/rarpd -> $(SEC_CONFIG) ; - /var/lock/subsys/reconfig -> $(SEC_CONFIG) ; - /var/lock/subsys/rhnsd -> $(SEC_CONFIG) ; - /var/lock/subsys/ripd -> $(SEC_CONFIG) ; - /var/lock/subsys/ripngd -> $(SEC_CONFIG) ; - /var/lock/subsys/routed -> $(SEC_CONFIG) ; - /var/lock/subsys/rstatd -> $(SEC_CONFIG) ; - /var/lock/subsys/rusersd -> $(SEC_CONFIG) ; - /var/lock/subsys/rwalld -> $(SEC_CONFIG) ; - /var/lock/subsys/rwhod -> $(SEC_CONFIG) ; - /var/lock/subsys/sendmail -> $(SEC_CONFIG) ; - /var/lock/subsys/smb -> $(SEC_CONFIG) ; - /var/lock/subsys/snmpd -> $(SEC_CONFIG) ; - /var/lock/subsys/squid -> $(SEC_CONFIG) ; - /var/lock/subsys/sshd -> $(SEC_CONFIG) ; - /var/lock/subsys/syslog -> $(SEC_CONFIG) ; - /var/lock/subsys/tux -> $(SEC_CONFIG) ; - /var/lock/subsys/tWnn -> $(SEC_CONFIG) ; - /var/lock/subsys/ups -> $(SEC_CONFIG) ; - /var/lock/subsys/vncserver -> $(SEC_CONFIG) ; - /var/lock/subsys/wine -> $(SEC_CONFIG) ; - /var/lock/subsys/xfs -> $(SEC_CONFIG) ; - /var/lock/subsys/xinetd -> $(SEC_CONFIG) ; - /var/lock/subsys/ypbind -> $(SEC_CONFIG) ; - /var/lock/subsys/yppasswdd -> $(SEC_CONFIG) ; - /var/lock/subsys/ypserv -> $(SEC_CONFIG) ; - /var/lock/subsys/ypxfrd -> $(SEC_CONFIG) ; - /var/lock/subsys/zebra -> $(SEC_CONFIG) ; - /var/run -> $(SEC_CONFIG) ; - /var/log -> $(SEC_CONFIG) ; - /etc/ioctl.save -> $(SEC_CONFIG) ; - /etc/issue.net -> $(SEC_CONFIG) -i ; # Inode number changes - /etc/issue -> $(SEC_CONFIG) ; - /etc/mtab -> $(SEC_CONFIG) -i ; # Inode number changes on any mount/unmount - /lib/modules -> $(SEC_CONFIG) ; - /etc/.pwd.lock -> $(SEC_CONFIG) ; - # /lib/modules/preferred -> $(SEC_CONFIG) ; #Uncomment when this file exists -} - -# These files change the behavior of the root account -( - rulename = "Root config files", - severity = 100 -) -{ - /root -> $(SEC_CRIT) ; # Catch all additions to /root - /root/.Xresources -> $(SEC_CONFIG) ; - /root/.bashrc -> $(SEC_CONFIG) ; - /root/.bash_profile -> $(SEC_CONFIG) ; - /root/.bash_logout -> $(SEC_CONFIG) ; - /root/.cshrc -> $(SEC_CONFIG) ; - /root/.tcshrc -> $(SEC_CONFIG) ; - #/root/Mail -> $(SEC_CONFIG) ; - #/root/mail -> $(SEC_CONFIG) ; - #/root/.amandahosts -> $(SEC_CONFIG) ; - #/root/.addressbook.lu -> $(SEC_CONFIG) ; - #/root/.addressbook -> $(SEC_CONFIG) ; - /root/.bash_history -> $(SEC_CONFIG) ; - #/root/.elm -> $(SEC_CONFIG) ; - /root/.esd_auth -> $(SEC_CONFIG) ; - /root/.gnome_private -> $(SEC_CONFIG) ; - /root/.gnome-desktop -> $(SEC_CONFIG) ; - /root/.gnome -> $(SEC_CONFIG) ; - /root/.ICEauthority -> $(SEC_CONFIG) ; - #/root/.mc -> $(SEC_CONFIG) ; - #/root/.pinerc -> $(SEC_CONFIG) ; - #/root/.sawfish -> $(SEC_CONFIG) ; - /root/.Xauthority -> $(SEC_CONFIG) -i ; # Changes Inode number on login - #/root/.xauth -> $(SEC_CONFIG) ; - #/root/.xsession-errors -> $(SEC_CONFIG) ; -} - - ################################ - # ## -################################ # -# # # -# Critical configuration files # # -# ## -################################ -( - rulename = "Critical configuration files", - severity = $(SIG_HI) -) -{ - #/etc/conf.linuxconf -> $(SEC_BIN) ; - /etc/crontab -> $(SEC_BIN) ; - /etc/cron.hourly -> $(SEC_BIN) ; - /etc/cron.daily -> $(SEC_BIN) ; - /etc/cron.weekly -> $(SEC_BIN) ; - /etc/cron.monthly -> $(SEC_BIN) ; - /etc/default -> $(SEC_BIN) ; - /etc/fstab -> $(SEC_BIN) ; - /etc/exports -> $(SEC_BIN) ; - /etc/group- -> $(SEC_BIN) ; # changes should be infrequent - /etc/host.conf -> $(SEC_BIN) ; - /etc/hosts.allow -> $(SEC_BIN) ; - /etc/hosts.deny -> $(SEC_BIN) ; - /etc/httpd/conf -> $(SEC_BIN) ; # changes should be infrequent - /etc/protocols -> $(SEC_BIN) ; - /etc/services -> $(SEC_BIN) ; - /etc/rc.d/init.d -> $(SEC_BIN) ; - /etc/rc.d -> $(SEC_BIN) ; - /etc/mail.rc -> $(SEC_BIN) ; - /etc/modules.conf -> $(SEC_BIN) ; - /etc/motd -> $(SEC_BIN) ; - /etc/named.conf -> $(SEC_BIN) ; - /etc/passwd -> $(SEC_CONFIG) ; - /etc/passwd- -> $(SEC_CONFIG) ; - /etc/profile.d -> $(SEC_BIN) ; - /var/lib/nfs/rmtab -> $(SEC_BIN) ; - /usr/sbin/fixrmtab -> $(SEC_BIN) ; - /etc/rpc -> $(SEC_BIN) ; - /etc/sysconfig -> $(SEC_BIN) ; - /etc/samba/smb.conf -> $(SEC_CONFIG) ; - #/etc/gettydefs -> $(SEC_BIN) ; - /etc/nsswitch.conf -> $(SEC_BIN) ; - /etc/yp.conf -> $(SEC_BIN) ; - /etc/hosts -> $(SEC_CONFIG) ; - /etc/xinetd.conf -> $(SEC_CONFIG) ; - /etc/inittab -> $(SEC_CONFIG) ; - /etc/resolv.conf -> $(SEC_CONFIG) ; - /etc/syslog.conf -> $(SEC_CONFIG) ; -} - - #################### - # ## -#################### # -# # # -# Critical devices # # -# ## -#################### -( - rulename = "Critical devices", - severity = $(SIG_HI), - recurse = false -) -{ - /dev/kmem -> $(Device) ; - /dev/mem -> $(Device) ; - /dev/null -> $(Device) ; - /dev/zero -> $(Device) ; - /proc/devices -> $(Device) ; - /proc/net -> $(Device) ; - /proc/sys -> $(Device) ; - /proc/cpuinfo -> $(Device) ; - /proc/modules -> $(Device) ; - /proc/mounts -> $(Device) ; - /proc/dma -> $(Device) ; - /proc/filesystems -> $(Device) ; - /proc/pci -> $(Device) ; - /proc/interrupts -> $(Device) ; - /proc/driver/rtc -> $(Device) ; - /proc/ioports -> $(Device) ; - /proc/scsi -> $(Device) ; - /proc/kcore -> $(Device) ; - /proc/self -> $(Device) ; - /proc/kmsg -> $(Device) ; - /proc/stat -> $(Device) ; - /proc/ksyms -> $(Device) ; - /proc/loadavg -> $(Device) ; - /proc/uptime -> $(Device) ; - /proc/locks -> $(Device) ; - /proc/version -> $(Device) ; - /proc/mdstat -> $(Device) ; - /proc/meminfo -> $(Device) ; - /proc/cmdline -> $(Device) ; - /proc/misc -> $(Device) ; -} - -# Rest of critical system binaries -( - rulename = "OS executables and libraries", - severity = $(SIG_HI) -) -{ - /bin -> $(SEC_BIN) ; - /lib -> $(SEC_BIN) ; -} - -#============================================================================= -# -# Copyright 2000 Tripwire, Inc. Tripwire is a registered trademark of Tripwire, -# Inc. in the United States and other countries. All rights reserved. -# -# Linux is a registered trademark of Linus Torvalds. -# -# UNIX is a registered trademark of The Open Group. -# -#============================================================================= -# -# Permission is granted to make and distribute verbatim copies of this document -# provided the copyright notice and this permission notice are preserved on all -# copies. -# -# Permission is granted to copy and distribute modified versions of this -# document under the conditions for verbatim copying, provided that the entire -# resulting derived work is distributed under the terms of a permission notice -# identical to this one. -# -# Permission is granted to copy and distribute translations of this document -# into another language, under the above conditions for modified versions, -# except that this permission notice may be stated in a translation approved by -# Tripwire, Inc. -# -# DCM diff --git a/community/wifi-radar/PKGBUILD b/community/wifi-radar/PKGBUILD deleted file mode 100644 index 11ff48cc2..000000000 --- a/community/wifi-radar/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 31375 2010-10-31 12:54:04Z lfleischer $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: dtw <dibble.at.thewrecker.dot.net> -# Contributor: shawnifoley http://bbs.archlinux.org/viewtopic.php?t=11492 -# Contributor: sebastien le guillerm <geekitus@tele2.fr> - -pkgname=wifi-radar -pkgver=2.0.s08 -pkgrel=2 -pkgdesc="A PyGTK2 utility for managing WiFi profiles" -arch=('i686' 'x86_64') -url="http://wifi-radar.berlios.de/" -license=('GPL') -depends=('pygtk' 'wireless_tools' 'sudo') -backup=('etc/wifi-radar.conf') -install=$pkgname.install -source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('cbad24805d5dc6696e38dc1df619c819') - -build() { - cd ${srcdir}/$pkgname-$pkgver - - # python2 fix - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' wifi-radar - -# Fix iwlist and iwconfig path - sed -i 's|/sbin/iwlist|/usr/sbin/iwlist|' $pkgname - sed -i 's|/sbin/iwconfig|/usr/sbin/iwconfig|' $pkgname - - make || return 1 - make DESTDIR=${pkgdir}/usr sysconfdir=${pkgdir}/etc install -} diff --git a/community/wifi-radar/wifi-radar.install b/community/wifi-radar/wifi-radar.install deleted file mode 100644 index 91f62bd14..000000000 --- a/community/wifi-radar/wifi-radar.install +++ /dev/null @@ -1,4 +0,0 @@ -post_remove(){ - rm etc/wifi-radar.conf &> /dev/null - rm var/log/wifi-radar.log &> /dev/null -} diff --git a/community/xulrunner-oss/PKGBUILD b/community/xulrunner-oss/PKGBUILD deleted file mode 100644 index 613d9f41b..000000000 --- a/community/xulrunner-oss/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 114705 2011-03-15 15:11:28Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -pkgname=xulrunner-oss -pkgver=2.0.1 -_ffoxver=4.0.1 -pkgrel=2 -pkgdesc="Mozilla Runtime Environment compiled with OSS support" -arch=('i686' 'x86_64') -license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libevent' 'sqlite3>=3.7.4' 'libnotify') -makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') -url="http://wiki.mozilla.org/XUL:Xul_Runner" -source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2 - mozconfig - mozilla-pkgconfig.patch - xulrunner-version.patch - xulrunner-omnijar.patch - port_gnomevfs_to_gio.patch - oss.patch) -options=('!emptydirs') -conflicts=('xulrunner') -provides=("xulrunner=${pkgver}") -md5sums=('9abda7d23151e97913c8555a64c13f34' - '2358a2ddd35bcdd62ff42442dfe548d9' - '639ea80e823543dd415b90c0ee804186' - 'a0236f6c3e55f60b7888d8cf137ff209' - '0bf82bc6677e3ce57fd20a147fe8d7b1' - '42f83468b296452fb754a81a4317ca64' - '81032ce49c2a5ac15d62155bcc42d3ed') - -build() { - cd "${srcdir}/mozilla-2.0" - cp "${srcdir}/mozconfig" .mozconfig - - #fix libdir/sdkdir - fedora - patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch" - - #Force installation to the same path for every version - patch -Np1 -i "${srcdir}/xulrunner-version.patch" - - patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch" - - patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch" - - patch -Np0 -i "${srcdir}/oss.patch" - sed -i 's/sydney_audio_alsa/sydney_audio_oss/' media/libsydneyaudio/src/Makefile.in - sed -i '/EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)/d' layout/build/Makefile.in - sed -i '/EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)/d' toolkit/library/libxul-config.mk - - unset CFLAGS - unset CXXFLAGS - export CXXFLAGS="-fpermissive" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" -} - -package() { - cd "${srcdir}/mozilla-2.0" - make -j1 -f client.mk DESTDIR="${pkgdir}" install - - #Remove included dictionaries, add symlink to system myspell path. - #Note: this will cause file conflicts when users have installed dictionaries in the old location - rm -rf "${pkgdir}/usr/lib/xulrunner-2.0/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-2.0/dictionaries" - - # add xulrunner library path to ld.so.conf - install -d ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/xulrunner-2.0" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf -} diff --git a/community/xulrunner-oss/mozconfig b/community/xulrunner-oss/mozconfig deleted file mode 100644 index 03a352920..000000000 --- a/community/xulrunner-oss/mozconfig +++ /dev/null @@ -1,56 +0,0 @@ -. $topsrcdir/xulrunner/config/mozconfig - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-cairo -ac_add_options --with-pthreads - -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-safe-browsing -ac_add_options --enable-extensions=default -ac_add_options --enable-startup-notification -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-smil -ac_add_options --enable-canvas3d -ac_add_options --enable-places -ac_add_options --enable-shared-js -ac_add_options --enable-url-classifier - -ac_add_options --enable-optimize -ac_add_options --enable-strip -ac_add_options --enable-install-strip -ac_add_options --enable-jemalloc -ac_add_options --enable-xterm-updates -ac_add_options --enable-printing -ac_add_options --enable-xinerama - -ac_add_options --disable-javaxpcom -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-xprint -ac_add_options --disable-mochitest -ac_add_options --disable-debug -ac_add_options --disable-installer -ac_add_options --disable-pedantic - -ac_add_options --enable-gio -ac_add_options --disable-gnomevfs -ac_add_options --enable-gconf -ac_add_options --enable-libnotify - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 diff --git a/community/xulrunner-oss/mozilla-pkgconfig.patch b/community/xulrunner-oss/mozilla-pkgconfig.patch deleted file mode 100644 index 2203efcde..000000000 --- a/community/xulrunner-oss/mozilla-pkgconfig.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in ---- mozilla-2.0.orig/xulrunner/installer/libxul-embedding.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/libxul-embedding.pc.in 2011-03-13 03:25:12.350027359 -0700 -@@ -6,5 +6,6 @@ - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue -ldl - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -Nur mozilla-2.0.orig/xulrunner/installer/libxul.pc.in mozilla-2.0/xulrunner/installer/libxul.pc.in ---- mozilla-2.0.orig/xulrunner/installer/libxul.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/libxul.pc.in 2011-03-13 03:25:28.010027359 -0700 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - idldir=%idldir% - -diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in ---- mozilla-2.0.orig/xulrunner/installer/Makefile.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/Makefile.in 2011-03-13 03:25:55.570027359 -0700 -@@ -121,6 +121,7 @@ - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2011-03-13 03:26:18.676694023 -0700 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- mozilla-2.0.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/mozilla-gtkmozembed.pc.in 2011-03-13 03:26:41.566694025 -0700 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -Nur mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in mozilla-2.0/xulrunner/installer/mozilla-js.pc.in ---- mozilla-2.0.orig/xulrunner/installer/mozilla-js.pc.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/mozilla-js.pc.in 2011-03-13 03:27:19.680027357 -0700 -@@ -7,4 +7,4 @@ - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib %MOZ_JS_LINK% --Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE -+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/community/xulrunner-oss/oss.patch b/community/xulrunner-oss/oss.patch deleted file mode 100644 index ca79879fd..000000000 --- a/community/xulrunner-oss/oss.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- configure.in 2011-03-16 04:58:10.640027357 -0700 -+++ configure.in.orig 2011-03-16 04:58:39.313360691 -0700 -@@ -6266,20 +6266,6 @@ - AC_DEFINE(MOZ_TREMOR) - fi - --dnl ======================================================== --dnl = Check alsa availability on Linux if using sydneyaudio --dnl ======================================================== -- --dnl If using sydneyaudio with Linux, ensure that the alsa library is available --if test -n "$MOZ_SYDNEYAUDIO"; then -- case "$target_os" in --linux*) -- PKG_CHECK_MODULES(MOZ_ALSA, alsa, , -- [echo "$MOZ_ALSA_PKG_ERRORS" -- AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) -- ;; -- esac --fi - - dnl ======================================================== - dnl Splashscreen -@@ -9294,7 +9280,6 @@ - AC_SUBST(MOZ_TREMOR) - AC_SUBST(MOZ_WEBM) - AC_SUBST(MOZ_OGG) --AC_SUBST(MOZ_ALSA_LIBS) - AC_SUBST(VPX_AS) - AC_SUBST(VPX_ASFLAGS) - AC_SUBST(VPX_DASH_C_FLAG) diff --git a/community/xulrunner-oss/port_gnomevfs_to_gio.patch b/community/xulrunner-oss/port_gnomevfs_to_gio.patch deleted file mode 100644 index 797baff42..000000000 --- a/community/xulrunner-oss/port_gnomevfs_to_gio.patch +++ /dev/null @@ -1,1316 +0,0 @@ -diff -r 49a1b2aa43c5 extensions/gio/Makefile.in ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/extensions/gio/Makefile.in Tue Jan 11 11:17:52 2011 +0100 -@@ -0,0 +1,69 @@ -+# vim:set ts=8 sw=8 sts=8 noet: -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is the Mozilla gnome-vfs extension. -+# -+# The Initial Developer of the Original Code is IBM Corporation. -+# -+# Portions created by IBM Corporation are Copyright (C) 2004 -+# IBM Corporation. All Rights Reserved. -+# -+# Contributor(s): -+# Darin Fisher <darin@meer.net> -+# Jan Horak <jhorak@redhat.com> -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+DEPTH = ../.. -+topsrcdir = @top_srcdir@ -+srcdir = @srcdir@ -+VPATH = @srcdir@ -+ -+include $(DEPTH)/config/autoconf.mk -+ -+MODULE = nkgio -+LIBRARY_NAME = nkgio -+SHORT_LIBNAME = nkgio -+IS_COMPONENT = 1 -+ -+CPPSRCS = \ -+ nsGIOProtocolHandler.cpp \ -+ $(NULL) -+ -+LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) -+ -+EXTRA_DSO_LDOPTS = \ -+ $(XPCOM_GLUE_LDOPTS) \ -+ $(NSPR_LIBS) \ -+ $(MOZ_GIO_LIBS) \ -+ $(NULL) -+ -+# make sure this component is never statically linked into the main -+# application. this is necessary since we don't want to force users -+# to install gio in order to use the rest of mozilla ;-) -+FORCE_SHARED_LIB= 1 -+ -+include $(topsrcdir)/config/rules.mk -diff -r 49a1b2aa43c5 extensions/gio/makefiles.sh ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/extensions/gio/makefiles.sh Tue Jan 11 11:17:52 2011 +0100 -@@ -0,0 +1,41 @@ -+#! /bin/sh -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is Mozilla Build System -+# -+# The Initial Developer of the Original Code is -+# Ben Turner <mozilla@songbirdnest.com> -+# -+# Portions created by the Initial Developer are Copyright (C) 2007 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+add_makefiles " -+ extensions/gio/Makefile -+" -diff -r 49a1b2aa43c5 extensions/gio/nsGIOProtocolHandler.cpp ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/extensions/gio/nsGIOProtocolHandler.cpp Tue Jan 11 11:17:52 2011 +0100 -@@ -0,0 +1,1163 @@ -+/* vim:set ts=2 sw=2 et cindent: */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is the Mozilla gnome-vfs extension. -+ * -+ * The Initial Developer of the Original Code is IBM Corporation. -+ * -+ * Portions created by IBM Corporation are Copyright (C) 2004 -+ * IBM Corporation. All Rights Reserved. -+ * -+ * Contributor(s): -+ * Darin Fisher <darin@meer.net> -+ * Jan Horak <jhorak@redhat.com> -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* -+ * This code is based on original Mozilla gnome-vfs extension. It implements -+ * input stream provided by GVFS/GIO. -+*/ -+#include "mozilla/ModuleUtils.h" -+#include "nsIPrefService.h" -+#include "nsIPrefBranch2.h" -+#include "nsIObserver.h" -+#include "nsThreadUtils.h" -+#include "nsProxyRelease.h" -+#include "nsIStringBundle.h" -+#include "nsIStandardURL.h" -+#include "nsMimeTypes.h" -+#include "nsNetUtil.h" -+#include "mozilla/Monitor.h" -+#include <gio/gio.h> -+ -+#define MOZ_GIO_SCHEME "moz-gio" -+#define MOZ_GIO_SUPPORTED_PROTOCOLS "network.gio.supported-protocols" -+ -+//----------------------------------------------------------------------------- -+ -+// NSPR_LOG_MODULES=gio:5 -+#ifdef PR_LOGGING -+static PRLogModuleInfo *sGIOLog; -+#define LOG(args) PR_LOG(sGIOLog, PR_LOG_DEBUG, args) -+#else -+#define LOG(args) -+#endif -+ -+ -+//----------------------------------------------------------------------------- -+static nsresult -+MapGIOResult(gint code) -+{ -+ switch (code) -+ { -+ case G_IO_ERROR_NOT_FOUND: return NS_ERROR_FILE_NOT_FOUND; // shows error -+ case G_IO_ERROR_INVALID_ARGUMENT: return NS_ERROR_INVALID_ARG; -+ case G_IO_ERROR_NOT_SUPPORTED: return NS_ERROR_NOT_AVAILABLE; -+ case G_IO_ERROR_NO_SPACE: return NS_ERROR_FILE_NO_DEVICE_SPACE; -+ case G_IO_ERROR_READ_ONLY: return NS_ERROR_FILE_READ_ONLY; -+ case G_IO_ERROR_PERMISSION_DENIED: return NS_ERROR_FILE_ACCESS_DENIED; // wrong password/login -+ case G_IO_ERROR_CLOSED: return NS_BASE_STREAM_CLOSED; // was EOF -+ case G_IO_ERROR_NOT_DIRECTORY: return NS_ERROR_FILE_NOT_DIRECTORY; -+ case G_IO_ERROR_PENDING: return NS_ERROR_IN_PROGRESS; -+ case G_IO_ERROR_EXISTS: return NS_ERROR_FILE_ALREADY_EXISTS; -+ case G_IO_ERROR_IS_DIRECTORY: return NS_ERROR_FILE_IS_DIRECTORY; -+ case G_IO_ERROR_NOT_MOUNTED: return NS_ERROR_NOT_CONNECTED; // shows error -+ case G_IO_ERROR_HOST_NOT_FOUND: return NS_ERROR_UNKNOWN_HOST; // shows error -+ case G_IO_ERROR_CANCELLED: return NS_ERROR_ABORT; -+ case G_IO_ERROR_NOT_EMPTY: return NS_ERROR_FILE_DIR_NOT_EMPTY; -+ case G_IO_ERROR_FILENAME_TOO_LONG: return NS_ERROR_FILE_NAME_TOO_LONG; -+ case G_IO_ERROR_INVALID_FILENAME: return NS_ERROR_FILE_INVALID_PATH; -+ case G_IO_ERROR_TIMED_OUT: return NS_ERROR_NET_TIMEOUT; // shows error -+ case G_IO_ERROR_WOULD_BLOCK: return NS_BASE_STREAM_WOULD_BLOCK; -+ case G_IO_ERROR_FAILED_HANDLED: return NS_ERROR_ABORT; // Cancel on login dialog -+ -+/* unhandled: -+ G_IO_ERROR_NOT_REGULAR_FILE, -+ G_IO_ERROR_NOT_SYMBOLIC_LINK, -+ G_IO_ERROR_NOT_MOUNTABLE_FILE, -+ G_IO_ERROR_TOO_MANY_LINKS, -+ G_IO_ERROR_ALREADY_MOUNTED, -+ G_IO_ERROR_CANT_CREATE_BACKUP, -+ G_IO_ERROR_WRONG_ETAG, -+ G_IO_ERROR_WOULD_RECURSE, -+ G_IO_ERROR_BUSY, -+ G_IO_ERROR_WOULD_MERGE, -+ G_IO_ERROR_TOO_MANY_OPEN_FILES -+*/ -+ // Make GCC happy -+ default: -+ return NS_ERROR_FAILURE; -+ } -+ -+ return NS_ERROR_FAILURE; -+} -+ -+static nsresult -+MapGIOResult(GError *result) -+{ -+ if (!result) -+ return NS_OK; -+ else -+ return MapGIOResult(result->code); -+} -+/** Return values for mount operation. -+ * These enums are used as mount operation return values. -+ */ -+typedef enum { -+ MOUNT_OPERATION_IN_PROGRESS, /** \enum operation in progress */ -+ MOUNT_OPERATION_SUCCESS, /** \enum operation successful */ -+ MOUNT_OPERATION_FAILED /** \enum operation not successful */ -+} MountOperationResult; -+//----------------------------------------------------------------------------- -+/** -+ * Sort function compares according to file type (directory/file) -+ * and alphabethical order -+ * @param a pointer to GFileInfo object to compare -+ * @param b pointer to GFileInfo object to compare -+ * @return -1 when first object should be before the second, 0 when equal, -+ * +1 when second object should be before the first -+ */ -+static gint -+FileInfoComparator(gconstpointer a, gconstpointer b) -+{ -+ GFileInfo *ia = ( GFileInfo *) a; -+ GFileInfo *ib = ( GFileInfo *) b; -+ if (g_file_info_get_file_type(ia) == G_FILE_TYPE_DIRECTORY -+ && g_file_info_get_file_type(ib) != G_FILE_TYPE_DIRECTORY) -+ return -1; -+ if (g_file_info_get_file_type(ib) == G_FILE_TYPE_DIRECTORY -+ && g_file_info_get_file_type(ia) != G_FILE_TYPE_DIRECTORY) -+ return 1; -+ -+ return strcasecmp(g_file_info_get_name(ia), g_file_info_get_name(ib)); -+} -+ -+/* Declaration of mount callback functions */ -+static void mount_enclosing_volume_finished (GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data); -+static void mount_operation_ask_password (GMountOperation *mount_op, -+ const char *message, -+ const char *default_user, -+ const char *default_domain, -+ GAskPasswordFlags flags, -+ gpointer user_data); -+//----------------------------------------------------------------------------- -+ -+class nsGIOInputStream : public nsIInputStream -+{ -+ public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_NSIINPUTSTREAM -+ -+ nsGIOInputStream(const nsCString &uriSpec) -+ : mSpec(uriSpec) -+ , mChannel(nsnull) -+ , mHandle(nsnull) -+ , mStream(nsnull) -+ , mBytesRemaining(PR_UINT32_MAX) -+ , mStatus(NS_OK) -+ , mDirList(nsnull) -+ , mDirListPtr(nsnull) -+ , mDirBufCursor(0) -+ , mDirOpen(PR_FALSE) -+ , mMonitorMountInProgress("GIOInputStream::MountFinished") { } -+ -+ ~nsGIOInputStream() { Close(); } -+ -+ void SetChannel(nsIChannel *channel) -+ { -+ // We need to hold an owning reference to our channel. This is done -+ // so we can access the channel's notification callbacks to acquire -+ // a reference to a nsIAuthPrompt if we need to handle an interactive -+ // mount operation. -+ // -+ // However, the channel can only be accessed on the main thread, so -+ // we have to be very careful with ownership. Moreover, it doesn't -+ // support threadsafe addref/release, so proxying is the answer. -+ // -+ // Also, it's important to note that this likely creates a reference -+ // cycle since the channel likely owns this stream. This reference -+ // cycle is broken in our Close method. -+ -+ NS_ADDREF(mChannel = channel); -+ } -+ void SetMountResult(MountOperationResult result, gint error_code); -+ private: -+ nsresult DoOpen(); -+ nsresult DoRead(char *aBuf, PRUint32 aCount, PRUint32 *aCountRead); -+ nsresult SetContentTypeOfChannel(const char *contentType); -+ nsresult MountVolume(); -+ nsresult DoOpenDirectory(); -+ nsresult DoOpenFile(GFileInfo *info); -+ nsCString mSpec; -+ nsIChannel *mChannel; // manually refcounted -+ GFile *mHandle; -+ GFileInputStream *mStream; -+ PRUint64 mBytesRemaining; -+ nsresult mStatus; -+ GList *mDirList; -+ GList *mDirListPtr; -+ nsCString mDirBuf; -+ PRUint32 mDirBufCursor; -+ PRPackedBool mDirOpen; -+ MountOperationResult mMountRes; -+ mozilla::Monitor mMonitorMountInProgress; -+ gint mMountErrorCode; -+}; -+/** -+ * Set result of mount operation and notify monitor waiting for results. -+ * This method is called in main thread as long as it is used only -+ * in mount_enclosing_volume_finished function. -+ * @param result Result of mount operation -+ */ -+void -+nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code) -+{ -+ mozilla::MonitorAutoEnter mon(mMonitorMountInProgress); -+ mMountRes = result; -+ mMountErrorCode = error_code; -+ mon.Notify(); -+} -+ -+/** -+ * Start mount operation and wait in loop until it is finished. This method is -+ * called from thread which is trying to read from location. -+ */ -+nsresult -+nsGIOInputStream::MountVolume() { -+ GMountOperation* mount_op = g_mount_operation_new(); -+ g_signal_connect (mount_op, "ask-password", -+ G_CALLBACK (mount_operation_ask_password), mChannel); -+ mMountRes = MOUNT_OPERATION_IN_PROGRESS; -+ /* g_file_mount_enclosing_volume uses a dbus request to mount the volume. -+ Callback mount_enclosing_volume_finished is called in main thread -+ (not this thread on which this method is called). */ -+ g_file_mount_enclosing_volume(mHandle, -+ G_MOUNT_MOUNT_NONE, -+ mount_op, -+ NULL, -+ mount_enclosing_volume_finished, -+ this); -+ mozilla::MonitorAutoEnter mon(mMonitorMountInProgress); -+ /* Waiting for finish of mount operation thread */ -+ while (mMountRes == MOUNT_OPERATION_IN_PROGRESS) -+ mon.Wait(); -+ -+ g_object_unref(mount_op); -+ -+ if (mMountRes == MOUNT_OPERATION_FAILED) { -+ return MapGIOResult(mMountErrorCode); -+ } else { -+ return NS_OK; -+ } -+} -+ -+/** -+ * Create list of infos about objects in opened directory -+ * Return: NS_OK when list obtained, otherwise error code according -+ * to failed operation. -+ */ -+nsresult -+nsGIOInputStream::DoOpenDirectory() -+{ -+ GError *error = NULL; -+ -+ GFileEnumerator *f_enum = g_file_enumerate_children(mHandle, -+ "standard::*,time::*", -+ G_FILE_QUERY_INFO_NONE, -+ NULL, -+ &error); -+ if (!f_enum) { -+ nsresult rv = MapGIOResult(error); -+ g_warning("Cannot read from directory: %s", error->message); -+ g_error_free(error); -+ return rv; -+ } -+ // fill list of file infos -+ GFileInfo *info = g_file_enumerator_next_file(f_enum, NULL, &error); -+ while (info) { -+ mDirList = g_list_append(mDirList, info); -+ info = g_file_enumerator_next_file(f_enum, NULL, &error); -+ } -+ g_object_unref(f_enum); -+ if (error) { -+ g_warning("Error reading directory content: %s", error->message); -+ nsresult rv = MapGIOResult(error); -+ g_error_free(error); -+ return rv; -+ } -+ mDirOpen = PR_TRUE; -+ -+ // Sort list of file infos by using FileInfoComparator function -+ mDirList = g_list_sort(mDirList, FileInfoComparator); -+ mDirListPtr = mDirList; -+ -+ // Write base URL (make sure it ends with a '/') -+ mDirBuf.Append("300: "); -+ mDirBuf.Append(mSpec); -+ if (mSpec.get()[mSpec.Length() - 1] != '/') -+ mDirBuf.Append('/'); -+ mDirBuf.Append('\n'); -+ -+ // Write column names -+ mDirBuf.Append("200: filename content-length last-modified file-type\n"); -+ -+ // Write charset (assume UTF-8) -+ // XXX is this correct? -+ mDirBuf.Append("301: UTF-8\n"); -+ SetContentTypeOfChannel(APPLICATION_HTTP_INDEX_FORMAT); -+ return NS_OK; -+} -+ -+/** -+ * Create file stream and set mime type for channel -+ * @param info file info used to determine mime type -+ * @return NS_OK when file stream created successfuly, error code otherwise -+ */ -+nsresult -+nsGIOInputStream::DoOpenFile(GFileInfo *info) -+{ -+ GError *error = NULL; -+ -+ mStream = g_file_read(mHandle, NULL, &error); -+ if (!mStream) { -+ nsresult rv = MapGIOResult(error); -+ g_warning("Cannot read from file: %s", error->message); -+ g_error_free(error); -+ return rv; -+ } -+ -+ const char * content_type = g_file_info_get_content_type(info); -+ if (content_type) { -+ char *mime_type = g_content_type_get_mime_type(content_type); -+ if (mime_type) { -+ if (strcmp(mime_type, APPLICATION_OCTET_STREAM) != 0) { -+ SetContentTypeOfChannel(mime_type); -+ } -+ g_free(mime_type); -+ } -+ } else { -+ g_warning("Missing content type."); -+ } -+ -+ mBytesRemaining = g_file_info_get_size(info); -+ // Update the content length attribute on the channel. We do this -+ // synchronously without proxying. This hack is not as bad as it looks! -+ mChannel->SetContentLength(mBytesRemaining); -+ -+ return NS_OK; -+} -+ -+/** -+ * Start file open operation, mount volume when needed and according to file type -+ * create file output stream or read directory content. -+ * @return NS_OK when file or directory opened successfully, error code otherwise -+ */ -+nsresult -+nsGIOInputStream::DoOpen() -+{ -+ nsresult rv; -+ GError *error = NULL; -+ -+ NS_ASSERTION(mHandle == nsnull, "already open"); -+ -+ mHandle = g_file_new_for_uri( mSpec.get() ); -+ -+ GFileInfo *info = g_file_query_info(mHandle, -+ "standard::*", -+ G_FILE_QUERY_INFO_NONE, -+ NULL, -+ &error); -+ -+ if (error) { -+ if (error->domain == G_IO_ERROR && error->code == G_IO_ERROR_NOT_MOUNTED) { -+ // location is not yet mounted, try to mount -+ g_error_free(error); -+ if (NS_IsMainThread()) -+ return NS_ERROR_NOT_CONNECTED; -+ error = NULL; -+ rv = MountVolume(); -+ if (rv != NS_OK) { -+ return rv; -+ } -+ // get info again -+ info = g_file_query_info(mHandle, -+ "standard::*", -+ G_FILE_QUERY_INFO_NONE, -+ NULL, -+ &error); -+ // second try to get file info from remote files after media mount -+ if (!info) { -+ g_warning("Unable to get file info: %s", error->message); -+ rv = MapGIOResult(error); -+ g_error_free(error); -+ return rv; -+ } -+ } else { -+ g_warning("Unable to get file info: %s", error->message); -+ rv = MapGIOResult(error); -+ g_error_free(error); -+ return rv; -+ } -+ } -+ // Get file type to handle directories and file differently -+ GFileType f_type = g_file_info_get_file_type(info); -+ if (f_type == G_FILE_TYPE_DIRECTORY) { -+ // directory -+ rv = DoOpenDirectory(); -+ } else if (f_type != G_FILE_TYPE_UNKNOWN) { -+ // file -+ rv = DoOpenFile(info); -+ } else { -+ g_warning("Unable to get file type."); -+ rv = NS_ERROR_FILE_NOT_FOUND; -+ } -+ if (info) -+ g_object_unref(info); -+ return rv; -+} -+ -+/** -+ * Read content of file or create file list from directory -+ * @param aBuf read destination buffer -+ * @param aCount length of destination buffer -+ * @param aCountRead number of read characters -+ * @return NS_OK when read successfully, NS_BASE_STREAM_CLOSED when end of file, -+ * error code otherwise -+ */ -+nsresult -+nsGIOInputStream::DoRead(char *aBuf, PRUint32 aCount, PRUint32 *aCountRead) -+{ -+ nsresult rv = NS_ERROR_NOT_AVAILABLE; -+ if (mStream) { -+ // file read -+ GError *error = NULL; -+ PRUint32 bytes_read = g_input_stream_read(G_INPUT_STREAM(mStream), -+ aBuf, -+ aCount, -+ NULL, -+ &error); -+ if (error) { -+ rv = MapGIOResult(error); -+ *aCountRead = 0; -+ g_warning("Cannot read from file: %s", error->message); -+ g_error_free(error); -+ return rv; -+ } -+ *aCountRead = bytes_read; -+ mBytesRemaining -= *aCountRead; -+ return NS_OK; -+ } -+ else if (mDirOpen) { -+ // directory read -+ while (aCount && rv != NS_BASE_STREAM_CLOSED) -+ { -+ // Copy data out of our buffer -+ PRUint32 bufLen = mDirBuf.Length() - mDirBufCursor; -+ if (bufLen) -+ { -+ PRUint32 n = PR_MIN(bufLen, aCount); -+ memcpy(aBuf, mDirBuf.get() + mDirBufCursor, n); -+ *aCountRead += n; -+ aBuf += n; -+ aCount -= n; -+ mDirBufCursor += n; -+ } -+ -+ if (!mDirListPtr) // Are we at the end of the directory list? -+ { -+ rv = NS_BASE_STREAM_CLOSED; -+ } -+ else if (aCount) // Do we need more data? -+ { -+ GFileInfo *info = (GFileInfo *) mDirListPtr->data; -+ -+ // Prune '.' and '..' from directory listing. -+ const char * fname = g_file_info_get_name(info); -+ if (fname && fname[0] == '.' && -+ (fname[1] == '\0' || (fname[1] == '.' && fname[2] == '\0'))) -+ { -+ mDirListPtr = mDirListPtr->next; -+ continue; -+ } -+ -+ mDirBuf.Assign("201: "); -+ -+ // The "filename" field -+ nsCString escName; -+ nsCOMPtr<nsINetUtil> nu = do_GetService(NS_NETUTIL_CONTRACTID); -+ if (nu && fname) { -+ nu->EscapeString(nsDependentCString(fname), -+ nsINetUtil::ESCAPE_URL_PATH, escName); -+ -+ mDirBuf.Append(escName); -+ mDirBuf.Append(' '); -+ } -+ -+ // The "content-length" field -+ // XXX truncates size from 64-bit to 32-bit -+ mDirBuf.AppendInt(PRInt32(g_file_info_get_size(info))); -+ mDirBuf.Append(' '); -+ -+ // The "last-modified" field -+ // -+ // NSPR promises: PRTime is compatible with time_t -+ // we just need to convert from seconds to microseconds -+ GTimeVal gtime; -+ g_file_info_get_modification_time(info, >ime); -+ -+ PRExplodedTime tm; -+ PRTime pt = ((PRTime) gtime.tv_sec) * 1000000; -+ PR_ExplodeTime(pt, PR_GMTParameters, &tm); -+ { -+ char buf[64]; -+ PR_FormatTimeUSEnglish(buf, sizeof(buf), -+ "%a,%%20%d%%20%b%%20%Y%%20%H:%M:%S%%20GMT ", &tm); -+ mDirBuf.Append(buf); -+ } -+ -+ // The "file-type" field -+ switch (g_file_info_get_file_type(info)) -+ { -+ case G_FILE_TYPE_REGULAR: -+ mDirBuf.Append("FILE "); -+ break; -+ case G_FILE_TYPE_DIRECTORY: -+ mDirBuf.Append("DIRECTORY "); -+ break; -+ case G_FILE_TYPE_SYMBOLIC_LINK: -+ mDirBuf.Append("SYMBOLIC-LINK "); -+ break; -+ default: -+ break; -+ } -+ mDirBuf.Append('\n'); -+ -+ mDirBufCursor = 0; -+ mDirListPtr = mDirListPtr->next; -+ } -+ } -+ } -+ return rv; -+} -+ -+/** -+ * This class is used to implement SetContentTypeOfChannel. -+ */ -+class nsGIOSetContentTypeEvent : public nsRunnable -+{ -+ public: -+ nsGIOSetContentTypeEvent(nsIChannel *channel, const char *contentType) -+ : mChannel(channel), mContentType(contentType) -+ { -+ // stash channel reference in mChannel. no AddRef here! see note -+ // in SetContentTypeOfchannel. -+ } -+ -+ NS_IMETHOD Run() -+ { -+ mChannel->SetContentType(mContentType); -+ return NS_OK; -+ } -+ -+ private: -+ nsIChannel *mChannel; -+ nsCString mContentType; -+}; -+ -+nsresult -+nsGIOInputStream::SetContentTypeOfChannel(const char *contentType) -+{ -+ // We need to proxy this call over to the main thread. We post an -+ // asynchronous event in this case so that we don't delay reading data, and -+ // we know that this is safe to do since the channel's reference will be -+ // released asynchronously as well. We trust the ordering of the main -+ // thread's event queue to protect us against memory corruption. -+ -+ nsresult rv; -+ nsCOMPtr<nsIRunnable> ev = -+ new nsGIOSetContentTypeEvent(mChannel, contentType); -+ if (!ev) -+ { -+ rv = NS_ERROR_OUT_OF_MEMORY; -+ } -+ else -+ { -+ rv = NS_DispatchToMainThread(ev); -+ } -+ return rv; -+} -+ -+NS_IMPL_THREADSAFE_ISUPPORTS1(nsGIOInputStream, nsIInputStream) -+ -+/** -+ * Free all used memory and close stream. -+ */ -+NS_IMETHODIMP -+nsGIOInputStream::Close() -+{ -+ if (mStream) -+ { -+ g_object_unref(mStream); -+ mStream = nsnull; -+ } -+ -+ if (mHandle) -+ { -+ g_object_unref(mHandle); -+ mHandle = nsnull; -+ } -+ -+ if (mDirList) -+ { -+ // Destroy the list of GIOFileInfo objects... -+ g_list_foreach(mDirList, (GFunc) g_object_unref, nsnull); -+ g_list_free(mDirList); -+ mDirList = nsnull; -+ mDirListPtr = nsnull; -+ } -+ -+ if (mChannel) -+ { -+ nsresult rv = NS_OK; -+ -+ nsCOMPtr<nsIThread> thread = do_GetMainThread(); -+ if (thread) -+ rv = NS_ProxyRelease(thread, mChannel); -+ -+ NS_ASSERTION(thread && NS_SUCCEEDED(rv), "leaking channel reference"); -+ mChannel = nsnull; -+ } -+ -+ mSpec.Truncate(); // free memory -+ -+ // Prevent future reads from re-opening the handle. -+ if (NS_SUCCEEDED(mStatus)) -+ mStatus = NS_BASE_STREAM_CLOSED; -+ -+ return NS_OK; -+} -+ -+/** -+ * Return number of remaining bytes available on input -+ * @param aResult remaining bytes -+ */ -+NS_IMETHODIMP -+nsGIOInputStream::Available(PRUint32 *aResult) -+{ -+ if (NS_FAILED(mStatus)) -+ return mStatus; -+ -+ /* When remaining bytes are bigger than max PRUint32 value an aResult must -+ be set to PRUint32 maximum */ -+ if (mBytesRemaining > PR_UINT32_MAX) -+ *aResult = PR_UINT32_MAX; -+ else -+ *aResult = mBytesRemaining; -+ -+ return NS_OK; -+} -+ -+/** -+ * Trying to read from stream. When location is not available it tries to mount it. -+ * @param aBuf buffer to put read data -+ * @param aCount length of aBuf -+ * @param aCountRead number of bytes actually read -+ */ -+NS_IMETHODIMP -+nsGIOInputStream::Read(char *aBuf, -+ PRUint32 aCount, -+ PRUint32 *aCountRead) -+{ -+ *aCountRead = 0; -+ // Check if file is already opened, otherwise open it -+ if (!mStream && !mDirOpen && mStatus == NS_OK) { -+ mStatus = DoOpen(); -+ if (NS_FAILED(mStatus)) { -+ return mStatus; -+ } -+ } -+ -+ mStatus = DoRead(aBuf, aCount, aCountRead); -+ // Check if all data has been read -+ if (mStatus == NS_BASE_STREAM_CLOSED) -+ return NS_OK; -+ -+ // Check whenever any error appears while reading -+ return mStatus; -+} -+ -+NS_IMETHODIMP -+nsGIOInputStream::ReadSegments(nsWriteSegmentFun aWriter, -+ void *aClosure, -+ PRUint32 aCount, -+ PRUint32 *aResult) -+{ -+ // There is no way to implement this using GnomeVFS, but fortunately -+ // that doesn't matter. Because we are a blocking input stream, Necko -+ // isn't going to call our ReadSegments method. -+ NS_NOTREACHED("nsGIOInputStream::ReadSegments"); -+ return NS_ERROR_NOT_IMPLEMENTED; -+} -+ -+NS_IMETHODIMP -+nsGIOInputStream::IsNonBlocking(PRBool *aResult) -+{ -+ *aResult = PR_FALSE; -+ return NS_OK; -+} -+ -+//----------------------------------------------------------------------------- -+ -+/** -+ * Called when finishing mount operation. Result of operation is set in -+ * nsGIOInputStream. This function is called in main thread as an async request -+ * typically from dbus. -+ * @param source_object GFile object which requested the mount -+ * @param res result object -+ * @param user_data pointer to nsGIOInputStream -+ */ -+static void -+mount_enclosing_volume_finished (GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data) -+{ -+ GError *error = NULL; -+ -+ nsGIOInputStream* istream = static_cast<nsGIOInputStream*>(user_data); -+ -+ g_file_mount_enclosing_volume_finish(G_FILE (source_object), res, &error); -+ -+ if (error) { -+ g_warning("Mount failed: %s %d", error->message, error->code); -+ istream->SetMountResult(MOUNT_OPERATION_FAILED, error->code); -+ g_error_free(error); -+ } else { -+ istream->SetMountResult(MOUNT_OPERATION_SUCCESS, 0); -+ } -+} -+ -+/** -+ * This function is called when username or password are requested from user. -+ * This function is called in main thread as async request from dbus. -+ * @param mount_op mount operation -+ * @param message message to show to user -+ * @param default_user preffered user -+ * @param default_domain domain name -+ * @param flags what type of information is required -+ * @param user_data nsIChannel -+ */ -+static void -+mount_operation_ask_password (GMountOperation *mount_op, -+ const char *message, -+ const char *default_user, -+ const char *default_domain, -+ GAskPasswordFlags flags, -+ gpointer user_data) -+{ -+ nsIChannel *channel = (nsIChannel *) user_data; -+ if (!channel) { -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED); -+ return; -+ } -+ // We can't handle request for domain -+ if (flags & G_ASK_PASSWORD_NEED_DOMAIN) { -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED); -+ return; -+ } -+ -+ nsCOMPtr<nsIAuthPrompt> prompt; -+ NS_QueryNotificationCallbacks(channel, prompt); -+ -+ // If no auth prompt, then give up. We could failover to using the -+ // WindowWatcher service, but that might defeat a consumer's purposeful -+ // attempt to disable authentication (for whatever reason). -+ if (!prompt) { -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED); -+ return; -+ } -+ // Parse out the host and port... -+ nsCOMPtr<nsIURI> uri; -+ channel->GetURI(getter_AddRefs(uri)); -+ if (!uri) { -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED); -+ return; -+ } -+ -+ nsCAutoString scheme, hostPort; -+ uri->GetScheme(scheme); -+ uri->GetHostPort(hostPort); -+ -+ // It doesn't make sense for either of these strings to be empty. What kind -+ // of funky URI is this? -+ if (scheme.IsEmpty() || hostPort.IsEmpty()) { -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED); -+ return; -+ } -+ // Construct the single signon key. Altering the value of this key will -+ // cause people's remembered passwords to be forgotten. Think carefully -+ // before changing the way this key is constructed. -+ nsAutoString key, realm; -+ -+ NS_ConvertUTF8toUTF16 dispHost(scheme); -+ dispHost.Append(NS_LITERAL_STRING("://")); -+ dispHost.Append(NS_ConvertUTF8toUTF16(hostPort)); -+ -+ key = dispHost; -+ if (*default_domain != '\0') -+ { -+ // We assume the realm string is ASCII. That might be a bogus assumption, -+ // but we have no idea what encoding GnomeVFS is using, so for now we'll -+ // limit ourselves to ISO-Latin-1. XXX What is a better solution? -+ realm.Append('"'); -+ realm.Append(NS_ConvertASCIItoUTF16(default_domain)); -+ realm.Append('"'); -+ key.Append(' '); -+ key.Append(realm); -+ } -+ // Construct the message string... -+ // -+ // We use Necko's string bundle here. This code really should be encapsulated -+ // behind some Necko API, after all this code is based closely on the code in -+ // nsHttpChannel.cpp. -+ nsCOMPtr<nsIStringBundleService> bundleSvc = -+ do_GetService(NS_STRINGBUNDLE_CONTRACTID); -+ if (!bundleSvc) { -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED); -+ return; -+ } -+ nsCOMPtr<nsIStringBundle> bundle; -+ bundleSvc->CreateBundle("chrome://global/locale/commonDialogs.properties", -+ getter_AddRefs(bundle)); -+ if (!bundle) { -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED); -+ return; -+ } -+ nsAutoString nsmessage; -+ -+ if (flags & G_ASK_PASSWORD_NEED_PASSWORD) { -+ if (flags & G_ASK_PASSWORD_NEED_USERNAME) { -+ if (!realm.IsEmpty()) { -+ const PRUnichar *strings[] = { realm.get(), dispHost.get() }; -+ bundle->FormatStringFromName(NS_LITERAL_STRING("EnterLoginForRealm").get(), -+ strings, 2, getter_Copies(nsmessage)); -+ } else { -+ const PRUnichar *strings[] = { dispHost.get() }; -+ bundle->FormatStringFromName(NS_LITERAL_STRING("EnterUserPasswordFor").get(), -+ strings, 1, getter_Copies(nsmessage)); -+ } -+ } else { -+ NS_ConvertUTF8toUTF16 userName(default_user); -+ const PRUnichar *strings[] = { userName.get(), dispHost.get() }; -+ bundle->FormatStringFromName(NS_LITERAL_STRING("EnterPasswordFor").get(), -+ strings, 2, getter_Copies(nsmessage)); -+ } -+ } else { -+ g_warning("Unknown mount operation request (flags: %x)", flags); -+ } -+ -+ if (nsmessage.IsEmpty()) { -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED); -+ return; -+ } -+ // Prompt the user... -+ nsresult rv; -+ PRBool retval = PR_FALSE; -+ PRUnichar *user = nsnull, *pass = nsnull; -+ if (default_user) { -+ // user will be freed by PromptUsernameAndPassword -+ user = ToNewUnicode(NS_ConvertUTF8toUTF16(default_user)); -+ } -+ if (flags & G_ASK_PASSWORD_NEED_USERNAME) { -+ rv = prompt->PromptUsernameAndPassword(nsnull, nsmessage.get(), -+ key.get(), -+ nsIAuthPrompt::SAVE_PASSWORD_PERMANENTLY, -+ &user, &pass, &retval); -+ } else { -+ rv = prompt->PromptPassword(nsnull, nsmessage.get(), -+ key.get(), -+ nsIAuthPrompt::SAVE_PASSWORD_PERMANENTLY, -+ &pass, &retval); -+ } -+ if (NS_FAILED(rv) || !retval) { // was || user == '\0' || pass == '\0' -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_ABORTED); -+ return; -+ } -+ /* GIO should accept UTF8 */ -+ g_mount_operation_set_username(mount_op, NS_ConvertUTF16toUTF8(user).get()); -+ g_mount_operation_set_password(mount_op, NS_ConvertUTF16toUTF8(pass).get()); -+ nsMemory::Free(user); -+ nsMemory::Free(pass); -+ g_mount_operation_reply(mount_op, G_MOUNT_OPERATION_HANDLED); -+} -+ -+//----------------------------------------------------------------------------- -+ -+class nsGIOProtocolHandler : public nsIProtocolHandler -+ , public nsIObserver -+{ -+ public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_NSIPROTOCOLHANDLER -+ NS_DECL_NSIOBSERVER -+ -+ nsresult Init(); -+ -+ private: -+ void InitSupportedProtocolsPref(nsIPrefBranch *prefs); -+ PRBool IsSupportedProtocol(const nsCString &spec); -+ -+ nsCString mSupportedProtocols; -+}; -+ -+NS_IMPL_ISUPPORTS2(nsGIOProtocolHandler, nsIProtocolHandler, nsIObserver) -+ -+nsresult -+nsGIOProtocolHandler::Init() -+{ -+#ifdef PR_LOGGING -+ sGIOLog = PR_NewLogModule("gio"); -+#endif -+ -+ nsCOMPtr<nsIPrefBranch2> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID); -+ if (prefs) -+ { -+ InitSupportedProtocolsPref(prefs); -+ prefs->AddObserver(MOZ_GIO_SUPPORTED_PROTOCOLS, this, PR_FALSE); -+ } -+ -+ return NS_OK; -+} -+ -+void -+nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) -+{ -+ // Get user preferences to determine which protocol is supported. -+ // Gvfs/GIO has a set of supported protocols like obex, network, archive, -+ // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be -+ // irrelevant to process by browser. By default accept only smb and sftp -+ // protocols so far. -+ nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, -+ getter_Copies(mSupportedProtocols)); -+ if (NS_SUCCEEDED(rv)) { -+ mSupportedProtocols.StripWhitespace(); -+ ToLowerCase(mSupportedProtocols); -+ } -+ else -+ mSupportedProtocols.Assign("smb:,sftp:"); // use defaults -+ -+ LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); -+} -+ -+PRBool -+nsGIOProtocolHandler::IsSupportedProtocol(const nsCString &aSpec) -+{ -+ const char *specString = aSpec.get(); -+ const char *colon = strchr(specString, ':'); -+ if (!colon) -+ return PR_FALSE; -+ -+ PRUint32 length = colon - specString + 1; -+ -+ // <scheme> + ':' -+ nsCString scheme(specString, length); -+ -+ char *found = PL_strcasestr(mSupportedProtocols.get(), scheme.get()); -+ if (!found) -+ return PR_FALSE; -+ -+ if (found[length] != ',' && found[length] != '\0') -+ return PR_FALSE; -+ -+ return PR_TRUE; -+} -+ -+NS_IMETHODIMP -+nsGIOProtocolHandler::GetScheme(nsACString &aScheme) -+{ -+ aScheme.Assign(MOZ_GIO_SCHEME); -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+nsGIOProtocolHandler::GetDefaultPort(PRInt32 *aDefaultPort) -+{ -+ *aDefaultPort = -1; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+nsGIOProtocolHandler::GetProtocolFlags(PRUint32 *aProtocolFlags) -+{ -+ // Is URI_STD true of all GnomeVFS URI types? -+ *aProtocolFlags = URI_STD | URI_DANGEROUS_TO_LOAD; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+nsGIOProtocolHandler::NewURI(const nsACString &aSpec, -+ const char *aOriginCharset, -+ nsIURI *aBaseURI, -+ nsIURI **aResult) -+{ -+ const nsCString flatSpec(aSpec); -+ LOG(("gio: NewURI [spec=%s]\n", flatSpec.get())); -+ -+ if (!aBaseURI) -+ { -+ // XXX Is it good to support all GIO protocols? -+ if (!IsSupportedProtocol(flatSpec)) -+ return NS_ERROR_UNKNOWN_PROTOCOL; -+ -+ PRInt32 colon_location = flatSpec.FindChar(':'); -+ if (colon_location <= 0) -+ return NS_ERROR_UNKNOWN_PROTOCOL; -+ -+ // Verify that GIO supports this URI scheme. -+ PRBool uri_scheme_supported = PR_FALSE; -+ -+ GVfs *gvfs = g_vfs_get_default(); -+ -+ if (!gvfs) { -+ g_warning("Cannot get GVfs object."); -+ return NS_ERROR_UNKNOWN_PROTOCOL; -+ } -+ -+ const gchar* const * uri_schemes = g_vfs_get_supported_uri_schemes(gvfs); -+ -+ while (*uri_schemes != NULL) { -+ // While flatSpec ends with ':' the uri_scheme does not. Therefore do not -+ // compare last character. -+ if (StringHead(flatSpec, colon_location).Equals(*uri_schemes)) { -+ uri_scheme_supported = PR_TRUE; -+ break; -+ } -+ uri_schemes++; -+ } -+ -+ if (!uri_scheme_supported) { -+ return NS_ERROR_UNKNOWN_PROTOCOL; -+ } -+ } -+ -+ nsresult rv; -+ nsCOMPtr<nsIStandardURL> url = -+ do_CreateInstance(NS_STANDARDURL_CONTRACTID, &rv); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ rv = url->Init(nsIStandardURL::URLTYPE_STANDARD, -1, flatSpec, -+ aOriginCharset, aBaseURI); -+ if (NS_SUCCEEDED(rv)) -+ rv = CallQueryInterface(url, aResult); -+ return rv; -+ -+} -+ -+NS_IMETHODIMP -+nsGIOProtocolHandler::NewChannel(nsIURI *aURI, nsIChannel **aResult) -+{ -+ NS_ENSURE_ARG_POINTER(aURI); -+ nsresult rv; -+ -+ nsCAutoString spec; -+ rv = aURI->GetSpec(spec); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ nsRefPtr<nsGIOInputStream> stream = new nsGIOInputStream(spec); -+ if (!stream) -+ { -+ rv = NS_ERROR_OUT_OF_MEMORY; -+ } -+ else -+ { -+ // start out assuming an unknown content-type. we'll set the content-type -+ // to something better once we open the URI. -+ rv = NS_NewInputStreamChannel(aResult, -+ aURI, -+ stream, -+ NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE)); -+ if (NS_SUCCEEDED(rv)) -+ stream->SetChannel(*aResult); -+ } -+ return rv; -+} -+ -+NS_IMETHODIMP -+nsGIOProtocolHandler::AllowPort(PRInt32 aPort, -+ const char *aScheme, -+ PRBool *aResult) -+{ -+ // Don't override anything. -+ *aResult = PR_FALSE; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+nsGIOProtocolHandler::Observe(nsISupports *aSubject, -+ const char *aTopic, -+ const PRUnichar *aData) -+{ -+ if (strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) == 0) { -+ nsCOMPtr<nsIPrefBranch> prefs = do_QueryInterface(aSubject); -+ InitSupportedProtocolsPref(prefs); -+ } -+ return NS_OK; -+} -+ -+//----------------------------------------------------------------------------- -+ -+#define NS_GIOPROTOCOLHANDLER_CID \ -+{ /* ee706783-3af8-4d19-9e84-e2ebfe213480 */ \ -+ 0xee706783, \ -+ 0x3af8, \ -+ 0x4d19, \ -+ {0x9e, 0x84, 0xe2, 0xeb, 0xfe, 0x21, 0x34, 0x80} \ -+} -+ -+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGIOProtocolHandler, Init) -+NS_DEFINE_NAMED_CID(NS_GIOPROTOCOLHANDLER_CID); -+ -+static const mozilla::Module::CIDEntry kVFSCIDs[] = { -+ { &kNS_GIOPROTOCOLHANDLER_CID, false, NULL, nsGIOProtocolHandlerConstructor }, -+ { NULL } -+}; -+ -+static const mozilla::Module::ContractIDEntry kVFSContracts[] = { -+ { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX MOZ_GIO_SCHEME, &kNS_GIOPROTOCOLHANDLER_CID }, -+ { NULL } -+}; -+ -+static const mozilla::Module kVFSModule = { -+ mozilla::Module::kVersion, -+ kVFSCIDs, -+ kVFSContracts -+}; -+ -+NSMODULE_DEFN(nsGIOModule) = &kVFSModule; -diff -r 49a1b2aa43c5 netwerk/base/src/nsIOService.cpp ---- a/netwerk/base/src/nsIOService.cpp Tue Dec 21 12:42:59 2010 +0100 -+++ b/netwerk/base/src/nsIOService.cpp Tue Jan 11 11:17:52 2011 +0100 -@@ -454,6 +454,27 @@ - } - - #ifdef MOZ_X11 -+ // check to see whether GVFS can handle this URI scheme. if it can -+ // create a nsIURI for the "scheme:", then we assume it has support for -+ // the requested protocol. otherwise, we failover to using the default -+ // protocol handler. -+ -+ rv = CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX"moz-gio", -+ result); -+ if (NS_SUCCEEDED(rv)) { -+ nsCAutoString spec(scheme); -+ spec.Append(':'); -+ -+ nsIURI *uri; -+ rv = (*result)->NewURI(spec, nsnull, nsnull, &uri); -+ if (NS_SUCCEEDED(rv)) { -+ NS_RELEASE(uri); -+ return rv; -+ } -+ -+ NS_RELEASE(*result); -+ } -+ - // check to see whether GnomeVFS can handle this URI scheme. if it can - // create a nsIURI for the "scheme:", then we assume it has support for - // the requested protocol. otherwise, we failover to using the default diff --git a/community/xulrunner-oss/xulrunner-omnijar.patch b/community/xulrunner-oss/xulrunner-omnijar.patch deleted file mode 100644 index 66ec5206c..000000000 --- a/community/xulrunner-oss/xulrunner-omnijar.patch +++ /dev/null @@ -1,1737 +0,0 @@ -# HG changeset patch -# Parent a7dea879b4b445a23186f438900562155bb39e99 -Bug 620931 part 1 - Use chrome manifest to register resource://gre-resources/ - -diff --git a/layout/style/jar.mn b/layout/style/jar.mn ---- a/layout/style/jar.mn -+++ b/layout/style/jar.mn -@@ -1,8 +1,10 @@ - toolkit.jar: - * res/ua.css (ua.css) - res/html.css (html.css) - res/quirk.css (quirk.css) - res/viewsource.css (viewsource.css) - * res/forms.css (forms.css) - res/arrow.gif (arrow.gif) - res/arrowd.gif (arrowd.gif) -+ -+% resource gre-resources %res/ -diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/res/nsResProtocolHandler.cpp ---- a/netwerk/protocol/res/nsResProtocolHandler.cpp -+++ b/netwerk/protocol/res/nsResProtocolHandler.cpp -@@ -75,17 +75,16 @@ static nsResProtocolHandler *gResHandler - // - // this enables PR_LOG_ALWAYS level information and places all output in - // the file log.txt - // - static PRLogModuleInfo *gResLog; - #endif - - #define kGRE NS_LITERAL_CSTRING("gre") --#define kGRE_RESOURCES NS_LITERAL_CSTRING("gre-resources") - - //---------------------------------------------------------------------------- - // nsResURL : overrides nsStandardURL::GetFile to provide nsIFile resolution - //---------------------------------------------------------------------------- - - nsresult - nsResURL::EnsureFile() - { -@@ -197,28 +196,16 @@ nsResProtocolHandler::Init() - NS_ENSURE_SUCCESS(rv, rv); - - // - // make resource://gre/ point to the GRE directory - // - rv = AddSpecialDir(NS_GRE_DIR, kGRE); - NS_ENSURE_SUCCESS(rv, rv); - -- // make resource://gre-resources/ point to gre toolkit[.jar]/res -- nsCOMPtr<nsIURI> greURI; -- nsCOMPtr<nsIURI> greResURI; -- GetSubstitution(kGRE, getter_AddRefs(greURI)); --#ifdef MOZ_CHROME_FILE_FORMAT_JAR -- NS_NAMED_LITERAL_CSTRING(strGRE_RES_URL, "jar:chrome/toolkit.jar!/res/"); --#else -- NS_NAMED_LITERAL_CSTRING(strGRE_RES_URL, "chrome/toolkit/res/"); --#endif -- rv = mIOService->NewURI(strGRE_RES_URL, nsnull, greURI, -- getter_AddRefs(greResURI)); -- SetSubstitution(kGRE_RESOURCES, greResURI); - //XXXbsmedberg Neil wants a resource://pchrome/ for the profile chrome dir... - // but once I finish multiple chrome registration I'm not sure that it is needed - - // XXX dveditz: resource://pchrome/ defeats profile directory salting - // if web content can load it. Tread carefully. - - return rv; - } -@@ -242,22 +229,16 @@ nsResProtocolHandler::Init(nsIFile *aOmn - // these entries should be kept in sync with the normal Init function - - // resource:/// points to jar:omni.jar!/ - SetSubstitution(EmptyCString(), uri); - - // resource://gre/ points to jar:omni.jar!/ - SetSubstitution(kGRE, uri); - -- urlStr += "chrome/toolkit/res/"; -- rv = mIOService->NewURI(urlStr, nsnull, nsnull, getter_AddRefs(uri)); -- NS_ENSURE_SUCCESS(rv, rv); -- -- // resource://gre-resources/ points to jar:omni.jar!/chrome/toolkit/res/ -- SetSubstitution(kGRE_RESOURCES, uri); - return NS_OK; - } - #endif - - #ifdef MOZ_IPC - static PLDHashOperator - EnumerateSubstitution(const nsACString& aKey, - nsIURI* aURI, -# HG changeset patch -# Parent 3038cccba1a071d6b418e15442d0f2d9f3dcb11d -Bug 620931 part 2 - When building --with-libxul-sdk, use the right preferences directory - -diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in ---- a/browser/locales/Makefile.in -+++ b/browser/locales/Makefile.in -@@ -183,17 +183,17 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG - $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins - - - libs-%: - $(NSINSTALL) -D $(DIST)/install - @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 -- @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 -+ @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 - @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - - - repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" - repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES) - @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." - $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export - $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx -diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk ---- a/toolkit/mozapps/installer/packager.mk -+++ b/toolkit/mozapps/installer/packager.mk -@@ -307,17 +307,17 @@ OMNIJAR_FILES = \ - res \ - defaults \ - greprefs.js \ - jsloader \ - $(NULL) - - NON_OMNIJAR_FILES += \ - chrome/icons/\* \ -- defaults/pref/channel-prefs.js \ -+ $(PREF_DIR)/channel-prefs.js \ - res/cursors/\* \ - res/MainMenu.nib/\* \ - $(NULL) - - PACK_OMNIJAR = \ - rm -f omni.jar components/binary.manifest && \ - grep -h '^binary-component' components/*.manifest > binary.manifest ; \ - sed -e 's/^binary-component/\#binary-component/' components/components.manifest > components.manifest && \ -# HG changeset patch -# Parent cd8df8030f7ad7530692bd7c4391a8009df56a02 -Bug 620931 part 3 - Allow GRE and XUL application to use omni.jar independently - -We now store two independent locations for an omni.jar, allowing GRE/XRE and -XUL application to each have their own omni.jar. And since xulrunner setups -are very independent from the XUL applications, we implement support for both -omni.jar and non omni.jar cases in the same runtime, with the side effect of -allowing to switch from one to the other manually without rebuilding the -binaries. - -We let the mozilla::Omnijar API handle both cases, so that callers don't need -too much work to support them. - -We also make the preferences service load the same set of preferences in all -the various cases (unified vs. separate, omni.jar vs. no omni.jar). - -The child process launcher for IPC is modified to pass the base directories -needed for the mozilla::Omnijar API initialization in the child process. - -Finally, the startupcache file name canonicalization is modified to separate -APP and GRE resources. - -diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp ---- a/ipc/glue/GeckoChildProcessHost.cpp -+++ b/ipc/glue/GeckoChildProcessHost.cpp -@@ -440,26 +440,29 @@ GeckoChildProcessHost::PerformAsyncLaunc - // other end of the socketpair() from us - - std::vector<std::string> childArgv; - - childArgv.push_back(exePath.value()); - - childArgv.insert(childArgv.end(), aExtraOpts.begin(), aExtraOpts.end()); - --#ifdef MOZ_OMNIJAR - // Make sure the child process can find the omnijar - // See XRE_InitCommandLine in nsAppRunner.cpp -- nsCAutoString omnijarPath; -- if (mozilla::OmnijarPath()) { -- mozilla::OmnijarPath()->GetNativePath(omnijarPath); -- childArgv.push_back("-omnijar"); -- childArgv.push_back(omnijarPath.get()); -+ nsCAutoString path; -+ nsCOMPtr<nsIFile> file = mozilla::Omnijar::GetBase(mozilla::Omnijar::GRE); -+ if (file && NS_SUCCEEDED(file->GetNativePath(path))) { -+ childArgv.push_back("-grebase"); -+ childArgv.push_back(path.get()); - } --#endif -+ file = mozilla::Omnijar::GetBase(mozilla::Omnijar::APP); -+ if (file && NS_SUCCEEDED(file->GetNativePath(path))) { -+ childArgv.push_back("-appbase"); -+ childArgv.push_back(path.get()); -+ } - - childArgv.push_back(pidstring); - - #if defined(MOZ_CRASHREPORTER) - # if defined(OS_LINUX) - int childCrashFd, childCrashRemapFd; - if (!CrashReporter::CreateNotificationPipeForChild( - &childCrashFd, &childCrashRemapFd)) -@@ -552,26 +555,29 @@ GeckoChildProcessHost::PerformAsyncLaunc - for (std::vector<std::string>::iterator it = aExtraOpts.begin(); - it != aExtraOpts.end(); - ++it) { - cmdLine.AppendLooseValue(UTF8ToWide(*it)); - } - - cmdLine.AppendLooseValue(std::wstring(mGroupId.get())); - --#ifdef MOZ_OMNIJAR - // Make sure the child process can find the omnijar - // See XRE_InitCommandLine in nsAppRunner.cpp -- nsAutoString omnijarPath; -- if (mozilla::OmnijarPath()) { -- mozilla::OmnijarPath()->GetPath(omnijarPath); -- cmdLine.AppendLooseValue(UTF8ToWide("-omnijar")); -- cmdLine.AppendLooseValue(omnijarPath.get()); -+ nsAutoString path; -+ nsCOMPtr<nsIFile> file = mozilla::Omnijar::GetBase(mozilla::Omnijar::GRE); -+ if (file && NS_SUCCEEDED(file->GetPath(path))) { -+ cmdLine.AppendLooseValue(UTF8ToWide("-grebase")); -+ cmdLine.AppendLooseValue(path.get()); - } --#endif -+ file = mozilla::Omnijar::GetBase(mozilla::Omnijar::APP); -+ if (file && NS_SUCCEEDED(file->GetPath(path))) { -+ cmdLine.AppendLooseValue(UTF8ToWide("-appbase")); -+ cmdLine.AppendLooseValue(path.get()); -+ } - - cmdLine.AppendLooseValue(UTF8ToWide(pidstring)); - - #if defined(MOZ_CRASHREPORTER) - cmdLine.AppendLooseValue( - UTF8ToWide(CrashReporter::GetChildNotificationPipe())); - #endif - -diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect/loader/mozJSComponentLoader.cpp ---- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp -+++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp -@@ -81,16 +81,17 @@ - #include "nsIConsoleService.h" - #include "nsIStorageStream.h" - #include "nsIStringStream.h" - #include "prmem.h" - #if defined(XP_WIN) - #include "nsILocalFileWin.h" - #endif - #include "xpcprivate.h" -+#include "nsIResProtocolHandler.h" - - #ifdef MOZ_ENABLE_LIBXUL - #include "mozilla/scache/StartupCache.h" - #include "mozilla/scache/StartupCacheUtils.h" - #endif - #include "mozilla/Omnijar.h" - - #include "jsdbgapi.h" -@@ -621,34 +622,21 @@ mozJSComponentLoader::LoadModule(nsILoca - - const mozilla::Module* - mozJSComponentLoader::LoadModuleFromJAR(nsILocalFile *aJarFile, - const nsACString &aComponentPath) - { - #if !defined(XPCONNECT_STANDALONE) - nsresult rv; - -- nsCAutoString fullSpec; -- --#ifdef MOZ_OMNIJAR -- PRBool equal; -- rv = aJarFile->Equals(mozilla::OmnijarPath(), &equal); -- if (NS_SUCCEEDED(rv) && equal) { -- fullSpec = "resource://gre/"; -- } else { --#endif -- nsCAutoString fileSpec; -- NS_GetURLSpecFromActualFile(aJarFile, fileSpec); -- fullSpec = "jar:"; -- fullSpec += fileSpec; -- fullSpec += "!/"; --#ifdef MOZ_OMNIJAR -- } --#endif -- -+ nsCAutoString fullSpec, fileSpec; -+ NS_GetURLSpecFromActualFile(aJarFile, fileSpec); -+ fullSpec = "jar:"; -+ fullSpec += fileSpec; -+ fullSpec += "!/"; - fullSpec += aComponentPath; - - nsCOMPtr<nsIURI> uri; - rv = NS_NewURI(getter_AddRefs(uri), fullSpec); - if (NS_FAILED(rv)) - return NULL; - - nsAutoString hashstring; -@@ -833,57 +821,138 @@ class JSScriptHolder - JSScriptHolder(JSContext *cx, JSScript *script) - : mCx(cx), mScript(script) {} - ~JSScriptHolder() { ::JS_DestroyScript(mCx, mScript); } - private: - JSContext *mCx; - JSScript *mScript; - }; - -+static const char baseName[2][5] = { "gre/", "app/" }; -+ -+static inline PRBool -+canonicalizeBase(nsCAutoString &spec, nsACString &out, mozilla::Omnijar::Type aType) -+{ -+ nsCAutoString base; -+ nsresult rv = mozilla::Omnijar::GetURIString(aType, base); -+ -+ if (NS_FAILED(rv) || !base.Length()) -+ return PR_FALSE; -+ -+ if (base.Compare(spec.get(), PR_FALSE, base.Length())) -+ return PR_FALSE; -+ -+ out.Append("/resource/"); -+ out.Append(baseName[aType]); -+ out.Append(Substring(spec, base.Length())); -+ return PR_TRUE; -+} - /** - * PathifyURI transforms mozilla .js uris into useful zip paths - * to make it makes it easier to manipulate startup cache entries - * using standard zip tools. - * Transformations applied: -- * * jsloader/<scheme> prefix is used to group mozJSComponentLoader cache entries in -+ * * jsloader/ prefix is used to group mozJSComponentLoader cache entries in - * a top-level zip directory. -- * * In MOZ_OMNIJAR case resource:/// and resource://gre/ URIs refer to the same path -- * so treat both of them as resource://gre/ -+ * * resource:// URIs are resolved to their corresponding file/jar URI to -+ * canonicalize resources URIs other than gre and app. -+ * * Paths under GRE or APP directory have their base path replaced with -+ * resource/gre or resource/app to avoid depending on install location. -+ * * jar:file:///path/to/file.jar!/sub/path urls are replaced with -+ * /path/to/file.jar/sub/path - * * .bin suffix is added to the end of the path to indicate that jsloader/ entries - * are binary representations of JS source. - * For example: -- * resource://gre/modules/XPCOMUtils.jsm becomes -- * jsloader/resource/gre/modules/XPCOMUtils.jsm.bin -+ * resource://gre/modules/XPCOMUtils.jsm or -+ * file://$GRE_DIR/modules/XPCOMUtils.jsm or -+ * jar:file://$GRE_DIR/omni.jar!/modules/XPCOMUtils.jsm become -+ * jsloader/resource/gre/modules/XPCOMUtils.jsm.bin -+ * file://$PROFILE_DIR/extensions/{uuid}/components/component.js becomes -+ * jsloader/$PROFILE_DIR/extensions/%7Buuid%7D/components/component.js.bin -+ * jar:file://$PROFILE_DIR/extensions/some.xpi!/components/component.js becomes -+ * jsloader/$PROFILE_DIR/extensions/some.xpi/components/component.js.bin - */ - static nsresult - PathifyURI(nsIURI *in, nsACString &out) - { -- out = "jsloader/"; -- nsCAutoString scheme; -- nsresult rv = in->GetScheme(scheme); -- NS_ENSURE_SUCCESS(rv, rv); -- out.Append(scheme); -- nsCAutoString host; -- // OK for GetHost to fail since it's not implemented sometimes -- in->GetHost(host); --#ifdef MOZ_OMNIJAR -- if (scheme.Equals("resource") && host.Length() == 0){ -- host = "gre"; -- } --#endif -- if (host.Length()) { -- out.Append("/"); -- out.Append(host); -- } -- nsCAutoString path; -- rv = in->GetPath(path); -- NS_ENSURE_SUCCESS(rv, rv); -- out.Append(path); -- out.Append(".bin"); -- return NS_OK; -+ PRBool equals; -+ nsresult rv; -+ nsCOMPtr<nsIURI> uri = in; -+ nsCAutoString spec; -+ -+ out = "jsloader"; -+ -+ // Resolve resource:// URIs. At the end of this if/else block, we -+ // have both spec and uri variables identifying the same URI. -+ if (NS_SUCCEEDED(in->SchemeIs("resource", &equals)) && equals) { -+ nsCOMPtr<nsIIOService> ioService = do_GetIOService(&rv); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsIProtocolHandler> ph; -+ rv = ioService->GetProtocolHandler("resource", getter_AddRefs(ph)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsIResProtocolHandler> irph(do_QueryInterface(ph, &rv)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ rv = irph->ResolveURI(in, spec); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ rv = ioService->NewURI(spec, nsnull, nsnull, getter_AddRefs(uri)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ } else { -+ rv = in->GetSpec(spec); -+ NS_ENSURE_SUCCESS(rv, rv); -+ } -+ -+ if (!canonicalizeBase(spec, out, mozilla::Omnijar::GRE) && -+ !canonicalizeBase(spec, out, mozilla::Omnijar::APP)) { -+ if (NS_SUCCEEDED(uri->SchemeIs("file", &equals)) && equals) { -+ nsCOMPtr<nsIFileURL> baseFileURL; -+ baseFileURL = do_QueryInterface(uri, &rv); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCAutoString path; -+ rv = baseFileURL->GetPath(path); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ out.Append(path); -+ } else if (NS_SUCCEEDED(uri->SchemeIs("jar", &equals)) && equals) { -+ nsCOMPtr<nsIJARURI> jarURI = do_QueryInterface(uri, &rv); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsIURI> jarFileURI; -+ rv = jarURI->GetJARFile(getter_AddRefs(jarFileURI)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsIFileURL> jarFileURL; -+ jarFileURL = do_QueryInterface(jarFileURI, &rv); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCAutoString path; -+ rv = jarFileURL->GetPath(path); -+ NS_ENSURE_SUCCESS(rv, rv); -+ out.Append(path); -+ -+ rv = jarURI->GetJAREntry(path); -+ NS_ENSURE_SUCCESS(rv, rv); -+ out.Append("/"); -+ out.Append(path); -+ } else { // Very unlikely -+ nsCAutoString spec; -+ rv = uri->GetSpec(spec); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ out.Append("/"); -+ out.Append(spec); -+ } -+ } -+ -+ out.Append(".bin"); -+ return NS_OK; - } - - /* static */ - #ifdef MOZ_ENABLE_LIBXUL - nsresult - mozJSComponentLoader::ReadScript(StartupCache* cache, nsIURI *uri, - JSContext *cx, JSScript **script) - { -diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp ---- a/modules/libjar/nsJAR.cpp -+++ b/modules/libjar/nsJAR.cpp -@@ -171,26 +171,23 @@ nsJAR::Open(nsIFile* zipFile) - if (mLock) return NS_ERROR_FAILURE; // Already open! - - mZipFile = zipFile; - mOuterZipEntry.Truncate(); - - mLock = PR_NewLock(); - NS_ENSURE_TRUE(mLock, NS_ERROR_OUT_OF_MEMORY); - --#ifdef MOZ_OMNIJAR - // The omnijar is special, it is opened early on and closed late - // this avoids reopening it -- PRBool equals; -- nsresult rv = zipFile->Equals(mozilla::OmnijarPath(), &equals); -- if (NS_SUCCEEDED(rv) && equals) { -- mZip = mozilla::OmnijarReader(); -+ nsZipArchive *zip = mozilla::Omnijar::GetReader(zipFile); -+ if (zip) { -+ mZip = zip; - return NS_OK; - } --#endif - return mZip->OpenArchive(zipFile); - } - - NS_IMETHODIMP - nsJAR::OpenInner(nsIZipReader *aZipReader, const char *aZipEntry) - { - NS_ENSURE_ARG_POINTER(aZipReader); - NS_ENSURE_ARG_POINTER(aZipEntry); -@@ -234,23 +231,22 @@ nsJAR::Close() - mLock = nsnull; - } - - mParsedManifest = PR_FALSE; - mManifestData.Reset(); - mGlobalStatus = JAR_MANIFEST_NOT_PARSED; - mTotalItemsInManifest = 0; - --#ifdef MOZ_OMNIJAR -- if (mZip == mozilla::OmnijarReader()) { -+ if ((mZip == mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE)) || -+ (mZip == mozilla::Omnijar::GetReader(mozilla::Omnijar::APP))) { - mZip.forget(); - mZip = new nsZipArchive(); - return NS_OK; - } --#endif - return mZip->CloseArchive(); - } - - NS_IMETHODIMP - nsJAR::Test(const char *aEntryName) - { - return mZip->Test(aEntryName); - } -@@ -391,22 +387,21 @@ nsJAR::GetInputStreamWithSpec(const nsAC - NS_IMETHODIMP - nsJAR::GetCertificatePrincipal(const char* aFilename, nsIPrincipal** aPrincipal) - { - //-- Parameter check - if (!aPrincipal) - return NS_ERROR_NULL_POINTER; - *aPrincipal = nsnull; - --#ifdef MOZ_OMNIJAR - // Don't check signatures in the omnijar - this is only - // interesting for extensions/XPIs. -- if (mZip == mozilla::OmnijarReader()) -+ if ((mZip == mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE)) || -+ (mZip == mozilla::Omnijar::GetReader(mozilla::Omnijar::APP))) - return NS_OK; --#endif - - //-- Parse the manifest - nsresult rv = ParseManifest(); - if (NS_FAILED(rv)) return rv; - if (mGlobalStatus == JAR_NO_MANIFEST) - return NS_OK; - - PRInt16 requestedStatus; -diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp ---- a/modules/libpref/src/nsPrefService.cpp -+++ b/modules/libpref/src/nsPrefService.cpp -@@ -67,20 +67,18 @@ - - #include "prefapi.h" - #include "prefread.h" - #include "prefapi_private_data.h" - #include "PrefTuple.h" - - #include "nsITimelineService.h" - --#ifdef MOZ_OMNIJAR - #include "mozilla/Omnijar.h" - #include "nsZipArchive.h" --#endif - - // Definitions - #define INITIAL_PREF_FILES 10 - static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID); - - // Prototypes - static nsresult openPrefFile(nsIFile* aFile); - static nsresult pref_InitInitialObjects(void); -@@ -793,124 +791,144 @@ static nsresult pref_LoadPrefsInDirList( - pref_LoadPrefsInDir(dir, nsnull, 0); - } - } - } - } - return NS_OK; - } - --//---------------------------------------------------------------------------------------- --// Initialize default preference JavaScript buffers from --// appropriate TEXT resources --//---------------------------------------------------------------------------------------- --static nsresult pref_InitDefaults() --{ -- nsCOMPtr<nsIFile> greprefsFile; -- nsresult rv; -- -- rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile)); -- NS_ENSURE_SUCCESS(rv, rv); -- -- rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("greprefs.js")); -- NS_ENSURE_SUCCESS(rv, rv); -- -- rv = openPrefFile(greprefsFile); -- if (NS_FAILED(rv)) { -- NS_WARNING("Error parsing GRE default preferences. Is this an old-style embedding app?"); -- } -- -- return NS_OK; --} -- --#ifdef MOZ_OMNIJAR - static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) - { - nsZipItemPtr<char> manifest(jarReader, name, true); - NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); - - PrefParseState ps; - PREF_InitParseState(&ps, PREF_ReaderCallback, NULL); - nsresult rv = PREF_ParseBuf(&ps, manifest, manifest.Length()); - PREF_FinalizeParseState(&ps); - - return rv; - } - --static nsresult pref_InitAppDefaultsFromOmnijar() --{ -- nsresult rv; -- -- nsZipArchive* jarReader = mozilla::OmnijarReader(); -- if (!jarReader) -- return pref_InitDefaults(); -- -- rv = pref_ReadPrefFromJar(jarReader, "greprefs.js"); -- NS_ENSURE_SUCCESS(rv, rv); -- -- nsZipFind *findPtr; -- rv = jarReader->FindInit("defaults/pref/*.js$", &findPtr); -- NS_ENSURE_SUCCESS(rv, rv); -- -- nsAutoPtr<nsZipFind> find(findPtr); -- -- nsTArray<nsCString> prefEntries; -- const char *entryName; -- PRUint16 entryNameLen; -- while (NS_SUCCEEDED(find->FindNext(&entryName, &entryNameLen))) { -- prefEntries.AppendElement(Substring(entryName, entryName + entryNameLen)); -- } -- -- prefEntries.Sort(); -- for (PRUint32 i = prefEntries.Length(); i--; ) { -- rv = pref_ReadPrefFromJar(jarReader, prefEntries[i].get()); -- if (NS_FAILED(rv)) -- NS_WARNING("Error parsing preferences."); -- } -- -- return NS_OK; --} --#endif -- -+//---------------------------------------------------------------------------------------- -+// Initialize default preference JavaScript buffers from -+// appropriate TEXT resources -+//---------------------------------------------------------------------------------------- - static nsresult pref_InitInitialObjects() - { - nsresult rv; - -- // first we parse the GRE default prefs. This also works if we're not using a GRE, --#ifdef MOZ_OMNIJAR -- rv = pref_InitAppDefaultsFromOmnijar(); --#else -- rv = pref_InitDefaults(); --#endif -- NS_ENSURE_SUCCESS(rv, rv); -+ // In omni.jar case, we load the following prefs: -+ // - jar:$gre/omni.jar!/greprefs.js -+ // - jar:$gre/omni.jar!/defaults/pref/*.js -+ // In non omni.jar case, we load: -+ // - $gre/greprefs.js -+ // -+ // When $app == $gre, we additionally load, in all cases: -+ // - $gre/defaults/pref/*.js -+ // This is kept for bug 591866 (channel-prefs.js should not be in omni.jar). -+ // We load all files instead of channel-prefs.js only to have the same -+ // behaviour as $app != $gre. -+ // -+ // When $app != $gre, we additionally load, in omni.jar case: -+ // - jar:$app/omni.jar!/defaults/preferences/*.js -+ // - $app/defaults/preferences/*.js -+ // and in non omni.jar case: -+ // - $app/defaults/preferences/*.js - -- nsCOMPtr<nsIFile> defaultPrefDir; -- // now parse the "application" default preferences -- rv = NS_GetSpecialDirectory(NS_APP_PREF_DEFAULTS_50_DIR, getter_AddRefs(defaultPrefDir)); -- NS_ENSURE_SUCCESS(rv, rv); -+ nsZipFind *findPtr; -+ nsAutoPtr<nsZipFind> find; -+ nsTArray<nsCString> prefEntries; -+ const char *entryName; -+ PRUint16 entryNameLen; - -- /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ -- static const char* specialFiles[] = { -+ nsZipArchive* jarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE); -+ if (jarReader) { -+ // Load jar:$gre/omni.jar!/greprefs.js -+ rv = pref_ReadPrefFromJar(jarReader, "greprefs.js"); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ // Load jar:$gre/omni.jar!/defaults/pref/*.js -+ rv = jarReader->FindInit("defaults/pref/*.js$", &findPtr); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ find = findPtr; -+ while (NS_SUCCEEDED(find->FindNext(&entryName, &entryNameLen))) { -+ prefEntries.AppendElement(Substring(entryName, entryName + entryNameLen)); -+ } -+ -+ prefEntries.Sort(); -+ for (PRUint32 i = prefEntries.Length(); i--; ) { -+ rv = pref_ReadPrefFromJar(jarReader, prefEntries[i].get()); -+ if (NS_FAILED(rv)) -+ NS_WARNING("Error parsing preferences."); -+ } -+ } else { -+ // Load $gre/greprefs.js -+ nsCOMPtr<nsIFile> greprefsFile; -+ rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("greprefs.js")); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ rv = openPrefFile(greprefsFile); -+ if (NS_FAILED(rv)) -+ NS_WARNING("Error parsing GRE default preferences. Is this an old-style embedding app?"); -+ } -+ -+ if (!mozilla::Omnijar::HasOmnijar(mozilla::Omnijar::APP)) { -+ // Load $gre/defaults/pref/*.js -+ nsCOMPtr<nsIFile> defaultPrefDir; -+ -+ rv = NS_GetSpecialDirectory(NS_APP_PREF_DEFAULTS_50_DIR, getter_AddRefs(defaultPrefDir)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ -+ static const char* specialFiles[] = { - #if defined(XP_MAC) || defined(XP_MACOSX) - "macprefs.js" - #elif defined(XP_WIN) - "winpref.js" - #elif defined(XP_UNIX) - "unix.js" --#if defined(_AIX) -+#if defined(VMS) -+ , "openvms.js" -+#elif defined(_AIX) - , "aix.js" - #endif - #elif defined(XP_OS2) - "os2pref.js" -+#elif defined(XP_BEOS) -+ "beos.js" - #endif -- }; -+ }; - -- rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); -- if (NS_FAILED(rv)) { -- NS_WARNING("Error parsing application default preferences."); -+ rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); -+ if (NS_FAILED(rv)) -+ NS_WARNING("Error parsing application default preferences."); -+ } -+ -+ // Load jar:$app/omni.jar!/defaults/preferences/*.js -+ nsZipArchive *appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); -+ if (appJarReader) { -+ rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr); -+ NS_ENSURE_SUCCESS(rv, rv); -+ find = findPtr; -+ prefEntries.Clear(); -+ while (NS_SUCCEEDED(find->FindNext(&entryName, &entryNameLen))) { -+ prefEntries.AppendElement(Substring(entryName, entryName + entryNameLen)); -+ } -+ prefEntries.Sort(); -+ for (PRUint32 i = prefEntries.Length(); i--; ) { -+ rv = pref_ReadPrefFromJar(appJarReader, prefEntries[i].get()); -+ if (NS_FAILED(rv)) -+ NS_WARNING("Error parsing preferences."); -+ } - } - - rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST); - NS_ENSURE_SUCCESS(rv, rv); - - NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, - nsnull, NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID); - -diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/res/nsResProtocolHandler.cpp ---- a/netwerk/protocol/res/nsResProtocolHandler.cpp -+++ b/netwerk/protocol/res/nsResProtocolHandler.cpp -@@ -152,97 +152,62 @@ nsResProtocolHandler::nsResProtocolHandl - } - - nsResProtocolHandler::~nsResProtocolHandler() - { - gResHandler = nsnull; - } - - nsresult --nsResProtocolHandler::AddSpecialDir(const char* aSpecialDir, const nsACString& aSubstitution) --{ -- nsCOMPtr<nsIFile> file; -- nsresult rv = NS_GetSpecialDirectory(aSpecialDir, getter_AddRefs(file)); -- NS_ENSURE_SUCCESS(rv, rv); -- -- nsCOMPtr<nsIURI> uri; -- rv = mIOService->NewFileURI(file, getter_AddRefs(uri)); -- NS_ENSURE_SUCCESS(rv, rv); -- -- return SetSubstitution(aSubstitution, uri); --} -- --nsresult - nsResProtocolHandler::Init() - { - if (!mSubstitutions.Init(32)) - return NS_ERROR_UNEXPECTED; - - nsresult rv; - - mIOService = do_GetIOService(&rv); - NS_ENSURE_SUCCESS(rv, rv); - --#ifdef MOZ_OMNIJAR -- nsCOMPtr<nsIFile> omniJar(mozilla::OmnijarPath()); -- if (omniJar) -- return Init(omniJar); --#endif -- -- // these entries should be kept in sync with the omnijar Init function -+ nsCAutoString appURI, greURI; -+ rv = mozilla::Omnijar::GetURIString(mozilla::Omnijar::APP, appURI); -+ NS_ENSURE_SUCCESS(rv, rv); -+ rv = mozilla::Omnijar::GetURIString(mozilla::Omnijar::GRE, greURI); -+ NS_ENSURE_SUCCESS(rv, rv); - - // -- // make resource:/// point to the application directory -+ // make resource:/// point to the application directory or omnijar - // -- rv = AddSpecialDir(NS_OS_CURRENT_PROCESS_DIR, EmptyCString()); -+ nsCOMPtr<nsIURI> uri; -+ rv = NS_NewURI(getter_AddRefs(uri), appURI.Length() ? appURI : greURI); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ rv = SetSubstitution(EmptyCString(), uri); - NS_ENSURE_SUCCESS(rv, rv); - - // - // make resource://gre/ point to the GRE directory - // -- rv = AddSpecialDir(NS_GRE_DIR, kGRE); -+ if (appURI.Length()) { // We already have greURI in uri if appURI.Length() is 0. -+ rv = NS_NewURI(getter_AddRefs(uri), greURI); -+ NS_ENSURE_SUCCESS(rv, rv); -+ } -+ -+ rv = SetSubstitution(kGRE, uri); - NS_ENSURE_SUCCESS(rv, rv); - - //XXXbsmedberg Neil wants a resource://pchrome/ for the profile chrome dir... - // but once I finish multiple chrome registration I'm not sure that it is needed - - // XXX dveditz: resource://pchrome/ defeats profile directory salting - // if web content can load it. Tread carefully. - - return rv; - } - --#ifdef MOZ_OMNIJAR --nsresult --nsResProtocolHandler::Init(nsIFile *aOmniJar) --{ -- nsresult rv; -- nsCOMPtr<nsIURI> uri; -- nsCAutoString omniJarSpec; -- NS_GetURLSpecFromActualFile(aOmniJar, omniJarSpec, mIOService); -- -- nsCAutoString urlStr("jar:"); -- urlStr += omniJarSpec; -- urlStr += "!/"; -- -- rv = mIOService->NewURI(urlStr, nsnull, nsnull, getter_AddRefs(uri)); -- NS_ENSURE_SUCCESS(rv, rv); -- -- // these entries should be kept in sync with the normal Init function -- -- // resource:/// points to jar:omni.jar!/ -- SetSubstitution(EmptyCString(), uri); -- -- // resource://gre/ points to jar:omni.jar!/ -- SetSubstitution(kGRE, uri); -- -- return NS_OK; --} --#endif -- - #ifdef MOZ_IPC - static PLDHashOperator - EnumerateSubstitution(const nsACString& aKey, - nsIURI* aURI, - void* aArg) - { - nsTArray<ResourceMapping>* resources = - static_cast<nsTArray<ResourceMapping>*>(aArg); -diff --git a/startupcache/StartupCache.cpp b/startupcache/StartupCache.cpp ---- a/startupcache/StartupCache.cpp -+++ b/startupcache/StartupCache.cpp -@@ -237,27 +237,36 @@ StartupCache::GetBuffer(const char* id, - nsZipItemPtr<char> zipItem(mArchive, id, true); - if (zipItem) { - *outbuf = zipItem.Forget(); - *length = zipItem.Length(); - return NS_OK; - } - } - --#ifdef MOZ_OMNIJAR -- if (mozilla::OmnijarReader()) { -+ if (mozilla::Omnijar::GetReader(mozilla::Omnijar::APP)) { - // no need to checksum omnijarred entries -- nsZipItemPtr<char> zipItem(mozilla::OmnijarReader(), id); -+ nsZipItemPtr<char> zipItem(mozilla::Omnijar::GetReader(mozilla::Omnijar::APP), id); - if (zipItem) { - *outbuf = zipItem.Forget(); - *length = zipItem.Length(); - return NS_OK; - } - } --#endif -+ -+ if (mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE)) { -+ // no need to checksum omnijarred entries -+ nsZipItemPtr<char> zipItem(mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE), id); -+ if (zipItem) { -+ *outbuf = zipItem.Forget(); -+ *length = zipItem.Length(); -+ return NS_OK; -+ } -+ } -+ - return NS_ERROR_NOT_AVAILABLE; - } - - // Makes a copy of the buffer, client retains ownership of inbuf. - nsresult - StartupCache::PutBuffer(const char* id, const char* inbuf, PRUint32 len) - { - WaitOnWriteThread(); -diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp ---- a/toolkit/xre/nsAppRunner.cpp -+++ b/toolkit/xre/nsAppRunner.cpp -@@ -3897,35 +3897,45 @@ XRE_InitCommandLine(int aArgc, char* aAr - CommandLine::Init(aArgc, canonArgs); - - for (int i = 0; i < aArgc; ++i) - free(canonArgs[i]); - delete[] canonArgs; - #endif - #endif - --#ifdef MOZ_OMNIJAR -- const char *omnijarPath = nsnull; -- ArgResult ar = CheckArg("omnijar", PR_FALSE, &omnijarPath); -+ const char *path = nsnull; -+ ArgResult ar = CheckArg("grebase", PR_FALSE, &path); - if (ar == ARG_BAD) { -- PR_fprintf(PR_STDERR, "Error: argument -omnijar requires an omnijar path\n"); -+ PR_fprintf(PR_STDERR, "Error: argument -grebase requires a path argument\n"); - return NS_ERROR_FAILURE; - } - -- if (!omnijarPath) -+ if (!path) - return rv; - -- nsCOMPtr<nsILocalFile> omnijar; -- rv = NS_NewNativeLocalFile(nsDependentCString(omnijarPath), PR_TRUE, -- getter_AddRefs(omnijar)); -- if (NS_SUCCEEDED(rv)) -- mozilla::SetOmnijar(omnijar); --#endif -- -- return rv; -+ nsCOMPtr<nsILocalFile> greBase; -+ rv = XRE_GetFileFromPath(path, getter_AddRefs(greBase)); -+ if (NS_FAILED(rv)) -+ return rv; -+ -+ ar = CheckArg("appbase", PR_FALSE, &path); -+ if (ar == ARG_BAD) { -+ PR_fprintf(PR_STDERR, "Error: argument -appbase requires a path argument\n"); -+ return NS_ERROR_FAILURE; -+ } -+ -+ nsCOMPtr<nsILocalFile> appBase; -+ if (path) { -+ rv = XRE_GetFileFromPath(path, getter_AddRefs(appBase)); -+ if (NS_FAILED(rv)) -+ return rv; -+ } -+ -+ return mozilla::Omnijar::SetBase(greBase, appBase); - } - - nsresult - XRE_DeinitCommandLine() - { - nsresult rv = NS_OK; - - #if defined(MOZ_IPC) -diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp ---- a/toolkit/xre/nsEmbedFunctions.cpp -+++ b/toolkit/xre/nsEmbedFunctions.cpp -@@ -512,19 +512,17 @@ XRE_InitChildProcess(int aArgc, - } - - // Run the UI event loop on the main thread. - uiMessageLoop.MessageLoop::Run(); - - // Allow ProcessChild to clean up after itself before going out of - // scope and being deleted - process->CleanUp(); --#ifdef MOZ_OMNIJAR -- mozilla::SetOmnijar(nsnull); --#endif -+ mozilla::Omnijar::SetBase(nsnull, nsnull); - } - } - - NS_LogTerm(); - return XRE_DeinitCommandLine(); - } - - MessageLoop* -diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in ---- a/xpcom/build/Makefile.in -+++ b/xpcom/build/Makefile.in -@@ -64,28 +64,25 @@ CSRCS = \ - $(NULL) - - CPPSRCS = \ - $(XPCOM_GLUE_SRC_LCPPSRCS) \ - $(XPCOM_GLUENS_SRC_LCPPSRCS) \ - nsXPComInit.cpp \ - nsXPCOMStrings.cpp \ - Services.cpp \ -+ Omnijar.cpp \ - $(NULL) - - ifndef MOZ_ENABLE_LIBXUL - ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH))) - CPPSRCS += dlldeps.cpp - endif - endif - --ifdef MOZ_OMNIJAR --CPPSRCS += Omnijar.cpp --endif -- - SHARED_LIBRARY_LIBS = \ - $(DEPTH)/chrome/src/$(LIB_PREFIX)chrome_s.$(LIB_SUFFIX) \ - ../ds/$(LIB_PREFIX)xpcomds_s.$(LIB_SUFFIX) \ - ../io/$(LIB_PREFIX)xpcomio_s.$(LIB_SUFFIX) \ - ../components/$(LIB_PREFIX)xpcomcomponents_s.$(LIB_SUFFIX) \ - ../threads/$(LIB_PREFIX)xpcomthreads_s.$(LIB_SUFFIX) \ - ../proxy/src/$(LIB_PREFIX)xpcomproxy_s.$(LIB_SUFFIX) \ - ../base/$(LIB_PREFIX)xpcombase_s.$(LIB_SUFFIX) \ -diff --git a/xpcom/build/Omnijar.cpp b/xpcom/build/Omnijar.cpp ---- a/xpcom/build/Omnijar.cpp -+++ b/xpcom/build/Omnijar.cpp -@@ -16,16 +16,17 @@ - * - * The Initial Developer of the Original Code is - * Mozilla Foundation. - * Portions created by the Initial Developer are Copyright (C) 2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Michael Wu <mwu@mozilla.com> -+ * Mike Hommey <mh@glandium.org> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your -@@ -33,69 +34,175 @@ - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - #include "Omnijar.h" - --#include "nsILocalFile.h" --#include "nsXULAppAPI.h" -+#include "nsIFile.h" - #include "nsZipArchive.h" -+#include "nsNetUtil.h" - --static nsILocalFile* sOmnijarPath = nsnull; --static nsZipArchive* sOmnijarReader = nsnull; -+namespace mozilla { - --static void --SetupReader() -+nsIFile *Omnijar::sPath[2] = { nsnull, nsnull }; -+PRBool Omnijar::sIsOmnijar[2] = { PR_FALSE, PR_FALSE }; -+ -+#ifdef MOZ_ENABLE_LIBXUL -+nsZipArchive *Omnijar::sReader[2] = { nsnull, nsnull }; -+#endif -+ -+static already_AddRefed<nsIFile> -+ComputePath(nsIFile *aPath, PRBool &aIsOmnijar) - { -- if (!sOmnijarPath) { -- return; -+ PRBool isDir; -+ aIsOmnijar = PR_FALSE; -+ if (!aPath || NS_FAILED(aPath->IsDirectory(&isDir)) || !isDir) -+ return nsnull; -+ -+ nsCOMPtr<nsIFile> path; -+#ifdef MOZ_ENABLE_LIBXUL -+ // Search for omni.jar in the given directory -+ if (!isDir || NS_FAILED(aPath->Clone(getter_AddRefs(path)))) -+ return nsnull; -+ -+ if (NS_FAILED(path->AppendNative(NS_LITERAL_CSTRING("omni.jar")))) -+ return nsnull; -+ -+ if (NS_FAILED(path->Exists(&aIsOmnijar))) -+ return nsnull; -+#endif -+ -+ if (!aIsOmnijar && NS_FAILED(aPath->Clone(getter_AddRefs(path)))) -+ return nsnull; -+ -+ return path.forget(); -+} -+ -+nsresult -+Omnijar::SetBase(nsIFile *aGrePath, nsIFile *aAppPath) -+{ -+ NS_ABORT_IF_FALSE(aGrePath || !aAppPath, "Omnijar::SetBase(NULL, something) call forbidden"); -+ -+#ifdef MOZ_ENABLE_LIBXUL -+ if (sReader[GRE]) { -+ sReader[GRE]->CloseArchive(); -+ delete sReader[GRE]; -+ } -+ if (sReader[APP]) { -+ sReader[APP]->CloseArchive(); -+ delete sReader[APP]; -+ } -+ sReader[APP] = sReader[GRE] = nsnull; -+#endif -+ -+ nsresult rv; -+ PRBool equals; -+ if (aAppPath) { -+ rv = aAppPath->Equals(aGrePath, &equals); -+ NS_ENSURE_SUCCESS(rv, rv); -+ } else { -+ equals = PR_TRUE; - } - -- nsZipArchive* zipReader = new nsZipArchive(); -- if (!zipReader) { -- NS_IF_RELEASE(sOmnijarPath); -- return; -+ nsCOMPtr<nsIFile> grePath = ComputePath(aGrePath, sIsOmnijar[GRE]); -+ nsCOMPtr<nsIFile> appPath = ComputePath(equals ? nsnull : aAppPath, sIsOmnijar[APP]); -+ -+ NS_IF_RELEASE(sPath[GRE]); -+ sPath[GRE] = grePath; -+ NS_IF_ADDREF(sPath[GRE]); -+ -+ NS_IF_RELEASE(sPath[APP]); -+ sPath[APP] = appPath; -+ NS_IF_ADDREF(sPath[APP]); -+ -+ return NS_OK; -+} -+ -+already_AddRefed<nsIFile> -+Omnijar::GetBase(Type aType) -+{ -+ NS_ABORT_IF_FALSE(sPath[0], "Omnijar not initialized"); -+ -+ if (!sIsOmnijar[aType]) { -+ NS_IF_ADDREF(sPath[aType]); -+ return sPath[aType]; - } - -- if (NS_FAILED(zipReader->OpenArchive(sOmnijarPath))) { -+ nsCOMPtr<nsIFile> file, path; -+ if (NS_FAILED(sPath[aType]->Clone(getter_AddRefs(file)))) -+ return nsnull; -+ -+ if (NS_FAILED(file->GetParent(getter_AddRefs(path)))) -+ return nsnull; -+ return path.forget(); -+} -+ -+#ifdef MOZ_ENABLE_LIBXUL -+nsZipArchive * -+Omnijar::GetReader(Type aType) -+{ -+ if (!sIsOmnijar[aType]) -+ return nsnull; -+ -+ if (sReader[aType]) -+ return sReader[aType]; -+ -+ nsZipArchive* zipReader = new nsZipArchive(); -+ if (!zipReader) -+ return nsnull; -+ -+ if (NS_FAILED(zipReader->OpenArchive(sPath[aType]))) { - delete zipReader; -- NS_IF_RELEASE(sOmnijarPath); -- return; -+ return nsnull; - } - -- sOmnijarReader = zipReader; -+ return (sReader[aType] = zipReader); - } - --nsILocalFile* --mozilla::OmnijarPath() -+nsZipArchive * -+Omnijar::GetReader(nsIFile *aPath) - { -- if (!sOmnijarReader) -- SetupReader(); -+ PRBool equals; -+ nsresult rv; - -- return sOmnijarPath; -+ if (sIsOmnijar[GRE]) { -+ rv = sPath[GRE]->Equals(aPath, &equals); -+ if (NS_SUCCEEDED(rv) && equals) -+ return GetReader(GRE); -+ } -+ if (sIsOmnijar[APP]) { -+ rv = sPath[APP]->Equals(aPath, &equals); -+ if (NS_SUCCEEDED(rv) && equals) -+ return GetReader(APP); -+ } -+ return nsnull; -+} -+#endif -+ -+nsresult -+Omnijar::GetURIString(Type aType, nsCString &result) -+{ -+ NS_ABORT_IF_FALSE(sPath[0], "Omnijar not initialized"); -+ -+ result = ""; -+ -+ if ((aType == APP) && (!sPath[APP])) -+ return NS_OK; -+ -+ nsCAutoString omniJarSpec; -+ nsresult rv = NS_GetURLSpecFromActualFile(sPath[aType], omniJarSpec); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (sIsOmnijar[aType]) { -+ result = "jar:"; -+ result += omniJarSpec; -+ result += "!"; -+ } else { -+ result = omniJarSpec; -+ } -+ result += "/"; -+ return NS_OK; - } - --nsZipArchive* --mozilla::OmnijarReader() --{ -- if (!sOmnijarReader) -- SetupReader(); -- -- return sOmnijarReader; --} -- --void --mozilla::SetOmnijar(nsILocalFile* aPath) --{ -- NS_IF_RELEASE(sOmnijarPath); -- if (sOmnijarReader) { -- sOmnijarReader->CloseArchive(); -- delete sOmnijarReader; -- sOmnijarReader = nsnull; -- } -- -- sOmnijarPath = aPath; -- NS_IF_ADDREF(sOmnijarPath); --} -- -+} /* namespace mozilla */ -diff --git a/xpcom/build/Omnijar.h b/xpcom/build/Omnijar.h ---- a/xpcom/build/Omnijar.h -+++ b/xpcom/build/Omnijar.h -@@ -16,16 +16,17 @@ - * - * The Initial Developer of the Original Code is - * Mozilla Foundation. - * Portions created by the Initial Developer are Copyright (C) 2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Michael Wu <mwu@mozilla.com> -+ * Mike Hommey <mh@glandium.org> - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your -@@ -34,29 +35,137 @@ - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - #ifndef mozilla_Omnijar_h - #define mozilla_Omnijar_h - --class nsILocalFile; -+#include "nscore.h" -+#include "nsTArray.h" -+#include "nsCOMPtr.h" -+#include "nsString.h" -+ -+class nsIFile; - class nsZipArchive; -- --#ifdef MOZ_OMNIJAR -+class nsIURI; - - namespace mozilla { - -+#ifdef MOZ_ENABLE_LIBXUL -+#define OMNIJAR_EXPORT -+#else -+#define OMNIJAR_EXPORT NS_EXPORT -+#endif -+ -+class OMNIJAR_EXPORT Omnijar { -+private: - /** -- * This returns the path to the omnijar. -- * If the omnijar isn't available, this function will return null. -- * Callers should fallback to flat packaging if null. -+ * Store an nsIFile for either a base directory when there is no omni.jar, -+ * or omni.jar itself. We can store two paths here, one for GRE -+ * (corresponding to resource://gre/) and one for APP -+ * (corresponding to resource:/// and resource://app/), but only -+ * store one when both point to the same location (unified). - */ --nsILocalFile *OmnijarPath(); --nsZipArchive *OmnijarReader(); --void SetOmnijar(nsILocalFile* aPath); -+static nsIFile *sPath[2]; -+/** -+ * Store whether the corresponding sPath is an omni.jar or a directory -+ */ -+static PRBool sIsOmnijar[2]; -+ -+#ifdef MOZ_ENABLE_LIBXUL -+/** -+ * Cached nsZipArchives for the corresponding sPath -+ */ -+static nsZipArchive *sReader[2]; -+#endif -+ -+public: -+enum Type { -+ GRE = 0, -+ APP = 1 -+}; -+ -+/** -+ * Returns whether SetBase has been called at least once with -+ * a valid nsIFile -+ */ -+static PRBool -+IsInitialized() -+{ -+ // GRE path is always set after initialization. -+ return sPath[0] != nsnull; -+} -+ -+/** -+ * Sets the base directories for GRE and APP. APP base directory -+ * may be nsnull, in case the APP and GRE directories are the same. -+ */ -+static nsresult SetBase(nsIFile *aGrePath, nsIFile *aAppPath); -+ -+/** -+ * Returns an nsIFile pointing to the omni.jar file for GRE or APP. -+ * Returns nsnull when there is no corresponding omni.jar. -+ * Also returns nsnull for APP in the unified case. -+ */ -+static already_AddRefed<nsIFile> -+GetPath(Type aType) -+{ -+ NS_ABORT_IF_FALSE(sPath[0], "Omnijar not initialized"); -+ -+ if (sIsOmnijar[aType]) { -+ NS_IF_ADDREF(sPath[aType]); -+ return sPath[aType]; -+ } -+ return nsnull; -+} -+ -+/** -+ * Returns whether GRE or APP use an omni.jar. Returns PR_False when -+ * using an omni.jar in the unified case. -+ */ -+static PRBool -+HasOmnijar(Type aType) -+{ -+ return sIsOmnijar[aType]; -+} -+ -+/** -+ * Returns the base directory for GRE or APP. In the unified case, -+ * returns nsnull for APP. -+ */ -+static already_AddRefed<nsIFile> GetBase(Type aType); -+ -+/** -+ * Returns a nsZipArchive pointer for the omni.jar file for GRE or -+ * APP. Returns nsnull in the same cases GetPath() would. -+ */ -+#ifdef MOZ_ENABLE_LIBXUL -+static nsZipArchive *GetReader(Type aType); -+#else -+static nsZipArchive *GetReader(Type aType) { return nsnull; } -+#endif -+ -+/** -+ * Returns a nsZipArchive pointer for the given path IAOI the given -+ * path is the omni.jar for either GRE or APP. -+ */ -+#ifdef MOZ_ENABLE_LIBXUL -+static nsZipArchive *GetReader(nsIFile *aPath); -+#else -+static nsZipArchive *GetReader(nsIFile *aPath) { return nsnull; } -+#endif -+ -+/** -+ * Returns the URI string corresponding to the omni.jar or directory -+ * for GRE or APP. i.e. jar:/path/to/omni.jar!/ for omni.jar and -+ * /path/to/base/dir/ otherwise. Returns an empty string for APP in -+ * the unified case. -+ * The returned URI is guaranteed to end with a slash. -+ */ -+static nsresult GetURIString(Type aType, nsCString &result); -+ -+}; /* class Omnijar */ - - } /* namespace mozilla */ - --#endif /* MOZ_OMNIJAR */ -- - #endif /* mozilla_Omnijar_h */ -diff --git a/xpcom/build/nsXPComInit.cpp b/xpcom/build/nsXPComInit.cpp ---- a/xpcom/build/nsXPComInit.cpp -+++ b/xpcom/build/nsXPComInit.cpp -@@ -462,35 +462,35 @@ NS_InitXPCOM2(nsIServiceManager* *result - nsDirectoryService::gService->Set(NS_XPCOM_LIBRARY_FILE, xpcomLib); - } - - if (appFileLocationProvider) { - rv = nsDirectoryService::gService->RegisterProvider(appFileLocationProvider); - if (NS_FAILED(rv)) return rv; - } - --#ifdef MOZ_OMNIJAR - NS_TIME_FUNCTION_MARK("Next: Omnijar init"); - -- if (!mozilla::OmnijarPath()) { -- nsCOMPtr<nsILocalFile> omnijar; -+ if (!mozilla::Omnijar::IsInitialized()) { -+ nsCOMPtr<nsILocalFile> greDir, appDir; - nsCOMPtr<nsIFile> file; - -- rv = NS_ERROR_FAILURE; - nsDirectoryService::gService->Get(NS_GRE_DIR, - NS_GET_IID(nsIFile), - getter_AddRefs(file)); -- if (file) -- rv = file->Append(NS_LITERAL_STRING("omni.jar")); -- if (NS_SUCCEEDED(rv)) -- omnijar = do_QueryInterface(file); -- if (NS_SUCCEEDED(rv)) -- mozilla::SetOmnijar(omnijar); -+ greDir = do_QueryInterface(file); -+ -+ nsDirectoryService::gService->Get(NS_XPCOM_CURRENT_PROCESS_DIR, -+ NS_GET_IID(nsIFile), -+ getter_AddRefs(file)); -+ appDir = do_QueryInterface(file); -+ -+ rv = mozilla::Omnijar::SetBase(greDir, appDir); -+ NS_ENSURE_SUCCESS(rv, rv); - } --#endif - - #ifdef MOZ_IPC - if ((sCommandLineWasInitialized = !CommandLine::IsInitialized())) { - NS_TIME_FUNCTION_MARK("Next: IPC command line init"); - - #ifdef OS_WIN - CommandLine::Init(0, nsnull); - #else -@@ -769,18 +769,16 @@ ShutdownXPCOM(nsIServiceManager* servMgr - sCommandLineWasInitialized = false; - } - if (sExitManager) { - delete sExitManager; - sExitManager = nsnull; - } - #endif - --#ifdef MOZ_OMNIJAR -- mozilla::SetOmnijar(nsnull); --#endif -+ mozilla::Omnijar::SetBase(nsnull, nsnull); - - NS_LogTerm(); - - return NS_OK; - } - - } // namespace mozilla -diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp ---- a/xpcom/components/nsComponentManager.cpp -+++ b/xpcom/components/nsComponentManager.cpp -@@ -175,18 +175,16 @@ NS_DEFINE_CID(kCategoryManagerCID, NS_CA - #define COMPMGR_TIME_FUNCTION_CONTRACTID(cid) \ - NS_TIME_FUNCTION_MIN_FMT(5, "%s (line %d) (contractid: %s)", MOZ_FUNCTION_NAME, \ - __LINE__, (cid)) - #else - #define COMPMGR_TIME_FUNCTION_CID(cid) do {} while (0) - #define COMPMGR_TIME_FUNCTION_CONTRACTID(cid) do {} while (0) - #endif - --#define kOMNIJAR_PREFIX NS_LITERAL_CSTRING("resource:///") -- - nsresult - nsGetServiceFromCategory::operator()(const nsIID& aIID, void** aInstancePtr) const - { - nsresult rv; - nsXPIDLCString value; - nsCOMPtr<nsICategoryManager> catman; - nsComponentManagerImpl *compMgr = nsComponentManagerImpl::gComponentManager; - if (!compMgr) { -@@ -390,47 +388,44 @@ nsresult nsComponentManagerImpl::Init() - - nsCategoryManager::GetSingleton()->SuppressNotifications(true); - - RegisterModule(&kXPCOMModule, NULL); - - for (PRUint32 i = 0; i < sStaticModules->Length(); ++i) - RegisterModule((*sStaticModules)[i], NULL); - --#ifdef MOZ_OMNIJAR -- if (mozilla::OmnijarPath()) { -- nsCOMPtr<nsIZipReader> omnijarReader = new nsJAR(); -- rv = omnijarReader->Open(mozilla::OmnijarPath()); -- if (NS_SUCCEEDED(rv)) -- RegisterJarManifest(omnijarReader, "chrome.manifest", false); -+ nsCOMPtr<nsIFile> appOmnijar = mozilla::Omnijar::GetPath(mozilla::Omnijar::APP); -+ if (appOmnijar) { -+ cl = sModuleLocations->InsertElementAt(1); // Insert after greDir -+ cl->type = NS_COMPONENT_LOCATION; -+ cl->location = do_QueryInterface(appOmnijar); -+ cl->jar = true; - } --#endif -+ nsCOMPtr<nsIFile> greOmnijar = mozilla::Omnijar::GetPath(mozilla::Omnijar::GRE); -+ if (greOmnijar) { -+ cl = sModuleLocations->InsertElementAt(0); -+ cl->type = NS_COMPONENT_LOCATION; -+ cl->location = do_QueryInterface(greOmnijar); -+ cl->jar = true; -+ } - - for (PRUint32 i = 0; i < sModuleLocations->Length(); ++i) { - ComponentLocation& l = sModuleLocations->ElementAt(i); - if (!l.jar) { - RegisterManifestFile(l.type, l.location, false); - continue; - } - - nsCOMPtr<nsIZipReader> reader = do_CreateInstance(kZipReaderCID, &rv); - rv = reader->Open(l.location); - if (NS_SUCCEEDED(rv)) - RegisterJarManifest(reader, "chrome.manifest", false); - } - --#ifdef MOZ_OMNIJAR -- if (mozilla::OmnijarPath()) { -- cl = sModuleLocations->InsertElementAt(0); -- cl->type = NS_COMPONENT_LOCATION; -- cl->location = mozilla::OmnijarPath(); -- cl->jar = true; -- } --#endif -- - nsCategoryManager::GetSingleton()->SuppressNotifications(false); - - mStatus = NORMAL; - - return NS_OK; - } - - void -# HG changeset patch -# Parent ff1b810f78226d7f4010909d3cde05a57fdcf20c -Bug 620931 part 4 - Fix resource://app/ to always point to the same as resource:/// - -diff --git a/netwerk/protocol/res/nsResProtocolHandler.cpp b/netwerk/protocol/res/nsResProtocolHandler.cpp ---- a/netwerk/protocol/res/nsResProtocolHandler.cpp -+++ b/netwerk/protocol/res/nsResProtocolHandler.cpp -@@ -74,16 +74,17 @@ static nsResProtocolHandler *gResHandler - // set NSPR_LOG_FILE=log.txt - // - // this enables PR_LOG_ALWAYS level information and places all output in - // the file log.txt - // - static PRLogModuleInfo *gResLog; - #endif - -+#define kAPP NS_LITERAL_CSTRING("app") - #define kGRE NS_LITERAL_CSTRING("gre") - - //---------------------------------------------------------------------------- - // nsResURL : overrides nsStandardURL::GetFile to provide nsIFile resolution - //---------------------------------------------------------------------------- - - nsresult - nsResURL::EnsureFile() -@@ -179,16 +180,22 @@ nsResProtocolHandler::Init() - nsCOMPtr<nsIURI> uri; - rv = NS_NewURI(getter_AddRefs(uri), appURI.Length() ? appURI : greURI); - NS_ENSURE_SUCCESS(rv, rv); - - rv = SetSubstitution(EmptyCString(), uri); - NS_ENSURE_SUCCESS(rv, rv); - - // -+ // make resource://app/ point to the application directory or omnijar -+ // -+ rv = SetSubstitution(kAPP, uri); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ // - // make resource://gre/ point to the GRE directory - // - if (appURI.Length()) { // We already have greURI in uri if appURI.Length() is 0. - rv = NS_NewURI(getter_AddRefs(uri), greURI); - NS_ENSURE_SUCCESS(rv, rv); - } - - rv = SetSubstitution(kGRE, uri); -diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp ---- a/toolkit/xre/nsXREDirProvider.cpp -+++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -300,19 +300,16 @@ nsXREDirProvider::GetFile(const char* aP - } - } - else if (!strcmp(aProperty, XRE_EXECUTABLE_FILE) && gArgv[0]) { - nsCOMPtr<nsILocalFile> lf; - rv = XRE_GetBinaryPath(gArgv[0], getter_AddRefs(lf)); - if (NS_SUCCEEDED(rv)) - file = lf; - } -- else if (!strcmp(aProperty, "resource:app")) { -- rv = GetAppDir()->Clone(getter_AddRefs(file)); -- } - - else if (!strcmp(aProperty, NS_APP_PROFILE_DIR_STARTUP) && mProfileDir) { - return mProfileDir->Clone(aFile); - } - else if (!strcmp(aProperty, NS_APP_PROFILE_LOCAL_DIR_STARTUP)) { - if (mProfileLocalDir) - return mProfileLocalDir->Clone(aFile); - -# HG changeset patch -# Parent 7d2228db71a299afca60babff632a967d2d6c456 -Bug 620931 part 5 - Enable omni.jar by default on xulrunner - -diff --git a/xulrunner/confvars.sh b/xulrunner/confvars.sh ---- a/xulrunner/confvars.sh -+++ b/xulrunner/confvars.sh -@@ -36,15 +36,16 @@ - # - # ***** END LICENSE BLOCK ***** - - MOZ_APP_NAME=xulrunner - MOZ_APP_DISPLAYNAME=XULRunner - MOZ_UPDATER=1 - MOZ_XULRUNNER=1 - MOZ_ENABLE_LIBXUL=1 -+MOZ_CHROME_FILE_FORMAT=omni - MOZ_STATIC_BUILD_UNSUPPORTED=1 - MOZ_APP_VERSION=$MOZILLA_VERSION - if test "$MOZ_STORAGE"; then - MOZ_PLACES=1 - fi - MOZ_EXTENSIONS_DEFAULT=" gnomevfs" - MOZ_URL_CLASSIFIER=1 diff --git a/community/xulrunner-oss/xulrunner-version.patch b/community/xulrunner-oss/xulrunner-version.patch deleted file mode 100644 index 8e81b23ea..000000000 --- a/community/xulrunner-oss/xulrunner-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in mozilla-2.0/xulrunner/installer/Makefile.in ---- mozilla-2.0.orig/xulrunner/installer/Makefile.in 2011-03-03 14:12:04.000000000 -0800 -+++ mozilla-2.0/xulrunner/installer/Makefile.in 2011-03-13 01:58:19.663360705 -0800 -@@ -44,6 +44,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION="2.0" -+ - NO_PKG_FILES = \ - xulrunner-config \ - regchrome* \ diff --git a/core/binutils/binutils-2.21-strip-segfault.patch b/core/binutils/binutils-2.21-strip-segfault.patch deleted file mode 100644 index 0133d879b..000000000 --- a/core/binutils/binutils-2.21-strip-segfault.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/binutils/objcopy.c b/binutils/objcopy.c -index 15c4f95..b64f3d0 100644 ---- a/binutils/objcopy.c -+++ b/binutils/objcopy.c -@@ -1,6 +1,6 @@ - /* objcopy.c -- copy object file from input to output, optionally massaging it. - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. - - This file is part of GNU Binutils. -@@ -2024,6 +2024,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, - struct stat buf; - int stat_status = 0; - bfd_boolean del = TRUE; -+ bfd_boolean ok_object; - - /* Create an output file for this member. */ - output_name = concat (dir, "/", -@@ -2061,44 +2062,42 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, - l->obfd = NULL; - list = l; - -- if (bfd_check_format (this_element, bfd_object)) -+ ok_object = bfd_check_format (this_element, bfd_object); -+ if (!ok_object) -+ bfd_nonfatal_message (NULL, this_element, NULL, -+ _("Unable to recognise the format of file")); -+ -+ /* PR binutils/3110: Cope with archives -+ containing multiple target types. */ -+ if (force_output_target || !ok_object) -+ output_bfd = bfd_openw (output_name, output_target); -+ else -+ output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); -+ -+ if (output_bfd == NULL) - { -- /* PR binutils/3110: Cope with archives -- containing multiple target types. */ -- if (force_output_target) -- output_bfd = bfd_openw (output_name, output_target); -- else -- output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); -+ bfd_nonfatal_message (output_name, NULL, NULL, NULL); -+ status = 1; -+ return; -+ } -+ -+ if (ok_object) -+ { -+ del = !copy_object (this_element, output_bfd, input_arch); - -- if (output_bfd == NULL) -+ if (del && bfd_get_arch (this_element) == bfd_arch_unknown) -+ /* Try again as an unknown object file. */ -+ ok_object = FALSE; -+ else if (!bfd_close (output_bfd)) - { - bfd_nonfatal_message (output_name, NULL, NULL, NULL); -+ /* Error in new object file. Don't change archive. */ - status = 1; -- return; - } -- -- del = ! copy_object (this_element, output_bfd, input_arch); -- -- if (! del -- || bfd_get_arch (this_element) != bfd_arch_unknown) -- { -- if (!bfd_close (output_bfd)) -- { -- bfd_nonfatal_message (output_name, NULL, NULL, NULL); -- /* Error in new object file. Don't change archive. */ -- status = 1; -- } -- } -- else -- goto copy_unknown_element; - } -- else -- { -- bfd_nonfatal_message (NULL, this_element, NULL, -- _("Unable to recognise the format of file")); - -- output_bfd = bfd_openw (output_name, output_target); --copy_unknown_element: -+ if (!ok_object) -+ { - del = !copy_unknown_object (this_element, output_bfd); - if (!bfd_close_all_done (output_bfd)) - { --- -1.6.5.GIT - diff --git a/core/glibc/glibc-2.13-prelink.patch b/core/glibc/glibc-2.13-prelink.patch deleted file mode 100644 index bef7998a8..000000000 --- a/core/glibc/glibc-2.13-prelink.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/elf/rtld.c b/elf/rtld.c -index 9a560b3..201c9cf 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - we need it in the memory handling later. */ - GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; - -+ /* Remember the last search directory added at startup, now that -+ malloc will no longer be the one from dl-minimal.c. */ -+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -+ - if (prelinked) - { - if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) -@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lossage); - } - -- /* Remember the last search directory added at startup, now that -- malloc will no longer be the one from dl-minimal.c. */ -- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -- - if (! prelinked && rtld_multiple_ref) - { - /* There was an explicit ref to the dynamic linker as a shared lib. diff --git a/core/less/zless b/core/less/zless deleted file mode 100644 index 93d560bc5..000000000 --- a/core/less/zless +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -: ${PAGER=less} -export PAGER - -PATH="/usr/bin:$PATH" -export PATH - -exec zmore ${1+"$@"} diff --git a/core/psmisc/ChangeLog b/core/psmisc/ChangeLog deleted file mode 100644 index d9fa6dfa5..000000000 --- a/core/psmisc/ChangeLog +++ /dev/null @@ -1,40 +0,0 @@ -2010-09-06 Eric Belanger <eric@archlinux.org> - - * psmisc 22.13-1 - * Upstream update - -2010-08-03 Eric Belanger <eric@archlinux.org> - - * psmisc 22.12-1 - * Upstream update - * Updated psmisc.checkregs.fix.patch - -2010-04-30 Eric Belanger <eric@archlinux.org> - - * psmisc 22.11-1 - * Upstream update - -2010-01-12 Eric Belanger <eric@archlinux.org> - - * psmisc 22.10-1 - * Upstream update - -2009-07-31 Eric Belanger <eric@archlinux.org> - - * psmisc 22.8-1 - * Upstream update - -2009-05-14 Eric Belanger <eric@archlinux.org> - - * psmisc 22.7-1 - * Upstream update - -2009-04-30 Eric Belanger <eric@archlinux.org> - - * psmisc 22.6-2.1 - * Added peekfd in x86_64 package (close FS#14514) - -2008-10-19 Eric Belanger <eric@archlinux.org> - - * Updated url - * Added ChangeLog diff --git a/core/shadow/chage b/core/shadow/chage deleted file mode 100644 index a7bf8a4a5..000000000 --- a/core/shadow/chage +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/core/shadow/chsh b/core/shadow/chsh deleted file mode 100644 index a7bf8a4a5..000000000 --- a/core/shadow/chsh +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/core/shadow/shadow b/core/shadow/shadow deleted file mode 100644 index a7bf8a4a5..000000000 --- a/core/shadow/shadow +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/core/shadow/shadow-4.1.4.2-groupmod-pam-check.patch b/core/shadow/shadow-4.1.4.2-groupmod-pam-check.patch deleted file mode 100644 index f25c4e10f..000000000 --- a/core/shadow/shadow-4.1.4.2-groupmod-pam-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://bugs.gentoo.org/300790 -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html - -2009-11-05 Nicolas François <nicolas.francois@centraliens.net> - - * NEWS, src/groupmod.c: Fixed groupmod when configured with - --enable-account-tools-setuid. - -diff --git a/src/groupmod.c b/src/groupmod.c -index 4205df2..da6d77f 100644 ---- a/src/groupmod.c -+++ b/src/groupmod.c -@@ -724,7 +724,7 @@ int main (int argc, char **argv) - { - struct passwd *pampw; - pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */ -- if (NULL == pamh) { -+ if (NULL == pampw) { - fprintf (stderr, - _("%s: Cannot determine your user name.\n"), - Prog); diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD deleted file mode 100644 index d5c42fd92..000000000 --- a/extra/audacity/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 119629 2011-04-12 20:51:50Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=audacity -pkgver=1.3.13 -pkgrel=1 -pkgdesc="A program that lets you manipulate digital audio waveforms" -arch=('i686' 'x86_64') -url="http://audacity.sourceforge.net/" -license=('GPL') -depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme' - 'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch') -makedepends=('zip') -options=('!makeflags') -install=audacity.install -source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2) -md5sums=('57be7fadb8c8dd17b8462c7ac1561d03') - -build() { - cd "${srcdir}/${pkgname}-src-${pkgver}-beta" - WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \ - --with-portaudio --with-libsamplerate \ - --without-libresample --with-libmad \ - --with-id3tag --with-libflac \ - --with-vorbis --with-libexpat \ - --with-libsndfile --with-soundtouch \ - --enable-unicode --without-taglib - make -} - -package() { - cd "${srcdir}/${pkgname}-src-${pkgver}-beta" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/audacity/audacity.install b/extra/audacity/audacity.install deleted file mode 100644 index 028c9f62a..000000000 --- a/extra/audacity/audacity.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD deleted file mode 100644 index 825cbefa3..000000000 --- a/extra/clucene/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 20266 2008-12-01 21:26:10Z tpowa $ -# Contributor: Alois Nespor <alois.nespor@gmail.com> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=clucene -pkgver=0.9.21b -pkgrel=1 -pkgdesc="CLucene is a C++ port of Lucene: A high-performance, full-featured text search engine." -arch=('i686' 'x86_64') -url="http://clucene.sourceforge.net" -license=('APACHE' 'LGPL') -depends=('gcc-libs') -makedepends=('libtool' 'autoconf' 'automake' 'doxygen') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.bz2) -options=(!libtool) - -build() { - cd ${srcdir}/$pkgname-core-$pkgver - # fix for some packages - CXXFLAGS="$CXXFLAGS -fPIC" - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install -} -md5sums=('ba1a8f764a2ca19c66ad907dddd88352') diff --git a/extra/darcs/PKGBUILD b/extra/darcs/PKGBUILD deleted file mode 100644 index c073061a5..000000000 --- a/extra/darcs/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 116991 2011-03-27 10:10:32Z remy $ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Simo Leone <neotuli@gmail.com> - -pkgname=darcs -pkgver=2.5.2 -pkgrel=1 -pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics" -arch=(i686 x86_64) -url="http://darcs.net/" -license=('GPL') -depends=('curl' 'gmp' 'ncurses>=5.6-7') -makedepends=('ghc' 'haskell-tar<0.4' 'haskell-text<0.12' - 'haskell-hashed-storage<0.6' 'haskell-haskeline<0.7' - 'haskell-html<1.1' 'haskell-parsec<3.2' 'haskell-regex-compat<0.94') -source=("http://darcs.net/releases/$pkgname-$pkgver.tar.gz") -md5sums=('491b6ca01dec245a16112ad2c7e07dc1') - -build() { - cd $srcdir/$pkgname-$pkgver - runhaskell Setup.lhs configure --ghc -O --prefix=/usr \ - --disable-library-for-ghci --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup.lhs build -} - -check() { - cd ${srcdir}/$pkgname-$pkgver - runhaskell Setup.lhs test -} - -package() { - cd $srcdir/$pkgname-$pkgver - runhaskell Setup.lhs copy --destdir=$pkgdir - rm -r $pkgdir/usr/lib/ - chmod 755 $pkgdir/usr/share/man/man1/$pkgname.1 -} - diff --git a/extra/ffmpeg/avutils-make-aes-and-sha-public.patch b/extra/ffmpeg/avutils-make-aes-and-sha-public.patch deleted file mode 100644 index ac10e4f4a..000000000 --- a/extra/ffmpeg/avutils-make-aes-and-sha-public.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a3a0af4fb1237bed0af75868073f9a63db8b1864 Mon Sep 17 00:00:00 2001 -From: Alexis Ballier <aballier@gentoo.org> -Date: Thu, 7 Apr 2011 10:19:23 -0300 -Subject: [PATCH] avutil: make aes and sha api public - -The functions are already av_ prefixed and sha1 header is already provided. -Install libavutil/{aes,sha}.h - -Signed-off-by: Michael Niedermayer <michaelni@gmx.at> -Signed-off-by: Luca Barbato <lu_zero@gentoo.org> ---- - libavutil/Makefile | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/libavutil/Makefile b/libavutil/Makefile -index 300acb1..baee496 100644 ---- a/libavutil/Makefile -+++ b/libavutil/Makefile -@@ -3,6 +3,7 @@ include $(SUBDIR)../config.mak - NAME = avutil - - HEADERS = adler32.h \ -+ aes.h \ - attributes.h \ - audioconvert.h \ - avassert.h \ -@@ -33,6 +34,7 @@ HEADERS = adler32.h \ - random_seed.h \ - rational.h \ - samplefmt.h \ -+ sha.h \ - sha1.h \ - - BUILT_HEADERS = avconfig.h --- -1.7.2.5 - diff --git a/extra/fprint_demo/PKGBUILD b/extra/fprint_demo/PKGBUILD deleted file mode 100644 index c03d8e516..000000000 --- a/extra/fprint_demo/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 49882 2009-08-16 19:52:26Z jgc $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> - -pkgname=fprint_demo -pkgver=0.4 -pkgrel=2 -pkgdesc="Simple GTK+ application to demonstrate and test libfprint's capabilities" -arch=('i686' 'x86_64') -url="http://reactivated.net/fprint/wiki/Main_Page" -license=('LGPL') -groups=('fprint') -depends=('libfprint') -source=(http://downloads.sourceforge.net/sourceforge/fprint/${pkgname}-${pkgver}.tar.bz2) -md5sums=('32e663a938e19801bdd17105d5c4d310') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/extra/haskell-binary/PKGBUILD b/extra/haskell-binary/PKGBUILD deleted file mode 100644 index a5e1b2b9a..000000000 --- a/extra/haskell-binary/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=binary -pkgname=haskell-binary -pkgver=0.5.0.2 -pkgrel=7 -pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings" -url="http://hackage.haskell.org/package/binary" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/extra/haskell-binary/haskell-binary.install b/extra/haskell-binary/haskell-binary.install deleted file mode 100644 index 0084ebef8..000000000 --- a/extra/haskell-binary/haskell-binary.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-binary -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/extra/haskell-dataenc/PKGBUILD b/extra/haskell-dataenc/PKGBUILD deleted file mode 100644 index cee342409..000000000 --- a/extra/haskell-dataenc/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=dataenc -pkgname=haskell-dataenc -pkgver=0.13.0.4 -pkgrel=3.1 -pkgdesc="Data encoding library" -url="http://hackage.haskell.org/package/dataenc" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('4764fa7f75ed3ee95a759d67d1347d46') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/extra/haskell-dataenc/haskell-dataenc.install b/extra/haskell-dataenc/haskell-dataenc.install deleted file mode 100644 index 9c1bbff01..000000000 --- a/extra/haskell-dataenc/haskell-dataenc.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-dataenc -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/extra/haskell-hashed-storage/PKGBUILD b/extra/haskell-hashed-storage/PKGBUILD deleted file mode 100644 index 244d3f851..000000000 --- a/extra/haskell-hashed-storage/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 -_hkgname=hashed-storage -pkgname=haskell-hashed-storage -pkgver=0.5.4 -pkgrel=3.1 -pkgdesc="Hashed file storage support code." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2' 'haskell-binary=0.5.0.2' 'haskell-mmap=0.5.7' - 'haskell-zlib=0.5.3.1' 'haskell-mtl=2.0.1.0' 'haskell-dataenc=0.13.0.4') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('e182a3fe6f977b0df85641da5df8e4f2') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/extra/haskell-hashed-storage/haskell-hashed-storage.install b/extra/haskell-hashed-storage/haskell-hashed-storage.install deleted file mode 100644 index 6f9a6904c..000000000 --- a/extra/haskell-hashed-storage/haskell-hashed-storage.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hashed-storage -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/extra/haskell-haskeline/PKGBUILD b/extra/haskell-haskeline/PKGBUILD deleted file mode 100644 index 7756390fa..000000000 --- a/extra/haskell-haskeline/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=haskeline -pkgname=haskell-haskeline -pkgver=0.6.3.2 -pkgrel=2.1 -pkgdesc="A command-line interface for user input, written in Haskell." -url="http://hackage.haskell.org/package/haskeline" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2' sh 'haskell-utf8-string=0.3.6' 'haskell-mtl=2.0.1.0' 'haskell-terminfo=0.3.1.3') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d75863f63a1cfb499d0198e4f28ac2af') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure \ - -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/extra/haskell-haskeline/haskell-haskeline.install b/extra/haskell-haskeline/haskell-haskeline.install deleted file mode 100644 index 27cb4a093..000000000 --- a/extra/haskell-haskeline/haskell-haskeline.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-haskeline -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/extra/haskell-mmap/PKGBUILD b/extra/haskell-mmap/PKGBUILD deleted file mode 100644 index 838275675..000000000 --- a/extra/haskell-mmap/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=mmap -pkgname=haskell-mmap -pkgver=0.5.7 -pkgrel=3.1 -pkgdesc="Memory mapped files for POSIX and Windows" -url="http://hackage.haskell.org/package/mmap" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('1f74b3f59617332b06e277f5212423c1') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/extra/haskell-mmap/haskell-mmap.install b/extra/haskell-mmap/haskell-mmap.install deleted file mode 100644 index 68fe74f4e..000000000 --- a/extra/haskell-mmap/haskell-mmap.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-mmap -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/extra/haskell-tar/PKGBUILD b/extra/haskell-tar/PKGBUILD deleted file mode 100644 index 98e92b594..000000000 --- a/extra/haskell-tar/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=tar -pkgname=haskell-tar -pkgver=0.3.1.0 -pkgrel=4.1 -pkgdesc="Reading, writing and manipulating \".tar\" archive files." -url="http://hackage.haskell.org/package/tar" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('10b54856495f9ef0a42aa270085c7d5e') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/extra/haskell-tar/haskell-tar.install b/extra/haskell-tar/haskell-tar.install deleted file mode 100644 index e8c2f6293..000000000 --- a/extra/haskell-tar/haskell-tar.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-tar -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/extra/haskell-terminfo/PKGBUILD b/extra/haskell-terminfo/PKGBUILD deleted file mode 100644 index f8339b0a4..000000000 --- a/extra/haskell-terminfo/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=terminfo -pkgname=haskell-terminfo -pkgver=0.3.1.3 -pkgrel=4.1 -pkgdesc="Haskell bindings to the terminfo library." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('8c0e052340f628b76f5687fa23379628') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/extra/haskell-terminfo/haskell-terminfo.install b/extra/haskell-terminfo/haskell-terminfo.install deleted file mode 100644 index 40d39f42b..000000000 --- a/extra/haskell-terminfo/haskell-terminfo.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-terminfo -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/extra/haskell-utf8-string/PKGBUILD b/extra/haskell-utf8-string/PKGBUILD deleted file mode 100644 index 6bc5d5292..000000000 --- a/extra/haskell-utf8-string/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=utf8-string -pkgname=haskell-utf8-string -pkgver=0.3.6 -pkgrel=7.1 -pkgdesc="Support for reading and writing UTF8 Strings" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('be8c5ef52a0824babdc89d60c1e9b600') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/extra/haskell-utf8-string/haskell-utf8-string.install b/extra/haskell-utf8-string/haskell-utf8-string.install deleted file mode 100644 index 0f64366b2..000000000 --- a/extra/haskell-utf8-string/haskell-utf8-string.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-utf8-string -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/extra/keytouch/ChangeLog b/extra/keytouch/ChangeLog deleted file mode 100644 index 24105e0d2..000000000 --- a/extra/keytouch/ChangeLog +++ /dev/null @@ -1,18 +0,0 @@ -2009-10-17 Eric Belanger <eric@archlinux.org> - - * keytouch 2.4.1-2 - * Fixed daemon script (close FS#15693) - -2008-07-20 Eric Belanger <eric@archlinux.org> - - * keytouch 2.4.1-1 - * Upstream update - * Removed unnecessary post-upgrade message - -2008-06-16 Eric Belanger <eric@archlinux.org> - - * keytouch 2.4.0-1 - * Upstream update - * Patched for glibc 2.8 - * Added to [extra] repo - * Added ChangeLog diff --git a/extra/krusader/add-xz-support.patch b/extra/krusader/add-xz-support.patch deleted file mode 100644 index 9ce44084b..000000000 --- a/extra/krusader/add-xz-support.patch +++ /dev/null @@ -1,403 +0,0 @@ -From: Jan Lepper <dehtris@yahoo.de> -Date: Thu, 27 Jan 2011 08:54:29 +0000 -Subject: add support for .xz archives - thanks to Val Gor, Grigorios Bouzakis -X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=a2db0b0fb5f58d0d648a362f75e3948f49cc87fc ---- -add support for .xz archives - thanks to Val Gor, Grigorios Bouzakis ---- - - ---- a/krArc/krarc.cpp -+++ b/krArc/krarc.cpp -@@ -423,7 +423,7 @@ void kio_krarcProtocol::get(const KUrl& - if (mt) - emit mimeType(mt->name()); - proc << getCmd << getPath(arcFile->url()); -- if (arcType != "gzip" && arcType != "bzip2" && arcType != "lzma") proc << localeEncodedString(file); -+ if (arcType != "gzip" && arcType != "bzip2" && arcType != "lzma" && arcType != "xz") proc << localeEncodedString(file); - connect(&proc, SIGNAL(newOutputData(KProcess *, QByteArray &)), - this, SLOT(receivedData(KProcess *, QByteArray &))); - proc.setMerge(false); -@@ -440,7 +440,7 @@ void kio_krarcProtocol::get(const KUrl& - proc.waitForFinished(); - - if (!extArcReady && !decompressToFile) { -- if (proc.exitStatus() != QProcess::NormalExit || !checkStatus(proc.exitCode()) || (arcType != "bzip2" && arcType != "lzma" && expectedSize != decompressedLen)) { -+ if (proc.exitStatus() != QProcess::NormalExit || !checkStatus(proc.exitCode()) || (arcType != "bzip2" && arcType != "lzma" && arcType != "xz" && expectedSize != decompressedLen)) { - if (encrypted && tries) { - invalidatePassword(); - get(url, tries - 1); -@@ -827,6 +827,8 @@ bool kio_krarcProtocol::setArcFile(const - arcType = "gzip"; - else if (arcType == "tlz") - arcType = "lzma"; -+ else if (arcType == "txz") -+ arcType = "xz"; - - if (arcType.isEmpty()) { - arcType = arcFile->mimetype(); -@@ -861,7 +863,7 @@ bool kio_krarcProtocol::initDirDict(cons - return false; - } - -- if (arcType != "bzip2" && arcType != "lzma") { -+ if (arcType != "bzip2" && arcType != "lzma" && arcType != "xz") { - if (arcType == "rpm") { - proc << listCmd << arcPath; - proc.setStandardOutputFile(temp.fileName()); -@@ -896,7 +898,7 @@ bool kio_krarcProtocol::initDirDict(cons - - root->append(entry); - -- if (arcType == "bzip2" || arcType == "lzma") { -+ if (arcType == "bzip2" || arcType == "lzma" || arcType == "xz") { - KRDEBUG("Got me here..."); - parseLine(0, ""); - return true; -@@ -1207,6 +1209,14 @@ void kio_krarcProtocol::parseLine(int li - mode = arcFile->mode(); - size = arcFile->size(); - } -+ if (arcType == "xz") { -+ fullName = arcFile->name(); -+ if (fullName.endsWith(QLatin1String("xz"))) { -+ fullName.truncate(fullName.length() - 3); -+ } -+ mode = arcFile->mode(); -+ size = arcFile->size(); -+ } - if (arcType == "bzip2") { - // There is no way to list bzip2 files, so we take our information from - // the archive itself... -@@ -1460,6 +1470,13 @@ bool kio_krarcProtocol::initArcParameter - copyCmd = QStringList(); - delCmd = QStringList(); - putCmd = QStringList(); -+ } else if (arcType == "xz") { -+ cmd = fullPathName("xz"); -+ listCmd << fullPathName("xz"); -+ getCmd << fullPathName("xz") << "-dc"; -+ copyCmd = QStringList(); -+ delCmd = QStringList(); -+ putCmd = QStringList(); - } else if (arcType == "arj") { - cmd = fullPathName("arj"); - listCmd << fullPathName("arj") << "v" << "-y" << "-v"; -@@ -1544,7 +1561,7 @@ bool kio_krarcProtocol::checkStatus(int - return exitCode == 0 || exitCode == 1; - else if (arcType == "ace" || arcType == "bzip2" || arcType == "lha" || arcType == "rpm" || arcType == "arj") - return exitCode == 0; -- else if (arcType == "gzip" || arcType == "lzma") -+ else if (arcType == "gzip" || arcType == "lzma" || arcType == "xz") - return exitCode == 0 || exitCode == 2; - else - return exitCode == 0; -@@ -1566,7 +1583,8 @@ QString kio_krarcProtocol::detectArchive - {"bzip2", 0, "\x42\x5a\x68\x39\x31" }, - {"gzip", 0, "\x1f\x8b"}, - {"deb", 0, "!<arch>\ndebian-binary " }, -- {"7z", 0, "7z\xbc\xaf\x27\x1c" } -+ {"7z", 0, "7z\xbc\xaf\x27\x1c" }/*, -+ {"xz", 0, "\xfd\x37\x7a\x58\x5a\x00"}*/ - }; - static int autoDetectElems = sizeof(autoDetectParams) / sizeof(AutoDetectParams); - -@@ -1714,6 +1732,14 @@ QString kio_krarcProtocol::detectArchive - return "lzma"; - } - -+ if (fileName.endsWith(QLatin1String(".tar.xz")) || -+ fileName.endsWith(QLatin1String(".txz"))) { -+ return "txz"; -+ } -+ if (fileName.endsWith(QLatin1String(".xz"))) { -+ return "xz"; -+ } -+ - return QString(); - } - - ---- a/krusader/Dialogs/packgui.cpp -+++ b/krusader/Dialogs/packgui.cpp -@@ -68,6 +68,7 @@ PackGUI::PackGUI(QString defaultName, QS - if (PS("tar") && PS("gzip")) typeData->addItem("tar.gz"); - if (PS("tar") && PS("bzip2")) typeData->addItem("tar.bz2"); - if (PS("tar") && PS("lzma")) typeData->addItem("tar.lzma"); -+ if (PS("tar") && PS("xz")) typeData->addItem("tar.xz"); - if (PS("zip")) typeData->addItem("zip"); - if (PS("rar")) typeData->addItem("rar"); - if (PS("lha")) typeData->addItem("lha"); - ---- a/krusader/Konfigurator/kgarchives.cpp -+++ b/krusader/Konfigurator/kgarchives.cpp -@@ -62,6 +62,7 @@ KgArchives::KgArchives(bool first, QWidg - {{"Archives", "Do Tar", _DoTar, i18n("Tar"), false, ""}, - {"Archives", "Do GZip", _DoGZip, i18n("GZip"), false, ""}, - {"Archives", "Do LZMA", _DoLZMA, i18n("LZMA"), false, ""}, -+ {"Archives", "Do XZ", _DoXZ, i18n("XZ"), false, ""}, - {"Archives", "Do BZip2", _DoBZip2, i18n("BZip2"), false, ""}, - {"Archives", "Do UnZip", _DoUnZip, i18n("Zip"), false, ""}, - {"Archives", "Do UnRar", _DoUnRar, i18n("Rar"), false, ""}, -@@ -73,7 +74,7 @@ KgArchives::KgArchives(bool first, QWidg - {"Archives", "Do 7z", _Do7z, i18n("7zip"), false, ""} - }; - -- cbs = createCheckBoxGroup(3, 0, packers, 12, generalGrp); -+ cbs = createCheckBoxGroup(3, 0, packers, 13, generalGrp); - generalGrid->addWidget(cbs, 1, 0); - - addLabel(generalGrid, 2, 0, i18n("The archives that are \"grayed out\" were unavailable on your\n" -@@ -148,6 +149,7 @@ void KgArchives::disableNonExistingPacke - cbs->find("Do GZip")->setEnabled(PS("gzip")); - cbs->find("Do BZip2")->setEnabled(PS("bzip2")); - cbs->find("Do LZMA")->setEnabled(PS("lzma")); -+ cbs->find("Do XZ")->setEnabled(PS("xz")); - cbs->find("Do UnZip")->setEnabled(PS("unzip")); - cbs->find("Do Lha")->setEnabled(PS("lha")); - cbs->find("Do RPM")->setEnabled(PS("rpm") || PS("cpio")); - ---- a/krusader/Konfigurator/kgdependencies.cpp -+++ b/krusader/Konfigurator/kgdependencies.cpp -@@ -100,6 +100,7 @@ KgDependencies::KgDependencies(bool firs - addApplication("unrar", archGrid1, 12, packers_tab, PAGE_PACKERS); - addApplication("unzip", archGrid1, 13, packers_tab, PAGE_PACKERS); - addApplication("zip", archGrid1, 14, packers_tab, PAGE_PACKERS); -+ addApplication("xz", archGrid1, 15, packers_tab, PAGE_PACKERS); - - // ---------------------------- CHECKSUM TAB ------------------------------------- - QWidget *checksum_tab = new QWidget(tabWidget); - ---- a/krusader/Konfigurator/kggeneral.cpp -+++ b/krusader/Konfigurator/kggeneral.cpp -@@ -193,6 +193,7 @@ void KgGeneral::createExtensionsTab() - defaultAtomicExtensions += ".tar.gz"; - defaultAtomicExtensions += ".tar.bz2"; - defaultAtomicExtensions += ".tar.lzma"; -+ defaultAtomicExtensions += ".tar.xz"; - defaultAtomicExtensions += ".moc.cpp"; - - listBox = createListBox("Look&Feel", "Atomic Extensions", - ---- a/krusader/Konfigurator/kgprotocols.cpp -+++ b/krusader/Konfigurator/kgprotocols.cpp -@@ -51,12 +51,14 @@ QString KgProtocols::defaultKrarcMimes = - "application/x-gzip,application/x-jar," - "application/x-lha,application/x-lha-compressed," - "application/x-rar,application/x-rar-compressed," -+ "application/x-xz," - "application/x-rpm,application/zip," - "application/x-zip,application/x-zip-compressed"; - QString KgProtocols::defaultTarMimes = "application/x-tar,application/x-tarz," - "application/x-bzip-compressed-tar," - "application/x-compressed-tar," -- "application/x-tbz,application/x-tgz"; -+ "application/x-tbz,application/x-tgz," -+ "application/x-xz-compressed-tar"; - - KgProtocols::KgProtocols(bool first, QWidget* parent) : - KonfiguratorPage(first, parent) - ---- a/krusader/Konfigurator/krresulttable.cpp -+++ b/krusader/Konfigurator/krresulttable.cpp -@@ -102,6 +102,7 @@ KrArchiverResultTable::KrArchiverResultT - Archiver* gzip = new Archiver("gzip", "http://www.gnu.org", PS("gzip"), true, true); - Archiver* bzip2 = new Archiver("bzip2", "http://www.gnu.org", PS("bzip2"), true, true); - Archiver* lzma = new Archiver("lzma", "http://tukaani.org/lzma", PS("lzma"), true, true); -+ Archiver* xz = new Archiver("xz", "http://tukaani.org/xz", PS("xz"), true, true); - Archiver* lha = new Archiver("lha", "http://www.gnu.org", PS("lha"), true, true); - Archiver* zip = new Archiver("zip", "http://www.info-zip.org", PS("zip"), true, false); - Archiver* unzip = new Archiver("unzip", "http://www.info-zip.org", PS("unzip"), false, true); -@@ -139,6 +140,7 @@ KrArchiverResultTable::KrArchiverResultT - addRow(gzip, _grid); - addRow(bzip2, _grid); - addRow(lzma, _grid); -+ addRow(xz, _grid); - addRow(lha, _grid); - addRow(zip, _grid); - addRow(unzip, _grid); -@@ -155,6 +157,7 @@ KrArchiverResultTable::KrArchiverResultT - delete gzip; - delete bzip2; - delete lzma; -+ delete xz; - delete lha; - delete zip; - delete unzip; - ---- a/krusader/Panel/krview.cpp -+++ b/krusader/Panel/krview.cpp -@@ -367,6 +367,7 @@ void KrView::initProperties() - defaultAtomicExtensions += ".tar.gz"; - defaultAtomicExtensions += ".tar.bz2"; - defaultAtomicExtensions += ".tar.lzma"; -+ defaultAtomicExtensions += ".tar.xz"; - defaultAtomicExtensions += ".moc.cpp"; - QStringList atomicExtensions = grpSvr.readEntry("Atomic Extensions", defaultAtomicExtensions); - for (QStringList::iterator i = atomicExtensions.begin(); i != atomicExtensions.end();) { - ---- a/krusader/VFS/krarchandler.cpp -+++ b/krusader/VFS/krarchandler.cpp -@@ -85,7 +85,7 @@ public: - }; - #endif - --static QStringList arcProtocols = QString("tar;bzip;bzip2;lzma;gzip;krarc;zip").split(';'); -+static QStringList arcProtocols = QString("tar;bzip;bzip2;lzma;xz;gzip;krarc;zip").split(';'); - - KWallet::Wallet * KRarcHandler::wallet = 0; - -@@ -98,6 +98,7 @@ QStringList KRarcHandler::supportedPacke - if (KrServices::cmdExist("gzip")) packers.append("gzip"); - if (KrServices::cmdExist("bzip2")) packers.append("bzip2"); - if (KrServices::cmdExist("lzma")) packers.append("lzma"); -+ if (KrServices::cmdExist("xz")) packers.append("xz"); - if (KrServices::cmdExist("unzip")) packers.append("unzip"); - if (KrServices::cmdExist("zip")) packers.append("zip"); - if (KrServices::cmdExist("lha")) packers.append("lha"); -@@ -134,6 +135,8 @@ bool KRarcHandler::arcSupported(QString - return true; - else if (type == "-tlz" && lst.contains("tar")) - return true; -+ else if (type == "-txz" && lst.contains("tar")) -+ return true; - else if (type == "tarz" && lst.contains("tar")) - return true; - else if (type == "gzip" && lst.contains("gzip")) -@@ -142,6 +145,8 @@ bool KRarcHandler::arcSupported(QString - return true; - else if (type == "lzma" && lst.contains("lzma")) - return true; -+ else if (type == "-xz" && lst.contains("xz")) -+ return true; - else if (type == "-lha" && lst.contains("lha")) - return true; - else if (type == "-ace" && lst.contains("unace")) -@@ -173,6 +178,7 @@ bool KRarcHandler::arcHandled(QString ty - (type == "-tar" && group.readEntry("Do Tar" , _DoTar)) || - (type == "-tbz" && group.readEntry("Do BZip2", _DoBZip2)) || - (type == "-tlz" && group.readEntry("Do LZMA", _DoLZMA)) || -+ (type == "-txz" && group.readEntry("Do XZ", _DoXZ)) || - (type == "gzip" && group.readEntry("Do GZip" , _DoGZip)) || - (type == "zip2" && group.readEntry("Do BZip2", _DoBZip2)) || - (type == "-zip" && group.readEntry("Do UnZip", _DoUnZip)) || -@@ -198,7 +204,7 @@ long KRarcHandler::arcFileCount(QString - if (!arcSupported(type)) return 0; - - // bzip an gzip archive contains only one file -- if (type == "zip2" || type == "gzip" || type == "lzma") return 1L; -+ if (type == "zip2" || type == "gzip" || type == "lzma" || type == "-xz") return 1L; - - // set the right lister to do the job - QStringList lister; -@@ -209,6 +215,7 @@ long KRarcHandler::arcFileCount(QString - else if (type == "tarz") lister << KrServices::fullPathName("tar") << "-tvzf"; - else if (type == "-tbz") lister << KrServices::fullPathName("tar") << "-tjvf"; - else if (type == "-tlz") lister << KrServices::fullPathName("tar") << "--lzma" << "-tvf"; -+ else if (type == "-txz") lister << KrServices::fullPathName("tar") << "--xz" << "-tvf"; - else if (type == "-lha") lister << KrServices::fullPathName("lha") << "l"; - else if (type == "-rar") lister << KrServices::fullPathName(KrServices::cmdExist("rar") ? "rar" : "unrar") << "l" << "-v"; - else if (type == "-ace") lister << KrServices::fullPathName("unace") << "l"; -@@ -293,9 +300,11 @@ bool KRarcHandler::unpack(QString archiv - else if (type == "tarz") packer << KrServices::fullPathName("tar") << "-xvzf"; - else if (type == "-tbz") packer << KrServices::fullPathName("tar") << "-xjvf"; - else if (type == "-tlz") packer << KrServices::fullPathName("tar") << "--lzma" << "-xvf"; -+ else if (type == "-txz") packer << KrServices::fullPathName("tar") << "--xz" << "-xvf"; - else if (type == "gzip") packer << KrServices::fullPathName("gzip") << "-cd"; - else if (type == "zip2") packer << KrServices::fullPathName("bzip2") << "-cdk"; - else if (type == "lzma") packer << KrServices::fullPathName("lzma") << "-cdk"; -+ else if (type == "-xz") packer << KrServices::fullPathName("xz") << "-cdk"; - else if (type == "-lha") packer << KrServices::fullPathName("lha") << "xf"; - else if (type == "-rar") packer << KrServices::fullPathName(KrServices::cmdExist("rar") ? "rar" : "unrar") << "-y" << "x"; - else if (type == "-ace") packer << KrServices::fullPathName("unace") << "x"; -@@ -351,7 +360,7 @@ bool KRarcHandler::unpack(QString archiv - // unpack the files - KrLinecountingProcess proc; - proc << packer << archive; -- if (type == "zip2" || type == "gzip" || type == "lzma") { -+ if (type == "zip2" || type == "gzip" || type == "lzma" || type == "-xz") { - QString arcname = archive.mid(archive.lastIndexOf("/") + 1); - if (arcname.contains(".")) arcname = arcname.left(arcname.lastIndexOf(".")); - proc.setStandardOutputFile(dest + '/' + arcname); -@@ -407,9 +416,11 @@ bool KRarcHandler::test(QString archive, - else if (type == "tarz") packer << KrServices::fullPathName("tar") << "-tvzf"; - else if (type == "-tbz") packer << KrServices::fullPathName("tar") << "-tjvf"; - else if (type == "-tlz") packer << KrServices::fullPathName("tar") << "--lzma" << "-tvf"; -+ else if (type == "-txz") packer << KrServices::fullPathName("tar") << "--xz" << "-tvf"; - else if (type == "gzip") packer << KrServices::fullPathName("gzip") << "-tv"; - else if (type == "zip2") packer << KrServices::fullPathName("bzip2") << "-tv"; - else if (type == "lzma") packer << KrServices::fullPathName("lzma") << "-tv"; -+ else if (type == "-xz") packer << KrServices::fullPathName("xz") << "-tv"; - else if (type == "-rar") packer << KrServices::fullPathName(KrServices::cmdExist("rar") ? "rar" : "unrar") << "t"; - else if (type == "-ace") packer << KrServices::fullPathName("unace") << "t"; - else if (type == "-lha") packer << KrServices::fullPathName("lha") << "t"; -@@ -474,6 +485,8 @@ bool KRarcHandler::pack(QStringList file - packer << KrServices::fullPathName("tar") << "-cvjf"; type = "-tbz"; - } else if (type == "tar.lzma") { - packer << KrServices::fullPathName("tar") << "--lzma" << "-cvf"; type = "-tlz"; -+ } else if (type == "tar.xz") { -+ packer << KrServices::fullPathName("tar") << "--xz" << "-cvf"; type = "-txz"; - } else if (type == "rar") { - packer << KrServices::fullPathName("rar") << "-r" << "a"; type = "-rar"; - } else if (type == "lha") { -@@ -673,6 +686,10 @@ QString KRarcHandler::getType(bool &encr - result = "-7z"; - } - -+ if (result.endsWith(QLatin1String("-xz"))) { -+ result = "-xz"; -+ } -+ - return result.right(4); - } - -@@ -683,9 +700,9 @@ bool KRarcHandler::checkStatus(QString t - return exitCode == 0 || exitCode == 1; - else if (type == "-ace" || type == "zip2" || type == "-lha" || type == "-rpm" || type == "cpio" || - type == "-tar" || type == "tarz" || type == "-tbz" || type == "-tgz" || type == "-arj" || -- type == "-deb" || type == "-tlz") -+ type == "-deb" || type == "-tlz" || type == "-txz") - return exitCode == 0; -- else if (type == "gzip" || type == "lzma") -+ else if (type == "gzip" || type == "lzma" || type == "-xz") - return exitCode == 0 || exitCode == 2; - else - return exitCode == 0; -@@ -707,7 +724,8 @@ QString KRarcHandler::detectArchive(bool - {"bzip2", 0, "\x42\x5a\x68\x39\x31" }, - {"gzip", 0, "\x1f\x8b"}, - {"deb", 0, "!<arch>\ndebian-binary " }, -- {"7z", 0, "7z\xbc\xaf\x27\x1c" } -+ {"7z", 0, "7z\xbc\xaf\x27\x1c" }/*, -+ {"xz", 0, "\xfd\x37\x7a\x58\x5a\x00"}*/ - }; - static int autoDetectElems = sizeof(autoDetectParams) / sizeof(AutoDetectParams); - -@@ -839,6 +857,14 @@ QString KRarcHandler::detectArchive(bool - return "lzma"; - } - -+ if (fileName.endsWith(QLatin1String(".tar.xz")) || -+ fileName.endsWith(QLatin1String(".txz"))) { -+ return "txz"; -+ } -+ if (fileName.endsWith(QLatin1String(".xz"))) { -+ return "xz"; -+ } -+ - return QString(); - } - - ---- a/krusader/defaults.h -+++ b/krusader/defaults.h -@@ -181,6 +181,8 @@ - #define _DoBZip2 true - // Do LZMA /////////// - #define _DoLZMA true -+// Do XZ /////////// -+#define _DoXZ true - // Do Rar ///////////// - #define _DoRar true - // Do UnRar /////////// - diff --git a/extra/libfprint/50-fprint.rules b/extra/libfprint/50-fprint.rules deleted file mode 100644 index 25feb8332..000000000 --- a/extra/libfprint/50-fprint.rules +++ /dev/null @@ -1,19 +0,0 @@ -# aes1610.c -ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="1600", MODE="0664", GROUP="scanner" -# aes2501.c -ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="2580", MODE="0664", GROUP="scanner" -# aes4000.c -ATTRS{idVendor}=="08ff", ATTRS{idProduct}=="5501", MODE="0664", GROUP="scanner" -# fdu2000.c -ATTRS{idVendor}=="1162", ATTRS{idProduct}=="0300", MODE="0664", GROUP="scanner" -# upektc.c -ATTRS{idVendor}=="0483", ATTRS{idProduct}=="2015", MODE="0664", GROUP="scanner" -# upekts.c -ATTRS{idVendor}=="0483", ATTRS{idProduct}=="2016", MODE="0664", GROUP="scanner" -# uru4000.c -ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bb", MODE="0664", GROUP="scanner" -ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bc", MODE="0664", GROUP="scanner" -ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00bd", MODE="0664", GROUP="scanner" -ATTRS{idVendor}=="045e", ATTRS{idProduct}=="00ca", MODE="0664", GROUP="scanner" -ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="0007", MODE="0664", GROUP="scanner" -ATTRS{idVendor}=="05ba", ATTRS{idProduct}=="000a", MODE="0664", GROUP="scanner" diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD deleted file mode 100644 index 23b1900f0..000000000 --- a/extra/libfprint/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 101410 2010-11-29 04:58:17Z allan $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> - -pkgname=libfprint -pkgver=0.0.6 -pkgrel=8 -pkgdesc="Library for fingerprint scanner support in applications" -arch=('i686' 'x86_64') -url="http://reactivated.net/fprint/wiki/Main_Page" -license=('LGPL') -depends=('libusb-compat' 'imagemagick' 'openssl' 'glib2') -groups=('fprint') -options=(!libtool) -install=fprint.install -source=(http://downloads.sourceforge.net/sourceforge/fprint/$pkgname-$pkgver.tar.bz2 - 50-fprint.rules) -md5sums=('4f47b46021b186488b60aaa97f90fe43' '2c4021484509498fb17bdbe0b6d85ebf') -sha1sums=('430af91efbefeb2b98fe30215fb33051e4f8efc5' '86e7274711226685dabf7d28f4b93dae85ffb29b') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr #--enable-debug-log - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D -m644 "$srcdir/50-fprint.rules" "$pkgdir/lib/udev/rules.d/70-fprint.rules" -} diff --git a/extra/libfprint/fprint.install b/extra/libfprint/fprint.install deleted file mode 100644 index 111cb3661..000000000 --- a/extra/libfprint/fprint.install +++ /dev/null @@ -1,19 +0,0 @@ -# arg 1: the new package version -post_install() { -getent group scanner >/dev/null || usr/sbin/groupadd -g 96 scanner - /bin/cat <<THEEND -NOTE ----- -Add your user to group 'scanner' to use scanner devices. -THEEND -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -op=$1 -shift -$op $* diff --git a/extra/libreoffice/buildfix_bison25.diff b/extra/libreoffice/buildfix_bison25.diff deleted file mode 100644 index 869b6c81e..000000000 --- a/extra/libreoffice/buildfix_bison25.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- connectivity/source/parse/sqlbison.y 2011-05-20 13:21:02.000000000 -0600 -+++ connectivity/source/parse/sqlbison.y 2011-05-20 13:22:11.000000000 -0600 -@@ -4338,7 +4338,7 @@ - } - - // ------------------------------------------------------------------------- --void OSQLParser::error(sal_Char *fmt) -+void OSQLParser::error(const sal_Char *fmt) - { - if(!m_sErrorMessage.getLength()) - { ---- connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:58.000000000 -0600 -+++ connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:46.000000000 -0600 -@@ -233,7 +233,7 @@ - // returns the type for a parameter in a given function name - static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos); - -- void error(sal_Char *fmt); -+ void error(const sal_Char *fmt); - int SQLlex(); - #ifdef YYBISON - void setParseTree(OSQLParseNode * pNewParseTree); - diff --git a/extra/libreoffice/buildfix_i116795.diff b/extra/libreoffice/buildfix_i116795.diff deleted file mode 100644 index 8601bc164..000000000 --- a/extra/libreoffice/buildfix_i116795.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -r 4ab9e11cb892 connectivity/qa/makefile.mk ---- a/connectivity/qa/makefile.mk Thu Mar 03 15:22:23 2011 +0100 -+++ b/connectivity/qa/makefile.mk Fri Mar 04 09:51:48 2011 +0100 -@@ -35,9 +35,16 @@ - - #----- compile .java files ----------------------------------------- - --JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar - JAVAFILES := $(shell @$(FIND) complex -name "*.java") - -+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -+ -+.IF "$(SYSTEM_HSQLDB)" == "YES" -+EXTRAJARFILES = $(HSQLDB_JAR) -+.ELSE -+JARFILES += hsqldb.jar -+.ENDIF -+ - #----- make a jar from compiled files ------------------------------ - - JARCLASSDIRS = $(PACKAGE) - diff --git a/extra/liferea/PKGBUILD b/extra/liferea/PKGBUILD deleted file mode 100644 index 14bbeaf7d..000000000 --- a/extra/liferea/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 118815 2011-04-08 03:03:14Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=liferea -pkgver=1.6.5 -pkgrel=3 -pkgdesc="A desktop news aggregator for online news feeds and weblogs" -arch=('i686' 'x86_64') -url="http://liferea.sourceforge.net/" -license=('GPL') -depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme') -makedepends=('pkg-config' 'intltool' 'lua' 'libnotify') -optdepends=('lua: for lua scripting support' - 'libnotify: for notification support') -options=('!libtool' '!emptydirs') -install=liferea.install -source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz - libnotify-0.7.patch) -md5sums=('b5a2c0803eec5d0aff0b9ca4114eaf16' - 'fca97e3316c1c51e0179c4c7dcce47a2') -sha1sums=('f24dbd0e81c5a8309f0d19853211fc02ff818477' - '52e53dd11a0ffe62304c4f17e80bfe1412cfbf29') - -build() { - cd "${srcdir}/liferea-${pkgver}" - patch -Np1 -i "$srcdir/libnotify-0.7.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install - make -} - -package() { - cd "${srcdir}/liferea-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} diff --git a/extra/liferea/libnotify-0.7.patch b/extra/liferea/libnotify-0.7.patch deleted file mode 100644 index 6dbbffb87..000000000 --- a/extra/liferea/libnotify-0.7.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -Nr liferea-1.6.5/src/notification/libnotify.c liferea-1.6.5-libnotify/src/notification/libnotify.c ---- liferea-1.6.5/src/notification/libnotify.c 2009-06-20 20:33:19.000000000 +0200 -+++ liferea-1.6.5-libnotify/src/notification/libnotify.c 2011-03-06 23:53:45.783336455 +0100 -@@ -150,7 +150,7 @@ - // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); - // notify_notification_clear_actions(n); - -- n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL); -+ n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL); - - notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p)); - -@@ -244,7 +244,7 @@ - - labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), - node_get_title (node), item_count); -- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); -+ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL); - g_free(labelSummary_p); - - notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); diff --git a/extra/liferea/liferea.install b/extra/liferea/liferea.install deleted file mode 100644 index 7d812ccdb..000000000 --- a/extra/liferea/liferea.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=liferea - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - 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() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/extra/mkvtoolnix/mkvtoolnix.install b/extra/mkvtoolnix/mkvtoolnix.install deleted file mode 100644 index 1cf75e1b6..000000000 --- a/extra/mkvtoolnix/mkvtoolnix.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - if [ -f usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime &> /dev/null - fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - post_install $1 -} diff --git a/extra/pam_fprint/PKGBUILD b/extra/pam_fprint/PKGBUILD deleted file mode 100644 index 7d391ed11..000000000 --- a/extra/pam_fprint/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 69402 2010-02-20 12:43:15Z allan $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> - -pkgname=pam_fprint -pkgver=0.2 -pkgrel=2 -pkgdesc="pam module for fingerprint authentication" -arch=('i686' 'x86_64') -url="http://reactivated.net/fprint/wiki/Main_Page" -license=('LGPL') -groups=('fprint') -depends=('libfprint' 'pam') -source=(http://downloads.sourceforge.net/sourceforge/fprint/$pkgname-$pkgver.tar.bz2) -md5sums=('abfb041ed856aaac5c5c416973451226 ') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install -} diff --git a/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch b/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch deleted file mode 100644 index 9d8eff6bd..000000000 --- a/extra/terminal/bug-7595-go-menu-single-tab-sensitivity.patch +++ /dev/null @@ -1,22 +0,0 @@ -From be9fca9ea8cedcf879c8e0c8cea96dd256a3591c Mon Sep 17 00:00:00 2001 -From: Nick Schermer <nick@xfce.org> -Date: Thu, 12 May 2011 16:08:20 +0000 -Subject: Only make go menu action sensitive if tabs > 1 (bug #7595). - -This way the (default) Alt+1 keybinding is usable when -only a single tab is opened in the terminal window. ---- -diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c -index f580a39..0d461a4 100644 ---- a/terminal/terminal-window.c -+++ b/terminal/terminal-window.c -@@ -748,6 +748,7 @@ terminal_window_rebuild_gomenu (TerminalWindow *window) - - /* create action */ - radio_action = gtk_radio_action_new (name, NULL, NULL, NULL, n); -+ gtk_action_set_sensitive (GTK_ACTION (radio_action), npages > 1); - exo_binding_new (G_OBJECT (page), "title", G_OBJECT (radio_action), "label"); - gtk_radio_action_set_group (radio_action, group); - group = gtk_radio_action_get_group (radio_action); --- -cgit diff --git a/extra/twisted/4771.diff b/extra/twisted/4771.diff deleted file mode 100644 index 4e36f2632..000000000 --- a/extra/twisted/4771.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: twisted/words/protocols/jabber/jstrports.py -=================================================================== ---- twisted/words/protocols/jabber/jstrports.py (revision 30346) -+++ twisted/words/protocols/jabber/jstrports.py (working copy) -@@ -6,7 +6,7 @@ - """ A temporary placeholder for client-capable strports, until we - sufficient use cases get identified """ - --from twisted.application import strports -+from twisted.internet.endpoints import _parse - - def _parseTCPSSL(factory, domain, port): - """ For the moment, parse TCP or SSL connections the same """ -@@ -22,7 +22,7 @@ - - - def parse(description, factory): -- args, kw = strports._parse(description) -+ args, kw = _parse(description) - return (args[0].upper(),) + _funcs[args[0]](factory, *args[1:], **kw) - - def client(description, factory): diff --git a/extra/windowmaker-extra/PKGBUILD b/extra/windowmaker-extra/PKGBUILD deleted file mode 100644 index 07aa9b019..000000000 --- a/extra/windowmaker-extra/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 27783 2009-02-25 22:56:21Z eric $ -# Contributor: orelien <orelien@chez.com> -# - -pkgname=windowmaker-extra -pkgver=0.1 -pkgrel=3 -pkgdesc="Extra WindowMaker icons and themes." -arch=(i686 x86_64) -url="http://www.windowmaker.info" -license=('GPL2') -depends=('windowmaker') -source=(http://www.sgiweb.org/freeware/source/windowmaker-extra/windowmaker-extra-$pkgver.tar.gz) -md5sums=('3ef850cfe0fb6660a55ccc8a2e408f74') - -build() { - cd $srcdir/WindowMaker-extra-$pkgver - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - rm -f $pkgdir/usr/share/WindowMaker/Icons/xv.xpm -} -# vim: ts=2 sw=2 et ft=sh diff --git a/kde-unstable/kdebindings-python/fix-build.patch b/kde-unstable/kdebindings-python/fix-build.patch deleted file mode 100644 index 6a3d0c9cf..000000000 --- a/kde-unstable/kdebindings-python/fix-build.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- 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/kdelibs/kcalendarsystem-fixed.patch b/kde-unstable/kdelibs/kcalendarsystem-fixed.patch deleted file mode 100644 index d97a9b904..000000000 --- a/kde-unstable/kdelibs/kcalendarsystem-fixed.patch +++ /dev/null @@ -1,18073 +0,0 @@ -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/kdepim/fix-console-build.patch b/kde-unstable/kdepim/fix-console-build.patch deleted file mode 100644 index 552b8c0c1..000000000 --- a/kde-unstable/kdepim/fix-console-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/libkface/PKGBUILD b/kde-unstable/libkface/PKGBUILD deleted file mode 100644 index 9bdcab86b..000000000 --- a/kde-unstable/libkface/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $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/libkmap/PKGBUILD b/kde-unstable/libkmap/PKGBUILD deleted file mode 100644 index b2ae07a94..000000000 --- a/kde-unstable/libkmap/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $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/libre/kernel26-libre/get_configs b/libre/kernel26-libre/get_configs deleted file mode 100755 index 624ea1048..000000000 --- a/libre/kernel26-libre/get_configs +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -source PKGBUILD - -pkgname=${pkgname/-libre/} -KERNEL_VERSION=${2:-${_basekernel}-ARCH} -from=${1:-core} - -for pkgarch in ${arch[@]}; do - wget -nc "http://mirrors.kernel.org/archlinux/$from/os/${pkgarch}/${pkgname}-headers-${pkgver}-${pkgrel}-${pkgarch}.pkg.tar.xz" - tar -xOf "${pkgname}-headers-${pkgver}-${pkgrel}-${pkgarch}.pkg.tar.xz" usr/src/linux-${KERNEL_VERSION}/.config > config.${pkgarch} -done - -sed -i "s/-ARCH/-LIBRE/" config.* - -exit 0 - diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD deleted file mode 100644 index 549c084f0..000000000 --- a/multilib-testing/binutils-multilib/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 50278 2011-06-27 16:01:59Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils-multilib -pkgver=2.21.1 -pkgrel=1 -_date=20110627 -pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" -arch=('x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('multilib-devel') -provides=("binutils=$pkgver-$pkgrel") -conflicts=('binutils') -depends=('glibc>=2.14' 'zlib') -makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2) -md5sums=('2face559e80d649ba148e42bb2d1fb0f') - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared \ - --enable-64-bit-bfd --enable-multilib - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=${pkgdir}/usr -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - make -k -j1 check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/multilib-testing/binutils-multilib/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -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/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD deleted file mode 100644 index e9aa9d885..000000000 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ /dev/null @@ -1,299 +0,0 @@ -# $Id: PKGBUILD 50355 2011-06-28 17:45:40Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgbase='gcc-multilib' -pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -pkgver=4.6.1 -pkgrel=1 -#_snapshot=4.6-20110603 -_libstdcppmanver=20110201 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection for multilib" -arch=('x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' - 'lib32-glibc>=2.14') -checkdepends=('dejagnu') -options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-hash-style-both.patch) -md5sums=('c57a9170c677bf795bdc04ed796ca491' - '1e9fd2eaf0ee47ea64e82c48998f1999' - '22cec272f9cc2801d3cd348feaca888b' - '4df25b623799b148a0703eaeec8fdf3f') - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - patch -Np1 -i ${srcdir}/gcc_pure64.patch - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --enable-multilib --disable-libstdcxx-pch \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs-multilib() -{ - pkgdesc="Runtime libraries shipped by GCC for multilib" - depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel") - provides=("gcc-libs=$pkgver-$pkgrel") - conflicts=('gcc-libs') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove stuff in lib32-gcc-libs - rm -rf ${pkgdir}/usr/lib32 - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_lib32-gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver") - - cd gcc-build - make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm ${pkgdir}/usr/lib32/libgfortran.spec - - # remove stuff in gcc-libs-multilib - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/info - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-multilib() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" - depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl') - groups=('multilib-devel') - provides=("gcc=$pkgver-$pkgrel") - conflicts=('gcc') - install=gcc.install - - cd gcc-build - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib{,32}/*.so* - rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib{,32}/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a} - rm -r $pkgdir/usr/lib{,32}/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran-multilib() -{ - pkgdesc="Fortran front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-fortran=$pkgver-$pkgrel") - conflicts=('gcc-fortran') - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc-multilib() -{ - pkgdesc="Objective-C front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-objc=$pkgver-$pkgrel") - conflicts=('gcc-objc') - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada-multilib() -{ - pkgdesc="Ada front-end for GCC (GNAT) for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-ada=$pkgver-$pkgrel") - conflicts=('gcc-ada') - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - cd ../$CHOST/32/libada - make -j1 DESTDIR=${pkgdir} INSTALL="install" \ - INSTALL_DATA="install -m644" install-gnatlib - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go-multilib() -{ - pkgdesc="Go front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-go=$pkgver-$pkgrel") - conflicts=('gcc-go') - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/multilib-testing/gcc-multilib/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.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/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/multilib-testing/gcc-multilib/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/multilib-testing/gcc-multilib/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.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/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 -@@ -41,7 +41,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 -+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -78,7 +78,7 @@ - %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 -+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -104,7 +104,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -64,7 +64,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 -+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 -@@ -389,11 +389,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" - ---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 -+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 -@@ -830,7 +830,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" - ---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 -+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -113,7 +113,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -121,7 +121,7 @@ - %{static:-static}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -193,7 +193,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 -+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -74,7 +74,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!static: \ diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/multilib-testing/gcc-multilib/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -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/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/multilib-testing/gcc-multilib/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.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/multilib-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch deleted file mode 100644 index 8c6b08171..000000000 --- a/multilib-testing/gcc-multilib/gcc_pure64.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h ---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 -@@ -49,7 +49,7 @@ - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 ---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD deleted file mode 100644 index 276d465cd..000000000 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ /dev/null @@ -1,152 +0,0 @@ -# $Id: PKGBUILD 50168 2011-06-25 17:22:07Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuild with each new glibc version - -_pkgbasename=glibc -pkgname=lib32-$_pkgbasename -pkgver=2.14 -pkgrel=4 -_glibcdate=20110617 -pkgdesc="GNU C Library for multilib" -arch=('x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -depends=("glibc>=$pkgver") -makedepends=('gcc-multilib>=4.4') -options=('!strip' '!emptydirs') -source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - glibc-2.12.1-static-shared-getpagesize.patch - glibc-2.12.2-ignore-origin-of-privileged-program.patch - glibc-2.13-futex.patch - glibc-2.14-libdl-crash.patch - #glibc-2.14-fix-resolver-crash-typo.patch - glibc-2.14-revert-4462fad3.patch - glibc-2.14-reexport-rpc-interface.patch - glibc-2.14-reinstall-nis-rpc-headers.patch - lib32-glibc.conf) -md5sums=('e441d745609d93c907b72548ba646dad' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '7d0154b7e17ea218c9fa953599d24cc4' - 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - '6e052f1cb693d5d3203f50f9d4e8c33b') - -build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 - patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - patch -Np1 -i ${srcdir}/glibc-__i686.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 - # using Fedora "fix" as patch in that bug report causes breakages... - patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch - - # http://www.exploit-db.com/exploits/15274/ - # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch - - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) - # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html - patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - - # This fixes the main segfault but not the assert fail (FS#24615) - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 - #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch - # resort to reverting the bad commit completely for the moment - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch - - # re-export RPC interface until libtirpc is ready as a replacement - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch - - cd ${srcdir} - mkdir glibc-build - cd glibc-build - - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - - echo "slibdir=/usr/lib32" >> configparms - - export CC="gcc -m32" - - ${srcdir}/glibc/configure --prefix=/usr \ - --libdir=/usr/lib32 --libexecdir=/usr/lib32 \ - --with-headers=/usr/include \ - --enable-add-ons=nptl,libidn \ - --enable-kernel=2.6.27 \ - --with-tls --with-__thread \ - --enable-bind-now --without-gd \ - --without-cvs --disable-profile \ - --disable-multi-arch i686-unknown-linux-gnu - - make -} - -check() { - cd ${srcdir}/glibc-build - - # some errors are expected - manually check log files - make -k check || true -} - -package() { - cd ${srcdir}/glibc-build - make install_root=${pkgdir} install - - rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}} - - # We need one 32 bit specific header file - find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete - - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 - - cd $pkgdir - strip $STRIP_BINARIES usr/lib32/getconf/* - - strip $STRIP_STATIC usr/lib32/*.a \ - usr/lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so - - strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ - usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib32/{pt_chown,{audit,gconv}/*.so} - - # Dynamic linker - install -d -m755 ${pkgdir}/lib - ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ - - # Add /usr/lib32 to the default library search path - install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" - - # Symlink /usr/lib32/locale to /usr/lib/locale - ln -s ../lib/locale "$pkgdir/usr/lib32/locale" -} diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e84754279..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch deleted file mode 100644 index 9b9c3ac45..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: - - 7: movq %rdx, %rax - --#ifndef __ASSUME_PRIVATE_FUTEX -+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME - addq $16, %rsp - cfi_adjust_cfa_offset(-16) - popq %r14 -@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) diff --git a/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch b/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch deleted file mode 100644 index b5d86c7d2..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/resolv/res_send.c b/resolv/res_send.c -index 97142b7..a001c1e 100644 ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch deleted file mode 100644 index ee29f8c20..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 73b2a2f..9bd91e3 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -1,5 +1,5 @@ - /* Close a shared object opened by `_dl_open'. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) - if (map->l_direct_opencount > 0 || map->l_type != lt_loaded - || dl_close_state != not_pending) - { -- if (map->l_direct_opencount == 0) -- { -- if (map->l_type == lt_loaded) -- dl_close_state = rerun; -- else if (map->l_type == lt_library) -- { -- struct link_map **oldp = map->l_initfini; -- map->l_initfini = map->l_orig_initfini; -- _dl_scope_free (oldp); -- } -- } -+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) -+ dl_close_state = rerun; - - /* There are still references to this object. Do nothing more. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index 9e30594..3890d00 100644 ---- a/elf/dl-deps.c -+++ b/elf/dl-deps.c -@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, - nneeded * sizeof needed[0]); - atomic_write_barrier (); - l->l_initfini = l_initfini; -+ l->l_free_initfini = 1; - } - - /* If we have no auxiliary objects just go on to the next map. */ -@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - } -diff --git a/elf/dl-libc.c b/elf/dl-libc.c -index 7be9483..a13fce3 100644 ---- a/elf/dl-libc.c -+++ b/elf/dl-libc.c -@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) - - for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) - { -- /* Remove all additional names added to the objects. */ - for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) - { - struct libname_list *lnp = l->l_libname->next; - - l->l_libname->next = NULL; - -+ /* Remove all additional names added to the objects. */ - while (lnp != NULL) - { - struct libname_list *old = lnp; -@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) - if (! old->dont_free) - free (old); - } -+ -+ /* Free the initfini dependency list. */ -+ if (l->l_free_initfini) -+ free (l->l_initfini); - } - - if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff --git a/elf/rtld.c b/elf/rtld.c -index 4a9109e..617e30e 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lnp->dont_free = 1; - lnp = lnp->next; - } -+ l->l_free_initfini = 0; - - if (l != &GL(dl_rtld_map)) - _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -diff --git a/include/link.h b/include/link.h -index e877104..051b99a 100644 ---- a/include/link.h -+++ b/include/link.h -@@ -1,6 +1,6 @@ - /* Data structure for communication from the run-time dynamic linker for - loaded ELF shared objects. -- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -192,6 +192,9 @@ struct link_map - during LD_TRACE_PRELINKING=1 - contains any DT_SYMBOLIC - libraries. */ -+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be -+ freed, ie. not allocated with -+ the dummy malloc in ld.so. */ - - /* Collected information about own RPATH directories. */ - struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map - - /* List of object in order of the init and fini calls. */ - struct link_map **l_initfini; -- /* The init and fini list generated at startup, saved when the -- object is also loaded dynamically. */ -- struct link_map **l_orig_initfini; - - /* List of the dependencies introduced through symbol binding. */ - struct link_map_reldeps diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index e2beea881..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -635,7 +635,7 @@ for linking") - # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) - # define libc_hidden_def(name) hidden_def (name) - # define libc_hidden_weak(name) hidden_weak (name) --# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) -+# define libc_hidden_nolink(name, version) hidden_def (name) - # define libc_hidden_ver(local, name) hidden_ver (local, name) - # define libc_hidden_data_def(name) hidden_data_def (name) - # define libc_hidden_data_weak(name) hidden_data_weak (name) -diff --git a/sunrpc/Makefile b/sunrpc/Makefile -index 5134ce9..40c73d1 100644 ---- a/sunrpc/Makefile -+++ b/sunrpc/Makefile -@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - des_crypt.h) - headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ - $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h --headers = rpc/netdb.h -+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) - install-others = $(inst_sysconfdir)/rpc - generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index eb0fd822d..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Tue, 17 May 2011 17:42:30 +0200 -Subject: [PATCH] Reinstall NIS RPC headers - ---- - nis/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/Makefile b/nis/Makefile -index b5c9609..d2934d9 100644 ---- a/nis/Makefile -+++ b/nis/Makefile -@@ -23,9 +23,9 @@ subdir := nis - - aux := nis_hash - -+headers := $(wildcard rpcsvc/*.[hx]) - distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ -- nisplus-parser.h nis_xdr.h nss \ -- $(wildcard rpcsvc/*.[hx]) -+ nisplus-parser.h nis_xdr.h nss - - # These are the databases available for the nis (and perhaps later nisplus) - # service. This must be a superset of the services in nss. --- -1.7.5.4 - diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch deleted file mode 100644 index d71e37492..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c ---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 -+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 -@@ -549,7 +549,7 @@ - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or -@@ -1275,14 +1275,10 @@ - (*thisresplenp > *thisanssizp) - ? *thisanssizp : *thisresplenp); - -- if (recvresp1 || (buf2 != NULL && recvresp2)) { -- *resplen2 = 0; -+ if (recvresp1 || (buf2 != NULL && recvresp2)) - return resplen; -- } - if (buf2 != NULL) - { -- /* No data from the first reply. */ -- resplen = 0; - /* We are waiting for a possible second reply. */ - if (hp->id == anhp->id) - recvresp1 = 1; diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/multilib-testing/lib32-glibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf deleted file mode 100644 index 9b08c3f43..000000000 --- a/multilib-testing/lib32-glibc/lib32-glibc.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib32 diff --git a/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch b/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch deleted file mode 100644 index 0133d879b..000000000 --- a/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/binutils/objcopy.c b/binutils/objcopy.c -index 15c4f95..b64f3d0 100644 ---- a/binutils/objcopy.c -+++ b/binutils/objcopy.c -@@ -1,6 +1,6 @@ - /* objcopy.c -- copy object file from input to output, optionally massaging it. - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -+ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. - - This file is part of GNU Binutils. -@@ -2024,6 +2024,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, - struct stat buf; - int stat_status = 0; - bfd_boolean del = TRUE; -+ bfd_boolean ok_object; - - /* Create an output file for this member. */ - output_name = concat (dir, "/", -@@ -2061,44 +2062,42 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, - l->obfd = NULL; - list = l; - -- if (bfd_check_format (this_element, bfd_object)) -+ ok_object = bfd_check_format (this_element, bfd_object); -+ if (!ok_object) -+ bfd_nonfatal_message (NULL, this_element, NULL, -+ _("Unable to recognise the format of file")); -+ -+ /* PR binutils/3110: Cope with archives -+ containing multiple target types. */ -+ if (force_output_target || !ok_object) -+ output_bfd = bfd_openw (output_name, output_target); -+ else -+ output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); -+ -+ if (output_bfd == NULL) - { -- /* PR binutils/3110: Cope with archives -- containing multiple target types. */ -- if (force_output_target) -- output_bfd = bfd_openw (output_name, output_target); -- else -- output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); -+ bfd_nonfatal_message (output_name, NULL, NULL, NULL); -+ status = 1; -+ return; -+ } -+ -+ if (ok_object) -+ { -+ del = !copy_object (this_element, output_bfd, input_arch); - -- if (output_bfd == NULL) -+ if (del && bfd_get_arch (this_element) == bfd_arch_unknown) -+ /* Try again as an unknown object file. */ -+ ok_object = FALSE; -+ else if (!bfd_close (output_bfd)) - { - bfd_nonfatal_message (output_name, NULL, NULL, NULL); -+ /* Error in new object file. Don't change archive. */ - status = 1; -- return; - } -- -- del = ! copy_object (this_element, output_bfd, input_arch); -- -- if (! del -- || bfd_get_arch (this_element) != bfd_arch_unknown) -- { -- if (!bfd_close (output_bfd)) -- { -- bfd_nonfatal_message (output_name, NULL, NULL, NULL); -- /* Error in new object file. Don't change archive. */ -- status = 1; -- } -- } -- else -- goto copy_unknown_element; - } -- else -- { -- bfd_nonfatal_message (NULL, this_element, NULL, -- _("Unable to recognise the format of file")); - -- output_bfd = bfd_openw (output_name, output_target); --copy_unknown_element: -+ if (!ok_object) -+ { - del = !copy_unknown_object (this_element, output_bfd); - if (!bfd_close_all_done (output_bfd)) - { --- -1.6.5.GIT - diff --git a/multilib/lib32-glibc/glibc-2.13-prelink.patch b/multilib/lib32-glibc/glibc-2.13-prelink.patch deleted file mode 100644 index bef7998a8..000000000 --- a/multilib/lib32-glibc/glibc-2.13-prelink.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/elf/rtld.c b/elf/rtld.c -index 9a560b3..201c9cf 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - we need it in the memory handling later. */ - GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; - -+ /* Remember the last search directory added at startup, now that -+ malloc will no longer be the one from dl-minimal.c. */ -+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -+ - if (prelinked) - { - if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) -@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lossage); - } - -- /* Remember the last search directory added at startup, now that -- malloc will no longer be the one from dl-minimal.c. */ -- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -- - if (! prelinked && rtld_multiple_ref) - { - /* There was an explicit ref to the dynamic linker as a shared lib. diff --git a/multilib/lib32-heimdal/001_all_heimdal-no_libedit.patch b/multilib/lib32-heimdal/001_all_heimdal-no_libedit.patch deleted file mode 100644 index a551bdce1..000000000 --- a/multilib/lib32-heimdal/001_all_heimdal-no_libedit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cf/krb-readline.m4 2005-06-16 18:28:32.000000000 +0200 -+++ cf/krb-readline.m4 2005-06-27 23:17:06.000000000 +0200 -@@ -6,7 +6,6 @@ - dnl el_init - - AC_DEFUN([KRB_READLINE],[ --AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent]) - if test "$ac_cv_func_el_init" = yes ; then - AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> diff --git a/multilib/lib32-heimdal/002_all_heimal-fPIC.patch b/multilib/lib32-heimdal/002_all_heimal-fPIC.patch deleted file mode 100644 index c67dbae76..000000000 --- a/multilib/lib32-heimdal/002_all_heimal-fPIC.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/editline/Makefile.am 2005-06-16 18:28:44.000000000 +0200 -+++ lib/editline/Makefile.am 2005-06-27 23:21:02.000000000 +0200 -@@ -41,6 +41,9 @@ - - EXTRA_DIST = $(man_MANS) - -+$(libeditline_la_OBJECTS): %.lo: %.c -+ $(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+ - snprintf.c: - $(LN_S) $(srcdir)/../roken/snprintf.c . - strdup.c: diff --git a/multilib/lib32-heimdal/003_all_heimdal-rxapps.patch b/multilib/lib32-heimdal/003_all_heimdal-rxapps.patch deleted file mode 100644 index 40fc05f08..000000000 --- a/multilib/lib32-heimdal/003_all_heimdal-rxapps.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- appl/kx/rxtelnet.in 2005-06-16 18:29:10.000000000 +0200 -+++ appl/kx/rxtelnet.in 2005-06-27 23:21:34.000000000 +0200 -@@ -2,7 +2,7 @@ - # $Id: rxtelnet.in,v 1.31 2004/03/07 17:22:06 lha Exp $ - # - usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]" --binary=telnet -+binary=ktelnet - term= - kx_args=-P - while true ---- appl/kx/rxterm.in 2005-06-16 18:29:10.000000000 +0200 -+++ appl/kx/rxterm.in 2005-06-27 23:21:55.000000000 +0200 -@@ -2,7 +2,7 @@ - # $Id: rxterm.in,v 1.23 2002/03/18 17:37:34 joda Exp $ - # - usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host" --binary=rsh -+binary=krsh - term=xterm - while true - do diff --git a/multilib/lib32-heimdal/005_all_heimdal-suid_fix.patch b/multilib/lib32-heimdal/005_all_heimdal-suid_fix.patch deleted file mode 100644 index 35a9ed9f6..000000000 --- a/multilib/lib32-heimdal/005_all_heimdal-suid_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- appl/su/Makefile.am 2005-06-16 18:27:46.000000000 +0200 -+++ appl/su/Makefile.am 2005-06-27 23:25:21.000000000 +0200 -@@ -7,6 +7,7 @@ - bin_PROGRAMS = su - bin_SUIDS = su - su_SOURCES = su.c supaths.h -+su_LDFLAGS = -Wl,-z,now - man_MANS = su.1 - - LDADD = $(LIB_kafs) \ ---- appl/otp/Makefile.am 2005-06-16 18:28:46.000000000 +0200 -+++ appl/otp/Makefile.am 2005-06-27 23:25:40.000000000 +0200 -@@ -8,6 +8,7 @@ - bin_SUIDS = otp - otp_SOURCES = otp.c otp_locl.h - otpprint_SOURCES = otpprint.c otp_locl.h -+otp_LDFLAGS = -Wl,-z,now - - man_MANS = otp.1 otpprint.1 - diff --git a/multilib/lib32-heimdal/012_all_heimdal-berkdb.patch b/multilib/lib32-heimdal/012_all_heimdal-berkdb.patch deleted file mode 100644 index 46762c220..000000000 --- a/multilib/lib32-heimdal/012_all_heimdal-berkdb.patch +++ /dev/null @@ -1,124 +0,0 @@ -Binary files heimdal-0.7-old/cf/.find-func-no-libs2.m4.swp and heimdal-0.7/cf/.find-func-no-libs2.m4.swp differ -Index: heimdal/cf/db.m4 -=================================================================== ---- heimdal.orig/cf/db.m4 -+++ heimdal/cf/db.m4 -@@ -18,24 +18,13 @@ db_type=unknown - - if test "$enable_berkeley_db" != no; then - -- AC_CHECK_HEADERS([ \ -- db4/db.h \ -- db3/db.h \ -- db.h \ -- db_185.h \ -- ]) -+ AC_CHECK_HEADERS([db.h]) - - dnl db_create is used by db3 and db4 - -- AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [ -+ AC_FIND_FUNC_NO_LIBS(db_create, db, [ - #include <stdio.h> -- #ifdef HAVE_DB4_DB_H -- #include <db4/db.h> -- #elif defined(HAVE_DB3_DB_H) -- #include <db3/db.h> -- #else - #include <db.h> -- #endif - ],[NULL, NULL, 0]) - - if test "$ac_cv_func_db_create" = "yes"; then -@@ -50,17 +39,9 @@ dnl db_create is used by db3 and db4 - - dnl dbopen is used by db1/db2 - -- AC_FIND_FUNC_NO_LIBS(dbopen, db2 db, [ -+ AC_FIND_FUNC_NO_LIBS(dbopen, db, [ - #include <stdio.h> -- #if defined(HAVE_DB2_DB_H) -- #include <db2/db.h> -- #elif defined(HAVE_DB_185_H) -- #include <db_185.h> -- #elif defined(HAVE_DB_H) - #include <db.h> -- #else -- #error no db.h -- #endif - ],[NULL, 0, 0, 0, NULL]) - - if test "$ac_cv_func_dbopen" = "yes"; then -Index: heimdal/lib/hdb/db.c -=================================================================== ---- heimdal.orig/lib/hdb/db.c -+++ heimdal/lib/hdb/db.c -@@ -37,11 +37,7 @@ RCSID("$Id: db.c 20215 2007-02-09 21:59: - - #if HAVE_DB1 - --#if defined(HAVE_DB_185_H) --#include <db_185.h> --#elif defined(HAVE_DB_H) - #include <db.h> --#endif - - static krb5_error_code - DB_close(krb5_context context, HDB *db) -Index: heimdal/lib/hdb/db3.c -=================================================================== ---- heimdal.orig/lib/hdb/db3.c -+++ heimdal/lib/hdb/db3.c -@@ -37,13 +37,7 @@ RCSID("$Id: db3.c 21610 2007-07-17 07:10 - - #if HAVE_DB3 - --#ifdef HAVE_DB4_DB_H --#include <db4/db.h> --#elif defined(HAVE_DB3_DB_H) --#include <db3/db.h> --#else - #include <db.h> --#endif - - static krb5_error_code - DB_close(krb5_context context, HDB *db) -Index: heimdal/lib/roken/getcap.c -=================================================================== ---- heimdal.orig/lib/roken/getcap.c -+++ heimdal/lib/roken/getcap.c -@@ -38,11 +38,13 @@ - #include "roken.h" - RCSID("$Id: getcap.c 16561 2006-01-13 14:25:32Z lha $"); - -+#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H) -+#define USE_DB -+#endif -+ - #include <sys/types.h> - #include <ctype.h> --#if defined(HAVE_DB_185_H) --#include <db_185.h> --#elif defined(HAVE_DB_H) -+#ifdef USE_DB - #include <db.h> - #endif - #include <errno.h> -Index: heimdal/lib/roken/ndbm_wrap.c -=================================================================== ---- heimdal.orig/lib/roken/ndbm_wrap.c -+++ heimdal/lib/roken/ndbm_wrap.c -@@ -37,13 +37,7 @@ RCSID("$Id: ndbm_wrap.c 21634 2007-07-17 - #endif - - #include "ndbm_wrap.h" --#if defined(HAVE_DB4_DB_H) --#include <db4/db.h> --#elif defined(HAVE_DB3_DB_H) --#include <db3/db.h> --#else - #include <db.h> --#endif - - #include <stdio.h> - #include <stdlib.h> diff --git a/multilib/lib32-heimdal/013_all_heimdal-pthread-lib.patch b/multilib/lib32-heimdal/013_all_heimdal-pthread-lib.patch deleted file mode 100644 index 19f879407..000000000 --- a/multilib/lib32-heimdal/013_all_heimdal-pthread-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-0.7.1/cf/pthreads.m4.old 2005-09-09 12:12:28.000000000 +0000 -+++ heimdal-0.7.1/cf/pthreads.m4 2005-09-17 22:23:23.000000000 +0000 -@@ -32,7 +32,7 @@ - 2.*) - native_pthread_support=yes - PTHREADS_CFLAGS=-pthread -- PTHREADS_LIBS=-pthread -+ PTHREADS_LIBS=-lpthread - ;; - esac - ;; diff --git a/multilib/lib32-heimdal/014_all_heimdal-path.patch b/multilib/lib32-heimdal/014_all_heimdal-path.patch deleted file mode 100644 index 36a86f1f9..000000000 --- a/multilib/lib32-heimdal/014_all_heimdal-path.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- appl/rcp/rcp.c.old 2006-05-03 13:31:59.398493625 +0200 -+++ appl/rcp/rcp.c 2006-05-03 13:32:04.494485981 +0200 -@@ -34,7 +34,7 @@ - #include "rcp_locl.h" - #include <getarg.h> - --#define RSH_PROGRAM "rsh" -+#define RSH_PROGRAM "krsh" - - struct passwd *pwd; - uid_t userid; ---- appl/rcp/rcp_locl.h.old 2006-05-03 02:30:31.602025409 +0200 -+++ appl/rcp/rcp_locl.h 2006-05-03 02:30:35.886018983 +0200 -@@ -64,4 +64,4 @@ - #define _PATH_CP "/bin/cp" - #endif - #undef _PATH_RSH --#define _PATH_RSH BINDIR "/rsh" -+#define _PATH_RSH BINDIR "/krsh" ---- appl/telnet/telnetd/telnetd.h.old 2006-05-03 02:23:14.582680939 +0200 -+++ appl/telnet/telnetd/telnetd.h 2006-05-03 02:23:23.746667193 +0200 -@@ -192,7 +192,7 @@ - #endif - - #undef _PATH_LOGIN --#define _PATH_LOGIN BINDIR "/login" -+#define _PATH_LOGIN BINDIR "/klogin" - - /* fallbacks */ - ---- appl/login/shadow.c.old 2006-05-05 06:31:29.517138115 +0200 -+++ appl/login/shadow.c 2006-05-05 06:32:26.433052741 +0200 -@@ -38,7 +38,7 @@ - #ifdef HAVE_SHADOW_H - - #ifndef _PATH_CHPASS --#define _PATH_CHPASS "/usr/bin/passwd" -+#define _PATH_CHPASS "/usr/bin/kpasswd" - #endif - - static int -@@ -52,7 +52,7 @@ - printf("fork /bin/passwd"); - exit(1); - case 0: -- execlp(_PATH_CHPASS, "passwd", who->pw_name, (char *) 0); -+ execlp(_PATH_CHPASS, "kpasswd", who->pw_name, (char *) 0); - exit(1); - default: - waitpid(pid, &status, 0); diff --git a/multilib/lib32-heimdal/PKGBUILD b/multilib/lib32-heimdal/PKGBUILD deleted file mode 100644 index a60499d78..000000000 --- a/multilib/lib32-heimdal/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 26560 2010-09-15 22:34:46Z bluewind $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: webjdm <web.jdm@gmail.com> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> - -_pkgbasename=heimdal -pkgname=lib32-$_pkgbasename -pkgver=1.3.3 -pkgrel=3 -pkgdesc="Implementation of Kerberos V5 libraries (32-bit)" -arch=('x86_64') -url="http://www.h5l.org/" -license=('custom') -depends=('lib32-e2fsprogs' 'lib32-openssl' 'lib32-db' lib32-sqlite3 $_pkgbasename) -makedepends=('gcc-multilib') -options=('!libtool' '!emptydirs') -source=(http://www.h5l.org/dist/src/${_pkgbasename}-${pkgver}.tar.gz - 001_all_heimdal-no_libedit.patch - 002_all_heimal-fPIC.patch - 003_all_heimdal-rxapps.patch - 005_all_heimdal-suid_fix.patch - 012_all_heimdal-berkdb.patch - 013_all_heimdal-pthread-lib.patch - 014_all_heimdal-path.patch) -md5sums=('963c09f1b14c41660be70b55fae9f163' - '98e28f11f906c967aac22d6184102c9e' - '6d5571bdedba2e2423b90bccdbac2c0a' - '2feec3924ee5230b54175b4d4000c872' - '45aeb207f360f9f4e9e0fabc8bfeecbc' - '56f5d10d0ec40f2fda82ef144ffac1e0' - '1b8665b771c4eb6b56ea8582c96e56e3' - '8208ae8c0b6ff5ab4f64af1693e9e396') - -build() { - cd ${srcdir}/heimdal-${pkgver} - patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch - patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch - patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch - patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch - patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch - patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch - patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - libtoolize --force - aclocal -I cf - autoconf - automake - - ./configure --prefix=/usr --enable-shared=yes --without-x \ - --libdir=/usr/lib32 \ - --with-openssl-lib=/usr/lib32 \ - --with-readline-lib=/usr/lib32 \ - --with-readline-include=/usr/include/readline \ - --with-sqlite3-lib=/usr/lib32 \ - --with-sqlite3-include=/usr/include -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{etc,bin,sbin,include,share,libexec} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/testing/amarok/PKGBUILD b/testing/amarok/PKGBUILD deleted file mode 100644 index e063cfcaa..000000000 --- a/testing/amarok/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 127380 2011-06-14 06:48:07Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=amarok -replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.4.1 -pkgrel=2 -pkgdesc="The powerful music player for KDE" -arch=("i686" "x86_64") -url="http://amarok.kde.org" -license=('GPL2' 'LGPL2.1' 'FDL') -depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' - 'liblastfm' 'ffmpeg' 'libofa' 'qjson') -makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' - 'libmygpo-qt') -optdepends=("libgpod: support for Apple iPod audio devices" - "libmtp: support for portable media devices" - "loudmouth: backend needed by mp3tunes for syncing" - "ifuse: support for Apple iPod Touch and iPhone" - "libmygpo-qt: gpodder.net Internet Service") -install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('4c65c5cd4d7bd267bdbef8e912fd6cb6') - -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/testing/amarok/amarok.install b/testing/amarok/amarok.install deleted file mode 100644 index e70c054ec..000000000 --- a/testing/amarok/amarok.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD deleted file mode 100644 index 9fd24d47b..000000000 --- a/testing/avidemux/PKGBUILD +++ /dev/null @@ -1,121 +0,0 @@ -# $Id: PKGBUILD 127810 2011-06-18 16:08:40Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=avidemux -pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.5.5 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL') -url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ - 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz - avidemux-2.5.4-x264-build115.patch) -md5sums=('33bbe210c6826cea1987ed18a41d57a7' - '24a18b53a58b678b9e87d30566985751') - -build() { - cd "${srcdir}/${pkgbase}_${pkgver}" - - patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch" - - mkdir build - cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. - make - -# plugin build expects libraries to be already installed; we fake a prefix -# in build/ by symlinking all libraries to build/lib/ - mkdir -p lib - cd lib - find ../avidemux -name '*.so*' | xargs ln -sft . - cd ../../plugins - mkdir build - cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR=${srcdir}/avidemux_${pkgver} \ - -D AVIDEMUX_CORECONFIG_DIR=${srcdir}/avidemux_${pkgver}/build/config \ - -D AVIDEMUX_INSTALL_PREFIX=${srcdir}/avidemux_${pkgver}/build \ - -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. - make -} - -package_avidemux-cli() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split)" - depends=('libxml2' 'sdl' 'fontconfig' 'libvpx') - optdepends=('lame: for the corresponding audio encoder plugin' - 'faac: for the corresponding audio encoder plugin' - 'faad2: for the corresponding audio decoder plugin' - 'opencore-amr: for the corresponding audio decoder plugin' - 'esound: for the corresponding audio device plugin' - 'jack: for the corresponding audio device plugin' - 'libpulse: for the corresponding audio device plugin' - 'sdl: for the corresponding audio device plugin' - 'x264: for the corresponding video encoder plugin' - 'xvidcore: for the corresponding video encoder plugin') - provides=('avidemux') - conflicts=('avidemux') - replaces=('avidemux') - - cd "${srcdir}/${pkgbase}_${pkgver}/build" - make DESTDIR="${pkgdir}" install - - cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/share/avidemux - rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} - rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so - - ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" - ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" - - install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" - install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" -} - -package_avidemux-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" - depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') - install=avidemux.install - - cd "${srcdir}/${pkgbase}_${pkgver}" - install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" - - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter - - install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" - install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" - - install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" - sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" -} - -package_avidemux-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils') - install=avidemux.install - - cd "${srcdir}/${pkgbase}_${pkgver}" - install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter - - install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" - install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" - - install -d "${pkgdir}/usr/share/avidemux/i18n" - install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" - - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" -} diff --git a/testing/avidemux/avidemux-2.5.4-x264-build115.patch b/testing/avidemux/avidemux-2.5.4-x264-build115.patch deleted file mode 100644 index c627667ec..000000000 --- a/testing/avidemux/avidemux-2.5.4-x264-build115.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 -@@ -488,8 +488,10 @@ - printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
- printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
- printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
-+#elif X264_BUILD > 114
-+ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
- #endif
- printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
- #if X264_BUILD > 88
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 -@@ -417,7 +417,7 @@ - _param.b_cabac = cabac;
- }
-
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- unsigned int x264Options::getOpenGopMode(void)
- {
- return _param.i_open_gop;
-@@ -428,6 +428,17 @@ - if (openGopMode < 3)
- _param.i_open_gop = openGopMode;
- }
-+#elif X264_BUILD > 114
-+unsigned int x264Options::getOpenGopMode(void)
-+{
-+ return _param.b_open_gop;
-+}
-+
-+void x264Options::setOpenGopMode(unsigned int openGopMode)
-+{
-+ if (openGopMode < 3)
-+ _param.b_open_gop = openGopMode;
-+}
- #endif
-
- unsigned int x264Options::getInterlaced(void)
diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install deleted file mode 100644 index e111ef946..000000000 --- a/testing/avidemux/avidemux.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD deleted file mode 100644 index 790948675..000000000 --- a/testing/binutils/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 129398 2011-06-27 11:06:48Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils -pkgver=2.21.1 -pkgrel=1 -_date=20110627 -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('base') -depends=('glibc>=2.14' 'zlib') -checkdepends=('dejagnu') -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('2face559e80d649ba148e42bb2d1fb0f') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_21-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - mv src binutils - tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* -} - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=${pkgdir}/usr -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - make -k -j1 check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/testing/binutils/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -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/blender/PKGBUILD b/testing/blender/PKGBUILD deleted file mode 100644 index 48cc575e0..000000000 --- a/testing/blender/PKGBUILD +++ /dev/null @@ -1,93 +0,0 @@ -# $Id: PKGBUILD 128410 2011-06-23 22:00:17Z eric $ -# Contributor: John Sowiak <john@archlinux.org> -# Maintainer: tobias <tobias@archlinux.org> - -# Apparently, the blender guys refuse to release source tarballs for -# intermediate releases that deal mainly with binaries but incorporate tiny -# minor changes from svn. Since I'm sick and tired of the urges of users that -# look for release numbers only we make a messy PKGBUILD that can checkout svn -# release if necessary. - -#_svn=true -_svn=false - -pkgname=blender -pkgver=2.58 -pkgrel=1 -epoch=1 -pkgdesc="A fully integrated 3D graphics creation suite" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.blender.org" -depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ - 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') -makedepends=('cmake') # 'subversion' -install=blender.install -if [ $_svn = false ]; then - source=(http://download.blender.org/source/$pkgname-$pkgver.tgz blender-ffmpeg.diff) - md5sums=('04a0d43ff27aa0abf14ca559f6a6bf67' 'ed36bab11bfc87864fe0cadf0de5d98f') -else - source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) - md5sums=('59e344d4ec48750a86e4ef079c3acbfc') -fi - -# source PKGBUILD && mksource -mksource() { - _svnver=36339 - _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" - _svnmod="$pkgname-$pkgver" - mkdir ${pkgname}-$pkgver - pushd ${pkgname}-$pkgver - svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod - find . -depth -type d -name .svn -exec rm -rf {} \; - tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* - popd -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p0 -i ../blender-ffmpeg.diff - mkdir build - cd build - - [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" - - cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DWITH_INSTALL_PORTABLE:BOOL=OFF \ - -DWITH_PYTHON_INSTALL:BOOL=OFF \ - -DWITH_OPENCOLLADA:BOOL=OFF \ - -DWITH_GAMEENGINE:BOOL=ON \ - -DWITH_PLAYER:BOOL=ON \ - -DWITH_BUILTIN_GLEW:BOOL=OFF \ - -DWITH_CODEC_FFMPEG:BOOL=ON \ - -DWITH_CODEC_SNDFILE:BOOL=ON \ - -DPYTHON_VERSION:STRING=3.2 \ - -DPYTHON_LIBPATH:STRING=/usr/lib \ - -DPYTHON_LIBRARY:STRING=python3.2mu \ - -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ - $ENABLESSE2 - - make $MAKEFLAGS - - cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ - "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ - cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi - chmod 755 bmake - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver/build" - make DESTDIR="${pkgdir}" install - python -m compileall "${pkgdir}/usr/share/blender" - -# install plugins - install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ -} diff --git a/testing/blender/blender-ffmpeg.diff b/testing/blender/blender-ffmpeg.diff deleted file mode 100644 index ffef489e2..000000000 --- a/testing/blender/blender-ffmpeg.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: intern/ffmpeg/ffmpeg_compat.h -=================================================================== ---- intern/ffmpeg/ffmpeg_compat.h (revision 37744) -+++ intern/ffmpeg/ffmpeg_compat.h (revision 37745) -@@ -40,7 +40,7 @@ - #define FFMPEG_HAVE_AVIO 1 - #endif - --#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) -+#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122)) - #define FFMPEG_HAVE_DEFAULT_VAL_UNION 1 - #endif - diff --git a/testing/blender/blender.install b/testing/blender/blender.install deleted file mode 100644 index f4d7cc443..000000000 --- a/testing/blender/blender.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_remove() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/testing/botan/PKGBUILD b/testing/botan/PKGBUILD deleted file mode 100644 index 2d05b70e8..000000000 --- a/testing/botan/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 128341 2011-06-23 05:31:14Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: d'Ronin <daronin@2600.com> -pkgname=botan -pkgver=1.10.0 -pkgrel=1 -pkgdesc="BSD-licensed crypto library written in C++" -license=('BSD') -arch=('i686' 'x86_64') -url="http://botan.randombit.net/" -depends=('gcc-libs' 'sh') -makedepends=('python2') -source=(http://files.randombit.net/botan/Botan-${pkgver}.tgz) -md5sums=('1f03a6a84f402a12e50665868dddae99') - -build() { - cd ${srcdir}/Botan-${pkgver} - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py - ./configure.py --prefix=/usr - make -} - -package() { - cd ${srcdir}/Botan-${pkgver} - make DESTDIR=${pkgdir}/usr install -} - diff --git a/testing/cairo-perl/PKGBUILD b/testing/cairo-perl/PKGBUILD deleted file mode 100644 index b697e5e16..000000000 --- a/testing/cairo-perl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124873 2011-05-24 21:13:32Z remy $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=cairo-perl -_realname=Cairo -pkgver=1.061 -pkgrel=4 -pkgdesc="Perl wrappers for cairo" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -options=('!emptydirs') -depends=('cairo>=1.8.10' 'perl>=5.14') -makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('08cd5e847f61858651fc4de769066e88') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test || true -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/claws-mail-extra-plugins/PKGBUILD b/testing/claws-mail-extra-plugins/PKGBUILD deleted file mode 100644 index 9d233d726..000000000 --- a/testing/claws-mail-extra-plugins/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $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/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch deleted file mode 100644 index efc06a472..000000000 --- a/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/testing/cronie/crontab b/testing/cronie/crontab deleted file mode 100644 index f2ce71030..000000000 --- a/testing/cronie/crontab +++ /dev/null @@ -1 +0,0 @@ -# without this file, crond disables inotify support at startup diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD deleted file mode 100644 index 360802755..000000000 --- a/testing/dbus-core/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 128605 2011-06-24 14:03:41Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Link Dupont <link@subpop.net> -# -pkgname=dbus-core -pkgver=1.4.12 -pkgrel=1 -pkgdesc="Freedesktop.org message bus system" -url="http://www.freedesktop.org/Software/dbus" -arch=(i686 x86_64) -license=('GPL' 'custom') -depends=('expat>=2.0.1' 'coreutils' 'filesystem') -makedepends=('libx11') -conflicts=('dbus<1.2.3-2') -options=(!libtool) -install=dbus.install -source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz - dbus) -md5sums=('104f2ea94c10a896dfb1edecb5714cb1' - '08f93dd19cffd1b45ab05c1fd4efb560') - -build() { - cd "${srcdir}/dbus-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ - --with-system-pid-file=/var/run/dbus.pid \ - --enable-inotify --disable-dnotify \ - --disable-verbose-mode --disable-static \ - --disable-tests --disable-asserts \ - --with-systemdsystemunitdir=/lib/systemd/system - make -} - -package(){ - cd "${srcdir}/dbus-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/bin/dbus-launch" - rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1" - - chown 81:81 "${pkgdir}/var/run/dbus" - - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/" - - #Fix configuration file - sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf" - - #install .keep files so pacman doesn't delete empty dirs - touch "${pkgdir}/usr/share/dbus-1/services/.keep" - touch "${pkgdir}/usr/share/dbus-1/system-services/.keep" - touch "${pkgdir}/etc/dbus-1/session.d/.keep" - touch "${pkgdir}/etc/dbus-1/system.d/.keep" - - install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core" - install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/" -} diff --git a/testing/dbus-core/dbus b/testing/dbus-core/dbus deleted file mode 100644 index 66b84cae0..000000000 --- a/testing/dbus-core/dbus +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting D-BUS system messagebus" - if [ ! -x /var/run/dbus ] ; then - install -m755 -g 81 -o 81 -d /var/run/dbus - fi - if [ -x /usr/bin/dbus-uuidgen ] ; then - /usr/bin/dbus-uuidgen --ensure - fi - - /usr/bin/dbus-daemon --system - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dbus - stat_done - fi - ;; - stop) - stat_busy "Stopping D-BUS system messagebus" - [ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/dbus.pid - rm_daemon dbus - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading D-BUS configuration" - [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \ - --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install deleted file mode 100644 index 44f4475ee..000000000 --- a/testing/dbus-core/dbus.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus - getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus - usr/bin/passwd -l dbus &>/dev/null - dbus-uuidgen --ensure -} - -post_upgrade() { - post_install - - #Make sure new rc script can shutdown running dbus - if [ -f var/run/dbus/pid ]; then - mv var/run/dbus/pid var/run/dbus.pid - fi -} - -post_remove() { - if getent passwd dbus >/dev/null; then - usr/sbin/userdel dbus - fi - if getent group dbus >/dev/null; then - usr/sbin/groupdel dbus - fi -} diff --git a/testing/dbus-glib/PKGBUILD b/testing/dbus-glib/PKGBUILD deleted file mode 100644 index fa15a7b85..000000000 --- a/testing/dbus-glib/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 128599 2011-06-24 13:51:01Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=dbus-glib -pkgver=0.94 -pkgrel=1 -pkgdesc="GLib bindings for DBUS" -arch=(i686 x86_64) -license=('GPL') -url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-core' 'glib2') -makedepends=('pkgconfig') -options=('!libtool' '!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e1f1506a6f4941e67bffd614b1ad5af6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-static=no --enable-bash-completion=no - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/dbus-python/PKGBUILD b/testing/dbus-python/PKGBUILD deleted file mode 100644 index 8cfacff43..000000000 --- a/testing/dbus-python/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 128602 2011-06-24 13:59:34Z ibiru $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=dbus-python -pkgver=0.84.0 -pkgrel=1 -pkgdesc="Python bindings for DBUS" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -url="http://www.freedesktop.org/wiki/Software/DBusBindings" -depends=('dbus-glib' 'python2') -makedepends=('pkg-config' 'docutils') -options=('!libtool') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('fe69a2613e824463e74f10913708c88a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=python2 ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/dbus/30-dbus b/testing/dbus/30-dbus deleted file mode 100644 index 603e92d3e..000000000 --- a/testing/dbus/30-dbus +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# launches a session dbus instance - -dbuslaunch="`which dbus-launch 2>/dev/null`" -if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - eval `$dbuslaunch --sh-syntax --exit-with-session` -fi - diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD deleted file mode 100644 index bcac66a7a..000000000 --- a/testing/dbus/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 128609 2011-06-24 14:05:28Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Link Dupont <link@subpop.net> -# -pkgname=dbus -pkgver=1.4.12 -pkgrel=1 -pkgdesc="Freedesktop.org message bus system" -url="http://www.freedesktop.org/Software/dbus" -arch=(i686 x86_64) -license=('GPL' 'custom') -depends=("dbus-core>=${pkgver}" 'libx11') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - 30-dbus) -md5sums=('104f2ea94c10a896dfb1edecb5714cb1' - 'd14e59575f04e55d21a04907b6fd9f3c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ - --with-system-pid-file=/var/run/dbus.pid \ - --disable-verbose-mode --disable-static \ - --enable-inotify --disable-dnotify \ - --disable-tests --disable-asserts - make -C tools dbus-launch -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m755 tools/dbus-launch "${pkgdir}/usr/bin/" - install -m644 doc/dbus-launch.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d" - install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/" - - install -d -m755 "${pkgdir}/usr/share/licenses/dbus" - install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/" -} diff --git a/testing/dvdrip/PKGBUILD b/testing/dvdrip/PKGBUILD deleted file mode 100644 index 119a2a1d9..000000000 --- a/testing/dvdrip/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 126069 2011-06-01 10:23:05Z foutrelis $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> - -pkgname=dvdrip -pkgver=0.98.11 -pkgrel=8 -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/testing/dvdrip/dvdrip.desktop b/testing/dvdrip/dvdrip.desktop deleted file mode 100644 index dd19b4aae..000000000 --- a/testing/dvdrip/dvdrip.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[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/testing/dvdrip/dvdrip.install b/testing/dvdrip/dvdrip.install deleted file mode 100644 index e111ef946..000000000 --- a/testing/dvdrip/dvdrip.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD deleted file mode 100644 index 2d869d714..000000000 --- a/testing/fakeroot/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 128934 2011-06-25 14:19:16Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> - -pkgname=fakeroot -pkgver=1.16 -pkgrel=1 -pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" -arch=('i686' 'x86_64') -license=('GPL') -url="http://packages.debian.org/fakeroot" -groups=('base-devel') -install=fakeroot.install -depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') -options=('!libtool') -source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('e8470aa7e965bfc74467de0e594e60b6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \ - --disable-static --with-ipc=sysv - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install - - install -dm755 ${pkgdir}/etc/ld.so.conf.d/ - echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf - - # install README for sysv/tcp usage - install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README -} diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install deleted file mode 100644 index 986c91b06..000000000 --- a/testing/fakeroot/fakeroot.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - sbin/ldconfig -r . -} - -post_upgrade() { - if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then - sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf - fi - sbin/ldconfig -r . -} - -pre_remove() { - sbin/ldconfig -r . -} diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD deleted file mode 100644 index f248b5594..000000000 --- a/testing/ffmpeg/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 127807 2011-06-18 16:07:16Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=ffmpeg -pkgver=20110618 -pkgrel=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" -arch=('i686' 'x86_64') -url="http://ffmpeg.org/" -license=('GPL') -depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump') -makedepends=('yasm' 'git') -#git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) -md5sums=('ff3636c6601f68cdcc777fadaf0eba46') - -build() { - cd "$srcdir/$pkgname" - - ./configure \ - --prefix=/usr \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-librtmp \ - --enable-gpl \ - --enable-version3 \ - --enable-runtime-cpudetect \ - --disable-debug - - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 - - make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/frozen-bubble/PKGBUILD b/testing/frozen-bubble/PKGBUILD deleted file mode 100644 index fb21cbd21..000000000 --- a/testing/frozen-bubble/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 127529 2011-06-15 21:23:24Z remy $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Brandon Niemczyk <maccorin@cfl.rr.com> - -pkgname=frozen-bubble -_pkgver=2.2.1-beta1 -pkgver=${_pkgver/-/} -pkgrel=3 -pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles" -arch=(i686 x86_64) -url="http://www.frozen-bubble.org" -license=(GPL2) -depends=(perl-sdl perl-ipc-system-simple perl-compress-bzip2 perl-file-which) -makedepends=(perl-file-slurp perl-locale-maketext-lexicon) -options=('!emptydirs') -source=(http://www.frozen-bubble.org/data/$pkgname-$_pkgver.tar.bz2 \ - frozen-bubble.desktop) -md5sums=('825cc23ed806838b9d86de9982a5687a' - '01b10b77ba6ad856f5c199121c582272') - -build() { - cd "$srcdir/$pkgname-$_pkgver" - unset CFLAGS - # install module in vendor directories - perl Build.PL installdirs=vendor - perl Build -} - -check() { - cd "$srcdir/$pkgname-$_pkgver" - perl Build test -} - -package() { - cd "$srcdir/$pkgname-$_pkgver" - perl Build install destdir="$pkgdir" - - install -D -m644 share/icons/frozen-bubble-icon-64x64.png "$pkgdir/usr/share/pixmaps/frozen-bubble.png" - install -D -m644 "$srcdir/frozen-bubble.desktop" "$pkgdir/usr/share/applications/frozen-bubble.desktop" -} diff --git a/testing/frozen-bubble/frozen-bubble.desktop b/testing/frozen-bubble/frozen-bubble.desktop deleted file mode 100644 index 76a7bcd88..000000000 --- a/testing/frozen-bubble/frozen-bubble.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Encoding=UTF-8 -Name=Frozen Bubble -Icon=frozen-bubble.png -Exec=/usr/bin/vendor_perl/frozen-bubble -Terminal=false -Categories=Game; diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD deleted file mode 100644 index cedbfa948..000000000 --- a/testing/gcc/PKGBUILD +++ /dev/null @@ -1,249 +0,0 @@ -# $Id: PKGBUILD 126776 2011-06-07 08:00:51Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.6.0 -pkgrel=7 -_snapshot=4.6-20110603 -_libstdcppmanver=20110201 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu') -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-hash-style-both.patch) -md5sums=('c97d52b2b4e6c8c5cf665ae3eb9e8e49' - '1e9fd2eaf0ee47ea64e82c48998f1999' - '4030ee1c08dd1e843c0225b772360e76' - '4df25b623799b148a0703eaeec8fdf3f') - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - if [ "${CARCH}" = "x86_64" ]; then - patch -Np1 -i ${srcdir}/gcc_pure64.patch - fi - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --disable-multilib --disable-libstdcxx-pch \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC" - groups=('base') - depends=('glibc>=2.13') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21-9' 'libmpc' 'cloog' 'ppl') - groups=('base-devel') - install=gcc.install - - cd gcc-build - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} - rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran() -{ - pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc() -{ - pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada() -{ - pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go() -{ - pkgdesc="Go front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/testing/gcc/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.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/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/testing/gcc/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/testing/gcc/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.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/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/testing/gcc/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 -@@ -41,7 +41,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 -+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -78,7 +78,7 @@ - %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 -+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -104,7 +104,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -64,7 +64,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 -+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 -@@ -389,11 +389,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" - ---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 -+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 -@@ -830,7 +830,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" - ---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 -+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -113,7 +113,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -121,7 +121,7 @@ - %{static:-static}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -193,7 +193,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 -+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -74,7 +74,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!static: \ diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/testing/gcc/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -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/gcc/gcc.install b/testing/gcc/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/testing/gcc/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.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/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch deleted file mode 100644 index 8c0baf8e2..000000000 --- a/testing/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h ---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 -@@ -49,8 +49,8 @@ - When the -shared link option is used a final link is not being - done. */ - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 ---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/testing/gconf-perl/PKGBUILD b/testing/gconf-perl/PKGBUILD deleted file mode 100644 index e4f58af63..000000000 --- a/testing/gconf-perl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124841 2011-05-24 18:04:05Z remy $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gconf-perl -_realname=Gnome2-GConf -pkgver=1.044 -pkgrel=5 -pkgdesc="Gnome2-GConf perl bindings for gconf" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('glib-perl' 'gconf' 'perl>=5.14') -options=(!emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('ea386003b18f067524833b0eeb271330') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - dbus-launch --exit-with-session make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD deleted file mode 100644 index 9fddba6ca..000000000 --- a/testing/ghc/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 128106 2011-06-22 10:54:11Z vesa $ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Special note for devs looking to upgrade this package: -# ghc places a unique hash for each library when it is built. -# Libraries depend on versions specified by those hashes. -# This implies that all libraries need to be rebuilt when ghc is rebuilt. -# Also, due to dependency loop problems, haskell-ghc-paths and haddock -# do not carry version dependencies. You will have to remember to build them too. -pkgname=ghc -pkgver=7.0.3 -pkgrel=2 -pkgdesc="The Glasgow Haskell Compiler" -arch=(i686 x86_64) -url="http://www.haskell.org/ghc/" -license=("custom") -depends=('perl' 'gmp>=5.0' gcc) -makedepends=(ghc happy perl libxslt docbook-xsl) -provides=("haskell-array=0.3.0.2" - "haskell-bytestring=0.9.1.10" - "haskell-cabal=1.10.1.0" - "haskell-containers=0.4.0.0" - "haskell-directory=1.1.0.0" - "haskell-extensible-exceptions=0.1.1.2" - "haskell-filepath=1.2.0.0" - "haskell-haskell98=1.1.0.1" - "haskell-hpc=0.5.0.6" - "haskell-old-locale=1.0.0.2" - "haskell-old-time=1.0.0.6" - "haskell-pretty=1.0.1.2" - "haskell-process=1.0.1.5" - "haskell-random=1.0.0.3" - "haskell-template-haskell=2.5.0.0" - "haskell-time=1.2.0.3" - "haskell-unix=2.4.2.0" - ) -replaces=("haskell-array<0.3.0.2" - "haskell-bytestring<0.9.1.10" - "haskell-cabal<1.10.1.0" - "haskell-containers<0.4.0.0" - "haskell-directory<1.1.0.0" - "haskell-extensible-exceptions<0.1.1.2" - "haskell-filepath<1.2.0.0" - "haskell-haskell98<1.1.0.1" - "haskell-hpc<0.5.0.6" - "haskell-old-locale<1.0.0.2" - "haskell-old-time<1.0.0.6" - "haskell-pretty<1.0.1.2" - "haskell-process<1.0.1.5" - "haskell-random<1.0.0.3" - "haskell-template-haskell<2.5.0.0" - "haskell-time<1.2.0.3" - "haskell-unix<2.4.2.0" - ) - -install=ghc.install -options=(!strip) -source=("http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2" - build.mk) - -build() { - cd $srcdir/$pkgname-$pkgver - - cp $srcdir/build.mk mk/build.mk - - ./configure --prefix=/usr - make -j1 || return 1 -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license - install -d $pkgdir/usr/share/haskell -} - -md5sums=('10bc5e9ae1b581404376efb85f260ff3' - '5a3e0880c80b1dcecf779ff2e63a9c0d') diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk deleted file mode 100644 index f918a0f16..000000000 --- a/testing/ghc/build.mk +++ /dev/null @@ -1,150 +0,0 @@ -# ----------------------------------------------------------------------------- -# A Sample build.mk -# -# Uncomment one of the following BuildFlavour settings to get the desired -# overall build type, and then tweak the options in the relevant section -# below. - -# Uncomment one of these to select a build profile below: - -# Full build with max optimisation (slow build) -BuildFlavour = perf - -# Fastest build (libs unoptimised): -#BuildFlavour = quickest - -# Fast build with optimised libraries: -#BuildFlavour = quick - -# Profile the stage2 compiler: -#BuildFlavour = prof - -# A development build, working on the stage 1 compiler: -#BuildFlavour = devel1 - -# A development build, working on the stage 2 compiler: -#BuildFlavour = devel2 - -GhcLibWays = v - -# -------- 1. A Performance/Distribution build-------------------------------- - -ifeq "$(BuildFlavour)" "perf" - -# perf matches the default settings, repeated here for comparison: - -SRC_HC_OPTS = -O -H64m -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O2 -fasm -GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -XGenerics -GhcLibWays += p - -ifeq "$(PlatformSupportsSharedLibs)" "YES" -GhcLibWays += dyn -endif - -endif - -# -------- A Fast build ------------------------------------------------------ - -ifeq "$(BuildFlavour)" "quickest" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O0 -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- A Fast build with optimised libs ---------------------------------- - -ifeq "$(BuildFlavour)" "quick" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- Profile the stage2 compiler --------------------------------------- - -ifeq "$(BuildFlavour)" "prof" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O -fasm -GhcLibHcOpts = -O -fasm - -GhcLibWays += p -GhcProfiled = YES - -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - - -# -------- A Development build (stage 1) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel1" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG -GhcStage2HcOpts = -Rghc-timing -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- A Development build (stage 2) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel2" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O -fasm -GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# ----------------------------------------------------------------------------- -# Other settings that might be useful - -# profiled RTS -#GhcRtsCcOpts = -pg -g - -# Optimised/profiled RTS -#GhcRtsCcOpts = -O2 -pg - -#GhcRtsWithFrontPanel = YES -#SRC_HC_OPTS += `gtk-config --libs` - -# NoFib settings -NoFibWays = -STRIP=: - - diff --git a/testing/ghc/ghc.install b/testing/ghc/ghc.install deleted file mode 100644 index 7d56083bc..000000000 --- a/testing/ghc/ghc.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=ghc - -pre_upgrade() { - cat << EOF - ==> Unregistering cabalized packages... -EOF - cd /usr/share/haskell/ && (for a in *; do ghc-pkg unregister --force $a &> /dev/null; done; cd - > /dev/null ) - cat << EOF - ==> Done. -EOF - -} - -post_upgrade() { - cat << EOF - ==> All cabalized and yaourt-installed packages need to be reinstalled now. - ==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages. -EOF -} diff --git a/testing/git/ChangeLog b/testing/git/ChangeLog deleted file mode 100644 index 76298e68f..000000000 --- a/testing/git/ChangeLog +++ /dev/null @@ -1,53 +0,0 @@ -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/testing/git/PKGBUILD b/testing/git/PKGBUILD deleted file mode 100644 index e4ae40280..000000000 --- a/testing/git/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 129435 2011-06-27 17:14:23Z dan $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=git -pkgver=1.7.6 -pkgrel=1 -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.14.0') -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=('9e0a438eb71e89eedb61f89470ed32a0' - 'a017935cf9e90d9f056b6547c318fd15' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082' - 'a0ffd7e16997262ef741db5e2dd8eabf44b6767cf1a213753c7d8a268b4553ad' - '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' - 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/testing/git/git-daemon b/testing/git/git-daemon deleted file mode 100644 index 21ba73ed5..000000000 --- a/testing/git/git-daemon +++ /dev/null @@ -1,70 +0,0 @@ -#!/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/testing/git/git-daemon.conf b/testing/git/git-daemon.conf deleted file mode 100644 index 3f9a12060..000000000 --- a/testing/git/git-daemon.conf +++ /dev/null @@ -1,5 +0,0 @@ -# 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/testing/glade-perl/PKGBUILD b/testing/glade-perl/PKGBUILD deleted file mode 100644 index 96d77bced..000000000 --- a/testing/glade-perl/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $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/testing/glib-perl/PKGBUILD b/testing/glib-perl/PKGBUILD deleted file mode 100644 index 89610fe1e..000000000 --- a/testing/glib-perl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 124651 2011-05-23 19:33:30Z remy $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> - -pkgname=glib-perl -_realname=Glib -pkgver=1.223 -pkgrel=3 -pkgdesc="Perl wrappers for glib 2.x, including GObject" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -options=('!emptydirs') -depends=('glib2>=2.24.1' 'perl>=5.14') -makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('cfdeaa8c95448f86c30b505e4701abf1') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD deleted file mode 100644 index f3a040236..000000000 --- a/testing/glibc/PKGBUILD +++ /dev/null @@ -1,188 +0,0 @@ -# $Id: PKGBUILD 128661 2011-06-25 11:56:19Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuilt with each new glibc version - -pkgname=glibc -pkgver=2.14 -pkgrel=4 -_glibcdate=20110617 -pkgdesc="GNU C Library" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -groups=('base') -depends=('linux-api-headers>=2.6.39' 'tzdata') -makedepends=('gcc>=4.4') -backup=(etc/locale.gen - etc/nscd.conf) -options=('!strip') -install=glibc.install -source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - glibc-2.12.1-static-shared-getpagesize.patch - glibc-2.12.2-ignore-origin-of-privileged-program.patch - glibc-2.13-futex.patch - glibc-2.14-libdl-crash.patch - #glibc-2.14-fix-resolver-crash-typo.patch - glibc-2.14-revert-4462fad3.patch - glibc-2.14-reexport-rpc-interface.patch - glibc-2.14-reinstall-nis-rpc-headers.patch - nscd - locale.gen.txt - locale-gen) -md5sums=('e441d745609d93c907b72548ba646dad' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '7d0154b7e17ea218c9fa953599d24cc4' - 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') - - -mksource() { - git clone git://sourceware.org/git/glibc.git - pushd glibc - git checkout -b glibc-2.14-arch origin/release/2.14/master - popd - tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* -} - -build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 - patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - patch -Np1 -i ${srcdir}/glibc-__i686.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 - # using Fedora "fix" as patch in that bug report causes breakages... - patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch - - # http://www.exploit-db.com/exploits/15274/ - # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch - - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) - # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html - patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - - # This fixes the main segfault but not the assert fail (FS#24615) - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 - #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch - # resort to reverting the bad commit completely for the moment - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch - - # re-export RPC interface until libtirpc is ready as a replacement - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch - - install -dm755 ${pkgdir}/etc - touch ${pkgdir}/etc/ld.so.conf - - cd ${srcdir} - mkdir glibc-build - cd glibc-build - - if [[ ${CARCH} = "i686" ]]; then - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - fi - - echo "slibdir=/lib" >> configparms - - ${srcdir}/glibc/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --with-headers=/usr/include \ - --enable-add-ons=nptl,libidn \ - --enable-kernel=2.6.27 \ - --with-tls --with-__thread \ - --enable-bind-now --without-gd \ - --without-cvs --disable-profile \ - --disable-multi-arch - - make -} - -check() { - cd ${srcdir}/glibc-build - - # some errors are expected - manually check log files - make -k check || true -} - -package() { - cd ${srcdir}/glibc-build - make install_root=${pkgdir} install - - rm -f ${pkgdir}/etc/ld.so.{cache,conf} - - install -dm755 ${pkgdir}/etc/rc.d - install -dm755 ${pkgdir}/usr/sbin - install -dm755 ${pkgdir}/usr/lib/locale - install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin - install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf - - sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf - - # create /etc/locale.gen - install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen - sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED - sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED - sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED - cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen - sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen - - if [[ ${CARCH} = "x86_64" ]]; then - # fix for the linker - sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd - # Comply with multilib binaries, they look for the linker in /lib64 - mkdir ${pkgdir}/lib64 - cd ${pkgdir}/lib64 - ln -v -s ../lib/ld* . - fi - - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 - - cd $pkgdir - strip $STRIP_BINARIES sbin/{ldconfig,sln} \ - usr/bin/{gencat,getconf,getent,iconv,locale} \ - usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \ - usr/lib/getconf/* \ - usr/sbin/{iconvconfig,nscd} - [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 - - strip $STRIP_STATIC usr/lib/*.a \ - lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so - - strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ - lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - lib/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib/{pt_chown,{audit,gconv}/*.so} -} diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/testing/glibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/testing/glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e84754279..000000000 --- a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/testing/glibc/glibc-2.13-futex.patch b/testing/glibc/glibc-2.13-futex.patch deleted file mode 100644 index 9b9c3ac45..000000000 --- a/testing/glibc/glibc-2.13-futex.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: - - 7: movq %rdx, %rax - --#ifndef __ASSUME_PRIVATE_FUTEX -+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME - addq $16, %rsp - cfi_adjust_cfa_offset(-16) - popq %r14 -@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) diff --git a/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch b/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch deleted file mode 100644 index b5d86c7d2..000000000 --- a/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/resolv/res_send.c b/resolv/res_send.c -index 97142b7..a001c1e 100644 ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch deleted file mode 100644 index ee29f8c20..000000000 --- a/testing/glibc/glibc-2.14-libdl-crash.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 73b2a2f..9bd91e3 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -1,5 +1,5 @@ - /* Close a shared object opened by `_dl_open'. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) - if (map->l_direct_opencount > 0 || map->l_type != lt_loaded - || dl_close_state != not_pending) - { -- if (map->l_direct_opencount == 0) -- { -- if (map->l_type == lt_loaded) -- dl_close_state = rerun; -- else if (map->l_type == lt_library) -- { -- struct link_map **oldp = map->l_initfini; -- map->l_initfini = map->l_orig_initfini; -- _dl_scope_free (oldp); -- } -- } -+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) -+ dl_close_state = rerun; - - /* There are still references to this object. Do nothing more. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index 9e30594..3890d00 100644 ---- a/elf/dl-deps.c -+++ b/elf/dl-deps.c -@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, - nneeded * sizeof needed[0]); - atomic_write_barrier (); - l->l_initfini = l_initfini; -+ l->l_free_initfini = 1; - } - - /* If we have no auxiliary objects just go on to the next map. */ -@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - } -diff --git a/elf/dl-libc.c b/elf/dl-libc.c -index 7be9483..a13fce3 100644 ---- a/elf/dl-libc.c -+++ b/elf/dl-libc.c -@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) - - for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) - { -- /* Remove all additional names added to the objects. */ - for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) - { - struct libname_list *lnp = l->l_libname->next; - - l->l_libname->next = NULL; - -+ /* Remove all additional names added to the objects. */ - while (lnp != NULL) - { - struct libname_list *old = lnp; -@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) - if (! old->dont_free) - free (old); - } -+ -+ /* Free the initfini dependency list. */ -+ if (l->l_free_initfini) -+ free (l->l_initfini); - } - - if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff --git a/elf/rtld.c b/elf/rtld.c -index 4a9109e..617e30e 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lnp->dont_free = 1; - lnp = lnp->next; - } -+ l->l_free_initfini = 0; - - if (l != &GL(dl_rtld_map)) - _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -diff --git a/include/link.h b/include/link.h -index e877104..051b99a 100644 ---- a/include/link.h -+++ b/include/link.h -@@ -1,6 +1,6 @@ - /* Data structure for communication from the run-time dynamic linker for - loaded ELF shared objects. -- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -192,6 +192,9 @@ struct link_map - during LD_TRACE_PRELINKING=1 - contains any DT_SYMBOLIC - libraries. */ -+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be -+ freed, ie. not allocated with -+ the dummy malloc in ld.so. */ - - /* Collected information about own RPATH directories. */ - struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map - - /* List of object in order of the init and fini calls. */ - struct link_map **l_initfini; -- /* The init and fini list generated at startup, saved when the -- object is also loaded dynamically. */ -- struct link_map **l_orig_initfini; - - /* List of the dependencies introduced through symbol binding. */ - struct link_map_reldeps diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index e2beea881..000000000 --- a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -635,7 +635,7 @@ for linking") - # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) - # define libc_hidden_def(name) hidden_def (name) - # define libc_hidden_weak(name) hidden_weak (name) --# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) -+# define libc_hidden_nolink(name, version) hidden_def (name) - # define libc_hidden_ver(local, name) hidden_ver (local, name) - # define libc_hidden_data_def(name) hidden_data_def (name) - # define libc_hidden_data_weak(name) hidden_data_weak (name) -diff --git a/sunrpc/Makefile b/sunrpc/Makefile -index 5134ce9..40c73d1 100644 ---- a/sunrpc/Makefile -+++ b/sunrpc/Makefile -@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - des_crypt.h) - headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ - $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h --headers = rpc/netdb.h -+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) - install-others = $(inst_sysconfdir)/rpc - generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index eb0fd822d..000000000 --- a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Tue, 17 May 2011 17:42:30 +0200 -Subject: [PATCH] Reinstall NIS RPC headers - ---- - nis/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/Makefile b/nis/Makefile -index b5c9609..d2934d9 100644 ---- a/nis/Makefile -+++ b/nis/Makefile -@@ -23,9 +23,9 @@ subdir := nis - - aux := nis_hash - -+headers := $(wildcard rpcsvc/*.[hx]) - distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ -- nisplus-parser.h nis_xdr.h nss \ -- $(wildcard rpcsvc/*.[hx]) -+ nisplus-parser.h nis_xdr.h nss - - # These are the databases available for the nis (and perhaps later nisplus) - # service. This must be a superset of the services in nss. --- -1.7.5.4 - diff --git a/testing/glibc/glibc-2.14-revert-4462fad3.patch b/testing/glibc/glibc-2.14-revert-4462fad3.patch deleted file mode 100644 index d71e37492..000000000 --- a/testing/glibc/glibc-2.14-revert-4462fad3.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c ---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 -+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 -@@ -549,7 +549,7 @@ - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or -@@ -1275,14 +1275,10 @@ - (*thisresplenp > *thisanssizp) - ? *thisanssizp : *thisresplenp); - -- if (recvresp1 || (buf2 != NULL && recvresp2)) { -- *resplen2 = 0; -+ if (recvresp1 || (buf2 != NULL && recvresp2)) - return resplen; -- } - if (buf2 != NULL) - { -- /* No data from the first reply. */ -- resplen = 0; - /* We are waiting for a possible second reply. */ - if (hp->id == anhp->id) - recvresp1 = 1; diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/testing/glibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install deleted file mode 100644 index 7f85ade96..000000000 --- a/testing/glibc/glibc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) - -post_upgrade() { - sbin/ldconfig -r . - [ -x sbin/init ] && sbin/init u - usr/sbin/locale-gen - - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen deleted file mode 100755 index 5aff344c4..000000000 --- a/testing/glibc/locale-gen +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -LOCALEGEN=/etc/locale.gen -LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi - - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; - -# Remove all old locale dir and locale-archive before generating new -# locale data. -rm -rf /usr/lib/locale/* || true - -umask 022 - -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi -} - -echo "Generating locales..." -while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ -done < $LOCALEGEN -echo "Generation complete." diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt deleted file mode 100644 index ccdd81734..000000000 --- a/testing/glibc/locale.gen.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# <locale> <charset> -# -# where <locale> is one of the locales given in /usr/share/i18n/locales -# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps -# -# Examples: -# en_US ISO-8859-1 -# en_US.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is included in this file. -# Uncomment the ones you need. -# diff --git a/testing/glibc/nscd b/testing/glibc/nscd deleted file mode 100755 index 8b14f2a3f..000000000 --- a/testing/glibc/nscd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/nscd` -case "$1" in - start) - stat_busy "Starting nscd" - # create necessary directories if they don't already exist - mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null - # remove stale files - rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null - [ -z "$PID" ] && /usr/sbin/nscd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon nscd - stat_done - fi - ;; - stop) - stat_busy "Stopping nscd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nscd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/gnome-perl/PKGBUILD b/testing/gnome-perl/PKGBUILD deleted file mode 100644 index 81f68ee25..000000000 --- a/testing/gnome-perl/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $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/testing/gnome-vfs-perl/PKGBUILD b/testing/gnome-vfs-perl/PKGBUILD deleted file mode 100644 index 3960f5285..000000000 --- a/testing/gnome-vfs-perl/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $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/testing/gnomecanvas-perl/PKGBUILD b/testing/gnomecanvas-perl/PKGBUILD deleted file mode 100644 index 2563caae4..000000000 --- a/testing/gnomecanvas-perl/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $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/testing/gnumeric/PKGBUILD b/testing/gnumeric/PKGBUILD deleted file mode 100644 index 2fd9e4799..000000000 --- a/testing/gnumeric/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $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/gnumeric/gnumeric.install b/testing/gnumeric/gnumeric.install deleted file mode 100644 index 50ee0a7e2..000000000 --- a/testing/gnumeric/gnumeric.install +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=gnumeric - -post_install() { - 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 $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} diff --git a/testing/graphviz/LICENSE b/testing/graphviz/LICENSE deleted file mode 100644 index 16cc69a52..000000000 --- a/testing/graphviz/LICENSE +++ /dev/null @@ -1,87 +0,0 @@ -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/testing/graphviz/PKGBUILD b/testing/graphviz/PKGBUILD deleted file mode 100644 index f1e8ba234..000000000 --- a/testing/graphviz/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 129245 2011-06-26 09:32:03Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -pkgname=graphviz -pkgver=2.28.0 -pkgrel=4 -pkgdesc='Graph visualization software' -url='http://www.graphviz.org/' -license=('custom:EPL') -arch=('i686' 'x86_64') -depends=('gd' 'librsvg' 'libxaw' 'ghostscript' 'pango') -makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') -optdepends=('mono: sharp bindings' - 'guile: guile bindings' - 'lua: lua bindings' - 'ocaml: ocaml bindings' - 'perl: perl bindings' - 'php: php bindings' - 'python2: python bindings' - 'r: r bindings' - 'ruby: ruby bindings' - 'tcl: tcl bindings' - 'qt: gvedit') -source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" - 'LICENSE') -sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d' - 'e78277e502c29abb74b9587a5dc951ec392554ea') - -options=('!libtool') -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i "/RUBY_INCLUDES=\"/s|\"$| `eval echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,}`\"|" configure - sed -i '/LIBPOSTFIX="64"/d' configure - export PYTHON=python2 - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # cf. http://www.graphviz.org/License.php - install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE -} diff --git a/testing/graphviz/install b/testing/graphviz/install deleted file mode 100644 index 65fba522b..000000000 --- a/testing/graphviz/install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - rm -f usr/lib/graphviz/config{,6} - usr/bin/dot -c -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/graphviz/config{,6} -} diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD deleted file mode 100644 index 958f5b0e5..000000000 --- a/testing/grep/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 128670 2011-06-25 12:20:55Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=grep -pkgver=2.9 -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=('25e41b2aa201104354740961ef36005a') - -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/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD deleted file mode 100644 index 9f1074038..000000000 --- a/testing/gstreamer0.10-ugly/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 127813 2011-06-18 16:10:52Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gstreamer0.10-ugly -pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') -pkgver=0.10.18 -pkgrel=2 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') -url="http://gstreamer.freedesktop.org/" -options=(!libtool) -source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2) -md5sums=('04a7009a4efea2844075949c111f5e4d') - -build() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - make - sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile -} - -package_gstreamer0.10-ugly() { - pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" - depends=('gstreamer0.10-base>=0.10.34') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_gstreamer0.10-ugly-plugins() { - pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" - depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') - groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make -C ext DESTDIR="${pkgdir}" install -} diff --git a/testing/gtk2-perl/PKGBUILD b/testing/gtk2-perl/PKGBUILD deleted file mode 100644 index 215b21109..000000000 --- a/testing/gtk2-perl/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 124902 2011-05-25 01:27:30Z foutrelis $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> - -pkgname=gtk2-perl -_realname=Gtk2 -pkgver=1.222 -pkgrel=3 -pkgdesc="Gtk2-Perl allows Perl developers to write GTK+ 2.x applications." -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('gtk2' 'pango-perl') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('8f8a170b33dc2cf4e69769e97c05185a') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make install DESTDIR="${pkgdir}" -} diff --git a/testing/haddock/PKGBUILD b/testing/haddock/PKGBUILD deleted file mode 100644 index e061249d3..000000000 --- a/testing/haddock/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 -pkgname=haddock -pkgver=2.9.2 -pkgrel=1 -pkgdesc="Documentation-generation tool for Haskell libraries" -url="http://hackage.haskell.org/package/${pkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=(alex happy) -depends=(ghc sh 'haskell-mtl' 'haskell-xhtml' 'haskell-ghc-paths') # cannot have more strict deps here -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) -install=${pkgname}.install - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - -md5sums=('04928e132827a1da20ace52babb43e47') diff --git a/testing/haddock/haddock.install b/testing/haddock/haddock.install deleted file mode 100644 index 278da355e..000000000 --- a/testing/haddock/haddock.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haddock -post_install() { - ${HS_DIR}/register.sh &> /dev/null - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null -} -post_upgrade() { - ${HS_DIR}/register.sh &> /dev/null - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} -pre_remove() { - ${HS_DIR}/unregister.sh &> /dev/null -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} diff --git a/testing/haskell-cgi/PKGBUILD b/testing/haskell-cgi/PKGBUILD deleted file mode 100644 index 4b64ba578..000000000 --- a/testing/haskell-cgi/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=cgi -pkgname=haskell-cgi -pkgver=3001.1.7.4 -pkgrel=3.1 -pkgdesc="A library for writing CGI programs" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1' 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-xhtml=3000.2.0.1-7.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('0e551afc8d6f39aaa70520e31de26506') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-cgi/haskell-cgi.install b/testing/haskell-cgi/haskell-cgi.install deleted file mode 100644 index 533fe4dc5..000000000 --- a/testing/haskell-cgi/haskell-cgi.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-cgi -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-deepseq/PKGBUILD b/testing/haskell-deepseq/PKGBUILD deleted file mode 100644 index 934303f2b..000000000 --- a/testing/haskell-deepseq/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=deepseq -pkgname=haskell-deepseq -pkgver=1.1.0.2 -pkgrel=2.1 -pkgdesc="Fully evaluate data structures" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('90b66480f0eb659c1db209ee703e0162') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-deepseq/haskell-deepseq.install b/testing/haskell-deepseq/haskell-deepseq.install deleted file mode 100644 index 8ba51eac7..000000000 --- a/testing/haskell-deepseq/haskell-deepseq.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-deepseq -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-fgl/PKGBUILD b/testing/haskell-fgl/PKGBUILD deleted file mode 100644 index 45f466e91..000000000 --- a/testing/haskell-fgl/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=fgl -pkgname=haskell-fgl -pkgver=5.4.2.3 -pkgrel=4.1 -pkgdesc="Martin Erwig's Functional Graph Library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0-3.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c') -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} -md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c') diff --git a/testing/haskell-fgl/haskell-fgl.install b/testing/haskell-fgl/haskell-fgl.install deleted file mode 100644 index 0da0edb7b..000000000 --- a/testing/haskell-fgl/haskell-fgl.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-fgl -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-ghc-paths/PKGBUILD b/testing/haskell-ghc-paths/PKGBUILD deleted file mode 100644 index 5a744ac49..000000000 --- a/testing/haskell-ghc-paths/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=ghc-paths -pkgname=haskell-ghc-paths -pkgver=0.1.0.8 -pkgrel=4 -pkgdesc="Knowledge of GHC's installation directories" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=(ghc=7.0.2) # cannot have stricter dep here due to haddock -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d2b23dc563888e380588501d2ce1d82b') -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-ghc-paths/haskell-ghc-paths.install b/testing/haskell-ghc-paths/haskell-ghc-paths.install deleted file mode 100644 index 4fd2c6c56..000000000 --- a/testing/haskell-ghc-paths/haskell-ghc-paths.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-ghc-paths -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-glut/PKGBUILD b/testing/haskell-glut/PKGBUILD deleted file mode 100644 index 98a30495c..000000000 --- a/testing/haskell-glut/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=GLUT -pkgname=haskell-glut -pkgver=2.1.2.1 -pkgrel=7.1 -pkgdesc="A binding for the OpenGL Utility Toolkit" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=('ghc=7.0.3-2' 'haskell-opengl=2.2.3.0-7.1' 'freeglut') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('b97f476a04098701e330e86c1f89ed52') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-glut/haskell-glut.install b/testing/haskell-glut/haskell-glut.install deleted file mode 100644 index 44c7cb3c1..000000000 --- a/testing/haskell-glut/haskell-glut.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-glut -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-haskell-src/PKGBUILD b/testing/haskell-haskell-src/PKGBUILD deleted file mode 100644 index eeb4844a7..000000000 --- a/testing/haskell-haskell-src/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=haskell-src -pkgname=haskell-haskell-src -pkgver=1.0.1.4 -pkgrel=2.1 -pkgdesc="Facilities for manipulating Haskell source code: an abstract syntax, lexer, parser and pretty-printer." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' 'haskell-syb=0.3-2.1' sh) -makedepends=(happy) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('32d181c082393ab859e72610803bac6e') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-haskell-src/haskell-haskell-src.install b/testing/haskell-haskell-src/haskell-haskell-src.install deleted file mode 100644 index 03ce601bc..000000000 --- a/testing/haskell-haskell-src/haskell-haskell-src.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-haskell-src -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-html/PKGBUILD b/testing/haskell-html/PKGBUILD deleted file mode 100644 index 1d207117e..000000000 --- a/testing/haskell-html/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=html -pkgname=haskell-html -pkgver=1.0.1.2 -pkgrel=9.1 -pkgdesc="HTML combinator library" -url="http://hackage.haskell.org/package/html" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-html/haskell-html.install b/testing/haskell-html/haskell-html.install deleted file mode 100644 index 768297e0a..000000000 --- a/testing/haskell-html/haskell-html.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-html -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD deleted file mode 100644 index d1106c478..000000000 --- a/testing/haskell-http/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=HTTP -pkgname=haskell-http -pkgver=4000.1.1 -pkgrel=3.1 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' sh 'haskell-network=2.3.0.2-2.1' 'haskell-parsec=3.1.1-2.1' 'haskell-mtl=2.0.1.0-3.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('ddf23d46c4d6dc0048c454e3d01caa57') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-http/haskell-http.install b/testing/haskell-http/haskell-http.install deleted file mode 100644 index fdebb1cb8..000000000 --- a/testing/haskell-http/haskell-http.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-http -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-hunit/PKGBUILD b/testing/haskell-hunit/PKGBUILD deleted file mode 100644 index 401887e4e..000000000 --- a/testing/haskell-hunit/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=HUnit -pkgname=haskell-hunit -pkgver=1.2.2.3 -pkgrel=2.1 -pkgdesc="A unit testing framework for Haskell" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('f179add502f88153e5c9fdc69056b657') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-hunit/haskell-hunit.install b/testing/haskell-hunit/haskell-hunit.install deleted file mode 100644 index ceb108b5b..000000000 --- a/testing/haskell-hunit/haskell-hunit.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hunit -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD deleted file mode 100644 index e0ee184de..000000000 --- a/testing/haskell-mtl/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=mtl -pkgname=haskell-mtl -pkgver=2.0.1.0 -pkgrel=3.1 -pkgdesc="Monad transformer library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh 'haskell-transformers=0.2.2.0-3.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('934fa813625ef7e88a6a96a09815ff95') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} -md5sums=('934fa813625ef7e88a6a96a09815ff95') diff --git a/testing/haskell-mtl/haskell-mtl.install b/testing/haskell-mtl/haskell-mtl.install deleted file mode 100644 index 9325811e8..000000000 --- a/testing/haskell-mtl/haskell-mtl.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-mtl -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD deleted file mode 100644 index 372cdf623..000000000 --- a/testing/haskell-network/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=network -pkgname=haskell-network -pkgver=2.3.0.2 -pkgrel=2.1 -pkgdesc="Networking-related facilities" -url="http://hackage.haskell.org/package/network" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh 'haskell-parsec=3.1.1-2.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('a739fe9b75af744cfa1c05e39d41ac1f') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-network/haskell-network.install b/testing/haskell-network/haskell-network.install deleted file mode 100644 index a56c31d0a..000000000 --- a/testing/haskell-network/haskell-network.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-network -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-opengl/PKGBUILD b/testing/haskell-opengl/PKGBUILD deleted file mode 100644 index 8d70bbc91..000000000 --- a/testing/haskell-opengl/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=OpenGL -pkgname=haskell-opengl -pkgver=2.2.3.0 -pkgrel=7.1 -pkgdesc="A binding for the OpenGL graphics system" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' 'mesa') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('f4e3ccb471034a6a74921d4dab9dd32d') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-opengl/haskell-opengl.install b/testing/haskell-opengl/haskell-opengl.install deleted file mode 100644 index d0f3474b3..000000000 --- a/testing/haskell-opengl/haskell-opengl.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-opengl -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-parallel/PKGBUILD b/testing/haskell-parallel/PKGBUILD deleted file mode 100644 index 0e46c2c93..000000000 --- a/testing/haskell-parallel/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=parallel -pkgname=haskell-parallel -pkgver=3.1.0.1 -pkgrel=3.1 -pkgdesc="Parallel programming library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh 'haskell-deepseq=1.1.0.2-2.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('591979e7897dbc09157edf73a4614957') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-parallel/haskell-parallel.install b/testing/haskell-parallel/haskell-parallel.install deleted file mode 100644 index e6ec0c449..000000000 --- a/testing/haskell-parallel/haskell-parallel.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-parallel -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD deleted file mode 100644 index 0810df75b..000000000 --- a/testing/haskell-parsec/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 -_hkgname=parsec -pkgname=haskell-parsec -pkgver=3.1.1 -pkgrel=2.1 -pkgdesc="Monadic parser combinators" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('3d5500847cac09f6f658db825b6c5df8') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-parsec/haskell-parsec.install b/testing/haskell-parsec/haskell-parsec.install deleted file mode 100644 index dfa0701b9..000000000 --- a/testing/haskell-parsec/haskell-parsec.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-parsec -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-platform/PKGBUILD b/testing/haskell-platform/PKGBUILD deleted file mode 100644 index 2534d95c2..000000000 --- a/testing/haskell-platform/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -pkgname=haskell-platform -pkgver=2011.2.0.0 -pkgrel=4 -pkgdesc="The Haskell Platform" -url="http://hackage.haskell.org/platform/" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' - 'haskell-glut=2.1.2.1-7.1' - 'haskell-http=4000.1.1-3.1' - 'haskell-hunit=1.2.2.3-2.1' - 'haskell-opengl=2.2.3.0-7.1' - 'haskell-quickcheck=2.4.0.1-3.1' - 'haskell-cgi=3001.1.7.4-3.1' - 'haskell-deepseq=1.1.0.2-2.1' - 'haskell-fgl=5.4.2.3-4.1' - 'haskell-haskell-src=1.0.1.4-2.1' - 'haskell-html=1.0.1.2-9.1' - 'haskell-mtl=2.0.1.0-3.1' - 'haskell-network=2.3.0.2-2.1' - 'haskell-parallel=3.1.0.1-3.1' - 'haskell-parsec=3.1.1-2.1' - 'haskell-regex-base=0.93.2-4.1' - 'haskell-regex-posix=0.94.4-2.1' - 'haskell-regex-compat=0.93.1-4.1' - 'haskell-stm=2.2.0.1-2.1' - 'haskell-syb=0.3-2.1' - 'haskell-text=0.11.0.5-2.1' - 'haskell-transformers=0.2.2.0-3.1' - 'haskell-xhtml=3000.2.0.1-7.1' - 'haskell-zlib=0.5.3.1-2.1' - 'cabal-install=0.10.2' - 'alex=2.3.5' - 'happy=1.18.6' ) - -build() { - return 0 -} diff --git a/testing/haskell-quickcheck/PKGBUILD b/testing/haskell-quickcheck/PKGBUILD deleted file mode 100644 index ab05c75f7..000000000 --- a/testing/haskell-quickcheck/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=QuickCheck -pkgname=haskell-quickcheck -pkgver=2.4.0.1 -pkgrel=3.1 -pkgdesc="Automatic testing of Haskell programs" -url="http://hackage.haskell.org/package/QuickCheck" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 haskell-mtl=2.0.1.0-3.1 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('e8c86e95fd1fa4c58fc8e53e2853db5e') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-quickcheck/haskell-quickcheck.install b/testing/haskell-quickcheck/haskell-quickcheck.install deleted file mode 100644 index c9e12fadc..000000000 --- a/testing/haskell-quickcheck/haskell-quickcheck.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-quickcheck -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-regex-base/PKGBUILD b/testing/haskell-regex-base/PKGBUILD deleted file mode 100644 index 57721d39b..000000000 --- a/testing/haskell-regex-base/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=regex-base -pkgname=haskell-regex-base -pkgver=0.93.2 -pkgrel=4.1 -pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-regex-base/haskell-regex-base.install b/testing/haskell-regex-base/haskell-regex-base.install deleted file mode 100644 index 3ad2fea28..000000000 --- a/testing/haskell-regex-base/haskell-regex-base.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-base -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-regex-compat/PKGBUILD b/testing/haskell-regex-compat/PKGBUILD deleted file mode 100644 index 507a96618..000000000 --- a/testing/haskell-regex-compat/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=regex-compat -pkgname=haskell-regex-compat -pkgver=0.93.1 -pkgrel=4.1 -pkgdesc="Replaces and enhances Text.Regex" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1' 'haskell-regex-posix=0.94.4-2.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d6becec95ea8098cab663116fdce60a5') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-regex-compat/haskell-regex-compat.install b/testing/haskell-regex-compat/haskell-regex-compat.install deleted file mode 100644 index 898c0bba1..000000000 --- a/testing/haskell-regex-compat/haskell-regex-compat.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-compat -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-regex-posix/PKGBUILD b/testing/haskell-regex-posix/PKGBUILD deleted file mode 100644 index 3b00616eb..000000000 --- a/testing/haskell-regex-posix/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=regex-posix -pkgname=haskell-regex-posix -pkgver=0.94.4 -pkgrel=2.1 -pkgdesc="The posix regex backend for regex-base" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh 'haskell-regex-base=0.93.2-4.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('c28a13e8329e93a19bbb51708bf64abb') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-regex-posix/haskell-regex-posix.install b/testing/haskell-regex-posix/haskell-regex-posix.install deleted file mode 100644 index 2b89fae7b..000000000 --- a/testing/haskell-regex-posix/haskell-regex-posix.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-posix -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-stm/PKGBUILD b/testing/haskell-stm/PKGBUILD deleted file mode 100644 index 9a9c9a962..000000000 --- a/testing/haskell-stm/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=stm -pkgname=haskell-stm -pkgver=2.2.0.1 -pkgrel=2.1 -pkgdesc="A modular composable concurrency abstraction." -url="http://hackage.haskell.org/package/stm" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('b1cf03ed315e00c33160746feeee8682') - -build() { - cd ${srcdir}/${_hkgname}-$pkgver - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-$pkgver - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-stm/haskell-stm.install b/testing/haskell-stm/haskell-stm.install deleted file mode 100644 index 0283c2fc5..000000000 --- a/testing/haskell-stm/haskell-stm.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-stm -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-syb/PKGBUILD b/testing/haskell-syb/PKGBUILD deleted file mode 100644 index 64faf05ed..000000000 --- a/testing/haskell-syb/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=syb -pkgname=haskell-syb -pkgver=0.3 -pkgrel=2.1 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('c4f6771fa32d467a029e6e813757a9fe') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname} - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-syb/haskell-syb.install b/testing/haskell-syb/haskell-syb.install deleted file mode 100644 index 080055165..000000000 --- a/testing/haskell-syb/haskell-syb.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-syb -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD deleted file mode 100644 index 7dbc1ce17..000000000 --- a/testing/haskell-text/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=text -pkgname=haskell-text -pkgver=0.11.0.5 -pkgrel=2.1 -pkgdesc="An efficient packed Unicode text type." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.3-2' sh 'haskell-deepseq=1.1.0.2-2.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('516a6813a6b9061fabdc9f0c3bbb1592') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-text/haskell-text.install b/testing/haskell-text/haskell-text.install deleted file mode 100644 index 620db3921..000000000 --- a/testing/haskell-text/haskell-text.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-text -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD deleted file mode 100644 index 446b2ffca..000000000 --- a/testing/haskell-transformers/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# $Id: PKGBUILD 128119 2011-06-22 11:19:38Z vesa $ - -_hkgname=transformers -pkgname=haskell-transformers -pkgver=0.2.2.0 -pkgrel=3.1 -pkgdesc="Concrete functor and monad transformers" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('3470ac66116900cd1ba84d3744474e49') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-transformers/haskell-transformers.install b/testing/haskell-transformers/haskell-transformers.install deleted file mode 100644 index eec2af6e1..000000000 --- a/testing/haskell-transformers/haskell-transformers.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-transformers -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-xhtml/PKGBUILD b/testing/haskell-xhtml/PKGBUILD deleted file mode 100644 index 4a34206ad..000000000 --- a/testing/haskell-xhtml/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=xhtml -pkgname=haskell-xhtml -pkgver=3000.2.0.1 -pkgrel=7.1 -pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants." -url="http://hackage.haskell.org/package/xhtml" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('9e3e7d9c66618c5e29716f90e54363c9') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-xhtml/haskell-xhtml.install b/testing/haskell-xhtml/haskell-xhtml.install deleted file mode 100644 index d03b8a053..000000000 --- a/testing/haskell-xhtml/haskell-xhtml.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-xhtml -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD deleted file mode 100644 index 22a9eb932..000000000 --- a/testing/haskell-zlib/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package originally generated by cabal2arch 0.7.6 -_hkgname=zlib -pkgname=haskell-zlib -pkgver=0.5.3.1 -pkgrel=2.1 -pkgdesc="Compression and decompression in the gzip and zlib formats" -url="http://hackage.haskell.org/package/zlib" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.3-2 'zlib' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('8fb2988b112e38d04a527b892f770507') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-zlib/haskell-zlib.install b/testing/haskell-zlib/haskell-zlib.install deleted file mode 100644 index d387b7b65..000000000 --- a/testing/haskell-zlib/haskell-zlib.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-zlib -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/imagemagick/PKGBUILD b/testing/imagemagick/PKGBUILD deleted file mode 100644 index 558bd5fde..000000000 --- a/testing/imagemagick/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 127963 2011-06-20 08:24:42Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=imagemagick -pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.0.8 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.imagemagick.org/" -license=('custom') -depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'xz' 'freetype2' 'fontconfig' \ - 'libxext' 'libjpeg-turbo') -makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') -source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ - perlmagick.rpath.patch) -md5sums=('67d8631c20fc9a2409343c02b159407d' - 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('03b8534d16aee3efc5496817f804d21964be79ad' - '23405f80904b1de94ebd7bd6fe2a332471b8c283') - -build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - - sed '/AC_PATH_XTRA/d' -i configure.ac - autoreconf - patch -Np0 -i ../perlmagick.rpath.patch - - LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --enable-openmp --with-wmf --with-openexr --with-xml \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" \ - --without-gvc --without-djvu --without-autotrace --with-jp2 \ - --without-jbig --without-fpx --without-dps --without-fftw - make -} - -package_imagemagick() { - pkgdesc="An image viewing/manipulation program" - optdepends=('ghostscript: for Ghostscript support' - 'openexr: for OpenEXR support' - 'libwmf: for WMF support' - 'librsvg: for SVG support' - 'libxml2: for XML support' - 'jasper: for JPEG-2000 support' - 'libpng: for PNG support') - backup=('etc/ImageMagick/coder.xml' - 'etc/ImageMagick/colors.xml' - 'etc/ImageMagick/delegates.xml' - 'etc/ImageMagick/log.xml' - 'etc/ImageMagick/magic.xml' - 'etc/ImageMagick/mime.xml' - 'etc/ImageMagick/policy.xml' - 'etc/ImageMagick/sRGB.icm' - 'etc/ImageMagick/thresholds.xml' - 'etc/ImageMagick/type.xml' - 'etc/ImageMagick/type-dejavu.xml' - 'etc/ImageMagick/type-ghostscript.xml' - 'etc/ImageMagick/type-windows.xml') - options=('!makeflags' '!docs' 'libtool') - - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install - chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" - -#Cleaning - find "${pkgdir}" -name '*.bs' -delete - rm -f "${pkgdir}"/usr/lib/*.la -} - -package_imagemagick-doc() { - pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - depends=() - options=('!makeflags') - - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install-data-html - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" -} diff --git a/testing/imagemagick/perlmagick.rpath.patch b/testing/imagemagick/perlmagick.rpath.patch deleted file mode 100644 index 958c0f2ee..000000000 --- a/testing/imagemagick/perlmagick.rpath.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 -+++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 -@@ -10067,6 +10067,7 @@ - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) -+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install diff --git a/testing/irssi/PKGBUILD b/testing/irssi/PKGBUILD deleted file mode 100644 index bba878633..000000000 --- a/testing/irssi/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $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/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD deleted file mode 100644 index e609c334b..000000000 --- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 105813 2011-01-12 00:25:58Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Jakub Schmidtke <sjakub-at-gmail.com> - -pkgname=kdeplasma-applets-networkmanagement -epoch=1 -pkgver=git20110610 -_commit=0c83d81a374ac56538b1f6257215c81478888333 -pkgrel=1 -pkgdesc="KDE control panel and widget network connections" -arch=('i686' 'x86_64') -url="http://www.kde.org/" -license=('GPL') -depends=('kdebase-workspace' 'networkmanager') -makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info') -optdepends=('mobile-broadband-provider-info: allow to add new mobile connection') -install=${pkgname}.install -source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('23e6c100571c23b58ba557b7a28dd053') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../networkmanagement \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} diff --git a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install b/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install deleted file mode 100644 index e70c054ec..000000000 --- a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD deleted file mode 100644 index 36b928066..000000000 --- a/testing/less/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 128667 2011-06-25 12:14:07Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=less -pkgver=444 -pkgrel=1 -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=('56f9f76ffe13f70155f47f6b3c87d421') - -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/libmtp/PKGBUILD b/testing/libmtp/PKGBUILD deleted file mode 100644 index 9632630d0..000000000 --- a/testing/libmtp/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $ -# Contributor: damir <damir@archlinux.org> -# Contributor: Kevin Edmonds <edmondskevin@hotmail.com> - -pkgname=libmtp -pkgver=1.1.0 -pkgrel=1 -pkgdesc="library implementation of the Media Transfer Protocol" -arch=("i686" "x86_64") -url="http://libmtp.sourceforge.net" -license=('LGPL') -depends=('libusb-compat') -makedepends=('doxygen') -options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('fd7b293436528f4c780a9da6e5cc5398') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libproxy/PKGBUILD b/testing/libproxy/PKGBUILD deleted file mode 100644 index 7fde7ae6d..000000000 --- a/testing/libproxy/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $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/testing/linux-api-headers/PKGBUILD b/testing/linux-api-headers/PKGBUILD deleted file mode 100644 index 0a3f8da6e..000000000 --- a/testing/linux-api-headers/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 126765 2011-06-07 07:31:07Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=linux-api-headers -pkgver=2.6.39.1 -_basever=2.6.39 -pkgrel=1 -pkgdesc="Kernel headers sanitized for use in userspace" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL2') -provides=("kernel-headers=${pkgver}") -conflicts=('kernel-headers') -replaces=('kernel-headers') -source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2 - http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2) -md5sums=('1aab7a741abe08d42e8eccf20de61e05' - '215f7ebaafe1175dbc5d1e439c9a96d5') - -build() { - cd ${srcdir}/linux-${_basever} - [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver} - - make mrproper - make headers_check -} - -package() { - cd ${srcdir}/linux-${_basever} - make INSTALL_HDR_PATH=${pkgdir}/usr headers_install - - # use headers from libdrm - rm -rf ${pkgdir}/usr/include/drm - - # clean-up unnecessary files generated during install - find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f -} diff --git a/testing/llvm/PKGBUILD b/testing/llvm/PKGBUILD deleted file mode 100644 index 3aeb30afa..000000000 --- a/testing/llvm/PKGBUILD +++ /dev/null @@ -1,231 +0,0 @@ -# $Id: PKGBUILD 129537 2011-06-28 18:36:08Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Sebastian Nowicki <sebnow@gmail.com> -# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor: Roberto Alsina <ralsina@kde.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=2.9 -_gcc_ver=4.6.1 -pkgrel=6 -arch=('i686' 'x86_64') -url="http://llvm.org/" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz - http://llvm.org/releases/$pkgver/clang-$pkgver.tgz - ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz - clang-plugin-loader-registry.patch - cindexer-clang-path.patch - clang-toolchains-gcc-versions.patch - clang-pure64.patch - enable-lto.patch - bug-9869-operator-h-c++0x.patch) -md5sums=('793138412d2af2c7c7f54615f8943771' - '634de18d04b7a4ded19ec4c17d23cfca' - '70e23a3dc2b38ecb2bb4d2c48f47295d' - '02c23b4aaca3445b8bf39fddb2f9906e' - '87a7162dbe99e9ffce6c40bd09f5f4f0' - '016d70145d52255c9a46fedde51634e2' - '225ee6b531f8327f34f344a18cb4ec81' - '8f7582d7440e4a8342c3aea9ec714fb4' - '047cac563a557463d7ec6bd87d953f5e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # At the present, clang must reside inside the LLVM source code tree to build - # See http://llvm.org/bugs/show_bug.cgi?id=4840 - rm -rf tools/clang - cp -r "$srcdir/clang-$pkgver" tools/clang - - # Fix symbolic links from OCaml bindings to LLVM libraries - sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ - Makefile.config.in - - # Fix insecure rpath (http://bugs.archlinux.org/task/14017) - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - - # Get the correct list of symbols to export - # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html - patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" - - # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) - patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" - - # Add GCC 4.6.1 to GccVersions (FS#23631) - patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" - - if [[ $CARCH == x86_64 ]]; then - # Adjust lib paths - patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" - fi - - # Make -flto work - # Use gold instead of default linker, and always use the plugin - patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - - # Fix upstream bug #9869: - # Operator.h incompatibility with GCC 4.6 in C++0x mode - patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.patch" - - # Apply strip option to configure - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" - - # Include location of libffi headers in CPPFLAGS - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - - # TODO: Uncomment when clang works with GCC 4.6+ - #_cxx_headers="/usr/include/c++/$_gcc_ver" - #if [[ ! -d $_cxx_headers ]]; then - # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" - # return 1 - #fi - _cxx_headers="/usr/include/c++/clang-$pkgver" - - _32bit_headers="" - if [[ $CARCH == x86_64 ]]; then - # Important for multilib - _32bit_headers="32" - fi - - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --disable-expensive-checks \ - --disable-debug-runtime \ - --disable-assertions \ - --with-binutils-include=/usr/include \ - --with-cxx-include-root=$_cxx_headers \ - --with-cxx-include-arch=$CHOST \ - --with-cxx-include-32bit-dir=$_32bit_headers \ - --$_optimized_switch-optimized - - make REQUIRES_RTTI=1 -} - -package_llvm() { - pkgdesc="Low Level Virtual Machine" - depends=('perl' 'libffi') - - cd "$srcdir/$pkgname-$pkgver" - - # We move the clang directory out of the tree so it won't get installed and - # then we bring it back in for the clang package - mv tools/clang "$srcdir" - # -j1 is due to race conditions during the installation of the OCaml bindings - make -j1 DESTDIR="$pkgdir" install - mv "$srcdir/clang" tools - - # OCaml bindings go to a separate package - rm -rf "$srcdir"/{ocaml,ocamldoc} - mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" - - # Remove duplicate files installed by the OCaml bindings - rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" - - # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - - # Symlink the gold plugin where clang expects it - ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_llvm-ocaml() { - pkgdesc="OCaml bindings for LLVM" - depends=("llvm=$pkgver-$pkgrel" 'ocaml') - - cd "$srcdir/llvm-$pkgver" - - install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} - cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" - cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm" - - # Remove execute bit from static libraries - chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE" -} - -package_clang() { - pkgdesc="C language family frontend for LLVM" - url="http://clang.llvm.org/" - # It looks like clang still needs GCC to assemble and link object files - # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html - depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver") - - # Fix installation path for clang docs - sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver/Makefile.config" - - cd "$srcdir/llvm-$pkgver/tools/clang" - make DESTDIR="$pkgdir" install - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Revert the path change in case we want to do a repackage later - sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ - "$srcdir/llvm-$pkgver/Makefile.config" - - # Install old libstdc++ headers. Contains combined headers from - # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64 - install -d "$pkgdir/usr/include/c++" - cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" -} - -package_clang-analyzer() { - pkgdesc="A source code analysis framework" - url="http://clang-analyzer.llvm.org/" - depends=("clang=$pkgver-$pkgrel" 'python2') - - cd "$srcdir/llvm-$pkgver/tools/clang" - - install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} - for _tool in scan-{build,view}; do - cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" - ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" - done - - # Use Python 2 - sed -i 's/env python$/\02/' \ - "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \ - "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer" - - # Compile Python scripts - python2 -m compileall "$pkgdir/usr/lib/clang-analyzer" - python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/llvm/bug-9869-operator-h-c++0x.patch b/testing/llvm/bug-9869-operator-h-c++0x.patch deleted file mode 100644 index b95d7d772..000000000 --- a/testing/llvm/bug-9869-operator-h-c++0x.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- llvm/trunk/include/llvm/Operator.h 2011/02/07 16:40:21 125006 -+++ llvm/trunk/include/llvm/Operator.h 2011/05/08 01:59:22 131062 -@@ -186,28 +186,46 @@ - }; - - class AddOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> { -+ ~AddOperator(); // DO NOT IMPLEMENT -+}; - class SubOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> { -+ ~SubOperator(); // DO NOT IMPLEMENT -+}; - class MulOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> { -+ ~MulOperator(); // DO NOT IMPLEMENT -+}; - class ShlOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> { -+ ~ShlOperator(); // DO NOT IMPLEMENT -+}; - - - class SDivOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> { -+ ~SDivOperator(); // DO NOT IMPLEMENT -+}; - class UDivOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> { -+ ~UDivOperator(); // DO NOT IMPLEMENT -+}; - class AShrOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> { -+ ~AShrOperator(); // DO NOT IMPLEMENT -+}; - class LShrOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> { -+ ~LShrOperator(); // DO NOT IMPLEMENT -+}; - - - - class GEPOperator - : public ConcreteOperator<Operator, Instruction::GetElementPtr> { -+ ~GEPOperator(); // DO NOT IMPLEMENT -+ - enum { - IsInBounds = (1 << 0) - }; diff --git a/testing/llvm/cindexer-clang-path.patch b/testing/llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/testing/llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/testing/llvm/clang-plugin-loader-registry.patch b/testing/llvm/clang-plugin-loader-registry.patch deleted file mode 100644 index f46eb9fce..000000000 --- a/testing/llvm/clang-plugin-loader-registry.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map ---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 -+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 -@@ -2,6 +2,7 @@ - global: main; - __progname; - environ; -+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; - - local: *; - }; diff --git a/testing/llvm/clang-pure64.patch b/testing/llvm/clang-pure64.patch deleted file mode 100644 index da6178519..000000000 --- a/testing/llvm/clang-pure64.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3306,7 +3306,7 @@ - else if (ToolChain.getArch() == llvm::Triple::arm) - CmdArgs.push_back("/lib/ld-linux.so.3"); - else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1317,18 +1317,10 @@ - if (Arch == llvm::Triple::x86) - Suffix64 = "/64"; - -- std::string Lib32 = "lib"; -- -- bool Exists; -- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) -- Lib32 = "lib32"; -- -+ std::string Lib32 = "lib32"; - std::string Lib64 = "lib"; -- bool Symlink; -- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && -- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) -- Lib64 = "lib64"; - -+ bool Exists; - std::string GccTriple = ""; - if (Arch == llvm::Triple::arm) { - if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && diff --git a/testing/llvm/clang-toolchains-gcc-versions.patch b/testing/llvm/clang-toolchains-gcc-versions.patch deleted file mode 100644 index 7e0083791..000000000 --- a/testing/llvm/clang-toolchains-gcc-versions.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp ---- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200 -+++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300 -@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const - GccTriple = "i586-suse-linux"; - } - -- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", -+ const char* GccVersions[] = {"4.6.1", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", - "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", - "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", - "4.2"}; diff --git a/testing/llvm/enable-lto.patch b/testing/llvm/enable-lto.patch deleted file mode 100644 index 40d93104a..000000000 --- a/testing/llvm/enable-lto.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,11 +1398,11 @@ - Lib = Lib64; - } - -- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); -+ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); - if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) - Linker = LinkerPath.str(); - else -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - LinuxDistro Distro = DetectLinuxDistro(Arch); - -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3412,11 +3412,11 @@ - } - } - -- if (Args.hasArg(options::OPT_use_gold_plugin)) { -+ // if (Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); -- } -+ // } - - C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); - } diff --git a/testing/mod_perl/PKGBUILD b/testing/mod_perl/PKGBUILD deleted file mode 100644 index 4c76eb05b..000000000 --- a/testing/mod_perl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 126963 2011-06-08 23:54:03Z foutrelis $ -# Maintainer: Firmicus <francois.archlinux.org> -# Contributor: Tom K <tomk@runbox.com> - -pkgname=mod_perl -pkgver=2.0.5 -pkgrel=4 -pkgdesc="Apache module that embeds the Perl interpreter within the server" -url="http://search.cpan.org/dist/${pkgname}/" -depends=('perl' '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/testing/module-init-tools/PKGBUILD b/testing/module-init-tools/PKGBUILD deleted file mode 100644 index e65f419df..000000000 --- a/testing/module-init-tools/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 128937 2011-06-25 14:35:00Z dreisner $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=module-init-tools -pkgver=3.16 -pkgrel=1 -pkgdesc="utilities needed by Linux systems for managing loadable kernel modules" -arch=('i686' 'x86_64') -url="http://kerneltools.org" -license=('GPL') -depends=('glibc') -makedepends=('docbook2x') -backup=('etc/modprobe.d/modprobe.conf') -source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 - modprobe.conf - docfix.patch) -md5sums=('bc44832c6e41707b8447e2847d2019f5' - '316f1bda4c21af02b30252eb014a0a55' - '4320d19902ded43bed55c804b065cdc7') - -build() { - cd $srcdir/$pkgname-$pkgver - - # fix headers in SGML manpage sources and an XML typo - patch -Np0 < "$srcdir/docfix.patch" - - ./configure --prefix=/usr --exec-prefix=/ --enable-zlib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - - # Install our custom (read: empty) modprobe.conf - install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf -} diff --git a/testing/module-init-tools/docfix.patch b/testing/module-init-tools/docfix.patch deleted file mode 100644 index 0151ca3f1..000000000 --- a/testing/module-init-tools/docfix.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- doc/depmod.conf.sgml.orig 2011-06-25 10:07:15.897805024 -0400 -+++ doc/depmod.conf.sgml 2011-06-25 10:07:48.810805020 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/depmod.sgml.orig 2011-06-25 10:07:15.898805024 -0400 -+++ doc/depmod.sgml 2011-06-25 10:07:56.636805021 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> -@@ -52,7 +52,7 @@ - <arg><option>-n</option></arg> - <arg><option>-v</option></arg> - <arg><option>-P <replaceable>prefix</replaceable></option></arg> -- <arg><option>-w</option><arg> -+ <arg><option>-w</option></arg> - <arg><option><replaceable>version</replaceable></option></arg> - <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg> - </cmdsynopsis> ---- doc/insmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400 -+++ doc/insmod.sgml 2011-06-25 10:07:59.228805019 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/lsmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400 -+++ doc/lsmod.sgml 2011-06-25 10:08:04.804805020 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/modinfo.sgml.orig 2011-06-25 10:07:15.900805024 -0400 -+++ doc/modinfo.sgml 2011-06-25 10:08:07.630805019 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/modprobe.conf.sgml.orig 2011-06-25 10:07:15.901805024 -0400 -+++ doc/modprobe.conf.sgml 2011-06-25 10:08:10.173805018 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/modprobe.sgml.orig 2011-06-25 10:07:15.902805024 -0400 -+++ doc/modprobe.sgml 2011-06-25 10:08:13.623805019 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/modules.dep.sgml.orig 2011-06-25 10:07:15.903805024 -0400 -+++ doc/modules.dep.sgml 2011-06-25 10:08:19.323805019 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> ---- doc/rmmod.sgml.orig 2011-06-25 10:07:15.904805024 -0400 -+++ doc/rmmod.sgml 2011-06-25 10:08:27.691805017 -0400 -@@ -1,4 +1,5 @@ --<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" -+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ - <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> - <!ENTITY docbook "<productname>DocBook</productname>"> - <!ENTITY sgml "<abbrev>SGML</abbrev>"> diff --git a/testing/module-init-tools/modprobe.conf b/testing/module-init-tools/modprobe.conf deleted file mode 100644 index 83865a3af..000000000 --- a/testing/module-init-tools/modprobe.conf +++ /dev/null @@ -1,3 +0,0 @@ -# -# /etc/modprobe.d/modprobe.conf (for v2.6 kernels) -# diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD deleted file mode 100644 index 3f593116a..000000000 --- a/testing/mpfr/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 128942 2011-06-25 14:51:58Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=mpfr -_pkgver=3.0.1 -_patchlevel=p4 -pkgver=${_pkgver}.${_patchlevel} -pkgrel=1 -pkgdesc="Multiple-precision floating-point library" -arch=('i686' 'x86_64') -url="http://www.mpfr.org/" -license=('LGPL') -depends=('gmp>=5.0') -options=('!libtool') -install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz - mpfr-${_pkgver}.${_patchlevel}.patch) -md5sums=('645882d9d179113a70af84d27086ed9f' - '52c2ac5ffbbbf0c68f08e89f016ba7aa') - -build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch - ./configure --prefix=/usr --enable-thread-safe --enable-shared - make -} - -check() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mpfr/mpfr-3.0.1.p4.patch b/testing/mpfr/mpfr-3.0.1.p4.patch deleted file mode 100644 index 9604635a2..000000000 --- a/testing/mpfr/mpfr-3.0.1.p4.patch +++ /dev/null @@ -1,367 +0,0 @@ -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-04-12 10:50:02.000000000 +0000 -@@ -0,0 +1 @@ -+asin_exprange -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-04-12 10:50:02.000000000 +0000 -@@ -1 +1 @@ --3.0.1 -+3.0.1-p1 -diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c ---- mpfr-3.0.1-a/asin.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/asin.c 2011-04-12 10:50:02.000000000 +0000 -@@ -63,11 +63,14 @@ - - compared = mpfr_cmp_ui (xp, 1); - -+ MPFR_SAVE_EXPO_MARK (expo); -+ - if (MPFR_UNLIKELY (compared >= 0)) - { - mpfr_clear (xp); - if (compared > 0) /* asin(x) = NaN for |x| > 1 */ - { -+ MPFR_SAVE_EXPO_FREE (expo); - MPFR_SET_NAN (asin); - MPFR_RET_NAN; - } -@@ -80,13 +83,11 @@ - inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode)); - MPFR_CHANGE_SIGN (asin); - } -- mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */ -- return inexact; -+ mpfr_div_2ui (asin, asin, 1, rnd_mode); - } - } -- -- MPFR_SAVE_EXPO_MARK (expo); -- -+ else -+ { - /* Compute exponent of 1 - ABS(x) */ - mpfr_ui_sub (xp, 1, xp, MPFR_RNDD); - MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0); -@@ -115,6 +116,7 @@ - inexact = mpfr_set (asin, xp, rnd_mode); - - mpfr_clear (xp); -+ } - - MPFR_SAVE_EXPO_FREE (expo); - return mpfr_check_range (asin, inexact, rnd_mode); -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-04-12 10:50:02.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1" -+#define MPFR_VERSION_STRING "3.0.1-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c ---- mpfr-3.0.1-a/tests/tasin.c 2011-04-04 10:19:17.000000000 +0000 -+++ mpfr-3.0.1-b/tests/tasin.c 2011-04-12 10:50:02.000000000 +0000 -@@ -219,6 +219,49 @@ - mpfr_clear (y); - } - -+static void -+reduced_expo_range (void) -+{ -+ mpfr_exp_t emin, emax; -+ mpfr_t x, y, ex_y; -+ int inex, ex_inex; -+ unsigned int flags, ex_flags; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ -+ mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0); -+ mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN); -+ -+ mpfr_set_emin (1); -+ mpfr_set_emax (1); -+ mpfr_clear_flags (); -+ inex = mpfr_asin (y, x, MPFR_RNDA); -+ flags = __gmpfr_flags; -+ mpfr_set_emin (emin); -+ mpfr_set_emax (emax); -+ -+ mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN); -+ ex_inex = -1; -+ ex_flags = MPFR_FLAGS_INEXACT; -+ -+ if (SIGN (inex) != ex_inex || flags != ex_flags || -+ ! mpfr_equal_p (y, ex_y)) -+ { -+ printf ("Error in reduced_expo_range\non x = "); -+ mpfr_dump (x); -+ printf ("Expected y = "); -+ mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", ex_inex, ex_flags); -+ printf ("Got y = "); -+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", SIGN (inex), flags); -+ exit (1); -+ } -+ -+ mpfr_clears (x, y, ex_y, (mpfr_ptr) 0); -+} -+ - int - main (void) - { -@@ -226,6 +269,7 @@ - - special (); - special_overflow (); -+ reduced_expo_range (); - - test_generic (2, 100, 15); - -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-04-12 10:50:02.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1"; -+ return "3.0.1-p1"; - } -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-05-04 11:18:33.000000000 +0000 -@@ -0,0 +1 @@ -+rec_sqrt-carry -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-05-04 11:18:33.000000000 +0000 -@@ -1 +1 @@ --3.0.1-p1 -+3.0.1-p2 -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-05-04 11:18:33.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1-p1" -+#define MPFR_VERSION_STRING "3.0.1-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c ---- mpfr-3.0.1-a/rec_sqrt.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/rec_sqrt.c 2011-05-04 11:18:33.000000000 +0000 -@@ -375,20 +375,37 @@ - MPFR_ASSERTD(un == ln + 1 || un == ln + 2); - /* the high un-ln limbs of u will overlap the low part of {x+ln,xn}, - we need to add or subtract the overlapping part {u + ln, un - ln} */ -+ /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1 -+ below (with size = th) mustn't be used. In such a case, the limb -+ (carry) will be 0, so that this is semantically a no-op, but if -+ mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a -+ non-atomic read/write in a place that is not always allocated, -+ with the possible consequences: a crash if the corresponding -+ address is not mapped, or (rather unlikely) memory corruption -+ if another process/thread writes at the same place; things may -+ be worse with future GMP versions. Hence the tests carry != 0. */ - if (neg == 0) - { - if (ln > 0) - MPN_COPY (x, u, ln); - cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln); - /* add cu at x+un */ -- cy += mpn_add_1 (x + un, x + un, th, cu); -+ if (cu != 0) -+ { -+ MPFR_ASSERTD (th != 0); -+ cy += mpn_add_1 (x + un, x + un, th, cu); -+ } - } - else /* negative case */ - { - /* subtract {u+ln, un-ln} from {x+ln,un} */ - cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln); - /* carry cy is at x+un, like cu */ -- cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */ -+ if (cy + cu != 0) -+ { -+ MPFR_ASSERTD (th != 0); -+ cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */ -+ } - /* cy cannot be zero, since the most significant bit of Xh is 1, - and the correction is bounded by 2^{-h+3} */ - MPFR_ASSERTD(cy == 0); -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-05-04 11:18:33.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1-p1"; -+ return "3.0.1-p2"; - } -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-05-05 00:00:35.000000000 +0000 -@@ -0,0 +1 @@ -+atan-expo-range -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-05-05 00:00:35.000000000 +0000 -@@ -1 +1 @@ --3.0.1-p2 -+3.0.1-p3 -diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c ---- mpfr-3.0.1-a/atan.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/atan.c 2011-05-05 00:00:35.000000000 +0000 -@@ -431,5 +431,5 @@ - MPFR_GROUP_CLEAR (group); - - MPFR_SAVE_EXPO_FREE (expo); -- return mpfr_check_range (arctgt, inexact, rnd_mode); -+ return mpfr_check_range (atan, inexact, rnd_mode); - } -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-05-05 00:00:35.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1-p2" -+#define MPFR_VERSION_STRING "3.0.1-p3" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c ---- mpfr-3.0.1-a/tests/tatan.c 2011-04-04 10:19:17.000000000 +0000 -+++ mpfr-3.0.1-b/tests/tatan.c 2011-05-05 00:00:35.000000000 +0000 -@@ -535,6 +535,52 @@ - mpfr_clears (a, x, y, (mpfr_ptr) 0); - } - -+/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html -+ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure). -+ */ -+static void -+reduced_expo_range (void) -+{ -+ mpfr_exp_t emin, emax; -+ mpfr_t x, y, ex_y; -+ int inex, ex_inex; -+ unsigned int flags, ex_flags; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ -+ mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0); -+ mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN); -+ -+ mpfr_set_emin (-5); -+ mpfr_set_emax (-5); -+ mpfr_clear_flags (); -+ inex = mpfr_atan (y, x, MPFR_RNDN); -+ flags = __gmpfr_flags; -+ mpfr_set_emin (emin); -+ mpfr_set_emax (emax); -+ -+ mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN); -+ ex_inex = 1; -+ ex_flags = MPFR_FLAGS_INEXACT; -+ -+ if (SIGN (inex) != ex_inex || flags != ex_flags || -+ ! mpfr_equal_p (y, ex_y)) -+ { -+ printf ("Error in reduced_expo_range\non x = "); -+ mpfr_dump (x); -+ printf ("Expected y = "); -+ mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", ex_inex, ex_flags); -+ printf ("Got y = "); -+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", SIGN (inex), flags); -+ exit (1); -+ } -+ -+ mpfr_clears (x, y, ex_y, (mpfr_ptr) 0); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -546,6 +592,7 @@ - smallvals_atan2 (); - atan2_bug_20071003 (); - atan2_different_prec (); -+ reduced_expo_range (); - - test_generic_atan (2, 200, 17); - test_generic_atan2 (2, 200, 17); -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-05-05 00:00:35.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1-p2"; -+ return "3.0.1-p3"; - } -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-05-09 14:48:24.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-05-09 14:48:24.000000000 +0000 -@@ -0,0 +1 @@ -+texp-zero -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-05-09 14:48:24.000000000 +0000 -@@ -1 +1 @@ --3.0.1-p3 -+3.0.1-p4 -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-05-09 14:48:24.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1-p3" -+#define MPFR_VERSION_STRING "3.0.1-p4" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c ---- mpfr-3.0.1-a/tests/texp.c 2011-04-04 10:19:17.000000000 +0000 -+++ mpfr-3.0.1-b/tests/texp.c 2011-05-09 14:48:24.000000000 +0000 -@@ -170,7 +170,9 @@ - mpfr_set_prec (x, prec); - mpfr_set_prec (y, prec); - mpfr_set_prec (z, prec); -- mpfr_urandomb (x, RANDS); -+ do -+ mpfr_urandomb (x, RANDS); -+ while (MPFR_IS_ZERO (x)); /* 0 is handled by mpfr_exp only */ - rnd = RND_RAND (); - mpfr_exp_2 (y, x, rnd); - mpfr_exp_3 (z, x, rnd); -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-05-09 14:48:24.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1-p3"; -+ return "3.0.1-p4"; - } diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install deleted file mode 100644 index d6dd0475b..000000000 --- a/testing/mpfr/mpfr.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(mpfr.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - 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() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD deleted file mode 100644 index 42faa88a3..000000000 --- a/testing/net-snmp/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $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/testing/net-snmp/libnl-2.patch b/testing/net-snmp/libnl-2.patch deleted file mode 100644 index 7c140fe83..000000000 --- a/testing/net-snmp/libnl-2.patch +++ /dev/null @@ -1,67 +0,0 @@ -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/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc deleted file mode 100644 index 9f1b83f64..000000000 --- a/testing/net-snmp/snmpd.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/snmpd` -case "$1" in - start) - stat_busy "Starting Net-SNMP" - [ -z "$PID" ] && /usr/sbin/snmpd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/snmpd.pid - add_daemon snmpd - stat_done - fi - ;; - stop) - stat_busy "Stopping Net-SNMP" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/snmpd.pid - rm_daemon snmpd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/pango-perl/PKGBUILD b/testing/pango-perl/PKGBUILD deleted file mode 100644 index ad489dec4..000000000 --- a/testing/pango-perl/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 124899 2011-05-25 01:24:25Z foutrelis $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=pango-perl -_realname=Pango -pkgver=1.221 -pkgrel=4 -pkgdesc="Perl bindings for Pango" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('pango' 'glib-perl' 'cairo-perl') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) -md5sums=('8d257209aa11bd6c3a2beb235c2f103f') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make install DESTDIR="${pkgdir}" -} diff --git a/testing/perl-alien-sdl/PKGBUILD b/testing/perl-alien-sdl/PKGBUILD deleted file mode 100644 index 25bd18eeb..000000000 --- a/testing/perl-alien-sdl/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124820 2011-05-24 15:44:07Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -# This package must not by "any" arch. -# Requires rebuild with every change to sdl-config - -pkgname=perl-alien-sdl -_realname=Alien-SDL -pkgver=1.426 -pkgrel=1 -pkgdesc="Building, finding and using SDL binaries" -arch=(i686 x86_64) -license=(PerlArtistic GPL) -url="http://search.cpan.org/dist/Alien-SDL/" -depends=(sdl=1.2.14 perl-file-sharedir perl-capture-tiny) -makedepends=(perl-file-which perl-text-patch) -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz) -md5sums=('ab5e1167934418f4a7b3285a9d05c89b') - -package() { - cd "$srcdir/$_realname-$pkgver" - - # install module in vendor directories - perl Build.PL installdirs=vendor destdir="$pkgdir" --with-sdl-config - - perl Build - perl Build install -} diff --git a/testing/perl-bit-vector/PKGBUILD b/testing/perl-bit-vector/PKGBUILD deleted file mode 100644 index ebdc0719d..000000000 --- a/testing/perl-bit-vector/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $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/testing/perl-compress-bzip2/PKGBUILD b/testing/perl-compress-bzip2/PKGBUILD deleted file mode 100644 index fc142e677..000000000 --- a/testing/perl-compress-bzip2/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 127799 2011-06-18 15:54:27Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -pkgname=perl-compress-bzip2 -_realname=Compress-Bzip2 -pkgver=2.09 -pkgrel=3 -pkgdesc="Interface to Bzip2 compression library" -arch=(i686 x86_64) -license=(GPL2) -depends=(perl bzip2) -url="http://search.cpan.org/dist/$_realname" -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") -md5sums=('1699fde3e86f2a036f135ae606d456bf') - -build() { - cd "$srcdir/$_realname-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "$srcdir/$_realname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/perl-crypt-ssleay/PKGBUILD b/testing/perl-crypt-ssleay/PKGBUILD deleted file mode 100644 index 37f315f89..000000000 --- a/testing/perl-crypt-ssleay/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $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/testing/perl-dbd-mysql/PKGBUILD b/testing/perl-dbd-mysql/PKGBUILD deleted file mode 100644 index 42d22d211..000000000 --- a/testing/perl-dbd-mysql/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $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/testing/perl-dbd-sqlite/PKGBUILD b/testing/perl-dbd-sqlite/PKGBUILD deleted file mode 100644 index 298cc2008..000000000 --- a/testing/perl-dbd-sqlite/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $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/testing/perl-dbi/PKGBUILD b/testing/perl-dbi/PKGBUILD deleted file mode 100644 index 42f7a5770..000000000 --- a/testing/perl-dbi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $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/testing/perl-digest-nilsimsa/PKGBUILD b/testing/perl-digest-nilsimsa/PKGBUILD deleted file mode 100644 index 40e9ae353..000000000 --- a/testing/perl-digest-nilsimsa/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $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/testing/perl-digest-sha1/PKGBUILD b/testing/perl-digest-sha1/PKGBUILD deleted file mode 100644 index eaae5e528..000000000 --- a/testing/perl-digest-sha1/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $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/testing/perl-event/PKGBUILD b/testing/perl-event/PKGBUILD deleted file mode 100644 index 3e20ec4c2..000000000 --- a/testing/perl-event/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $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/testing/perl-fcgi/PKGBUILD b/testing/perl-fcgi/PKGBUILD deleted file mode 100644 index d44eddf2a..000000000 --- a/testing/perl-fcgi/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $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/testing/perl-html-parser/PKGBUILD b/testing/perl-html-parser/PKGBUILD deleted file mode 100644 index 7e3b0a701..000000000 --- a/testing/perl-html-parser/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $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/testing/perl-libintl-perl/PKGBUILD b/testing/perl-libintl-perl/PKGBUILD deleted file mode 100644 index af266d871..000000000 --- a/testing/perl-libintl-perl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $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/testing/perl-locale-gettext/PKGBUILD b/testing/perl-locale-gettext/PKGBUILD deleted file mode 100644 index 6f916e28e..000000000 --- a/testing/perl-locale-gettext/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $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/testing/perl-locale-gettext/compatibility-with-POSIX-module.patch b/testing/perl-locale-gettext/compatibility-with-POSIX-module.patch deleted file mode 100644 index ad675516b..000000000 --- a/testing/perl-locale-gettext/compatibility-with-POSIX-module.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/testing/perl-net-dns/PKGBUILD b/testing/perl-net-dns/PKGBUILD deleted file mode 100644 index 1a4f7c0cc..000000000 --- a/testing/perl-net-dns/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $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/testing/perl-net-ssleay/PKGBUILD b/testing/perl-net-ssleay/PKGBUILD deleted file mode 100644 index 6620fbd6f..000000000 --- a/testing/perl-net-ssleay/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $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/testing/perl-net-upnp/PKGBUILD b/testing/perl-net-upnp/PKGBUILD deleted file mode 100644 index e54c70917..000000000 --- a/testing/perl-net-upnp/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $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/testing/perl-netaddr-ip/PKGBUILD b/testing/perl-netaddr-ip/PKGBUILD deleted file mode 100644 index fa6549515..000000000 --- a/testing/perl-netaddr-ip/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $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/testing/perl-sdl/PKGBUILD b/testing/perl-sdl/PKGBUILD deleted file mode 100644 index 29483fdc1..000000000 --- a/testing/perl-sdl/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 127524 2011-06-15 21:01:17Z remy $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=perl-sdl -pkgver=2.531 -pkgrel=3 -pkgdesc="Simple DirectMedia Layer for Perl" -arch=(i686 x86_64) -license=(LGPL) -url="http://sdl.perl.org" -depends=(perl-alien-sdl perl-tie-simple - sdl_{net,ttf,image,mixer,gfx,pango} mesa smpeg) -#makedepends=(perl-yaml) -options=('!emptydirs') -replaces=(sdl_perl) -conflicts=(sdl_perl) -provides=("sdl_perl=$pkgver") -source=(http://search.cpan.org/CPAN/authors/id/G/GA/GARU/SDL-$pkgver.tar.gz) -md5sums=('ed39c87ae685d3a933705a2ea82a9e18') - -build() { - cd "$srcdir/SDL-$pkgver" - # Perl selects the proper CFLAGS set for binary modules - unset CFLAGS - # install module in vendor directories - perl Build.PL installdirs=vendor - perl Build -} - -check() { - cd "$srcdir/SDL-$pkgver" - perl Build test || true -} - -package() { - cd "$srcdir/SDL-$pkgver" - perl Build install destdir="$pkgdir" -} diff --git a/testing/perl-template-toolkit/PKGBUILD b/testing/perl-template-toolkit/PKGBUILD deleted file mode 100644 index d955edfdd..000000000 --- a/testing/perl-template-toolkit/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# 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/testing/perl-term-readkey/PKGBUILD b/testing/perl-term-readkey/PKGBUILD deleted file mode 100644 index 25f9e397d..000000000 --- a/testing/perl-term-readkey/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $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/testing/perl-text-iconv/PKGBUILD b/testing/perl-text-iconv/PKGBUILD deleted file mode 100644 index acd6932e2..000000000 --- a/testing/perl-text-iconv/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $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/testing/perl-time-hires/PKGBUILD b/testing/perl-time-hires/PKGBUILD deleted file mode 100644 index db9ddcb7f..000000000 --- a/testing/perl-time-hires/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $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/testing/perl-tk/PKGBUILD b/testing/perl-tk/PKGBUILD deleted file mode 100644 index 2a80a320e..000000000 --- a/testing/perl-tk/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 124660 2011-05-23 20:07:22Z remy $ -# Maintainer: François Charette <francois ατ archlinux δοτ org> -# Contributor: Jason Chu <jchu@xentac.net> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=perl-tk -_cpanname=Tk -pkgver=804.029 -pkgrel=3 -pkgdesc="A graphical user interface toolkit for Perl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_cpanname}" -license=('PerlArtistic' 'GPL' 'custom') -depends=('libx11' 'libpng' 'libjpeg' 'tk' 'perl') -options=('!emptydirs') -replaces=('perltk') -provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('f4aebe6fcdb309a8480514f2ccf8117c') - -build() { - cd $srcdir/${_cpanname}-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - /bin/chmod -R u+w * - # The Xlib header is wrong... - sed -i 's/XKeycodeToKeysym\(.*\)unsigned int/XKeycodeToKeysym\1KeyCode/' pTk/Xlib.h - make -} - -#check() { -# cd $srcdir/${_cpanname}-$pkgver -# make test -#} - -package() { - cd $srcdir/${_cpanname}-$pkgver - make install DESTDIR=$pkgdir - - # license - install -D -m644 pTk/license.terms \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/tk.license - install -D -m644 pTk/Tix.license \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/tix.license -} diff --git a/testing/perl-unicode-string/PKGBUILD b/testing/perl-unicode-string/PKGBUILD deleted file mode 100644 index c8bcd6c7a..000000000 --- a/testing/perl-unicode-string/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $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/testing/perl-xml-parser/PKGBUILD b/testing/perl-xml-parser/PKGBUILD deleted file mode 100644 index 021aa1b05..000000000 --- a/testing/perl-xml-parser/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 129383 2011-06-27 06:10:42Z andrea $ -# Maintainer: -# Contributor: firmicus <francois@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: herb <hrose@archlinux.org> - -pkgname=perl-xml-parser -_realname=XML-Parser -pkgver=2.41 -pkgrel=1 -pkgdesc="Expat-based XML parser module for perl" -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl' 'expat') -replaces=('perlxml') -provides=("perlxml=${pkgver}") -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/${_realname}-${pkgver}.tar.gz") -md5sums=('c320d2ffa459e6cdc6f9f59c1185855e') - -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/testing/perl-yaml-syck/PKGBUILD b/testing/perl-yaml-syck/PKGBUILD deleted file mode 100644 index c2ab5a4f8..000000000 --- a/testing/perl-yaml-syck/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $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/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch deleted file mode 100644 index 1404460df..000000000 --- a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch +++ /dev/null @@ -1,83 +0,0 @@ -From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Thu, 28 Apr 2011 09:18:54 +0300 -Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in - EU::CBuilder - -Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), -CFLAGS and LDFLAGS from the environment have overridden the Config.pm -ccflags and ldflags settings. This can cause binary incompatibilities -between the core Perl and extensions built with EU::CBuilder. - -Append to the Config.pm values rather than overriding them. ---- - .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- - dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- - 2 files changed, 28 insertions(+), 3 deletions(-) - -diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -index b572312..2255c51 100644 ---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm -@@ -40,11 +40,13 @@ sub new { - $self->{config}{$k} = $v unless exists $self->{config}{$k}; - } - $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; -- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; -+ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) -+ if defined $ENV{CFLAGS}; - $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; - $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; - $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; -- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; -+ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) -+ if defined $ENV{LDFLAGS}; - - unless ( exists $self->{config}{cxx} ) { - my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); -diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t -index c3bf6b5..1bb15aa 100644 ---- a/dist/ExtUtils-CBuilder/t/04-base.t -+++ b/dist/ExtUtils-CBuilder/t/04-base.t -@@ -1,7 +1,7 @@ - #! perl -w - - use strict; --use Test::More tests => 50; -+use Test::More tests => 64; - use Config; - use Cwd; - use File::Path qw( mkpath ); -@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, - "_prepare_mksymlists_args(): got expected arguments for Mksymlists", - ); - -+my %testvars = ( -+ CFLAGS => 'ccflags', -+ LDFLAGS => 'ldflags', -+); -+ -+while (my ($VAR, $var) = each %testvars) { -+ local $ENV{$VAR}; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "honours $var from Config.pm"); -+ -+ $ENV{$VAR} = "-foo -bar"; -+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); -+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); -+ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); -+ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, -+ "honours $VAR from the environment"); -+ like($base->{config}{$var}, qr/\Q$Config{$var}/, -+ "doesn't override $var from Config.pm with $VAR from the environment"); -+} -+ - ##### - - for ($source_file, $object_file, $lib_file) { --- -1.7.4.4 - diff --git a/testing/perl/ChangeLog b/testing/perl/ChangeLog deleted file mode 100644 index 9add39e20..000000000 --- a/testing/perl/ChangeLog +++ /dev/null @@ -1,66 +0,0 @@ -2011-06-22 Angel Velasquez <angvp@archlinux.org> - * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS - * Fixed #FS22197, FS#22441, FS#24767 - * Rebuilt perl 5.14.1-2 against db 5.2.28 - -2011-06-16 Angel Velasquez <angvp@archlinux.org> - * Fixed #FS24660 - * Rebuilt against db 5.2.28 - -2011-05-16 Angel Velasquez <angvp@archlinux.org> - * perl 5.14.0 - * Removed patch for h2ph warning from 5.12.3 - * Removed provides array, you can use corelist -v 5.14.0 to know the - modules included with the perl core, through Module::CoreList (thx j3nnn1 - for the tip) - -2010-11-07 kevin <kevin@archlinux.org> - - * perl 5.12.2-1 - - Using /usr/bin/*_perl for script directories - -2010-11-06 kevin <kevin@archlinux.org> - - - Removed otherlibdirs directive from Configure - - Removed /usr/*/perl5/site_perl/5.10.1 from INC - - Finally removed legacy dirs /usr/lib/perl5/current and - /usr/lib/perl5/site_perl/current from @INC - -2010-05-23 kevin <kevin@archlinux.org> - - * perl 5.12.1-2 - - Francois updated the provides array. - -2010-05-23 kevin <kevin@archlinux.org> - - * perl 5.12.1-1 - -2010-05-16 kevin <kevin@archlinux.org> - - * perl 5.12.0-2 - -2010-05-12 kevin <kevin@archlinux.org> - - - FS#19411. Removed the for loop in perlbin.sh which didn't work on zsh. - This makes the loop variables unnecessary so the script no longer - pollutes the user's environment. - - FS#19427. Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support - user built modules. - -2010-05-09 kevin <kevin@archlinux.org> - - * perl 5.12.0-1 - - Modified perlbin.sh to only add existing dirs to PATH. Fixes FS#17402, - path points to non-existant directories - -2010-05-07 kevin <kevin@archlinux.org> - - - Added this changelog. - - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC. - This removes the duplicates and versioned directory entries. - - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix - Fix FS#13808, binaries don't follow FHS. - - Stopped using versioned directories in sitelib and sitearch. - - -# vim: set ft=changelog ts=4 sw=4 et: diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD deleted file mode 100644 index 8f6af76c0..000000000 --- a/testing/perl/PKGBUILD +++ /dev/null @@ -1,103 +0,0 @@ -# $Id: PKGBUILD 128400 2011-06-23 21:11:34Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: kevin <kevin.archlinux.org> -# Contributor: judd <jvinet.zeroflux.org> -# Contributor: francois <francois.archlinux.org> -pkgname=perl -pkgver=5.14.1 -pkgrel=1 -pkgdesc="A highly capable, feature-rich programming language" -arch=(i686 x86_64) -license=('GPL' 'PerlArtistic') -url="http://www.perl.org" -groups=('base') -depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') -changelog=ChangeLog -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 -perlbin.sh -perlbin.csh -0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) -install=perl.install -options=('!makeflags' '!purge') -md5sums=('97cd306a2c22929cc141a09568f43bb0' - '5ed2542fdb9a60682f215bd33701e61a' - 'd76445605c49886c77734446247e439d' - 'c25d86206d649046538c3daab7874564') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - if [ "${CARCH}" = "x86_64" ]; then - # for x86_64 - arch_opts="-Dcccdlflags='-fPIC'" - else - # for i686 - arch_opts="" - fi - ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ - -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ - -Dprivlib=/usr/share/perl5/core_perl \ - -Darchlib=/usr/lib/perl5/core_perl \ - -Dsitelib=/usr/share/perl5/site_perl \ - -Dsitearch=/usr/lib/perl5/site_perl \ - -Dvendorlib=/usr/share/perl5/vendor_perl \ - -Dvendorarch=/usr/lib/perl5/vendor_perl \ - -Dscriptdir=/usr/bin/core_perl \ - -Dsitescript=/usr/bin/site_perl \ - -Dvendorscript=/usr/bin/vendor_perl \ - -Dinc_version_list=none \ - -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ - -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" - patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch - make -} -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install - - ### Perl Settings ### - # Change man page extensions for site and vendor module builds. - # Use archlinux email address instead of my own. - sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ - -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \ - -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \ - -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl - - ### CPAN Settings ### - # Set CPAN default config to use the site directories. - sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ - -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ - -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm - - ### CPANPLUS Settings ### - # Set CPANPLUS default config to use the site directories. - sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ - -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ - -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - - # Profile script to set paths to perl scripts. - install -D -m755 ${srcdir}/perlbin.sh \ - ${pkgdir}/etc/profile.d/perlbin.sh - # Profile script to set paths to perl scripts on csh. (FS#22441) - install -D -m755 ${srcdir}/perlbin.csh \ - ${pkgdir}/etc/profile.d/perlbin.csh - - (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) - (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) - grep -Rl "${pkgdir}" ${pkgdir}/usr | \ - xargs sed -i "s^${pkgdir}^^g" - - # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ - # (FS#16488) - rm -f $pkgdir/usr/share/perl5/core_perl/*.pod - for d in $pkgdir/usr/share/perl5/core_perl/*; do - if [ -d $d -a $(basename $d) != "pod" ]; then - find $d -name *.pod -delete - fi - done - find $pkgdir/usr/lib -name *.pod -delete - find $pkgdir -name .packlist -delete - # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) - install -dv ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf -} diff --git a/testing/perl/fix-h2ph-and-tests.patch b/testing/perl/fix-h2ph-and-tests.patch deleted file mode 100644 index a2d176ec6..000000000 --- a/testing/perl/fix-h2ph-and-tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001 -From: Robin Barker <rmbarker@cpan.org> -Date: Thu, 22 Apr 2010 11:51:20 +0100 -Subject: [PATCH 1/1] Fix h2ph and test - ---- - lib/h2ph.t | 12 ++++++++++-- - utils/h2ph.PL | 28 +++++++++++++++++++++++----- - 2 files changed, 33 insertions(+), 7 deletions(-) - -diff --git a/lib/h2ph.t b/lib/h2ph.t -index 27dd7b9..8d62d46 100644 ---- a/lib/h2ph.t -+++ b/lib/h2ph.t -@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) { - exit 0; - } - --plan(4); -+plan(5); - - # quickly compare two text files - sub txt_compare { -@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht', - stderr => 1 ); - like( $result, qr/syntax OK$/, "output compiles"); - -+$result = runperl( progfile => '_h2ph_pre.ph', -+ switches => ['-c'], -+ stderr => 1 ); -+like( $result, qr/syntax OK$/, "preamble compiles"); -+ - $result = runperl( switches => ["-w"], -- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);'); -+ stderr => 1, -+ prog => <<'PROG' ); -+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht); -+PROG - is( $result, '', "output free of warnings" ); - - # cleanup -diff --git a/utils/h2ph.PL b/utils/h2ph.PL -index 8f56db4..1255807 100644 ---- a/utils/h2ph.PL -+++ b/utils/h2ph.PL -@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) { - exit $Exit; - - sub expr { -- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out. -+ if (/\b__asm__\b/) { # freak out -+ $new = '"(assembly code)"'; -+ return -+ } - my $joined_args; - if(keys(%curargs)) { - $joined_args = join('|', keys(%curargs)); -@@ -770,7 +773,7 @@ sub inc_dirs - sub build_preamble_if_necessary - { - # Increment $VERSION every time this function is modified: -- my $VERSION = 2; -+ my $VERSION = 3; - my $preamble = "$Dest_dir/_h2ph_pre.ph"; - - # Can we skip building the preamble file? -@@ -798,7 +801,16 @@ sub build_preamble_if_necessary - # parenthesized value: d=(v) - $define{$_} = $1; - } -- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { -+ if (/^(\w+)\((\w)\)$/) { -+ my($macro, $arg) = ($1, $2); -+ my $def = $define{$_}; -+ $def =~ s/$arg/\$\{$arg\}/g; -+ print PREAMBLE <<DEFINE; -+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } } -+ -+DEFINE -+ } elsif -+ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { - # float: - print PREAMBLE - "unless (defined &$_) { sub $_() { $1 } }\n\n"; -@@ -807,8 +819,14 @@ sub build_preamble_if_necessary - print PREAMBLE - "unless (defined &$_) { sub $_() { $1 } }\n\n"; - } elsif ($define{$_} =~ /^\w+$/) { -- print PREAMBLE -- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n"; -+ my $def = $define{$_}; -+ if ($isatype{$def}) { -+ print PREAMBLE -+ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n"; -+ } else { -+ print PREAMBLE -+ "unless (defined &$_) { sub $_() { &$def } }\n\n"; -+ } - } else { - print PREAMBLE - "unless (defined &$_) { sub $_() { \"", --- -1.6.5.2.74.g610f9.dirty - diff --git a/testing/perl/perl.install b/testing/perl/perl.install deleted file mode 100644 index 3f7d58f23..000000000 --- a/testing/perl/perl.install +++ /dev/null @@ -1,18 +0,0 @@ -# arg 1: the new package version -post_install() { - for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do - [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver - [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver - [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver - done - return 0 -} - -post_upgrade() { - echo '- The directories /usr/lib/perl5/current, /usr/lib/perl5/site_perl/current,' - echo ' /usr/lib/perl5/site_perl/5.10.1, and /usr/share/perl5/site_perl/5.10.1' - echo ' have been removed from @INC.' - - echo '- The script/binary directories are now /usr/bin/*_perl instead of' - echo ' /usr/lib/perl5/*_perl/bin which will be eventually removed.' -} diff --git a/testing/perl/perlbin.csh b/testing/perl/perlbin.csh deleted file mode 100644 index cc0d5d553..000000000 --- a/testing/perl/perlbin.csh +++ /dev/null @@ -1,17 +0,0 @@ -# Set path to perl scriptdirs if they exist -# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts -# Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release - -[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH -${PATH}:/usr/lib/perl5/site_perl/bin - -[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH -${PATH}:/usr/lib/perl5/vendor_perl/bin - -[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl - -# If you have modules in non-standard directories you can add them here. -#export PERLLIB=dir1:dir2 diff --git a/testing/perl/perlbin.sh b/testing/perl/perlbin.sh deleted file mode 100755 index 20f830436..000000000 --- a/testing/perl/perlbin.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Set path to perl scriptdirs if they exist -# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts -# Added /usr/bin/*_perl dirs for scripts -# Remove /usr/lib/perl5/*_perl/bin in next release - -[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin - -[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin - -[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl - -export PATH - -# If you have modules in non-standard directories you can add them here. -#export PERLLIB=dir1:dir2 - diff --git a/testing/pidgin/PKGBUILD b/testing/pidgin/PKGBUILD deleted file mode 100644 index 91e94bb66..000000000 --- a/testing/pidgin/PKGBUILD +++ /dev/null @@ -1,110 +0,0 @@ -# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> - -pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.9.0 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://pidgin.im/" -license=('GPL') -makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10' - 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' - 'networkmanager') -options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-more.patch) -md5sums=('2cd285c7a40f93b7a51bfe733971d3a6' - 'a673659d86c7a65aa710f7c8c7feda82') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Further fixes for NetworkManager 0.9 - # (http://developer.pidgin.im/ticket/13859) - 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} - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-schemas-install \ - --disable-meanwhile \ - --disable-gnutls \ - --enable-cyrus-sasl \ - --disable-doxygen \ - --enable-nm \ - --with-python=/usr/bin/python2 \ - --with-system-ssl-certs=/etc/ssl/certs - make -} - -package_pidgin(){ - pkgdesc="Multi-protocol instant messaging client" - depends=("libpurple=$pkgver-$pkgrel" 'startup-notification' 'gtkspell' - 'libxss' 'libsm' 'gstreamer0.10' 'hicolor-icon-theme') - optdepends=('aspell: for spelling correction' - 'ca-certificates: SSL CA certificates' - 'gstreamer0.10-good-plugins: video and voice support' - 'tk: Tcl/Tk scripting support') - install=pidgin.install - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C pidgin DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop - - rm "$pkgdir/usr/share/man/man1/finch.1" -} - -package_libpurple(){ - pkgdesc="IM library extracted from Pidgin" - depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' - '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 - make -C "$_dir" DESTDIR="$pkgdir" install - done -} - -package_finch(){ - pkgdesc="A ncurses-based messaging client" - depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'tk: Tcl/Tk scripting support') - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C finch DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir"/usr/share/man/man1/pidgin.1 -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/pidgin/nm09-more.patch b/testing/pidgin/nm09-more.patch deleted file mode 100644 index 8c708df9a..000000000 --- a/testing/pidgin/nm09-more.patch +++ /dev/null @@ -1,49 +0,0 @@ -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/testing/pidgin/pidgin.install b/testing/pidgin/pidgin.install deleted file mode 100644 index 1a05f573e..000000000 --- a/testing/pidgin/pidgin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/postgresql/PKGBUILD b/testing/postgresql/PKGBUILD deleted file mode 100644 index d5a887585..000000000 --- a/testing/postgresql/PKGBUILD +++ /dev/null @@ -1,141 +0,0 @@ -# $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/testing/postgresql/build.patch b/testing/postgresql/build.patch deleted file mode 100644 index c8f665d12..000000000 --- a/testing/postgresql/build.patch +++ /dev/null @@ -1,11 +0,0 @@ -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/testing/postgresql/perl-5.14-fix.patch b/testing/postgresql/perl-5.14-fix.patch deleted file mode 100644 index 82ef7d688..000000000 --- a/testing/postgresql/perl-5.14-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 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/testing/postgresql/postgresql b/testing/postgresql/postgresql deleted file mode 100755 index 0fbe94036..000000000 --- a/testing/postgresql/postgresql +++ /dev/null @@ -1,79 +0,0 @@ -#!/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/testing/postgresql/postgresql.confd b/testing/postgresql/postgresql.confd deleted file mode 100644 index 5f8fa034c..000000000 --- a/testing/postgresql/postgresql.confd +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to postgresql -# -PGROOT="/var/lib/postgres" -INITOPTS="--locale $LANG" diff --git a/testing/postgresql/postgresql.install b/testing/postgresql/postgresql.install deleted file mode 100644 index d65bb6a7f..000000000 --- a/testing/postgresql/postgresql.install +++ /dev/null @@ -1,22 +0,0 @@ -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/testing/postgresql/postgresql.logrotate b/testing/postgresql/postgresql.logrotate deleted file mode 100644 index 9c36918be..000000000 --- a/testing/postgresql/postgresql.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/postgresql.log { - copytruncate - missingok -} diff --git a/testing/postgresql/postgresql.pam b/testing/postgresql/postgresql.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/testing/postgresql/postgresql.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD deleted file mode 100644 index 1783c528a..000000000 --- a/testing/psmisc/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 128514 2011-06-24 07:34:22Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=psmisc -pkgver=22.14 -pkgrel=1 -pkgdesc="Miscellaneous procfs tools" -arch=('i686' 'x86_64') -url="http://psmisc.sourceforge.net/index.html" -license=('GPL') -groups=('base') -depends=('glibc' 'ncurses') -source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -md5sums=('ba3f4e971895c92bba7770d81c981503') -sha1sums=('dc6fc0ec131c11796d01512bbd80089719b04a66') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/razor/PKGBUILD b/testing/razor/PKGBUILD deleted file mode 100644 index 87905b577..000000000 --- a/testing/razor/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 124559 2011-05-22 23:44:08Z andrea $ -# Maintainer: -# Contributor: Dale Blount <dale@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=razor -pkgver=2.84 -pkgrel=5 -pkgdesc="A distributed, collaborative, spam detection and filtering network" -arch=('i686' 'x86_64') -url="http://razor.sourceforge.net" -license=('PerlArtistic') -depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl>=5.14.0') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2) -md5sums=('8b9a11a6ce020383c32c45d1530d77c2') -options=(!emptydirs) - -build() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} - - # skip install_razor_agents (we'll do the linking later) - # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile - - perl Makefile.PL INSTALLDIRS=vendor - make - make test -} - -package() { - cd ${srcdir}/${pkgname}-agents-${pkgver} - make DESTDIR=${pkgdir} install - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete - - # cd ${pkgdir}/usr/bin - # for i in razor-check razor-report razor-revoke razor-admin; do - # /bin/ln -sf razor-client $i; - # done -} diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD deleted file mode 100644 index 765b76685..000000000 --- a/testing/readline/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 129370 2011-06-27 05:49:47Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=readline -_basever=6.2 -_patchlevel=001 #prepare for some patches -pkgver=$_basever.$_patchlevel -pkgrel=2 -pkgdesc="GNU readline library" -arch=('i686' 'x86_64') -url="http://tiswww.case.edu/php/chet/readline/rltop.html" -license=('GPL') -depends=('glibc' 'ncurses') -backup=('etc/inputrc') -options=('!emptydirs') -install=readline.install -source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz - inputrc) -if [ $_patchlevel -gt 00 ]; then - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p)) - done -fi -md5sums=('67948acb2ca081f23359d0256e9a271c' - '58d54966c1191db45973cb3191ac621a' - '83287d52a482f790dfb30ec0a8746669') - -build() { - cd ${srcdir}/${pkgname}-$_basever - for p in ../readline${_basever//./}-*; do - [ -e "$p" ] || continue - msg "applying patch ${p}" - patch -Np0 -i ${p} - done - - # Remove RPATH from shared objects (FS#14366) - sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf - - # build with -fPIC for x86_64 (FS#15634) - [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" - - ./configure --prefix=/usr --libdir=/lib - make SHLIB_LIBS=-lncurses -} - -package() { - cd ${srcdir}/${pkgname}-$_basever - make DESTDIR=${pkgdir} install - - install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc - - # FHS recommends only shared libs in /lib - install -dm755 $pkgdir/usr/lib - mv $pkgdir/lib/*.a $pkgdir/usr/lib - - # to make the linker find the shared lib and fix compile issues - cd ${pkgdir}/usr/lib - ln -sv /lib/libreadline.so . - ln -sv /lib/libhistory.so . -} diff --git a/testing/readline/inputrc b/testing/readline/inputrc deleted file mode 100644 index fd13a673b..000000000 --- a/testing/readline/inputrc +++ /dev/null @@ -1,36 +0,0 @@ -# do not bell on tab-completion -#set bell-style none - -set meta-flag on -set input-meta on -set convert-meta off -set output-meta on - -$if mode=emacs - -# for linux console and RH/Debian xterm -"\e[1~": beginning-of-line -"\e[4~": end-of-line -"\e[5~": beginning-of-history -"\e[6~": end-of-history -"\e[7~": beginning-of-line -"\e[3~": delete-char -"\e[2~": quoted-insert -"\e[5C": forward-word -"\e[5D": backward-word -"\e\e[C": forward-word -"\e\e[D": backward-word -"\e[1;5C": forward-word -"\e[1;5D": backward-word - -# for rxvt -"\e[8~": end-of-line - -# for non RH/Debian xterm, can't hurt for RH/DEbian xterm -"\eOH": beginning-of-line -"\eOF": end-of-line - -# for freebsd console -"\e[H": beginning-of-line -"\e[F": end-of-line -$endif diff --git a/testing/readline/readline.install b/testing/readline/readline.install deleted file mode 100644 index 06b646f23..000000000 --- a/testing/readline/readline.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(history.info readline.info rluserman.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -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/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD deleted file mode 100644 index a1644664b..000000000 --- a/testing/rhythmbox/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 127360 2011-06-13 15:53:46Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=rhythmbox -pkgver=2.90.1.git20110610 -pkgrel=2 -pkgdesc="An iTunes-like music player/libary" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.rhythmbox.org" -depends=('libgpod' 'gvfs-afc' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify' - 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins' - 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'dconf') -makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection') -optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' - 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs' - 'brasero: cd burning') -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}.tar.xz) -sha256sums=('20e9bf31f3fbd2b4e4db86ab12aeee8175a8a49a5c3ec2081a8ca3880d01fba0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export CFLAGS="$CFLAGS -g -O1" - export CXXFLAGS="$CXXFLAGS -g -O1" - PYTHON=/usr/bin/python2 ./autogen.sh - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/rhythmbox \ - --localstatedir=/var --disable-static \ - --enable-daap --enable-python \ - --with-mdns=avahi --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install deleted file mode 100644 index cbea0e6b3..000000000 --- a/testing/rhythmbox/rhythmbox.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=rhythmbox - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -f -q -t 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/rrdtool/PKGBUILD b/testing/rrdtool/PKGBUILD deleted file mode 100644 index 8c95ca2d4..000000000 --- a/testing/rrdtool/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 127048 2011-06-10 06:18:26Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=rrdtool -pkgver=1.4.5 -pkgrel=2 -pkgdesc="Data logging and graphing application" -arch=('i686' 'x86_64') -url="http://www.rrdtool.org" -license=('GPL' 'custom') -depends=('libpng' 'libxml2' 'pango' 'tcp_wrappers') -makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') -optdepends=('tcl: to use corresponding binding' \ - 'python2: to use corresponding binding' \ - 'ruby: to use corresponding binding' \ - 'lua: to use corresponding binding') -options=('!libtool' '!emptydirs' '!makeflags') -source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) -md5sums=('4d116dba9a0888d8aaac179e35d3980a') -sha1sums=('56638e8aedd5d5522152e86746e382b75dc48c35') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|-lrrd|-lrrd -L/usr/lib/perl5/core_perl/CORE/ -lperl -Wl,-E -Wl,-rpath,/usr/lib/perl5/core_perl/CORE |' \ - bindings/perl-shared/Makefile.PL - ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ - --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ - --enable-ruby --enable-ruby-site-install --enable-python \ - --enable-lua --enable-lua-site-install --enable-tcl - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/rxvt-unicode/ChangeLog b/testing/rxvt-unicode/ChangeLog deleted file mode 100644 index d4275a700..000000000 --- a/testing/rxvt-unicode/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2011-05-22 Angel Velasquez <angvp@archlinux.org> - * Rebuilt against perl 5.14.0 - -2011-05-17 Angel Velasquez <angvp@archlinux.org> - * Removed not accepted upstream patch (closes FS#23324) diff --git a/testing/rxvt-unicode/PKGBUILD b/testing/rxvt-unicode/PKGBUILD deleted file mode 100644 index a72fa7c11..000000000 --- a/testing/rxvt-unicode/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 124538 2011-05-22 21:23:30Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org - -pkgname=rxvt-unicode -pkgver=9.11 -pkgrel=4 -pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)" -arch=('i686' 'x86_64') -url="http://software.schmorp.de/pkg/rxvt-unicode.html" -license=('GPL') -depends=('gcc-libs' 'libxft' 'gdk-pixbuf2') -optdepends=('perl: lots of utilities' 'gtk2-perl: to use the urxvt-tabbed') -changelog=ChangeLog -source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \ - ${pkgname}.desktop) -md5sums=('1bed5bfeed026e0bfafa0e9e4f62aa37' - '3de6c13126a45bc3bc9f6bba077a1311') -sha1sums=('21d0fad9a6032dbcf2c43a85f288543c6bd5ab3d' - '962aebc88982dbeb62a7c4a051ff567e015f61a0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-terminfo=/usr/share/terminfo \ - --enable-256-color \ - --enable-font-styles \ - --enable-xim \ - --enable-keepscrolling \ - --enable-selectionscrolling \ - --enable-smart-resize \ - --enable-pixbuf \ - --enable-transparency \ - --enable-utmp \ - --enable-wtmp \ - --enable-lastlog \ - --disable-frills - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -d "${pkgdir}/usr/share/terminfo" - export TERMINFO="${pkgdir}/usr/share/terminfo" - make DESTDIR="${pkgdir}" install - # install the tabbing wrapper ( requires gtk2-perl! ) - sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed - install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed" - # install freedesktop menu - install -Dm644 ../${pkgname}.desktop \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" -} diff --git a/testing/rxvt-unicode/rxvt-unicode.desktop b/testing/rxvt-unicode/rxvt-unicode.desktop deleted file mode 100644 index 68d613dbd..000000000 --- a/testing/rxvt-unicode/rxvt-unicode.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=rxvt-unicode -Comment=An Unicode capable rxvt clone -Exec=urxvt -Icon=terminal -Terminal=false -Type=Application -Categories=Application;System;TerminalEmulator; diff --git a/testing/shadow/LICENSE b/testing/shadow/LICENSE deleted file mode 100644 index c5ab15a56..000000000 --- a/testing/shadow/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 1990 - 1994, Julianne Frances Haugh - * Copyright (c) 1996 - 2000, Marek Michałkiewicz - * Copyright (c) 2001 - 2006, Tomasz Kłoczko - * Copyright (c) 2007 - 2009, Nicolas François - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the copyright holders or contributors may not be used to - * endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD deleted file mode 100644 index b3a130166..000000000 --- a/testing/shadow/PKGBUILD +++ /dev/null @@ -1,106 +0,0 @@ -# $Id: PKGBUILD 129320 2011-06-26 16:36:48Z eric $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> - -pkgname=shadow -pkgver=4.1.4.3 -pkgrel=2 -pkgdesc="Password and account management tool suite with support for shadow files and PAM" -arch=('i686' 'x86_64') -url='http://pkg-shadow.alioth.debian.org/' -license=('BSD') -groups=('base') -depends=('bash' 'pam' 'acl') -backup=(etc/login.defs - etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel} - etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} - etc/pam.d/{chfn,chgpasswd,groupmems,chsh} - etc/default/useradd) -options=('!libtool') -install=shadow.install -#http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.bz2 -# shadow 4.1.4.3 is just shadow 4.1.4.2 with shadow_CVE-2011-0721.patch applied -source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz - adduser chgpasswd chpasswd defaults.pam login login.defs newusers - passwd shadow.cron.daily useradd.defaults LICENSE - xstrdup.patch shadow_CVE-2011-0721.patch shadow-strncpy-usage.patch - shadow-add-missing-include.patch) -sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e' - '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' - '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' - 'd66096ed9477bd7242e8d2cc28eaa23170269788' - '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - '0b2d98a0ee3bfde8551ade48d4d35cc20ec702a1' - 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' - 'd66096ed9477bd7242e8d2cc28eaa23170269788' - '6f183bc7709b0a8d20ad17481a4ad025cf6e5056' - '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' - '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' - '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' - '6010fffeed1fc6673ad9875492e1193b1a847b53' - '6bfe6528391eb38d338beacedd620407877b637d' - '9db9e62ad173f31e1039121c0124cf60826ffd7e' - '0697a21f7519de30821da7772677035652df4ad2') - -build() { - cd "$srcdir/$pkgname-4.1.4.2+svn3283" - - #Ugh, force this to build shared libraries, for god's sake - sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am - libtoolize - autoreconf - export LDFLAGS="$LDFLAGS -lcrypt" - - patch -p1 -i "$srcdir/xstrdup.patch" - patch -p1 -i "$srcdir/shadow_CVE-2011-0721.patch" - patch -p1 -i "$srcdir/shadow-strncpy-usage.patch" - patch -p1 -i "$srcdir/shadow-add-missing-include.patch" - - # supress etc/pam.d/*, we provide our own - sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in - - ./configure \ - --prefix=/usr --libdir=/lib \ - --mandir=/usr/share/man --sysconfdir=/etc \ - --enable-shared --disable-static \ - --with-libpam --without-selinux - make -} - -package() { - cd "$srcdir/$pkgname-4.1.4.2+svn3283" - make DESTDIR="$pkgdir" install - - # license - install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE" - - # interactive useradd - install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser" - - # useradd defaults - install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" - - # cron job - install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow" - - # login.defs - install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" - - # PAM config - custom - install -Dm644 "$srcdir/login" "$pkgdir/etc/pam.d/login" - install -Dm644 "$srcdir/passwd" "$pkgdir/etc/pam.d/passwd" - install -Dm644 "$srcdir/chgpasswd" "$pkgdir/etc/pam.d/chgpasswd" - install -Dm644 "$srcdir/chpasswd" "$pkgdir/etc/pam.d/chpasswd" - install -Dm644 "$srcdir/newusers" "$pkgdir/etc/pam.d/newusers" - # PAM config - from tarball - install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" - - # we use the 'useradd' PAM file for other similar utilities - for file in chage chfn chsh groupadd groupdel groupmod shadow \ - useradd usermod userdel; do - install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" - done - - # Remove su - using su from coreutils instead - rm "$pkgdir/bin/su" - find "$pkgdir/usr/share/man" -name 'su.1' -delete -} diff --git a/testing/shadow/adduser b/testing/shadow/adduser deleted file mode 100644 index a5d7fd4fa..000000000 --- a/testing/shadow/adduser +++ /dev/null @@ -1,399 +0,0 @@ -#!/bin/bash -# -# Copyright 1995 Hrvoje Dogan, Croatia. -# Copyright 2002, 2003, 2004 Stuart Winter, West Midlands, England, UK. -# Copyright 2004 Slackware Linux, Inc., Concord, CA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -########################################################################## -# Program: /usr/sbin/adduser -# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux -# Author : Stuart Winter <stuart@polplex.co.uk> -# Based on the original Slackware adduser by Hrvoje Dogan -# with modifications by Patrick Volkerding -# Version: 1.09 -########################################################################## -# Usage..: adduser [<new_user_name>] -########################################################################## -# History # -########### -# v1.09 - 07/06/04 -# * Added standard Slackware script licence to the head of this file. -# v1.08 - 25/04/04 -# * Disallow user names that begin with a numeric because useradd -# (from shadow v4.03) does not allow them. <sw> -# v1.07 - 07/03/03 -# * When supplying a null string for the uid (meaning 'Choose next available'), -# if there were file names in the range 'a-z' in the pwd then the -# egrep command considered these files rather than the null string. -# The egrep expression is now in quotes. -# Reported & fixed by Vadim O. Ustiansky <sw> -# v1.06 - 31/03/03 -# * Ask to chown user.group the home directory if it already exists. -# This helps reduce later confusion when adding users whose home dir -# already exists (mounted partition for example) and is owned -# by a user other than the user to which the directory is being -# assigned as home. Default is not to chown. -# Brought to my attention by mRgOBLIN. <sw> -# v1.05 - 04/01/03 -# * Advise & prevent users from creating logins with '.' characters -# in the user name. <sw> -# * Made pending account creation info look neater <sw> -# v1.04 - 09/06/02 -# * Catered for shadow-4.0.3's 'useradd' binary that no longer -# will let you create a user that has any uppercase chars in it -# This was reported on the userlocal.org forums -# by 'xcp' - thanks. <sw,pjv> -# v1.03 - 20/05/02 -# * Support 'broken' (null lines in) /etc/passwd and -# /etc/group files <sw> -# * For recycling UIDs (default still 'off'), we now look in -# /etc/login.defs for the UID_MIN value and use it -# If not found then default to 1000 <sw> -# v1.02 - 10/04/02 -# * Fix user-specified UID bug. <pjv> -# v1.01 - 23/03/02 -# * Match Slackware indenting style, simplify. <pjv> -# v1.00 - 22/03/02 -# * Created -####################################################################### - -# Path to files -pfile=/etc/passwd -gfile=/etc/group -sfile=/etc/shells - -# Paths to binaries -useradd=/usr/sbin/useradd -chfn=/usr/bin/chfn -passwd=/usr/bin/passwd - -# Defaults -defhome=/home -defshell=/bin/bash -defgroup=users - -# Determine what the minimum UID is (for UID recycling) -# (we ignore it if it's not at the beginning of the line (i.e. commented out with #)) -export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)" -# If we couldn't find it, set it to the default of 1000 -if [ -z "$recycleUIDMIN" ]; then - export recycleUIDMIN=1000 # this is the default from Slackware's /etc/login.defs -fi - - -# This setting enables the 'recycling' of older unused UIDs. -# When you userdel a user, it removes it from passwd and shadow but it will -# never get used again unless you specify it expliticly -- useradd (appears to) just -# look at the last line in passwd and increment the uid. I like the idea of -# recycling uids but you may have very good reasons not to (old forgotten -# confidential files still on the system could then be owned by this new user). -# We'll set this to no because this is what the original adduser shell script -# did and it's what users expect. -recycleuids=no - -# Function to read keyboard input. -# bash1 is broken (even ash will take read -ep!), so we work around -# it (even though bash1 is no longer supported on Slackware). -function get_input() { - local output - if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then - echo -n "${1} " >&2 # fudge for use with bash v1 - read output - else # this should work with any other /bin/sh - read -ep "${1} " output - fi - echo $output -} - -# Function to display the account info -function display () { - local goose - goose="$(echo $2 | cut -d ' ' -f 2-)" # lop off the prefixed argument useradd needs - echo -n "$1 " - # If it's null then display the 'other' information - if [ -z "$goose" -a ! -z "$3" ]; then - echo "$3" - else - echo "$goose" - fi -} - -# Function to check whether groups exist in the /etc/group file -function check_group () { - local got_error group - if [ ! -z "$@" ]; then - for group in $@ ; do - local uid_not_named="" uid_not_num="" - grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes - grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes - if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then - echo "- Group '$group' does not exist" - got_error=yes - fi - done - fi - # Return exit code of 1 if at least one of the groups didn't exist - if [ ! -z "$got_error" ]; then - return 1 - fi -} - -#: Read the login name for the new user :# -# -# Remember that most Mail Transfer Agents are case independant, so having -# 'uSer' and 'user' may cause confusion/things to break. Because of this, -# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase, -# and we must reject them, too. - -# Set the login variable to the command line param -echo -LOGIN="$1" -needinput=yes -while [ ! -z $needinput ]; do - if [ -z "$LOGIN" ]; then - while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done - fi - grep "^${LOGIN}:" $pfile >/dev/null 2>&1 # ensure it's not already used - if [ $? -eq 0 ]; then - echo "- User '$LOGIN' already exists; please choose another" - unset LOGIN - elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then - echo "- User names cannot begin with a number; please choose another" - unset LOGIN - elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase - echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another" - unset LOGIN - elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then - echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another" - unset LOGIN - else - unset needinput - fi -done - -# Display the user name passed from the shell if it hasn't changed -if [ "$1" = "$LOGIN" ]; then - echo "Login name for new user: $LOGIN" -fi - -#: Get the UID for the user & ensure it's not already in use :# -# -# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because -# when you change password for the uid, it finds the first match in /etc/passwd -# which isn't necessarily the correct user -# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")" - grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "- That UID is already in use; please choose another" - elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then - echo "- UIDs are numerics only" - else - unset needinput - fi -done -# If we were given a UID, then syntax up the variable to pass to useradd -if [ ! -z "$_UID" ]; then - U_ID="-u ${_UID}" -else - # Will we be recycling UIDs? - if [ "$recycleuids" = "yes" ]; then - U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)" - fi -fi - -#: Get the initial group for the user & ensure it exists :# -# -# We check /etc/group for both the text version and the group ID number -echo -needinput=yes -while [ ! -z "$needinput" ]; do - GID="$(get_input "Initial group [ ${defgroup} ]:")" - check_group "$GID" - if [ $? -gt 0 ]; then - echo "- Please choose another" - else - unset needinput - fi -done -# Syntax the variable ready for useradd -if [ -z "$GID" ]; then - GID="-g ${defgroup}" -else - GID="-g ${GID}" -fi - -#: Get additional groups for the user :# -# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - AGID="$(get_input "Additional groups (comma separated) []:")" - AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing - if [ ! -z "$AGID" ]; then - check_group "$AGID" # check all groups at once (treated as N # of params) - if [ $? -gt 0 ]; then - echo "- Please re-enter the group(s)" - else - unset needinput # we found all groups specified - AGID="-G $(echo "$AGID" | tr ' ' ,)" - fi - else - unset needinput # we don't *have* to have additional groups - fi -done - -#: Get the new user's home dir :# -# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")" - if [ -z "$HME" ]; then - HME="${defhome}/${LOGIN}" - fi - # Warn the user if the home dir already exists - if [ -d "$HME" ]; then - echo "- Warning: '$HME' already exists !" - getyn="$(get_input " Do you wish to change the home directory path ? (Y/n) ")" - if [ "$(echo $getyn | grep -i "n")" ]; then - unset needinput - # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME - getyn="$(get_input " Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")" - if [ "$(echo $getyn | grep -i "y")" ]; then - CHOWNHOMEDIR=$HME # set this to the home directory - fi - fi - else - unset needinput - fi -done -HME="-d ${HME}" - -#: Get the new user's shell :# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - unset got_error - SHL="$(get_input "Shell [ ${defshell} ]")" - if [ -z "$SHL" ]; then - SHL="${defshell}" - fi - # Warn the user if the shell doesn't exist in /etc/shells or as a file - if [ -z "$(grep "^${SHL}$" $sfile)" ]; then - echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)" - got_error=yes - fi - if [ ! -f "$SHL" ]; then - echo "- Warning: ${SHL} does not exist as a file" - got_error=yes - fi - if [ ! -z "$got_error" ]; then - getyn="$(get_input " Do you wish to change the shell ? (Y/n) ")" - if [ "$(echo $getyn | grep -i "n")" ]; then - unset needinput - fi - else - unset needinput - fi -done -SHL="-s ${SHL}" - -#: Get the expiry date :# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")" - if [ ! -z "$EXP" ]; then - # Check to see whether the expiry date is in the valid format - if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then - echo "- That is not a valid expiration date" - else - unset needinput - EXP="-e ${EXP}" - fi - else - unset needinput - fi -done - -# Display the info about the new impending account -echo -echo "New account will be created as follows:" -echo -echo "---------------------------------------" -display "Login name.......: " "$LOGIN" -display "UID..............: " "$_UID" "[ Next available ]" -display "Initial group....: " "$GID" -display "Additional groups: " "$AGID" "[ None ]" -display "Home directory...: " "$HME" -display "Shell............: " "$SHL" -display "Expiry date......: " "$EXP" "[ Never ]" -echo - -echo "This is it... if you want to bail out, hit Control-C. Otherwise, press" -echo "ENTER to go ahead and make the account." -read junk - -echo -echo "Creating new account..." -echo -echo - -# Add the account to the system -CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN"" -$CMD - -if [ $? -gt 0 ]; then - echo "- Error running useradd command -- account not created!" - echo "(cmd: $CMD)" - exit 1 -fi - -# chown the home dir ? We can only do this once the useradd has -# completed otherwise the user name doesn't exist. -if [ ! -z "${CHOWNHOMEDIR}" ]; then - chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}" -fi - -# Set the finger information -$chfn "$LOGIN" -if [ $? -gt 0 ]; then - echo "- Warning: an error occurred while setting finger information" -fi - -# Set a password -$passwd "$LOGIN" -if [ $? -gt 0 ]; then - echo "* WARNING: An error occured while setting the password for" - echo " this account. Please manually investigate this *" - exit 1 -fi - -echo -echo -echo "Account setup complete." -exit 0 - diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd deleted file mode 100644 index 8f49f5cc8..000000000 --- a/testing/shadow/chgpasswd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -account required pam_permit.so -password include system-auth diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd deleted file mode 100644 index bc14857dc..000000000 --- a/testing/shadow/chpasswd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so md5 shadow diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam deleted file mode 100644 index a7bf8a4a5..000000000 --- a/testing/shadow/defaults.pam +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/testing/shadow/login b/testing/shadow/login deleted file mode 100644 index 51ff96a4a..000000000 --- a/testing/shadow/login +++ /dev/null @@ -1,20 +0,0 @@ -#%PAM-1.0 -auth required pam_securetty.so -auth requisite pam_nologin.so -auth required pam_unix.so nullok -auth required pam_tally.so onerr=succeed file=/var/log/faillog -# use this to lockout accounts for 10 minutes after 3 failed attempts -#auth required pam_tally.so deny=2 unlock_time=600 onerr=succeed file=/var/log/faillog -account required pam_access.so -account required pam_time.so -account required pam_unix.so -#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so md5 shadow use_authtok -session required pam_unix.so -session required pam_env.so -session required pam_motd.so -session required pam_limits.so -session optional pam_mail.so dir=/var/spool/mail standard -session optional pam_lastlog.so -session optional pam_loginuid.so --session optional pam_ck_connector.so nox11 diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs deleted file mode 100644 index 2500ee447..000000000 --- a/testing/shadow/login.defs +++ /dev/null @@ -1,197 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. -# If unspecified, some arbitrary (and possibly incorrect) value will -# be assumed. All other items are optional - if not specified then -# the described action or option will be inhibited. -# -# Comment lines (lines beginning with "#") and blank lines are ignored. -# -# Modified for Linux. --marekm - -# -# Delay in seconds before being allowed another attempt after a login failure -# -FAIL_DELAY 3 - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# QMAIL_DIR is for Qmail -# -#QMAIL_DIR Maildir -MAIL_DIR /var/spool/mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# *REQUIRED* The default PATH settings, for superuser and normal users. -# -# (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# UMASK Default "umask" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -UMASK 077 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 -# System accounts -SYS_UID_MIN 500 -SYS_UID_MAX 999 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 1000 -GID_MAX 60000 -# System accounts -SYS_GID_MIN 500 -SYS_GID_MAX 999 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 5 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - diff --git a/testing/shadow/newusers b/testing/shadow/newusers deleted file mode 100644 index bc14857dc..000000000 --- a/testing/shadow/newusers +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so md5 shadow diff --git a/testing/shadow/passwd b/testing/shadow/passwd deleted file mode 100644 index 1ffd1bdd8..000000000 --- a/testing/shadow/passwd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so md5 shadow use_authtok -password required pam_unix.so md5 shadow nullok diff --git a/testing/shadow/shadow-add-missing-include.patch b/testing/shadow/shadow-add-missing-include.patch deleted file mode 100644 index 5c9e946ef..000000000 --- a/testing/shadow/shadow-add-missing-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur shadow-4.1.4.2+svn3283/libmisc/copydir.c shadow-4.1.4.2+svn3283.new/libmisc/copydir.c ---- shadow-4.1.4.2+svn3283/libmisc/copydir.c 2010-09-05 11:35:26.000000000 -0400 -+++ shadow-4.1.4.2+svn3283.new/libmisc/copydir.c 2011-06-26 01:26:52.000000000 -0400 -@@ -34,6 +34,7 @@ - - #ident "$Id: copydir.c 3283 2010-09-05 15:34:42Z nekral-guest $" - -+#include <stdarg.h> - #include <assert.h> - #include <sys/stat.h> - #include <sys/types.h> diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch deleted file mode 100644 index 46df74ace..000000000 --- a/testing/shadow/shadow-strncpy-usage.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur shadow-4.1.4.3.orig/src/login.c shadow-4.1.4.3/src/login.c ---- shadow-4.1.4.3.orig/src/login.c 2011-03-05 22:17:10.032524948 -0800 -+++ shadow-4.1.4.3/src/login.c 2011-03-05 22:17:59.154342059 -0800 -@@ -748,8 +748,9 @@ - sizeof (loginprompt), - _("%s login: "), hostn); - } else { -+ loginprompt[sizeof (loginprompt) - 1] = '\0'; - strncpy (loginprompt, _("login: "), -- sizeof (loginprompt)); -+ sizeof (loginprompt) - 1); - } - - retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt); -diff -ur shadow-4.1.4.3.orig/src/usermod.c shadow-4.1.4.3/src/usermod.c ---- shadow-4.1.4.3.orig/src/usermod.c 2011-03-05 22:17:10.029191265 -0800 -+++ shadow-4.1.4.3/src/usermod.c 2011-03-05 22:18:42.665576968 -0800 -@@ -182,7 +182,8 @@ - struct tm *tp; - - if ((negativ != NULL) && (date < 0)) { -- strncpy (buf, negativ, maxsize); -+ buf[maxsize - 1] = '\0'; -+ strncpy (buf, negativ, maxsize - 1); - } else { - time_t t = (time_t) date; - tp = gmtime (&t); diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily deleted file mode 100755 index 1931a793e..000000000 --- a/testing/shadow/shadow.cron.daily +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Verify integrity of password and group files -/usr/sbin/pwck -r -/usr/sbin/grpck -r - diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install deleted file mode 100644 index c1bd1066b..000000000 --- a/testing/shadow/shadow.install +++ /dev/null @@ -1,8 +0,0 @@ -post_upgrade() { - grpck -r &>/dev/null - if [ $? -eq 2 ]; then - echo "Fixing gshadow file ..." - while :; do echo "y"; done | grpck &>/dev/null - fi - return 0 -} diff --git a/testing/shadow/shadow_CVE-2011-0721.patch b/testing/shadow/shadow_CVE-2011-0721.patch deleted file mode 100644 index eb9ad80a2..000000000 --- a/testing/shadow/shadow_CVE-2011-0721.patch +++ /dev/null @@ -1,57 +0,0 @@ -Goal: Input sanitization for chfn and chsh - -Fixes: CVE-2011-0721 - -Status wrt upstream: Already applied upstream (4.1.4.3) - ---- a/src/chfn.c -+++ b/src/chfn.c -@@ -551,14 +551,14 @@ - static void check_fields (void) - { - int err; -- err = valid_field (fullnm, ":,="); -+ err = valid_field (fullnm, ":,=\n"); - if (err > 0) { - fprintf (stderr, _("%s: name with non-ASCII characters: '%s'\n"), Prog, fullnm); - } else if (err < 0) { - fprintf (stderr, _("%s: invalid name: '%s'\n"), Prog, fullnm); - fail_exit (E_NOPERM); - } -- err = valid_field (roomno, ":,="); -+ err = valid_field (roomno, ":,=\n"); - if (err > 0) { - fprintf (stderr, _("%s: room number with non-ASCII characters: '%s'\n"), Prog, roomno); - } else if (err < 0) { -@@ -566,17 +566,17 @@ - Prog, roomno); - fail_exit (E_NOPERM); - } -- if (valid_field (workph, ":,=") != 0) { -+ if (valid_field (workph, ":,=\n") != 0) { - fprintf (stderr, _("%s: invalid work phone: '%s'\n"), - Prog, workph); - fail_exit (E_NOPERM); - } -- if (valid_field (homeph, ":,=") != 0) { -+ if (valid_field (homeph, ":,=\n") != 0) { - fprintf (stderr, _("%s: invalid home phone: '%s'\n"), - Prog, homeph); - fail_exit (E_NOPERM); - } -- err = valid_field (slop, ":"); -+ err = valid_field (slop, ":\n"); - if (err > 0) { - fprintf (stderr, _("%s: '%s' contains non-ASCII characters\n"), Prog, slop); - } else if (err < 0) { ---- a/src/chsh. -+++ b/src/chsh.c -@@ -528,7 +528,7 @@ - * users are restricted to using the shells in /etc/shells. - * The shell must be executable by the user. - */ -- if (valid_field (loginsh, ":,=") != 0) { -+ if (valid_field (loginsh, ":,=\n") != 0) { - fprintf (stderr, _("%s: Invalid entry: %s\n"), Prog, loginsh); - fail_exit (1); - } diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults deleted file mode 100644 index b800b1777..000000000 --- a/testing/shadow/useradd.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# useradd defaults file for ArchLinux -# original changes by TomK -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel -CREATE_MAIL_SPOOL=no diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch deleted file mode 100644 index bce434264..000000000 --- a/testing/shadow/xstrdup.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 -+++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 -@@ -61,5 +61,6 @@ - - char *xstrdup (const char *str) - { -+ if(str == NULL) return NULL; - return strcpy (xmalloc (strlen (str) + 1), str); - } diff --git a/testing/spamassassin/PKGBUILD b/testing/spamassassin/PKGBUILD deleted file mode 100644 index c84fcb803..000000000 --- a/testing/spamassassin/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 128413 2011-06-23 22:14:04Z angvp $ -# Maintainer: Dale Blount <dale@archlinux.org> -# Contributor: Manolis Tzanidakis -pkgname=spamassassin -pkgver=3.3.2 -pkgrel=1 -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' - 'dkim: DomainKeys Identified Mail (DKIM) checking') -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=('d1d62cc5c6eac57e88c4006d9633b81e' - '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/testing/spamassassin/spamassassin.install b/testing/spamassassin/spamassassin.install deleted file mode 100644 index 5109956c9..000000000 --- a/testing/spamassassin/spamassassin.install +++ /dev/null @@ -1,25 +0,0 @@ -# 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/testing/spamassassin/spamd b/testing/spamassassin/spamd deleted file mode 100644 index 11d35f7cd..000000000 --- a/testing/spamassassin/spamd +++ /dev/null @@ -1,49 +0,0 @@ -#!/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/testing/spamassassin/spamd.conf.d b/testing/spamassassin/spamd.conf.d deleted file mode 100644 index 4295e0073..000000000 --- a/testing/spamassassin/spamd.conf.d +++ /dev/null @@ -1 +0,0 @@ -SPAMD_OPTS="-c" diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD deleted file mode 100644 index 19cb12294..000000000 --- a/testing/subversion/PKGBUILD +++ /dev/null @@ -1,98 +0,0 @@ -# $Id: PKGBUILD 127222 2011-06-11 09:32:25Z andrea $ -# Maintainer: Paul Mattal <paul@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=subversion -pkgver=1.6.17 -pkgrel=4 -pkgdesc="Replacement for CVS, another versioning system (SVN)" -arch=('i686' 'x86_64') -license=('apache' 'bsd') -depends=('neon' 'apr-util' 'sqlite3') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 - svnserve svn svnserve.conf svnmerge.py - subversion.rpath.fix.patch - subversion.suppress.deprecation.warnings.patch) - -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') -url="http://subversion.apache.org/" -provides=('svn') -options=('!makeflags' '!libtool') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export PYTHON=/usr/bin/python2 - - # apply patches - patch -Np0 -i ../subversion.rpath.fix.patch - patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch - - # configure - autoreconf - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ - --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.1 \ - --enable-javahl --with-gnome-keyring --with-kwallet - - # build - (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py CLEANUP=yes -#} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # install - export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH - make DESTDIR=${pkgdir} install - - make DESTDIR=${pkgdir} swig-py - make install-swig-py DESTDIR=${pkgdir} - - install -d ${pkgdir}/usr/lib/python2.7 - mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages - - install -d ${pkgdir}/usr/share/subversion - install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ - rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in - - make DESTDIR=${pkgdir} swig-pl - make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor - rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -rf ${pkgdir}/usr/lib/perl5/core_perl - - make DESTDIR=${pkgdir} swig-rb - make install-swig-rb DESTDIR=${pkgdir} - - make DESTDIR=${pkgdir} javahl - make DESTDIR=${pkgdir} install-javahl - - install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d} - - install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d - install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d - install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve - install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge - install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE - - # bash completion - install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \ - ${pkgdir}/etc/bash_completion.d/subversion -} -md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14' - 'a2b029e8385007ffb99b437b30521c90' - 'a0db6dd43af33952739b6ec089852630' - 'c459e299192552f61578f3438abf0664' - 'a6371baeda7e224504629ecdda2749b4' - '6b4340ba9d8845cd8497e013ae01be3f' - '1166f3b7413d7e7450299b3525680bbe') diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch deleted file mode 100644 index ba6ee9e4e..000000000 --- a/testing/subversion/subversion.rpath.fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 -+++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 -@@ -678,6 +678,7 @@ - - $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL -+ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} - - swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ - $(SWIG_PL_DIR)/native/Makefile diff --git a/testing/subversion/subversion.suppress.deprecation.warnings.patch b/testing/subversion/subversion.suppress.deprecation.warnings.patch deleted file mode 100644 index 94ce89b18..000000000 --- a/testing/subversion/subversion.suppress.deprecation.warnings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py ---- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py 2009-02-13 11:22:26.000000000 -0500 -+++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py 2010-02-08 07:46:29.000000000 -0500 -@@ -19,6 +19,7 @@ - from libsvn.core import * - import libsvn.core as _libsvncore - import atexit as _atexit -+import warnings - - class SubversionException(Exception): - def __init__(self, message=None, apr_err=None, child=None, -@@ -44,7 +45,9 @@ - Exception.__init__(self, *args) - - self.apr_err = apr_err -- self.message = message -+ with warnings.catch_warnings(): -+ warnings.simplefilter("ignore", DeprecationWarning) -+ self.message = message - self.child = child - self.file = file - self.line = line diff --git a/testing/subversion/svn b/testing/subversion/svn deleted file mode 100644 index 8988aaf63..000000000 --- a/testing/subversion/svn +++ /dev/null @@ -1,11 +0,0 @@ -service svn -{ - flags = REUSE - socket_type = stream - wait = no - user = root - server = /usr/bin/svnserve - server_args = -i - log_on_failure += USERID - disable = yes -} diff --git a/testing/subversion/svnmerge.py b/testing/subversion/svnmerge.py deleted file mode 100644 index d8931648f..000000000 --- a/testing/subversion/svnmerge.py +++ /dev/null @@ -1,2370 +0,0 @@ -#!/usr/bin/env python2 -# -*- coding: utf-8 -*- -# Copyright (c) 2005, Giovanni Bajo -# Copyright (c) 2004-2005, Awarix, Inc. -# All rights reserved. -# -# 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 General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -# -# Author: Archie Cobbs <archie at awarix dot com> -# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com> -# -# Acknowledgments: -# John Belmonte <john at neggie dot net> - metadata and usability -# improvements -# Blair Zajac <blair at orcaware dot com> - random improvements -# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive -# merging support -# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple -# location identifier formats -# -# $HeadURL$ -# $LastChangedDate$ -# $LastChangedBy$ -# $LastChangedRevision$ -# -# Requisites: -# svnmerge.py has been tested with all SVN major versions since 1.1 (both -# client and server). It is unknown if it works with previous versions. -# -# Differences from svnmerge.sh: -# - More portable: tested as working in FreeBSD and OS/2. -# - Add double-verbose mode, which shows every svn command executed (-v -v). -# - "svnmerge avail" now only shows commits in source, not also commits in -# other parts of the repository. -# - Add "svnmerge block" to flag some revisions as blocked, so that -# they will not show up anymore in the available list. Added also -# the complementary "svnmerge unblock". -# - "svnmerge avail" has grown two new options: -# -B to display a list of the blocked revisions -# -A to display both the blocked and the available revisions. -# - Improved generated commit message to make it machine parsable even when -# merging commits which are themselves merges. -# - Add --force option to skip working copy check -# - Add --record-only option to "svnmerge merge" to avoid performing -# an actual merge, yet record that a merge happened. -# - Can use a variety of location-identifier formats -# -# TODO: -# - Add "svnmerge avail -R": show logs in reverse order -# -# Information for Hackers: -# -# Identifiers for branches: -# A branch is identified in three ways within this source: -# - as a working copy (variable name usually includes 'dir') -# - as a fully qualified URL -# - as a path identifier (an opaque string indicating a particular path -# in a particular repository; variable name includes 'pathid') -# A "target" is generally user-specified, and may be a working copy or -# a URL. - -import sys, os, getopt, re, types, tempfile, time, locale -from bisect import bisect -from xml.dom import pulldom - -NAME = "svnmerge" -if not hasattr(sys, "version_info") or sys.version_info < (2, 0): - error("requires Python 2.0 or newer") - -# Set up the separator used to separate individual log messages from -# each revision merged into the target location. Also, create a -# regular expression that will find this same separator in already -# committed log messages, so that the separator used for this run of -# svnmerge.py will have one more LOG_SEPARATOR appended to the longest -# separator found in all the commits. -LOG_SEPARATOR = 8 * '.' -LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR), - re.MULTILINE) - -# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX. -LOG_LINE_PREFIX = 2 * ' ' - -# Set python to the default locale as per environment settings, same as svn -# TODO we should really parse config and if log-encoding is specified, set -# the locale to match that encoding -locale.setlocale(locale.LC_ALL, '') - -# We want the svn output (such as svn info) to be non-localized -# Using LC_MESSAGES should not affect localized output of svn log, for example -if os.environ.has_key("LC_ALL"): - del os.environ["LC_ALL"] -os.environ["LC_MESSAGES"] = "C" - -############################################################################### -# Support for older Python versions -############################################################################### - -# True/False constants are Python 2.2+ -try: - True, False -except NameError: - True, False = 1, 0 - -def lstrip(s, ch): - """Replacement for str.lstrip (support for arbitrary chars to strip was - added in Python 2.2.2).""" - i = 0 - try: - while s[i] == ch: - i = i+1 - return s[i:] - except IndexError: - return "" - -def rstrip(s, ch): - """Replacement for str.rstrip (support for arbitrary chars to strip was - added in Python 2.2.2).""" - try: - if s[-1] != ch: - return s - i = -2 - while s[i] == ch: - i = i-1 - return s[:i+1] - except IndexError: - return "" - -def strip(s, ch): - """Replacement for str.strip (support for arbitrary chars to strip was - added in Python 2.2.2).""" - return lstrip(rstrip(s, ch), ch) - -def rsplit(s, sep, maxsplits=0): - """Like str.rsplit, which is Python 2.4+ only.""" - L = s.split(sep) - if not 0 < maxsplits <= len(L): - return L - return [sep.join(L[0:-maxsplits])] + L[-maxsplits:] - -############################################################################### - -def kwextract(s): - """Extract info from a svn keyword string.""" - try: - return strip(s, "$").strip().split(": ")[1] - except IndexError: - return "<unknown>" - -__revision__ = kwextract('$Rev$') -__date__ = kwextract('$Date$') - -# Additional options, not (yet?) mapped to command line flags -default_opts = { - "svn": "svn", - "prop": NAME + "-integrated", - "block-prop": NAME + "-blocked", - "commit-verbose": True, - "verbose": 0, -} -logs = {} - -def console_width(): - """Get the width of the console screen (if any).""" - try: - return int(os.environ["COLUMNS"]) - except (KeyError, ValueError): - pass - - try: - # Call the Windows API (requires ctypes library) - from ctypes import windll, create_string_buffer - h = windll.kernel32.GetStdHandle(-11) - csbi = create_string_buffer(22) - res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi) - if res: - import struct - (bufx, bufy, - curx, cury, wattr, - left, top, right, bottom, - maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw) - return right - left + 1 - except ImportError: - pass - - # Parse the output of stty -a - if os.isatty(1): - out = os.popen("stty -a").read() - m = re.search(r"columns (\d+);", out) - if m: - return int(m.group(1)) - - # sensible default - return 80 - -def error(s): - """Subroutine to output an error and bail.""" - print >> sys.stderr, "%s: %s" % (NAME, s) - sys.exit(1) - -def report(s): - """Subroutine to output progress message, unless in quiet mode.""" - if opts["verbose"]: - print "%s: %s" % (NAME, s) - -def prefix_lines(prefix, lines): - """Given a string representing one or more lines of text, insert the - specified prefix at the beginning of each line, and return the result. - The input must be terminated by a newline.""" - assert lines[-1] == "\n" - return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n" - -def recode_stdout_to_file(s): - if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \ - or sys.stdout.encoding is None: - return s - u = s.decode(sys.stdout.encoding) - return u.encode(locale.getdefaultlocale()[1]) - -class LaunchError(Exception): - """Signal a failure in execution of an external command. Parameters are the - exit code of the process, the original command line, and the output of the - command.""" - -try: - """Launch a sub-process. Return its output (both stdout and stderr), - optionally split by lines (if split_lines is True). Raise a LaunchError - exception if the exit code of the process is non-zero (failure). - - This function has two implementations, one based on subprocess (preferred), - and one based on popen (for compatibility). - """ - import subprocess - import shlex - - def launch(cmd, split_lines=True): - # Requiring python 2.4 or higher, on some platforms we get - # much faster performance from the subprocess module (where python - # doesn't try to close an exhorbitant number of file descriptors) - stdout = "" - stderr = "" - try: - if os.name == 'nt': - p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \ - close_fds=False, stderr=subprocess.PIPE) - else: - # Use shlex to break up the parameters intelligently, - # respecting quotes. shlex can't handle unicode. - args = shlex.split(cmd.encode('ascii')) - p = subprocess.Popen(args, stdout=subprocess.PIPE, \ - close_fds=False, stderr=subprocess.PIPE) - stdoutAndErr = p.communicate() - stdout = stdoutAndErr[0] - stderr = stdoutAndErr[1] - except OSError, inst: - # Using 1 as failure code; should get actual number somehow? For - # examples see svnmerge_test.py's TestCase_launch.test_failure and - # TestCase_launch.test_failurecode. - raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst)) - - if p.returncode == 0: - if split_lines: - # Setting keepends=True for compatibility with previous logic - # (where file.readlines() preserves newlines) - return stdout.splitlines(True) - else: - return stdout - else: - raise LaunchError(p.returncode, cmd, stdout + stderr) -except ImportError: - # support versions of python before 2.4 (slower on some systems) - def launch(cmd, split_lines=True): - if os.name not in ['nt', 'os2']: - import popen2 - p = popen2.Popen4(cmd) - p.tochild.close() - if split_lines: - out = p.fromchild.readlines() - else: - out = p.fromchild.read() - ret = p.wait() - if ret == 0: - ret = None - else: - ret >>= 8 - else: - i,k = os.popen4(cmd) - i.close() - if split_lines: - out = k.readlines() - else: - out = k.read() - ret = k.close() - - if ret is None: - return out - raise LaunchError(ret, cmd, out) - -def launchsvn(s, show=False, pretend=False, **kwargs): - """Launch SVN and grab its output.""" - username = password = configdir = "" - if opts.get("username", None): - username = "--username=" + opts["username"] - if opts.get("password", None): - password = "--password=" + opts["password"] - if opts.get("config-dir", None): - configdir = "--config-dir=" + opts["config-dir"] - cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive", - username, password, configdir, s])) - if show or opts["verbose"] >= 2: - print cmd - if pretend: - return None - return launch(cmd, **kwargs) - -def svn_command(s): - """Do (or pretend to do) an SVN command.""" - out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"], - pretend=opts["dry-run"], - split_lines=False) - if not opts["dry-run"]: - print out - -def check_dir_clean(dir): - """Check the current status of dir for local mods.""" - if opts["force"]: - report('skipping status check because of --force') - return - report('checking status of "%s"' % dir) - - # Checking with -q does not show unversioned files or external - # directories. Though it displays a debug message for external - # directories, after a blank line. So, practically, the first line - # matters: if it's non-empty there is a modification. - out = launchsvn("status -q %s" % dir) - if out and out[0].strip(): - error('"%s" has local modifications; it must be clean' % dir) - -class PathIdentifier: - """Abstraction for a path identifier, so that we can start talking - about it before we know the form that it takes in the properties (its - external_form). Objects are referenced in the class variable 'locobjs', - keyed by all known forms.""" - - # a map of UUID (or None) to repository root URL. - repo_hints = {} - - # a map from any known string form to the corresponding PathIdentifier - locobjs = {} - - def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None): - self.repo_relative_path = repo_relative_path - self.uuid = uuid - self.url = url - self.external_form = external_form - - def __repr__(self): - return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>' - - def __str__(self): - """Return a printable string representation""" - if self.external_form: - return self.external_form - if self.url: - return self.format('url') - if self.uuid: - return self.format('uuid') - return self.format('path') - - def from_pathid(pathid_str): - """convert pathid_str to a PathIdentifier""" - if not PathIdentifier.locobjs.has_key(pathid_str): - if is_url(pathid_str): - # we can determine every form; PathIdentifier.hint knows how to do that - PathIdentifier.hint(pathid_str) - elif pathid_str[:7] == 'uuid://': - mo = re.match('uuid://([^/]*)(.*)', pathid_str) - if not mo: - error("Invalid path identifier '%s'" % pathid_str) - uuid, repo_relative_path = mo.groups() - pathid = PathIdentifier(repo_relative_path, uuid=uuid) - # we can cache this by uuid:// pathid and by repo-relative path - PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid - elif pathid_str and pathid_str[0] == '/': - # strip any trailing slashes - pathid_str = pathid_str.rstrip('/') - pathid = PathIdentifier(repo_relative_path=pathid_str) - # we can only cache this by repo-relative path - PathIdentifier.locobjs[pathid_str] = pathid - else: - error("Invalid path identifier '%s'" % pathid_str) - return PathIdentifier.locobjs[pathid_str] - from_pathid = staticmethod(from_pathid) - - def from_target(target): - """Convert a target (either a working copy path or an URL) into a - path identifier.""" - # prime the cache first if we don't know about this target yet - if not PathIdentifier.locobjs.has_key(target): - PathIdentifier.hint(target) - - try: - return PathIdentifier.locobjs[target] - except KeyError: - error("Could not recognize path identifier '%s'" % target) - from_target = staticmethod(from_target) - - def hint(target): - """Cache some information about target, as it may be referenced by - repo-relative path in subversion properties; the cache can help to - expand such a relative path to a full path identifier.""" - if PathIdentifier.locobjs.has_key(target): return - if not is_url(target) and not is_wc(target): return - - url = target_to_url(target) - - root = get_repo_root(url) - assert root[-1] != "/" - assert url[:len(root)] == root, "url=%r, root=%r" % (url, root) - repo_relative_path = url[len(root):] - - try: - uuid = get_svninfo(target)['Repository UUID'] - uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path) - except KeyError: - uuid = None - uuid_pathid = None - - locobj = PathIdentifier.locobjs.get(url) or \ - (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid)) - if not locobj: - locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url) - - PathIdentifier.repo_hints[uuid] = root # (uuid may be None) - - PathIdentifier.locobjs[target] = locobj - PathIdentifier.locobjs[url] = locobj - if uuid_pathid: - PathIdentifier.locobjs[uuid_pathid] = locobj - if not PathIdentifier.locobjs.has_key(repo_relative_path): - PathIdentifier.locobjs[repo_relative_path] = locobj - hint = staticmethod(hint) - - def format(self, fmt): - if fmt == 'path': - return self.repo_relative_path - elif fmt == 'uuid': - return "uuid://%s%s" % (self.uuid, self.repo_relative_path) - elif fmt == 'url': - return self.url - else: - error("Unkonwn path type '%s'" % fmt) - - def match_substring(self, str): - """Test whether str is a substring of any representation of this - PathIdentifier.""" - if self.repo_relative_path.find(str) >= 0: - return True - - if self.uuid: - if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0: - return True - - if self.url: - if (self.url + self.repo_relative_path).find(str) >= 0: - return True - - return False - - def get_url(self): - """Convert a pathid into a URL. If this is not possible, error out.""" - if self.url: - return self.url - # if we have a uuid and happen to know the URL for it, use that - elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid): - self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path - PathIdentifier.locobjs[self.url] = self - return self.url - # if we've only seen one rep, use that (a guess, but an educated one) - elif not self.uuid and len(PathIdentifier.repo_hints) == 1: - uuid, root = PathIdentifier.repo_hints.items()[0] - if uuid: - self.uuid = uuid - PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self - self.url = root + self.repo_relative_path - PathIdentifier.locobjs[self.url] = self - report("Guessing that '%s' refers to '%s'" % (self, self.url)) - return self.url - else: - error("Cannot determine URL for '%s'; " % self + - "Explicit source argument (-S/--source) required.\n") - -class RevisionLog: - """ - A log of the revisions which affected a given URL between two - revisions. - """ - - def __init__(self, url, begin, end, find_propchanges=False): - """ - Create a new RevisionLog object, which stores, in self.revs, a list - of the revisions which affected the specified URL between begin and - end. If find_propchanges is True, self.propchange_revs will contain a - list of the revisions which changed properties directly on the - specified URL. URL must be the URL for a directory in the repository. - """ - self.url = url - - # Setup the log options (--quiet, so we don't show log messages) - log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url) - if find_propchanges: - # The --verbose flag lets us grab merge tracking information - # by looking at propchanges - log_opts = "--verbose " + log_opts - - # Read the log to look for revision numbers and merge-tracking info - self.revs = [] - self.propchange_revs = [] - repos_pathid = PathIdentifier.from_target(url) - for chg in SvnLogParser(launchsvn("log %s" % log_opts, - split_lines=False)): - self.revs.append(chg.revision()) - for p in chg.paths(): - if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path: - self.propchange_revs.append(chg.revision()) - - # Save the range of the log - self.begin = int(begin) - if end == "HEAD": - # If end is not provided, we do not know which is the latest - # revision in the repository. So we set 'end' to the latest - # known revision. - self.end = self.revs[-1] - else: - self.end = int(end) - - self._merges = None - self._blocks = None - - def merge_metadata(self): - """ - Return a VersionedProperty object, with a cached view of the merge - metadata in the range of this log. - """ - - # Load merge metadata if necessary - if not self._merges: - self._merges = VersionedProperty(self.url, opts["prop"]) - self._merges.load(self) - - return self._merges - - def block_metadata(self): - if not self._blocks: - self._blocks = VersionedProperty(self.url, opts["block-prop"]) - self._blocks.load(self) - - return self._blocks - - -class VersionedProperty: - """ - A read-only, cached view of a versioned property. - - self.revs contains a list of the revisions in which the property changes. - self.values stores the new values at each corresponding revision. If the - value of the property is unknown, it is set to None. - - Initially, we set self.revs to [0] and self.values to [None]. This - indicates that, as of revision zero, we know nothing about the value of - the property. - - Later, if you run self.load(log), we cache the value of this property over - the entire range of the log by noting each revision in which the property - was changed. At the end of the range of the log, we invalidate our cache - by adding the value "None" to our cache for any revisions which fall out - of the range of our log. - - Once self.revs and self.values are filled, we can find the value of the - property at any arbitrary revision using a binary search on self.revs. - Once we find the last revision during which the property was changed, - we can lookup the associated value in self.values. (If the associated - value is None, the associated value was not cached and we have to do - a full propget.) - - An example: We know that the 'svnmerge' property was added in r10, and - changed in r21. We gathered log info up until r40. - - revs = [0, 10, 21, 40] - values = [None, "val1", "val2", None] - - What these values say: - - From r0 to r9, we know nothing about the property. - - In r10, the property was set to "val1". This property stayed the same - until r21, when it was changed to "val2". - - We don't know what happened after r40. - """ - - def __init__(self, url, name): - """View the history of a versioned property at URL with name""" - self.url = url - self.name = name - - # We know nothing about the value of the property. Setup revs - # and values to indicate as such. - self.revs = [0] - self.values = [None] - - # We don't have any revisions cached - self._initial_value = None - self._changed_revs = [] - self._changed_values = [] - - def load(self, log): - """ - Load the history of property changes from the specified - RevisionLog object. - """ - - # Get the property value before the range of the log - if log.begin > 1: - self.revs.append(log.begin-1) - try: - self._initial_value = self.raw_get(log.begin-1) - except LaunchError: - # The specified URL might not exist before the - # range of the log. If so, we can safely assume - # that the property was empty at that time. - self._initial_value = { } - self.values.append(self._initial_value) - else: - self._initial_value = { } - self.values[0] = self._initial_value - - # Cache the property values in the log range - old_value = self._initial_value - for rev in log.propchange_revs: - new_value = self.raw_get(rev) - if new_value != old_value: - self._changed_revs.append(rev) - self._changed_values.append(new_value) - self.revs.append(rev) - self.values.append(new_value) - old_value = new_value - - # Indicate that we know nothing about the value of the property - # after the range of the log. - if log.revs: - self.revs.append(log.end+1) - self.values.append(None) - - def raw_get(self, rev=None): - """ - Get the property at revision REV. If rev is not specified, get - the property at revision HEAD. - """ - return get_revlist_prop(self.url, self.name, rev) - - def get(self, rev=None): - """ - Get the property at revision REV. If rev is not specified, get - the property at revision HEAD. - """ - - if rev is not None: - - # Find the index using a binary search - i = bisect(self.revs, rev) - 1 - - # Return the value of the property, if it was cached - if self.values[i] is not None: - return self.values[i] - - # Get the current value of the property - return self.raw_get(rev) - - def changed_revs(self, key=None): - """ - Get a list of the revisions in which the specified dictionary - key was changed in this property. If key is not specified, - return a list of revisions in which any key was changed. - """ - if key is None: - return self._changed_revs - else: - changed_revs = [] - old_val = self._initial_value - for rev, val in zip(self._changed_revs, self._changed_values): - if val.get(key) != old_val.get(key): - changed_revs.append(rev) - old_val = val - return changed_revs - - def initialized_revs(self): - """ - Get a list of the revisions in which keys were added or - removed in this property. - """ - initialized_revs = [] - old_len = len(self._initial_value) - for rev, val in zip(self._changed_revs, self._changed_values): - if len(val) != old_len: - initialized_revs.append(rev) - old_len = len(val) - return initialized_revs - -class RevisionSet: - """ - A set of revisions, held in dictionary form for easy manipulation. If we - were to rewrite this script for Python 2.3+, we would subclass this from - set (or UserSet). As this class does not include branch - information, it's assumed that one instance will be used per - branch. - """ - def __init__(self, parm): - """Constructs a RevisionSet from a string in property form, or from - a dictionary whose keys are the revisions. Raises ValueError if the - input string is invalid.""" - - self._revs = {} - - revision_range_split_re = re.compile('[-:]') - - if isinstance(parm, types.DictType): - self._revs = parm.copy() - elif isinstance(parm, types.ListType): - for R in parm: - self._revs[int(R)] = 1 - else: - parm = parm.strip() - if parm: - for R in parm.split(","): - rev_or_revs = re.split(revision_range_split_re, R) - if len(rev_or_revs) == 1: - self._revs[int(rev_or_revs[0])] = 1 - elif len(rev_or_revs) == 2: - for rev in range(int(rev_or_revs[0]), - int(rev_or_revs[1])+1): - self._revs[rev] = 1 - else: - raise ValueError, 'Ill formatted revision range: ' + R - - def sorted(self): - revnums = self._revs.keys() - revnums.sort() - return revnums - - def normalized(self): - """Returns a normalized version of the revision set, which is an - ordered list of couples (start,end), with the minimum number of - intervals.""" - revnums = self.sorted() - revnums.reverse() - ret = [] - while revnums: - s = e = revnums.pop() - while revnums and revnums[-1] in (e, e+1): - e = revnums.pop() - ret.append((s, e)) - return ret - - def __str__(self): - """Convert the revision set to a string, using its normalized form.""" - L = [] - for s,e in self.normalized(): - if s == e: - L.append(str(s)) - else: - L.append(str(s) + "-" + str(e)) - return ",".join(L) - - def __contains__(self, rev): - return self._revs.has_key(rev) - - def __sub__(self, rs): - """Compute subtraction as in sets.""" - revs = {} - for r in self._revs.keys(): - if r not in rs: - revs[r] = 1 - return RevisionSet(revs) - - def __and__(self, rs): - """Compute intersections as in sets.""" - revs = {} - for r in self._revs.keys(): - if r in rs: - revs[r] = 1 - return RevisionSet(revs) - - def __nonzero__(self): - return len(self._revs) != 0 - - def __len__(self): - """Return the number of revisions in the set.""" - return len(self._revs) - - def __iter__(self): - return iter(self.sorted()) - - def __or__(self, rs): - """Compute set union.""" - revs = self._revs.copy() - revs.update(rs._revs) - return RevisionSet(revs) - -def merge_props_to_revision_set(merge_props, pathid): - """A converter which returns a RevisionSet instance containing the - revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a - dictionary of pathid -> revision set branch integration information - (as returned by get_merge_props()).""" - if not merge_props.has_key(pathid): - error('no integration info available for path "%s"' % pathid) - return RevisionSet(merge_props[pathid]) - -def dict_from_revlist_prop(propvalue): - """Given a property value as a string containing per-source revision - lists, return a dictionary whose key is a source path identifier - and whose value is the revisions for that source.""" - prop = {} - - # Multiple sources are separated by any whitespace. - for L in propvalue.split(): - # We use rsplit to play safe and allow colons in pathids. - pathid_str, revs = rsplit(L.strip(), ":", 1) - - pathid = PathIdentifier.from_pathid(pathid_str) - - # cache the "external" form we saw - pathid.external_form = pathid_str - - prop[pathid] = revs - return prop - -def get_revlist_prop(url_or_dir, propname, rev=None): - """Given a repository URL or working copy path and a property - name, extract the values of the property which store per-source - revision lists and return a dictionary whose key is a source path - identifier, and whose value is the revisions for that source.""" - - # Note that propget does not return an error if the property does - # not exist, it simply does not output anything. So we do not need - # to check for LaunchError here. - args = '--strict "%s" "%s"' % (propname, url_or_dir) - if rev: - args = '-r %s %s' % (rev, args) - out = launchsvn('propget %s' % args, split_lines=False) - - return dict_from_revlist_prop(out) - -def get_merge_props(dir): - """Extract the merged revisions.""" - return get_revlist_prop(dir, opts["prop"]) - -def get_block_props(dir): - """Extract the blocked revisions.""" - return get_revlist_prop(dir, opts["block-prop"]) - -def get_blocked_revs(dir, source_pathid): - p = get_block_props(dir) - if p.has_key(source_pathid): - return RevisionSet(p[source_pathid]) - return RevisionSet("") - -def format_merge_props(props, sep=" "): - """Formats the hash PROPS as a string suitable for use as a - Subversion property value.""" - assert sep in ["\t", "\n", " "] # must be a whitespace - props = props.items() - props.sort() - L = [] - for h, r in props: - L.append("%s:%s" % (h, r)) - return sep.join(L) - -def _run_propset(dir, prop, value): - """Set the property 'prop' of directory 'dir' to value 'value'. We go - through a temporary file to not run into command line length limits.""" - try: - fd, fname = tempfile.mkstemp() - f = os.fdopen(fd, "wb") - except AttributeError: - # Fallback for Python <= 2.3 which does not have mkstemp (mktemp - # suffers from race conditions. Not that we care...) - fname = tempfile.mktemp() - f = open(fname, "wb") - - try: - f.write(value) - f.close() - report("property data written to temp file: %s" % value) - svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir)) - finally: - os.remove(fname) - -def set_props(dir, name, props): - props = format_merge_props(props) - if props: - _run_propset(dir, name, props) - else: - # Check if NAME exists on DIR before trying to delete it. - # As of 1.6 propdel no longer supports deleting a - # non-existent property. - out = launchsvn('propget "%s" "%s"' % (name, dir)) - if out: - svn_command('propdel "%s" "%s"' % (name, dir)) - -def set_merge_props(dir, props): - set_props(dir, opts["prop"], props) - -def set_block_props(dir, props): - set_props(dir, opts["block-prop"], props) - -def set_blocked_revs(dir, source_pathid, revs): - props = get_block_props(dir) - if revs: - props[source_pathid] = str(revs) - elif props.has_key(source_pathid): - del props[source_pathid] - set_block_props(dir, props) - -def is_url(url): - """Check if url looks like a valid url.""" - return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid' - -def check_url(url): - """Similar to is_url, but actually invoke get_svninfo to find out""" - return get_svninfo(url) != {} - -def is_pathid(pathid): - return isinstance(pathid, PathIdentifier) - -def is_wc(dir): - """Check if a directory is a working copy.""" - return os.path.isdir(os.path.join(dir, ".svn")) or \ - os.path.isdir(os.path.join(dir, "_svn")) - -_cache_svninfo = {} -def get_svninfo(target): - """Extract the subversion information for a target (through 'svn info'). - This function uses an internal cache to let clients query information - many times.""" - if _cache_svninfo.has_key(target): - return _cache_svninfo[target] - info = {} - for L in launchsvn('info "%s"' % target): - L = L.strip() - if not L: - continue - key, value = L.split(": ", 1) - info[key] = value.strip() - _cache_svninfo[target] = info - return info - -def target_to_url(target): - """Convert working copy path or repos URL to a repos URL.""" - if is_wc(target): - info = get_svninfo(target) - return info["URL"] - return target - -_cache_reporoot = {} -def get_repo_root(target): - """Compute the root repos URL given a working-copy path, or a URL.""" - # Try using "svn info WCDIR". This works only on SVN clients >= 1.3 - if not is_url(target): - try: - info = get_svninfo(target) - root = info["Repository Root"] - _cache_reporoot[root] = None - return root - except KeyError: - pass - url = target_to_url(target) - assert url[-1] != '/' - else: - url = target - - # Go through the cache of the repository roots. This avoids extra - # server round-trips if we are asking the root of different URLs - # in the same repository (the cache in get_svninfo() cannot detect - # that of course and would issue a remote command). - assert is_url(url) - for r in _cache_reporoot: - if url.startswith(r): - return r - - # Try using "svn info URL". This works only on SVN clients >= 1.2 - try: - info = get_svninfo(url) - # info may be {}, in which case we'll see KeyError here - root = info["Repository Root"] - _cache_reporoot[root] = None - return root - except (KeyError, LaunchError): - pass - - # Constrained to older svn clients, we are stuck with this ugly - # trial-and-error implementation. It could be made faster with a - # binary search. - while url: - temp = os.path.dirname(url) - try: - launchsvn('proplist "%s"' % temp) - except LaunchError: - _cache_reporoot[url] = None - return rstrip(url, "/") - url = temp - - error("svn repos root of %s not found" % target) - -class SvnLogParser: - """ - Parse the "svn log", going through the XML output and using pulldom (which - would even allow streaming the command output). - """ - def __init__(self, xml): - self._events = pulldom.parseString(xml) - def __getitem__(self, idx): - for event, node in self._events: - if event == pulldom.START_ELEMENT and node.tagName == "logentry": - self._events.expandNode(node) - return self.SvnLogRevision(node) - raise IndexError, "Could not find 'logentry' tag in xml" - - class SvnLogRevision: - def __init__(self, xmlnode): - self.n = xmlnode - def revision(self): - return int(self.n.getAttribute("revision")) - def author(self): - return self.n.getElementsByTagName("author")[0].firstChild.data - def paths(self): - return [self.SvnLogPath(n) - for n in self.n.getElementsByTagName("path")] - - class SvnLogPath: - def __init__(self, xmlnode): - self.n = xmlnode - def action(self): - return self.n.getAttribute("action") - def pathid(self): - return self.n.firstChild.data - def copyfrom_rev(self): - try: return self.n.getAttribute("copyfrom-rev") - except KeyError: return None - def copyfrom_pathid(self): - try: return self.n.getAttribute("copyfrom-path") - except KeyError: return None - -def get_copyfrom(target): - """Get copyfrom info for a given target (it represents the - repository-relative path from where it was branched). NOTE: - repos root has no copyfrom info. In this case None is returned. - - Returns the: - - source file or directory from which the copy was made - - revision from which that source was copied - - revision in which the copy was committed - """ - repos_path = PathIdentifier.from_target(target).repo_relative_path - for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"' - % target, split_lines=False)): - for p in chg.paths(): - if p.action() == 'A' and p.pathid() == repos_path: - # These values will be None if the corresponding elements are - # not found in the log. - return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision() - return None,None,None - -def get_latest_rev(url): - """Get the latest revision of the repository of which URL is part.""" - try: - info = get_svninfo(url) - if not info.has_key("Revision"): - error("Not a valid URL: %s" % url) - return info["Revision"] - except LaunchError: - # Alternative method for latest revision checking (for svn < 1.2) - report('checking latest revision of "%s"' % url) - L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0] - rev = re.search("revision (\d+)", L).group(1) - report('latest revision of "%s" is %s' % (url, rev)) - return rev - -def get_created_rev(url): - """Lookup the revision at which the path identified by the - provided URL was first created.""" - oldest_rev = -1 - report('determining oldest revision for URL "%s"' % url) - ### TODO: Refactor this to use a modified RevisionLog class. - lines = None - cmd = "log -r1:HEAD --stop-on-copy -q " + url - try: - lines = launchsvn(cmd + " --limit=1") - except LaunchError: - # Assume that --limit isn't supported by the installed 'svn'. - lines = launchsvn(cmd) - if lines and len(lines) > 1: - i = lines[1].find(" ") - if i != -1: - oldest_rev = int(lines[1][1:i]) - if oldest_rev == -1: - error('unable to determine oldest revision for URL "%s"' % url) - return oldest_rev - -def get_commit_log(url, revnum): - """Return the log message for a specific integer revision - number.""" - out = launchsvn("log --incremental -r%d %s" % (revnum, url)) - return recode_stdout_to_file("".join(out[1:])) - -def construct_merged_log_message(url, revnums): - """Return a commit log message containing all the commit messages - in the specified revisions at the given URL. The separator used - in this log message is determined by searching for the longest - svnmerge separator existing in the commit log messages and - extending it by one more separator. This results in a new commit - log message that is clearer in describing merges that contain - other merges. Trailing newlines are removed from the embedded - log messages.""" - messages = [''] - longest_sep = '' - for r in revnums.sorted(): - message = get_commit_log(url, r) - if message: - message = re.sub(r'(\r\n|\r|\n)', "\n", message) - message = rstrip(message, "\n") + "\n" - messages.append(prefix_lines(LOG_LINE_PREFIX, message)) - for match in LOG_SEPARATOR_RE.findall(message): - sep = match[1] - if len(sep) > len(longest_sep): - longest_sep = sep - - longest_sep += LOG_SEPARATOR + "\n" - messages.append('') - return longest_sep.join(messages) - -def get_default_source(branch_target, branch_props): - """Return the default source for branch_target (given its branch_props). - Error out if there is ambiguity.""" - if not branch_props: - error("no integration info available") - - props = branch_props.copy() - pathid = PathIdentifier.from_target(branch_target) - - # To make bidirectional merges easier, find the target's - # repository local path so it can be removed from the list of - # possible integration sources. - if props.has_key(pathid): - del props[pathid] - - if len(props) > 1: - err_msg = "multiple sources found. " - err_msg += "Explicit source argument (-S/--source) required.\n" - err_msg += "The merge sources available are:" - for prop in props: - err_msg += "\n " + str(prop) - error(err_msg) - - return props.keys()[0] - -def should_find_reflected(branch_dir): - should_find_reflected = opts["bidirectional"] - - # If the source has integration info for the target, set find_reflected - # even if --bidirectional wasn't specified - if not should_find_reflected: - source_props = get_merge_props(opts["source-url"]) - should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir)) - - return should_find_reflected - -def analyze_revs(target_pathid, url, begin=1, end=None, - find_reflected=False): - """For the source of the merges in the source URL being merged into - target_pathid, analyze the revisions in the interval begin-end (which - defaults to 1-HEAD), to find out which revisions are changes in - the url, which are changes elsewhere (so-called 'phantom' - revisions), optionally which are reflected changes (to avoid - conflicts that can occur when doing bidirectional merging between - branches), and which revisions initialize merge tracking against other - branches. Return a tuple of four RevisionSet's: - (real_revs, phantom_revs, reflected_revs, initialized_revs). - - NOTE: To maximize speed, if "end" is not provided, the function is - not able to find phantom revisions following the last real - revision in the URL. - """ - - begin = str(begin) - if end is None: - end = "HEAD" - else: - end = str(end) - if long(begin) > long(end): - return RevisionSet(""), RevisionSet(""), \ - RevisionSet(""), RevisionSet("") - - logs[url] = RevisionLog(url, begin, end, find_reflected) - revs = RevisionSet(logs[url].revs) - - if end == "HEAD": - # If end is not provided, we do not know which is the latest revision - # in the repository. So return the phantom revision set only up to - # the latest known revision. - end = str(list(revs)[-1]) - - phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs - - if find_reflected: - reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid) - reflected_revs += logs[url].block_metadata().changed_revs(target_pathid) - else: - reflected_revs = [] - - initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs()) - reflected_revs = RevisionSet(reflected_revs) - - return revs, phantom_revs, reflected_revs, initialized_revs - -def analyze_source_revs(branch_target, source_url, **kwargs): - """For the given branch and source, extract the real and phantom - source revisions.""" - branch_url = target_to_url(branch_target) - branch_pathid = PathIdentifier.from_target(branch_target) - - # Extract the latest repository revision from the URL of the branch - # directory (which is already cached at this point). - end_rev = get_latest_rev(source_url) - - # Calculate the base of analysis. If there is a "1-XX" interval in the - # merged_revs, we do not need to check those. - base = 1 - r = opts["merged-revs"].normalized() - if r and r[0][0] == 1: - base = r[0][1] + 1 - - # See if the user filtered the revision set. If so, we are not - # interested in something outside that range. - if opts["revision"]: - revs = RevisionSet(opts["revision"]).sorted() - if base < revs[0]: - base = revs[0] - if end_rev > revs[-1]: - end_rev = revs[-1] - - return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs) - -def minimal_merge_intervals(revs, phantom_revs): - """Produce the smallest number of intervals suitable for merging. revs - is the RevisionSet which we want to merge, and phantom_revs are phantom - revisions which can be used to concatenate intervals, thus minimizing the - number of operations.""" - revnums = revs.normalized() - ret = [] - - cur = revnums.pop() - while revnums: - next = revnums.pop() - assert next[1] < cur[0] # otherwise it is not ordered - assert cur[0] - next[1] > 1 # otherwise it is not normalized - for i in range(next[1]+1, cur[0]): - if i not in phantom_revs: - ret.append(cur) - cur = next - break - else: - cur = (next[0], cur[1]) - - ret.append(cur) - ret.reverse() - return ret - -def display_revisions(revs, display_style, revisions_msg, source_url): - """Show REVS as dictated by DISPLAY_STYLE, either numerically, in - log format, or as diffs. When displaying revisions numerically, - prefix output with REVISIONS_MSG when in verbose mode. Otherwise, - request logs or diffs using SOURCE_URL.""" - if display_style == "revisions": - if revs: - report(revisions_msg) - print revs - elif display_style == "logs": - for start,end in revs.normalized(): - svn_command('log --incremental -v -r %d:%d %s' % \ - (start, end, source_url)) - elif display_style in ("diffs", "summarize"): - if display_style == 'summarize': - summarize = '--summarize ' - else: - summarize = '' - - for start, end in revs.normalized(): - print - if start == end: - print "%s: changes in revision %d follow" % (NAME, start) - else: - print "%s: changes in revisions %d-%d follow" % (NAME, - start, end) - print - - # Note: the starting revision number to 'svn diff' is - # NOT inclusive so we have to subtract one from ${START}. - svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize, - source_url)) - else: - assert False, "unhandled display style: %s" % display_style - -def action_init(target_dir, target_props): - """Initialize for merges.""" - # Check that directory is ready for being modified - check_dir_clean(target_dir) - - target_pathid = PathIdentifier.from_target(target_dir) - source_pathid = opts['source-pathid'] - if source_pathid == target_pathid: - error("cannot init integration source path '%s'\nIts path identifier does not " - "differ from the path identifier of the current directory, '%s'." - % (source_pathid, target_pathid)) - - source_url = opts['source-url'] - - # If the user hasn't specified the revisions to use, see if the - # "source" is a copy from the current tree and if so, we can use - # the version data obtained from it. - revision_range = opts["revision"] - if not revision_range: - # If source was originally copied from target, and we are merging - # changes from source to target (the copy target is the merge source, - # and the copy source is the merge target), then we want to mark as - # integrated up to the rev in which the copy was committed which - # created the merge source: - cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url) - - cf_pathid = None - if cf_source: - cf_url = get_repo_root(source_url) + cf_source - if is_url(cf_url) and check_url(cf_url): - cf_pathid = PathIdentifier.from_target(cf_url) - - if target_pathid == cf_pathid: - report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' % - (source_url, target_dir, cf_rev, copy_committed_in_rev)) - revision_range = "1-" + str(copy_committed_in_rev) - - if not revision_range: - # If the reverse is true: copy source is the merge source, and - # the copy target is the merge target, then we want to mark as - # integrated up to the specific rev of the merge target from - # which the merge source was copied. (Longer discussion at: - # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 ) - cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir) - - cf_pathid = None - if cf_source: - cf_url = get_repo_root(target_dir) + cf_source - if is_url(cf_url) and check_url(cf_url): - cf_pathid = PathIdentifier.from_target(cf_url) - - source_pathid = PathIdentifier.from_target(source_url) - if source_pathid == cf_pathid: - report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' % - (target_dir, source_url, cf_rev, copy_committed_in_rev)) - revision_range = "1-" + cf_rev - - # When neither the merge source nor target is a copy of the other, and - # the user did not specify a revision range, then choose a default which is - # the current revision; saying, in effect, "everything has been merged, so - # mark as integrated up to the latest rev on source url). - if not revision_range: - revision_range = "1-" + get_latest_rev(source_url) - - revs = RevisionSet(revision_range) - - report('marking "%s" as already containing revisions "%s" of "%s"' % - (target_dir, revs, source_url)) - - revs = str(revs) - # If the local svnmerge-integrated property already has an entry - # for the source-pathid, simply error out. - if not opts["force"] and target_props.has_key(source_pathid): - error('Repository-relative path %s has already been initialized at %s\n' - 'Use --force to re-initialize' % (source_pathid, target_dir)) - # set the pathid's external_form based on the user's options - source_pathid.external_form = source_pathid.format(opts['location-type']) - - revs = str(revs) - target_props[source_pathid] = revs - - # Set property - set_merge_props(target_dir, target_props) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \ - % (NAME, revs) - print >>f, '%s' % source_url - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_avail(branch_dir, branch_props): - """Show commits available for merges.""" - source_revs, phantom_revs, reflected_revs, initialized_revs = \ - analyze_source_revs(branch_dir, opts["source-url"], - find_reflected= - should_find_reflected(branch_dir)) - report('skipping phantom revisions: %s' % phantom_revs) - if reflected_revs: - report('skipping reflected revisions: %s' % reflected_revs) - report('skipping initialized revisions: %s' % initialized_revs) - - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \ - reflected_revs - initialized_revs - - # Compose the set of revisions to show - revs = RevisionSet("") - report_msg = "revisions available to be merged are:" - if "avail" in opts["avail-showwhat"]: - revs |= avail_revs - if "blocked" in opts["avail-showwhat"]: - revs |= blocked_revs - report_msg = "revisions blocked are:" - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs = revs & RevisionSet(opts["revision"]) - - display_revisions(revs, opts["avail-display"], - report_msg, - opts["source-url"]) - -def action_integrated(branch_dir, branch_props): - """Show change sets already merged. This set of revisions is - calculated from taking svnmerge-integrated property from the - branch, and subtracting any revision older than the branch - creation revision.""" - # Extract the integration info for the branch_dir - branch_props = get_merge_props(branch_dir) - revs = merge_props_to_revision_set(branch_props, opts["source-pathid"]) - - # Lookup the oldest revision on the branch path. - oldest_src_rev = get_created_rev(opts["source-url"]) - - # Subtract any revisions which pre-date the branch. - report("subtracting revisions which pre-date the source URL (%d)" % - oldest_src_rev) - revs = revs - RevisionSet(range(1, oldest_src_rev)) - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs = revs & RevisionSet(opts["revision"]) - - display_revisions(revs, opts["integrated-display"], - "revisions already integrated are:", opts["source-url"]) - -def action_merge(branch_dir, branch_props): - """Record merge meta data, and do the actual merge (if not - requested otherwise via --record-only).""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - source_revs, phantom_revs, reflected_revs, initialized_revs = \ - analyze_source_revs(branch_dir, opts["source-url"], - find_reflected= - should_find_reflected(branch_dir)) - - if opts["revision"]: - revs = RevisionSet(opts["revision"]) - else: - revs = source_revs - - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - merged_revs = opts["merged-revs"] - - # Show what we're doing - if opts["verbose"]: # just to avoid useless calculations - if merged_revs & revs: - report('"%s" already contains revisions %s' % (branch_dir, - merged_revs & revs)) - if phantom_revs: - report('memorizing phantom revision(s): %s' % phantom_revs) - if reflected_revs: - report('memorizing reflected revision(s): %s' % reflected_revs) - if blocked_revs & revs: - report('skipping blocked revisions(s): %s' % (blocked_revs & revs)) - if initialized_revs: - report('skipping initialized revision(s): %s' % initialized_revs) - - # Compute final merge set. - revs = revs - merged_revs - blocked_revs - reflected_revs - \ - phantom_revs - initialized_revs - if not revs: - report('no revisions to merge, exiting') - return - - # When manually marking revisions as merged, we only update the - # integration meta data, and don't perform an actual merge. - record_only = opts["record-only"] - - if record_only: - report('recording merge of revision(s) %s from "%s"' % - (revs, opts["source-url"])) - else: - report('merging in revision(s) %s from "%s"' % - (revs, opts["source-url"])) - - # Do the merge(s). Note: the starting revision number to 'svn merge' - # is NOT inclusive so we have to subtract one from start. - # We try to keep the number of merge operations as low as possible, - # because it is faster and reduces the number of conflicts. - old_block_props = get_block_props(branch_dir) - merge_metadata = logs[opts["source-url"]].merge_metadata() - block_metadata = logs[opts["source-url"]].block_metadata() - for start,end in minimal_merge_intervals(revs, phantom_revs): - if not record_only: - # Preset merge/blocked properties to the source value at - # the start rev to avoid spurious property conflicts - set_merge_props(branch_dir, merge_metadata.get(start - 1)) - set_block_props(branch_dir, block_metadata.get(start - 1)) - # Do the merge - svn_command("merge --force -r %d:%d %s %s" % \ - (start - 1, end, opts["source-url"], branch_dir)) - # TODO: to support graph merging, add logic to merge the property - # meta-data manually - - # Update the set of merged revisions. - merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs - branch_props[opts["source-pathid"]] = str(merged_revs) - set_merge_props(branch_dir, branch_props) - # Reset the blocked revs - set_block_props(branch_dir, old_block_props) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - if record_only: - print >>f, 'Recorded merge of revisions %s via %s from ' % \ - (revs, NAME) - else: - print >>f, 'Merged revisions %s via %s from ' % \ - (revs, NAME) - print >>f, '%s' % opts["source-url"] - if opts["commit-verbose"]: - print >>f - print >>f, construct_merged_log_message(opts["source-url"], revs), - - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_block(branch_dir, branch_props): - """Block revisions.""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - source_revs, phantom_revs, reflected_revs, initialized_revs = \ - analyze_source_revs(branch_dir, opts["source-url"]) - revs_to_block = source_revs - opts["merged-revs"] - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs_to_block = RevisionSet(opts["revision"]) & revs_to_block - - if not revs_to_block: - error('no available revisions to block') - - # Change blocked information - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - blocked_revs = blocked_revs | revs_to_block - set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME) - if opts["commit-verbose"]: - print >>f - print >>f, construct_merged_log_message(opts["source-url"], - revs_to_block), - - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_unblock(branch_dir, branch_props): - """Unblock revisions.""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) - revs_to_unblock = blocked_revs - - # Limit to revisions specified by -r (if any) - if opts["revision"]: - revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"]) - - if not revs_to_unblock: - error('no available revisions to unblock') - - # Change blocked information - blocked_revs = blocked_revs - revs_to_unblock - set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME) - if opts["commit-verbose"]: - print >>f - print >>f, construct_merged_log_message(opts["source-url"], - revs_to_unblock), - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -def action_rollback(branch_dir, branch_props): - """Rollback previously integrated revisions.""" - - # Make sure the revision arguments are present - if not opts["revision"]: - error("The '-r' option is mandatory for rollback") - - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - # Extract the integration info for the branch_dir - branch_props = get_merge_props(branch_dir) - # Get the list of all revisions already merged into this source-pathid. - merged_revs = merge_props_to_revision_set(branch_props, - opts["source-pathid"]) - - # At which revision was the src created? - oldest_src_rev = get_created_rev(opts["source-url"]) - src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev) - - # Limit to revisions specified by -r (if any) - revs = merged_revs & RevisionSet(opts["revision"]) - - # make sure there's some revision to rollback - if not revs: - report("Nothing to rollback in revision range r%s" % opts["revision"]) - return - - # If even one specified revision lies outside the lifetime of the - # merge source, error out. - if revs & src_pre_exist_range: - err_str = "Specified revision range falls out of the rollback range.\n" - err_str += "%s was created at r%d" % (opts["source-pathid"], - oldest_src_rev) - error(err_str) - - record_only = opts["record-only"] - - if record_only: - report('recording rollback of revision(s) %s from "%s"' % - (revs, opts["source-url"])) - else: - report('rollback of revision(s) %s from "%s"' % - (revs, opts["source-url"])) - - # Do the reverse merge(s). Note: the starting revision number - # to 'svn merge' is NOT inclusive so we have to subtract one from start. - # We try to keep the number of merge operations as low as possible, - # because it is faster and reduces the number of conflicts. - rollback_intervals = minimal_merge_intervals(revs, []) - # rollback in the reverse order of merge - rollback_intervals.reverse() - for start, end in rollback_intervals: - if not record_only: - # Do the merge - svn_command("merge --force -r %d:%d %s %s" % \ - (end, start - 1, opts["source-url"], branch_dir)) - - # Write out commit message if desired - # calculate the phantom revs first - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - if record_only: - print >>f, 'Recorded rollback of revisions %s via %s from ' % \ - (revs , NAME) - else: - print >>f, 'Rolled back revisions %s via %s from ' % \ - (revs , NAME) - print >>f, '%s' % opts["source-url"] - - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - - # Update the set of merged revisions. - merged_revs = merged_revs - revs - branch_props[opts["source-pathid"]] = str(merged_revs) - set_merge_props(branch_dir, branch_props) - -def action_uninit(branch_dir, branch_props): - """Uninit SOURCE URL.""" - # Check branch directory is ready for being modified - check_dir_clean(branch_dir) - - # If the source-pathid does not have an entry in the svnmerge-integrated - # property, simply error out. - if not branch_props.has_key(opts["source-pathid"]): - error('Repository-relative path "%s" does not contain merge ' - 'tracking information for "%s"' \ - % (opts["source-pathid"], branch_dir)) - - del branch_props[opts["source-pathid"]] - - # Set merge property with the selected source deleted - set_merge_props(branch_dir, branch_props) - - # Set blocked revisions for the selected source to None - set_blocked_revs(branch_dir, opts["source-pathid"], None) - - # Write out commit message if desired - if opts["commit-file"]: - f = open(opts["commit-file"], "w") - print >>f, 'Removed merge tracking for "%s" for ' % NAME - print >>f, '%s' % opts["source-url"] - f.close() - report('wrote commit message to "%s"' % opts["commit-file"]) - -############################################################################### -# Command line parsing -- options and commands management -############################################################################### - -class OptBase: - def __init__(self, *args, **kwargs): - self.help = kwargs["help"] - del kwargs["help"] - self.lflags = [] - self.sflags = [] - for a in args: - if a.startswith("--"): self.lflags.append(a) - elif a.startswith("-"): self.sflags.append(a) - else: - raise TypeError, "invalid flag name: %s" % a - if kwargs.has_key("dest"): - self.dest = kwargs["dest"] - del kwargs["dest"] - else: - if not self.lflags: - raise TypeError, "cannot deduce dest name without long options" - self.dest = self.lflags[0][2:] - if kwargs: - raise TypeError, "invalid keyword arguments: %r" % kwargs.keys() - def repr_flags(self): - f = self.sflags + self.lflags - r = f[0] - for fl in f[1:]: - r += " [%s]" % fl - return r - -class Option(OptBase): - def __init__(self, *args, **kwargs): - self.default = kwargs.setdefault("default", 0) - del kwargs["default"] - self.value = kwargs.setdefault("value", None) - del kwargs["value"] - OptBase.__init__(self, *args, **kwargs) - def apply(self, state, value): - assert value == "" - if self.value is not None: - state[self.dest] = self.value - else: - state[self.dest] += 1 - -class OptionArg(OptBase): - def __init__(self, *args, **kwargs): - self.default = kwargs["default"] - del kwargs["default"] - self.metavar = kwargs.setdefault("metavar", None) - del kwargs["metavar"] - OptBase.__init__(self, *args, **kwargs) - - if self.metavar is None: - if self.dest is not None: - self.metavar = self.dest.upper() - else: - self.metavar = "arg" - if self.default: - self.help += " (default: %s)" % self.default - def apply(self, state, value): - assert value is not None - state[self.dest] = value - def repr_flags(self): - r = OptBase.repr_flags(self) - return r + " " + self.metavar - -class CommandOpts: - class Cmd: - def __init__(self, *args): - self.name, self.func, self.usage, self.help, self.opts = args - def short_help(self): - return self.help.split(".")[0] - def __str__(self): - return self.name - def __call__(self, *args, **kwargs): - return self.func(*args, **kwargs) - - def __init__(self, global_opts, common_opts, command_table, version=None): - self.progname = NAME - self.version = version.replace("%prog", self.progname) - self.cwidth = console_width() - 2 - self.ctable = command_table.copy() - self.gopts = global_opts[:] - self.copts = common_opts[:] - self._add_builtins() - for k in self.ctable.keys(): - cmd = self.Cmd(k, *self.ctable[k]) - opts = [] - for o in cmd.opts: - if isinstance(o, types.StringType) or \ - isinstance(o, types.UnicodeType): - o = self._find_common(o) - opts.append(o) - cmd.opts = opts - self.ctable[k] = cmd - - def _add_builtins(self): - self.gopts.append( - Option("-h", "--help", help="show help for this command and exit")) - if self.version is not None: - self.gopts.append( - Option("-V", "--version", help="show version info and exit")) - self.ctable["help"] = (self._cmd_help, - "help [COMMAND]", - "Display help for a specific command. If COMMAND is omitted, " - "display brief command description.", - []) - - def _cmd_help(self, cmd=None, *args): - if args: - self.error("wrong number of arguments", "help") - if cmd is not None: - cmd = self._command(cmd) - self.print_command_help(cmd) - else: - self.print_command_list() - - def _paragraph(self, text, width=78): - chunks = re.split("\s+", text.strip()) - chunks.reverse() - lines = [] - while chunks: - L = chunks.pop() - while chunks and len(L) + len(chunks[-1]) + 1 <= width: - L += " " + chunks.pop() - lines.append(L) - return lines - - def _paragraphs(self, text, *args, **kwargs): - pars = text.split("\n\n") - lines = self._paragraph(pars[0], *args, **kwargs) - for p in pars[1:]: - lines.append("") - lines.extend(self._paragraph(p, *args, **kwargs)) - return lines - - def _print_wrapped(self, text, indent=0): - text = self._paragraphs(text, self.cwidth - indent) - print text.pop(0) - for t in text: - print " " * indent + t - - def _find_common(self, fl): - for o in self.copts: - if fl in o.lflags+o.sflags: - return o - assert False, fl - - def _compute_flags(self, opts, check_conflicts=True): - back = {} - sfl = "" - lfl = [] - for o in opts: - sapp = lapp = "" - if isinstance(o, OptionArg): - sapp, lapp = ":", "=" - for s in o.sflags: - if check_conflicts and back.has_key(s): - raise RuntimeError, "option conflict: %s" % s - back[s] = o - sfl += s[1:] + sapp - for l in o.lflags: - if check_conflicts and back.has_key(l): - raise RuntimeError, "option conflict: %s" % l - back[l] = o - lfl.append(l[2:] + lapp) - return sfl, lfl, back - - def _extract_command(self, args): - """ - Try to extract the command name from the argument list. This is - non-trivial because we want to allow command-specific options even - before the command itself. - """ - opts = self.gopts[:] - for cmd in self.ctable.values(): - opts.extend(cmd.opts) - sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False) - - lopts,largs = getopt.getopt(args, sfl, lfl) - if not largs: - return None - return self._command(largs[0]) - - def _fancy_getopt(self, args, opts, state=None): - if state is None: - state= {} - for o in opts: - if not state.has_key(o.dest): - state[o.dest] = o.default - - sfl, lfl, back = self._compute_flags(opts) - try: - lopts,args = getopt.gnu_getopt(args, sfl, lfl) - except AttributeError: - # Before Python 2.3, there was no gnu_getopt support. - # So we can't parse intermixed positional arguments - # and options. - lopts,args = getopt.getopt(args, sfl, lfl) - - for o,v in lopts: - back[o].apply(state, v) - return state, args - - def _command(self, cmd): - if not self.ctable.has_key(cmd): - self.error("unknown command: '%s'" % cmd) - return self.ctable[cmd] - - def parse(self, args): - if not args: - self.print_small_help() - sys.exit(0) - - cmd = None - try: - cmd = self._extract_command(args) - opts = self.gopts[:] - if cmd: - opts.extend(cmd.opts) - args.remove(cmd.name) - state, args = self._fancy_getopt(args, opts) - except getopt.GetoptError, e: - self.error(e, cmd) - - # Handle builtins - if self.version is not None and state["version"]: - self.print_version() - sys.exit(0) - if state["help"]: # special case for --help - if cmd: - self.print_command_help(cmd) - sys.exit(0) - cmd = self.ctable["help"] - else: - if cmd is None: - self.error("command argument required") - if str(cmd) == "help": - cmd(*args) - sys.exit(0) - return cmd, args, state - - def error(self, s, cmd=None): - print >>sys.stderr, "%s: %s" % (self.progname, s) - if cmd is not None: - self.print_command_help(cmd) - else: - self.print_small_help() - sys.exit(1) - def print_small_help(self): - print "Type '%s help' for usage" % self.progname - def print_usage_line(self): - print "usage: %s <subcommand> [options...] [args...]\n" % self.progname - def print_command_list(self): - print "Available commands (use '%s help COMMAND' for more details):\n" \ - % self.progname - cmds = self.ctable.keys() - cmds.sort() - indent = max(map(len, cmds)) - for c in cmds: - h = self.ctable[c].short_help() - print " %-*s " % (indent, c), - self._print_wrapped(h, indent+6) - def print_command_help(self, cmd): - cmd = self.ctable[str(cmd)] - print 'usage: %s %s\n' % (self.progname, cmd.usage) - self._print_wrapped(cmd.help) - def print_opts(opts, self=self): - if not opts: return - flags = [o.repr_flags() for o in opts] - indent = max(map(len, flags)) - for f,o in zip(flags, opts): - print " %-*s :" % (indent, f), - self._print_wrapped(o.help, indent+5) - print '\nCommand options:' - print_opts(cmd.opts) - print '\nGlobal options:' - print_opts(self.gopts) - - def print_version(self): - print self.version - -############################################################################### -# Options and Commands description -############################################################################### - -global_opts = [ - Option("-F", "--force", - help="force operation even if the working copy is not clean, or " - "there are pending updates"), - Option("-n", "--dry-run", - help="don't actually change anything, just pretend; " - "implies --show-changes"), - Option("-s", "--show-changes", - help="show subversion commands that make changes"), - Option("-v", "--verbose", - help="verbose mode: output more information about progress"), - OptionArg("-u", "--username", - default=None, - help="invoke subversion commands with the supplied username"), - OptionArg("-p", "--password", - default=None, - help="invoke subversion commands with the supplied password"), - OptionArg("-c", "--config-dir", metavar="DIR", - default=None, - help="cause subversion commands to consult runtime config directory DIR"), -] - -common_opts = [ - Option("-b", "--bidirectional", - value=True, - default=False, - help="remove reflected and initialized revisions from merge candidates. " - "Not required but may be specified to speed things up slightly"), - OptionArg("-f", "--commit-file", metavar="FILE", - default="svnmerge-commit-message.txt", - help="set the name of the file where the suggested log message " - "is written to"), - Option("-M", "--record-only", - value=True, - default=False, - help="do not perform an actual merge of the changes, yet record " - "that a merge happened"), - OptionArg("-r", "--revision", - metavar="REVLIST", - default="", - help="specify a revision list, consisting of revision numbers " - 'and ranges separated by commas, e.g., "534,537-539,540"'), - OptionArg("-S", "--source", "--head", - default=None, - help="specify a merge source for this branch. It can be either " - "a working directory path, a full URL, or an unambiguous " - "substring of one of the locations for which merge tracking was " - "already initialized. Needed only to disambiguate in case of " - "multiple merge sources"), -] - -command_table = { - "init": (action_init, - "init [OPTION...] [SOURCE]", - """Initialize merge tracking from SOURCE on the current working - directory. - - If SOURCE is specified, all the revisions in SOURCE are marked as already - merged; if this is not correct, you can use --revision to specify the - exact list of already-merged revisions. - - If SOURCE is omitted, then it is computed from the "svn cp" history of the - current working directory (searching back for the branch point); in this - case, %s assumes that no revision has been integrated yet since - the branch point (unless you teach it with --revision).""" % NAME, - [ - "-f", "-r", # import common opts - OptionArg("-L", "--location-type", - dest="location-type", - default="path", - help="Use this type of location identifier in the new " + - "Subversion properties; 'uuid', 'url', or 'path' " + - "(default)"), - ]), - - "avail": (action_avail, - "avail [OPTION...] [PATH]", - """Show unmerged revisions available for PATH as a revision list. - If --revision is given, the revisions shown will be limited to those - also specified in the option. - - When svnmerge is used to bidirectionally merge changes between a - branch and its source, it is necessary to not merge the same changes - forth and back: e.g., if you committed a merge of a certain - revision of the branch into the source, you do not want that commit - to appear as available to merged into the branch (as the code - originated in the branch itself!). svnmerge will automatically - exclude these so-called "reflected" revisions.""", - [ - Option("-A", "--all", - dest="avail-showwhat", - value=["blocked", "avail"], - default=["avail"], - help="show both available and blocked revisions (aka ignore " - "blocked revisions)"), - "-b", - Option("-B", "--blocked", - dest="avail-showwhat", - value=["blocked"], - help="show the blocked revision list (see '%s block')" % NAME), - Option("-d", "--diff", - dest="avail-display", - value="diffs", - default="revisions", - help="show corresponding diff instead of revision list"), - Option("--summarize", - dest="avail-display", - value="summarize", - help="show summarized diff instead of revision list"), - Option("-l", "--log", - dest="avail-display", - value="logs", - help="show corresponding log history instead of revision list"), - "-r", - "-S", - ]), - - "integrated": (action_integrated, - "integrated [OPTION...] [PATH]", - """Show merged revisions available for PATH as a revision list. - If --revision is given, the revisions shown will be limited to - those also specified in the option.""", - [ - Option("-d", "--diff", - dest="integrated-display", - value="diffs", - default="revisions", - help="show corresponding diff instead of revision list"), - Option("-l", "--log", - dest="integrated-display", - value="logs", - help="show corresponding log history instead of revision list"), - "-r", - "-S", - ]), - - "rollback": (action_rollback, - "rollback [OPTION...] [PATH]", - """Rollback previously merged in revisions from PATH. The - --revision option is mandatory, and specifies which revisions - will be rolled back. Only the previously integrated merges - will be rolled back. - - When manually rolling back changes, --record-only can be used to - instruct %s that a manual rollback of a certain revision - already happened, so that it can record it and offer that - revision for merge henceforth.""" % (NAME), - [ - "-f", "-r", "-S", "-M", # import common opts - ]), - - "merge": (action_merge, - "merge [OPTION...] [PATH]", - """Merge in revisions into PATH from its source. If --revision is omitted, - all the available revisions will be merged. In any case, already merged-in - revisions will NOT be merged again. - - When svnmerge is used to bidirectionally merge changes between a - branch and its source, it is necessary to not merge the same changes - forth and back: e.g., if you committed a merge of a certain - revision of the branch into the source, you do not want that commit - to appear as available to merged into the branch (as the code - originated in the branch itself!). svnmerge will automatically - exclude these so-called "reflected" revisions. - - When manually merging changes across branches, --record-only can - be used to instruct %s that a manual merge of a certain revision - already happened, so that it can record it and not offer that - revision for merge anymore. Conversely, when there are revisions - which should not be merged, use '%s block'.""" % (NAME, NAME), - [ - "-b", "-f", "-r", "-S", "-M", # import common opts - ]), - - "block": (action_block, - "block [OPTION...] [PATH]", - """Block revisions within PATH so that they disappear from the available - list. This is useful to hide revisions which will not be integrated. - If --revision is omitted, it defaults to all the available revisions. - - Do not use this option to hide revisions that were manually merged - into the branch. Instead, use '%s merge --record-only', which - records that a merge happened (as opposed to a merge which should - not happen).""" % NAME, - [ - "-f", "-r", "-S", # import common opts - ]), - - "unblock": (action_unblock, - "unblock [OPTION...] [PATH]", - """Revert the effect of '%s block'. If --revision is omitted, all the - blocked revisions are unblocked""" % NAME, - [ - "-f", "-r", "-S", # import common opts - ]), - - "uninit": (action_uninit, - "uninit [OPTION...] [PATH]", - """Remove merge tracking information from PATH. It cleans any kind of merge - tracking information (including the list of blocked revisions). If there - are multiple sources, use --source to indicate which source you want to - forget about.""", - [ - "-f", "-S", # import common opts - ]), -} - - -def main(args): - global opts - - # Initialize default options - opts = default_opts.copy() - logs.clear() - - optsparser = CommandOpts(global_opts, common_opts, command_table, - version="%%prog r%s\n modified: %s\n\n" - "Copyright (C) 2004,2005 Awarix Inc.\n" - "Copyright (C) 2005, Giovanni Bajo" - % (__revision__, __date__)) - - cmd, args, state = optsparser.parse(args) - opts.update(state) - - source = opts.get("source", None) - branch_dir = "." - - if str(cmd) == "init": - if len(args) == 1: - source = args[0] - elif len(args) > 1: - optsparser.error("wrong number of parameters", cmd) - elif str(cmd) in command_table.keys(): - if len(args) == 1: - branch_dir = args[0] - elif len(args) > 1: - optsparser.error("wrong number of parameters", cmd) - else: - assert False, "command not handled: %s" % cmd - - # Validate branch_dir - if not is_wc(branch_dir): - if str(cmd) == "avail": - info = None - # it should be noted here that svn info does not error exit - # if an invalid target is specified to it (as is - # intuitive). so the try, except code is not absolutely - # necessary. but, I retain it to indicate the intuitive - # handling. - try: - info = get_svninfo(branch_dir) - except LaunchError: - pass - # test that we definitely targeted a subversion directory, - # mirroring the purpose of the earlier is_wc() call - if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory": - error('"%s" is neither a valid URL, nor a working directory' % branch_dir) - else: - error('"%s" is not a subversion working directory' % branch_dir) - - # give out some hints as to potential pathids - PathIdentifier.hint(branch_dir) - if source: PathIdentifier.hint(source) - - # Extract the integration info for the branch_dir - branch_props = get_merge_props(branch_dir) - - # Calculate source_url and source_path - report("calculate source path for the branch") - if not source: - if str(cmd) == "init": - cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir) - if not cf_source: - error('no copyfrom info available. ' - 'Explicit source argument (-S/--source) required.') - opts["source-url"] = get_repo_root(branch_dir) + cf_source - opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"]) - - if not opts["revision"]: - opts["revision"] = "1-" + cf_rev - else: - opts["source-pathid"] = get_default_source(branch_dir, branch_props) - opts["source-url"] = opts["source-pathid"].get_url() - - assert is_pathid(opts["source-pathid"]) - assert is_url(opts["source-url"]) - else: - # The source was given as a command line argument and is stored in - # SOURCE. Ensure that the specified source does not end in a /, - # otherwise it's easy to have the same source path listed more - # than once in the integrated version properties, with and without - # trailing /'s. - source = rstrip(source, "/") - if not is_wc(source) and not is_url(source): - # Check if it is a substring of a pathid recorded - # within the branch properties. - found = [] - for pathid in branch_props.keys(): - if pathid.match_substring(source): - found.append(pathid) - if len(found) == 1: - # (assumes pathid is a repository-relative-path) - source_pathid = found[0] - source = source_pathid.get_url() - else: - error('"%s" is neither a valid URL, nor an unambiguous ' - 'substring of a repository path, nor a working directory' - % source) - else: - source_pathid = PathIdentifier.from_target(source) - - source_pathid = PathIdentifier.from_target(source) - if str(cmd) == "init" and \ - source_pathid == PathIdentifier.from_target("."): - error("cannot init integration source path '%s'\n" - "Its repository-relative path must differ from the " - "repository-relative path of the current directory." - % source_pathid) - opts["source-pathid"] = source_pathid - opts["source-url"] = target_to_url(source) - - # Sanity check source_url - assert is_url(opts["source-url"]) - # SVN does not support non-normalized URL (and we should not - # have created them) - assert opts["source-url"].find("/..") < 0 - - report('source is "%s"' % opts["source-url"]) - - # Get previously merged revisions (except when command is init) - if str(cmd) != "init": - opts["merged-revs"] = merge_props_to_revision_set(branch_props, - opts["source-pathid"]) - - # Perform the action - cmd(branch_dir, branch_props) - - -if __name__ == "__main__": - try: - main(sys.argv[1:]) - except LaunchError, (ret, cmd, out): - err_msg = "command execution failed (exit code: %d)\n" % ret - err_msg += cmd + "\n" - err_msg += "".join(out) - error(err_msg) - except KeyboardInterrupt: - # Avoid traceback on CTRL+C - print "aborted by user" - sys.exit(1) diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/testing/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf deleted file mode 100644 index 37fb7ea10..000000000 --- a/testing/subversion/svnserve.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" - -#SVNSERVE_USER="svn" diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD deleted file mode 100644 index c54007652..000000000 --- a/testing/syslog-ng/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 129498 2011-06-28 13:40:42Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> - -pkgname=syslog-ng -pkgver=3.2.4 -pkgrel=2 -pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" -arch=('i686' 'x86_64') -license=('GPL2') -groups=('base') -url="http://www.balabit.com/network-security/syslog-ng/" -depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap' 'awk') -makedepends=('flex' 'pkg-config') -optdepends=('logrotate: for rotating log files') -provides=('logger') -options=('!libtool') -backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ - 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') -source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz - non-blocking-systemd-fds.patch - syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch) -md5sums=('5995f7dad0053a478b60a63f6f754203' - '25e43afe51eb2223c25168e3c3e7aaf6' - '344dddfff946300f5576b13a7e8ea19f' - '735636090be4582885974542d2a75855' - '8b4441343d859c2f01c2cf799a7e6f98' - '46e5dcff71f820d497898331a3f608fe') -sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1' - '73b83deae9a8b945dfb13adf331e6bf6f119b83e' - 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f' - 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' - '4481819762fd1b6f25903016a8878e63c0058fcb' - 'f093a09626a528d23f0f2aeece018cab15a735a9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # fix #22555 for kernels >=2.6.38 - patch -p1 -i ../cap_syslog.patch - - # fix systemd blocking FD bug - # https://bugzilla.balabit.com/show_bug.cgi?id=125 - patch -Np1 < "$srcdir/non-blocking-systemd-fds.patch" - - ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \ - --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \ - --enable-tcp-wrapper \ - --with-pidfile-dir=/var/run \ - --disable-spoof-source \ - --enable-systemd - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d" - install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf" - install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng" - install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng" - install -Dm644 "doc/examples/syslog-ng.service" "$pkgdir/lib/systemd/system/syslog-ng.service" -} diff --git a/testing/syslog-ng/cap_syslog.patch b/testing/syslog-ng/cap_syslog.patch deleted file mode 100644 index b6e6db6e4..000000000 --- a/testing/syslog-ng/cap_syslog.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/lib/gprocess.h b/lib/gprocess.h -index cda35b0..5c449f7 100644 ---- a/lib/gprocess.h -+++ b/lib/gprocess.h -@@ -28,9 +28,14 @@ - #include "syslog-ng.h" - - #include <sys/types.h> -+#include <sys/utsname.h> - - #if ENABLE_LINUX_CAPS - # include <sys/capability.h> -+# -+# ifndef CAP_SYSLOG -+# define CAP_SYSLOG 34 -+# endif - #endif - - typedef enum -@@ -78,5 +83,8 @@ void g_process_finish(void); - - void g_process_add_option_group(GOptionContext *ctx); - -+extern int kernel_version; -+extern void get_kernel_version(void); -+#define LINUX_VERSION(x,y,z) (0x10000*(x) + 0x100*(y) + z) - - #endif -diff --git a/modules/affile/affile.c b/modules/affile/affile.c -index e145324..886fa72 100644 ---- a/modules/affile/affile.c -+++ b/modules/affile/affile.c -@@ -59,7 +59,12 @@ affile_open_file(gchar *name, gint flags, - if (privileged) - { - g_process_cap_modify(CAP_DAC_READ_SEARCH, TRUE); -- g_process_cap_modify(CAP_SYS_ADMIN, TRUE); -+ if (!kernel_version) -+ get_kernel_version(); -+ if (kernel_version < LINUX_VERSION(2, 6, 38)) -+ g_process_cap_modify(CAP_SYS_ADMIN, TRUE); -+ else -+ g_process_cap_modify(CAP_SYSLOG, TRUE); - } - else - { -diff --git a/syslog-ng/main.c b/syslog-ng/main.c -index 9880c1f..ee5031b 100644 ---- a/syslog-ng/main.c -+++ b/syslog-ng/main.c -@@ -67,6 +67,7 @@ static gboolean syntax_only = FALSE; - static gboolean display_version = FALSE; - static gchar *ctlfilename = PATH_CONTROL_SOCKET; - static gchar *preprocess_into = NULL; -+int kernel_version; - - static volatile sig_atomic_t sig_hup_received = FALSE; - static volatile sig_atomic_t sig_term_received = FALSE; -@@ -363,6 +364,20 @@ version(void) - ON_OFF_STR(ENABLE_PACCT_MODULE)); - } - -+void -+get_kernel_version(void) { -+ static struct utsname uts; -+ int x = 0, y = 0, z = 0; -+ -+ if (uname(&uts) == -1) { -+ fprintf(stderr, "Unable to retrieve kernel version.\n"); -+ exit(1); -+ } -+ -+ sscanf(uts.release, "%d.%d.%d", &x, &y, &z); -+ kernel_version = LINUX_VERSION(x, y, z); -+} -+ - int - main(int argc, char *argv[]) - { -@@ -379,9 +394,20 @@ main(int argc, char *argv[]) - * indicate readability. Enabling/disabling cap_sys_admin on every poll - * invocation seems to be too expensive. So I enable it for now. */ - -- g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," -+ if (!kernel_version) -+ get_kernel_version(); -+ if (kernel_version < LINUX_VERSION(2, 6, 34)) -+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," - "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner=p " - "cap_sys_admin=ep"); -+ else if (kernel_version < LINUX_VERSION(2, 6, 38)) -+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," -+ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," -+ "cap_sys_admin=p"); -+ else -+ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," -+ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," -+ "cap_syslog=p"); - ctx = g_option_context_new("syslog-ng"); - g_process_add_option_group(ctx); - msg_add_option_group(ctx); diff --git a/testing/syslog-ng/non-blocking-systemd-fds.patch b/testing/syslog-ng/non-blocking-systemd-fds.patch deleted file mode 100644 index bd056088b..000000000 --- a/testing/syslog-ng/non-blocking-systemd-fds.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2f214c4f87d944aa28d53e331a67b1fd88d9840f Mon Sep 17 00:00:00 2001 -From: Balazs Scheidler <bazsi@balabit.hu> -Date: Wed, 22 Jun 2011 12:50:53 +0200 -Subject: [PATCH] systemd: make sure the acquired fd is in non-blocking mode - -The fd acquired from systemd is in blocking mode, and syslog-ng -didn't explicitly set it to non-blocking, causing syslog-ng -to stall. This patch changes that, explicitly enables -O_NONBLOCK and O_CLOEXEC on systemd acquired fds. - -Reported-By: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> -Signed-off-by: Balazs Scheidler <bazsi@balabit.hu> ---- - modules/afsocket/afunix.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/modules/afsocket/afunix.c b/modules/afsocket/afunix.c -index cd9c205..9a4e37b 100644 ---- a/modules/afsocket/afunix.c -+++ b/modules/afsocket/afunix.c -@@ -108,6 +108,8 @@ afunix_sd_acquire_socket(AFSocketSourceDriver *s, gint *result_fd) - - if (*result_fd != -1) - { -+ g_fd_set_nonblock(*result_fd, TRUE); -+ g_fd_set_cloexec(*result_fd, TRUE); - msg_verbose("Acquired systemd socket", - evt_tag_str("filename", self->filename), - evt_tag_int("systemd-sock-fd", *result_fd), --- -1.7.5.4 - diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf deleted file mode 100644 index 6e3362681..000000000 --- a/testing/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,92 +0,0 @@ -@version: 3.2 -# -# /etc/syslog-ng/syslog-ng.conf -# - -options { - stats_freq (0); - flush_lines (0); - time_reopen (10); - log_fifo_size (1000); - long_hostnames(off); - use_dns (no); - use_fqdn (no); - create_dirs (no); - keep_hostname (yes); - perm(0640); - group("log"); -}; - -source src { - unix-dgram("/dev/log"); - internal(); - file("/proc/kmsg"); -}; - -destination d_authlog { file("/var/log/auth.log"); }; -destination d_syslog { file("/var/log/syslog.log"); }; -destination d_cron { file("/var/log/crond.log"); }; -destination d_daemon { file("/var/log/daemon.log"); }; -destination d_kernel { file("/var/log/kernel.log"); }; -destination d_lpr { file("/var/log/lpr.log"); }; -destination d_user { file("/var/log/user.log"); }; -destination d_uucp { file("/var/log/uucp.log"); }; -destination d_mail { file("/var/log/mail.log"); }; -destination d_news { file("/var/log/news.log"); }; -destination d_ppp { file("/var/log/ppp.log"); }; -destination d_debug { file("/var/log/debug.log"); }; -destination d_messages { file("/var/log/messages.log"); }; -destination d_errors { file("/var/log/errors.log"); }; -destination d_everything { file("/var/log/everything.log"); }; -destination d_iptables { file("/var/log/iptables.log"); }; -destination d_acpid { file("/var/log/acpid.log"); }; -destination d_console { usertty("root"); }; - -# Log everything to tty12 -destination console_all { file("/dev/tty12"); }; - -filter f_auth { facility(auth); }; -filter f_authpriv { facility(auth, authpriv); }; -filter f_syslog { program(syslog-ng); }; -filter f_cron { facility(cron); }; -filter f_daemon { facility(daemon); }; -filter f_kernel { facility(kern) and not filter(f_iptables); }; -filter f_lpr { facility(lpr); }; -filter f_mail { facility(mail); }; -filter f_news { facility(news); }; -filter f_user { facility(user); }; -filter f_uucp { facility(uucp); }; -filter f_ppp { facility(local2); }; -filter f_debug { not facility(auth, authpriv, news, mail); }; -filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; -filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; -filter f_emergency { level(emerg); }; -filter f_info { level(info); }; -filter f_notice { level(notice); }; -filter f_warn { level(warn); }; -filter f_crit { level(crit); }; -filter f_err { level(err); }; -filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; -filter f_acpid { program("acpid"); }; - -log { source(src); filter(f_acpid); destination(d_acpid); }; -log { source(src); filter(f_authpriv); destination(d_authlog); }; -log { source(src); filter(f_syslog); destination(d_syslog); }; -log { source(src); filter(f_cron); destination(d_cron); }; -log { source(src); filter(f_daemon); destination(d_daemon); }; -log { source(src); filter(f_kernel); destination(d_kernel); }; -log { source(src); filter(f_lpr); destination(d_lpr); }; -log { source(src); filter(f_mail); destination(d_mail); }; -log { source(src); filter(f_news); destination(d_news); }; -log { source(src); filter(f_ppp); destination(d_ppp); }; -log { source(src); filter(f_user); destination(d_user); }; -log { source(src); filter(f_uucp); destination(d_uucp); }; -#log { source(src); filter(f_debug); destination(d_debug); }; -log { source(src); filter(f_messages); destination(d_messages); }; -log { source(src); filter(f_err); destination(d_errors); }; -log { source(src); filter(f_emergency); destination(d_console); }; -log { source(src); filter(f_everything); destination(d_everything); }; -log { source(src); filter(f_iptables); destination(d_iptables); }; - -# Log everything to tty12 -#log { source(src); destination(console_all); }; diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate deleted file mode 100644 index e0e6929f2..000000000 --- a/testing/syslog-ng/syslog-ng.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { - missingok - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc deleted file mode 100755 index bb5320b2c..000000000 --- a/testing/syslog-ng/syslog-ng.rc +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -checkconfig() { - syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf - if [ $? -gt 0 ]; then - stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)." - stat_fail - exit 0 - fi -} - -PID=`pidof -o %PPID /usr/sbin/syslog-ng` -case "$1" in - start) - stat_busy "Starting Syslog-NG" - checkconfig - [ -z "$PID" ] && /usr/sbin/syslog-ng - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon syslog-ng - stat_done - fi - ;; - stop) - stat_busy "Stopping Syslog-NG" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/syslog-ng.pid -# Removing stale syslog-ng.persist file. Its new location, as of 2.0.6-1, is /var/lib/syslog-ng/ - rm -f /var/syslog-ng.persist - rm_daemon syslog-ng - stat_done - fi - ;; - reload) - stat_busy "Reloading Syslog-NG configuration and re-opening log files" - if [ -z "$PID" ]; then - stat_fail - else - checkconfig - kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac -exit 0 diff --git a/testing/twisted/PKGBUILD b/testing/twisted/PKGBUILD deleted file mode 100644 index d25475b8d..000000000 --- a/testing/twisted/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 126682 2011-06-06 14:53:30Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=twisted -pkgver=11.0.0 -pkgrel=1 -pkgdesc="Asynchronous networking framework written in Python." -arch=('i686' 'x86_64') -url="http://twistedmatrix.com/" -license=('MIT') -depends=('python2' 'pycrypto' 'zope-interface') -optdepends=('python2-pyopenssl' - 'python-soappy:for twisted.web.soap') -install=twisted.install -source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2) -md5sums=('d7f94a1609a1b8f3b8c8d0146d4cfe54') - -build() { - cd "${srcdir}/Twisted-${pkgver}" - python2 setup.py build -} - -package() { - cd "${srcdir}/Twisted-${pkgver}" - python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py - sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py -} diff --git a/testing/twisted/twisted.install b/testing/twisted/twisted.install deleted file mode 100644 index 8e93ffd3c..000000000 --- a/testing/twisted/twisted.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1 -} - -post_upgrade() { - post_install -} - -post_remove() { - find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f -} diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD deleted file mode 100644 index a181f374c..000000000 --- a/testing/valgrind/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 126782 2011-06-07 10:02:00Z allan $ -# Maintainer: Dan McGee <dan@archlinux.org> -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=valgrind -pkgver=3.6.1 -pkgrel=2 -pkgdesc="A tool to help find memory-management problems in programs" -arch=('i686' 'x86_64') -license=('GPL') -url="http://valgrind.org/" -depends=('glibc>=2.14' 'glibc<2.15' 'perl') -makedepends=('gdb') -options=('!emptydirs') -source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 - valgrind-3.6.1-glibc-2.14.patch - glibc-patch-version.patch) -md5sums=('2c3aa122498baecc9d69194057ca88f5' - '560032ce5d27ef0c7c1af32c3fd45833' - 'b657f0ebdde3d9aefc9fd16f9e653702') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # make sure our CFLAGS are respected - sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in - - # glibc-2.14 compatibility - patch -Np1 -i ${srcdir}/valgrind-3.6.1-glibc-2.14.patch - - # prevent need to rebuild with glibc patch level version bumps - patch -Np1 -i ${srcdir}/glibc-patch-version.patch - - if [ "${CARCH}" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man - fi - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/valgrind/glibc-patch-version.patch b/testing/valgrind/glibc-patch-version.patch deleted file mode 100644 index 2c6830aef..000000000 --- a/testing/valgrind/glibc-patch-version.patch +++ /dev/null @@ -1,52 +0,0 @@ -Saves having to rebuild valgrind on glibc-x.x.* patch level releases - -diff -Naur valgrind-3.5.0-old//glibc-2.X.supp.in valgrind-3.5.0/glibc-2.X.supp.in ---- valgrind-3.5.0-old//glibc-2.X.supp.in 2009-08-19 23:37:48.000000000 +1000 -+++ valgrind-3.5.0/glibc-2.X.supp.in 2010-05-22 19:43:08.088007038 +1000 -@@ -168,9 +168,9 @@ - Memcheck:Param - socketcall.sendto(msg) - fun:__sendto_nocancel -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so - } - { - glibc24-64bit-padding-1c -@@ -180,7 +180,7 @@ - fun:__nscd_get_map_ref - fun:nscd_get*_r - fun:*nscd* -- obj:/*libc-@GLIBC_VERSION@.so -+ obj:/*libc-@GLIBC_VERSION@*.so - } - - -@@ -199,18 +199,18 @@ - Memcheck:Param - socketcall.sendto(msg) - fun:send -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so - } - { - X11-64bit-padding-4b - Memcheck:Param - socketcall.send(msg) - fun:send -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -- obj:/*libc-@GLIBC_VERSION@.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so -+ obj:/*libc-@GLIBC_VERSION@*.so - } - - ##----------------------------------------------------------------------## diff --git a/testing/valgrind/valgrind-3.6.1-glibc-2.14.patch b/testing/valgrind/valgrind-3.6.1-glibc-2.14.patch deleted file mode 100644 index 7fd217016..000000000 --- a/testing/valgrind/valgrind-3.6.1-glibc-2.14.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- valgrind/configure.in.jj 2010-10-21 03:14:02.000000000 +0200 -+++ valgrind/configure.in 2010-11-05 17:09:18.674455299 +0100 -@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.14) -+ AC_MSG_RESULT(2.14 family) -+ AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) - AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) -@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) - AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) - AC_MSG_ERROR([or Darwin libc]) - ;; ---- valgrind/config.h.in.jj 2010-10-20 22:20:49.000000000 +0200 -+++ valgrind/config.h.in 2010-11-05 17:08:33.863454886 +0100 -@@ -33,6 +33,9 @@ - /* Define to 1 if you're using glibc 2.13.x */ - #undef GLIBC_2_13 - -+/* Define to 1 if you're using glibc 2.14.x */ -+#undef GLIBC_2_14 -+ - /* Define to 1 if you're using glibc 2.2.x */ - #undef GLIBC_2_2 - ---- valgrind/configure.jj 2010-10-21 03:16:18.000000000 +0200 -+++ valgrind/configure 2010-11-05 17:09:39.163455396 +0100 -@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_13 1" >>confde - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.14) -+ echo "$as_me:$LINENO: result: 2.14 family" >&5 -+echo "${ECHO_T}2.14 family" >&6 -+ -+cat >>confdefs.h <<\_ACEOF -+#define GLIBC_2_14 1 -+_ACEOF -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5 - $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; } -@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 - as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; diff --git a/testing/vim/PKGBUILD b/testing/vim/PKGBUILD deleted file mode 100644 index 603de624a..000000000 --- a/testing/vim/PKGBUILD +++ /dev/null @@ -1,198 +0,0 @@ -# $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/testing/vim/archlinux.vim b/testing/vim/archlinux.vim deleted file mode 100644 index 148bb930f..000000000 --- a/testing/vim/archlinux.vim +++ /dev/null @@ -1,26 +0,0 @@ -" 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/testing/vim/gvim.desktop b/testing/vim/gvim.desktop deleted file mode 100644 index 56fd61b8f..000000000 --- a/testing/vim/gvim.desktop +++ /dev/null @@ -1,42 +0,0 @@ -[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/testing/vim/gvim.install b/testing/vim/gvim.install deleted file mode 100644 index 0a8d3b0a9..000000000 --- a/testing/vim/gvim.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - echo -n "Updating desktop and mime database..." - update-desktop-database -q - echo "done." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/vim/vimrc b/testing/vim/vimrc deleted file mode 100644 index 92d3ff980..000000000 --- a/testing/vim/vimrc +++ /dev/null @@ -1,16 +0,0 @@ -" 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/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD deleted file mode 100644 index 95361e280..000000000 --- a/testing/vlc/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 127816 2011-06-18 16:12:17Z ibiru $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> - -pkgname=vlc -pkgver=1.1.10 -pkgrel=4 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" -arch=('i686' 'x86_64') -url="http://www.videolan.org/vlc/" -license=('GPL') -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' 'libupnp' - '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' - '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') -install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('066cb94b1e3aa848d828121354d6be4d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-faad \ - --enable-v4l \ - --enable-snapshot \ - --enable-dbus-control \ - --enable-nls \ - --enable-lirc \ - --enable-pvr \ - --enable-ncurses \ - --with-live555-tree=/usr/lib/live \ - --enable-upnp \ - --enable-realrtsp - make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}/" install - - for res in 16 32 48 128; do - 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 -} diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install deleted file mode 100644 index 4a1091bc5..000000000 --- a/testing/vlc/vlc.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} diff --git a/testing/weechat/PKGBUILD b/testing/weechat/PKGBUILD deleted file mode 100644 index 7e2144efc..000000000 --- a/testing/weechat/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $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/x264/PKGBUILD b/testing/x264/PKGBUILD deleted file mode 100644 index 90508716e..000000000 --- a/testing/x264/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 127804 2011-06-18 16:05:03Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: damir <damir@archlinux.org> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=x264 -pkgver=20110617 -pkgrel=1 -pkgdesc="free library for encoding H264/AVC video streams" -arch=('i686' 'x86_64') -url="http://www.videolan.org/developers/x264.html" -license=('GPL') -depends=('glibc') -makedepends=('yasm') -source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) -md5sums=('928717aa2f0c7ca91e589d6b60e688f1') - -build() { - cd "$srcdir/$pkgname-snapshot-$pkgver-2245" - - ./configure --enable-shared - - make - make DESTDIR="$pkgdir" \ - bindir=/usr/bin \ - libdir=/usr/lib \ - includedir=/usr/include \ - install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules deleted file mode 100644 index 67e5580cc..000000000 --- a/testing/xf86-input-wacom/70-wacom.rules +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index f1bf57b06..000000000 --- a/testing/xf86-input-wacom/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $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/" -} |
