diff options
792 files changed, 0 insertions, 53382 deletions
diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD deleted file mode 100644 index 36ec36e3b..000000000 --- a/community-staging/cegui/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 47894 2011-05-26 00:25:26Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com>, -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> - -pkgname=cegui -pkgver=0.7.5 -pkgrel=3 -pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" -arch=('i686' 'x86_64') -url="http://crayzedsgui.sourceforge.net" -#options=('!libtool') -license=("MIT") -depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') -makedepends=('python2' 'doxygen') -source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) -md5sums=('38c79d1fdfaaa10f481c99a2ac479516') - -build() { - cd $srcdir/CEGUI-${pkgver} - - sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-xerces-c \ - --enable-null-renderer - - make -} - -package() { - cd $srcdir/CEGUI-${pkgver} - - make DESTDIR=${pkgdir} install - - #build docs - cd doc/doxygen && doxygen - cd .. && make DESTDIR=${pkgdir} install-html - - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} - diff --git a/community-staging/clementine/PKGBUILD b/community-staging/clementine/PKGBUILD deleted file mode 100644 index c276ec0d6..000000000 --- a/community-staging/clementine/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 47879 2011-05-25 20:42:25Z stephane $ -#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > -#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> - -pkgname=clementine -pkgver=0.7.1 -pkgrel=4 -pkgdesc="A music player and library organizer" -url="http://www.clementine-player.org/" -license=('GPL') -arch=('i686' 'x86_64') -depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice') -makedepends=('cmake' 'boost') -optdepends=('gstreamer0.10-base-plugins: for more open formats' - 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' - 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') -source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz - clementine-0.7.1-fix-devicekit.patch) -sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142' - 'd595e2746949363680e0d64fe2fb97b524c8d27c') -install=clementine.install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch b/community-staging/clementine/clementine-0.7.1-fix-devicekit.patch deleted file mode 100644 index 797a2c864..000000000 --- a/community-staging/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-staging/clementine/clementine.install b/community-staging/clementine/clementine.install deleted file mode 100644 index 2d71a7563..000000000 --- a/community-staging/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-staging/collectd/PKGBUILD b/community-staging/collectd/PKGBUILD deleted file mode 100644 index ceae766f1..000000000 --- a/community-staging/collectd/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 47414 2011-05-22 23:19:52Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Gerhard Brauer <gerhard.brauer@web.de> - -pkgname=collectd -pkgver=5.0.0 -pkgrel=4 -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-staging/collectd/install b/community-staging/collectd/install deleted file mode 100644 index 54cc0e1b3..000000000 --- a/community-staging/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-staging/collectd/libnotify-0.7.patch b/community-staging/collectd/libnotify-0.7.patch deleted file mode 100644 index 5ea67047a..000000000 --- a/community-staging/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-staging/collectd/rc.d b/community-staging/collectd/rc.d deleted file mode 100644 index 442f2324a..000000000 --- a/community-staging/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-staging/collectd/yajl-2.x.patch b/community-staging/collectd/yajl-2.x.patch deleted file mode 100644 index b90543dfe..000000000 --- a/community-staging/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-staging/courier-mta/PKGBUILD b/community-staging/courier-mta/PKGBUILD deleted file mode 100644 index 6ac1618dc..000000000 --- a/community-staging/courier-mta/PKGBUILD +++ /dev/null @@ -1,113 +0,0 @@ -# $Id: PKGBUILD 75460 2010-04-01 16:56:22Z giovanni $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -# ----------- NOTE TO ALL USERS ------------ -# Go read http://www.courier-mta.org/install.html b4 running or building courier - - -pkgname=courier-mta -pkgver=0.66.1 -pkgrel=2 -pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" -arch=(i686 x86_64) -license=('GPL2') -backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ - 'etc/courier/imapd' 'etc/courier/imapd-ssl' \ - 'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \ - 'etc/courier/courierd' 'etc/courier/sqwebmaild' \ - 'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \ - 'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \ - 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ - 'etc/conf.d/courier-mta') -url="http://courier-mta.org" -depends=('courier-authlib>=0.63.0' 'fam' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') -optdepends=('libldap') -makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'fam') -provides=('smtp-server' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') -conflicts=('courier-imap' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') -options=('!libtool') -install=courier-mta.install -source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 - courier-mta.rc.d - courier-mta.conf.d) -md5sums=('79250d71d88ba2bcb630b7356f0250cd' - 'e140f320968e57cfe459cd7a3b4017e0' - 'f3ff70b40c7a1f7a017e8c4cc4d92f4f') - -build() { - cd ${srcdir}/courier-${pkgver} - - # fix a tiny bug - sed -i -e \ - 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ - configure && chmod 755 configure - - # courier is more about configuring than compiling :-), lets start the mess - ./configure --prefix=/usr \ - --sysconfdir=/etc/courier \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var/spool/courier \ - --disable-root-check \ - --enable-unicode \ - --enable-workarounds-for-imap-client-bugs \ - --enable-mimetypes=/etc/mime.types \ - --with-piddir=/var/run/courier \ - --with-locking-method=lockf \ - --with-trashquota \ - --with-db=gdbm \ - --with-trashquota \ - --with-random=/dev/urandom --without-ispell \ - --with-mailuser=courier --with-mailgroup=courier \ - --with-certdb=/etc/ssl/certs/ - make -} - -package() { - cd ${srcdir}/courier-${pkgver} - - #chown mail.mail ${pkgdir}/var/spool/courier - make DESTDIR=${pkgdir} install - # docs say we can get rid of those after make - find ${pkgdir} -name '*\.a' -exec -rm -f {} \; - # install the perftest-script for testings - install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1 - ############################################################################### - # this is what usually "make install-configure" does - # *.dist files get rid of "dist" - for distfile in ${pkgdir}/etc/courier/*.dist; do - mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist) - done - # install pam files according to the layout used in Archlinux - for pamfile in ${pkgdir}/etc/courier/*.authpam; do - sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile} - #echo "password required pam_unix.so" >> $pamfile - install -Dm 644 ${pamfile} \ - ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//") - rm -f ${pamfile} - done - - ############################################################################### - # Arch Linux specific tweaks to make things easier for the user - # create passwordfile for webadmin -> standard archwebadmin - sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile - yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password - # arch specific scripts - install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta - install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta - #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ - # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache - # bug http://bugs.archlinux.org/task/5154 - find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \; - # fixing some permissions - chown -R courier:courier ${pkgdir}/usr/lib/courier/modules - rm -r ${pkgdir}/var/run - #chown -R courier:courier ${pkgdir}/var/run/courier - chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share} - # make a link to /usr/sbin/sendmail - install -dm 755 ${pkgdir}/usr/sbin - cd ${pkgdir}/usr/sbin - ln -s ../bin/sendmail ./sendmail -} diff --git a/community-staging/courier-mta/courier-mta.conf.d b/community-staging/courier-mta/courier-mta.conf.d deleted file mode 100644 index 5856a5cda..000000000 --- a/community-staging/courier-mta/courier-mta.conf.d +++ /dev/null @@ -1,18 +0,0 @@ -# -# Parameters to be passed to courier-imap -# -# -# Select the service you want started with courier-imap -# -# Available options : -# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild -# -CI_DAEMONS="courier esmtpd imapd pop3d" - -# If you want authdaemond to be automatically started and -# stopped by courier-imap, set this to "true" -AUTO_AUTHDAEMON="false" - -# Courier will start this many seconds after autodaemond if -# AUTO_AUTHDAEMON is set to "true" -AUTO_AUTHDAEMON_LAG=2 diff --git a/community-staging/courier-mta/courier-mta.install b/community-staging/courier-mta/courier-mta.install deleted file mode 100644 index eac627867..000000000 --- a/community-staging/courier-mta/courier-mta.install +++ /dev/null @@ -1,46 +0,0 @@ -# arg 1: the new package version -post_install() { - cat << EOM - --> if you are using LDAP services to provide lookup in sqwebmail or aliases - --> then you have to install: - libldap -EOM - # create the *.dat files - makealiases - makesmtpaccess -} - -pre_upgrade() { - pre_remove $1 -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - - -pre_remove() { - # manual backup, since courier is always processing the whole directory - # - so it would process "system" AND "system.pacsave" -> bad - [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup - cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system - cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default - cat << EOM - --> the /etc/courier/aliase/system and the /etc/courier/smtpaccess/default - --> files have been backed up to /etc/courier/_backup since the *.pacsave - --> files cannot stay in place. Read about couriers alias handling from the - --> documentation! -EOM -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift - -$op $* diff --git a/community-staging/courier-mta/courier-mta.rc.d b/community-staging/courier-mta/courier-mta.rc.d deleted file mode 100644 index 6c5fbc914..000000000 --- a/community-staging/courier-mta/courier-mta.rc.d +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta -[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 -[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond start - sleep ${AUTO_AUTHDAEMON_LAG} - fi - if [ ! -f /var/run/daemons/authdaemond ]; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - for daemon in $CI_DAEMONS; do - stat_busy "Starting Courier ${daemon}" - /usr/sbin/${daemon} start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon - stat_done - fi - done - ;; - stop) - for daemon in $CI_DAEMONS; do - stat_busy "Stopping Courier ${daemon}" - /usr/sbin/${daemon} stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon - stat_done - fi - done - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond stop - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly b/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly deleted file mode 100644 index 6c541321e..000000000 --- a/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Cleans the cache of the sqwebmail server -if [ -x /usr/share/sqwebmail/cleancache.pl ]; then - su -c "/usr/share/sqwebmail/cleancache.pl" bin -fi diff --git a/community-staging/csfml/PKGBUILD b/community-staging/csfml/PKGBUILD deleted file mode 100644 index d0920b18d..000000000 --- a/community-staging/csfml/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 47932 2011-05-26 06:40:32Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -pkgname=csfml - -_git=true - -if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110526 -fi - -pkgrel=1 -pkgdesc='C bindings for sfml' -arch=('i686' 'x86_64') -url='http://www.sfml-dev.org/' -license=('zlib') -depends=('sfml') -makedepends=('git' 'cmake' 'doxygen') - -_gitroot='https://github.com/LaurentGomila/SFML.git' -_gitname='SFML' - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - cd $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - cd bindings/c/ - mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ - -DBUILD_DOC=true - make - make doc -} - -package() { - cd "$srcdir/$_gitname-build/bindings/c/build/" - - make DESTDIR="$pkgdir/" install - - install -Dm644 ../license.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - make clean -} - diff --git a/community-staging/ekg2/PKGBUILD b/community-staging/ekg2/PKGBUILD deleted file mode 100644 index 77a930762..000000000 --- a/community-staging/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-staging/freeradius/PKGBUILD b/community-staging/freeradius/PKGBUILD deleted file mode 100644 index 1b3d364f0..000000000 --- a/community-staging/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-staging/freeradius/freeradius.install b/community-staging/freeradius/freeradius.install deleted file mode 100644 index e50aa403d..000000000 --- a/community-staging/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-staging/freeradius/krb5-build-fix.patch b/community-staging/freeradius/krb5-build-fix.patch deleted file mode 100644 index 11dae7090..000000000 --- a/community-staging/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-staging/freeradius/radiusd b/community-staging/freeradius/radiusd deleted file mode 100755 index bf872b6f2..000000000 --- a/community-staging/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-staging/frogatto/PKGBUILD b/community-staging/frogatto/PKGBUILD deleted file mode 100644 index 434ddd9fb..000000000 --- a/community-staging/frogatto/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 47897 2011-05-26 00:34:36Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Tom Wambold <tom5760@gmail.com> - -pkgname='frogatto' -arch=('i686' 'x86_64') -pkgver=1.1 -pkgrel=3 -pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog" -url="http://www.frogatto.com" -license=('GPL') -depends=('libgl' 'mesa' 'glew' 'sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'libpng' 'boost-libs' 'frogatto-data') -makedepends=('boost') -source=(http://www.frogatto.com/files/$pkgname-$pkgver.tar.bz2 - frogatto - frogatto.desktop) -md5sums=('8c01c8a1d7ecf820a682eb684d8bf739' - '9ed2c9ea59e95fe3c0b3ad49e58f8890' - 'e31563b04748a39292a59aaad633ff58') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's/ccache //g' Makefile - sed -i 's/-lprofiler//g' Makefile - sed -i 's/-lboost_regex-mt/-lboost_regex/g' Makefile - sed -i 's/-lboost_system-mt/-lboost_system/g' Makefile - sed -i 's/-lboost_thread-mt/-lboost_thread/g' Makefile - sed -i 's/-lboost_iostreams-mt/-lboost_iostreams/g' Makefile - make game server -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -D -m755 game $pkgdir/opt/frogatto/game - install -D -m755 server $pkgdir/opt/frogatto/server - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/frogatto/LICENSE - - cd $srcdir - install -DT -m755 frogatto $pkgdir/usr/bin/frogatto - install -D -m644 frogatto.desktop $pkgdir/usr/share/applications/frogatto.desktop -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/frogatto/frogatto b/community-staging/frogatto/frogatto deleted file mode 100644 index 0d741e0de..000000000 --- a/community-staging/frogatto/frogatto +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/frogatto -exec /opt/frogatto/game $* diff --git a/community-staging/frogatto/frogatto.desktop b/community-staging/frogatto/frogatto.desktop deleted file mode 100644 index b0795467a..000000000 --- a/community-staging/frogatto/frogatto.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Frogatto -GenericName=Old-school 2D platformer -Comment=Old-school 2D platformer -Exec=/usr/bin/frogatto -Terminal=false -MultipleArgs=false -Type=Application -Icon=/opt/frogatto/images/window-icon.png -Categories=Game;ArcadeGame diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD deleted file mode 100644 index 45dee93f7..000000000 --- a/community-staging/gambas3/PKGBUILD +++ /dev/null @@ -1,1080 +0,0 @@ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> - -pkgbase=gambas3 -pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' - 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' - 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' - 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' - 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' - 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' - 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' - 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' - 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.1 -pkgrel=3 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net/" -license=('GPL') -groups=('gambas3') -makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' - 'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' - 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') -options=('!emptydirs' '!makeflags') -source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('ab4c182b9d7dfec06b3a42bb002a779a' - 'b284be39d147ec799f1116a6abc068b4' - 'a8ec8e5a6aba7a7e453ce7a35c1800a9') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - ./reconf-all - ./configure --prefix=/usr -C - - make bindir=${pkgdir}/usr/bin -} - -package_gambas3-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Gambas3 runtime environment" - install=gambas3-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install - - cd ../gbx - make DESTDIR="${pkgdir}" install - cd ../lib/debug - make DESTDIR="${pkgdir}" install - cd ../eval - make DESTDIR="${pkgdir}" install - cd ../draw - make DESTDIR="${pkgdir}" install - install -D -m644 ../gb.component \ - ${pkgdir}/usr/lib/gambas3 - - cd ${srcdir}/${pkgbase}-${pkgver}/main - ln -s gbx3 ${pkgdir}/usr/bin/gbr3 - gbc/gbi3 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la} - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 mime/* \ - ${pkgdir}/usr/share/gambas3/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas3/icons - install -D -m644 mime/application-x-gambas.png \ - ${pkgdir}/usr/share/gambas3/icons/application-x-gambas.png - - cd gbc - make DESTDIR="${pkgdir}" uninstall -} - -package_gambas3-devel() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install -} - -package_gambas3-ide() { - depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' - 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' - 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') - pkgdesc="Gambas3 Integrated Development Environment" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - -#!! with the ide !! - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ - ${pkgdir}/usr/share/applications/gambas3.desktop - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ - ${pkgdir}/usr/share/pixmaps/gambas3.png - - rm -r ${pkgdir}/usr/bin/gb* - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3 -} - -package_gambas3-script() { - depends=('gambas3-devel') - pkgdesc="Gambas3 scripter and server programs support" - install=gambas3-script.install - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/ - ## - - rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}} - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3/[c-i]* -} - -package_gambas3-examples() { - depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' - 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' - 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' - 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' - 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' - 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' - 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' - 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') - pkgdesc="Gambas3 examples" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - rm -r ${pkgdir}/usr/{bin,lib} - rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} -} - -package_gambas3-gb-cairo() { - depends=('gambas3-runtime' 'cairo') - pkgdesc="Gambas3 cairo component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-chart() { - depends=('gambas3-gb-form') - pkgdesc="Gambas3 chart component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* - ## -} - -package_gambas3-gb-compress() { - depends=('gambas3-runtime' 'bzip2' 'zlib') - pkgdesc="Gambas3 compression support component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]* - ## -} - -package_gambas3-gb-crypt() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 MD5/DES crypting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*} - ## -} - -package_gambas3-gb-db-form() { - depends=('gambas3-gb-db' 'gambas3-gb-form') - pkgdesc="Gambas3 database form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} - ## -} - -package_gambas3-gb-db-mysql() { - depends=('gambas3-gb-db' 'libmysqlclient') - pkgdesc="Gambas3 MySQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-odbc() { - depends=('gambas3-gb-db' 'unixodbc') - pkgdesc="Gambas3 ODBC database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-postgresql() { - depends=('gambas3-gb-db' 'postgresql-libs') - pkgdesc="Gambas3 PostgreSQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite2() { - depends=('gambas3-gb-db' 'sqlite2') - pkgdesc="Gambas3 Sqlite2 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite3() { - depends=('gambas3-gb-db' 'sqlite3') - pkgdesc="Gambas3 Sqlite3 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-desktop() { - depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') - pkgdesc="Gambas3 desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-dbus() { - depends=('gambas3-runtime' 'dbus-core') - pkgdesc="Gambas3 DBUS component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-eval-highlight() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 expression evaluator highlight component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]* - ## -} - -package_gambas3-gb-form() { - depends=('gambas3-gb-gui') - pkgdesc="Gambas3 form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - ## -} - -package_gambas3-gb-form-dialog() { - depends=('gambas3-gb-form') - pkgdesc="Gambas3 form dialog component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} - ## -} - -package_gambas3-gb-form-mdi() { - depends=('gambas3-gb-form') - pkgdesc="Gambas3 form MDI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} - ## -} - -package_gambas3-gb-form-stock() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 default stock icons component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} - ## -} - -package_gambas3-gb-gtk() { - depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="Gambas3 graphical GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-gui() { - depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') - pkgdesc="Gambas3 automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} - ## -} - -package_gambas3-gb-image() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 image component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*} - ## -} - -package_gambas3-gb-image-effect() { - depends=('gambas3-gb-image') - pkgdesc="Gambas3 image effect component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*} - ## -} - -package_gambas3-gb-image-imlib() { - depends=('gambas3-gb-image' 'imlib2') - pkgdesc="Gambas3 imlib component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-image-io() { - depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Gambas3 input/output component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 network component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-curl() { - depends=('gambas3-gb-net' 'curl') - pkgdesc="Gambas3 curl component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-smtp() { - depends=('gambas3-runtime' 'glib2') - pkgdesc="Gambas3 SMTP component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl() { - depends=('gambas3-runtime' 'libgl' 'glew') - pkgdesc="Gambas3 OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glu() { - depends=('gambas3-gb-opengl') - pkgdesc="Gambas3 GL Utility component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glsl() { - depends=('gambas3-gb-opengl') - pkgdesc="Gambas3 GLSL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-option() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 getopt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*} - ## -} - -package_gambas3-gb-pcre() { - depends=('gambas3-runtime' 'pcre') - pkgdesc="Gambas3 PCRE component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-pdf() { - depends=('gambas3-runtime' 'poppler') - pkgdesc="Gambas3 PDF component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4() { - depends=('gambas3-gb-image' 'qt') - pkgdesc="Gambas3 Qt4 toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-ext() { - depends=('gambas3-gb-qt4') - pkgdesc="Gambas3 Qt4 toolkit extended component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-opengl() { - depends=('gambas3-gb-qt4' 'libgl') - pkgdesc="Gambas3 Qt4 toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-webkit() { - depends=('gambas3-gb-qt4') - pkgdesc="Gambas3 Qt4 toolkit webkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-report() { - depends=('gambas3-gb-form' 'gambas3-gb-image-io') - pkgdesc="Gambas3 report component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} - ## -} - -package_gambas3-gb-sdl() { - depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') - pkgdesc="Gambas3 SDL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-sdl-sound() { - depends=('gambas3-runtime' 'sdl_mixer') - pkgdesc="Gambas3 SDL sound component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-settings() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 setting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} - ## -} - -package_gambas3-gb-signal() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 signal component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*} - ## -} - -package_gambas3-gb-v4l() { - depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') - pkgdesc="Gambas3 video4linux component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-vb() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 VB transitional component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]* - ## -} - -package_gambas3-gb-xml() { - depends=('gambas3-runtime' 'libxml2') - pkgdesc="Gambas3 XML component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-xml-rpc() { - depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') - pkgdesc="Gambas3 XML-RPC component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} - ## -} - -package_gambas3-gb-xml-xslt() { - depends=('gambas3-gb-xml' 'libxslt') - pkgdesc="Gambas3 XML-XSLT component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-web() { - depends=('gambas3-runtime') - pkgdesc="Gambas3 CGI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* - ## -} diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install deleted file mode 100644 index c6aad0d55..000000000 --- a/community-staging/gambas3/gambas3-runtime.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas3/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install deleted file mode 100644 index 77c1aa52f..000000000 --- a/community-staging/gambas3/gambas3-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} diff --git a/community-staging/gambas3/gambas3.install b/community-staging/gambas3/gambas3.install deleted file mode 100644 index c6aad0d55..000000000 --- a/community-staging/gambas3/gambas3.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas3/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD deleted file mode 100644 index 2c357a634..000000000 --- a/community-staging/gource/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 47914 2011-05-26 01:27:25Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> -# Contributor: Olivier Ramonat <olivier at ramonat dot fr> -pkgname=gource -pkgver=0.34 -pkgrel=2 -pkgdesc="software version control visualization" -license=(GPL3) -arch=(i686 x86_64) -url=http://code.google.com/p/gource/ -depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') -source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('292a62d687874e871067e985d717d71a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR=$pkgdir install -} -# vim: ts=2:sw=2 et: diff --git a/community-staging/kvirc/PKGBUILD b/community-staging/kvirc/PKGBUILD deleted file mode 100644 index a53dbed2c..000000000 --- a/community-staging/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-staging/kvirc/kvirc.install b/community-staging/kvirc/kvirc.install deleted file mode 100644 index 8f76d007f..000000000 --- a/community-staging/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-staging/libmicrohttpd/PKGBUILD b/community-staging/libmicrohttpd/PKGBUILD deleted file mode 100644 index c942a6761..000000000 --- a/community-staging/libmicrohttpd/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 47393 2011-05-22 11:59:43Z jelle $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Norberto Lopes <shelika@mail.telepac.pt> -# Contributor: Kao Dome <kaodome@gmail.com> -# Contributor: Dmitrij D. Czarkoff <czarkoff@gmail.com> -# Contributor: Mathias Rohnstock <linksoft@gmx.de> - -pkgname=libmicrohttpd -pkgver=0.9.11 -pkgrel=1 -pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libmicrohttpd/" -license=('LGPL') -options=('!libtool') -depends=('gnutls') -install=libmicrohttpd.install -source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('69b97b11437e53863e92d5f0221f339b') - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-dependency-tracking --enable-largefile \ - --enable-curl --enable-messages --with-pic - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/platform.h \ - ${pkgdir}/usr/include/$pkgname/platform.h - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \ - ${pkgdir}/usr/include/$pkgname/plibc.h - sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \ - $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc -} diff --git a/community-staging/libmicrohttpd/libmicrohttpd.install b/community-staging/libmicrohttpd/libmicrohttpd.install deleted file mode 100644 index dc0d2b996..000000000 --- a/community-staging/libmicrohttpd/libmicrohttpd.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(microhttpd.info microhttpd-tutorial.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/community-staging/lightspark/PKGBUILD b/community-staging/lightspark/PKGBUILD deleted file mode 100644 index d1a23e996..000000000 --- a/community-staging/lightspark/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=lightspark -pkgver=0.4.7.1 -pkgrel=4 -pkgdesc='An alternative Flash Player for Linux.' -arch=('i686' 'x86_64') -url='http://lightspark.sourceforge.net' -license=('LGPL3') -conflicts=('lightspark-git') -depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') -makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'pkgconfig' 'fontconfig') -optdepends=('gnash-gtk: fallback support') -install="${pkgname}.install" -source=("http://launchpad.net/${pkgname}/trunk/${pkgname}-${pkgver:0:5}/+download/${pkgname}-${pkgver}.tar.gz") -md5sums=('fee5cd52a8a23e858979a8f4ec778266') - -build() { - rm -rf build - mkdir build - cd build - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCOMPILE_PLUGIN=1 \ - -DCMAKE_BUILD_TYPE=Release \ - -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ - ../${pkgname}-${pkgver} - - make -} - -package() { - cd build - - make DESTDIR=${pkgdir} install -} diff --git a/community-staging/lightspark/lightspark.install b/community-staging/lightspark/lightspark.install deleted file mode 100644 index 75e2b7b55..000000000 --- a/community-staging/lightspark/lightspark.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD deleted file mode 100644 index 01aab85d1..000000000 --- a/community-staging/performous/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 47952 2011-05-26 11:21:56Z lcarlier $ -# Maintainer : Laurent Carlier <lordheavym@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=performous -pkgver=0.6.1 -pkgrel=6 -pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' -arch=('i686' 'x86_64') -url="http://performous.org/" -license=('GPL') -depends=('boost-libs>=1.46' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ - 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') -makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.46') -optdepends=('performous-freesongs: free songs for performous') -source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2) -md5sums=('451a759de77984b5a699e91107fe52e2') - -build() { - cd ${srcdir}/Performous-${pkgver}-Source - - mkdir -p build - cd build - - # fix config loading with libxml++ - export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} - # fix to built against boost 1.46, upstream (git) now support v3 - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr .. - - make -} - -package() { - cd ${srcdir}/Performous-${pkgver}-Source/build - - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/perl-berkeleydb/PKGBUILD b/community-staging/perl-berkeleydb/PKGBUILD deleted file mode 100644 index 2476eaf71..000000000 --- a/community-staging/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-staging/perl-class-data-inheritable/PKGBUILD b/community-staging/perl-class-data-inheritable/PKGBUILD deleted file mode 100644 index 279d6da79..000000000 --- a/community-staging/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-staging/perl-class-factory-util/PKGBUILD b/community-staging/perl-class-factory-util/PKGBUILD deleted file mode 100644 index d22f619c9..000000000 --- a/community-staging/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-staging/perl-class-methodmaker/PKGBUILD b/community-staging/perl-class-methodmaker/PKGBUILD deleted file mode 100644 index 9896a9d33..000000000 --- a/community-staging/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-staging/perl-clone/PKGBUILD b/community-staging/perl-clone/PKGBUILD deleted file mode 100644 index ede090293..000000000 --- a/community-staging/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-staging/perl-crypt-blowfish/PKGBUILD b/community-staging/perl-crypt-blowfish/PKGBUILD deleted file mode 100644 index 204a0d0f9..000000000 --- a/community-staging/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-staging/perl-crypt-des/PKGBUILD b/community-staging/perl-crypt-des/PKGBUILD deleted file mode 100644 index ae854b92b..000000000 --- a/community-staging/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-staging/perl-crypt-openssl-bignum/PKGBUILD b/community-staging/perl-crypt-openssl-bignum/PKGBUILD deleted file mode 100644 index 33f382066..000000000 --- a/community-staging/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-staging/perl-crypt-openssl-random/PKGBUILD b/community-staging/perl-crypt-openssl-random/PKGBUILD deleted file mode 100644 index b9a8adb52..000000000 --- a/community-staging/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-staging/perl-crypt-openssl-rsa/PKGBUILD b/community-staging/perl-crypt-openssl-rsa/PKGBUILD deleted file mode 100644 index 23151f63e..000000000 --- a/community-staging/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-staging/perl-curses/PKGBUILD b/community-staging/perl-curses/PKGBUILD deleted file mode 100644 index 629c01041..000000000 --- a/community-staging/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-staging/perl-data-structure-util/PKGBUILD b/community-staging/perl-data-structure-util/PKGBUILD deleted file mode 100644 index 765098374..000000000 --- a/community-staging/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-staging/perl-datetime-format-builder/PKGBUILD b/community-staging/perl-datetime-format-builder/PKGBUILD deleted file mode 100644 index 094777a66..000000000 --- a/community-staging/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-staging/perl-datetime-format-mail/PKGBUILD b/community-staging/perl-datetime-format-mail/PKGBUILD deleted file mode 100644 index dc6c69605..000000000 --- a/community-staging/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-staging/perl-datetime/PKGBUILD b/community-staging/perl-datetime/PKGBUILD deleted file mode 100644 index b5c86bd7f..000000000 --- a/community-staging/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-staging/perl-dbd-odbc/PKGBUILD b/community-staging/perl-dbd-odbc/PKGBUILD deleted file mode 100644 index d787e37b5..000000000 --- a/community-staging/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-staging/perl-dbd-pg/PKGBUILD b/community-staging/perl-dbd-pg/PKGBUILD deleted file mode 100644 index 7af282d37..000000000 --- a/community-staging/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-staging/perl-dbd-sqlite2/PKGBUILD b/community-staging/perl-dbd-sqlite2/PKGBUILD deleted file mode 100644 index 314f129d4..000000000 --- a/community-staging/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-staging/perl-dbd-sybase/PKGBUILD b/community-staging/perl-dbd-sybase/PKGBUILD deleted file mode 100644 index a33488520..000000000 --- a/community-staging/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-staging/perl-fuse/PKGBUILD b/community-staging/perl-fuse/PKGBUILD deleted file mode 100644 index 079721841..000000000 --- a/community-staging/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-staging/perl-gd/PKGBUILD b/community-staging/perl-gd/PKGBUILD deleted file mode 100644 index b29f364b0..000000000 --- a/community-staging/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-staging/perl-gnome2-wnck/PKGBUILD b/community-staging/perl-gnome2-wnck/PKGBUILD deleted file mode 100644 index 25e0df822..000000000 --- a/community-staging/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-staging/perl-gssapi/PKGBUILD b/community-staging/perl-gssapi/PKGBUILD deleted file mode 100644 index 714407586..000000000 --- a/community-staging/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-staging/perl-gstreamer-interfaces/PKGBUILD b/community-staging/perl-gstreamer-interfaces/PKGBUILD deleted file mode 100644 index 61a9b62e6..000000000 --- a/community-staging/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-staging/perl-gstreamer/PKGBUILD b/community-staging/perl-gstreamer/PKGBUILD deleted file mode 100644 index 84f62fa75..000000000 --- a/community-staging/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-staging/perl-gtk2-mozembed/PKGBUILD b/community-staging/perl-gtk2-mozembed/PKGBUILD deleted file mode 100644 index bc2a503a0..000000000 --- a/community-staging/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-staging/perl-gtk2-sexy/PKGBUILD b/community-staging/perl-gtk2-sexy/PKGBUILD deleted file mode 100644 index 6b4789bd2..000000000 --- a/community-staging/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-staging/perl-gtk2-trayicon/PKGBUILD b/community-staging/perl-gtk2-trayicon/PKGBUILD deleted file mode 100644 index a4cdb9e76..000000000 --- a/community-staging/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-staging/perl-gtk2-webkit/PKGBUILD b/community-staging/perl-gtk2-webkit/PKGBUILD deleted file mode 100644 index 269e6080a..000000000 --- a/community-staging/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-staging/perl-html-strip/PKGBUILD b/community-staging/perl-html-strip/PKGBUILD deleted file mode 100644 index 2f93db01f..000000000 --- a/community-staging/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-staging/perl-inline-java/PKGBUILD b/community-staging/perl-inline-java/PKGBUILD deleted file mode 100644 index d9396fc00..000000000 --- a/community-staging/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-staging/perl-io-tty/PKGBUILD b/community-staging/perl-io-tty/PKGBUILD deleted file mode 100644 index 7fe7b0b0d..000000000 --- a/community-staging/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-staging/perl-json-xs/PKGBUILD b/community-staging/perl-json-xs/PKGBUILD deleted file mode 100644 index 0c935e5ca..000000000 --- a/community-staging/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-staging/perl-libapreq2/PKGBUILD b/community-staging/perl-libapreq2/PKGBUILD deleted file mode 100644 index 21d49f90f..000000000 --- a/community-staging/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-staging/perl-list-moreutils/PKGBUILD b/community-staging/perl-list-moreutils/PKGBUILD deleted file mode 100644 index fc399b9a7..000000000 --- a/community-staging/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-staging/perl-mail-box-parser-c/PKGBUILD b/community-staging/perl-mail-box-parser-c/PKGBUILD deleted file mode 100644 index cf1fc16f4..000000000 --- a/community-staging/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-staging/perl-mail-transport-dbx/PKGBUILD b/community-staging/perl-mail-transport-dbx/PKGBUILD deleted file mode 100644 index 15244af54..000000000 --- a/community-staging/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-staging/perl-net-dbus/PKGBUILD b/community-staging/perl-net-dbus/PKGBUILD deleted file mode 100644 index a7307c2a8..000000000 --- a/community-staging/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-staging/perl-net-libidn/PKGBUILD b/community-staging/perl-net-libidn/PKGBUILD deleted file mode 100644 index 1d2f41001..000000000 --- a/community-staging/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-staging/perl-params-validate/PKGBUILD b/community-staging/perl-params-validate/PKGBUILD deleted file mode 100644 index 2dd4124e8..000000000 --- a/community-staging/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-staging/perl-string-crc32/PKGBUILD b/community-staging/perl-string-crc32/PKGBUILD deleted file mode 100644 index de3d39177..000000000 --- a/community-staging/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-staging/perl-text-charwidth/PKGBUILD b/community-staging/perl-text-charwidth/PKGBUILD deleted file mode 100644 index db2e6d27a..000000000 --- a/community-staging/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-staging/perl-text-kakasi/ChangeLog b/community-staging/perl-text-kakasi/ChangeLog deleted file mode 100644 index 0a469fdff..000000000 --- a/community-staging/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-staging/perl-text-kakasi/PKGBUILD b/community-staging/perl-text-kakasi/PKGBUILD deleted file mode 100644 index 78b522c7c..000000000 --- a/community-staging/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-staging/perl-tie-hash-indexed/PKGBUILD b/community-staging/perl-tie-hash-indexed/PKGBUILD deleted file mode 100644 index 687e000c1..000000000 --- a/community-staging/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-staging/perl-tk-tablematrix/PKGBUILD b/community-staging/perl-tk-tablematrix/PKGBUILD deleted file mode 100644 index 8f9dd8986..000000000 --- a/community-staging/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-staging/perl-www-curl/PKGBUILD b/community-staging/perl-www-curl/PKGBUILD deleted file mode 100644 index ba9fcc3f1..000000000 --- a/community-staging/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-staging/perl-xml-libxml/PKGBUILD b/community-staging/perl-xml-libxml/PKGBUILD deleted file mode 100644 index 38d4fd63f..000000000 --- a/community-staging/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-staging/perl-xml-libxml/perl-xml-libxml.install b/community-staging/perl-xml-libxml/perl-xml-libxml.install deleted file mode 100644 index 43c29a245..000000000 --- a/community-staging/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-staging/perl-xml-libxslt/PKGBUILD b/community-staging/perl-xml-libxslt/PKGBUILD deleted file mode 100644 index de58675ec..000000000 --- a/community-staging/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-staging/perl-xmms/PKGBUILD b/community-staging/perl-xmms/PKGBUILD deleted file mode 100644 index 053086167..000000000 --- a/community-staging/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-staging/pork/PKGBUILD b/community-staging/pork/PKGBUILD deleted file mode 100644 index 53946b6e1..000000000 --- a/community-staging/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-staging/root/PKGBUILD b/community-staging/root/PKGBUILD deleted file mode 100644 index 4f46232cf..000000000 --- a/community-staging/root/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Sebastian Voecking <voeck@web.de> - -pkgname=root -pkgver=5.28.00d -pkgrel=2 -pkgdesc='C++ data analysis framework and interpreter from CERN.' -arch=('i686' 'x86_64') -url='http://root.cern.ch' -license=('LGPL2.1') -depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' - 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') -makedepends=('fftw') -install='root.install' -source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" - 'root.sh' - 'rootd' - 'root.desktop' - 'root.xml') -md5sums=('53505fcb256df38526d446916e6efc15' - '0e883ad44f99da9bc7c23bc102800b62' - 'efd06bfa230cc2194b38e0c8939e72af' - 'ac61b17395d75a2705fefa2ef841a6bf' - 'e2cf69b204192b5889ceb5b4dedc66f7') - -build() { - cd ${pkgname} - - if [ ${CARCH} == 'i686' ]; then - TARGET=linux; - else - TARGET=linuxx8664gcc; - fi - - # python2 switch - find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \; - sed -i 's/python 2/python2 2/g' configure - - ./configure \ - ${TARGET} \ - --prefix=/usr \ - --disable-builtin-glew \ - --disable-builtin-freetype \ - --disable-builtin-ftgl \ - --disable-builtin-pcre \ - --disable-builtin-zlib \ - --enable-gdml \ - --enable-gsl-shared \ - --enable-minuit2 \ - --enable-soversion \ - --enable-roofit \ - --enable-python \ - --with-python-incdir=/usr/include/python2.7 \ - --with-python-libdir=/usr/lib - #--disable-krb5 - # disable krb5 because of compile error - - # move from aur - #--disable-builtin-afterimage \ - - #--with-python-incdir=/usr/include/python2.7/Python.h \ - #--with-python-libdir=/usr/lib/libpython2.7.so - - make -} - -package() { - cd ${pkgname} - - make DESTDIR=${pkgdir} install - - install -D ${srcdir}/root.sh ${pkgdir}/etc/profile.d/root.sh - install -D ${srcdir}/rootd ${pkgdir}/etc/rc.d/rootd - install -D -m644 ${srcdir}/root.desktop ${pkgdir}/usr/share/applications/root.desktop - install -D -m644 ${srcdir}/root.xml ${pkgdir}/usr/share/mime/packages/root.xml - - rm -rf ${pkgdir}/etc/root/daemons -} diff --git a/community-staging/root/root.desktop b/community-staging/root/root.desktop deleted file mode 100644 index ca382111c..000000000 --- a/community-staging/root/root.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Exec=root -Terminal=true -Name=ROOT -Name[de]=ROOT -Comment=An object-oriented data analysis framework -Comment[de]=Ein objektorientiertes Framework zur Datenanalyse -StartupNotify=true -MimeType=application/x-root;text/x-c++src -Categories=Science;Development;Application; diff --git a/community-staging/root/root.install b/community-staging/root/root.install deleted file mode 100644 index 457af7314..000000000 --- a/community-staging/root/root.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then - echo "/usr/lib/root" >> etc/ld.so.conf - sbin/ldconfig -r . - fi - - update-desktop-database >/dev/null - - update-mime-database /usr/share/mime >/dev/null -} - -pre_remove() { - cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot - mv /tmp/.pacroot etc/ld.so.conf - chmod 644 etc/ld.so.conf - sbin/ldconfig -r . -} diff --git a/community-staging/root/root.sh b/community-staging/root/root.sh deleted file mode 100644 index 685e6036b..000000000 --- a/community-staging/root/root.sh +++ /dev/null @@ -1,5 +0,0 @@ -if [ $PYTHONPATH ]; then - export PYTHONPATH=$PYTHONPATH:/usr/lib/root; -else - export PYTHONPATH=/usr/lib/root; -fi diff --git a/community-staging/root/root.xml b/community-staging/root/root.xml deleted file mode 100644 index af8dd69c5..000000000 --- a/community-staging/root/root.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/x-root"> - <comment>ROOT file</comment> - <comment xml:lang="de">ROOT-Datei</comment> - <glob pattern="*.root"/> - <magic priority="80"> - <match value="root" type="string" offset="0:64"/> - </magic> - </mime-type> -</mime-info> diff --git a/community-staging/root/rootd b/community-staging/root/rootd deleted file mode 100755 index fb2c3388c..000000000 --- a/community-staging/root/rootd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/rootd` -case "$1" in - start) - stat_busy "Starting ROOT file server daemon" - [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID /usr/sbin/rootd` - echo $PID >/var/run/rootd.pid - add_daemon rootd - stat_done - fi - ;; - stop) - stat_busy "Stopping ROOT file server daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon rootd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/rss-glx/PKGBUILD b/community-staging/rss-glx/PKGBUILD deleted file mode 100644 index 37c440cf4..000000000 --- a/community-staging/rss-glx/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 48037 2011-05-27 16:21:40Z spupykin $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> -# Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> - -pkgname=rss-glx -pkgver=0.9.1 -pkgrel=6 -pkgdesc="The Really Slick Screensavers port to GLX" -arch=('i686' 'x86_64') -url="http://rss-glx.sourceforge.net/" -license=('GPL') -depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick') -optdepends=('xscreensaver: xscreensaver integration') -install=rss-glx.install -options=('!libtool') -source=(http://downloads.sourceforge.net/rss-glx/${pkgname}_${pkgver}.tar.bz2 - rss-glx-desktops.tar.bz2) -md5sums=('a772bd143cd8d141edf4d9eff9860ab3' - '4211215c9a4918b0dff30a7000647dd9') - -build() { - cd ${srcdir}/${pkgname}_${pkgver} - - [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in) - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --program-transform-name='s/plasma/plasma_rss/' \ - --with-configdir=/usr/share/xscreensaver/config \ - --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \ - --enable-shared=yes --enable-static=no - make CFLAGS="$CFLAGS -I/usr/include/ImageMagick" - make DESTDIR=${pkgdir} install - - # FS#18300 - install -d ${pkgdir}/usr/lib/xscreensaver/ - list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl) - for i in $list; do - ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/" - done - - install -d ${pkgdir}/usr/share/applications/screensavers - install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers -} diff --git a/community-staging/rss-glx/rss-glx-desktops.tar.bz2 b/community-staging/rss-glx/rss-glx-desktops.tar.bz2 Binary files differdeleted file mode 100644 index 940fd5277..000000000 --- a/community-staging/rss-glx/rss-glx-desktops.tar.bz2 +++ /dev/null diff --git a/community-staging/rss-glx/rss-glx.install b/community-staging/rss-glx/rss-glx.install deleted file mode 100644 index 758642618..000000000 --- a/community-staging/rss-glx/rss-glx.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - cat << 'EOM' - --> If you want to integrate the RSS screen savers with xscreensaver - --> for your user, then install the xscreensaver package and launch - --> the command "rss-glx_install.pl" -EOM - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/community-staging/sfml/PKGBUILD b/community-staging/sfml/PKGBUILD deleted file mode 100644 index 806e373d4..000000000 --- a/community-staging/sfml/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 47923 2011-05-26 03:12:35Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Ondrej Martinak <omartinak@gmail.com> - -pkgname=sfml - -_git=true - -if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110526 -fi - -pkgrel=1 -pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' -arch=('i686' 'x86_64') -url='http://www.sfml-dev.org/' -license=('zlib') -depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') -makedepends=('git' 'mesa' 'cmake' 'doxygen') - -_gitroot='https://github.com/LaurentGomila/SFML.git' -_gitname='SFML' - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - cd $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ - -DBUILD_DOC=true \ - -DBUILD_EXAMPLES=true - make - make doc -} - -package() { - cd "$srcdir/$_gitname-build/build" - make DESTDIR="$pkgdir/" install - - install -Dm644 ../license.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - make clean -} - diff --git a/community-staging/sfml/sfml.install b/community-staging/sfml/sfml.install deleted file mode 100644 index 9d18b5251..000000000 --- a/community-staging/sfml/sfml.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - echo "To view the SFML samples, go to /opt/SFML/samples/bin and run them individually" -} diff --git a/community-staging/sfml/use-system-libs.patch b/community-staging/sfml/use-system-libs.patch deleted file mode 100644 index 5d3200225..000000000 --- a/community-staging/sfml/use-system-libs.patch +++ /dev/null @@ -1,70 +0,0 @@ -Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6 -Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ -Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ -Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ -diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp ---- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100 -+++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2010-08-16 12:27:33.983627625 +0200 -@@ -28,10 +28,10 @@ - #include <SFML/Graphics/ImageLoader.hpp>
- extern "C"
- {
-- #include <SFML/Graphics/libjpeg/jpeglib.h>
-- #include <SFML/Graphics/libjpeg/jerror.h>
-+ #include <jpeglib.h>
-+ #include <jerror.h>
- }
--#include <SFML/Graphics/libpng/png.h>
-+#include <png.h>
- #include <SFML/Graphics/SOIL/SOIL.h>
- #include <iostream>
-
-Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej -diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile ---- SFML-1.6-old/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100 -+++ SFML-1.6/src/SFML/Graphics/Makefile 2010-08-16 12:25:13.663501212 +0200 -@@ -1,15 +1,5 @@ - SRC = $(wildcard *.cpp)
--SRCGLEW = $(wildcard ./GLEW/*.c)
--SRCJPEG = $(wildcard ./libjpeg/*.c)
--SRCPNG = $(wildcard ./libpng/*.c)
--SRCSOIL = $(wildcard ./SOIL/*.c)
--SRCZLIB = $(wildcard ./zlib/*.c)
- OBJ = $(SRC:.cpp=.o)
--OBJGLEW = $(SRCGLEW:.c=.o)
--OBJJPEG = $(SRCJPEG:.c=.o)
--OBJPNG = $(SRCPNG:.c=.o)
--OBJSOIL = $(SRCSOIL:.c=.o)
--OBJZLIB = $(SRCZLIB:.c=.o)
-
- ifeq ($(STATIC), yes)
- LIB = libsfml-graphics-s.a
-@@ -23,22 +13,19 @@ -
- all: $(LIB)
-
--libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+libsfml-graphics-s.a: $(OBJ)
-+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -static -lGLEW -ljpeg -lpng -lsoil -lz -lSOIL
-
--libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
-+libsfml-graphics.so: $(OBJ)
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-
--$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
--
- .PHONY: clean mrproper
-
- clean:
-- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+ @rm -rf $(OBJ)
-
- mrproper: clean
- @rm -rf $(LIBNAME)
-Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD deleted file mode 100644 index 38ce61979..000000000 --- a/community-staging/spring/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 47908 2011-05-26 01:20:52Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=spring -pkgver=0.82.7.1 -pkgrel=4 -pkgdesc='A free 3D real-time-strategy (RTS) game engine' -arch=('i686' 'x86_64') -url="http://springrts.com/" -license=('GPL') -depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') -makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python' 'java-environment') -optdepends=('python: python-based bots' - 'java-runtime: java-based bots') -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma - gcc46.patch) -md5sums=('378cf0b18a5dd5b840964e5945778503' - 'e9586b611db1ed04fe4f0c5982fda7d2') - -build() { - bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma - - cd spring_$pkgver - - sed -i '1i\ - #include <list>' rts/lib/lobby/Connection.h - patch -Np1 < $srcdir/gcc46.patch - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATADIR=share/spring - make -} - -package() { - cd spring_$pkgver - - make DESTDIR=$pkgdir install - - install -d $pkgdir/etc/spring - echo '$HOME/.spring' > $pkgdir/etc/spring/datadir -} - -# vim sw=2:ts=2 et: diff --git a/community-staging/spring/gcc46.patch b/community-staging/spring/gcc46.patch deleted file mode 100644 index 4f6865cac..000000000 --- a/community-staging/spring/gcc46.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Jan Dittberner <jandd@debian.org> -Subject: Patch for FTBFS with g++ 4.6.0 -Bug-Debian: http://bugs.debian.org/625097 -Bug: http://springrts.com/mantis/view.php?id=2415 ---- a/AI/Skirmish/E323AI/AAStar.h -+++ b/AI/Skirmish/E323AI/AAStar.h -@@ -4,6 +4,7 @@ - #include <queue> - #include <vector> - #include <list> -+#include <cstddef> // for NULL - - class AAStar { - public: ---- a/rts/Rendering/ShadowHandler.cpp -+++ b/rts/Rendering/ShadowHandler.cpp -@@ -318,6 +318,11 @@ - xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); - ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); - -+ shadowParams.x = xmid; -+ shadowParams.y = ymid; -+ shadowParams.z = p17; -+ shadowParams.w = p18; -+ - shadowMatrix[ 0] = cross1.x / maxLengthX; - shadowMatrix[ 4] = cross1.y / maxLengthX; - shadowMatrix[ 8] = cross1.z / maxLengthX; ---- a/rts/Rendering/ShadowHandler.h -+++ b/rts/Rendering/ShadowHandler.h -@@ -38,7 +38,7 @@ - CMatrix44f shadowMatrix; - void CalcMinMaxView(void); - -- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } -+ const float4& GetShadowParams() const { return shadowParams; } - - enum ShadowGenProgram { - SHADOWGEN_PROGRAM_MODEL = 0, -@@ -76,6 +76,7 @@ - //! to write the (FBO) depth-buffer texture - std::vector<Shader::IProgramObject*> shadowGenProgs; - -+ float4 shadowParams; - float x1, x2, y1, y2; - float xmid, ymid; - float p17, p18; ---- a/rts/Rendering/GLContext.cpp -+++ b/rts/Rendering/GLContext.cpp -@@ -9,6 +9,7 @@ - #include "GLContext.h" - - #include <list> -+#include <cstddef> // for NULL - - - using namespace std; ---- a/rts/System/MemPool.h -+++ b/rts/System/MemPool.h -@@ -4,6 +4,7 @@ - #define _MEM_POOL_H_ - - #include <new> -+#include <cstddef> // for NULL - - const size_t MAX_MEM_SIZE=200; - diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD deleted file mode 100644 index dbcd690af..000000000 --- a/community-staging/supertux/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Eric Belanger <belanger@astro.umontreal.ca> -# Contributor: vande198 -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=supertux -pkgver=0.3.3 -pkgrel=3 -pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" -arch=('i686' 'x86_64') -url="http://super-tux.sourceforge.net/" -license=('GPL') -depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') -makedepends=('cmake' 'boost') -source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2) -md5sums=('f3f803e629ee51a9de0b366a036e393d') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp - cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-staging/supertux/compile.patch b/community-staging/supertux/compile.patch deleted file mode 100644 index 05376fe91..000000000 --- a/community-staging/supertux/compile.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp ---- supertux-0.3.1.orig/src/console.hpp 2008-01-03 21:59:27.000000000 +0100 -+++ supertux-0.3.1/src/console.hpp 2008-08-23 11:57:47.000000000 +0200 -@@ -27,6 +27,8 @@ - #include <sstream> - #include <iostream> - #include <squirrel.h> -+#include <memory> -+#include <cstdlib> - - class Console; - class ConsoleStreamBuffer; -diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp ---- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 21:59:26.000000000 +0100 -+++ supertux-0.3.1/src/lisp/lexer.cpp 2008-08-23 13:45:58.000000000 +0200 -@@ -21,6 +21,7 @@ - #include <sstream> - #include <stdexcept> - #include <iostream> -+#include <cstring> - - #include "lexer.hpp" - -diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp ---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 21:59:26.000000000 +0100 -+++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-08-23 13:29:34.000000000 +0200 -@@ -21,6 +21,7 @@ - #define SUPERTUX_SPRITE_MANAGER_H - - #include <map> -+#include <string> - - class SpriteData; - class Sprite; -diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp ---- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 21:59:27.000000000 +0100 -+++ supertux-0.3.1/src/textscroller.hpp 2008-08-23 13:34:35.000000000 +0200 -@@ -24,6 +24,7 @@ - #include <vector> - #include <string> - #include <map> -+#include <memory> - - #include "screen.hpp" - #include "math/vector.hpp" -diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp ---- supertux-0.3.1.orig/src/title.cpp 2008-01-03 21:59:28.000000000 +0100 -+++ supertux-0.3.1/src/title.cpp 2008-08-23 12:05:19.000000000 +0200 -@@ -32,6 +32,7 @@ - #include <SDL.h> - #include <SDL_image.h> - #include <physfs.h> -+#include <algorithm> - - #include "title.hpp" - #include "mainloop.hpp" -diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp ---- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 21:59:22.000000000 +0100 -+++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-08-23 13:37:14.000000000 +0200 -@@ -23,6 +23,7 @@ - #include <config.h> - - #include <SDL.h> -+#include <algorithm> - - #include "texture.hpp" - #include "color.hpp" diff --git a/community-staging/supertux/gcc44.patch b/community-staging/supertux/gcc44.patch deleted file mode 100644 index b58d9c29d..000000000 --- a/community-staging/supertux/gcc44.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp ---- supertux-0.3.1.orig/src/console.hpp 2008-01-03 20:59:27.000000000 +0000 -+++ supertux-0.3.1/src/console.hpp 2009-05-17 19:43:26.914307646 +0000 -@@ -27,6 +27,8 @@ - #include <sstream> - #include <iostream> - #include <squirrel.h> -+#include <memory> -+#include <cstdlib> - - class Console; - class ConsoleStreamBuffer; -diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp ---- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 20:59:26.000000000 +0000 -+++ supertux-0.3.1/src/lisp/lexer.cpp 2009-05-17 19:43:27.037705317 +0000 -@@ -21,6 +21,7 @@ - #include <sstream> - #include <stdexcept> - #include <iostream> -+#include <cstring> - - #include "lexer.hpp" - -diff -ruN supertux-0.3.1.orig/src/lisp/lisp.cpp supertux-0.3.1/src/lisp/lisp.cpp ---- supertux-0.3.1.orig/src/lisp/lisp.cpp 2008-01-03 20:59:26.000000000 +0000 -+++ supertux-0.3.1/src/lisp/lisp.cpp 2009-05-17 19:44:29.305165638 +0000 -@@ -18,7 +18,7 @@ - // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - #include <config.h> -- -+#include <cstdio> - #include "lisp.hpp" - - namespace lisp -diff -ruN supertux-0.3.1.orig/src/random_generator.cpp supertux-0.3.1/src/random_generator.cpp ---- supertux-0.3.1.orig/src/random_generator.cpp 2008-01-03 20:59:27.000000000 +0000 -+++ supertux-0.3.1/src/random_generator.cpp 2009-05-17 19:44:05.851002254 +0000 -@@ -39,6 +39,7 @@ - #include <stdexcept> - #include <time.h> - #include <cassert> -+#include <cstdio> - #include "random_generator.hpp" - - RandomGenerator systemRandom; // global random number generator -diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp ---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 20:59:26.000000000 +0000 -+++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2009-05-17 19:43:27.037705317 +0000 -@@ -21,6 +21,7 @@ - #define SUPERTUX_SPRITE_MANAGER_H - - #include <map> -+#include <string> - - class SpriteData; - class Sprite; -diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp ---- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 20:59:27.000000000 +0000 -+++ supertux-0.3.1/src/textscroller.hpp 2009-05-17 19:43:27.037705317 +0000 -@@ -24,6 +24,7 @@ - #include <vector> - #include <string> - #include <map> -+#include <memory> - - #include "screen.hpp" - #include "math/vector.hpp" -diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp ---- supertux-0.3.1.orig/src/title.cpp 2008-01-03 20:59:28.000000000 +0000 -+++ supertux-0.3.1/src/title.cpp 2009-05-17 19:43:27.041000359 +0000 -@@ -32,6 +32,7 @@ - #include <SDL.h> - #include <SDL_image.h> - #include <physfs.h> -+#include <algorithm> - - #include "title.hpp" - #include "mainloop.hpp" -diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp ---- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 20:59:22.000000000 +0000 -+++ supertux-0.3.1/src/video/sdl_texture.hpp 2009-05-17 19:43:27.041000359 +0000 -@@ -23,6 +23,7 @@ - #include <config.h> - - #include <SDL.h> -+#include <algorithm> - - #include "texture.hpp" - #include "color.hpp" diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD deleted file mode 100644 index 41dab8d90..000000000 --- a/community-staging/vdrift/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 47904 2011-05-26 00:55:30Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> -# Contributor: Lone_Wolf lonewolf@xs4all.nl - -pkgname=vdrift -pkgver=2010.06.30 -pkgrel=3 -pkgdesc="An open source driving simulation made with drift racing in mind" -arch=('i686' 'x86_64') -url="http://vdrift.net/" -license=('GPL') -depends=('sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') -makedepends=('scons' 'boost' 'asio') -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-${pkgver//./-}/$pkgname-${pkgver//./-}.tar.bz2 - $pkgname.desktop) -md5sums=('ddcaf90bb25f9ce9cc084d7f467d7b56' - '8bb429f37bcb4aed5e7ab1d80c5a4f93') - -build() { - cd "$srcdir"/$pkgname-${pkgver//./-} - - # select arch - if [ `uname -m` = "x86_64" ]; then - _sconsarch="a64" - else - _sconsarch="686" - fi - - # patch for crashing with bad drivers - sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp - - # build and install - scons \ - "destdir"="$pkgdir" \ - "arch"=$_sconsarch \ - "release"=1 \ - "force_feedback"=1 \ - "prefix"=/usr \ - "datadir"=share/$pkgname/data || return 1 -} - -package() { - cd "$srcdir"/$pkgname-${pkgver//./-} - - scons install || return 1 - - # remove some unneeded files - find "$pkgdir"/usr/share/$pkgname -name SConscript -delete - - # install icons - install -Dm644 data/textures/icons/$pkgname-16x16.png \ - "$pkgdir"/usr/share/icons/hicolor/16x16/apps/$pkgname.png - install -Dm644 data/textures/icons/$pkgname-32x32.png \ - "$pkgdir"/usr/share/icons/hicolor/32x32/apps/$pkgname.png - install -Dm644 data/textures/icons/$pkgname-64x64.png \ - "$pkgdir"/usr/share/icons/hicolor/64x64/apps/$pkgname.png - - # install .desktop file - install -Dm644 ../$pkgname.desktop \ - "$pkgdir"/usr/share/applications/$pkgname.desktop - - # delete installed data (will be provided by -data package) - rm -r "$pkgdir"/usr/share/$pkgname -} -# vim: sw=2:ts=2 et: diff --git a/community-staging/vdrift/vdrift.desktop b/community-staging/vdrift/vdrift.desktop deleted file mode 100644 index 7078f0d9c..000000000 --- a/community-staging/vdrift/vdrift.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=VDrift -Version=2009-06-15 -GenericName=Racing Simulation -Comment=An open source driving simulation made with drift racing in mind -Exec=vdrift -Icon=vdrift.png -Terminal=false -Categories=Game;Simulation; diff --git a/community-staging/widelands/PKGBUILD b/community-staging/widelands/PKGBUILD deleted file mode 100644 index e2a882999..000000000 --- a/community-staging/widelands/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 47900 2011-05-26 00:39:20Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Christoph Zeiler <rabyte*gmail> - -pkgname=widelands -pkgver=16 -_realver=build16 -pkgrel=2 -pkgdesc="A realtime strategy game with emphasis on economy and transport" -arch=('i686' 'x86_64') -url="http://widelands.org/" -license=('GPL') -depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') -makedepends=('cmake' 'boost') -source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 - $pkgname.desktop - $pkgname.png - $pkgname.sh) -md5sums=('3d8c28e145b73c64d8ed1625319d25a2' - '15820bf099fd6f16251fe70a75c534bb' - '3dfda7e9ca76ca00dd98d745d0ceb328' - '7cae50aba5ed0cd2cfeea79124637b46') - -build() { - cd $srcdir/$pkgname-$_realver-src - - mkdir -p build/compile && cd build/compile - - cmake ../.. -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWL_INSTALL_PREFIX=/usr \ - -DWL_INSTALL_DATADIR=share/$pkgname \ - -DWL_INSTALL_BINDIR=bin - make -} - -package() { - cd $srcdir/$pkgname-$_realver-src/build/compile - - make DESTDIR="$pkgdir" install - - # Install bin, icon and desktop file - #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname - #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname - install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop -} diff --git a/community-staging/widelands/widelands-build15-gcc-4.5-patch b/community-staging/widelands/widelands-build15-gcc-4.5-patch deleted file mode 100644 index 6ba313358..000000000 --- a/community-staging/widelands/widelands-build15-gcc-4.5-patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 -@@ -113,7 +113,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Map::button_clicked, *this, 4, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -142,7 +142,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name - ()); - break; - } -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 -@@ -272,7 +272,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Random_Map::button_clicked, *this, 8, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -343,7 +343,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - break; - case 9: - break; -@@ -476,7 +476,7 @@ - (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) - ++m_currentworld; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - button_clicked(-1); // Update other values in UI as well - diff --git a/community-staging/widelands/widelands.desktop b/community-staging/widelands/widelands.desktop deleted file mode 100644 index 9715d816c..000000000 --- a/community-staging/widelands/widelands.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Widelands -GenericName=Widelands -Comment=Realtime strategy game -Icon=widelands -Exec=widelands -Type=Application -Categories=Game;StrategyGame; diff --git a/community-staging/widelands/widelands.png b/community-staging/widelands/widelands.png Binary files differdeleted file mode 100644 index c329cf667..000000000 --- a/community-staging/widelands/widelands.png +++ /dev/null diff --git a/community-staging/widelands/widelands.sh b/community-staging/widelands/widelands.sh deleted file mode 100644 index 0b21a1694..000000000 --- a/community-staging/widelands/widelands.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /usr/share/widelands -./widelands $* diff --git a/community-staging/wml/PKGBUILD b/community-staging/wml/PKGBUILD deleted file mode 100644 index 2f7a3781f..000000000 --- a/community-staging/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-staging/znc/PKGBUILD b/community-staging/znc/PKGBUILD deleted file mode 100644 index 0bc108944..000000000 --- a/community-staging/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-testing/gitg/PKGBUILD b/community-testing/gitg/PKGBUILD deleted file mode 100644 index 19c71018e..000000000 --- a/community-testing/gitg/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Blaž Tomžič <blaz.tomazic@gmail.com> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> -# Contributor: M Rawash <mrawash@gmail.com> -# Contributor: DonVla <donvla@users.sourceforge.net> - -pkgname=gitg -pkgver=0.2.2 -pkgrel=1 -pkgdesc='A GIT repository viewer based on GTK+' -arch=('i686' 'x86_64') -url='http://trac.novowork.com/gitg/' -license=('GPL') -depends=('gconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas') -makedepends=('intltool') -install="${pkgname}.install" -source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('cfa1b1d2bdd1211c09e00dca42130ea98e98fde576d85e18eabfde1802d0d04a') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/gitg/gitg.install b/community-testing/gitg/gitg.install deleted file mode 100644 index 787d6085e..000000000 --- a/community-testing/gitg/gitg.install +++ /dev/null @@ -1,17 +0,0 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: DonVla <donvla@users.sourceforge.net> -# gitg install file - -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} diff --git a/community-testing/pysfml/PKGBUILD b/community-testing/pysfml/PKGBUILD deleted file mode 100644 index 54b76cbb5..000000000 --- a/community-testing/pysfml/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 29367 2010-10-13 15:58:47Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: scj <scj(at)archlinux(dot)us> - -pkgname=('python-pysfml' 'python2-pysfml') -pkgbase=python-pysfml -pkgver=1.6 -pkgrel=2 -pkgdesc="Python bindings for the SFML library" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.sfml-dev.org" -makedepends=('sfml' 'python' 'python2') -license=('zlib') -depends=() -replaces=('pysfml') -source=(http://downloads.sourceforge.net/sfml/SFML-${pkgver}-python-sdk.zip) -md5sums=('9acaf793ae9a498a51f7f6fc74307b32') - -build() { - cd "${srcdir}/SFML-${pkgver}/python" -} - -package_python-pysfml() { - depends=('sfml' 'python') - - cd "${srcdir}/SFML-${pkgver}/python" - - python3 setup.py install --root=${pkgdir} -} - -package_python2-pysfml() { - depends=('sfml' 'python2') - - cd "${srcdir}/SFML-${pkgver}/python" - - python2 setup.py install --root=${pkgdir} -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/virtualbox/10-vboxdrv.rules b/community-testing/virtualbox/10-vboxdrv.rules deleted file mode 100644 index 37403ae2f..000000000 --- a/community-testing/virtualbox/10-vboxdrv.rules +++ /dev/null @@ -1,5 +0,0 @@ -KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1" -SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" -SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/community-testing/virtualbox/18-system-xorg.patch b/community-testing/virtualbox/18-system-xorg.patch deleted file mode 100644 index 4a28b93b6..000000000 --- a/community-testing/virtualbox/18-system-xorg.patch +++ /dev/null @@ -1,277 +0,0 @@ -Description: Build the X.Org driver only for the selected system X Server version. -Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de> - -diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -@@ -40,8 +40,8 @@ LIBRARIES += \ - VBoxGuestR3LibShared - ifndef VBOX_ONLY_TESTSUITE - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 -+# LIBRARIES += \ -+# VBoxGuestR3LibXFree86 - endif - endif - LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 -diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk ---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk -+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk -@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL - VBoxOGL_INCS = . - if1of ($(KBUILD_TARGET), linux solaris freebsd) - VBoxOGL_INCS += \ -- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ -- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ -- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ -- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ -- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ -- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ -- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ -- $(VBOX_PATH_X11_ROOT)/1.3/xorg \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 \ - $(VBOX_MESA_INCS) \ -- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 -+ /usr/include/drm \ -+ /usr/include/libdrm - VBoxOGL_DEFS += VBOX_NO_NATIVEGL - endif - -diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk ---- a/src/VBox/Additions/x11/Makefile.kmk -+++ b/src/VBox/Additions/x11/Makefile.kmk -@@ -17,6 +17,10 @@ - SUB_DEPTH = ../../../.. - include $(KBUILD_PATH)/subheader.kmk - -+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110) -+ XSERVER_VERSION := 17 -+endif -+ - # Include sub-makefiles. - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) - include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk -diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk - # vboxmouse_drv - # - if1of ($(KBUILD_TARGET), linux) -- SYSMODS += vboxmouse_drv - vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD - vboxmouse_drv_DEFS.linux = linux - vboxmouse_drv_DEFS.x86 += __i386__ -@@ -59,7 +58,6 @@ endif - # - # vboxmouse_drv_70 - # --DLLS += vboxmouse_drv_70 - vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_70_DEFS = \ - XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE -@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \ - # - # vboxmouse_drv_71 - # --DLLS += vboxmouse_drv_71 - vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) - vboxmouse_drv_71_INCS := \ -@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \ - # - # vboxmouse_drv_13 - # --DLLS += vboxmouse_drv_13 - vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_13_INCS := \ -@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \ - # - # vboxmouse_drv_14 - # --DLLS += vboxmouse_drv_14 - vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_14_INCS := \ -@@ -126,7 +121,6 @@ endif - # - # vboxmouse_drv_15 - # --DLLS += vboxmouse_drv_15 - vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_15_INCS := \ -@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \ - # - # vboxmouse_drv_16 - # --DLLS += vboxmouse_drv_16 - vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_16_INCS := \ -@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \ - # - # vboxmouse_drv_17 - # --DLLS += vboxmouse_drv_17 - vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \ - # - # vboxmouse_drv_18 - # --DLLS += vboxmouse_drv_18 - vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \ - # - # vboxmouse_drv_19 - # --DLLS += vboxmouse_drv_19 - vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \ - # - # vboxmouse_drv_110 - # --DLLS += vboxmouse_drv_110 - vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \ - vboxmouse_15.c - - -+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv -+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 -+DLLS += vboxmouse_drv_$(XSERVER_VERSION) -+ -+ - # Check the undefined symbols in the X.Org modules against lists of allowed - # symbols. Not very elegant, but it will catch problems early. - ifdef VBOX_WITH_TESTCASES -diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk - # vboxvideo_drv - # - if1of ($(KBUILD_TARGET), linux) -- SYSMODS += vboxvideo_drv - endif # target linux - vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD - vboxvideo_drv_DEFS.linux = linux -@@ -89,7 +88,6 @@ endif # target linux - # base keywords instead of using .solaris or .linux. - # Also it is *important* to use := and not = when deriving a property. - # --DLLS += vboxvideo_drv_70 - vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD - if1of ($(KBUILD_TARGET), linux) - vboxvideo_drv_70_CFLAGS += \ -@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES) - # - # vboxvideo_drv_71 - # --DLLS += vboxvideo_drv_71 - vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) -@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES) - # - # vboxvideo_drv_13 - # --DLLS += vboxvideo_drv_13 - vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13 -@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \ - # - # vboxvideo_drv_14 - # --DLLS += vboxvideo_drv_14 - vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS) -@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES) - # - # vboxvideo_drv_15 - # --DLLS += vboxvideo_drv_15 - vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \ -@@ -192,7 +186,6 @@ endif - # - # vboxvideo_drv_16 - # --DLLS += vboxvideo_drv_16 - vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_17 - # --DLLS += vboxvideo_drv_17 - vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_18 - # --DLLS += vboxvideo_drv_18 - vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_19 - # --DLLS += vboxvideo_drv_19 - vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_110 - # --DLLS += vboxvideo_drv_110 - vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \ - vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) - - -+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv -+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \ -+ /usr/include/xorg \ -+ /usr/include/x11 \ -+ /usr/include/pixman-1 \ -+ /usr/include/X11/dri \ -+ /usr/include/drm \ -+ /usr/include/libdrm -+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include -+DLLS += vboxvideo_drv_$(XSERVER_VERSION) -+ -+# required for lenny backports -+ifeq ($(XSERVER_VERSION),14) -+ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg -+endif -+ -+ - # Check the undefined symbols in the X.Org modules against lists of allowed - # symbols. Not very elegant, but it will catch problems early. - ifdef VBOX_WITH_TESTCASES diff --git a/community-testing/virtualbox/60-vboxguest.rules b/community-testing/virtualbox/60-vboxguest.rules deleted file mode 100644 index 6285f7249..000000000 --- a/community-testing/virtualbox/60-vboxguest.rules +++ /dev/null @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" -ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/community-testing/virtualbox/LocalConfig.kmk b/community-testing/virtualbox/LocalConfig.kmk deleted file mode 100644 index d0e939ad4..000000000 --- a/community-testing/virtualbox/LocalConfig.kmk +++ /dev/null @@ -1,19 +0,0 @@ -VBOX_WITH_ADDITION_DRIVERS = -VBOX_WITH_INSTALLER = 1 -VBOX_WITH_LINUX_ADDITIONS = 1 -VBOX_WITH_X11_ADDITIONS = 1 -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = -VBOX_WITH_ORIGIN := -VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS := /usr/share/virtualbox -VBOX_WITH_REGISTRATION_REQUEST = -VBOX_WITH_UPDATE_REQUEST = -VBOX_WITH_VNC := 1 -VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /opt/java -VBOX_GCC_WERR = -VBOX_GCC_WARN = diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD deleted file mode 100644 index d989f61e0..000000000 --- a/community-testing/virtualbox/PKGBUILD +++ /dev/null @@ -1,217 +0,0 @@ -# $Id: PKGBUILD 47272 2011-05-20 17:46:19Z ibiru $ -#Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgbase=virtualbox -pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.8 -pkgrel=3 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL' 'custom') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' -'xorg-server-devel' 'xf86driproto' 'libxcomposite') -[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf - virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch - 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh - 18-system-xorg.patch - change_default_driver_dir.patch) -_kernver=2.6.39-ARCH - -build() { - cd "$srcdir/VirtualBox-${pkgver}_OSE" - - patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" - patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" - patch -Np1 -i "$srcdir/vboxdrv-reference.patch" - patch -Np1 -i "$srcdir/18-system-xorg.patch" - patch -Np1 -i "$srcdir/change_default_driver_dir.patch" - - cp "$srcdir/LocalConfig.kmk" . - - ./configure --disable-docs \ - --enable-webservice \ - --enable-vde \ - --with-linux=/usr/src/linux-${_kernver} - source ./env.sh - kmk all - - export KERN_DIR=/usr/src/linux-${_kernver} - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo" - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" -} - -package_virtualbox() { - pkgdesc="Powerful x86 virtualization for enterprise as well as home use" - depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'kernel26-headers' 'gcc' 'make') - optdepends=('libxt: for shared clipboard' - 'python2: for python support' - 'qt: for VirtualBox GUI' - 'vde2: Virtual Distributed Ethernet support' - 'virtualbox-sdk: developer kit') - - replaces=('virtualbox-ose') - conflicts=('virtualbox-ose') - install=virtualbox.install - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls} - - #doc - install -m 0644 "$srcdir/UserManual.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf" - - #Binaries and Wrapper with Launchers - install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" - ln -sf VBox "$pkgdir/usr/bin/VBoxHeadless" - ln -sf VBox "$pkgdir/usr/bin/vboxheadless" - ln -sf VBox "$pkgdir/usr/bin/VBoxManage" - ln -sf VBox "$pkgdir/usr/bin/vboxmanage" - ln -sf VBox "$pkgdir/usr/bin/VBoxSDL" - ln -sf VBox "$pkgdir/usr/bin/vboxsdl" - ln -sf VBox "$pkgdir/usr/bin/VirtualBox" - ln -sf VBox "$pkgdir/usr/bin/virtualbox" - ln -sf VBox "$pkgdir/usr/bin/vboxwebsrv" - - install -m 0755 VBoxTunctl "$pkgdir/usr/bin" - - #components - install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" - - #lib - install -m 0755 *.so "$pkgdir/usr/lib/virtualbox" - install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" - - #setuid root binaries - install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox" - #other binaries - install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" - - #language - install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" - - #useless scripts - install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" - - #icons - install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" - - pushd icons - for i in *; do - install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - done - popd - - #desktop - install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" - install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" - - #install configuration - mkdir -p "$pkgdir/etc/vbox" - echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" - - #udev and licence - install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \ - "$pkgdir/usr/share/licenses/virtualbox/LICENSE" - install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ - "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" - - #sources for modules - cp -r src ${pkgdir}/usr/lib/virtualbox - #install compilation script - install -D -m 755 "${srcdir}/vboxdrv.sh" "${pkgdir}/etc/rc.d/vboxdrv" -} - -package_virtualbox-sdk() { - pkgdesc=" VirtualBox Software Developer Kit (SDK)" - - mkdir -p "$pkgdir/usr/lib/virtualbox" - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - - install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" - #python sdk - pushd sdk/installer - VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}" - popd - rm -rf sdk/installer - mv sdk "$pkgdir/usr/lib/virtualbox" -} -package_virtualbox-guest-additions(){ - pkgdesc="VirtualBox user-space tools for Linux guests" - depends=("virtualbox-guest-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr') - replaces=('virtualbox-ose-additions') - conflicts=('virtualbox-ose-additions') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - - install -d "$pkgdir/usr/bin" - install -d "$pkgdir/sbin" - install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" - install -m755 mount.vboxsf "$pkgdir/sbin" - - install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ - "$pkgdir"/etc/X11/xorg.conf.d/50-vboxmouse.conf - install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \ - "$pkgdir"/lib/udev/rules.d/70-xorg-vboxmouse.rules - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - "$pkgdir"/usr/bin/VBoxClient-all - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ - "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxmouse_drv.so \ - "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so" - install -D vboxvideo_drv.so \ - "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" - install -d "$pkgdir/usr/lib/xorg/modules/dri" - install -m755 VBoxOGL*.so "$pkgdir/usr/lib" - ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" - install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" - -} -package_virtualbox-guest-modules(){ - pkgdesc="VirtualBox kernel modules for Linux guests" - license=('GPL') - install=virtualbox-guest-modules.install - depends=('kernel26>=2.6.39' 'kernel26<2.6.40') - replaces=('virtualbox-ose-additions-modules') - conflicts=('virtualbox-ose-additions-modules') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - - cd vboxguest - install -D -m644 vboxguest.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko" - - cd ../vboxsf - install -D -m644 vboxsf.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko" - - cd ../vboxvideo - install -D -m644 vboxvideo.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko" - - install -D -m 0644 "$srcdir/60-vboxguest.rules" \ - "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" - - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" -} -md5sums=('a3e81289f2357fcf4bbe3e77805f38b6' - '39712ccbc16b04c1cda209ae16446bf2' - '44efb3c4be214daa453a317d527f1f30' - '32a232b43852b9a08cb11a7bcd64b347' - '5f85710e0b8606de967716ded7b2d351' - 'ed1341881437455d9735875ddf455fbe' - '9bde5b7dfba5abcd49768052c5409800' - 'c1a07f044c476a190af8486fe78bee0f' - '47da2e88de582bb2bab14580a3aa47b1' - '8a22b33c9dfaf8fb79bb2d26304e650b' - 'ac43f7cf44b934d8dbdbc3bb6f7879ad') diff --git a/community-testing/virtualbox/change_default_driver_dir.patch b/community-testing/virtualbox/change_default_driver_dir.patch deleted file mode 100644 index 71930f062..000000000 --- a/community-testing/virtualbox/change_default_driver_dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ---- VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:28:14.545495222 -0700 -+++ VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:29:57.945499707 -0700 -@@ -36,13 +36,8 @@ - //#define DEBUG_DRI_CALLS - - //@todo this could be different... --#ifdef RT_ARCH_AMD64 --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri" -+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" - # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#else --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri" --# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#endif - - #ifdef DEBUG_DRI_CALLS - #define SWDRI_SHOWNAME(pext, func) \ diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch deleted file mode 100644 index e7a9179a9..000000000 --- a/community-testing/virtualbox/vboxdrv-reference.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp ---- VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 03:31:05.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 11:10:00.503832646 -0700 -@@ -75,9 +75,8 @@ - "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " - "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " - "module by executing<br/><br/>" -- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " -- "package first. This package keeps track of Linux kernel changes and " -+ " <font color=blue>'/etc/rc.d/vboxdrv setup'</font><br/><br/>" -+ "as root. This package keeps track of Linux kernel changes and" - "recompiles the vboxdrv kernel module if necessary." - ); - -@@ -92,7 +91,7 @@ - "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing<br/><br/>" -- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -+ " <font color=blue>'/etc/rc.d/vboxdrv setup'</font><br/><br/>" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." - ); -diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh ---- VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh 2011-04-21 03:31:18.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-04-21 11:10:00.503832646 -0700 -@@ -34,7 +34,7 @@ - available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by - -- sudo /etc/init.d/vboxdrv setup -+ /etc/rc.d/vboxdrv setup - - You will not be able to start VMs until this problem is fixed. - EOF -@@ -42,7 +42,7 @@ - cat << EOF - WARNING: The character device /dev/vboxdrv does not exist. Try - -- sudo /etc/init.d/vboxdrv restart -+ /etc/rc.d/vboxdrv restart - - and if that is not successful, try to re-install the package. - diff --git a/community-testing/virtualbox/vboxdrv.sh b/community-testing/virtualbox/vboxdrv.sh deleted file mode 100755 index 8de14b97f..000000000 --- a/community-testing/virtualbox/vboxdrv.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/vbox/vbox.cfg - -MODLIST=() -LOG="/var/log/vbox-install.log" - -if [ -n "$INSTALL_DIR" ]; then - VBOXMANAGE="$INSTALL_DIR/VBoxManage" - BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp" - BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp" - BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp" -else - echo "missing vbox.cfg" - exit 0 -fi - -case "$1" in - setup) - stat_busy "Unloading VirtualBox kernel modules" - for module in vbox{netflt,netadp,drv}; do - if grep -q "^${module}" /proc/modules; then - MODLIST+=($module) - modprobe -r $module - fi - done - stat_done - for p in /lib/modules/*; do - if [ ! -d "$p/kernel" ]; then - if [ -e "$p/misc/vboxdrv.ko" ]; then - stat_busy "Removing old VirtualBox kernel modules from $p" - rm -f "$p/misc/vbox"{drv,netadp,netflt}.ko 2>/dev/null - rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null - stat_done - fi - fi - done - if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then - stat_busy "Removing old VirtualBox netadp kernel module" - find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then - stat_busy "Removing old VirtualBox netflt kernel module" - find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then - stat_busy "Removing old VirtualBox kernel module" - find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - stat_busy "Recompiling VirtualBox kernel modules" - if ! $BUILDVBOXDRV \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install > $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETFLT \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETADP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - stat_done - stat_busy "Reloading VirtualBox kernel modules" - for module in "${MODLIST[@]}"; do - modprobe $module - done - stat_done - ;; - *) - echo "usage: $0 {setup}" -esac diff --git a/community-testing/virtualbox/virtualbox-4-makeself-check.patch b/community-testing/virtualbox/virtualbox-4-makeself-check.patch deleted file mode 100644 index e1fcb8c2f..000000000 --- a/community-testing/virtualbox/virtualbox-4-makeself-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- VirtualBox-4.0.0_OSE/configure -+++ VirtualBox-4.0.0_OSE/configure -@@ -2527,7 +2527,6 @@ - check_compiler_h - [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit - # tools/common/makeself* -- [ $OSE -ge 1 ] && check_makeself - fi - - [ -n "$SETUP_WINE" ] && setup_wine diff --git a/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch b/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch deleted file mode 100644 index 8b0d59123..000000000 --- a/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- VirtualBox-4.0.0_OSE/configure -+++ VirtualBox-4.0.0_OSE/configure -@@ -2499,7 +2499,6 @@ - # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs - # [ "$OS" != "darwin" ] && check_yasm - [ "$OS" != "darwin" ] && check_xsltproc --[ "$OS" != "darwin" ] && check_mkisofs - - # the libraries - [ "$OS" != "darwin" ] && check_pthread diff --git a/community-testing/virtualbox/virtualbox-guest-modules.install b/community-testing/virtualbox/virtualbox-guest-modules.install deleted file mode 100644 index ae05bd1ba..000000000 --- a/community-testing/virtualbox/virtualbox-guest-modules.install +++ /dev/null @@ -1,24 +0,0 @@ -KERNEL_VERSION='2.6.39-ARCH' - -post_install() { - cat << EOM - -===> virtualbox-guest-modules post-install message: -===> -===> You may want to load vboxguest, vboxsf and vboxvideo -===> -===> To load them automatically, add them -===> to the MODULES array in /etc/rc.conf. - -EOM - - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} - -post_remove() { - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} - -post_upgrade() { - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} diff --git a/community-testing/virtualbox/virtualbox.install b/community-testing/virtualbox/virtualbox.install deleted file mode 100644 index e70757685..000000000 --- a/community-testing/virtualbox/virtualbox.install +++ /dev/null @@ -1,65 +0,0 @@ -utils() { - if [ -x usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime > /dev/null 2>&1 - fi - - if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 - fi - - if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database -q - fi -} - -post_install() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF - -===> In order to run VirtualBox, you have to be in the 'vboxusers' group. -===> -===> If you want to be able to install guest additions, you have to install -===> 'virtualbox-additions' package. -===> -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -===> -===> You must load vboxnetflt for Host Interface Networking: -===> # modprobe vboxnetflt -===> -===> You must load vboxnetadp for Host-Only networking: -===> # modprobe vboxnetadp -===> -===> To load it automatically, add vboxdrv module -===> to the MODULES array in /etc/rc.conf. - -*** To compile the modules do /etc/rc.d/vboxdrv setup *** - -EOF - utils -} - -post_upgrade() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF -===> You must reload vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -===> -===> You must reload vboxnetflt for Host Interface Networking: -===> # modprobe vboxnetflt -===> -===> You must reload vboxnetadp for Host-Only networking: -===> # modprobe vboxnetadp -===> -===> To load it automatically, add vboxdrv module -===> to the MODULES array in /etc/rc.conf. - -*** To recompile the modules do /etc/rc.d/vboxdrv setup *** -EOF - utils -} - -post_remove() { - groupdel vboxusers >/dev/null 2>&1 || true - utils -} diff --git a/kde-unstable/akonadi/PKGBUILD b/kde-unstable/akonadi/PKGBUILD deleted file mode 100644 index c19e6d4ce..000000000 --- a/kde-unstable/akonadi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 125234 2011-05-25 19:13:14Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=akonadi -pkgver=1.5.80 -pkgrel=2 -pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" -arch=('i686' 'x86_64') -url='http://pim.kde.org/akonadi' -license=('LGPL') -depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') -install="${pkgname}.install" -source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2") -md5sums=('3ea38477473ee27257b9a6d0504889ec') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/akonadi/akonadi.install b/kde-unstable/akonadi/akonadi.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/kde-unstable/akonadi/akonadi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD deleted file mode 100644 index f155259d7..000000000 --- a/kde-unstable/calligra/PKGBUILD +++ /dev/null @@ -1,341 +0,0 @@ -# $Id: PKGBUILD 124312 2011-05-19 09:43:16Z andrea $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=calligra -pkgname=('calligra-filters' - 'calligra-interfaces' - 'calligra-libs' - 'calligra-plugins' - 'calligra-pics' - 'calligra-servicetypes' - 'calligra-templates' - 'calligra-tools' - 'calligra-karbon' - 'calligra-karbon-doc' - 'calligra-kexi' - 'calligra-kexi-doc' - 'calligra-kformula' - 'calligra-kformula-doc' - 'calligra-kounavail' - 'calligra-kplato' - 'calligra-stage' - 'calligra-stage-doc' - 'calligra-krita' - 'calligra-tables' - 'calligra-tables-doc' - 'calligra-words' - 'calligra-handbook' - 'calligra-thesaurus-doc' - 'calligra-braindump' - 'calligra-flow') -pkgver=2.3.71 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org' -license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('kdelibs' 'kdepimlibs' 'eigen' 'lcms2' 'postgresql-libs' 'freetds' - 'kdegraphics-okular' 'libgsf' 'libwpd' 'libwpg' 'pstoedit' 'glew' - 'gsl' 'cmake' 'automoc4' 'boost') -groups=('calligra') -source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('f280add8d1d57cc701dc105fc92d2504') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_calligra-filters() { - pkgdesc="Filters for the Calligra office suite" - optdepends=('libgsf: Microsoft Word document importer' - 'libwpd: WordPerfect document importer' - 'libwpg: Corel WordPerfect Graphics image importer' - 'pstoedit: Karbon EPS import filter' - 'kdegraphics-libs: support for raw images') - conflicts=('koffice-filters') - replaces=('koffice-filters') - install=calligra-filters.install - - cd "${srcdir}"/build/filters - make DESTDIR="${pkgdir}" install -} - -package_calligra-interfaces() { - pkgdesc="Interfaces for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-interfaces') - replaces=('koffice-interfaces') - - cd "${srcdir}"/build/interfaces - make DESTDIR="${pkgdir}" install -} - -package_calligra-libs() { - pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes') - conflicts=('koffice-libs') - replaces=('koffice-libs') - - cd "${srcdir}"/build/libs - make DESTDIR="${pkgdir}" install -} - -package_calligra-plugins() { - pkgdesc="Plugins for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-plugins' 'koffice-kchart') - replaces=('koffice-plugins' 'koffice-kchart') - - cd "${srcdir}"/build/plugins - make DESTDIR="${pkgdir}" install -} - -package_calligra-pics() { - pkgdesc="Icons for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-pics') - replaces=('koffice-pics') - install=calligra.install - - cd "${srcdir}"/build/pics - make DESTDIR="${pkgdir}" install -} - -package_calligra-servicetypes() { - pkgdesc="Servicetypes for the Calligra office suite" - conflicts=('koffice-servicetypes') - replaces=('koffice-servicetypes') - install=calligra.install - - cd "${srcdir}"/build/servicetypes - make DESTDIR="${pkgdir}" install -} - -package_calligra-templates() { - pkgdesc="Templates for the Calligra office suite" - conflicts=('koffice-templates') - replaces=('koffice-templates') - - cd "${srcdir}"/build/templates - make DESTDIR="${pkgdir}" install -} - -package_calligra-tools() { - pkgdesc="Tools for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-tools') - replaces=('koffice-tools') - install=calligra-tools.install - - cd "${srcdir}"/build/tools - make DESTDIR="${pkgdir}" install -} - -#### package common files done ##### - -#### package apps and their docs ##### - -package_calligra-karbon() { - pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'calligra-templates') - conflicts=('koffice-karbon') - replaces=('koffice-karbon') - install=calligra-karbon.install - - cd "${srcdir}"/build/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-karbon-doc() { - pkgdesc="Documentation for Karbon" - depends=('calligra-karbon') - conflicts=('koffice-karbon-doc') - replaces=('koffice-karbon-doc') - - cd "${srcdir}"/build/doc/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-kexi() { - pkgdesc="Develop desktop database applications" - depends=('calligra-libs' 'calligra-templates') - conflicts=('koffice-kexi') - replaces=('koffice-kexi') - install=calligra-kexi.install - - cd "${srcdir}"/build/kexi - make DESTDIR="${pkgdir}" install -} - -package_calligra-kexi-doc() { - pkgdesc="Documentation for Kexi" - depends=('calligra-kexi') - conflicts=('koffice-kexi-doc') - replaces=('koffice-kexi-doc') - - cd "${srcdir}"/build/doc/kexi - make DESTDIR="${pkgdir}" install -} - -package_calligra-kformula() { - pkgdesc="Formula editor" - depends=('calligra-libs' 'calligra-templates') - conflicts=('koffice-kformula') - replaces=('koffice-kformula') - install=calligra-kformula.install - - cd "${srcdir}"/build/kformula - make DESTDIR="${pkgdir}" install -} - -package_calligra-kformula-doc() { - pkgdesc="Documentation for KFormula" - depends=('calligra-kformula') - conflicts=('koffice-kformula-doc') - replaces=('koffice-kformula-doc') - - cd "${srcdir}"/build/doc/kformula - make DESTDIR="${pkgdir}" install -} - -package_calligra-kounavail() { - pkgdesc="Unavailable Calligra Document" - depends=('calligra-libs') - conflicts=('koffice-kounavail') - replaces=('koffice-kounavail') - - cd "${srcdir}"/build/kounavail - make DESTDIR="${pkgdir}" install -} - -package_calligra-kplato() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words') - conflicts=('koffice-kplato') - replaces=('koffice-kplato') - install=calligra-kplato.install - - cd "${srcdir}"/build/kplato - make DESTDIR="${pkgdir}" install -} - -package_calligra-stage() { - pkgdesc="Write presentation documents" - depends=('calligra-libs' 'calligra-templates') - optdepends=('koffice-filters: import/export filters') - conflicts=('koffice-kpresenter') - replaces=('koffice-kpresenter') - install=calligra-stage.install - - cd "${srcdir}"/build/kpresenter - make DESTDIR="${pkgdir}" install -} - -package_calligra-stage-doc() { - pkgdesc="Documentation for Stage" - depends=('calligra-stage') - conflicts=('koffice-kpresenter-doc') - replaces=('koffice-kpresenter-doc') - - cd "${srcdir}"/build/doc/stage - make DESTDIR="${pkgdir}" install -} - -package_calligra-krita() { - pkgdesc="Edit and paint images" - depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'glew' - 'qimageblitz' 'poppler-qt' 'openexr' 'opengtl') - optdepends=('koffice-filters: import/export filters') - conflicts=('koffice-krita') - replaces=('koffice-krita') - install=calligra-krita.install - - cd "${srcdir}"/build/krita - make DESTDIR="${pkgdir}" install -} - -package_calligra-tables() { - pkgdesc="Write spreadsheet documents" - depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'gsl') - optdepends=('koffice-filters: import/export filters') - conflicts=('koffice-kspread') - replaces=('koffice-kspread') - install=calligra-tables.install - - cd "${srcdir}"/build/tables - make DESTDIR="${pkgdir}" install -} - -package_calligra-tables-doc() { - pkgdesc="Documentation for Tables" - depends=('calligra-tables') - conflicts=('koffice-kspread-doc') - replaces=('koffice-kspread-doc') - - cd "${srcdir}"/build/doc/tables - make DESTDIR="${pkgdir}" install -} - -package_calligra-words() { - pkgdesc="Word Processor" - depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'calligra-pics' - 'calligra-kounavail') - optdepends=('koffice-filters: import/export filters') - conflicts=('koffice-kword') - replaces=('koffice-kword') - install=calligra-words.install - - cd "${srcdir}"/build/words - make DESTDIR="${pkgdir}" install -} - -package_calligra-handbook() { - pkgdesc="Documentation for Calligra" - conflicts=('koffice-handbook') - replaces=('koffice-handbook') - - cd "${srcdir}"/build/doc/calligra - make DESTDIR="${pkgdir}" install -} - -package_calligra-thesaurus-doc() { - pkgdesc="Documentation for Thesaurus" - conflicts=('koffice-thesaurus-doc') - replaces=('koffice-thesaurus-doc') - - cd "${srcdir}"/build/doc/thesaurus - make DESTDIR="${pkgdir}" install -} - -package_calligra-braindump() { - pkgdesc="Notes and idea gathering" - install=calligra-braindump.install - - cd "${srcdir}"/build/braindump - make DESTDIR="${pkgdir}" install -} - -package_calligra-flow() { - pkgdesc="Flowchart & Diagram Editing" - install=calligra-flow.install - - cd "${srcdir}"/build/flow - make DESTDIR="${pkgdir}" install -} - -package_calligra-flow-doc() { - pkgdesc="Documentation for Flow" - depends=('calligra-flow') - - cd "${srcdir}"/build/doc/flow - make DESTDIR="${pkgdir}" install -} - -##### package apps done ##### diff --git a/kde-unstable/calligra/calligra-braindump.install b/kde-unstable/calligra/calligra-braindump.install deleted file mode 100644 index c2179f6e2..000000000 --- a/kde-unstable/calligra/calligra-braindump.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-filters.install b/kde-unstable/calligra/calligra-filters.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/kde-unstable/calligra/calligra-filters.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/calligra/calligra-flow.install b/kde-unstable/calligra/calligra-flow.install deleted file mode 100644 index 6c87527e2..000000000 --- a/kde-unstable/calligra/calligra-flow.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/calligra/calligra-karbon.install b/kde-unstable/calligra/calligra-karbon.install deleted file mode 100644 index c2179f6e2..000000000 --- a/kde-unstable/calligra/calligra-karbon.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-kexi.install b/kde-unstable/calligra/calligra-kexi.install deleted file mode 100644 index b8c7ebf27..000000000 --- a/kde-unstable/calligra/calligra-kexi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/calligra/calligra-kformula.install b/kde-unstable/calligra/calligra-kformula.install deleted file mode 100644 index c2179f6e2..000000000 --- a/kde-unstable/calligra/calligra-kformula.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-kplato.install b/kde-unstable/calligra/calligra-kplato.install deleted file mode 100644 index c2179f6e2..000000000 --- a/kde-unstable/calligra/calligra-kplato.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-krita.install b/kde-unstable/calligra/calligra-krita.install deleted file mode 100644 index 33d234a02..000000000 --- a/kde-unstable/calligra/calligra-krita.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-stage.install b/kde-unstable/calligra/calligra-stage.install deleted file mode 100644 index 6c87527e2..000000000 --- a/kde-unstable/calligra/calligra-stage.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/calligra/calligra-tables.install b/kde-unstable/calligra/calligra-tables.install deleted file mode 100644 index 6c87527e2..000000000 --- a/kde-unstable/calligra/calligra-tables.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/calligra/calligra-tools.install b/kde-unstable/calligra/calligra-tools.install deleted file mode 100644 index 6c87527e2..000000000 --- a/kde-unstable/calligra/calligra-tools.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/calligra/calligra-words.install b/kde-unstable/calligra/calligra-words.install deleted file mode 100644 index 6c87527e2..000000000 --- a/kde-unstable/calligra/calligra-words.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/calligra/calligra.install b/kde-unstable/calligra/calligra.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/calligra/calligra.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/kde-unstable/kdeaccessibility/PKGBUILD b/kde-unstable/kdeaccessibility/PKGBUILD deleted file mode 100644 index 9fe34bcd9..000000000 --- a/kde-unstable/kdeaccessibility/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeaccessibility -pkgname=('kdeaccessibility-jovie' - 'kdeaccessibility-kaccessible' - 'kdeaccessibility-kmag' - 'kdeaccessibility-kmousetool' - 'kdeaccessibility-kmouth') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://accessibility.kde.org' -license=('GPL' 'FDL') -groups=('kde' 'kdeaccessibility') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('a8d4ca99dadc9439b6a1ee91645527f954665cb1') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Opentts=OFF - make -} - -package_kdeaccessibility-jovie() { - pkgdesc='A text to speech application' - depends=('kdebase-runtime' 'speech-dispatcher') - replaces=('kdeaccessibility-kttsd') - install='kdeaccessibility.install' - cd $srcdir/build/jovie - make DESTDIR=$pkgdir install - cd $srcdir/build/jovie/doc - make DESTDIR=$pkgdir install -} - -package_kdeaccessibility-kaccessible() { - pkgdesc='Provides accessibility services like focus tracking and a screenreader' - depends=('kdebase-runtime' 'speech-dispatcher') - install='kdeaccessibility.install' - cd $srcdir/build/kaccessible - make DESTDIR=$pkgdir install -} - -package_kdeaccessibility-kmag() { - pkgdesc='Screen Magnifier' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kmag/" - install='kdeaccessibility.install' - cd $srcdir/build/kmag - make DESTDIR=$pkgdir install - cd $srcdir/build/kmag/doc - make DESTDIR=$pkgdir install -} - -package_kdeaccessibility-kmousetool() { - pkgdesc='Clicks the mouse for you, reducing the effects of RSI' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kmousetool/" - install='kdeaccessibility.install' - cd $srcdir/build/kmousetool - make DESTDIR=$pkgdir install - cd $srcdir/build/kmousetool/doc - make DESTDIR=$pkgdir install -} - -package_kdeaccessibility-kmouth() { - pkgdesc='Speech Synthesizer Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kmouth/" - install='kdeaccessibility.install' - cd $srcdir/build/kmouth - make DESTDIR=$pkgdir install - cd $srcdir/build/kmouth/doc - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdeaccessibility/kdeaccessibility.install b/kde-unstable/kdeaccessibility/kdeaccessibility.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeaccessibility/kdeaccessibility.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/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD deleted file mode 100644 index ceac7ec49..000000000 --- a/kde-unstable/kdeadmin/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# $Id: PKGBUILD 124778 2011-05-24 11:55:25Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeadmin -pkgname=('kdeadmin-kcron' - 'kdeadmin-ksystemlog' - 'kdeadmin-kuser' - 'kdeadmin-system-config-printer-kde') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeadmin') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' - 'system-config-printer-common') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'syslog-path.patch') -sha1sums=('ceb0ccd2d24b64770f6ac7649d312937a09a17e2' - '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - patch -p1 -i ${srcdir}/syslog-path.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_strigi-analyzer=OFF - make -} - -package_kdeadmin-kcron() { - pkgdesc='Configure and schedule tasks' - depends=('kdelibs') - cd $srcdir/build/kcron - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcron - make DESTDIR=$pkgdir install -} - -package_kdeadmin-ksystemlog() { - pkgdesc='System log viewer tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/ksystemlog/" - cd $srcdir/build/ksystemlog - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksystemlog - make DESTDIR=$pkgdir install -} - -package_kdeadmin-kuser() { - pkgdesc='User Manager' - depends=('kdepim-runtime') - url="http://kde.org/applications/system/kuser/" - install='kdeadmin.install' - cd $srcdir/build/kuser - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kuser - make DESTDIR=$pkgdir install -} - -package_kdeadmin-system-config-printer-kde() { - pkgdesc='Configure local and remote Printers' - depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt') - url="http://kde.org/applications/system/printerapplet/" - cd $srcdir/build/system-config-printer-kde - make DESTDIR=$pkgdir install - - # Use the python2 executable - find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} diff --git a/kde-unstable/kdeadmin/kdeadmin.install b/kde-unstable/kdeadmin/kdeadmin.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeadmin/kdeadmin.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/kde-unstable/kdeadmin/syslog-path.patch b/kde-unstable/kdeadmin/syslog-path.patch deleted file mode 100644 index 8a9142bf6..000000000 --- a/kde-unstable/kdeadmin/syslog-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100 -+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100 -@@ -39,7 +39,7 @@ - SystemConfiguration() : - GenericLogModeConfiguration( - QLatin1String( SYSTEM_LOG_MODE_ID ), -- QStringList() << QLatin1String( "/var/log/syslog" ), -+ QStringList() << QLatin1String( "/var/log/messages.log" ), - QList<int>() << INFORMATION_LOG_LEVEL_ID - ) { - diff --git a/kde-unstable/kdeartwork/PKGBUILD b/kde-unstable/kdeartwork/PKGBUILD deleted file mode 100644 index 0118d8b45..000000000 --- a/kde-unstable/kdeartwork/PKGBUILD +++ /dev/null @@ -1,104 +0,0 @@ -# $Id: PKGBUILD 124845 2011-05-24 18:14:29Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeartwork -pkgname=('kdeartwork-aurorae' - 'kdeartwork-colorschemes' - 'kdeartwork-desktopthemes' - 'kdeartwork-emoticons' - 'kdeartwork-iconthemes' - 'kdeartwork-kscreensaver' - 'kdeartwork-sounds' - 'kdeartwork-styles' - 'kdeartwork-wallpapers' - 'kdeartwork-weatherwallpapers') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeartwork') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' - 'kdebase-workspace' 'libkexiv2') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('70c5274f2c933b87c10a1ae53eb6971ae3887e87') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdeartwork-aurorae() { - pkgdesc='An Aurorae theme based on the Oxygen plasma theme' - cd $srcdir/build/aurorae - make DESTDIR=$pkgdir install -} - -package_kdeartwork-colorschemes() { - pkgdesc='KDE color schemes' - replaces=('kdeaccessibility-colorschemes') - cd $srcdir/build/ColorSchemes - make DESTDIR=$pkgdir install -} - -package_kdeartwork-desktopthemes() { - pkgdesc='KDE desktop themes' - cd $srcdir/build/desktopthemes - make DESTDIR=$pkgdir install -} - -package_kdeartwork-emoticons() { - pkgdesc='KDE emoticons' - cd $srcdir/build/emoticons - make DESTDIR=$pkgdir install -} - -package_kdeartwork-iconthemes() { - pkgdesc='KDE icon themes' - replaces=('kdeaccessibility-iconthemes') - cd $srcdir/build/IconThemes - make DESTDIR=$pkgdir install -} - -package_kdeartwork-kscreensaver() { - pkgdesc='KDE screensaver' - depends=('kdebase-workspace' 'libkexiv2') - cd $srcdir/build/kscreensaver - make DESTDIR=$pkgdir install -} - -package_kdeartwork-sounds() { - pkgdesc='KDE sounds' - cd $srcdir/build/sounds - make DESTDIR=$pkgdir install -} - -package_kdeartwork-styles() { - pkgdesc='KDE styles' - depends=('kdebase-workspace') - cd $srcdir/build/styles - make DESTDIR=$pkgdir install - cd $srcdir/build/kwin-styles - make DESTDIR=$pkgdir install -} - -package_kdeartwork-wallpapers() { - pkgdesc='KDE wallpapers' - cd $srcdir/build/wallpapers - make DESTDIR=$pkgdir install - cd $srcdir/build/HighResolutionWallpapers - make DESTDIR=$pkgdir install -} - -package_kdeartwork-weatherwallpapers() { - pkgdesc='KDE weather wallpapers' - cd $srcdir/build/WeatherWallpapers - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdebase-konsole/PKGBUILD b/kde-unstable/kdebase-konsole/PKGBUILD deleted file mode 100644 index 105e3dc39..000000000 --- a/kde-unstable/kdebase-konsole/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124800 2011-05-24 13:26:15Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebase-konsole -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://kde.org/applications/system/konsole/' -pkgdesc="Terminal" -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebase') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.bz2") -sha1sums=('7e7b5a0b37ae4d22e51a61f70afccbba86a93921') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../konsole-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD deleted file mode 100644 index 70105c4ec..000000000 --- a/kde-unstable/kdebase-runtime/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdebase-runtime -_pkgname=kde-runtime -pkgver=4.6.80 -pkgrel=1 -pkgdesc="KDE Base Runtime Environment" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL') -depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' - 'xorg-xauth' 'hicolor-icon-theme') -makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib') -optdepends=('htdig: to build the search index in khelpcenter' - 'rarian: needed by khelpcenter' - 'gdb: drkonq crash handler') -install="${pkgname}.install" -source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('5d06c11f43beb21ebf6c47d2a7addcbe710e019e') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${_pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install - rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" - ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" -} diff --git a/kde-unstable/kdebase-runtime/kdebase-runtime.install b/kde-unstable/kdebase-runtime/kdebase-runtime.install deleted file mode 100644 index 3f06b8deb..000000000 --- a/kde-unstable/kdebase-runtime/kdebase-runtime.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD deleted file mode 100644 index fae8c192f..000000000 --- a/kde-unstable/kdebase-workspace/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# $Id: PKGBUILD 125374 2011-05-26 12:53:42Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdebase-workspace -_pkgname=kde-workspace -pkgver=4.6.80 -pkgrel=2 -pkgdesc="KDE Base Workspace" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde') -# note on libxdamage: -# not detected by namcap because libgl depends on it -# but nvidia providing libgl does not depend on libxdamage -depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' - 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx' - 'xorg-xsetroot' 'libxcomposite' 'libxinerama' 'kde-wallpapers') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python') -replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') -conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') -install="${pkgname}.install" -backup=('usr/share/config/kdm/kdmrc' - 'etc/pam.d/kde' - 'etc/pam.d/kde-np' - 'etc/pam.d/kscreensaver') -options=('emptydirs') -source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" - 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch') -sha1sums=('99bf68ee90c4cfa3568527a55c7c68d4247d9b13' - '8c2bdefb23a03b753b78d16944d03fa3939d2d99' - '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - 'f7b38af38549242a240f1a90ab9964ca8a366129' - '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' - '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' - 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') - -build() { - cd ${srcdir}/${_pkgname}-${pkgver} - patch -p0 -i ${srcdir}/kdm-zsh-profile.patch - patch -p0 -i ${srcdir}/fixpath.patch - patch -p0 -i ${srcdir}/terminate-server.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${_pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF \ - -DWITH_libgps=OFF \ - -DWITH_Prison=OFF \ - -DWITH_NetworkManager=OFF \ - -DKWIN_MOBILE_EFFECTS=OFF \ - -DWITH_OpenGLES=OFF \ - -DKWIN_BUILD_WITH_OPENGLES=OFF - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - - install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm - install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde - install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np - install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver - install -d -m755 ${pkgdir}/usr/share/xsessions/ - ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/ - install -d -m755 ${pkgdir}/etc/kde/{env,shutdown} - - install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm -} diff --git a/kde-unstable/kdebase-workspace/fixpath.patch b/kde-unstable/kdebase-workspace/fixpath.patch deleted file mode 100644 index be2b8383e..000000000 --- a/kde-unstable/kdebase-workspace/fixpath.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 -+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 -@@ -34,22 +34,6 @@ - MALLOC_CHECK_=2 - export MALLOC_CHECK_ - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`$bindir/kde4-config --qt-binaries` -- if [ -n "$qbindir" ]; then -- case $PATH in -- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; -- *) PATH=$qbindir:$PATH; export PATH;; -- esac -- fi -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --fi -- - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage -@@ -206,7 +190,7 @@ - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --libpath=`kde4-config --path lib | tr : '\n'` -+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') - - for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do - for file in "$prefix"*.sh; do diff --git a/kde-unstable/kdebase-workspace/kde-np.pam b/kde-unstable/kdebase-workspace/kde-np.pam deleted file mode 100644 index 81eeef47b..000000000 --- a/kde-unstable/kdebase-workspace/kde-np.pam +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 -auth required pam_nologin.so -auth required pam_permit.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so
\ No newline at end of file diff --git a/kde-unstable/kdebase-workspace/kde.pam b/kde-unstable/kdebase-workspace/kde.pam deleted file mode 100644 index 1a259390f..000000000 --- a/kde-unstable/kdebase-workspace/kde.pam +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so
\ No newline at end of file diff --git a/kde-unstable/kdebase-workspace/kdebase-workspace.install b/kde-unstable/kdebase-workspace/kdebase-workspace.install deleted file mode 100644 index f7d6d305b..000000000 --- a/kde-unstable/kdebase-workspace/kdebase-workspace.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() { - groupadd -g 135 kdm &>/dev/null - useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null - chown -R 135:135 var/lib/kdm &>/dev/null - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - update-desktop-database -q -} - -post_upgrade() { - getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null - getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null - chown -R 135:135 var/lib/kdm &>/dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_remove() { - if getent passwd kdm >/dev/null 2>&1; then - userdel kdm - fi - if getent group kdm >/dev/null 2>&1; then - groupdel kdm - fi - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/kde-unstable/kdebase-workspace/kdm b/kde-unstable/kdebase-workspace/kdm deleted file mode 100644 index 799d58f4b..000000000 --- a/kde-unstable/kdebase-workspace/kdm +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/kdm) -case "$1" in - start) - stat_busy "Starting KDE Desktop Manager" - [ -z "$PID" ] && /usr/bin/kdm &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon kdm - stat_done - fi - ;; - stop) - stat_busy "Stopping KDE Desktop Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon kdm - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch b/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch deleted file mode 100644 index 779456b39..000000000 --- a/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000 -+++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000 -@@ -662,7 +662,7 @@ - " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n" - " zhome=${ZDOTDIR:-$HOME}\n" - " # zshenv is always sourced automatically.\n" --" [ -f $zdir/zprofile ] && . $zdir/zprofile\n" -+" [ -f /etc/profile ] && . /etc/profile\n" - " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n" - " [ -f $zdir/zlogin ] && . $zdir/zlogin\n" - " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n" diff --git a/kde-unstable/kdebase-workspace/kscreensaver.pam b/kde-unstable/kdebase-workspace/kscreensaver.pam deleted file mode 100644 index b4d80c21f..000000000 --- a/kde-unstable/kdebase-workspace/kscreensaver.pam +++ /dev/null @@ -1 +0,0 @@ -auth required pam_unix_auth.so diff --git a/kde-unstable/kdebase-workspace/terminate-server.patch b/kde-unstable/kdebase-workspace/terminate-server.patch deleted file mode 100644 index 094591317..000000000 --- a/kde-unstable/kdebase-workspace/terminate-server.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 -+++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 -@@ -1448,7 +1448,7 @@ - - Key: TerminateServer - Type: bool --Default: false -+Default: true - User: core - Instance: #:*/! - Merge: xdm diff --git a/kde-unstable/kdebase/PKGBUILD b/kde-unstable/kdebase/PKGBUILD deleted file mode 100644 index da7098290..000000000 --- a/kde-unstable/kdebase/PKGBUILD +++ /dev/null @@ -1,117 +0,0 @@ -# $Id: PKGBUILD 124659 2011-05-23 19:43:17Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdebase -pkgname=('kdebase-dolphin' - 'kdebase-kdepasswd' - 'kdebase-kdialog' - 'kdebase-keditbookmarks' - 'kdebase-kfind' - 'kdebase-konq-plugins' - 'kdebase-konqueror' - 'kdebase-lib' - 'kdebase-plasma') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebase') -makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml') -source=("http://download.kde.org/unstable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2") -sha1sums=('f89b848791628d675e26dd7e703bd79834d1c951') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../kde-baseapps-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdebase-dolphin() { - pkgdesc='File Manager' - depends=('kdebase-runtime' 'kdebase-lib') - optdepends=('ruby: servicemenu installation') - url="http://kde.org/applications/system/dolphin/" - cd $srcdir/build/dolphin - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/dolphin - make DESTDIR=$pkgdir install -} - -package_kdebase-kdepasswd() { - pkgdesc='Change Password' - depends=('kdebase-runtime' 'kdebase-lib') - cd $srcdir/build/kdepasswd - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kdepasswd - make DESTDIR=$pkgdir install -} - -package_kdebase-kdialog() { - pkgdesc='A utility for displaying dialog boxes from shell scripts' - depends=('kdebase-runtime') - cd $srcdir/build/kdialog - make DESTDIR=$pkgdir install -} - -package_kdebase-keditbookmarks() { - pkgdesc='Bookmark Organizer and Editor' - depends=('kdebase-runtime') - cd $srcdir/build/keditbookmarks - make DESTDIR=$pkgdir install -} - -package_kdebase-kfind() { - pkgdesc='Find Files/Folders' - depends=('kdebase-runtime' 'kdebase-lib') - url="http://kde.org/applications/utilities/kfind/" - install='kdebase.install' - cd $srcdir/build/kfind - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kfind - make DESTDIR=$pkgdir install -} - -package_kdebase-konq-plugins() { - pkgdesc='Extra plugins for Konqueror' - depends=('kdebase-konqueror') - replaces=('konq-plugins') - install='kdebase.install' - cd $srcdir/build/konq-plugins - make DESTDIR=$pkgdir install -} - -package_kdebase-konqueror() { - pkgdesc='KDE File Manager & Web Browser' - depends=('kdebase-dolphin' 'kdebase-keditbookmarks') - optdepends=('kwebkitpart: to enable webkit engine') - url="http://kde.org/applications/internet/konqueror/" - install='kdebase.install' - conflicts=('kdebase-nsplugins') - replaces=('kdebase-nsplugins') - for i in konqueror doc/konqueror nsplugins; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install - done -} - -package_kdebase-lib() { - pkgdesc='KDE libraries for the basic desktop applications' - groups=() - depends=('kdelibs') - cd $srcdir/build/lib - make DESTDIR=$pkgdir install -} - -package_kdebase-plasma() { - pkgdesc='Display the contents of folders (User´s home folder as default)' - depends=('kdebase-workspace' 'kdebase-lib') - cd $srcdir/build/plasma - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdebase/kdebase.install b/kde-unstable/kdebase/kdebase.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdebase/kdebase.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/kde-unstable/kdebindings-kimono/PKGBUILD b/kde-unstable/kdebindings-kimono/PKGBUILD deleted file mode 100644 index 0fa73a2b1..000000000 --- a/kde-unstable/kdebindings-kimono/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124934 2011-05-25 09:35:20Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-kimono -pkgver=4.6.80 -pkgrel=1 -pkgdesc=".NET/Mono bindings for the KDE libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebindings') -depends=('kdebindings-qyoto' 'kdebindings-smokekde') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') -conflicts=('kdebindings-csharp') -source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.bz2") -sha1sums=('911dfbee3141ca0f72c13e15bafc549ccd9ab33a') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kimono-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdebindings-korundum/PKGBUILD b/kde-unstable/kdebindings-korundum/PKGBUILD deleted file mode 100644 index 9c40054a2..000000000 --- a/kde-unstable/kdebindings-korundum/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124940 2011-05-25 09:48:53Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-korundum -pkgver=4.6.80 -pkgrel=1 -pkgdesc="KDE bindings for ruby" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebindings') -depends=('kdebindings-qtruby' 'kdebindings-smokekde') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' - 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') -conflicts=('kdebindings-ruby') -source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2") -sha1sums=('30209e7e3d3dc54c7eb787d7e7bcc90735c5bc1a') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../korundum-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdebindings-perlkde/PKGBUILD b/kde-unstable/kdebindings-perlkde/PKGBUILD deleted file mode 100644 index 4dfb0d07e..000000000 --- a/kde-unstable/kdebindings-perlkde/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124941 2011-05-25 09:55:03Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-perlkde -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Perl bindings for the KDE libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebindings') -depends=('kdebindings-perlqt' 'kdebindings-smokekde') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' - 'kdegraphics-okular' 'kdesdk-kate') -source=("http://download.kde.org/unstable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") -sha1sums=('0d689b8ffcfaeb1f4e216f00f0ddacb5f59b9047') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../perlkde-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD deleted file mode 100644 index a8268f3c5..000000000 --- a/kde-unstable/kdebindings-perlqt/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124667 2011-05-23 20:36:47Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-perlqt -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Perl bindings for the Qt libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebindings') -depends=('kdebindings-smokeqt') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') -source=("http://download.kde.org/unstable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") -sha1sums=('aa6f72ff5eed3f178a1d7274e61c2c7ed81fd74e') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../perlqt-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD deleted file mode 100644 index 817ca914a..000000000 --- a/kde-unstable/kdebindings-python/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 124775 2011-05-24 11:26:16Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-python -pkgver=4.6.80 -pkgrel=1 -pkgdesc="KDE bindings for python" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebindings') -depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') -makedepends=('cmake' 'automoc4' 'boost') -source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2" - 'fix-build.patch') -sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da' - '3d2329981ea571d38f0354c6d1300a2743a775db') - -build() { - cd "${srcdir}"/pykde4-${pkgver} - patch -p3 -i "${srcdir}"/fix-build.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../pykde4-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - # Use the python2 executable - find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} -sha1sums=('f45e40298046ecea382f9b85c34b3e21d856a9da' - '4eb8917ad922819bbea038d79a9786cf5d0e2767') diff --git a/kde-unstable/kdebindings-python/fix-build.patch b/kde-unstable/kdebindings-python/fix-build.patch 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/kdebindings-qtruby/PKGBUILD b/kde-unstable/kdebindings-qtruby/PKGBUILD deleted file mode 100644 index 82fd53c1b..000000000 --- a/kde-unstable/kdebindings-qtruby/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-qtruby -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Qt bindings for ruby" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebindings') -depends=('kdebindings-smokeqt' 'ruby') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') -conflicts=('kdebindings-ruby') -source=("http://download.kde.org/unstable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") -sha1sums=('9b153784efb3187ca4f38a14355b8a5ce283316c') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../qtruby-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdebindings-qyoto/PKGBUILD b/kde-unstable/kdebindings-qyoto/PKGBUILD deleted file mode 100644 index d130b397d..000000000 --- a/kde-unstable/kdebindings-qyoto/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-qyoto -pkgver=4.6.80 -pkgrel=1 -pkgdesc=".NET/Mono bindings for the Qt libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebindings') -depends=('kdebindings-smokeqt' 'mono') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') -conflicts=('kdebindings-csharp') -source=("http://download.kde.org/unstable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") -sha1sums=('7f63ae1c1e30edf226ca8418d5fa78edaf42cb36') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../qyoto-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD deleted file mode 100644 index ba2edc4f6..000000000 --- a/kde-unstable/kdebindings-smokegen/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-smokegen -pkgver=4.6.80 -pkgrel=1 -pkgdesc="A general purpose C++ parser with a plugin infrastructure" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -conflicts=('kdebindings-smoke') -source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") -sha1sums=('ce860f4308df4cc91b1e49d0f1f5bca3805c4cf1') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../smokegen-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdebindings-smokekde/PKGBUILD b/kde-unstable/kdebindings-smokekde/PKGBUILD deleted file mode 100644 index 6f9724353..000000000 --- a/kde-unstable/kdebindings-smokekde/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124928 2011-05-25 09:28:04Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-smokekde -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Language independent library for KDE bindings" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebindings') -depends=('kdebindings-smokeqt') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' - 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') -conflicts=('kdebindings-smoke') -source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") -sha1sums=('9fd8cbac3f0affce6fa078b07ca418a5e0c79521') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../smokekde-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD deleted file mode 100644 index c7bdbcbd1..000000000 --- a/kde-unstable/kdebindings-smokeqt/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124815 2011-05-24 15:22:45Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-smokeqt -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Language independent library for Qt bindings" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdebindings') -depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') -conflicts=('kdebindings-smoke') -source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") -sha1sums=('872b77e7e445b7492a647e63e267677604d76a96') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../smokeqt-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-blinken/PKGBUILD b/kde-unstable/kdeedu-blinken/PKGBUILD deleted file mode 100644 index 7ebd3c811..000000000 --- a/kde-unstable/kdeedu-blinken/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-blinken -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Memory Enhancement Game" -url="http://kde.org/applications/education/blinken/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/blinken-${pkgver}.tar.bz2") -sha1sums=('847ee81d2a4f5f1acb4bf8c0835c2e8187a631ea') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../blinken-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-blinken/kdeedu-blinken.install b/kde-unstable/kdeedu-blinken/kdeedu-blinken.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-blinken/kdeedu-blinken.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/kde-unstable/kdeedu-cantor/PKGBUILD b/kde-unstable/kdeedu-cantor/PKGBUILD deleted file mode 100644 index a82cacfaa..000000000 --- a/kde-unstable/kdeedu-cantor/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-cantor -pkgver=4.6.80 -pkgrel=1 -pkgdesc="KDE Frontend to Mathematical Software" -url="http://kde.org/applications/education/cantor/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'r' 'libspectre') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.bz2") -sha1sums=('0c6ebd5e523bf5fdf01bbf654ce60a55fc72cbe2') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../cantor-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-cantor/kdeedu-cantor.install b/kde-unstable/kdeedu-cantor/kdeedu-cantor.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdeedu-cantor/kdeedu-cantor.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdeedu-kalgebra/PKGBUILD b/kde-unstable/kdeedu-kalgebra/PKGBUILD deleted file mode 100644 index 40b24830e..000000000 --- a/kde-unstable/kdeedu-kalgebra/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kalgebra -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Graph Calculator" -url="http://kde.org/applications/education/kalgebra/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") -sha1sums=('d448a675782157d8c553db497e048231d6eb5f53') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kalgebra-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install b/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdeedu-kalzium/PKGBUILD b/kde-unstable/kdeedu-kalzium/PKGBUILD deleted file mode 100644 index 8bc1d0c3c..000000000 --- a/kde-unstable/kdeedu-kalzium/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kalzium -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Periodic Table of Elements" -url="http://kde.org/applications/education/kalzium/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdelibs' 'avogadro' 'ocaml') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") -sha1sums=('1ace4d42711904d9556efbe1ff89dc4c803887fe') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kalzium-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install b/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.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/kde-unstable/kdeedu-kanagram/PKGBUILD b/kde-unstable/kdeedu-kanagram/PKGBUILD deleted file mode 100644 index 45a33746c..000000000 --- a/kde-unstable/kdeedu-kanagram/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kanagram -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Letter Order Game" -url="http://kde.org/applications/education/kanagram/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") -sha1sums=('b7075ffa2c366acecfce13b5bef9938c6317aefb') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kanagram-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install b/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.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/kde-unstable/kdeedu-kbruch/PKGBUILD b/kde-unstable/kdeedu-kbruch/PKGBUILD deleted file mode 100644 index 9710c1df2..000000000 --- a/kde-unstable/kdeedu-kbruch/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kbruch -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Exercise Fractions" -url="http://kde.org/applications/education/kbruch/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") -sha1sums=('205b7f2171e67b55fc1bbcd0844702daf9dcb4a6') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kbruch-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install b/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.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/kde-unstable/kdeedu-kgeography/PKGBUILD b/kde-unstable/kdeedu-kgeography/PKGBUILD deleted file mode 100644 index 720c4027a..000000000 --- a/kde-unstable/kdeedu-kgeography/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kgeography -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Geography Trainer" -url="http://kde.org/applications/education/kgeography/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") -sha1sums=('2d161ef150618780e6f2bcf3a8e19993a5c95fa6') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kgeography-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install b/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.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/kde-unstable/kdeedu-khangman/PKGBUILD b/kde-unstable/kdeedu-khangman/PKGBUILD deleted file mode 100644 index 56df0fbce..000000000 --- a/kde-unstable/kdeedu-khangman/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-khangman -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Hangman Game" -url="http://kde.org/applications/education/khangman/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/khangman-${pkgver}.tar.bz2") -sha1sums=('a3e140a71c27400d49f75b862965123c1df6e992') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../khangman-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-khangman/kdeedu-khangman.install b/kde-unstable/kdeedu-khangman/kdeedu-khangman.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-khangman/kdeedu-khangman.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/kde-unstable/kdeedu-kig/PKGBUILD b/kde-unstable/kdeedu-kig/PKGBUILD deleted file mode 100644 index ca6f92279..000000000 --- a/kde-unstable/kdeedu-kig/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 125335 2011-05-25 23:12:03Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kig -pkgver=4.6.80 -pkgrel=2 -pkgdesc="Interactive Geometry" -url="http://kde.org/applications/education/kig/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kig-${pkgver}.tar.bz2") -sha1sums=('d0b2ca69262b1e720be8ab2b6cfb9dd6b5a81371') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kig-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py -} diff --git a/kde-unstable/kdeedu-kig/kdeedu-kig.install b/kde-unstable/kdeedu-kig/kdeedu-kig.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdeedu-kig/kdeedu-kig.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdeedu-kiten/PKGBUILD b/kde-unstable/kdeedu-kiten/PKGBUILD deleted file mode 100644 index 6ba5c4b19..000000000 --- a/kde-unstable/kdeedu-kiten/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kiten -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Japanese Reference/Study Tool" -url="http://kde.org/applications/education/kiten/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kiten-${pkgver}.tar.bz2") -sha1sums=('a5120c87015e044b4313e889b80afd608341e414') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kiten-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kiten/kdeedu-kiten.install b/kde-unstable/kdeedu-kiten/kdeedu-kiten.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-kiten/kdeedu-kiten.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/kde-unstable/kdeedu-klettres/PKGBUILD b/kde-unstable/kdeedu-klettres/PKGBUILD deleted file mode 100644 index 70f5e54b4..000000000 --- a/kde-unstable/kdeedu-klettres/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-klettres -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Learn The Alphabet" -url="http://kde.org/applications/education/klettres/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/klettres-${pkgver}.tar.bz2") -sha1sums=('395a1c700eaf1fee83216facbe5442162d383e64') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../klettres-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-klettres/kdeedu-klettres.install b/kde-unstable/kdeedu-klettres/kdeedu-klettres.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-klettres/kdeedu-klettres.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/kde-unstable/kdeedu-kmplot/PKGBUILD b/kde-unstable/kdeedu-kmplot/PKGBUILD deleted file mode 100644 index 8db40962f..000000000 --- a/kde-unstable/kdeedu-kmplot/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kmplot -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Mathematical Function Plotter" -url="http://kde.org/applications/education/kmplot/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") -sha1sums=('be3593a33b05a59d82020d988804e82737abbc09') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kmplot-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install b/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdeedu-kstars/PKGBUILD b/kde-unstable/kdeedu-kstars/PKGBUILD deleted file mode 100644 index 77306c68d..000000000 --- a/kde-unstable/kdeedu-kstars/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kstars -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Desktop Planetarium" -url="http://kde.org/applications/education/kstars/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kstars-${pkgver}.tar.bz2") -sha1sums=('c74818da033d70200b873a954a2f05af3e03c610') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kstars-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Xplanet=OFF - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kstars/kdeedu-kstars.install b/kde-unstable/kdeedu-kstars/kdeedu-kstars.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-kstars/kdeedu-kstars.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/kde-unstable/kdeedu-ktouch/PKGBUILD b/kde-unstable/kdeedu-ktouch/PKGBUILD deleted file mode 100644 index 0b8e706e9..000000000 --- a/kde-unstable/kdeedu-ktouch/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-ktouch -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Touch Typing Tutor" -url="http://kde.org/applications/education/ktouch/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") -sha1sums=('7e80926b1fe45d7af861891a140e843b27cbf171') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ktouch-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install b/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.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/kde-unstable/kdeedu-kturtle/PKGBUILD b/kde-unstable/kdeedu-kturtle/PKGBUILD deleted file mode 100644 index dc60d6200..000000000 --- a/kde-unstable/kdeedu-kturtle/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kturtle -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Educational Programming Environment" -url="http://kde.org/applications/education/kturtle/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") -sha1sums=('5aa67c458212315616a9c67e06a3e8a8a79ee302') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kturtle-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install b/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.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/kde-unstable/kdeedu-kwordquiz/PKGBUILD b/kde-unstable/kdeedu-kwordquiz/PKGBUILD deleted file mode 100644 index 76696bc6d..000000000 --- a/kde-unstable/kdeedu-kwordquiz/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-kwordquiz -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Flash Card Trainer" -url="http://kde.org/applications/education/kwordquiz/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") -sha1sums=('44277946ffad538cd50690af9475e0520698bafb') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kwordquiz-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD deleted file mode 100644 index 39fe50f17..000000000 --- a/kde-unstable/kdeedu-marble/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-marble -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Desktop Globe" -url="http://kde.org/applications/education/marble/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'gpsd') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2" - 'gpsd-2.96.patch') -sha1sums=('4d7663909efe3b42006debd78f1217bb3dfffd88' - 'f44dfd3bb384e631d59b93d7dda3413795da8183') - -build() { - cd "${srcdir}"/marble-${pkgver} - patch -p1 -i "${srcdir}"/gpsd-2.96.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../marble-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-marble/gpsd-2.96.patch b/kde-unstable/kdeedu-marble/gpsd-2.96.patch deleted file mode 100644 index e27702181..000000000 --- a/kde-unstable/kdeedu-marble/gpsd-2.96.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -+++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -@@ -18,6 +18,9 @@ using namespace Marble; - - GpsdConnection::GpsdConnection( QObject* parent ) - : QObject( parent ), -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ m_gpsd("localhost", DEFAULT_GPSD_PORT), -+#endif - m_timer( 0 ) - { - connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) ); -@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject* - void GpsdConnection::initialize() - { - m_timer.stop(); -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ gps_data_t* data; -+#else - gps_data_t* data = m_gpsd.open(); -+#endif - if ( data ) { - m_status = PositionProviderStatusAcquiring; - emit statusChanged( m_status ); -@@ -73,8 +80,16 @@ void GpsdConnection::initialize() - void GpsdConnection::update() - { - #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET ) -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ if ( m_gpsd.waiting(0) ) { -+#else - if ( m_gpsd.waiting() ) { -+#endif -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ gps_data_t* data = m_gpsd.read(); -+#else - gps_data_t* data = m_gpsd.poll(); -+#endif - if ( data && data->set & PACKET_SET ) { - emit gpsdInfo( *data ); - } diff --git a/kde-unstable/kdeedu-marble/kdeedu-marble.install b/kde-unstable/kdeedu-marble/kdeedu-marble.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdeedu-marble/kdeedu-marble.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdeedu-parley/PKGBUILD b/kde-unstable/kdeedu-parley/PKGBUILD deleted file mode 100644 index 7b27fa558..000000000 --- a/kde-unstable/kdeedu-parley/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-parley -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Vocabulary Trainer" -url="http://kde.org/applications/education/parley/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libkdeedu') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/parley-${pkgver}.tar.bz2") -sha1sums=('991f7aeee7849913a167d65b792791724bc5c1aa') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../parley-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-parley/kdeedu-parley.install b/kde-unstable/kdeedu-parley/kdeedu-parley.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdeedu-parley/kdeedu-parley.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD deleted file mode 100644 index 1ab660c03..000000000 --- a/kde-unstable/kdeedu-rocs/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-rocs -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Rocs Graph Theory" -url="http://kde.org/applications/education/rocs/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'boost-libs') -makedepends=('cmake' 'automoc4' 'boost') -source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.bz2") -sha1sums=('90ea18d54bc7dc6a87db72e34fb9131849300392') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../rocs-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-step/PKGBUILD b/kde-unstable/kdeedu-step/PKGBUILD deleted file mode 100644 index 6b63198df..000000000 --- a/kde-unstable/kdeedu-step/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124761 2011-05-24 08:01:51Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-step -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Interactive Physical Simulator" -url="http://kde.org/applications/education/step/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/step-${pkgver}.tar.bz2") -sha1sums=('a71d1ed2f92c9b881640b273adafa71240ca6e8a') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../step-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-step/kdeedu-step.install b/kde-unstable/kdeedu-step/kdeedu-step.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeedu-step/kdeedu-step.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/kde-unstable/kdegames/PKGBUILD b/kde-unstable/kdegames/PKGBUILD deleted file mode 100644 index bc3b1576a..000000000 --- a/kde-unstable/kdegames/PKGBUILD +++ /dev/null @@ -1,514 +0,0 @@ -# $Id: PKGBUILD 124786 2011-05-24 12:57:40Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdegames -pkgname=('kdegames-bomber' - 'kdegames-bovo' - 'kdegames-granatier' - 'kdegames-kajongg' - 'kdegames-kapman' - 'kdegames-katomic' - 'kdegames-kbattleship' - 'kdegames-kblackbox' - 'kdegames-kblocks' - 'kdegames-kbounce' - 'kdegames-kbreakout' - 'kdegames-kdiamond' - 'kdegames-kfourinline' - 'kdegames-kgoldrunner' - 'kdegames-kigo' - 'kdegames-killbots' - 'kdegames-kiriki' - 'kdegames-kjumpingcube' - 'kdegames-klines' - 'kdegames-klickety' - 'kdegames-kmahjongg' - 'kdegames-kmines' - 'kdegames-knetwalk' - 'kdegames-kolf' - 'kdegames-kollision' - 'kdegames-konquest' - 'kdegames-kpatience' - 'kdegames-kreversi' - 'kdegames-kshisen' - 'kdegames-ksirk' - 'kdegames-kspaceduel' - 'kdegames-ksquares' - 'kdegames-ksudoku' - 'kdegames-ktron' - 'kdegames-ktuberling' - 'kdegames-kubrick' - 'kdegames-libkdegames' - 'kdegames-libkmahjongg' - 'kdegames-lskat' - 'kdegames-palapeli') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegames') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted' - 'kdebindings-python' 'openal') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('c9e21203e8f47e1748c309a4ff14c87953c43839') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdegames-bomber() { - pkgdesc='Arcade Bombing Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/bomber/" - install='kdegames.install' - cd $srcdir/build/bomber - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/bomber - make DESTDIR=$pkgdir install -} - -package_kdegames-bovo() { - pkgdesc='Five-in-a-row Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/bovo/" - install='kdegames.install' - cd $srcdir/build/bovo - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/bovo - make DESTDIR=$pkgdir install -} - -package_kdegames-granatier() { - pkgdesc='Granatier' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') - url="http://kde.org/applications/games/granatier/" - install='kdegames.install' - cd $srcdir/build/granatier - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/granatier - make DESTDIR=$pkgdir install -} - -package_kdegames-kajongg() { - pkgdesc='The ancient Chinese board game for 4 players' - depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted') - install='kdegames.install' - cd $srcdir/build/kajongg - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kajongg - make DESTDIR=$pkgdir install - - # Use the python2 executable - find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} - -package_kdegames-kapman() { - pkgdesc='Eat pills escaping ghosts' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kapman/" - install='kdegames.install' - cd $srcdir/build/kapman - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kapman - make DESTDIR=$pkgdir install -} - -package_kdegames-katomic() { - pkgdesc='Sokoban-like Logic Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/katomic/" - install='kdegames.install' - cd $srcdir/build/katomic - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/katomic - make DESTDIR=$pkgdir install -} - -package_kdegames-kbattleship() { - pkgdesc='Battleship Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') - url="http://kde.org/applications/games/kbattleship/" - install='kdegames-kbattleship.install' - cd $srcdir/build/kbattleship - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbattleship - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \ - $pkgdir/usr/share/ggz/kbattleship.dsc -} - -package_kdegames-kblackbox() { - pkgdesc='Blackbox Logic Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kblackbox/" - install='kdegames.install' - cd $srcdir/build/kblackbox - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kblackbox - make DESTDIR=$pkgdir install -} - -package_kdegames-kblocks() { - pkgdesc='Falling Blocks Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kblocks/" - install='kdegames.install' - cd $srcdir/build/kblocks - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kblocks - make DESTDIR=$pkgdir install -} - -package_kdegames-kbounce() { - pkgdesc='Ball Bouncing Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kbounce/" - install='kdegames.install' - cd $srcdir/build/kbounce - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbounce - make DESTDIR=$pkgdir install -} - -package_kdegames-kbreakout() { - pkgdesc='Breakout-like Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kbreakout/" - install='kdegames.install' - cd $srcdir/build/kbreakout - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbreakout - make DESTDIR=$pkgdir install -} - -package_kdegames-kdiamond() { - pkgdesc='Three-in-a-row game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kdiamond/" - install='kdegames.install' - cd $srcdir/build/kdiamond - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kdiamond - make DESTDIR=$pkgdir install -} - -package_kdegames-kfourinline() { - pkgdesc='Four-in-a-row Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kfourinline/" - install='kdegames-kfourinline.install' - cd $srcdir/build/kfourinline - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kfourinline - make DESTDIR=$pkgdir install -} - -package_kdegames-kgoldrunner() { - pkgdesc='A game of action and puzzle-solving' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kgoldrunner/" - install='kdegames.install' - cd $srcdir/build/kgoldrunner - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kgoldrunner - make DESTDIR=$pkgdir install -} - -package_kdegames-kigo() { - pkgdesc='Go Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo') - url="http://kde.org/applications/games/kigo/" - install='kdegames-kigo.install' - cd $srcdir/build/kigo - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kigo - make DESTDIR=$pkgdir install -} - -package_kdegames-killbots() { - pkgdesc='Killbots' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/killbots/" - install='kdegames.install' - cd $srcdir/build/killbots - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/killbots - make DESTDIR=$pkgdir install -} - -package_kdegames-kiriki() { - pkgdesc='Yahtzee-like Dice Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kiriki/" - install='kdegames.install' - cd $srcdir/build/kiriki - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kiriki - make DESTDIR=$pkgdir install -} - -package_kdegames-kjumpingcube() { - pkgdesc='Territory Capture Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kjumpingcube/" - install='kdegames.install' - cd $srcdir/build/kjumpingcube - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kjumpingcube - make DESTDIR=$pkgdir install -} - -package_kdegames-klickety() { - pkgdesc='Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - replaces=('kdegames-ksame') - conflicts=('kdegames-ksame') - url="http://kde.org/applications/games/ksame/" - install='kdegames.install' - cd $srcdir/build/klickety - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klickety - make DESTDIR=$pkgdir install -} - -package_kdegames-klines() { - pkgdesc='Tactical Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/klines/" - install='kdegames.install' - cd $srcdir/build/klines - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klines - make DESTDIR=$pkgdir install -} - -package_kdegames-kmahjongg() { - pkgdesc='Mahjongg Solitaire' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') - url="http://kde.org/applications/games/kmahjongg/" - install='kdegames.install' - cd $srcdir/build/kmahjongg - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmahjongg - make DESTDIR=$pkgdir install -} - -package_kdegames-kmines() { - pkgdesc='Minesweeper-like Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kmines/" - install='kdegames.install' - cd $srcdir/build/kmines - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmines - make DESTDIR=$pkgdir install -} - -package_kdegames-knetwalk() { - pkgdesc='Network Construction Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/knetwalk/" - install='kdegames.install' - cd $srcdir/build/knetwalk - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/knetwalk - make DESTDIR=$pkgdir install -} - -package_kdegames-kolf() { - pkgdesc='Miniature Golf' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kolf/" - install='kdegames-kolf.install' - cd $srcdir/build/kolf - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kolf - make DESTDIR=$pkgdir install -} - -package_kdegames-kollision() { - pkgdesc='A simple ball dodging game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kollision/" - install='kdegames.install' - cd $srcdir/build/kollision - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kollision - make DESTDIR=$pkgdir install -} - -package_kdegames-konquest() { - pkgdesc='Galactic Strategy Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/konquest/" - install='kdegames.install' - cd $srcdir/build/konquest - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/konquest - make DESTDIR=$pkgdir install -} - -package_kdegames-kpatience() { - pkgdesc='Patience Card Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kpatience/" - install='kdegames.install' - replaces=('kdegames-kpat') - cd $srcdir/build/kpat - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kpat - make DESTDIR=$pkgdir install -} - -package_kdegames-kreversi() { - pkgdesc='Reversi Board Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') - url="http://kde.org/applications/games/kreversi/" - install='kdegames-kreversi.install' - cd $srcdir/build/kreversi - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kreversi - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \ - $pkgdir/usr/share/ggz/kreversi.dsc -} - -package_kdegames-kshisen() { - pkgdesc='Shisen-Sho Mahjongg-like Tile Game' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') - url="http://kde.org/applications/games/kshisen/" - install='kdegames.install' - cd $srcdir/build/kshisen - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kshisen - make DESTDIR=$pkgdir install -} - -package_kdegames-ksirk() { - pkgdesc='World Domination Strategy Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ksirk/" - install='kdegames.install' - cd $srcdir/build/ksirk - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksirk - make DESTDIR=$pkgdir install -} - -package_kdegames-kspaceduel() { - pkgdesc='Space Arcade Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kspaceduel/" - install='kdegames-kspaceduel.install' - cd $srcdir/build/kspaceduel - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kspaceduel - make DESTDIR=$pkgdir install -} - -package_kdegames-ksquares() { - pkgdesc='Connect the dots to create squares' - depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') - url="http://kde.org/applications/games/ksquares/" - install='kdegames-ksquares.install' - cd $srcdir/build/ksquares - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksquares - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \ - $pkgdir/usr/share/ggz/ksquares.dsc -} - -package_kdegames-ksudoku() { - pkgdesc='KSudoku, Sudoku game & more for KDE' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ksudoku/" - install='kdegames.install' - cd $srcdir/build/ksudoku - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksudoku - make DESTDIR=$pkgdir install -} - -package_kdegames-ktron() { - pkgdesc='Tron-like Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ktron/" - install='kdegames.install' - cd $srcdir/build/ktron - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktron - make DESTDIR=$pkgdir install -} - -package_kdegames-ktuberling() { - pkgdesc='Picture Game for Children' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ktuberling/" - install='kdegames-ktuberling.install' - cd $srcdir/build/ktuberling - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktuberling - make DESTDIR=$pkgdir install -} - -package_kdegames-kubrick() { - pkgdesc='A 3-D game based on Rubik´s Cube' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kubrick/" - install='kdegames.install' - cd $srcdir/build/kubrick - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kubrick - make DESTDIR=$pkgdir install -} - -package_kdegames-libkdegames() { - pkgdesc='KDE game library' - groups=() - depends=('kdelibs') - cd $srcdir/build/libkdegames - make DESTDIR=$pkgdir install - for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do - install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i) - done -} - -package_kdegames-libkmahjongg() { - pkgdesc='Library used for loading and rendering of Mahjongg tilesets' - groups=() - depends=('kdelibs') - cd $srcdir/build/libkmahjongg - make DESTDIR=$pkgdir install -} - -package_kdegames-lskat() { - pkgdesc='Card Game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/lskat/" - install='kdegames-lskat.install' - cd $srcdir/build/lskat - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/lskat - make DESTDIR=$pkgdir install -} - -package_kdegames-palapeli() { - pkgdesc='Jigsaw puzzle game' - depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/palapeli/" - install='kdegames-palapeli.install' - cd $srcdir/build/palapeli - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/palapeli - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdegames/kdegames-kbattleship.install b/kde-unstable/kdegames/kdegames-kbattleship.install deleted file mode 100644 index ac4516ed0..000000000 --- a/kde-unstable/kdegames/kdegames-kbattleship.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null -} - -pre_remove() { - if [ -f usr/share/ggz/kbattleship.dsc ]; then - ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null - fi -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} diff --git a/kde-unstable/kdegames/kdegames-kfourinline.install b/kde-unstable/kdegames/kdegames-kfourinline.install deleted file mode 100644 index 9b20edb30..000000000 --- a/kde-unstable/kdegames/kdegames-kfourinline.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegames/kdegames-kigo.install b/kde-unstable/kdegames/kdegames-kigo.install deleted file mode 100644 index 9b20edb30..000000000 --- a/kde-unstable/kdegames/kdegames-kigo.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegames/kdegames-kolf.install b/kde-unstable/kdegames/kdegames-kolf.install deleted file mode 100644 index 9b20edb30..000000000 --- a/kde-unstable/kdegames/kdegames-kolf.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegames/kdegames-kreversi.install b/kde-unstable/kdegames/kdegames-kreversi.install deleted file mode 100644 index 4623e6e49..000000000 --- a/kde-unstable/kdegames/kdegames-kreversi.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null -} - -pre_remove() { - if [ -f usr/share/ggz/kreversi.dsc ]; then - ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null - fi -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/kde-unstable/kdegames/kdegames-kspaceduel.install b/kde-unstable/kdegames/kdegames-kspaceduel.install deleted file mode 100644 index 9b20edb30..000000000 --- a/kde-unstable/kdegames/kdegames-kspaceduel.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegames/kdegames-ksquares.install b/kde-unstable/kdegames/kdegames-ksquares.install deleted file mode 100644 index 5a619897d..000000000 --- a/kde-unstable/kdegames/kdegames-ksquares.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null -} - -pre_remove() { - if [ -f usr/share/ggz/ksquares.dsc ]; then - ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null - fi -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/kde-unstable/kdegames/kdegames-ktuberling.install b/kde-unstable/kdegames/kdegames-ktuberling.install deleted file mode 100644 index 9b20edb30..000000000 --- a/kde-unstable/kdegames/kdegames-ktuberling.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegames/kdegames-lskat.install b/kde-unstable/kdegames/kdegames-lskat.install deleted file mode 100644 index 9b20edb30..000000000 --- a/kde-unstable/kdegames/kdegames-lskat.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegames/kdegames-palapeli.install b/kde-unstable/kdegames/kdegames-palapeli.install deleted file mode 100644 index c77e68041..000000000 --- a/kde-unstable/kdegames/kdegames-palapeli.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegames/kdegames.install b/kde-unstable/kdegames/kdegames.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdegames/kdegames.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/kde-unstable/kdegraphics-gwenview/PKGBUILD b/kde-unstable/kdegraphics-gwenview/PKGBUILD deleted file mode 100644 index c8528477b..000000000 --- a/kde-unstable/kdegraphics-gwenview/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-gwenview -pkgver=4.6.80 -pkgrel=1 -pkgdesc="A fast and easy to use image viewer for KDE" -url="http://kde.org/applications/graphics/gwenview/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-lib' 'libkipi') -makedepends=('cmake' 'automoc4') -optdepends=('kipi-plugins') -source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") -sha1sums=('41b93bdcab6ba169be4ed3fcfb481c6ae1161bd6') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../gwenview-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install b/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegraphics-kamera/PKGBUILD b/kde-unstable/kdegraphics-kamera/PKGBUILD deleted file mode 100644 index 17b0a9b3f..000000000 --- a/kde-unstable/kdegraphics-kamera/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kamera -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Configure Kamera" -url="http://kde.org/applications/graphics/kamera/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime' 'gphoto2') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/unstable/${pkgver}/src/kamera-${pkgver}.tar.bz2") -sha1sums=('cba0e4ca19fe62a9cbfe7b2559e5364c16944901') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kamera-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD deleted file mode 100644 index ebad9e424..000000000 --- a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kcolorchooser -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Color Chooser" -url="http://kde.org/applications/graphics/kcolorchooser/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") -sha1sums=('99aad5ebb4b1d5d99426e8a33c2f15717cc4087e') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kcolorchooser-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.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/kde-unstable/kdegraphics-kgamma/PKGBUILD b/kde-unstable/kdegraphics-kgamma/PKGBUILD deleted file mode 100644 index 18926be42..000000000 --- a/kde-unstable/kdegraphics-kgamma/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 124788 2011-05-24 12:59:42Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kgamma -pkgver=4.6.80 -pkgrel=1 -pkgdesc="A monitor calibration tool" -url="http://kde.org/applications/graphics/kgamma/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -# note on libxxf86vm: -# not detected by namcap because libgl depends on it -# but nvidia providing libgl does not depend on libxxf86vm -depends=('kdebase-runtime' 'libxxf86vm') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/unstable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") -sha1sums=('aac4e43df0095e0511bb27cc27a23b10847eb075') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kgamma-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD deleted file mode 100644 index c68c46c2d..000000000 --- a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kolourpaint -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Paint Program" -url="http://kde.org/applications/graphics/kolourpaint/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime' 'qimageblitz') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") -sha1sums=('c79fc3a31d61623a02e7c89ede19cbe7e49a8518') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kolourpaint-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegraphics-kruler/PKGBUILD b/kde-unstable/kdegraphics-kruler/PKGBUILD deleted file mode 100644 index 663888d54..000000000 --- a/kde-unstable/kdegraphics-kruler/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-kruler -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Screen Ruler" -url="http://kde.org/applications/graphics/kruler/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/kruler-${pkgver}.tar.bz2") -sha1sums=('b43fee1954baa7b84866a1cd5f15cbcff54d5e3d') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kruler-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install b/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD deleted file mode 100644 index 4dde21e03..000000000 --- a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-ksaneplugin -pkgver=4.6.80 -pkgrel=1 -pkgdesc="A scan plugin that implements the scanning" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('libksane') -makedepends=('cmake' 'automoc4') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/unstable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") -sha1sums=('3caa70899ed3797c9739409d311779f39fa9eda7') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ksaneplugin-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD deleted file mode 100644 index de10d1e5e..000000000 --- a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124674 2011-05-23 20:43:19Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-ksnapshot -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Screen Capture Program" -url="http://kde.org/applications/graphics/ksnapshot/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdelibs' 'libkipi') -makedepends=('cmake' 'automoc4') -optdepends=('kipi-plugins') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") -sha1sums=('684be8b03920e4a92625337ff18a5b368482dd08') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../ksnapshot-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD deleted file mode 100644 index 4c027b673..000000000 --- a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-strigi-analyzer -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Strigi analyzers for various graphics file formats" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('bc4c901bc4bc7080c91ed739d2480294d2fc5033') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-svgpart/PKGBUILD b/kde-unstable/kdegraphics-svgpart/PKGBUILD deleted file mode 100644 index ce748bb92..000000000 --- a/kde-unstable/kdegraphics-svgpart/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-svgpart -pkgver=4.6.80 -pkgrel=1 -pkgdesc="A KPart for viewving SVGs" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/unstable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") -sha1sums=('300fc6a062ea34e6131097ae9a59e8279f3c1193') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../svgpart-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD deleted file mode 100644 index 7a3e5b1a1..000000000 --- a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-thumbnailers -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Thumbnailers for various graphics file formats" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('libkexiv2' 'libkdcraw') -makedepends=('cmake' 'automoc4') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d350cb85ad8520be00f6ee1f05a393d777e0f021') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics/PKGBUILD b/kde-unstable/kdegraphics/PKGBUILD deleted file mode 100644 index 4780a97e7..000000000 --- a/kde-unstable/kdegraphics/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdegraphics -pkgname=('kdegraphics-okular') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'ebook-tools' - 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('69f191663db147cf481edd9f528fcae50c1dc2c3') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdegraphics-okular() { - pkgdesc='Document Viewer' - depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' - 'ebook-tools' 'libspectre') - url="http://kde.org/applications/graphics/okular/" - install='kdegraphics-okular.install' - cd $srcdir/build/okular - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/okular - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdegraphics/kdegraphics-okular.install b/kde-unstable/kdegraphics/kdegraphics-okular.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdegraphics/kdegraphics-okular.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD deleted file mode 100644 index 8bfff6584..000000000 --- a/kde-unstable/kdelibs/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 124924 2011-05-25 08:50:46Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdelibs -pkgver=4.6.80 -pkgrel=1 -pkgdesc="KDE Core Libraries" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' - 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' - 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' - 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' - 'docbook-xsl') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' - 'hspell') -replaces=('kdelibs-experimental') -install='kdelibs.install' -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' - 'kcalendarsystem-fixed.patch') -sha1sums=('313e051b08762ec68d7d7aaceb5471ede2bf66ac' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - '13cbb58347dc7103684bb002b8f636fc0fa9e738') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # avoid file conflict with gnome-menu - patch -p1 -i $srcdir/kde-applications-menu.patch - # add Archlinux menu entry - patch -p1 -i $srcdir/archlinux-menu.patch - - # Already fixed upstream - patch -p1 -i "${srcdir}"/kcalendarsystem-fixed.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ - -DKDE_DEFAULT_HOME='.kde4' \ - -DWITH_FAM=OFF - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - - # cert bundle seems to be hardcoded - # link it to the one from ca-certificates - rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt -} diff --git a/kde-unstable/kdelibs/archlinux-menu.patch b/kde-unstable/kdelibs/archlinux-menu.patch deleted file mode 100644 index 546784fa2..000000000 --- a/kde-unstable/kdelibs/archlinux-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 -+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 -@@ -16,11 +16,19 @@ - </DefaultLayout> - <Layout> - <Merge type="menus"/> -+ <Menuname>Arch Linux</Menuname> - <Menuname>Applications</Menuname> - <Merge type="files"/> - </Layout> - - <Menu> -+ <Name>Arch Linux</Name> -+ <Directory>Archlinux.directory</Directory> -+ <Include> -+ <Category>Archlinux</Category> -+ </Include> -+ </Menu> -+ <Menu> - <Name>Applications</Name> - <Directory>kde-unknown.directory</Directory> - <OnlyUnallocated/> diff --git a/kde-unstable/kdelibs/kcalendarsystem-fixed.patch b/kde-unstable/kdelibs/kcalendarsystem-fixed.patch 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/kdelibs/kde-applications-menu.patch b/kde-unstable/kdelibs/kde-applications-menu.patch deleted file mode 100644 index 4b513298a..000000000 --- a/kde-unstable/kdelibs/kde-applications-menu.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 -+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 -@@ -69,7 +69,7 @@ - if (WIN32) - install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) - else (WIN32) --install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) -+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) - endif (WIN32) - install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) - install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) ---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 -+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 -@@ -302,7 +302,7 @@ - if (!m_trackId.isEmpty()) - g_vfolder->setTrackId(m_trackId); - -- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); -+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); - - KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); - entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/kde-unstable/kdelibs/kdelibs.install b/kde-unstable/kdelibs/kdelibs.install deleted file mode 100644 index c77e68041..000000000 --- a/kde-unstable/kdelibs/kdelibs.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD deleted file mode 100644 index 44d684966..000000000 --- a/kde-unstable/kdemultimedia/PKGBUILD +++ /dev/null @@ -1,109 +0,0 @@ -# $Id: PKGBUILD 125373 2011-05-26 10:37:17Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdemultimedia -pkgname=('kdemultimedia-dragonplayer' - 'kdemultimedia-ffmpegthumbs' - 'kdemultimedia-juk' - 'kdemultimedia-kioslave' - 'kdemultimedia-kmix' - 'kdemultimedia-kscd' - 'kdemultimedia-mplayerthumbs') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdemultimedia') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp' - 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'mplayerthumbs.config') -sha1sums=('60fa25d125aa77b66fd1c1e9e043df48abf35bd4' - 'ba016fa2563c14ffcba852c62506b66bfc6ee683') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Xine=OFF - make -} - -package_kdemultimedia-dragonplayer() { - pkgdesc='Video Player' - depends=('kdebase-runtime') - url="http://kde.org/applications/multimedia/dragonplayer/" - install='kdemultimedia.install' - cd $srcdir/build/dragonplayer - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/dragonplayer - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-ffmpegthumbs() { - pkgdesc='Video Files (ffmpegthumbs)' - depends=('kdebase-runtime' 'ffmpeg') - install='kdemultimedia.install' - cd $srcdir/build/ffmpegthumbs - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-juk() { - pkgdesc='Music Player' - depends=('kdebase-runtime' 'tunepimp') - url="http://kde.org/applications/multimedia/juk" - install='kdemultimedia.install' - cd $srcdir/build/juk - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/juk - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-kioslave() { - pkgdesc='Audio CD Browser' - depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') - conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') - replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') - for i in kioslave doc/kioslave libkcddb libkcompactdisc; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install - done -} - -package_kdemultimedia-kmix() { - pkgdesc='Sound Mixer' - depends=('kdebase-runtime') - url="http://kde.org/applications/multimedia/kmix" - install='kdemultimedia.install' - cd $srcdir/build/kmix - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmix - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-kscd() { - pkgdesc='CD Player' - depends=('kdebase-runtime' 'libmusicbrainz3') - url="http://kde.org/applications/multimedia/kscd" - install='kdemultimedia.install' - cd $srcdir/build/kscd - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcontrol/cddbretrieval - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-mplayerthumbs() { - pkgdesc='Video Files (MPlayerThumbs)' - depends=('kdebase-runtime' 'mplayer') - replaces=('mplayerthumbs') - conflicts=('mplayerthumbs') - cd $srcdir/build/mplayerthumbs - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs -} diff --git a/kde-unstable/kdemultimedia/kdemultimedia.install b/kde-unstable/kdemultimedia/kdemultimedia.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdemultimedia/kdemultimedia.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/kde-unstable/kdemultimedia/mplayerthumbs.config b/kde-unstable/kdemultimedia/mplayerthumbs.config deleted file mode 100644 index 761a17953..000000000 --- a/kde-unstable/kdemultimedia/mplayerthumbs.config +++ /dev/null @@ -1,2 +0,0 @@ -[MPlayerThumbsCfg] -backend=0 diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD deleted file mode 100644 index 763acd722..000000000 --- a/kde-unstable/kdenetwork/PKGBUILD +++ /dev/null @@ -1,114 +0,0 @@ -# $Id: PKGBUILD 124770 2011-05-24 10:05:32Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdenetwork -pkgname=('kdenetwork-filesharing' - 'kdenetwork-kdnssd' - 'kdenetwork-kget' - 'kdenetwork-kopete' - 'kdenetwork-kppp' - 'kdenetwork-krdc' - 'kdenetwork-krfb') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdenetwork') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' - 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp' - 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' - 'telepathy-qt4' 'libktorrent' 'libmms') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('8afe1547ea6f9f7acbdaf73b3ade4e3c752e645e') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ - -DWITH_Xmms=OFF \ - -DWITH_LibMeanwhile=OFF - make -} - -package_kdenetwork-filesharing() { - pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' - depends=('kdelibs' 'smbclient') - install='kdenetwork.install' - cd $srcdir/build/filesharing - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kdnssd() { - pkgdesc='Monitors the network for DNS-SD services' - depends=('kdelibs') - cd $srcdir/build/kdnssd - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kget() { - pkgdesc='Download Manager' - depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms') - optdepends=('python2: YouTube plugin') - url="http://kde.org/applications/internet/kget/" - install='kdenetwork.install' - cd $srcdir/build/kget - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kget - make DESTDIR=$pkgdir install - - # Use the python2 executable - find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} - -package_kdenetwork-kopete() { - pkgdesc='Instant Messenger' - depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' - 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu') - url="http://kde.org/applications/internet/kopete/" - install='kdenetwork.install' - cd $srcdir/build/kopete - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kopete - make DESTDIR=$pkgdir install -} - -package_kdenetwork-kppp() { - pkgdesc='Internet Dial-Up Tool' - depends=('kdebase-runtime' 'ppp') - url="http://kde.org/applications/internet/kppp/" - install='kdenetwork.install' - cd $srcdir/build/kppp - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kppp - make DESTDIR=$pkgdir install -} - -package_kdenetwork-krdc() { - pkgdesc='Remote Desktop Client' - depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4') - optdepends=('kdebase-keditbookmarks: to edit bookmarks') - url="http://kde.org/applications/internet/krdc/" - cd $srcdir/build/krdc - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krdc - make DESTDIR=$pkgdir install -} - -package_kdenetwork-krfb() { - pkgdesc='Desktop Sharing' - # note on libxdamage: - # not detected by namcap because libgl depends on it - # but nvidia providing libgl does not depend on libxdamage - depends=('kdebase-runtime' 'libvncserver' 'libxdamage') - cd $srcdir/build/krfb - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krfb - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdenetwork/kdenetwork.install b/kde-unstable/kdenetwork/kdenetwork.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdenetwork/kdenetwork.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/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD deleted file mode 100644 index b3e328a75..000000000 --- a/kde-unstable/kdepim-runtime/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 99527 2010-11-14 22:37:20Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdepim-runtime -pkgver=4.6.80 -pkgrel=1 -pkgdesc='KDE PIM Runtime Environment' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -depends=('kdepimlibs' 'kdebase-runtime') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('18cb10ea5a7373c4eea859b0d0518b6a9c0e6a4e') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdepim-runtime/kdepim-runtime.install b/kde-unstable/kdepim-runtime/kdepim-runtime.install deleted file mode 100644 index ce5c32e1b..000000000 --- a/kde-unstable/kdepim-runtime/kdepim-runtime.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD deleted file mode 100644 index 378ef6a39..000000000 --- a/kde-unstable/kdepim/PKGBUILD +++ /dev/null @@ -1,257 +0,0 @@ -# $Id: PKGBUILD 124768 2011-05-24 09:38:48Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdepim -pkgname=('kdepim-akonadiconsole' - 'kdepim-akregator' - 'kdepim-blogilo' - 'kdepim-console' - 'kdepim-kaddressbook' - 'kdepim-kalarm' - 'kdepim-kjots' - 'kdepim-kleopatra' - 'kdepim-kmail' - 'kdepim-knode' - 'kdepim-knotes' - 'kdepim-kontact' - 'kdepim-korganizer' - 'kdepim-kresources' - 'kdepim-ktimetracker' - 'kdepim-libkdepim' - 'kdepim-wizards') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url='http://pim.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdepim') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' - 'pilot-link' 'kde-agent') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'fix-console-build.patch') -sha1sums=('dc32fee3332df3bdb4395f3a229d88de34ae4de1' - 'e4b82bcee6c46aad39196a5bb2732fed72ff4541') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/fix-console-build.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDEPIM_BUILD_MOBILE=OFF - make -} - -package_kdepim-akonadiconsole() { - pkgdesc='Akonadi Management and Debugging Console' - depends=('kdepim-libkdepim') - url='http://pim.kde.org' - install='kdepim.install' - cd "${srcdir}"/build/akonadiconsole - make DESTDIR="${pkgdir}" install -} - -package_kdepim-akregator() { - pkgdesc='A Feed Reader for KDE' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/akregator/" - install='kdepim.install' - cd "${srcdir}"/build/akregator - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/akregator - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/akregator - make DESTDIR="${pkgdir}" install -} - -package_kdepim-blogilo() { - pkgdesc='A KDE Blogging Client' - depends=('kdepim-runtime') - url="http://kde.org/applications/internet/blogilo/" - replaces=('blogilo') - conflicts=('blogilo') - install='kdepim.install' - cd "${srcdir}"/build/blogilo - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/blogilo - make DESTDIR="${pkgdir}" install -} - -package_kdepim-console() { - pkgdesc='Command line tool for accessing calendar files' - depends=('kdepim-runtime') - url='http://pim.kde.org' - install='kdepim.install' - cd "${srcdir}"/build/console - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kaddressbook() { - pkgdesc='Contact Manager' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/kaddressbook/" - install='kdepim.install' - cd "${srcdir}"/build/kaddressbook - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/kaddressbook - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/plugins/kaddressbook - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kalarm() { - pkgdesc='Personal Alarm Scheduler' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kalarm/" - install='kdepim.install' - cd "${srcdir}"/build/kalarm - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kalarm - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kjots() { - pkgdesc='Note Taker' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kjots/" - install='kdepim.install' - cd "${srcdir}"/build/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/kjots - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kleopatra() { - pkgdesc='Certificate Manager and Unified Crypto GUI' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kleopatra/" - cd "${srcdir}"/build/kleopatra - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kleopatra - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kmail() { - pkgdesc='Mail Client' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/kmail/" - install='kdepim.install' - conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins') - replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins') - optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication') - for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ - nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-knode() { - pkgdesc='News Reader' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/knode/" - install='kdepim.install' - cd "${srcdir}"/build/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knode - make DESTDIR="${pkgdir}" install -} - -package_kdepim-knotes() { - pkgdesc='Popup Notes' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/knotes/" - install='kdepim.install' - cd "${srcdir}"/build/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knotes - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kontact() { - pkgdesc='Personal Information Manager' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/kontact/" - install='kdepim.install' - conflcits=('kdepim-kontactinterfaces') - replaces=('kdepim-kontactinterfaces') - for i in kontact/src doc/kontact \ - kontact/plugins/summary kontact/plugins/specialdates; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-korganizer() { - pkgdesc='Calendar and Scheduling Program' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/korganizer" - install='kdepim.install' - cd "${srcdir}"/build/korganizer - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/korganizer - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/korganizer - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kresources() { - pkgdesc='KDE PIM resources' - depends=('kdepim-libkdepim') - url='http://pim.kde.org' - cd "${srcdir}"/build/kresources - make DESTDIR="${pkgdir}" install -} - -package_kdepim-ktimetracker() { - pkgdesc='Personal Time Tracker' - depends=('kdepim-kresources') - url="http://kde.org/applications/utilities/ktimetracker/" - install='kdepim.install' - cd "${srcdir}"/build/ktimetracker - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/ktimetracker - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/ktimetracker - make DESTDIR="${pkgdir}" install -} - -package_kdepim-libkdepim() { - pkgdesc='Library for KDE PIM' - groups=() - depends=('kde-agent' 'kdepim-runtime') - url='http://pim.kde.org' - conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') - replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') - for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \ - kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ - messagecomposer messagecore messagelist messageviewer icons \ - strigi-analyzer plugins/messageviewer plugins/ktexteditor; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-wizards() { - pkgdesc='KDE Groupware Wizard' - depends=('kdepim-kresources') - url='http://pim.kde.org' - cd "${srcdir}"/build/wizards - make DESTDIR="${pkgdir}" install -} 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/kdepim/kdepim.install b/kde-unstable/kdepim/kdepim.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdepim/kdepim.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/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD deleted file mode 100644 index 2fff6052c..000000000 --- a/kde-unstable/kdepimlibs/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124655 2011-05-23 19:42:19Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=kdepimlibs -pkgver=4.6.80 -pkgrel=1 -pkgdesc="KDE PIM Libraries" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL') -depends=('kdelibs' 'gpgme' 'akonadi' 'libical' ) -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') -install='kdepimlibs.install' -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('e07ba03177775ee6db6669123b944dd7c3b362f1') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdepimlibs/kdepimlibs.install b/kde-unstable/kdepimlibs/kdepimlibs.install deleted file mode 100644 index 99262607c..000000000 --- a/kde-unstable/kdepimlibs/kdepimlibs.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD deleted file mode 100644 index 567e16086..000000000 --- a/kde-unstable/kdeplasma-addons/PKGBUILD +++ /dev/null @@ -1,603 +0,0 @@ -# $Id: PKGBUILD 124813 2011-05-24 15:14:21Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeplasma-addons -pkgname=('kdeplasma-addons-applets-bball' - 'kdeplasma-addons-applets-binary-clock' - 'kdeplasma-addons-applets-blackboard' - 'kdeplasma-addons-applets-bookmarks' - 'kdeplasma-addons-applets-bubblemon' - 'kdeplasma-addons-applets-calculator' - 'kdeplasma-addons-applets-charselect' - 'kdeplasma-addons-applets-comic' - 'kdeplasma-addons-applets-community' - 'kdeplasma-addons-applets-dict' - 'kdeplasma-addons-applets-eyes' - 'kdeplasma-addons-applets-fifteenpuzzle' - 'kdeplasma-addons-applets-filewatcher' - 'kdeplasma-addons-applets-frame' - 'kdeplasma-addons-applets-fuzzy-clock' - 'kdeplasma-addons-applets-incomingmsg' - 'kdeplasma-addons-applets-kdeobservatory' - 'kdeplasma-addons-applets-kimpanel' - 'kdeplasma-addons-applets-knowledgebase' - 'kdeplasma-addons-applets-kolourpicker' - 'kdeplasma-addons-applets-konqprofiles' - 'kdeplasma-addons-applets-konsoleprofiles' - 'kdeplasma-addons-applets-lancelot' - 'kdeplasma-addons-applets-leavenote' - 'kdeplasma-addons-applets-life' - 'kdeplasma-addons-applets-luna' - 'kdeplasma-addons-applets-magnifique' - 'kdeplasma-addons-applets-mediaplayer' - 'kdeplasma-addons-applets-microblog' - 'kdeplasma-addons-applets-news' - 'kdeplasma-addons-applets-notes' - 'kdeplasma-addons-applets-nowplaying' - 'kdeplasma-addons-applets-paste' - 'kdeplasma-addons-applets-pastebin' - 'kdeplasma-addons-applets-plasmaboard' - 'kdeplasma-addons-applets-previewer' - 'kdeplasma-addons-applets-qalculate' - 'kdeplasma-addons-applets-rememberthemilk' - 'kdeplasma-addons-applets-rssnow' - 'kdeplasma-addons-applets-showdashboard' - 'kdeplasma-addons-applets-showdesktop' - 'kdeplasma-addons-applets-social-news' - 'kdeplasma-addons-applets-spellcheck' - 'kdeplasma-addons-applets-systemloadviewer' - 'kdeplasma-addons-applets-timer' - 'kdeplasma-addons-applets-unitconverter' - 'kdeplasma-addons-applets-weather' - 'kdeplasma-addons-applets-weatherstation' - 'kdeplasma-addons-applets-webslice' - 'kdeplasma-addons-containments' - 'kdeplasma-addons-libs' - 'kdeplasma-addons-runners-audioplayercontrol' - 'kdeplasma-addons-runners-browserhistory' - 'kdeplasma-addons-runners-characters' - 'kdeplasma-addons-runners-contacts' - 'kdeplasma-addons-runners-converter' - 'kdeplasma-addons-runners-datetime' - 'kdeplasma-addons-runners-events' - 'kdeplasma-addons-runners-katesessions' - 'kdeplasma-addons-runners-konquerorsessions' - 'kdeplasma-addons-runners-konsolesessions' - 'kdeplasma-addons-runners-kopete' - 'kdeplasma-addons-runners-mediawiki' - 'kdeplasma-addons-runners-spellchecker' - 'kdeplasma-addons-wallpapers-mandelbrot' - 'kdeplasma-addons-wallpapers-marble' - 'kdeplasma-addons-wallpapers-pattern' - 'kdeplasma-addons-wallpapers-virus' - 'kdeplasma-addons-wallpapers-weather') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL') -groups=('kde' 'kdeplasma-addons') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' - 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('09b97248aa576991f9f5e9ddaa3392618e2337e7') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdeplasma-addons-applets-bball() { - pkgdesc='A bouncy ball for plasma' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/bball - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-binary-clock() { - pkgdesc='Time displayed in binary format' - depends=('kdebase-workspace') - cd $srcdir/build/applets/binary-clock - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-blackboard() { - pkgdesc='Black Board' - depends=('kdebase-workspace') - cd $srcdir/build/applets/blackboard - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-bookmarks() { - pkgdesc='Quick Access to the Bookmarks' - depends=('kdebase-workspace') - cd $srcdir/build/applets/bookmarks - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-bubblemon() { - pkgdesc='A pretty bubble that monitors your system.' - depends=('kdebase-workspace') - cd $srcdir/build/applets/bubblemon - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-calculator() { - pkgdesc='Calculate simple sums' - depends=('kdebase-workspace') - cd $srcdir/build/applets/calculator - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-charselect() { - pkgdesc='View, select, and copy characters from a font collection' - depends=('kdebase-workspace') - cd $srcdir/build/applets/charselect - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-comic() { - pkgdesc='View comic strips from the Internet' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/comic - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-community() { - pkgdesc='Communicate using the Social Desktop' - depends=('kdebase-workspace') - cd $srcdir/build/applets/community - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-dict() { - pkgdesc='Look up the meaning of words and their translation into different languages' - depends=('kdebase-workspace') - cd $srcdir/build/applets/dict - make DESTDIR=$pkgdir install - # FIXME - # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz - rm -rf $pkgdir/usr/share/icons -} - -package_kdeplasma-addons-applets-eyes() { - pkgdesc='XEyes clone' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/eyes - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-fifteenpuzzle() { - pkgdesc='Put the pieces in order' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/fifteenPuzzle - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-filewatcher() { - pkgdesc='Watch for changes in specified files' - depends=('kdebase-workspace') - cd $srcdir/build/applets/fileWatcher - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-frame() { - pkgdesc='Display your favorite pictures' - depends=('kdebase-workspace' 'libkexiv2') - cd $srcdir/build/applets/frame - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-fuzzy-clock() { - pkgdesc='Time displayed in a less precise format' - depends=('kdebase-workspace') - cd $srcdir/build/applets/fuzzy-clock - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-incomingmsg() { - pkgdesc='Notification of new messages' - depends=('kdebase-workspace') - cd $srcdir/build/applets/incomingmsg - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-kdeobservatory() { - pkgdesc='Visualize the KDE ecosystem' - depends=('kdebase-workspace' 'qwt') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/kdeobservatory - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-kimpanel() { - pkgdesc='A generic input method panel for Oriental languages' - depends=('kdebase-workspace') - optdepends=('scim: SCIM backend' - 'fcitx: FCITX backend') - cd $srcdir/build/applets/kimpanel - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-knowledgebase() { - pkgdesc='Opendesktop Knowledgebase' - depends=('kdebase-workspace') - cd $srcdir/build/applets/knowledgebase - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-kolourpicker() { - pkgdesc='Pick a color from the desktop' - depends=('kdebase-workspace') - cd $srcdir/build/applets/kolourpicker - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-konqprofiles() { - pkgdesc='List and launch Konqueror profiles' - depends=('kdebase-workspace') - cd $srcdir/build/applets/konqprofiles - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-konsoleprofiles() { - pkgdesc='List and launch Konsole profiles' - depends=('kdebase-workspace') - cd $srcdir/build/applets/konsoleprofiles - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-lancelot() { - pkgdesc='Launcher to start applications' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - replaces=('lancelot') - provides=('lancelot') - conflicts=('lancelot') - install='kdeplasma-addons-applets-lancelot.install' - cd $srcdir/build/applets/lancelot - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-leavenote() { - pkgdesc='Leave notes for users while they are away' - depends=('kdebase-workspace') - cd $srcdir/build/applets/leavenote - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-life() { - pkgdesc='Life' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/life - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-luna() { - pkgdesc='Display moon phases for your location' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/luna - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-magnifique() { - pkgdesc='A magnification glass for the Plasma desktop' - depends=('kdebase-workspace') - cd $srcdir/build/applets/magnifique - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-mediaplayer() { - pkgdesc='Widget that can play video and sound' - depends=('kdebase-workspace') - cd $srcdir/build/applets/mediaplayer - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-microblog() { - pkgdesc='Update and view your microblog status.' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/microblog - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-news() { - pkgdesc='Show news from various sources' - depends=('kdebase-workspace') - cd $srcdir/build/applets/news - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-notes() { - pkgdesc='Desktop sticky notes' - depends=('kdebase-workspace') - cd $srcdir/build/applets/notes - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-nowplaying() { - pkgdesc='Displays currently playing audio' - depends=('kdebase-workspace') - cd $srcdir/build/applets/nowplaying - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-paste() { - pkgdesc='Paste text snippets' - depends=('kdebase-workspace') - cd $srcdir/build/applets/paste - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-pastebin() { - pkgdesc='Paste text/images to a remote server' - depends=('kdebase-workspace') - cd $srcdir/build/applets/pastebin - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-plasmaboard() { - pkgdesc='A virtual, on-screen keyboard' - depends=('kdebase-workspace') - cd $srcdir/build/applets/plasmaboard - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-previewer() { - pkgdesc='Preview This File' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/previewer - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-qalculate() { - pkgdesc='A powerful mathematical equation solver' - depends=('kdebase-workspace') - install='kdeplasma-addons-applets.install' - cd $srcdir/build/applets/qalculate - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-rememberthemilk() { - pkgdesc='Remember The Milk Todo list applet' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/rememberthemilk - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-rssnow() { - pkgdesc='Show news from various sources' - depends=('kdebase-workspace') - cd $srcdir/build/applets/rssnow - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-showdashboard() { - pkgdesc='Show the Plasma widget dashboard above other windows' - depends=('kdebase-workspace') - cd $srcdir/build/applets/showdashboard - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-showdesktop() { - pkgdesc='Show the Plasma desktop' - depends=('kdebase-workspace') - cd $srcdir/build/applets/showdesktop - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-social-news() { - pkgdesc='Stay informed with the Social Desktop' - replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') - conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') - depends=('kdebase-workspace') - cd $srcdir/build/applets/social-news - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-spellcheck() { - pkgdesc='Fast spell checking' - depends=('kdebase-workspace') - cd $srcdir/build/applets/spellcheck - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-systemloadviewer() { - pkgdesc='Tiny CPU/RAM/Swap monitor' - depends=('kdebase-workspace') - cd $srcdir/build/applets/systemloadviewer - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-timer() { - pkgdesc='Countdown over a specified time period' - depends=('kdebase-workspace') - cd $srcdir/build/applets/timer - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-unitconverter() { - pkgdesc='Plasmoid for converting units' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/unitconverter - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-weather() { - pkgdesc='Displays Weather information' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/weather - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-weatherstation() { - pkgdesc='Weather reports with an LCD display style' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/weatherstation - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-applets-webslice() { - pkgdesc='Show a part of a webpage' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/applets/webslice - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-containments() { - pkgdesc='Activities types for Plasma shells' - depends=('kdebase-workspace') - cd $srcdir/build/containments - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-libs() { - pkgdesc='Plasma Addon Library' - depends=('kdebase-workspace') - groups=() - replaces=('kdeplasma-addons-dataengines') - provides=('kdeplasma-addons-dataengines') - conflicts=('kdeplasma-addons-dataengines') - cd $srcdir/build/libs - make DESTDIR=$pkgdir install - cd $srcdir/build/dataengines - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-audioplayercontrol() { - pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)' - depends=('kdebase-workspace') - cd $srcdir/build/runners/audioplayercontrol - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-browserhistory() { - pkgdesc='Searches in Konqueror´s history' - depends=('kdebase-workspace') - cd $srcdir/build/runners/browserhistory - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-characters() { - pkgdesc='special Characters' - depends=('kdebase-workspace') - cd $srcdir/build/runners/characters - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-contacts() { - pkgdesc='Finds entries in your address book' - depends=('kdebase-workspace') - cd $srcdir/build/runners/contacts - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-converter() { - pkgdesc='Convert values to different units' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/runners/converter - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-datetime() { - pkgdesc='The current date and time, locally or in any timezone' - depends=('kdebase-workspace') - cd $srcdir/build/runners/datetime - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-events() { - pkgdesc='Calendar Events runner' - depends=('kdebase-workspace') - cd $srcdir/build/runners/events - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-katesessions() { - pkgdesc='Matches Kate Sessions' - depends=('kdebase-workspace') - cd $srcdir/build/runners/katesessions - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-konquerorsessions() { - pkgdesc='Matches Konqueror Sessions' - depends=('kdebase-workspace') - cd $srcdir/build/runners/konquerorsessions - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-konsolesessions() { - pkgdesc='Matches Konsole Sessions' - depends=('kdebase-workspace') - cd $srcdir/build/runners/konsolesessions - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-kopete() { - pkgdesc='Kopete Contact runner' - depends=('kdebase-workspace') - cd $srcdir/build/runners/kopete - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-mediawiki() { - pkgdesc='Search on Wikitravel' - depends=('kdebase-workspace') - cd $srcdir/build/runners/mediawiki - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-runners-spellchecker() { - pkgdesc='Check the spelling of a word' - depends=('kdebase-workspace') - cd $srcdir/build/runners/spellchecker - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-mandelbrot() { - pkgdesc='Mandelbrot' - depends=('kdebase-workspace') - cd $srcdir/build/wallpapers/mandelbrot - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-marble() { - pkgdesc='Globe' - depends=('kdebase-workspace' 'kdeedu-marble') - cd $srcdir/build/wallpapers/marble - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-pattern() { - pkgdesc='Pattern' - depends=('kdebase-workspace') - cd $srcdir/build/wallpapers/pattern - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-virus() { - pkgdesc='Virus' - depends=('kdebase-workspace') - cd $srcdir/build/wallpapers/virus - make DESTDIR=$pkgdir install -} - -package_kdeplasma-addons-wallpapers-weather() { - pkgdesc='Weather' - depends=('kdebase-workspace' 'kdeplasma-addons-libs') - cd $srcdir/build/wallpapers/weather - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install deleted file mode 100644 index ce5c32e1b..000000000 --- a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install deleted file mode 100644 index c4ef46ba8..000000000 --- a/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.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 -}
\ No newline at end of file diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD deleted file mode 100644 index c64df1df3..000000000 --- a/kde-unstable/kdesdk-kate/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 124689 2011-05-23 21:22:48Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=kdesdk-kate -pkgname=('kdebase-kwrite' - 'kdesdk-kate') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -makedepends=('kdelibs ''cmake' 'automoc4') -source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.bz2" - 'pkgbuild-syntax-highlight.patch') -sha1sums=('9c95690b9f967a0ed52afcf6c4d7ace3ef9284ff' - 'ab0c5d2a796b0f283154799add161c99f48ffcd5') - -build() { - cd "${srcdir}"/kate-${pkgver} - patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../kate-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_KTEXTEDITOR=OFF - make -} - -package_kdebase-kwrite() { - pkgdesc="Text Editor" - depends=('kdebase-runtime') - groups=('kde' 'kdebase') - install='kdebase-kwrite.install' - - cd "${srcdir}"/build/kwrite - make DESTDIR="${pkgdir}" install - - cd "${srcdir}"/build/part - make DESTDIR="${pkgdir}" install - - cd "${srcdir}"/build/doc/kwrite - make DESTDIR="${pkgdir}" install -} - -package_kdesdk-kate() { - pkgdesc="Advanced Text Editor" - depends=('kdebase-kwrite') - groups=('kde' 'kdesdk') - install='kdesdk-kate.install' - - cd "${srcdir}"/build/kate - make DESTDIR="${pkgdir}" install - - cd "${srcdir}"/build/doc/kate - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdesdk-kate/kdebase-kwrite.install b/kde-unstable/kdesdk-kate/kdebase-kwrite.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdesdk-kate/kdebase-kwrite.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdesdk-kate/kdesdk-kate.install b/kde-unstable/kdesdk-kate/kdesdk-kate.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdesdk-kate/kdesdk-kate.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch b/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch deleted file mode 100644 index 3c43eca0f..000000000 --- a/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kate-4.6.80/part/syntax/data/bash.xml~ 2011-05-23 21:20:34.295137123 +0000 -+++ kate-4.6.80/part/syntax/data/bash.xml 2011-05-23 21:20:54.581993368 +0000 -@@ -8,7 +8,7 @@ - <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following --> - <!ENTITY pathpart "([\w_@.%*?+-]|\\ )"> <!-- valid character in a file name --> - ]> --<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> -+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> - - <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl) - Changes by Matthew Woehlke (mw_triad@users.sourceforge.net) diff --git a/kde-unstable/kdesdk/PKGBUILD b/kde-unstable/kdesdk/PKGBUILD deleted file mode 100644 index c01ad1d6e..000000000 --- a/kde-unstable/kdesdk/PKGBUILD +++ /dev/null @@ -1,247 +0,0 @@ -# $Id: PKGBUILD 124846 2011-05-24 18:38:10Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdesdk -pkgname=('kdesdk-cervisia' - 'kdesdk-dolphin-plugins' - 'kdesdk-kapptemplate' - 'kdesdk-kcachegrind' - 'kdesdk-kdeaccounts-plugin' - 'kdesdk-kdepalettes' - 'kdesdk-kioslave' - 'kdesdk-kmtrace' - 'kdesdk-kompare' - 'kdesdk-kpartloader' - 'kdesdk-kprofilemethod' -# 'kdesdk-kspy' - 'kdesdk-kstartperf' - 'kdesdk-kuiviewer' - 'kdesdk-lokalize' - 'kdesdk-okteta' - 'kdesdk-poxml' -# 'kdesdk-scheck' - 'kdesdk-scripts' - 'kdesdk-strigi-analyzer' - 'kdesdk-umbrello') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdesdk') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2' - 'kdepimlibs' 'kdebase-lib') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'fix-python2-path.patch') -sha1sums=('2193e14b8373b833221dbf08ecdb0075e86abe44' - 'd05ca0231869c484fd3861955d960a60aff7dcfb') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - # Fix python2 path - patch -Np1 -i ${srcdir}/fix-python2-path.patch - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find . -name '*.py') - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdesdk-cervisia() { - pkgdesc='CVS Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/cervisia/" - install='kdesdk.install' - cd $srcdir/build/cervisia - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/cervisia - make DESTDIR=$pkgdir install -} - -package_kdesdk-dolphin-plugins() { - pkgdesc='Extra Dolphin plugins' - depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare') - install='kdesdk.install' - cd $srcdir/build/dolphin-plugins/git - make DESTDIR=$pkgdir install - cd $srcdir/build/dolphin-plugins/svn - make DESTDIR=$pkgdir install -} - -package_kdesdk-kapptemplate() { - pkgdesc='KDE Template Generator' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kapptemplate/" - install='kdesdk.install' - cd $srcdir/build/kapptemplate - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kapptemplate - make DESTDIR=$pkgdir install -} - -package_kdesdk-kcachegrind() { - pkgdesc='Visualization of Performance Profiling Data' - depends=('kdebase-runtime' 'python2') - optdepends=('php: PHP support') - url="http://kde.org/applications/development/kcachegrind/" - install='kdesdk.install' - cd $srcdir/build/kcachegrind - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcachegrind - make DESTDIR=$pkgdir install -} - -package_kdesdk-kdeaccounts-plugin() { - pkgdesc='KDE Repository Accounts' - depends=('kdepim-runtime') - cd $srcdir/build/kdeaccounts-plugin - make DESTDIR=$pkgdir install -} - -package_kdesdk-kdepalettes() { - pkgdesc='Palettes for the Gimp that match the KDE standard color palette' - optdepends=('gimp') - install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \ - $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl -} - -package_kdesdk-kioslave() { - pkgdesc='KDED Subversion Module' - depends=('kdebase-runtime' 'subversion') - cd $srcdir/build/kioslave - make DESTDIR=$pkgdir install -} - -package_kdesdk-kmtrace() { - pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality' - depends=('kdebase-runtime') - cd $srcdir/build/kmtrace - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmtrace - make DESTDIR=$pkgdir install -} - -package_kdesdk-kompare() { - pkgdesc='Diff/Patch Frontend' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kompare/" - install='kdesdk.install' - cd $srcdir/build/kompare - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kompare - make DESTDIR=$pkgdir install -} - -package_kdesdk-kpartloader() { - pkgdesc='A test application for KParts' - depends=('kdebase-runtime') - install='kdesdk.install' - cd $srcdir/build/kpartloader - make DESTDIR=$pkgdir install -} - -package_kdesdk-kprofilemethod() { - pkgdesc='Macros helping to profile' - cd $srcdir/build/kprofilemethod - make DESTDIR=$pkgdir install -} - -package_kdesdk-kspy() { - pkgdesc='An Object Inspector for Qt/KDE applications' - depends=('kdebase-runtime') - cd $srcdir/build/kspy - make DESTDIR=$pkgdir install -} - -package_kdesdk-kstartperf() { - pkgdesc='Startup time measurement tool for KDE applications' - depends=('kdebase-runtime') - cd $srcdir/build/kstartperf - make DESTDIR=$pkgdir install -} - -package_kdesdk-kuiviewer() { - pkgdesc='Qt Designer UI File Viewer' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/kuiviewer/" - install='kdesdk.install' - cd $srcdir/build/kuiviewer - make DESTDIR=$pkgdir install -} - -package_kdesdk-lokalize() { - pkgdesc='Computer-Aided Translation System' - depends=('kdebase-runtime' 'kdebindings-python') - url="http://kde.org/applications/development/lokalize/" - optdepends=('translate-toolkit: enable extra python script') - install='kdesdk.install' - cd $srcdir/build/lokalize - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/lokalize - make DESTDIR=$pkgdir install -} - -package_kdesdk-okteta() { - pkgdesc='Hex Editor' - depends=('kdebase-runtime') - replaces=('kdeutils-okteta') - conflicts=('kdeutils-okteta') - url="http://kde.org/applications/utilities/okteta" - install='kdesdk-okteta.install' - cd $srcdir/build/okteta - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/okteta - make DESTDIR=$pkgdir install -} - -package_kdesdk-poxml() { - pkgdesc='Translates DocBook XML files using gettext po files' - depends=('qt' 'antlr2') - cd $srcdir/build/poxml - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/poxml - make DESTDIR=$pkgdir install -} - -package_kdesdk-scheck() { - pkgdesc='An interface style to highlight accel and style guide conflicts' - depends=('kdebase-runtime') - cd $srcdir/build/scheck - make DESTDIR=$pkgdir install -} - -package_kdesdk-scripts() { - pkgdesc='KDE SDK scripts' - depends=('python2') - cd $srcdir/build/scripts - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/scripts - make DESTDIR=$pkgdir install -} - -package_kdesdk-strigi-analyzer() { - pkgdesc='Strigi-Analyzer for KDE SDK' - depends=('kdelibs') - cd $srcdir/build/strigi-analyzer - make DESTDIR=$pkgdir install -} - -package_kdesdk-umbrello() { - pkgdesc='UML Modeller' - depends=('kdebase-runtime') - url="http://kde.org/applications/development/umbrello/" - install='kdesdk.install' - cd $srcdir/build/umbrello - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/umbrello - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdesdk/fix-python2-path.patch b/kde-unstable/kdesdk/fix-python2-path.patch deleted file mode 100644 index c2c0745d1..000000000 --- a/kde-unstable/kdesdk/fix-python2-path.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~ 2010-11-24 11:53:38.586666671 +0100 -+++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree 2010-11-24 11:53:38.623333337 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # _*_ coding: latin1 _*_ - - # ---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100 -+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100 -@@ -114,7 +114,7 @@ - print >>sys.stderr, "Execution failed:", e - - cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname) -- if os.name!='nt': cmd='python '+cmd -+ if os.name!='nt': cmd='python2 '+cmd - else: cmd=cmd.replace('/','\\') - os.system(cmd) - ---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100 -+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100 -@@ -42,7 +42,7 @@ - xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf) - - ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0] -- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) -+ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) - - try: convert() - except: print 'error occured' ---- kdesdk-4.5.80/scripts/rename_source_files~ 2010-11-24 11:45:41.040000004 +0100 -+++ kdesdk-4.5.80/scripts/rename_source_files 2010-11-24 11:45:41.093333336 +0100 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python2 - # - # Copyright David Faure <faure@kde.org>, License LGPL v2 - # ---- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100 -+++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100 -@@ -17,6 +17,6 @@ - svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID - - echo "Creating changelog..."; --svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 -+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 - - rm /tmp/accounts.$PPID ---- kdesdk-4.5.80/scripts/kde_generate_export_header~ 2010-11-24 11:48:49.696666669 +0100 -+++ kdesdk-4.5.80/scripts/kde_generate_export_header 2010-11-24 11:48:49.753333338 +0100 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python2 - - import os, sys, string - ---- kdesdk-4.5.80/scripts/reviewboarddiff~ 2010-11-24 11:49:37.686666670 +0100 -+++ kdesdk-4.5.80/scripts/reviewboarddiff 2010-11-24 11:49:37.740000003 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # encoding: utf-8 - # - # Generates reviewboard compatible diffs from git-svn repositories. diff --git a/kde-unstable/kdesdk/kdesdk-okteta.install b/kde-unstable/kdesdk/kdesdk-okteta.install deleted file mode 100644 index 3f06b8deb..000000000 --- a/kde-unstable/kdesdk/kdesdk-okteta.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/kdesdk/kdesdk.install b/kde-unstable/kdesdk/kdesdk.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdesdk/kdesdk.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/kde-unstable/kdetoys/PKGBUILD b/kde-unstable/kdetoys/PKGBUILD deleted file mode 100644 index 1eba40691..000000000 --- a/kde-unstable/kdetoys/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 124780 2011-05-24 12:05:42Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdetoys -pkgname=('kdetoys-amor' - 'kdetoys-kteatime' - 'kdetoys-ktux') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdetoys') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('b268bb38f84199d33d3be1fe3e0389c0abb35e69') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdetoys-amor() { - pkgdesc='On-Screen Creature' - depends=('kdebase-runtime') - install='kdetoys.install' - cd $srcdir/build/amor - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/amor - make DESTDIR=$pkgdir install -} - -package_kdetoys-kteatime() { - pkgdesc='Tea Cooker' - depends=('kdebase-runtime') - install='kdetoys.install' - cd $srcdir/build/kteatime - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kteatime - make DESTDIR=$pkgdir install -} - -package_kdetoys-ktux() { - pkgdesc='KTux' - depends=('kdebase-workspace' ) - install='kdetoys.install' - cd $srcdir/build/ktux - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdetoys/kdetoys.install b/kde-unstable/kdetoys/kdetoys.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdetoys/kdetoys.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/kde-unstable/kdeutils/PKGBUILD b/kde-unstable/kdeutils/PKGBUILD deleted file mode 100644 index 89915c6f6..000000000 --- a/kde-unstable/kdeutils/PKGBUILD +++ /dev/null @@ -1,180 +0,0 @@ -# $Id: PKGBUILD 124777 2011-05-24 11:52:41Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeutils -pkgname=('kdeutils-ark' - 'kdeutils-filelight' - 'kdeutils-kcalc' - 'kdeutils-kcharselect' - 'kdeutils-kdf' - 'kdeutils-kfloppy' - 'kdeutils-kgpg' - 'kdeutils-kremotecontrol' - 'kdeutils-ktimer' - 'kdeutils-kwallet' - 'kdeutils-printer-applet' - 'kdeutils-superkaramba' - 'kdeutils-sweeper') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeutils') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' - 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' - 'qjson') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('90b5e5bd95ec2de2d36db20c6155d23dbeab2d60') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdeutils-ark() { - pkgdesc='Archiving Tool' - depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') - optdepends=('p7zip' 'zip' 'unzip' 'unrar') - url="http://kde.org/applications/utilities/ark/" - cd $srcdir/build/ark - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ark - make DESTDIR=$pkgdir install -} - -package_kdeutils-filelight() { - pkgdesc='View disk usage information' - depends=('kdebase-runtime' 'qimageblitz') - replaces=('filelight') - conflicts=('filelight') - install='kdeutils.install' - url="http://methylblue.com/filelight/" - cd $srcdir/build/filelight - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/filelight - make DESTDIR=$pkgdir install -} - -package_kdeutils-kcalc() { - pkgdesc='Scientific Calculator' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kcalc/" - cd $srcdir/build/kcalc - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcalc - make DESTDIR=$pkgdir install -} - -package_kdeutils-kcharselect() { - pkgdesc='Character Selector' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kcharselect/" - cd $srcdir/build/kcharselect - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcharselect - make DESTDIR=$pkgdir install -} - -package_kdeutils-kdf() { - pkgdesc='View Disk Usage' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/kdiskfree/" - install='kdeutils.install' - cd $srcdir/build/kdf - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kdf - make DESTDIR=$pkgdir install -} - -package_kdeutils-kfloppy() { - pkgdesc='Floppy Formatter' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kfloppy/" - install='kdeutils.install' - cd $srcdir/build/kfloppy - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kfloppy - make DESTDIR=$pkgdir install -} - -package_kdeutils-kgpg() { - pkgdesc='A GnuPG frontend' - depends=('kdepim-runtime' 'kde-agent') - url="http://kde.org/applications/utilities/kgpg" - install='kdeutils.install' - cd $srcdir/build/kgpg - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kgpg - make DESTDIR=$pkgdir install -} - -package_kdeutils-kremotecontrol() { - pkgdesc='Configure your remote controls for use with applications' - replaces=('kdeutils-kdelirc') - conflicts=('kdeutils-kdelirc') - depends=('kdebase-workspace') - url="http://kde.org/applications/utilities/kremotecontrol" - install='kdeutils.install' - cd $srcdir/build/kremotecontrol - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcontrol/kremotecontrol - make DESTDIR=$pkgdir install -} - -package_kdeutils-ktimer() { - pkgdesc='Countdown Launcher' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/ktimer" - install='kdeutils.install' - cd $srcdir/build/ktimer - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktimer - make DESTDIR=$pkgdir install -} - -package_kdeutils-kwallet() { - pkgdesc='Wallet Management Tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/system/kwalletmanager/" - install='kdeutils.install' - cd $srcdir/build/kwallet - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kwallet - make DESTDIR=$pkgdir install -} - -package_kdeutils-printer-applet() { - pkgdesc='System tray icon for managing print jobs' - depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common') - url="http://kde.org/applications/system/printerapplet/" - cd $srcdir/build/printer-applet - make DESTDIR=$pkgdir install - - # Use the python2 executable - find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} - -package_kdeutils-superkaramba() { - pkgdesc='An engine for cool desktop eyecandy' - depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz') - url="http://kde.org/applications/utilities/superkaramba" - install='kdeutils.install' - cd $srcdir/build/superkaramba - make DESTDIR=$pkgdir install -} - -package_kdeutils-sweeper() { - pkgdesc='System Cleaner' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/sweeper/" - cd $srcdir/build/sweeper - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdeutils/kdeutils.install b/kde-unstable/kdeutils/kdeutils.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdeutils/kdeutils.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/kde-unstable/kdewebdev/PKGBUILD b/kde-unstable/kdewebdev/PKGBUILD deleted file mode 100644 index d70b92ee0..000000000 --- a/kde-unstable/kdewebdev/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 124779 2011-05-24 12:04:03Z andrea $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdewebdev -pkgname=('kdewebdev-kfilereplace' - 'kdewebdev-kimagemapeditor' - 'kdewebdev-klinkstatus' - 'kdewebdev-kommander') -pkgver=4.6.80 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdewebdev') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' - 'boost') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('d5e35391eb64265f66d81c5bdd8d95abf11d474a') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdewebdev-kfilereplace() { - pkgdesc='Search & Replace Tool' - depends=('kdebase-runtime') - url="http://kde.org/applications/utilities/kfilereplace/" - install='kdewebdev.install' - cd $srcdir/build/kfilereplace - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kfilereplace - make DESTDIR=$pkgdir install -} - -package_kdewebdev-kimagemapeditor() { - pkgdesc='HTML Image Map Editor' - depends=('kdebase-runtime') - install='kdewebdev.install' - cd $srcdir/build/kimagemapeditor - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kimagemapeditor - make DESTDIR=$pkgdir install -} - -package_kdewebdev-klinkstatus() { - pkgdesc='Link Checker' - depends=('kdepim-runtime' 'tidyhtml') - install='kdewebdev.install' - cd $srcdir/build/klinkstatus - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klinkstatus - make DESTDIR=$pkgdir install -} - -package_kdewebdev-kommander() { - pkgdesc='Executor for Kommander dialogs' - depends=('kdebase-runtime') - cd $srcdir/build/kommander - make DESTDIR=$pkgdir install -} diff --git a/kde-unstable/kdewebdev/kdewebdev.install b/kde-unstable/kdewebdev/kdewebdev.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/kdewebdev/kdewebdev.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/kde-unstable/libkdcraw/PKGBUILD b/kde-unstable/libkdcraw/PKGBUILD deleted file mode 100644 index 95daa4280..000000000 --- a/kde-unstable/libkdcraw/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libkdcraw -pkgver=4.6.80 -pkgrel=1 -pkgdesc="A C++ interface used to decode RAW picture" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs' 'lcms') -makedepends=('cmake' 'automoc4') -conflicts=('kdegraphics-libs') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('19fe60a51ede7bf5b4047f8fff22cd8361ebd90c') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/libkdcraw/libkdcraw.install b/kde-unstable/libkdcraw/libkdcraw.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/libkdcraw/libkdcraw.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/kde-unstable/libkdeedu/PKGBUILD b/kde-unstable/libkdeedu/PKGBUILD deleted file mode 100644 index fa4986b87..000000000 --- a/kde-unstable/libkdeedu/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124792 2011-05-24 13:04:47Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libkdeedu -pkgver=4.6.80 -pkgrel=1 -pkgdesc="Libraries used by KDE Education applications" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -replaces=('kdeedu-libkdeedu' 'kdeedu-data') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('2349b0a1676b61c7915a272030d6388e8bd6c3b1') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/libkdeedu/libkdeedu.install b/kde-unstable/libkdeedu/libkdeedu.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/libkdeedu/libkdeedu.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/kde-unstable/libkexiv2/PKGBUILD b/kde-unstable/libkexiv2/PKGBUILD deleted file mode 100644 index c80f8cd71..000000000 --- a/kde-unstable/libkexiv2/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libkexiv2 -pkgver=4.6.80 -pkgrel=1 -pkgdesc="A library to manipulate pictures metadata" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -conflicts=('kdegraphics-libs') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('cff979e2bcc604ec422feff0bc1fee3483955e5d') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/libkface/PKGBUILD b/kde-unstable/libkface/PKGBUILD 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/libkipi/PKGBUILD b/kde-unstable/libkipi/PKGBUILD deleted file mode 100644 index b11e5a1cf..000000000 --- a/kde-unstable/libkipi/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libkipi -pkgver=4.6.80 -pkgrel=1 -pkgdesc="An interface to use kipi-plugins from a KDE application" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs') -makedepends=('cmake' 'automoc4') -conflicts=('kdegraphics-libs') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f87620e1eaa795129447473c3b89dbc5a27da161') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/libkipi/libkipi.install b/kde-unstable/libkipi/libkipi.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/libkipi/libkipi.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/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/kde-unstable/libksane/PKGBUILD b/kde-unstable/libksane/PKGBUILD deleted file mode 100644 index b1f117368..000000000 --- a/kde-unstable/libksane/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124799 2011-05-24 13:21:06Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=libksane -pkgver=4.6.80 -pkgrel=1 -pkgdesc="An image scanning library" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -depends=('kdelibs' 'sane') -makedepends=('cmake' 'automoc4') -conflicts=('kdegraphics-libs') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('19cf8532f5ea046343fcaa51b9a9c0df7aae2978') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/libksane/libksane.install b/kde-unstable/libksane/libksane.install deleted file mode 100644 index e70c054ec..000000000 --- a/kde-unstable/libksane/libksane.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/kde-unstable/phonon/PKGBUILD b/kde-unstable/phonon/PKGBUILD deleted file mode 100644 index ad7852355..000000000 --- a/kde-unstable/phonon/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 125369 2011-05-26 10:11:37Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=phonon -pkgver=4.5.55 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://phonon.kde.org" -license=('LGPL') -pkgdesc="The multimedia framework for KDE4" -depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') -optdepends=('pulseaudio: PulseAudio support') -makedepends=('cmake' 'automoc4' 'pulseaudio') -source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=phonon.git&a=snapshot&h=37ec84753af68c4f30041d080b37f1a49a89197c&fmt=tbz2") -#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ce1316c88df988320e75a2b4c3cb8804') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON - make -} - -package(){ - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/qt/PKGBUILD b/kde-unstable/qt/PKGBUILD deleted file mode 100644 index 89e96034f..000000000 --- a/kde-unstable/qt/PKGBUILD +++ /dev/null @@ -1,222 +0,0 @@ -# $Id: PKGBUILD 125344 2011-05-26 00:12:04Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=qt -pkgname=('qt' 'qt-private-headers') -pkgver=4.7.3 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://qt.nokia.com/' -license=('GPL3' 'LGPL') -makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' - 'mysql' 'unixodbc' 'cups' 'gtk2') -options=('!libtool') -_pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" - 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop' - 'qtbug-16292.patch') -md5sums=('49b96eefb1224cc529af6fe5608654fe' - 'fc211414130ab2764132e7370f8e5caa' - '85179f5e0437514f8639957e1d8baf62' - 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'dc7ed8c2e8c68a175f7f05a34dccc937') - -build() { - unset QMAKESPEC - export QT4DIR=$srcdir/$_pkgfqn - export PATH=${QT4DIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - - cd $srcdir/$_pkgfqn - - # Already fixed upstream - patch -p1 -i "${srcdir}"/qtbug-16292.patch - - sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf - sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf - - ./configure -confirm-license -opensource \ - -prefix /usr \ - -docdir /usr/share/doc/qt \ - -plugindir /usr/lib/qt/plugins \ - -importdir /usr/lib/qt/imports \ - -datadir /usr/share/qt \ - -translationdir /usr/share/qt/translations \ - -sysconfdir /etc \ - -examplesdir /usr/share/doc/qt/examples \ - -demosdir /usr/share/doc/qt/demos \ - -largefile \ - -plugin-sql-{psql,mysql,sqlite,odbc} \ - -system-sqlite \ - -xmlpatterns \ - -no-phonon \ - -no-phonon-backend \ - -svg \ - -webkit \ - -script \ - -scripttools \ - -system-zlib \ - -system-libtiff \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -no-rpath \ - -openssl-linked \ - -silent \ - -optimized-qmake \ - -dbus \ - -reduce-relocations \ - -no-separate-debug-info \ - -gtkstyle \ - -opengl \ - -no-openvg \ - -glib - make -} - -package_qt() { - pkgdesc='A cross-platform application and UI framework' - depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' - 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' - 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') - optdepends=('postgresql-libs: PostgreSQL driver' - 'libmysqlclient: MySQL driver' - 'unixodbc: ODBC driver' - 'libxinerama: Xinerama support' - 'libxcursor: Xcursor support' - 'libxfixes: Xfixes support') - install='qt.install' - - cd $srcdir/$_pkgfqn - make INSTALL_ROOT=$pkgdir install - - # install missing icons and desktop files - for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do - size=$(echo $(basename ${icon}) | cut -d- -f2) - install -p -D -m644 ${icon} ${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png - done - install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png - install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png - install -p -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png - install -d ${pkgdir}/usr/share/applications - install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/ - - # install license addition - install -D -m644 LGPL_EXCEPTION.txt ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt - - # Fix wrong path in pkgconfig files - find ${pkgdir}/usr/lib/pkgconfig -type f -name '*.pc' \ - -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - # Fix wrong path in prl files - find ${pkgdir}/usr/lib -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; -} - -package_qt-private-headers(){ - pkgdesc="Qt private headers for development" - depends=("qt=${pkgver}") - - install -d ${pkgdir}/usr/include/phonon/private - cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/Qt3Support/private - cd ${srcdir}/$_pkgfqn/src/qt3support/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtCore/private - cd ${srcdir}/$_pkgfqn/src/corelib/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtDBus/private - cd ${srcdir}/$_pkgfqn/src/dbus/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtDeclarative/private - cd ${srcdir}/$_pkgfqn/src/declarative/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtDesigner/private - cd ${srcdir}/$_pkgfqn/tools/designer/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtGui/private - cd ${srcdir}/$_pkgfqn/src/gui/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtHelp/private - cd ${srcdir}/$_pkgfqn/tools/assistant/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtMultimedia/private - cd ${srcdir}/$_pkgfqn/src/multimedia/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtNetwork/private - cd ${srcdir}/$_pkgfqn/src/network/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtNetwork/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtOpenGL/private - cd ${srcdir}/$_pkgfqn/src/opengl/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtOpenGL/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtScript/private - cd ${srcdir}/$_pkgfqn/src/script/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtScript/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtScriptTools/private - cd ${srcdir}/$_pkgfqn/src/scripttools/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtScriptTools/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtSql/private - cd ${srcdir}/$_pkgfqn/src/sql/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtSql/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtSvg/private - cd ${srcdir}/$_pkgfqn/src/svg/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtSvg/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtTest/private - cd ${srcdir}/$_pkgfqn/src/testlib/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtTest/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtUiTools/private - cd ${srcdir}/$_pkgfqn/tools/designer/src/uitools - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtUiTools/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtWebKit/private - cd ${srcdir}/$_pkgfqn/src/3rdparty/webkit - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtWebKit/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtXmlPatterns/private - cd ${srcdir}/$_pkgfqn/src/xmlpatterns/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtXmlPatterns/private/ \; &> /dev/null -} diff --git a/kde-unstable/qt/assistant.desktop b/kde-unstable/qt/assistant.desktop deleted file mode 100644 index a9e98c44b..000000000 --- a/kde-unstable/qt/assistant.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt Assistant -Comment=Shows Qt documentation and examples -Exec=/usr/bin/assistant -Icon=assistant -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development;Documentation; diff --git a/kde-unstable/qt/designer.desktop b/kde-unstable/qt/designer.desktop deleted file mode 100644 index 9b7b6e9aa..000000000 --- a/kde-unstable/qt/designer.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Qt Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt applications -Exec=/usr/bin/designer -Icon=designer -MimeType=application/x-designer; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/kde-unstable/qt/linguist.desktop b/kde-unstable/qt/linguist.desktop deleted file mode 100644 index 8cbe86599..000000000 --- a/kde-unstable/qt/linguist.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt Linguist -Comment=Add translations to Qt applications -Exec=/usr/bin/linguist -Icon=linguist -MimeType=text/vnd.trolltech.linguist;application/x-linguist; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/kde-unstable/qt/qt.install b/kde-unstable/qt/qt.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/qt/qt.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/kde-unstable/qt/qtbug-16292.patch b/kde-unstable/qt/qtbug-16292.patch deleted file mode 100644 index 9728e28f5..000000000 --- a/kde-unstable/qt/qtbug-16292.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001 -From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> -Date: Tue, 15 Feb 2011 11:19:26 +0100 -Subject: [PATCH] Fix crash in KPackageKit - -QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex -after calling QTreeView::indexRowSizeHint(). - -Same thing inside QTreeView::indexRowSizeHint(), since -QHeaderView::count() will call -QAbstractItemViewPrivate::executePostedLayout() which may invalidate -all the QModelIndex. - -Reviewed-by: Olivier -Task-number: QTBUG-16292 ---- - src/gui/itemviews/qtreeview.cpp | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index f1f3236..c0573bb 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -2753,6 +2753,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const - - int start = -1; - int end = -1; -+ int indexRow = index.row(); - int count = d->header->count(); - bool emptyHeader = (count == 0); - QModelIndex parent = index.parent(); -@@ -2789,7 +2790,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const - int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column); - if (d->header->isSectionHidden(logicalColumn)) - continue; -- QModelIndex idx = d->model->index(index.row(), logicalColumn, parent); -+ QModelIndex idx = d->model->index(indexRow, logicalColumn, parent); - if (idx.isValid()) { - QWidget *editor = d->editorForIndex(idx).editor; - if (editor && d->persistent.contains(editor)) { -@@ -3224,14 +3225,14 @@ int QTreeViewPrivate::itemHeight(int item) const - if (viewItems.isEmpty()) - return 0; - const QModelIndex &index = viewItems.at(item).index; -+ if (!index.isValid()) -+ return 0; - int height = viewItems.at(item).height; -- if (height <= 0 && index.isValid()) { -+ if (height <= 0) { - height = q_func()->indexRowSizeHint(index); - viewItems[item].height = height; - } -- if (!index.isValid() || height < 0) -- return 0; -- return height; -+ return qMax(height, 0); - } - - --- -1.6.1 - diff --git a/kde-unstable/qt/qtconfig.desktop b/kde-unstable/qt/qtconfig.desktop deleted file mode 100644 index 46dcf9e3d..000000000 --- a/kde-unstable/qt/qtconfig.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt Config -Comment=Configure Qt behavior, styles, fonts -Exec=/usr/bin/qtconfig -Icon=qtlogo -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Settings; -NoDisplay=true diff --git a/kde-unstable/soprano/PKGBUILD b/kde-unstable/soprano/PKGBUILD deleted file mode 100644 index 324ccc640..000000000 --- a/kde-unstable/soprano/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 124470 2011-05-22 12:59:48Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=soprano -pkgver=2.6.50git20110522 -pkgrel=1 -pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' -arch=('i686' 'x86_64') -url='http://soprano.sourceforge.net/' -license=('GPL' 'LGPL') -depends=('qt' 'clucene' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso') -makedepends=('cmake' 'openjdk6' 'doxygen') -#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -source=("${pkgname}-${pkgver}.tar.bz2"::'http://quickgit.kde.org/?p=soprano.git&a=snapshot&h=d70bf052edd6475dc6f89bee82c3ddee8dae46a0&fmt=tbz2') -md5sums=('28f88ef342e77d355da56117897f3e2c') - -build() { - cd ${srcdir} - mkdir build - cd build - . /etc/profile.d/openjdk6.sh - # we need the rpath - cmake ../${pkgname} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR="${pkgdir}" install -} diff --git a/multilib-testing/lib32-libffi/PKGBUILD b/multilib-testing/lib32-libffi/PKGBUILD deleted file mode 100644 index 3e7409124..000000000 --- a/multilib-testing/lib32-libffi/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 47107 2011-05-16 19:59:16Z lcarlier $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=lib32-libffi -pkgver=3.0.9 -pkgrel=1 -pkgdesc="A portable, high level programming interface to various calling conventions (32 bits version)." -arch=('x86_64') -license=('MIT') -url="http://sourceware.org/libffi" -depends=('lib32-glibc') -options=('!libtool') -source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) -md5sums=('1f300a7a7f975d4046f51c3022fa5ff1') - -build() { - cd "${srcdir}/libffi-${pkgver}" - - export CC="gcc -m32" - - ./configure --prefix=/usr \ - --libdir=/usr/lib32 --libexecdir=/usr/lib32 - make - - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" - rm -r "${pkgdir}"/usr/share/{info,man} -} diff --git a/multilib-testing/lib32-llvm/PKGBUILD b/multilib-testing/lib32-llvm/PKGBUILD deleted file mode 100644 index ff7f4f050..000000000 --- a/multilib-testing/lib32-llvm/PKGBUILD +++ /dev/null @@ -1,153 +0,0 @@ -# $Id: PKGBUILD 47129 2011-05-17 14:00:02Z lcarlier $ -# 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=('lib32-llvm') -pkgver=2.9 -_gcc_ver=4.6.0 -pkgrel=1 -arch=('x86_64') -url="http://llvm.org/" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('gcc-libs-multilib' 'lib32-libffi' 'python2' "gcc-multilib=$_gcc_ver") -source=(http://llvm.org/releases/$pkgver/llvm-$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) -md5sums=('793138412d2af2c7c7f54615f8943771' - '634de18d04b7a4ded19ec4c17d23cfca' - '70e23a3dc2b38ecb2bb4d2c48f47295d' - '02c23b4aaca3445b8bf39fddb2f9906e' - '87a7162dbe99e9ffce6c40bd09f5f4f0' - '8da236120a9a287a977b575b8b905c93' - '225ee6b531f8327f34f344a18cb4ec81' - '8f7582d7440e4a8342c3aea9ec714fb4') - -build() { - cd "$srcdir/llvm-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - # 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)/lib32/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.0 to GccVersions (FS#23631) - #patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" - - # Adjust lib paths - #patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" - - # Make -flto work - # Use gold instead of default linker, and always use the plugin - #patch -d tools/clang -Np0 -i "$srcdir/enable-lto.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/lib32/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() { - pkgdesc="Low Level Virtual Machine (32 bits version)" - depends=('perl' 'lib32-libffi' 'llvm') - - cd "$srcdir/llvm-$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/lib32/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" - sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/llvm:' "$pkgdir/usr/bin/llvm-config" - mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm/llvm-config" - # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.* - - # Symlink the gold plugin where clang expects it - ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so" - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}} -} diff --git a/multilib-testing/lib32-llvm/cindexer-clang-path.patch b/multilib-testing/lib32-llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/multilib-testing/lib32-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/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch deleted file mode 100644 index f46eb9fce..000000000 --- a/multilib-testing/lib32-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/multilib-testing/lib32-llvm/clang-pure64.patch b/multilib-testing/lib32-llvm/clang-pure64.patch deleted file mode 100644 index da6178519..000000000 --- a/multilib-testing/lib32-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/multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch b/multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch deleted file mode 100644 index 2e527300d..000000000 --- a/multilib-testing/lib32-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.0", "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/multilib-testing/lib32-llvm/enable-lto.patch b/multilib-testing/lib32-llvm/enable-lto.patch deleted file mode 100644 index 40d93104a..000000000 --- a/multilib-testing/lib32-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/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD deleted file mode 100644 index dcf69d7e6..000000000 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ /dev/null @@ -1,351 +0,0 @@ -# $Id: PKGBUILD 48014 2011-05-27 05:54:14Z lcarlier $ -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=lib32-mesa -pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' -'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri') - -_git=true -#_git=false - -if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110526 - else - pkgver=7.10.2 -fi - -pkgrel=1 -arch=(x86_64 'mips64el') -makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' -'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm') -url="http://mesa3d.sourceforge.net" -license=('custom') -if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7b3f40b70dc7dd602897d364011089047583c5d - source=('ftp://ftp.archlinux.org/other/mesa/mesa-f7b3f40b70dc7dd602897d364011089047583c5d.tar.bz2') - md5sums=('ca2b343a0b8077fda38077c547b80fc3') -else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) - md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') -fi - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - # for our llvm-config for 32 bit :( - export PATH="/usr/lib32/llvm:$PATH" - # fix linking with llvmpipe driver - sed -i -e 's:LD=g++:LD=g++ -m32:' src/gallium/drivers/llvmpipe/Makefile - autoreconf -vfi - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - if [ "${_git}" != "true" ]; then - patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" - fi - - if [ "${_git}" = "true" ]; then - ./autogen.sh --prefix=/usr \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-r300 \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-llvm \ - --enable-gallium-egl \ - --enable-gallium-swrast \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx,egl \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-32-bit \ - --libdir=/usr/lib32 - # --enable-gallium-svga \ - # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg - # The source code to implement ARB_texture_float extension is included and can be toggled on at compile time only by those who purchased a license from SGI, or are in a country where the patent does not apply. - # --enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177 - else - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-radeon \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --disable-gallium-egl \ - --enable-32-bit \ - --libdir=/usr/lib32 - fi - - make -} - -package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions" - - bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/" - - if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - fi - ln -s swrastg_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so" - ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so" - - rm -rf "${pkgdir}"/usr/{include,share,bin} - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl" -} - -package_lib32-libgles() { - depends=('libgles') - pkgdesc="Mesa GLES libraries (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles" -} - -package_lib32-libegl() { - depends=('lib32-udev' 'libegl') - pkgdesc="Mesa libEGL libraries (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/" - if [ "${_git}" != "true" ]; then - install -m755 -d "${pkgdir}/usr/lib32/egl" - bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" - fi - bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libegl" - ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl" -} - -package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.25' 'lib32-gcc-libs>=4.5' 'mesa') - pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - make DESTDIR="${pkgdir}" install - - - rm -f "${pkgdir}/usr/lib32/libGL.so"* - rm -f "${pkgdir}/usr/lib32/libGLESv"* - rm -f "${pkgdir}/usr/lib32/libEGL"* - rm -rf "${pkgdir}/usr/lib32/egl" - rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc} - rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa" -} - -package_lib32-ati-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" - conflicts=('xf86-video-ati<6.9.0-6') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - - # DRI drivers for r300 and r600 are removed - # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so - if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - fi -} - -package_lib32-intel-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C i810 DESTDIR="${pkgdir}" install - make -C i915 DESTDIR="${pkgdir}" install - make -C i965 DESTDIR="${pkgdir}" install -} - -package_lib32-unichrome-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C unichrome DESTDIR="${pkgdir}" install -} - -package_lib32-mach64-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)" - conflicts=('xf86-video-mach64<6.8.2') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C mach64 DESTDIR="${pkgdir}" install -} - -package_lib32-mga-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Matrox (32-bit)" - conflicts=('xf86-video-mga<1.4.11') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C mga DESTDIR="${pkgdir}" install -} - -package_lib32-r128-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)" - conflicts=('xf86-video-r128<6.8.1') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C r128 DESTDIR="${pkgdir}" install -} - -package_lib32-savage-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)" - conflicts=('xf86-video-savage<2.3.1') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C savage DESTDIR="${pkgdir}" install -} - -package_lib32-sis-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for SiS (32-bit)" - conflicts=('xf86-video-sis<0.10.2') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C sis DESTDIR="${pkgdir}" install -} - -package_lib32-tdfx-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for 3dfx (32-bit)" - conflicts=('xf86-video-tdfx<1.4.3') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C tdfx DESTDIR="${pkgdir}" install -} - -package_lib32-nouveau-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C nouveau DESTDIR="${pkgdir}" install - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - fi -} - diff --git a/multilib-testing/lib32-mesa/nouveau-fix-header.patch b/multilib-testing/lib32-mesa/nouveau-fix-header.patch deleted file mode 100644 index 38aa996f1..000000000 --- a/multilib-testing/lib32-mesa/nouveau-fix-header.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 -From: Ben Skeggs <bskeggs@redhat.com> -Date: Mon, 20 Dec 2010 03:39:36 +0000 -Subject: nouveau: fix includes for latest libdrm - -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> ---- -diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h -index ab480ca..747b084 100644 ---- a/src/gallium/drivers/nouveau/nouveau_winsys.h -+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h -@@ -10,7 +10,7 @@ - #include "nouveau/nouveau_grobj.h" - #include "nouveau/nouveau_notifier.h" - #include "nouveau/nouveau_resource.h" --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - #ifndef NV04_PFIFO_MAX_PACKET_LEN - #define NV04_PFIFO_MAX_PACKET_LEN 2047 -diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c -index ce48022..a99df76 100644 ---- a/src/gallium/drivers/nv50/nv50_surface.c -+++ b/src/gallium/drivers/nv50/nv50_surface.c -@@ -22,7 +22,7 @@ - - #define __NOUVEAU_PUSH_H__ - #include <stdint.h> --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - #include "nv50_context.h" - #include "nv50_resource.h" - #include "pipe/p_defines.h" -diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c -index e0e65e7..e2fadd3 100644 ---- a/src/gallium/drivers/nvfx/nv04_2d.c -+++ b/src/gallium/drivers/nvfx/nv04_2d.c -@@ -34,11 +34,11 @@ - #include <stdio.h> - #include <stdint.h> - #include <nouveau/nouveau_device.h> --#include <nouveau/nouveau_pushbuf.h> - #include <nouveau/nouveau_channel.h> - #include <nouveau/nouveau_bo.h> - #include <nouveau/nouveau_notifier.h> - #include <nouveau/nouveau_grobj.h> -+#include <nouveau/nv04_pushbuf.h> - #include "nv04_2d.h" - - #include "nouveau/nv_object.xml.h" -diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c -index 597664e..339b317 100644 ---- a/src/gallium/drivers/nvfx/nvfx_vbo.c -+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c -@@ -9,8 +9,7 @@ - #include "nvfx_resource.h" - - #include "nouveau/nouveau_channel.h" -- --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - static inline unsigned - util_guess_unique_indices_count(unsigned mode, unsigned indices) -diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -index 8036b18..c5ac128 100644 ---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h -+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -@@ -38,7 +38,6 @@ - #include <assert.h> - - #include "nouveau_device.h" --#include "nouveau_pushbuf.h" - #include "nouveau_grobj.h" - #include "nouveau_channel.h" - #include "nouveau_bo.h" -@@ -46,6 +45,7 @@ - #include "nouveau_screen.h" - #include "nouveau_state.h" - #include "nouveau_surface.h" -+#include "nv04_pushbuf.h" - - #define DRIVER_DATE "20091015" - #define DRIVER_AUTHOR "Nouveau" --- -cgit v0.8.3-6-g21f6 diff --git a/multilib-testing/lib32-udev/PKGBUILD b/multilib-testing/lib32-udev/PKGBUILD deleted file mode 100644 index 081db8c4a..000000000 --- a/multilib-testing/lib32-udev/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=('lib32-udev') -pkgver=171 -pkgrel=1 -arch=('x86_64') -pkgdesc="The userspace dev tools (udev) (32-bit)" -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -options=(!makeflags !libtool) -depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') -makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) -md5sums=('bdf4617284be2ecac11767437417e209') - -build() { - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/udev-$pkgver - - ./configure --libdir=/usr/lib32 - make -} - -package() { - - cd $srcdir/udev-$pkgver - - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/{etc,include,lib,libexec,sbin,share} - rm -rf ${pkgdir}/usr/lib32/girepository* -} diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD deleted file mode 100644 index cb1fb077f..000000000 --- a/multilib/binutils-multilib/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 46786 2011-05-11 15:43:26Z 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 -pkgrel=8 -_date=20110430 -pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" -arch=('x86_64' 'mips64el') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('multilib-devel') -provides=("binutils=$pkgver-$pkgrel") -conflicts=('binutils') -depends=('glibc>=2.13' '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 - binutils-2.21-strip-segfault.patch) -md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec' - '98e8dfaf1c0ededa586823ebfb27825a') - -build() { - cd ${srcdir}/binutils - # http://sourceware.org/bugzilla/show_bug.cgi?id=12632 - patch -Np1 -i $srcdir/binutils-2.21-strip-segfault.patch - - 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 - - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. - 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/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/binutils-multilib/binutils.install b/multilib/binutils-multilib/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/multilib/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/chuck/PKGBUILD b/multilib/chuck/PKGBUILD deleted file mode 100644 index 63f99fc8b..000000000 --- a/multilib/chuck/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 35414 2010-12-20 02:07:32Z heftig $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: tardo <tardo@nagi-fanboi.net> - -pkgname=chuck -pkgver=1.2.1.3 -pkgrel=5 -pkgdesc="Concurrent, on-the-fly audio programming language." -arch=('i686' 'x86_64' 'mips64el') -url="http://chuck.cs.princeton.edu/" -license=('GPL') -depends=('gcc-libs' 'libsndfile' 'alsa-lib') -makedepends=('bison' 'flex') -source=(http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz) -md5sums=('ac8459b4067c2491fbdeb61d122a5985') - -if [[ $CARCH == x86_64 ]]; then - depends=('lib32-gcc-libs' 'lib32-libsndfile' 'lib32-alsa-lib') - makedepends+=('gcc-multilib') -fi - -build() { - if [[ $CARCH == x86_64 ]]; then - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - fi - - cd $srcdir/$pkgname-$pkgver/src - CFLAGS="$CFLAGS -fno-strict-aliasing" - - # This can be linux-alsa linux-jack linux-oss osx win32 - make linux-alsa -} - -package() { - cd $srcdir/$pkgname-$pkgver/src - install -D -m 755 chuck $pkgdir/usr/bin/chuck -} diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD deleted file mode 100644 index 78d31942f..000000000 --- a/multilib/gcc-multilib/PKGBUILD +++ /dev/null @@ -1,305 +0,0 @@ -# $Id: PKGBUILD 47043 2011-05-14 11:08:03Z 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.0 -pkgrel=5 -_snapshot=4.6-20110513 -_libstdcppmanver=20110201 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection for multilib" -arch=('x86_64' 'mips64el') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'dejagnu' - 'lib32-glibc>=2.12.1') -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_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=('2be769db16ac02f30fb62423b4c50145' - 'a310d230945f4b3093dd3ca72839c649' - '361a10c5a5545c80fd271b18036dd00c' - 'f7db2f6ed34398361de62cb6b8eb53d2' - '9b69c1d8874e8496c1965ee3e32eaa6d' - '248e53b461078bf1c89528fb8e4ba051' - 'e15a01b0d02ff12e975e4c2649e71e55' - '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.11.1-2' "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.12.1' "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=('binutils-multilib>=2.21' 'libmpc>=0.8.1-2' 'cloog' 'ppl' - "gcc-libs-multilib=$pkgver-$pkgrel") - 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/gcc-multilib/gcc-ada.install b/multilib/gcc-multilib/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/multilib/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/gcc-multilib/gcc-fortran.install b/multilib/gcc-multilib/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/multilib/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/gcc-multilib/gcc-hash-style-both.patch b/multilib/gcc-multilib/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/multilib/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/gcc-multilib/gcc-libs.install b/multilib/gcc-multilib/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/multilib/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/gcc-multilib/gcc.install b/multilib/gcc-multilib/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/multilib/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/gcc-multilib/gcc_pure64.patch b/multilib/gcc-multilib/gcc_pure64.patch deleted file mode 100644 index 8c6b08171..000000000 --- a/multilib/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/lib32-acl/PKGBUILD b/multilib/lib32-acl/PKGBUILD deleted file mode 100644 index b360eaaff..000000000 --- a/multilib/lib32-acl/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=lib32-acl -pkgver=2.2.49 -pkgrel=1 -pkgdesc="Access control list libraries (32-bit)" -arch=('x86_64' 'mips64el') -url="http://savannah.nongnu.org/projects/acl" -license=('LGPL') -depends=('lib32-attr' 'acl') -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://mirrors.zerg.biz/nongnu/acl/acl-${pkgver}.src.tar.gz) -sha256sums=('b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5') - -build() { - cd "${srcdir}/acl-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/acl-${pkgver}" - - make DIST_ROOT="${pkgdir}" install install-lib install-dev - - rm -rf ${pkgdir}/usr/{bin,include,share} -} diff --git a/multilib/lib32-alsa-lib/PKGBUILD b/multilib/lib32-alsa-lib/PKGBUILD deleted file mode 100644 index e510cabd9..000000000 --- a/multilib/lib32-alsa-lib/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 40235 2011-02-22 08:22:12Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=alsa-lib -pkgname=lib32-${_pkgbasename} -pkgver=1.0.24.1 -pkgrel=1 -pkgdesc="An alternative implementation of Linux sound support (32 bit)" -arch=('x86_64' 'mips64el') -url="http://www.alsa-project.org" -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib') -license=('GPL') -options=(!libtool) -source=(ftp://ftp.alsa-project.org/pub/lib/${_pkgbasename}-$pkgver.tar.bz2) - -build() { - cd $srcdir/${_pkgbasename}-$pkgver - export CC='gcc -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - ./configure --prefix=/usr --libdir=/usr/lib32 --disable-python - make -} - -package() { - cd $srcdir/${_pkgbasename}-$pkgver - make DESTDIR=$pkgdir install - - # Clean up lib32 package - rm -rf "${pkgdir}"/usr/{bin,include,share} -} -md5sums=('7cc05f25e1d5b65da8fb3fdcd540f226') diff --git a/multilib/lib32-alsa-oss/PKGBUILD b/multilib/lib32-alsa-oss/PKGBUILD deleted file mode 100644 index 0a0c56b56..000000000 --- a/multilib/lib32-alsa-oss/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 26502 2010-09-15 22:26:51Z bluewind $ -# Maintainer: judd <jvinet@zeroflux.org> - -_pkgbasename=alsa-oss -pkgname=lib32-${_pkgbasename} -pkgver=1.0.17 -pkgrel=2 -pkgdesc="OSS compatibility library (32 bit)" -arch=(x86_64 'mips64el') -license=('GPL') -url="http://www.alsa-project.org" -options=(!libtool) -depends=('lib32-glibc' 'lib32-alsa-lib' 'alsa-oss') -source=(ftp://ftp.alsa-project.org/pub/oss-lib/${_pkgbasename}-$pkgver.tar.bz2) -md5sums=('1b1850c2fc91476a73d50f537cbd402f') - -build() { - cd $srcdir/${_pkgbasename}-$pkgver - - export CC='gcc -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/${_pkgbasename}-$pkgver - - make DESTDIR="$pkgdir" install - - # Clean up lib32 package - rm -rf "${pkgdir}"/usr/{bin,include,share} -} diff --git a/multilib/lib32-alsa-plugins/PKGBUILD b/multilib/lib32-alsa-plugins/PKGBUILD deleted file mode 100644 index 23fcf8298..000000000 --- a/multilib/lib32-alsa-plugins/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 40238 2011-02-22 08:27:39Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=alsa-plugins -pkgname=lib32-$_pkgbasename -pkgver=1.0.24 -pkgrel=1 -pkgdesc="Extra alsa plugins (32-bit)" -arch=(x86_64 'mips64el') -url="http://www.alsa-project.org" -license=(GPL) -depends=(lib32-alsa-lib $_pkgbasename) -makedepends=(lib32-{libpulse,jack,speex,libsamplerate} gcc-multilib) -optdepends=('lib32-libpulse: PulseAudio plugin' - 'lib32-jack: Jack plugin' - 'lib32-libsamplerate: libsamplerate resampling plugin' - 'lib32-speex: libspeexdsp resampling plugin') -options=('!libtool') -source=("ftp://ftp.alsa-project.org/pub/plugins/$_pkgbasename-$pkgver.tar.bz2") -md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16') - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 --disable-avcodec - make -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/multilib/lib32-atk/PKGBUILD b/multilib/lib32-atk/PKGBUILD deleted file mode 100644 index 48bc502bc..000000000 --- a/multilib/lib32-atk/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 27946 2010-09-30 16:10:31Z heftig $ -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Maintainer: Mikko Seppälä <t-r-a-y@mbnet.fi> -_pkgbasename=atk -pkgname=lib32-$_pkgbasename -pkgver=1.32.0 -pkgrel=1 -pkgdesc="A library providing a set of interfaces for accessibility (32-bit)" -arch=('x86_64' 'mips64el') -license=('LGPL') -depends=('lib32-glib2>=2.25.17' $_pkgbasename) -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.32/${_pkgbasename}-${pkgver}.tar.bz2) -url='http://www.gtk.org/' -sha256sums=('e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --disable-introspection - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} -} diff --git a/multilib/lib32-attr/PKGBUILD b/multilib/lib32-attr/PKGBUILD deleted file mode 100644 index be3b106e0..000000000 --- a/multilib/lib32-attr/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 26511 2010-09-15 22:28:05Z bluewind $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -_pkgbasename=attr -pkgname=lib32-$_pkgbasename -pkgver=2.4.44 -pkgrel=4 -pkgdesc="Extended attribute support library for ACL support (32-bit)" -arch=(x86_64 'mips64el') -url="http://oss.sgi.com/projects/xfs/" -license=('LGPL') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib' 'gettext') -options=('!libtool') -source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz) -sha256sums=('e01fa00686072a02dddf994e6217be950f51c1dc0852ad2e210c48b6e8de793a') - -build() { - cd $srcdir/attr-$pkgver - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - autoconf - ./configure --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32 - make - - # Doesn't like building as non-root - - make prefix=${pkgdir}/usr \ - PKG_LIB_DIR=$pkgdir/usr/lib32 \ - PKG_DEVLIB_DIR=$pkgdir/usr/lib32 \ - install-lib install-dev - - rm -rf "${pkgdir}"/usr/{bin,include,share} -} diff --git a/multilib/lib32-audiofile/PKGBUILD b/multilib/lib32-audiofile/PKGBUILD deleted file mode 100644 index cced53737..000000000 --- a/multilib/lib32-audiofile/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 26514 2010-09-15 22:28:30Z bluewind $ -# Maintainer: dorphell <dorphell@archlinux.org> -_pkgbasename=audiofile -pkgname=lib32-$_pkgbasename -pkgver=0.2.7 -pkgrel=3 -pkgdesc="Silicon Graphics Audio File Library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.68k.org/~michael/audiofile/" -license=('LGPL') -depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/0.2/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('61efd278627415b5468426fc9e52aef32ea0fdac12b56bcdd72734c2ece5945e') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-cairo/PKGBUILD b/multilib/lib32-cairo/PKGBUILD deleted file mode 100644 index 4fb36fe83..000000000 --- a/multilib/lib32-cairo/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 43547 2011-03-27 14:25:07Z bluewind $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=cairo -pkgname=lib32-$_pkgbasename -pkgver=1.10.2 -pkgrel=2 -pkgdesc="Cairo vector graphics library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://cairographics.org/" -license=('LGPL' 'MPL') -depends=('lib32-libpng' 'lib32-libxrender' 'lib32-fontconfig' - 'lib32-pixman' 'lib32-glib2' ${_pkgbasename}) -makedepends=('gcc-multilib') -source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.gz - cairo-1.10.0-buggy_gradients.patch) -sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e' - '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-tee - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-cairo/cairo-1.10.0-buggy_gradients.patch b/multilib/lib32-cairo/cairo-1.10.0-buggy_gradients.patch deleted file mode 100644 index 368e356d3..000000000 --- a/multilib/lib32-cairo/cairo-1.10.0-buggy_gradients.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/cairo-xlib-display.c.ubuntu 2010-08-04 11:57:49.000000000 +0200
-+++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200
-@@ -353,11 +353,7 @@
- /* Prior to Render 0.10, there is no protocol support for gradients and
- * we call function stubs instead, which would silently consume the drawing.
- */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
- display->buggy_gradients = TRUE;
--#else
-- display->buggy_gradients = FALSE;
--#endif
- display->buggy_pad_reflect = FALSE;
- display->buggy_repeat = FALSE;
diff --git a/multilib/lib32-curl/PKGBUILD b/multilib/lib32-curl/PKGBUILD deleted file mode 100755 index 454a5a471..000000000 --- a/multilib/lib32-curl/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 36008 2010-12-25 14:36:29Z ibiru $ -# Maintainer: Florian Pritz <flo@xssn.at> - -_pkgbasename=curl -pkgname=lib32-$_pkgbasename -pkgver=7.21.3 -pkgrel=1 -pkgdesc="An URL retrieval utility and library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://curl.haxx.se" -license=('MIT') -depends=('lib32-zlib' 'lib32-openssl' 'bash' 'ca-certificates' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=("http://curl.haxx.se/download/${_pkgbasename}-${pkgver}.tar.bz2") -md5sums=('5b57fee22090b5c43a6886fdd35af2ce') - - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - - ./configure \ - --with-random=/dev/urandom \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-dependency-tracking \ - --enable-ipv6 \ - --disable-ldaps \ - --disable-ldap \ - --enable-manual \ - --enable-versioned-symbols \ - --with-ca-path=/etc/ssl/certs \ - --without-libidn \ - --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{share,bin} - #we need curlbuild.h - find ${pkgdir}/usr/include/curl -type f -not -name curlbuild.h -delete - #now save it as curlbuild-32.h - mv ${pkgdir}/usr/include/curl/curlbuild.h ${pkgdir}/usr/include/curl/curlbuild-32.h - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-db/PKGBUILD b/multilib/lib32-db/PKGBUILD deleted file mode 100644 index cd6086061..000000000 --- a/multilib/lib32-db/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 35318 2010-12-18 21:29:14Z heftig $ -# Maintainer: Biru Ionut <biru.ionut at gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -_pkgbasename=db -pkgname=lib32-$_pkgbasename -pkgver=5.1.19 -pkgrel=1 -pkgdesc="The Berkeley DB embedded database system (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" -license=('custom') -depends=('lib32-gcc-libs' $_pkgbasename) -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://download-uk.oracle.com/berkeley-db/db-${pkgver}.tar.gz) -md5sums=('76fcbfeebfcd09ba0b4d96bfdf8d884d') - -build() { - cd ${srcdir}/$_pkgbasename-${pkgver}/build_unix - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ../dist/configure --prefix=/usr --enable-compat185 \ - --enable-shared --enable-static --enable-cxx --enable-dbm \ - --libdir=/usr/lib32 - make LIBSO_LIBS=-lpthread -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver}/build_unix - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{docs,include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-dbus-core/PKGBUILD b/multilib/lib32-dbus-core/PKGBUILD deleted file mode 100644 index cff3d6d90..000000000 --- a/multilib/lib32-dbus-core/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 26527 2010-09-15 22:30:16Z bluewind $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> - -pkgname=lib32-dbus-core -_pkgbasename=dbus-core -pkgver=1.4.0 -pkgrel=2 -pkgdesc="Freedesktop.org message bus system (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.freedesktop.org/Software/dbus" -license=('GPL' 'custom') -depends=('lib32-glibc' 'lib32-expat' 'dbus-core') -makedepends=('gcc-multilib') -options=(!libtool) -source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz) -md5sums=('f59618b18d2fb2bd1fce9e1c5a2a3282') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/dbus-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 \ - --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 --without-x - make -} -package() { - cd "${srcdir}/dbus-${pkgver}" - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{bin,include,lib,share} - rm -rf "${pkgdir}"/{etc,var} - - mkdir -p "${pkgdir}/usr/share/licenses" - ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/multilib/lib32-e2fsprogs/PKGBUILD b/multilib/lib32-e2fsprogs/PKGBUILD deleted file mode 100644 index 230a5e67d..000000000 --- a/multilib/lib32-e2fsprogs/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: mightyjaym <jm.ambrosino@free.fr> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> - -_pkgbasename=e2fsprogs -pkgname=lib32-e2fsprogs -pkgver=1.41.14 -pkgrel=2 -pkgdesc="Ext2 filesystem libraries (32-bit)" -arch=(x86_64 'mips64el') -license=('GPL' 'LGPL' 'MIT') -url="http://e2fsprogs.sourceforge.net" -depends=('lib32-util-linux' $_pkgbasename) -makedepends=('bc' 'gcc-multilib') -source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz") -sha1sums=('24f9364fa3d4c0d7d00cb627b819d0e51055d6c5') - - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 --with-root-prefix="" --enable-elf-shlibs \ - --disable-{debugfs,imager,resizer,fsck,uuidd,libuuid,libblkid} - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install-libs - - rm -rf "${pkgdir}"/usr/{bin,include,share} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-expat/CVE-2009-3560.patch b/multilib/lib32-expat/CVE-2009-3560.patch deleted file mode 100644 index 5fe9c36c8..000000000 --- a/multilib/lib32-expat/CVE-2009-3560.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c ---- trunk~/lib/xmlparse.c 2007-05-08 04:25:35.000000000 +0200 -+++ trunk/lib/xmlparse.c 2009-12-29 21:57:22.141732904 +0100 -@@ -3703,6 +3703,9 @@ - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ diff --git a/multilib/lib32-expat/CVE-2009-3720.patch b/multilib/lib32-expat/CVE-2009-3720.patch deleted file mode 100644 index 65d16431f..000000000 --- a/multilib/lib32-expat/CVE-2009-3720.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c ---- trunk~/lib/xmltok_impl.c 2006-11-26 18:34:46.000000000 +0100 -+++ trunk/lib/xmltok_impl.c 2009-10-22 21:42:41.000000000 +0200 -@@ -1744,7 +1744,7 @@ - const char *end, - POSITION *pos) - { -- while (ptr != end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: \ diff --git a/multilib/lib32-expat/PKGBUILD b/multilib/lib32-expat/PKGBUILD deleted file mode 100644 index 68a4aebb8..000000000 --- a/multilib/lib32-expat/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 26535 2010-09-15 22:31:07Z bluewind $ - -_pkgbasename=expat -pkgname=lib32-${_pkgbasename} -pkgver=2.0.1 -pkgrel=7 -pkgdesc="An XML Parser library written in C (32 bit)" -arch=('x86_64' 'mips64el') -url="http://expat.sourceforge.net/" -license=('custom') -makedepends=('gcc-multilib') -depends=('lib32-glibc' "${_pkgbasename}") -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/expat/${_pkgbasename}-${pkgver}.tar.gz - CVE-2009-3560.patch - CVE-2009-3720.patch) -md5sums=('ee8b492592568805593f81f8cdf2a04c' - '50603cac0f03aabc7087415251f592be' - 'f3eeb796f28945899216b815e5901996') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i $srcdir/CVE-2009-3560.patch - patch -Np1 -i $srcdir/CVE-2009-3720.patch - export CC='gcc -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - ./configure --prefix=/usr --libdir=/usr/lib32 --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/" - ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}" - - # Clean up lib32 package - rm -rf "${pkgdir}"/usr/{bin,include,share/man} -} diff --git a/multilib/lib32-flac/PKGBUILD b/multilib/lib32-flac/PKGBUILD deleted file mode 100644 index 019f80e99..000000000 --- a/multilib/lib32-flac/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 26539 2010-09-15 22:31:33Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=flac -pkgname=lib32-$_pkgbasename -pkgver=1.2.1 -pkgrel=7 -pkgdesc="Free Lossless Audio Codec (32-bit)" -arch=('x86_64' 'mips64el') -url="http://flac.sourceforge.net/" -license=('custom:Xiph' 'LGPL' 'GPL' 'FDL') -depends=('lib32-libogg' 'lib32-gcc-libs' $_pkgbasename) -makedepends=('nasm' gcc-multilib) -options=('!libtool' '!makeflags') -source=(http://downloads.sf.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz - flac-1.2.1-gcc-4.3-includes.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' - 'b9d245422bbc547b18a72897366bea77') -sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' - '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - patch -Np1 -i ${srcdir}/flac-1.2.1-gcc-4.3-includes.patch - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ - --disable-rpath --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-flac/flac-1.2.1-gcc-4.3-includes.patch b/multilib/lib32-flac/flac-1.2.1-gcc-4.3-includes.patch deleted file mode 100644 index 52fec8be5..000000000 --- a/multilib/lib32-flac/flac-1.2.1-gcc-4.3-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp ---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600 -@@ -30,6 +30,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <cstring> - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/multilib/lib32-fontconfig/30-urw-aliases.patch b/multilib/lib32-fontconfig/30-urw-aliases.patch deleted file mode 100644 index 8077b869e..000000000 --- a/multilib/lib32-fontconfig/30-urw-aliases.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/conf.d/30-urw-aliases.conf 2009-08-06 16:23:57.000000000 +0100 -+++ b/conf.d/30-urw-aliases.conf 2009-08-06 16:25:07.000000000 +0100 -@@ -29,6 +29,10 @@ - <family>Zapf Dingbats</family> - <accept><family>Dingbats</family></accept> - </alias> -+ <alias binding="same"> -+ <family>ZapfDingbats</family> -+ <accept><family>Dingbats</family></accept> -+ </alias> - <match target="pattern"> - <test name="family"> - <string>Symbol</string> diff --git a/multilib/lib32-fontconfig/PKGBUILD b/multilib/lib32-fontconfig/PKGBUILD deleted file mode 100644 index aa25498d4..000000000 --- a/multilib/lib32-fontconfig/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 26542 2010-09-15 22:31:59Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -_pkgbasename=fontconfig -pkgname=lib32-$_pkgbasename -pkgver=2.8.0 -pkgrel=3 -pkgdesc="A library for configuring and customizing font access (32-bit)" -arch=(x86_64 'mips64el') -url="http://www.fontconfig.org/release/" -license=('custom') -depends=('lib32-expat>=2.0.1' 'lib32-freetype2>=2.3.11' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.gz - 30-urw-aliases.patch) -md5sums=('77e15a92006ddc2adbb06f840d591c0e' - '51bc6cb633b50f3c28793361738aac5b') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i "${srcdir}/30-urw-aliases.patch" - # enable Position Independent Code for prelinking - export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir"/{etc,var} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-freetype2/PKGBUILD b/multilib/lib32-freetype2/PKGBUILD deleted file mode 100644 index 81c908f0a..000000000 --- a/multilib/lib32-freetype2/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 35255 2010-12-18 00:33:57Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=freetype2 -pkgname=lib32-$_pkgbasename -pkgver=2.4.4 -pkgrel=1 -pkgdesc="TrueType font rendering library (32-bit)" -arch=(x86_64 'mips64el') -license=('GPL') -url="http://freetype.sourceforge.net" -depends=('lib32-zlib' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch) -md5sums=('b3e2b6e2f1c3e0dffa1fd2a0f848b671' - '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" - patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/freetype-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-freetype2/freetype-2.2.1-enable-valid.patch b/multilib/lib32-freetype2/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index c78b6b70f..000000000 --- a/multilib/lib32-freetype2/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/multilib/lib32-freetype2/freetype-2.3.0-enable-spr.patch b/multilib/lib32-freetype2/freetype-2.3.0-enable-spr.patch deleted file mode 100644 index 8432e28a4..000000000 --- a/multilib/lib32-freetype2/freetype-2.3.0-enable-spr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /*************************************************************************/ diff --git a/multilib/lib32-gdk-pixbuf2/PKGBUILD b/multilib/lib32-gdk-pixbuf2/PKGBUILD deleted file mode 100644 index d78f9ed83..000000000 --- a/multilib/lib32-gdk-pixbuf2/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 91063 2010-09-21 19:21:24Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -_pkgbasename=gdk-pixbuf2 -pkgname=lib32-$_pkgbasename -pkgver=2.23.3 -pkgrel=1 -pkgdesc="An image loading library for gtk2 (32-bit)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gtk.org/" -license=('GPL2') -depends=('lib32-glib2>=2.25.15' - lib32-lib{'png>=1.4.3','tiff>=3.9.4','jpeg>=8.0.2',x11} - $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool' '!docs') -install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.bz2) -sha256sums=('9faba780151c02e13cb2029d512c975e9c41b98cd72de6d2cc50e4af10a5e76a') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/gdk-pixbuf-${pkgver}" - - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --without-libjasper \ - --with-included-loaders=png - make -} - -package() { - cd "${srcdir}/gdk-pixbuf-${pkgver}" - - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/etc - rm -rf "${pkgdir}"/usr/{include,share} - - cd "${pkgdir}"/usr/bin - mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32 - rm gdk-pixbuf-csource -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib/lib32-gdk-pixbuf2/gdk-pixbuf2.install deleted file mode 100644 index 92d58ef04..000000000 --- a/multilib/lib32-gdk-pixbuf2/gdk-pixbuf2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gdk-pixbuf-query-loaders-32 --update-cache -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache -} diff --git a/multilib/lib32-giflib/PKGBUILD b/multilib/lib32-giflib/PKGBUILD deleted file mode 100644 index 46804feec..000000000 --- a/multilib/lib32-giflib/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> -# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> -# Contributor: mightyjaym <jm.ambrosino@free.fr> - -_pkgbasename=giflib -pkgname=lib32-$_pkgbasename -pkgver=4.1.6 -pkgrel=5 -pkgdesc="A library for reading and writing gif images (32-bit)" -url="http://sourceforge.net/projects/giflib/" -arch=('x86_64' 'mips64el') -license=('MIT') -depends=('lib32-libx11' 'lib32-libsm' $_pkgbasename) -makedepends=(gcc-multilib) -provides=("lib32-libungif=${pkgver}") -conflicts=('lib32-libungif') -replaces=('lib32-libungif') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/giflib/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('7125644155ae6ad33dbc9fc15a14735f') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - make DESTDIR=${pkgdir} install - - # libungif compatibility - instructions taken from Redhat specfile - MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'` - gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} - install -m755 libungif.so.${pkgver} ${pkgdir}/usr/lib32/ - ln -sf libungif.so.${pkgver} ${pkgdir}/usr/lib32/libungif.so.4 - ln -sf libungif.so.4 ${pkgdir}/usr/lib32/libungif.so - - rm -rf "${pkgdir}"/usr/{include,share,bin} - install -m755 -d ${pkgdir}/usr/share/licenses - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-glew/PKGBUILD b/multilib/lib32-glew/PKGBUILD deleted file mode 100644 index 50533a011..000000000 --- a/multilib/lib32-glew/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 39623 2011-02-13 10:47:57Z bluewind $ -# Maintainer: Florian Pritz <flo@xinu.at> - -_pkgbasename=glew -pkgname=lib32-$_pkgbasename -pkgver=1.5.8 -pkgrel=2 -pkgdesc="A cross-platform C/C++ extension loading library (32 bit)" -arch=('x86_64' 'mips64el') -url="http://glew.sourceforge.net" -license=('BSD' 'MIT' 'GPL') -depends=('lib32-libxmu' 'lib32-libxi' 'lib32-mesa' "$_pkgbasename>=$pkgver") -makedepends=('gcc-multilib') -source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz) -md5sums=('342c8dc64fb9daa6af245b132e086bdd') -sha1sums=('450946935faa20ac4950cb42ff025be2c1f7c22e') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - sed -i 's|CC = cc|CC = gcc -m32|' config/Makefile.linux - sed -i 's|LD = cc|LD = gcc -m32|' config/Makefile.linux - sed -i 's|lib64|lib32|' config/Makefile.linux - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make GLEW_DEST="${pkgdir}/usr" install - chmod 0755 "${pkgdir}/usr/lib32/libGLEW.so.${pkgver}" - - rm -rf "${pkgdir}"/usr/{include,bin,lib32/libGLEW.a} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-glib/PKGBUILD b/multilib/lib32-glib/PKGBUILD deleted file mode 100644 index 5554ca738..000000000 --- a/multilib/lib32-glib/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 29612 2010-10-17 13:00:45Z pschmitz $ - -_pkgbasename=glib -pkgname=lib32-$_pkgbasename -pkgver=1.2.10 -pkgrel=11 -pkgdesc="Common C routines used by Gtk+ and other libs (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.gtk.org/" -license=('LGPL') -depends=('lib32-glibc' "${_pkgbasename}") -makedepends=('gcc-multilib') -options=('!libtool' '!docs') -source=("ftp://ftp.gtk.org/pub/gtk/v1.2/${_pkgbasename}-${pkgver}.tar.gz" - 'gcc340.patch' - 'aclocal-fixes.patch') -md5sums=('6fe30dad87c77b91b632def29dd69ef9' - '877b3330e822a4be69a0f8a8c268cfd7' - 'e52c4b88427b9785bb8049dbdc9ff6fb') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - patch -Np1 -i ../gcc340.patch - patch -Np0 -i ../aclocal-fixes.patch - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --libdir=/usr/lib32 \ - --infodir=/usr/share/info \ - --host=x86_64-unknown-linux-gnu \ - --target=x86_64-unknown-linux-gnu - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/{share,include,bin,lib32/glib} -} diff --git a/multilib/lib32-glib/aclocal-fixes.patch b/multilib/lib32-glib/aclocal-fixes.patch deleted file mode 100644 index b064074aa..000000000 --- a/multilib/lib32-glib/aclocal-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glib.m4.orig 2006-03-05 13:13:24.000000000 +0000 -+++ glib.m4 2006-03-05 13:13:35.000000000 +0000 -@@ -5,7 +5,7 @@ - dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or - dnl gthread is specified in MODULES, pass to glib-config - dnl --AC_DEFUN(AM_PATH_GLIB, -+AC_DEFUN([AM_PATH_GLIB], - [dnl - dnl Get the cflags and libraries from the glib-config script - dnl diff --git a/multilib/lib32-glib/gcc340.patch b/multilib/lib32-glib/gcc340.patch deleted file mode 100644 index 941111ae7..000000000 --- a/multilib/lib32-glib/gcc340.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h ---- glib-1.2.10.orig/glib.h 2001-02-27 04:44:38.000000000 +0100 -+++ glib-1.2.10/glib.h 2004-05-27 15:50:32.436527848 +0200 -@@ -271,8 +271,10 @@ - - /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with - * macros, so we can refer to them as strings unconditionally. -+ * -+ * Unfortunately these are _not_ treated as strings anymore in GCC3.4. - */ --#ifdef __GNUC__ -+#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4) - #define G_GNUC_FUNCTION __FUNCTION__ - #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ - #else /* !__GNUC__ */ diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD deleted file mode 100644 index 9208fc109..000000000 --- a/multilib/lib32-glib2/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 45657 2011-04-26 16:44:11Z svenstaro $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> -_pkgbasename=glib2 -pkgname=lib32-$_pkgbasename -pkgver=2.28.6 -pkgrel=1 -pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" -url="http://www.gtk.org/" -arch=('x86_64' 'mips64el') -license=('LGPL') -depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' $_pkgbasename) -makedepends=('gcc-multilib') -options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2) -sha256sums=('557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/glib-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \ - --enable-static --enable-shared --with-pcre=system --disable-fam - make -} - -package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/{etc,usr/{share,include}} - - cd "${pkgdir}"/usr/bin - mv gio-querymodules gio-querymodules-32 - rm -f gdbus glib* gobject-query gsettings gtester* -} diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD deleted file mode 100644 index bd371a1b0..000000000 --- a/multilib/lib32-glibc/PKGBUILD +++ /dev/null @@ -1,129 +0,0 @@ -# $Id: PKGBUILD 43540 2011-03-27 14:07:50Z 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.13 -pkgrel=5 -_glibcdate=20110117 -pkgdesc="GNU C Library for multilib" -arch=('x86_64' 'mips64el') -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-prelink.patch - glibc-2.13-futex.patch - lib32-glibc.conf) -md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '24dfab6fd244f3773523412588ecc52c' - '7d0154b7e17ea218c9fa953599d24cc4' - '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=12489 - # http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - patch -Np1 -i ${srcdir}/glibc-2.13-futex.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 - - # 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,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/lib32-glibc/glibc-2.10-bz4781.patch b/multilib/lib32-glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/multilib/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/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib/lib32-glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/multilib/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/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e84754279..000000000 --- a/multilib/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/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/multilib/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/lib32-glibc/glibc-2.13-futex.patch b/multilib/lib32-glibc/glibc-2.13-futex.patch deleted file mode 100644 index 9b9c3ac45..000000000 --- a/multilib/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/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-glibc/glibc-__i686.patch b/multilib/lib32-glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/multilib/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/lib32-glibc/lib32-glibc.conf b/multilib/lib32-glibc/lib32-glibc.conf deleted file mode 100644 index 9b08c3f43..000000000 --- a/multilib/lib32-glibc/lib32-glibc.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib32 diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD deleted file mode 100644 index 97b8ad783..000000000 --- a/multilib/lib32-gnutls/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 45059 2011-04-15 15:10:37Z ibiru $ -# Maintainer: Biru Ionut <ionut@archlinux.ro -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> -_pkgbasename=gnutls -pkgname=lib32-$_pkgbasename -pkgver=2.12.2 -pkgrel=1 -pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)" -arch=('x86_64' 'mips64el') -license=('GPL3' 'LGPL') -url="http://www.gnu.org/software/gnutls/" -options=('!libtool') -# uses built-in libtasn1 for the moment -depends=(lib32-{gcc-libs,readline,libgcrypt,zlib}) -makedepends=('gcc-multilib') -source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('ca6903d99b2aca2a6a326bc8df805b61') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --with-zlib \ - --with-libgcrypt \ - --disable-static\ - --disable-guile - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{bin,include,share} -} diff --git a/multilib/lib32-gtk/PKGBUILD b/multilib/lib32-gtk/PKGBUILD deleted file mode 100644 index 15420cd06..000000000 --- a/multilib/lib32-gtk/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 29612 2010-10-17 13:00:45Z pschmitz $ - -_pkgbasename=gtk -pkgname=lib32-$_pkgbasename -pkgver=1.2.10 -pkgrel=11 -pkgdesc="The GTK+ toolkit (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.gtk.org/" -license=('LGPL') -depends=('lib32-libxi' 'lib32-glib' "${_pkgbasename}") -makedepends=('gcc-multilib' 'lib32-libxt') -options=('!libtool') -source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz" - 'aclocal-fixes.patch') -md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' - 'c59d4906602d99a7468f7334b6fc3b4e') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/gtk+-${pkgver} - patch -p0 -i ${srcdir}/aclocal-fixes.patch - - ./configure --prefix=/usr \ - --libdir=/usr/lib32 \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --host=x86_64-unknown-linux-gnu \ - --target=x86_64-unknown-linux-gnu \ - --with-xinput=xfree - make -} - -package() { - cd ${srcdir}/gtk+-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}/"{usr/{share,include,bin},etc} -} diff --git a/multilib/lib32-gtk/aclocal-fixes.patch b/multilib/lib32-gtk/aclocal-fixes.patch deleted file mode 100644 index dd2ffbd44..000000000 --- a/multilib/lib32-gtk/aclocal-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk.m4.orig 2006-03-05 13:18:09.000000000 +0000 -+++ gtk.m4 2006-03-05 13:18:20.000000000 +0000 -@@ -4,7 +4,7 @@ - dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) - dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS - dnl --AC_DEFUN(AM_PATH_GTK, -+AC_DEFUN([AM_PATH_GTK], - [dnl - dnl Get the cflags and libraries from the gtk-config script - dnl diff --git a/multilib/lib32-gtk2/PKGBUILD b/multilib/lib32-gtk2/PKGBUILD deleted file mode 100644 index b1b41044b..000000000 --- a/multilib/lib32-gtk2/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 45659 2011-04-26 16:47:39Z svenstaro $ -# Maintainer: Ionut Biru <ibiru@archlinux.org -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> - -_pkgbasename=gtk2 -pkgname=lib32-$_pkgbasename -pkgver=2.24.4 -pkgrel=1 -pkgdesc="The GTK+ Toolkit (v2) (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.gtk.org/" -install=gtk2.install -depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','heimdal>=1.3.2','gnutls>=2.8.6','gdk-pixbuf2>=2.22.1'} - lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage} - $_pkgbasename) -makedepends=('pkgconfig' 'gcc-multilib') -options=('!libtool' '!docs') -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2 - xid-collision-debug.patch - gtk-modules-32.patch) -sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - patch -p1 -i ${srcdir}/gtk-modules-32.patch - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib32 \ - --with-xinput=yes - make -} - -package() { - cd "${srcdir}/gtk+-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/etc - rm -rf "${pkgdir}"/usr/{include,share} - - cd "${pkgdir}"/usr/bin - mv gtk-query-immodules-2.0 gtk-query-immodules-2.0-32 - rm -f gtk-builder-convert gtk-demo gtk-update-icon-cache -} diff --git a/multilib/lib32-gtk2/gtk-modules-32.patch b/multilib/lib32-gtk2/gtk-modules-32.patch deleted file mode 100644 index a2530c3bf..000000000 --- a/multilib/lib32-gtk2/gtk-modules-32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c ---- gtk+-2.20.1/gtk/gtkrc.c 2010-05-03 01:28:21.000000000 +0200 -+++ gtk+-2.20.1-32/gtk/gtkrc.c 2010-08-26 07:22:42.316920033 +0200 -@@ -450,7 +450,7 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL); - } - - return result; diff --git a/multilib/lib32-gtk2/gtk2.install b/multilib/lib32-gtk2/gtk2.install deleted file mode 100644 index 49f86f550..000000000 --- a/multilib/lib32-gtk2/gtk2.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32 -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null - rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null -} diff --git a/multilib/lib32-gtk2/xid-collision-debug.patch b/multilib/lib32-gtk2/xid-collision-debug.patch deleted file mode 100644 index d61238c3b..000000000 --- a/multilib/lib32-gtk2/xid-collision-debug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 -+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 -@@ -56,10 +56,10 @@ - if (!display_x11->xid_ht) - display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, - (GEqualFunc) gdk_xid_equal); -- -+/* - if (g_hash_table_lookup (display_x11->xid_ht, xid)) - g_warning ("XID collision, trouble ahead"); -- -+*/ - g_hash_table_insert (display_x11->xid_ht, xid, data); - } - 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 a5abe94ee..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' 'mips64el') -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/multilib/lib32-jack/PKGBUILD b/multilib/lib32-jack/PKGBUILD deleted file mode 100644 index 8be7cab8a..000000000 --- a/multilib/lib32-jack/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 41464 2011-03-06 21:01:51Z schiv $ -# Maintainer: tobias <tobias@archlinux.net> -# Maintainer: Ray Rashif <schivmeister@gmail.com> -# Contributor: Robert Emil Berge <robert@rebi.no> - -_pkgbasename=jack -pkgname=lib32-$_pkgbasename -_longname=jack-audio-connection-kit -pkgver=0.120.1 -pkgrel=1 -pkgdesc="A low-latency audio server (32-bit)" -arch=('x86_64' 'mips64el') -license=('GPL' 'LGPL') -depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib) -url="http://jackaudio.org/" -options=('!libtool') -source=(http://jackaudio.org/downloads/${_longname}-${pkgver}.tar.gz) -md5sums=('e45bab906be64e4e2752cbd855a8efd5') - -build() { - cd ${srcdir}/${_longname}-${pkgver} - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -C libjack -} - -package() { - cd ${srcdir}/${_longname}-${pkgver} - - make DESTDIR=${pkgdir} install-pkgconfigDATA - make -C libjack DESTDIR=${pkgdir} install -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-lcms/PKGBUILD b/multilib/lib32-lcms/PKGBUILD deleted file mode 100644 index eebb7bfe7..000000000 --- a/multilib/lib32-lcms/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 26566 2010-09-15 22:35:39Z bluewind $ -# Maintainer: Tobias Kieslich <neri@archlinux.org> -# Contributor: Ben <contrasutra@myrealbox.com> - -_pkgbasename=lcms -pkgname=lib32-$_pkgbasename -pkgver=1.19 -pkgrel=3 -pkgdesc="Lightweight color management development library/engine (32-bit)" -arch=(x86_64 'mips64el') -license=('custom') -depends=('lib32-libtiff>=3.9.4' $_pkgbasename) -makedepends=(gcc-multilib) -url="http://www.littlecms.com" -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('8af94611baf20d9646c7c2c285859818') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libasyncns/PKGBUILD b/multilib/lib32-libasyncns/PKGBUILD deleted file mode 100644 index 90aa38686..000000000 --- a/multilib/lib32-libasyncns/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 26569 2010-09-15 22:36:05Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: Eric Belanger <belanger@astro.umontreal.ca> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -_pkgbasename=libasyncns -pkgname=lib32-$_pkgbasename -pkgver=0.8 -pkgrel=5 -pkgdesc="A C library for Linux/Unix for executing name service queries asynchronously (32-bit)" -arch=(x86_64 'mips64el') -url="http://0pointer.de/lennart/projects/libasyncns" -license=('LGPL') -options=('!libtool') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib') -source=(http://0pointer.de/lennart/projects/libasyncns/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('1f553d6ce1ad255bc83b3d8e9384f515') - -build() { - cd ${srcdir}/libasyncns-${pkgver} - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - # Fix libdir - sed -i '/^libdir=/s:/lib:/lib32:' *.pc.in - - ./configure --prefix=/usr --disable-lynx --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/libasyncns-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/{include,share} -} diff --git a/multilib/lib32-libcanberra/PKGBUILD b/multilib/lib32-libcanberra/PKGBUILD deleted file mode 100644 index f4dc8225e..000000000 --- a/multilib/lib32-libcanberra/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 46313 2011-05-05 01:10:02Z heftig $ -# Maintainer: Florian Pritz <flo@xssn.at> -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libcanberra -pkgbase=lib32-$_pkgbasename -pkgname=(lib32-libcanberra lib32-libcanberra-pulse) -pkgver=0.28 -pkgrel=1 -pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)" -arch=(x86_64 'mips64el') -license=('LGPL') -depends=('lib32-libvorbis' 'lib32-libtool' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-tdb' - $_pkgbasename) -makedepends=('gtk-doc' lib32-libpulse gcc-multilib libtool-multilib) -options=(!emptydirs) -url=http://0pointer.de/lennart/projects/libcanberra -source=("$url/$_pkgbasename-$pkgver.tar.gz") -md5sums=('c198b4811598c4c161ff505e4531b02c') - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ - --disable-static --with-builtin=dso --enable-null --disable-oss \ - --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \ - --libdir=/usr/lib32 - make -} - -package_lib32-libcanberra() { - optdepends=("$pkgbase-pulse: PulseAudio driver") - - cd "$srcdir/$_pkgbasename-$pkgver" - - make -j1 DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/lib32/libcanberra-gtk.la" - rm -f "${pkgdir}/usr/lib32/gtk-2.0/modules/"*.la - - - # Split libcanberra-pulse - mkdir pulse-plugin - mv "${pkgdir}"/usr/lib32/${_pkgbasename}-${pkgver}/${_pkgbasename}-pulse.* pulse-plugin - - rm -rf "${pkgdir}"/{etc,usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}} -} - -package_lib32-libcanberra-pulse() { - pkgdesc="PulseAudio plugin for libcanberra (32-bit)" - depends=("$pkgbase=$pkgver-$pkgrel" 'lib32-libpulse') - - cd "$srcdir/$_pkgbasename-$pkgver" - - mkdir -p "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" - mv pulse-plugin/* "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" -} diff --git a/multilib/lib32-libcap/PKGBUILD b/multilib/lib32-libcap/PKGBUILD deleted file mode 100644 index 85be7ae08..000000000 --- a/multilib/lib32-libcap/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -#$Id: PKGBUILD 64614 2010-01-21 11:40:53Z allan $ -# Maintainer: Hugo Doria <hugo@archlinux.org> - -_pkgbasename=libcap -pkgname=lib32-$_pkgbasename -pkgver=2.21 -pkgrel=1 -pkgdesc="POSIX 1003.1e capabilities (32-bit)" -arch=(x86_64 'mips64el') -url="http://www.kernel.org/pub/linux/libs/security/linux-privs/" -license=('GPL') -depends=('lib32-attr' $_pkgbasename) -makedepends=('gcc-multilib') -source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('61966ef40f2dee8731b69db895e4548d') - -build() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - make -C libcap CC="gcc -m32" prefix=/usr lib=lib32 DESTDIR=${pkgdir} install - chmod 755 ${pkgdir}/usr/lib32/libcap.so.${pkgver} - - rm -rf "${pkgdir}/usr/include" -} diff --git a/multilib/lib32-libcups/PKGBUILD b/multilib/lib32-libcups/PKGBUILD deleted file mode 100644 index 9f6a94a87..000000000 --- a/multilib/lib32-libcups/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 32274 2010-11-13 00:50:15Z heftig $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -_pkgbasename=libcups -pkgname=lib32-$_pkgbasename -pkgver=1.4.5 -pkgrel=1 -pkgdesc="The CUPS Printing System - client libraries (32-bit)" -arch=('x86_64' 'mips64el') -license=('GPL') -url="http://www.cups.org/" -depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib) -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2) -md5sums=('50729f6fc46ba54223e0eaf5009f3419') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/cups-${pkgver} - - aclocal -I config-scripts - autoconf -I config-scripts - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \ - --enable-ssl=no --disable-gnutls --disable-threads \ - --with-optim="$CFLAGS" --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/cups-${pkgver} - make BUILDROOT=${pkgdir} install-libs -} - diff --git a/multilib/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD deleted file mode 100644 index 5f646dd23..000000000 --- a/multilib/lib32-libdrm/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 45000 2011-04-14 07:44:44Z lcarlier $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libdrm -pkgname=lib32-$_pkgbasename -pkgver=2.4.25 -pkgrel=1 -pkgdesc="Userspace interface to kernel DRM services (32-bit)" -arch=(x86_64 'mips64el') -license=('custom') -depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -url="http://dri.freedesktop.org/" -source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 - no-pthread-stubs.patch) -sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194' - 'af2d9871565ea4cf524873f897691a18b2bba944') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - - # libtoolize --force - autoreconf --force --install - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --enable-udev \ - --enable-intel \ - --enable-radeon \ - --enable-vmwgfx-experimental-api \ - --enable-nouveau-experimental-api - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libdrm/no-pthread-stubs.patch b/multilib/lib32-libdrm/no-pthread-stubs.patch deleted file mode 100644 index 6602f8785..000000000 --- a/multilib/lib32-libdrm/no-pthread-stubs.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac ---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 -+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE - --PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) --AC_SUBST(PTHREADSTUBS_CFLAGS) --AC_SUBST(PTHREADSTUBS_LIBS) -- - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], ---- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_intel_la_LTLIBRARIES = libdrm_intel.la - libdrm_intel_ladir = $(libdir) - libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ -+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@ - - libdrm_intel_la_SOURCES = \ - intel_atomic.h \ ---- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/radeon \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la - libdrm_radeon_ladir = $(libdir) - libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_radeon_la_LIBADD = ../libdrm.la - - libdrm_radeon_la_SOURCES = \ - radeon_bo_gem.c \ ---- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000 -@@ -2,13 +2,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = \ - nouveau_device.c \ diff --git a/multilib/lib32-libgcrypt/PKGBUILD b/multilib/lib32-libgcrypt/PKGBUILD deleted file mode 100644 index 7785ce5fa..000000000 --- a/multilib/lib32-libgcrypt/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 26587 2010-09-15 22:38:34Z bluewind $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -_pkgbasename=libgcrypt -pkgname=lib32-$_pkgbasename -pkgver=1.4.6 -pkgrel=3 -pkgdesc="a general purpose crypto library based on the code used (32-bit)" -arch=(x86_64 'mips64el') -url="http://www.gnupg.org" -license=('LGPL') -depends=('lib32-libgpg-error>=1.7' $_pkgbasename) -makedepends=(gcc-multilib libtool-multilib) -options=(!libtool) -source=(ftp://ftp.gnupg.org/gcrypt/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${_pkgbasename}-${pkgver}.tar.bz2 -) -md5sums=('dbf99425a4fe9217c84ce3a35d938634') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - - # Use 32-bit assembler - sed 's:path="amd64":path="i586 i386":' -i mpi/config.links - - # keep static library for , needed for cryptsetup - ./configure --prefix=/usr --disable-padlock-support --libdir=/usr/lib32 --enable-shared - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} -} diff --git a/multilib/lib32-libglade/PKGBUILD b/multilib/lib32-libglade/PKGBUILD deleted file mode 100644 index 029d31cc8..000000000 --- a/multilib/lib32-libglade/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> -# Contributor: TryA <tryagainprod {at} gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libglade -pkgname=lib32-libglade -pkgver=2.6.4 -pkgrel=4 -pkgdesc="Allows you to load glade interface files in a program at runtime (32-bit)" -arch=('x86_64') -license=('LGPL') -depends=('lib32-gtk2' 'lib32-libxml2' "${_pkgbasename}") -makedepends=('python2' 'pkgconfig' 'gcc-multilib') -options=('!libtool') -source=("http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/2.6/${_pkgbasename}-${pkgver}.tar.bz2" - 'libglade-2.0.1-nowarning.patch') -url='http://www.gnome.org' -md5sums=('d1776b40f4e166b5e9c107f1c8fe4139' - '4f879c0ce550004905aa0fb24f25c353') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" - PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf ${pkgdir}/usr/{bin,include,share} -} diff --git a/multilib/lib32-libglade/libglade-2.0.1-nowarning.patch b/multilib/lib32-libglade/libglade-2.0.1-nowarning.patch deleted file mode 100644 index fd071215f..000000000 --- a/multilib/lib32-libglade/libglade-2.0.1-nowarning.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- libglade-2.0.1/glade/glade-gtk.c.nowarning 2003-08-29 14:50:10.000000000 -0400 -+++ libglade-2.0.1/glade/glade-gtk.c 2003-08-29 14:58:41.000000000 -0400 -@@ -639,9 +639,8 @@ - if (!strcmp (childinfo->properties[j].name, "label")) { - label = childinfo->properties[j].value; - break; -- } else { -- g_warning ("Unknown CList child property: %s", childinfo->properties[j].name); - } -+ /* Ignore all other properties */ - } - - if (label) { -@@ -683,6 +682,7 @@ - char *icon = NULL; - gboolean use_stock = FALSE, active = FALSE, new_group = FALSE; - gboolean use_underline = FALSE; -+ gboolean sensitive = TRUE; - GtkWidget *iconw = NULL; - int j; - -@@ -708,6 +708,8 @@ - group_name = value; - } else if (!strcmp (name, "new_group")) { - new_group = BOOL (value); -+ } else if (!strcmp (name, "sensitive")) { -+ sensitive = BOOL (value); - } else if (!strcmp (name, "visible")) { - /* ignore for now */ - } else if (!strcmp (name, "tooltip")) { -@@ -785,6 +787,8 @@ - gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label), - TRUE); - } -+ -+ gtk_widget_set_sensitive (child, sensitive); - - glade_xml_set_common_params (xml, child, childinfo->child); - } else { diff --git a/multilib/lib32-libgpg-error/PKGBUILD b/multilib/lib32-libgpg-error/PKGBUILD deleted file mode 100644 index b18aeb3ca..000000000 --- a/multilib/lib32-libgpg-error/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 26590 2010-09-15 22:39:01Z bluewind $ -# Maintainer: judd <jvinet@zeroflux.org> - -_pkgbasename=libgpg-error -pkgname=lib32-$_pkgbasename -pkgver=1.9 -pkgrel=4 -pkgdesc="Support library for libgcrypt (32-bit)" -arch=(x86_64 'mips64el') -url="http://www.gnupg.org" -license=('LGPL') -depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib) -options=(!libtool) -source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${_pkgbasename}-${pkgver}.tar.bz2) - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) -md5sums=('521b98aa9395e7eaf0ef2236233a0796') - - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}"/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}"/${_pkgbasename}-${pkgver} - make DESTDIR="${pkgdir}/" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-libice/PKGBUILD b/multilib/lib32-libice/PKGBUILD deleted file mode 100644 index 37a7ab15c..000000000 --- a/multilib/lib32-libice/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 31526 2010-11-01 23:47:50Z heftig $ -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> -_pkgbasename=libice -pkgname=lib32-$_pkgbasename -pkgver=1.0.7 -pkgrel=1 -pkgdesc="X11 Inter-Client Exchange library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -depends=('lib32-glibc' 'xproto>=7.0.18' $_pkgbasename) -makedepends=('pkgconfig' 'xtrans>=1.2.5' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2) -license=('custom') -sha1sums=('c7d0f4c5b0e999385445b8be1bc89aec4e5de71d') - -build() { - cd "${srcdir}/libICE-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 - - make -} - -package() { - cd "${srcdir}/libICE-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libjpeg/PKGBUILD b/multilib/lib32-libjpeg/PKGBUILD deleted file mode 100644 index fe3548c1f..000000000 --- a/multilib/lib32-libjpeg/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 38658 2011-01-30 08:53:28Z bluewind $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -_pkgbasename=libjpeg -pkgname=lib32-$_pkgbasename -pkgver=8.3.0 -_pkgver=8c -pkgrel=1 -pkgdesc="Library of JPEG support functions (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.ijg.org/" -license=('custom') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('libtool' 'gcc-multilib') -options=('!libtool') -source=(http://www.ijg.org/files/jpegsrc.v${_pkgver}.tar.gz) -md5sums=('a2c10c04f396a9ce72894beb18b4e1f9') - -build() { - cd $srcdir/jpeg-${_pkgver} - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --enable-shared --enable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/jpeg-${_pkgver} - make DESTDIR="$pkgdir" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libldap/PKGBUILD b/multilib/lib32-libldap/PKGBUILD deleted file mode 100644 index d4ba2dfec..000000000 --- a/multilib/lib32-libldap/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 26599 2010-09-15 22:40:16Z bluewind $ -# Maintainer: -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -_pkgbasename=libldap -pkgname=lib32-$_pkgbasename -pkgver=2.4.22 -pkgrel=3 -pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries (32-bit)" -arch=('x86_64' 'mips64el') -license=('custom') -url="http://www.openldap.org/" -depends=('lib32-openssl' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz" - 'ntlm.patch') -md5sums=('ef01b52255ce8e3fbf8aa34f6fe7598b' - 'dfa9eb6f2fd9d0a3dab0e1860923489e') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/openldap-${pkgver} - - patch -Np1 -i ${srcdir}/ntlm.patch - - ./configure --prefix=/usr \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var/lib/openldap \ - --enable-crypt --enable-dynamic \ - --with-threads --disable-wrappers \ - --disable-spasswd --without-cyrus-sasl \ - --disable-bdb --disable-hdb --libdir=/usr/lib32 - - cd include - make - - cd ../libraries - make depend - make - -} - -package() { - cd ${srcdir}/openldap-${pkgver} - - cd include - make DESTDIR=${pkgdir} install - - cd ../libraries - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/etc" - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libldap/ntlm.patch b/multilib/lib32-libldap/ntlm.patch deleted file mode 100644 index a4fe4d45a..000000000 --- a/multilib/lib32-libldap/ntlm.patch +++ /dev/null @@ -1,230 +0,0 @@ -Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is -actually called by evolution-data-server, checked at version 1.12.2. -Without this patch, the Exchange addressbook integration uses simple binds -with cleartext passwords. - -Russ checked with openldap-software for upstream's opinion on this patch -on 2007-12-21. Upstream had never received it as a patch submission and -given that it's apparently only for older Exchange servers that can't do -SASL and DIGEST-MD5, it's not very appealing. - -Bug#457374 filed against evolution-data-server asking if this support is -still required on 2007-12-21. - -Index: trunk/include/ldap.h -=================================================================== ---- trunk.orig/include/ldap.h -+++ trunk/include/ldap.h -@@ -2461,5 +2461,25 @@ - LDAPControl **ctrls, - LDAPDerefRes **drp )); - -+/* -+ * hacks for NTLM -+ */ -+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) -+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) -+LDAP_F( int ) -+ldap_ntlm_bind LDAP_P(( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp )); -+LDAP_F( int ) -+ldap_parse_ntlm_bind_result LDAP_P(( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge)); -+ - LDAP_END_DECL - #endif /* _LDAP_H */ -Index: trunk/libraries/libldap/ntlm.c -=================================================================== ---- /dev/null -+++ trunk/libraries/libldap/ntlm.c -@@ -0,0 +1,138 @@ -+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ -+/* -+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. -+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file -+ */ -+ -+/* Mostly copied from sasl.c */ -+ -+#include "portable.h" -+ -+#include <stdlib.h> -+#include <stdio.h> -+ -+#include <ac/socket.h> -+#include <ac/string.h> -+#include <ac/time.h> -+#include <ac/errno.h> -+ -+#include "ldap-int.h" -+ -+int -+ldap_ntlm_bind( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp ) -+{ -+ BerElement *ber; -+ int rc; -+ ber_int_t id; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( msgidp != NULL ); -+ -+ if( msgidp == NULL ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ /* create a message to send */ -+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ assert( LBER_VALID( ber ) ); -+ -+ LDAP_NEXT_MSGID( ld, id ); -+ rc = ber_printf( ber, "{it{istON}" /*}*/, -+ id, LDAP_REQ_BIND, -+ ld->ld_version, dn, tag, -+ cred ); -+ -+ /* Put Server Controls */ -+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { -+ ld->ld_errno = LDAP_ENCODING_ERROR; -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ /* send the message */ -+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); -+ -+ if(*msgidp < 0) -+ return ld->ld_errno; -+ -+ return LDAP_SUCCESS; -+} -+ -+int -+ldap_parse_ntlm_bind_result( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge) -+{ -+ ber_int_t errcode; -+ ber_tag_t tag; -+ BerElement *ber; -+ ber_len_t len; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( res != NULL ); -+ -+ if ( ld == NULL || res == NULL ) { -+ return LDAP_PARAM_ERROR; -+ } -+ -+ if( res->lm_msgtype != LDAP_RES_BIND ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ if ( ld->ld_error ) { -+ LDAP_FREE( ld->ld_error ); -+ ld->ld_error = NULL; -+ } -+ if ( ld->ld_matched ) { -+ LDAP_FREE( ld->ld_matched ); -+ ld->ld_matched = NULL; -+ } -+ -+ /* parse results */ -+ -+ ber = ber_dup( res->lm_ber ); -+ -+ if( ber == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ tag = ber_scanf( ber, "{ioa" /*}*/, -+ &errcode, challenge, &ld->ld_error ); -+ ber_free( ber, 0 ); -+ -+ if( tag == LBER_ERROR ) { -+ ld->ld_errno = LDAP_DECODING_ERROR; -+ return ld->ld_errno; -+ } -+ -+ ld->ld_errno = errcode; -+ -+ return( ld->ld_errno ); -+} -+ -Index: trunk/libraries/libldap/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap/Makefile.in -+++ trunk/libraries/libldap/Makefile.in -@@ -27,7 +27,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c - - OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ -@@ -40,7 +40,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo - - LDAP_INCDIR= ../../include -Index: trunk/libraries/libldap_r/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap_r/Makefile.in -+++ trunk/libraries/libldap_r/Makefile.in -@@ -29,7 +29,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c - SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ - thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ -@@ -47,7 +47,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo - - LDAP_INCDIR= ../../include diff --git a/multilib/lib32-libmikmod/PKGBUILD b/multilib/lib32-libmikmod/PKGBUILD deleted file mode 100644 index 3f7517b46..000000000 --- a/multilib/lib32-libmikmod/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: Peter Lewis <plewis@aur.archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Jesse Juhani Jaara <jesse.jaara@gmail.com> - -pkgname=lib32-libmikmod -pkgver=3.1.12 -pkgrel=5 -pkgdesc="A portable sound library" -license=('GPL' 'LGPL') -url="http://sourceforge.net/projects/mikmod/" -arch=('x86_64' 'mips64el') -depends=('libmikmod' 'lib32-glibc') -makedepends=('gcc-multilib') -options=('!libtool') -install= -source=(http://downloads.sourceforge.net/mikmod/libmikmod-${pkgver}.tar.gz - libmikmod-3.1.12-64bit-fix.diff - libmikmod-3.1.12-exitcrash-fix.diff - libmikmod-3.1.12-loopingvolume-fix.diff - libmikmod-3.1.12-md_sngchn-fix.diff - libmikmod-CVE-2009-0179.patch) -md5sums=('9f3c740298260d5f88981fc0d51f6f16' - 'dc7ffd8d6d355e9d6ec671b7f2b2adc7' - '03a4f5bfcecddf5f515672d6d477b7f7' - 'a837fd876cbd2ac27419b802504489db' - '076d39de19de36b880ed90297f1ee0d1' - 'fa91f4bc17164be32bec0ea7a73f2aaa') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/libmikmod-$pkgver - - # patches from sdl_mixer-1.2.11 source - patch -Np1 -i $srcdir/libmikmod-3.1.12-64bit-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-exitcrash-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-md_sngchn-fix.diff - patch -Np1 -i $srcdir/libmikmod-CVE-2009-0179.patch - - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/libmikmod-$pkgver - make DESTDIR=$pkgdir install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} - diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-64bit-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-64bit-fix.diff deleted file mode 100644 index cd7800881..000000000 --- a/multilib/lib32-libmikmod/libmikmod-3.1.12-64bit-fix.diff +++ /dev/null @@ -1,47 +0,0 @@ -Date: Sun, 04 Jul 2004 11:53:23 +0200 -From: Josselin Mouette -Subject: Re: sdl 64bit problem [PATCH] - -Le sam, 03/07/2004 � 18:20 +0200, Hans-Frieder Vogt a �crit : -> Hi list, -> -> I found the problem that lead to the distorted sound in tuxracer on AMD64. It -> may have also been the cause for the other reported sound problems with SDL. -> The problem is not in SDL, but in SDL-mixer. -> There, music files (*.it, and probably others as well) are incorrectly read on -> all 64 bit architectures but Alpha, due to an incorrect data type definition. -> The attached patch should solve the problem for all 64 bit architectures on -> Linux, since at least cpp defines _LP64 and __LP64__ for them. -> _LP64 indicates that long ints and pointers are 64 bits, but integers are 32 -> bits. -> I am not sure whether the usage of _LP64 is also standard for the commercial -> compilers, and for other Unixes, but at least Solaris 9 defines _LP64 in the -> 64 bit environment as well. -> -> Josselin, -> could you include this patch into your next debian packages? - -diff -ru libmikmod-3.1.12.orig/include/mikmod.h.in libmikmod-3.1.12/include/mikmod.h.in ---- libmikmod-3.1.12.orig/include/mikmod.h.in 2007-12-15 01:24:19.000000000 -0800 -+++ libmikmod-3.1.12/include/mikmod.h.in 2009-10-05 00:18:56.000000000 -0700 -@@ -85,7 +85,7 @@ - - @DOES_NOT_HAVE_SIGNED@ - --#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - /* 64 bit architectures */ - - typedef signed char SBYTE; /* 1 byte, signed */ -diff -ru libmikmod-3.1.12.orig/include/mikmod_internals.h libmikmod-3.1.12/include/mikmod_internals.h ---- libmikmod-3.1.12.orig/include/mikmod_internals.h 2007-12-15 04:24:51.000000000 -0800 -+++ libmikmod-3.1.12/include/mikmod_internals.h 2009-10-05 00:19:15.000000000 -0700 -@@ -50,7 +50,7 @@ - /*========== More type definitions */ - - /* SLONGLONG: 64bit, signed */ --#if defined (__arch64__) || defined(__alpha) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - typedef long SLONGLONG; - #define NATIVE_64BIT_INT - #elif defined(__WATCOMC__) diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-exitcrash-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-exitcrash-fix.diff deleted file mode 100644 index fe62892b5..000000000 --- a/multilib/lib32-libmikmod/libmikmod-3.1.12-exitcrash-fix.diff +++ /dev/null @@ -1,21 +0,0 @@ -Date: 15 Apr 2002 11:01:19 +0200 -From: Guillaume Cottenceau <gc@mandrakesoft.com> - -Unfortunately, I should have double checked that the following -fix (authored by Dave Goehrig <dave@cthulhu-burger.org>, not me), -was really in the CVS... it's not, as of stable 1.2.3 at least. -Please include it, it fixes a segfault on exiting a program which -disabled MOD music during its execution. - -diff -ru libmikmod-3.1.12.orig/playercode/virtch_common.c libmikmod-3.1.12/playercode/virtch_common.c ---- libmikmod-3.1.12.orig/playercode/virtch_common.c 2007-12-15 01:26:53.000000000 -0800 -+++ libmikmod-3.1.12/playercode/virtch_common.c 2009-10-05 00:37:12.000000000 -0700 -@@ -347,7 +347,7 @@ - - void VC1_SampleUnload(SWORD handle) - { -- if (handle<MAXSAMPLEHANDLES) { -+ if (Samples && handle<MAXSAMPLEHANDLES) { - if (Samples[handle]) - free(Samples[handle]); - Samples[handle]=NULL; diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff deleted file mode 100644 index f0ce70e34..000000000 --- a/multilib/lib32-libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff +++ /dev/null @@ -1,15 +0,0 @@ -Yi-Huang Han - Wed Oct 24 21:55:47 PDT 2001 - * Fixed MOD music volume when looping - -diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c ---- libmikmod-3.1.12.orig/playercode/mplayer.c 2009-10-05 00:19:59.000000000 -0700 -+++ libmikmod-3.1.12/playercode/mplayer.c 2009-10-05 00:44:35.000000000 -0700 -@@ -3019,7 +3019,7 @@ - { - MUTEX_LOCK(vars); - if (pf) -- pf->volume=(volume<0)?0:(volume>128)?128:volume; -+ pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume; - MUTEX_UNLOCK(vars); - } - diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff deleted file mode 100644 index 45cc355ae..000000000 --- a/multilib/lib32-libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff +++ /dev/null @@ -1,112 +0,0 @@ -This patch fixes "buffer overflow due to md_numchn - ID: 1630158" - -diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c ---- libmikmod-3.1.12.orig/playercode/mplayer.c 2007-12-15 01:26:28.000000000 -0800 -+++ libmikmod-3.1.12/playercode/mplayer.c 2009-10-04 23:48:36.000000000 -0700 -@@ -52,6 +52,8 @@ - will wait */ - /*static*/ MODULE *pf = NULL; - -+#define NUMVOICES(mod) (md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices) -+ - #define HIGH_OCTAVE 2 /* number of above-range octaves */ - - static UWORD oldperiods[OCTAVE*2]={ -@@ -248,14 +250,14 @@ - MP_VOICE *a; - ULONG t,k,tvol,pp; - -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (((mod->voice[t].main.kick==KICK_ABSENT)|| - (mod->voice[t].main.kick==KICK_ENV))&& - Voice_Stopped_internal(t)) - return t; - - tvol=0xffffffUL;t=-1;a=mod->voice; -- for (k=0;k<md_sngchn;k++,a++) { -+ for (k=0;k<NUMVOICES(mod);k++,a++) { - /* allow us to take over a nonexisting sample */ - if (!a->main.s) - return k; -@@ -2249,12 +2251,12 @@ - - switch (dat) { - case 0x0: /* past note cut */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) - mod->voice[t].main.fadevol=0; - break; - case 0x1: /* past note off */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) { - mod->voice[t].main.keyoff|=KEY_OFF; - if ((!(mod->voice[t].venv.flg & EF_ON))|| -@@ -2263,7 +2265,7 @@ - } - break; - case 0x2: /* past note fade */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) - mod->voice[t].main.keyoff|=KEY_FADE; - break; -@@ -2318,7 +2320,7 @@ - SAMPLE *s; - - mod->totalchn=mod->realchn=0; -- for (channel=0;channel<md_sngchn;channel++) { -+ for (channel=0;channel<NUMVOICES(mod);channel++) { - aout=&mod->voice[channel]; - i=aout->main.i; - s=aout->main.s; -@@ -2736,7 +2738,7 @@ - if (a->dct!=DCT_OFF) { - int t; - -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if ((!Voice_Stopped_internal(t))&& - (mod->voice[t].masterchn==channel)&& - (a->main.sample==mod->voice[t].main.sample)) { -@@ -2978,6 +2980,11 @@ - if (!(mod->voice=(MP_VOICE*)_mm_calloc(md_sngchn,sizeof(MP_VOICE)))) - return 1; - -+ /* mod->numvoices was used during loading to clamp md_sngchn. -+ After loading it's used to remember how big mod->voice is. -+ */ -+ mod->numvoices = md_sngchn; -+ - Player_Init_internal(mod); - return 0; - } -@@ -3086,7 +3093,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3111,7 +3118,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3138,7 +3145,7 @@ - pf->sngpos=pos; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; diff --git a/multilib/lib32-libmikmod/libmikmod-CVE-2009-0179.patch b/multilib/lib32-libmikmod/libmikmod-CVE-2009-0179.patch deleted file mode 100644 index 0c47e6545..000000000 --- a/multilib/lib32-libmikmod/libmikmod-CVE-2009-0179.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c ---- libmikmod-3.1.11.orig/loaders/load_xm.c 2004-01-21 18:43:53.000000000 +0100 -+++ libmikmod-3.1.11/loaders/load_xm.c 2008-04-16 04:30:45.000000000 +0200 -@@ -622,7 +622,8 @@ - /* read the remainder of the header */ - for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader); - -- if(_mm_eof(modreader)) { -+ /* last instrument is at the end of file in version 0x0104 */ -+ if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) { - free(nextwav);free(wh); - nextwav=NULL;wh=NULL; - _mm_errno = MMERR_LOADING_SAMPLEINFO; -diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c ---- libmikmod-3.1.11.orig/playercode/mloader.c 2004-01-21 18:43:53.000000000 +0100 -+++ libmikmod-3.1.11/playercode/mloader.c 2008-04-16 04:30:45.000000000 +0200 -@@ -450,10 +450,12 @@ - if (!l->Init || l->Init()) { - _mm_rewind(modreader); - ok = l->Load(curious); -- /* propagate inflags=flags for in-module samples */ -- for (t = 0; t < of.numsmp; t++) -- if (of.samples[t].inflags == 0) -- of.samples[t].inflags = of.samples[t].flags; -+ if (ok) { -+ /* propagate inflags=flags for in-module samples */ -+ for (t = 0; t < of.numsmp; t++) -+ if (of.samples[t].inflags == 0) -+ of.samples[t].inflags = of.samples[t].flags; -+ } - } else - ok = 0; - diff --git a/multilib/lib32-libmng/PKGBUILD b/multilib/lib32-libmng/PKGBUILD deleted file mode 100644 index c98f14df0..000000000 --- a/multilib/lib32-libmng/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 26602 2010-09-15 22:40:41Z bluewind $ -# Maintainer: Florian Pritz <flo@xssn.at> -_pkgbasename=libmng -pkgname=lib32-$_pkgbasename -pkgver=1.0.10 -pkgrel=5 -pkgdesc="A collection of routines used to create and manipulate MNG format graphics files (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.libmng.com/" -license=('custom') -depends=('lib32-zlib' 'lib32-libjpeg>=8' $_pkgbasename) -makedepends=(gcc-multilib) -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz) -md5sums=('a464ae7d679781beebdf7440d144b7bd') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/$_pkgbasename-$pkgver - ln -s makefiles/configure.in . - ln -s makefiles/Makefile.am . - autoreconf --force --install - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/$_pkgbasename-$pkgver - - make DESTDIR=$pkgdir install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libogg/PKGBUILD b/multilib/lib32-libogg/PKGBUILD deleted file mode 100644 index 4cf549e25..000000000 --- a/multilib/lib32-libogg/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 40915 2011-03-01 15:20:49Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=libogg -pkgname=lib32-$_pkgbasename -pkgver=1.2.2 -pkgrel=1 -pkgdesc="Ogg bitstream and framing library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.xiph.org/ogg/" -license=('BSD') -depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://downloads.xiph.org/releases/ogg/$_pkgbasename-$pkgver.tar.gz) -md5sums=('5a9fcabc9a1b7c6f1cd75ddc78f36c56') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/${_pkgbasename}-${pkgver} - - make DESTDIR=$pkgdir install - - rm -rf "$pkgdir"/usr/{share,bin} - find "$pkgdir"/usr/include/ogg -type f -not -name config_types.h -delete - mv "$pkgdir"/usr/include/ogg/config_types{,-32}.h - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libpng/PKGBUILD b/multilib/lib32-libpng/PKGBUILD deleted file mode 100644 index 2af5311cc..000000000 --- a/multilib/lib32-libpng/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 37276 2011-01-13 18:48:07Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: Travis Willard <travis@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -_pkgbasename=libpng -pkgname=lib32-$_pkgbasename -pkgver=1.4.5 -_apngver=1.4.5 -pkgrel=1 -pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.libpng.org/pub/png/libpng.html" -license=('custom') -depends=('lib32-zlib' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz") -md5sums=('37d420c7d8294aac438c150bb4335901' - '459affb0ac7e0f1ae4d99b88234cb3db') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - # Add animated PNG (apng) support - # see http://sourceforge.net/projects/libpng-apng/ - patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch" - -# libtoolize --force --copy -# aclocal -# autoconf -# automake --add-missing - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - cd contrib/pngminus - make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libpulse/PKGBUILD b/multilib/lib32-libpulse/PKGBUILD deleted file mode 100644 index 80a792601..000000000 --- a/multilib/lib32-libpulse/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 33577 2010-11-26 02:49:09Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -_pkgbasename=libpulse -pkgname=lib32-$_pkgbasename -pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)" -pkgver=0.9.22 -pkgrel=1 -arch=(x86_64 'mips64el') -url="http://pulseaudio.org/" -license=(GPL LGPL) -depends=(lib32-{dbus-core,xcb-util} - lib32-lib{asyncns,cap,xtst,sm,sndfile} - $_pkgbasename) -makedepends=(pkgconfig gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex) -optdepends=('lib32-alsa-plugins: ALSA support') -provides=("lib32-pulseaudio=$pkgver") -conflicts=(lib32-pulseaudio) -replaces=(lib32-pulseaudio) -options=(!emptydirs !libtool !makeflags) -source=("http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-$pkgver.tar.gz") -md5sums=('ca85ab470669b05e100861654cf5eb3c') - -_libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la" - -build() { - cd "$srcdir/pulseaudio-$pkgver" - - # Don't break circular dependency between libpulse and libpulsecommon - LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib32 \ - --libexecdir=/usr/lib32 \ - --localstatedir=/var \ - --disable-hal \ - --disable-rpath \ - --disable-default-build-tests - - make -C src $_libs -} - -package() { - cd "$srcdir/pulseaudio-$pkgver" - make -C src lib_LTLIBRARIES="$_libs" DESTDIR="$pkgdir" install-libLTLIBRARIES - make DESTDIR="$pkgdir" install-pkgconfigDATA -} diff --git a/multilib/lib32-libsamplerate/PKGBUILD b/multilib/lib32-libsamplerate/PKGBUILD deleted file mode 100644 index 89fe8fc33..000000000 --- a/multilib/lib32-libsamplerate/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 33260 2010-11-23 15:20:46Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=libsamplerate -pkgname=lib32-$_pkgbasename -pkgver=0.1.7 -pkgrel=3 -pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.mega-nerd.com/SRC/index.html" -license=('GPL') -depends=('lib32-libsndfile' $_pkgbasename) -makedepedns=('gcc-multilib') -options=('!libtool') -source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz) -md5sums=('6731a81cb0c622c483b28c0d7f90867d') -sha1sums=('f3f803ec5feae5a3fdb0fa3937277669e854386e') - -build() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-libsm/PKGBUILD b/multilib/lib32-libsm/PKGBUILD deleted file mode 100644 index 4055dde48..000000000 --- a/multilib/lib32-libsm/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 31529 2010-11-01 23:52:46Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libsm -pkgname=lib32-$_pkgbasename -pkgver=1.2.0 -pkgrel=1 -pkgdesc="X11 Session Management library (32-bit)" -arch=(x86_64 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libice' 'lib32-util-linux-ng' $_pkgbasename) -makedepends=('xorg-util-macros' 'xtrans' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2) -sha1sums=('f78bc72f0b3ec26cbf980f84f014422ba854544d') - -build() { - cd "${srcdir}/libSM-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libSM-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libsndfile/PKGBUILD b/multilib/lib32-libsndfile/PKGBUILD deleted file mode 100644 index 480c01772..000000000 --- a/multilib/lib32-libsndfile/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 43016 2011-03-23 20:35:57Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=libsndfile -pkgname=lib32-$_pkgbasename -pkgver=1.0.24 -pkgrel=1 -pkgdesc="A C library for reading and writing files containing sampled sound (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.mega-nerd.com/libsndfile" -license=('LGPL') -depends=('lib32-flac' 'lib32-libvorbis' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'gcc-multilib') -options=('!libtool') -source=(http://www.mega-nerd.com/libsndfile/files/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('8f823c30c1d8d44830db6ab845d6679e') -sha1sums=('ade2dad272b52f61bb58aca3a4004b28549ee0f8') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - export GETCONF="getconf -v POSIX_V7_ILP32_OFFBIG" - export GETCONF_DIR="/usr/lib32/getconf" - - ./configure --prefix=/usr --disable-sqlite --libdir=/usr/lib32 - make -C src -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make -C src DESTDIR="${pkgdir}" install - make DESTDIR="$pkgdir" install-pkgconfigDATA - - rm -rf "$pkgdir/usr/include" -} diff --git a/multilib/lib32-libstdc++5/PKGBUILD b/multilib/lib32-libstdc++5/PKGBUILD deleted file mode 100644 index b2e21eb90..000000000 --- a/multilib/lib32-libstdc++5/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 26620 2010-09-15 22:43:15Z bluewind $ - -pkgname=lib32-libstdc++5 -pkgver=3.3.6 -pkgrel=5 -pkgdesc="Legacy GNU Standard C++ library version 3 (32 bit)" -arch=(x86_64 'mips64el') -url="http://gcc.gnu.org" -license=('GPL' 'LGPL') -depends=('lib32-gcc-libs') -makedepends=('gcc-multilib' 'binutils-multilib') -options=('!libtool' '!makeflags') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 - gcc-3.4.3-no_multilib_amd64.patch) -md5sums=('18c52e6fb8966b7700665dca289d077f' - '6b3d00b8d079805be1b895f7f6ce47a0' - 'b2a96584f4cee72362695ba44c911c40') - -build(){ - export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||') - export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||') - cd ${srcdir}/gcc-${pkgver} - - patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch - # No fixincludes - sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - mkdir ../gcc-build - cd ../gcc-build - # We build the full multilib libstdc++5 here, no idea how to restrict - # the build process to the 32 bit version only. - ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \ - --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \ - --enable-multilib - make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" -} - -package() { - cd ${srcdir}/gcc-build - make DESTDIR=${pkgdir} install-target-libstdc++-v3 - - # Only install the lib32 files - rm -rf ${pkgdir}/usr/{include,share,lib} - rm -f ${pkgdir}/usr/lib32/*.a - rm -f ${pkgdir}/usr/lib32/libstdc++.so -} diff --git a/multilib/lib32-libstdc++5/gcc-3.4.3-no_multilib_amd64.patch b/multilib/lib32-libstdc++5/gcc-3.4.3-no_multilib_amd64.patch deleted file mode 100644 index 6ba6694db..000000000 --- a/multilib/lib32-libstdc++5/gcc-3.4.3-no_multilib_amd64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc/config/i386/t-linux64.orig 2003-06-28 00:19:59.000000000 +0000 -+++ gcc/config/i386/t-linux64 2003-06-28 00:20:07.000000000 +0000 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 ../lib -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/multilib/lib32-libtiff/PKGBUILD b/multilib/lib32-libtiff/PKGBUILD deleted file mode 100644 index 77c2c0ec4..000000000 --- a/multilib/lib32-libtiff/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 26623 2010-09-15 22:43:40Z bluewind $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -_pkgbasename=libtiff -pkgname=lib32-$_pkgbasename -pkgver=3.9.4 -pkgrel=3 -pkgdesc="Library for manipulation of TIFF images (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.remotesensing.org/libtiff/" -license=('custom') -depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename) -makedepends=('lib32-libgl' 'lib32-libxmu' 'lib32-libxi' gcc-multilib) -options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz \ - libtiff-CVE-2009-2285.patch) -md5sums=('2006c1bdd12644dbf02956955175afd6' 'ff61077408727a82281f77a94f555e2a') -sha1sums=('a4e32d55afbbcabd0391a9c89995e8e8a19961de' 'eadce8c8bd72ea9c74f35300bf299131813b0c8b') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/tiff-${pkgver}" - patch -p1 < ../libtiff-CVE-2009-2285.patch - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/tiff-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libtiff/libtiff-CVE-2009-2285.patch b/multilib/lib32-libtiff/libtiff-CVE-2009-2285.patch deleted file mode 100644 index 435a84b53..000000000 --- a/multilib/lib32-libtiff/libtiff-CVE-2009-2285.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: tiff-3.8.2/libtiff/tif_lzw.c -=================================================================== ---- tiff-3.8.2.orig/libtiff/tif_lzw.c -+++ tiff-3.8.2/libtiff/tif_lzw.c -@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize - NextCode(tif, sp, bp, code, GetNextCode); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); -@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0, - NextCode(tif, sp, bp, code, GetNextCodeCompat); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); diff --git a/multilib/lib32-libusb-compat/PKGBUILD b/multilib/lib32-libusb-compat/PKGBUILD deleted file mode 100644 index fac00be16..000000000 --- a/multilib/lib32-libusb-compat/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: arjan <arjan@archlinux.org> - -pkgname=lib32-libusb-compat -pkgver=0.1.3 -pkgrel=1 -pkgdesc="Library to enable user space application programs to communicate with USB devices" -arch=('x86_64' 'mips64el') -depends=('lib32-libusb' 'libusb-compat') -makedepends=('gcc-multilib') -url="http://libusb.sourceforge.net/" -license=('LGPL') -source=(http://downloads.sourceforge.net/libusb/libusb-compat-0.1/libusb-compat-$pkgver/libusb-compat-${pkgver}.tar.bz2) -options=('!libtool') -md5sums=('570ac2ea085b80d1f74ddc7c6a93c0eb') - -build() { - cd ${srcdir}/libusb-compat-${pkgver} - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/libusb-compat-${pkgver} - - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/{bin,include} -} diff --git a/multilib/lib32-libusb/PKGBUILD b/multilib/lib32-libusb/PKGBUILD deleted file mode 100644 index 5dbff488c..000000000 --- a/multilib/lib32-libusb/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=lib32-libusb -pkgver=1.0.8 -pkgrel=1 -pkgdesc="Library to enable user space application programs to communicate with USB devices. (32-bit)" -arch=('x86_64' 'mips64el') -url="http://libusb.sourceforge.net/" -license=('LGPL') -depends=('lib32-glibc' 'libusb') -makedepends=('gcc-multilib') -source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2) -options=(!libtool) -md5sums=('37d34e6eaa69a4b645a19ff4ca63ceef') - -build() { - cd "${srcdir}/libusb-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - - make -} - -package () { - cd "${srcdir}/libusb-${pkgver}" - - make DESTDIR="${pkgdir}" install - rm -rf ${pkgdir}/usr/include -} - diff --git a/multilib/lib32-libvdpau/PKGBUILD b/multilib/lib32-libvdpau/PKGBUILD deleted file mode 100644 index 6dd41a912..000000000 --- a/multilib/lib32-libvdpau/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 41886 2011-03-10 14:20:26Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: TryA <tryagainprod {at} gmail.com> - -_pkgbasename=libvdpau -pkgname=lib32-libvdpau -pkgver=0.4.1 -pkgrel=3 -pkgdesc="Nvidia VDPAU library (32-bit)" -arch=('x86_64' 'mips64el') -url=http://cgit.freedesktop.org/~aplattner/libvdpau -depends=(${_pkgbasename}) -options=('!libtool') -license=('custom') -source=(http://people.freedesktop.org/~aplattner/vdpau/${_pkgbasename}-${pkgver}.tar.gz) -makedepends=('lib32-libx11') -sha256sums=('061b6f86c64912f79851bfefcac4f77b401e9a939dbbb7b1ec795bc7d5aaf59b') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/include - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libvorbis/PKGBUILD b/multilib/lib32-libvorbis/PKGBUILD deleted file mode 100644 index 85e47a747..000000000 --- a/multilib/lib32-libvorbis/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 33990 2010-11-30 15:16:40Z bluewind $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -_pkgbasename=libvorbis -pkgname=lib32-$_pkgbasename -pkgver=1.3.2 -pkgrel=1 -pkgdesc="Vorbis codec library (32-bit)" -arch=('x86_64' 'mips64el') -license=('custom') -url="http://www.xiph.org/ogg/vorbis/" -depends=('lib32-libogg' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://downloads.xiph.org/releases/vorbis/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('c870b9bd5858a0ecb5275c14486d9554') - -build() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - #-march=i686 optimizes too much, strip it out - CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libx11/PKGBUILD b/multilib/lib32-libx11/PKGBUILD deleted file mode 100644 index e24e8203b..000000000 --- a/multilib/lib32-libx11/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 45003 2011-04-14 07:54:26Z lcarlier $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libx11 -pkgname=lib32-$_pkgbasename -pkgver=1.4.3 -pkgrel=1 -pkgdesc="X11 client-side library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxcb' 'xproto' 'kbproto' $_pkgbasename) -makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib') -options=('!libtool') -license=('custom:XFREE86') -source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha1sums=('174270a0e51614b5077026fc6c20701d4e09aef8') - -build() { - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libX11-${pkgver}" - ./configure --prefix=/usr --disable-static --disable-xf86bigfont \ - --libdir=/usr/lib32 --disable-specs - make - make check -} - -package() { - cd "${srcdir}/libX11-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxau/PKGBUILD b/multilib/lib32-libxau/PKGBUILD deleted file mode 100644 index 947c6e8c4..000000000 --- a/multilib/lib32-libxau/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 26632 2010-09-15 22:44:58Z bluewind $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -_pkgbasename=libxau -pkgname=lib32-$_pkgbasename -pkgver=1.0.6 -pkgrel=2 -pkgdesc="X11 authorisation library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -depends=('lib32-glibc' $_pkgbasename) -makedepends=('pkgconfig' 'xproto>=7.0.15' 'gcc-multilib') -license=('custom') -options=('!libtool') -source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2) -sha1sums=('0e1ab449f98026e4599f6e0d7491810d36c8fe4d') - -build() { - cd "${srcdir}/libXau-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXau-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxcb/PKGBUILD b/multilib/lib32-libxcb/PKGBUILD deleted file mode 100644 index 992eeaccd..000000000 --- a/multilib/lib32-libxcb/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 26635 2010-09-15 22:45:22Z bluewind $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -_pkgbasename=libxcb -pkgname=lib32-$_pkgbasename -pkgver=1.7 -pkgrel=2 -pkgdesc="X11 client-side library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.6' 'lib32-libxdmcp' 'lib32-libxau' - $_pkgbasename) -makedepends=('pkgconfig' 'libxslt' 'python' 'gcc-multilib' - 'autoconf') -conflicts=('libx11<1.1.99.2') -options=('!libtool') -license=('custom') -source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('7540f0587907bce421914f0ddb813810cb2f36f8' - '3455e84642283bc91c8313af319002a20bbcbdf4') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - libtoolize --force --copy - aclocal - autoconf - automake --add-missing - ./configure --prefix=/usr --enable-xinput --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch deleted file mode 100644 index f17de1b1d..000000000 --- a/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac ---- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500 -+++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500 -@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT) - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6) --NEEDED="pthread-stubs xau >= 0.99.2" -+NEEDED="xau >= 0.99.2" - PKG_CHECK_MODULES(NEEDED, $NEEDED) - - have_xdmcp="no" diff --git a/multilib/lib32-libxcomposite/PKGBUILD b/multilib/lib32-libxcomposite/PKGBUILD deleted file mode 100644 index cc2647913..000000000 --- a/multilib/lib32-libxcomposite/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 31532 2010-11-01 23:56:56Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxcomposite -pkgname=lib32-$_pkgbasename -pkgver=0.4.3 -pkgrel=1 -pkgdesc="X11 Composite extension library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxfixes' 'compositeproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=(!libtool) -source=(${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2) -sha1sums=('081b26b556d55e20d7956c80a2ea2854962aecec') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXcomposite-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXcomposite-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxcursor/PKGBUILD b/multilib/lib32-libxcursor/PKGBUILD deleted file mode 100644 index 380bb4ab0..000000000 --- a/multilib/lib32-libxcursor/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 31535 2010-11-02 00:00:15Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -_pkgbasename=libxcursor -pkgname=lib32-$_pkgbasename -pkgver=1.1.11 -pkgrel=1 -pkgdesc="X cursor management library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxfixes' 'lib32-libxrender' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2) -sha1sums=('35491bd17cbcdda712e1a064c67ccbc523e2702c') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXcursor-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXcursor-${pkgver}" - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxdamage/PKGBUILD b/multilib/lib32-libxdamage/PKGBUILD deleted file mode 100644 index 36c7a1617..000000000 --- a/multilib/lib32-libxdamage/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 26644 2010-09-15 22:46:36Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxdamage -pkgname=lib32-$_pkgbasename -pkgver=1.1.3 -pkgrel=3 -pkgdesc="X11 damaged region extension library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxfixes>=4.0.4' $_pkgbasename) -makedepends=('pkg-config' 'damageproto>=1.2.0' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.bz2) -sha1sums=('7d96e8de107fede16951cb47d5e147630fbc7dee') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXdamage-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXdamage-${pkgver}" - - make DESTDIR="${pkgdir}" install || return 1 - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxdmcp/PKGBUILD b/multilib/lib32-libxdmcp/PKGBUILD deleted file mode 100644 index 62c5983a6..000000000 --- a/multilib/lib32-libxdmcp/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 35270 2010-12-18 01:18:05Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxdmcp -pkgname=lib32-$_pkgbasename -pkgver=1.1.0 -pkgrel=1 -pkgdesc="X11 Display Manager Control Protocol library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('xproto' 'lib32-glibc' $_pkgbasename) -makedepends=('xorg-util-macros' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2) -sha1sums=('28132db24727552f77e998e6a6798a5b9b30789f') - -build() { - cd ${srcdir}/libXdmcp-${pkgver} - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/libXdmcp-${pkgver} - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxext/PKGBUILD b/multilib/lib32-libxext/PKGBUILD deleted file mode 100644 index 0008a0b8f..000000000 --- a/multilib/lib32-libxext/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 31542 2010-11-02 00:03:44Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxext -pkgname=lib32-$_pkgbasename -pkgver=1.2.0 -pkgrel=1 -pkgdesc="X11 miscellaneous extensions library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libx11' 'xextproto' $_pkgbasename) -makedepends=('xorg-util-macros' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2) -sha1sums=('090d7109c5fffde8a0063e10f22f3e2ec48cf19e') - -build() { - cd "${srcdir}/libXext-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXext-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxfixes/PKGBUILD b/multilib/lib32-libxfixes/PKGBUILD deleted file mode 100644 index 31f6d2188..000000000 --- a/multilib/lib32-libxfixes/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 26653 2010-09-15 22:47:51Z bluewind $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxfixes -pkgname=lib32-$_pkgbasename -pkgver=4.0.5 -pkgrel=3 -pkgdesc="X11 miscellaneous 'fixes' extension library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libx11>=1.3.4' $_pkgbasename) -makedepends=('pkg-config' gcc-multilib "fixesproto>=4.1.1") -options=('!libtool') -source=(${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2) -sha1sums=('255dfb9a8c50d795c60711ec4764f76cd0620cbf') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXfixes-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXfixes-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxft/PKGBUILD b/multilib/lib32-libxft/PKGBUILD deleted file mode 100644 index 440167576..000000000 --- a/multilib/lib32-libxft/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 31474 2010-10-31 22:37:35Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -_pkgbasename=libxft -pkgname=lib32-$_pkgbasename -pkgver=2.2.0 -pkgrel=1 -pkgdesc="FreeType-based font drawing library for X (32-bit)" -arch=('x86_64' 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-fontconfig' 'lib32-libxrender') -makedepends=('gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2) -sha1sums=('ed29784259f4e26df78141035560ae8a7c62e83f') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/libXft-${pkgver} - ./configure --prefix=/usr \ - --libdir=/usr/lib32 --disable-static - make -} - -package() { - cd "${srcdir}/libXft-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{bin,include,share} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxi/PKGBUILD b/multilib/lib32-libxi/PKGBUILD deleted file mode 100644 index 40b8aa47d..000000000 --- a/multilib/lib32-libxi/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 39079 2011-02-06 10:58:56Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxi -pkgname=lib32-$_pkgbasename -pkgver=1.4.1 -pkgrel=1 -pkgdesc="X11 Input extension library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://xorg.freedesktop.org" -depends=('lib32-libxext' 'inputproto' $_pkgbasename) -makedepends=('pkgconfig' 'xorg-util-macros' gcc-multilib) -options=(!libtool) -license=('custom') -source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('15c9d369cc76c73b5e3833ba3b39355e6cc06636') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXi-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXi-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxinerama/PKGBUILD b/multilib/lib32-libxinerama/PKGBUILD deleted file mode 100644 index 979272492..000000000 --- a/multilib/lib32-libxinerama/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 31546 2010-11-02 00:05:46Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -_pkgbasename=libxinerama -pkgname=lib32-$_pkgbasename -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X11 Xinerama extension library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxext' 'xineramaproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=(!libtool) -source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2) -sha1sums=('f030b0cfcce15502aac78188524f32a6f29bd0a4') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXinerama-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXinerama-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxml2/PKGBUILD b/multilib/lib32-libxml2/PKGBUILD deleted file mode 100644 index b31a77e17..000000000 --- a/multilib/lib32-libxml2/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 33687 2010-11-27 15:36:04Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -_pkgbasename=libxml2 -pkgname=lib32-$_pkgbasename -pkgver=2.7.8 -pkgrel=1 -pkgdesc="XML parsing library, version 2 (32-bit)" -arch=(x86_64 'mips64el') -license=('custom') -depends=('lib32-zlib>=1.2.4' 'lib32-readline>=6.1' 'lib32-ncurses>=5.7' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -url="http://www.xmlsoft.org/" -source=(ftp://ftp.xmlsoft.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz - shared_library_versionning.patch) -md5sums=('8127a65e8c3b08856093099b52599c86' - '84aeb7c6db023eae044e95d9211dba53') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i "${srcdir}/shared_library_versionning.patch" - autoreconf -fi - ./configure --prefix=/usr --with-threads --with-history --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/usr/lib32/xml2Conf.sh" - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxml2/shared_library_versionning.patch b/multilib/lib32-libxml2/shared_library_versionning.patch deleted file mode 100644 index a0b62bca9..000000000 --- a/multilib/lib32-libxml2/shared_library_versionning.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 04 Nov 2010 20:53:14 +0000 -Subject: Reactivate the shared library versionning script - ---- -diff --git a/configure.in b/configure.in -index 59d0629..a1d2c89 100644 ---- a/configure.in -+++ b/configure.in -@@ -84,7 +84,7 @@ else - esac - fi - AC_SUBST(VERSION_SCRIPT_FLAGS) --AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) -+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) - - dnl - dnl We process the AC_ARG_WITH first so that later we can modify --- -cgit v0.8.3.1 diff --git a/multilib/lib32-libxmu/PKGBUILD b/multilib/lib32-libxmu/PKGBUILD deleted file mode 100644 index f25edd963..000000000 --- a/multilib/lib32-libxmu/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 35276 2010-12-18 01:22:30Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxmu -pkgname=lib32-$_pkgbasename -pkgver=1.1.0 -pkgrel=1 -pkgdesc="X11 miscellaneous micro-utility library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'lib32-libxt' $_pkgbasename) -makedepends=('xorg-util-macros' 'gcc-multilib') -license=('custom') -options=('!libtool') -source=(${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2) -sha1sums=('81876a0848070bfc4476a2538fc16898eb6d96cd') - -build() { - cd "${srcdir}/libXmu-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXmu-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxpm/PKGBUILD b/multilib/lib32-libxpm/PKGBUILD deleted file mode 100644 index 764a1bc12..000000000 --- a/multilib/lib32-libxpm/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 35279 2010-12-18 01:24:10Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> -_pkgbasename=libxpm -pkgname=lib32-$_pkgbasename -pkgver=3.5.9 -pkgrel=1 -pkgdesc="X11 pixmap library (32-bit)" -arch=(x86_64 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxt' 'lib32-libxext' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2) -sha1sums=('38258a1d589d3f157e0338d0fd13eec11bc4a39b') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXpm-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXpm-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxrandr/PKGBUILD b/multilib/lib32-libxrandr/PKGBUILD deleted file mode 100644 index 5283fb89e..000000000 --- a/multilib/lib32-libxrandr/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 31551 2010-11-02 00:08:36Z heftig $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -_pkgbasename=libxrandr -pkgname=lib32-$_pkgbasename -pkgver=1.3.1 -pkgrel=1 -pkgdesc="X11 RandR extension library (32-bit)" -arch=('x86_64' 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'lib32-libxrender' 'randrproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -sha1sums=('8e89622b0656cb2eb22c1f3c646c797dc648ead5') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXrandr-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXrandr-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxrender/PKGBUILD b/multilib/lib32-libxrender/PKGBUILD deleted file mode 100644 index 88d7e6560..000000000 --- a/multilib/lib32-libxrender/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 26677 2010-09-15 22:51:11Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxrender -pkgname=lib32-$_pkgbasename -pkgver=0.9.6 -pkgrel=4 -pkgdesc="X Rendering Extension client library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libx11>=1.3.4' $_pkgbasename) -makedepends=('pkgconfig' 'gcc-multilib' renderproto) -options=('!libtool') -source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2) -sha1sums=('65bd96dc17da6b064f95109da02d9c9d14cb06dc') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXrender-${pkgver}" - ./configure --prefix=/usr --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXrender-${pkgver}" - - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxslt/PKGBUILD b/multilib/lib32-libxslt/PKGBUILD deleted file mode 100644 index 1b1949fd8..000000000 --- a/multilib/lib32-libxslt/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 26680 2010-09-15 22:51:35Z bluewind $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -_pkgbasename=libxslt -pkgname=lib32-$_pkgbasename -pkgver=1.1.26 -pkgrel=5 -pkgdesc="XML stylesheet transformation library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://xmlsoft.org/XSLT/" -license=('custom') -depends=('lib32-libxml2>=2.7.7' 'lib32-libgcrypt>=1.4.4' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(ftp://xmlsoft.org/libxslt/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('e61d0364a30146aaa3001296f853b2b9') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 --without-python - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxss/PKGBUILD b/multilib/lib32-libxss/PKGBUILD deleted file mode 100644 index 53a5d932d..000000000 --- a/multilib/lib32-libxss/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 35282 2010-12-18 01:28:22Z heftig $ -# Maintainer: Florian Pritz <flo@xssn.at> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -_pkgbasename=libxss -pkgname=lib32-$_pkgbasename -pkgver=1.2.1 -pkgrel=1 -pkgdesc="X11 Screen Saver extension library (32-bit)" -arch=(x86_64 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'scrnsaverproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2) -sha1sums=('3c29e2222fd68e26e408234c51c6d8b2edf6ab19') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXScrnSaver-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXScrnSaver-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxt/PKGBUILD b/multilib/lib32-libxt/PKGBUILD deleted file mode 100644 index 43ad6c3ac..000000000 --- a/multilib/lib32-libxt/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 45006 2011-04-14 08:11:26Z lcarlier $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxt -pkgname=lib32-$_pkgbasename -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X11 toolkit intrinsics library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libsm' 'lib32-libx11' $_pkgbasename) -makedepends=('xorg-util-macros' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2) -sha1sums=('a29a97f8521bdc7a95364e163f0ce474de572ae5') - -build() { - cd "${srcdir}/libXt-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXt-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxtst/PKGBUILD b/multilib/lib32-libxtst/PKGBUILD deleted file mode 100644 index 72653eabb..000000000 --- a/multilib/lib32-libxtst/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 35285 2010-12-18 01:30:43Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxtst -pkgname=lib32-$_pkgbasename -pkgver=1.2.0 -pkgrel=1 -pkgdesc="X11 Testing -- Resource extension library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxext' 'lib32-libxi' 'recordproto' 'inputproto' $_pkgbasename) -makedepends=('gcc-multilib' 'xorg-util-macros') -options=('!libtool') -source=(${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2) -sha1sums=('9fb06ed599caf7f9e7115cbbfadf02b47c17aa72') - -build() { - cd "${srcdir}/libXtst-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXtst-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxv/PKGBUILD b/multilib/lib32-libxv/PKGBUILD deleted file mode 100644 index 31affeacb..000000000 --- a/multilib/lib32-libxv/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 35288 2010-12-18 01:31:33Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxv -pkgname=lib32-$_pkgbasename -pkgver=1.0.6 -pkgrel=1 -pkgdesc="X11 Video extension library (32-bit)" -arch=(x86_64 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'videoproto' $_pkgbasename) -makedepends=('pkgconfig' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2) -sha1sums=('9ebb6d7936a7b247b9b0f6dc81def39a18e4214c') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${startdir}/src/libXv-${pkgver} - ./configure --prefix=/usr --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd ${startdir}/src/libXv-${pkgver} - - make DESTDIR=${startdir}/pkg install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxvmc/PKGBUILD b/multilib/lib32-libxvmc/PKGBUILD deleted file mode 100644 index 6eb92c0d3..000000000 --- a/multilib/lib32-libxvmc/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 26695 2010-09-15 22:53:40Z bluewind $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxvmc -pkgname=lib32-$_pkgbasename -pkgver=1.0.6 -pkgrel=3 -pkgdesc="X11 Video Motion Compensation extension library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxv>=1.0.5' $_pkgbasename) -makedepends=('pkgconfig' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2) -sha1sums=('4ace7e7ce6b646b5715b2efa561affc89bc87f91') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/libXvMC-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/libXvMC-${pkgver} - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" - -} diff --git a/multilib/lib32-libxxf86dga/PKGBUILD b/multilib/lib32-libxxf86dga/PKGBUILD deleted file mode 100644 index 236aee2f3..000000000 --- a/multilib/lib32-libxxf86dga/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 35291 2010-12-18 01:33:35Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -_pkgbasename=libxxf86dga -pkgname=lib32-$_pkgbasename -pkgver=1.1.2 -pkgrel=1 -pkgdesc="X11 Direct Graphics Access extension library (32-bit)" -arch=(x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxext' 'xf86dgaproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2) -sha1sums=('333a9f5c61eba896f420969561606551174645cd') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXxf86dga-${pkgver}" - ./configure --prefix=/usr --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXxf86dga-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxxf86vm/PKGBUILD b/multilib/lib32-libxxf86vm/PKGBUILD deleted file mode 100644 index 78aab7a7d..000000000 --- a/multilib/lib32-libxxf86vm/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 35294 2010-12-18 01:34:58Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxxf86vm -pkgname=lib32-$_pkgbasename -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X11 XFree86 video mode extension library (32-bit)" -arch=('x86_64' 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'xf86vidmodeproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -sha1sums=('2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXxf86vm-${pkgver}" - ./configure --prefix=/usr --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXxf86vm-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD deleted file mode 100644 index 3bd351707..000000000 --- a/multilib/lib32-mesa/PKGBUILD +++ /dev/null @@ -1,337 +0,0 @@ -# $Id: PKGBUILD 44674 2011-04-10 20:53:16Z lcarlier $ -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=lib32-mesa -pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' -'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri') - -#_git=true -_git=false - -if [ "${_git}" = "true" ]; then - pkgver=7.10.0.git20110215 - else - pkgver=7.10.2 -fi - -pkgrel=2 -arch=(x86_64 'mips64el') -makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' -'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev') -url="http://mesa3d.sourceforge.net" -license=('custom') -if [ "${_git}" = "true" ]; then - # mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866 - source=('ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2') - md5sums=('f0d9daab4aaaacfd3b756dcb23b268af') -else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) - md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') -fi - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - autoreconf -vfi - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" - - if [ "${_git}" = "true" ]; then - ./autogen.sh --prefix=/usr \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-radeon \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --disable-gallium-egl \ - --enable-32-bit \ - --libdir=/usr/lib32 - else - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-radeon \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --disable-gallium-egl \ - --enable-32-bit \ - --libdir=/usr/lib32 - fi - - make -} - -package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions" - - bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/" - - if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - fi - ln -s swrastg_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so" - ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so" - - rm -rf "${pkgdir}"/usr/{include,share,bin} - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl" -} - -package_lib32-libgles() { - depends=('libgles') - pkgdesc="Mesa GLES libraries (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles" -} - -package_lib32-libegl() { - depends=('lib32-udev' 'libegl') - pkgdesc="Mesa libEGL libraries (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/egl" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" - bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libegl" - ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl" -} - -package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'mesa') - pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" - fi - - make DESTDIR="${pkgdir}" install - - - rm -f "${pkgdir}/usr/lib32/libGL.so"* - rm -f "${pkgdir}/usr/lib32/libGLESv"* - rm -f "${pkgdir}/usr/lib32/libEGL"* - rm -rf "${pkgdir}/usr/lib32/egl" - rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc} - rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa" -} - -package_lib32-ati-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" - conflicts=('xf86-video-ati<6.9.0-6') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - - # DRI drivers for r300 and r600 are removed - # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so - if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - fi -} - -package_lib32-intel-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C i810 DESTDIR="${pkgdir}" install - make -C i915 DESTDIR="${pkgdir}" install - make -C i965 DESTDIR="${pkgdir}" install -} - -package_lib32-unichrome-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C unichrome DESTDIR="${pkgdir}" install -} - -package_lib32-mach64-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)" - conflicts=('xf86-video-mach64<6.8.2') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C mach64 DESTDIR="${pkgdir}" install -} - -package_lib32-mga-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Matrox (32-bit)" - conflicts=('xf86-video-mga<1.4.11') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C mga DESTDIR="${pkgdir}" install -} - -package_lib32-r128-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)" - conflicts=('xf86-video-r128<6.8.1') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C r128 DESTDIR="${pkgdir}" install -} - -package_lib32-savage-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)" - conflicts=('xf86-video-savage<2.3.1') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C savage DESTDIR="${pkgdir}" install -} - -package_lib32-sis-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for SiS (32-bit)" - conflicts=('xf86-video-sis<0.10.2') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C sis DESTDIR="${pkgdir}" install -} - -package_lib32-tdfx-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for 3dfx (32-bit)" - conflicts=('xf86-video-tdfx<1.4.3') - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - make -C tdfx DESTDIR="${pkgdir}" install -} - -package_lib32-nouveau-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)" - - if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" - fi - - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C nouveau DESTDIR="${pkgdir}" install - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - fi -} - diff --git a/multilib/lib32-mesa/nouveau-fix-header.patch b/multilib/lib32-mesa/nouveau-fix-header.patch deleted file mode 100644 index 38aa996f1..000000000 --- a/multilib/lib32-mesa/nouveau-fix-header.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 -From: Ben Skeggs <bskeggs@redhat.com> -Date: Mon, 20 Dec 2010 03:39:36 +0000 -Subject: nouveau: fix includes for latest libdrm - -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> ---- -diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h -index ab480ca..747b084 100644 ---- a/src/gallium/drivers/nouveau/nouveau_winsys.h -+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h -@@ -10,7 +10,7 @@ - #include "nouveau/nouveau_grobj.h" - #include "nouveau/nouveau_notifier.h" - #include "nouveau/nouveau_resource.h" --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - #ifndef NV04_PFIFO_MAX_PACKET_LEN - #define NV04_PFIFO_MAX_PACKET_LEN 2047 -diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c -index ce48022..a99df76 100644 ---- a/src/gallium/drivers/nv50/nv50_surface.c -+++ b/src/gallium/drivers/nv50/nv50_surface.c -@@ -22,7 +22,7 @@ - - #define __NOUVEAU_PUSH_H__ - #include <stdint.h> --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - #include "nv50_context.h" - #include "nv50_resource.h" - #include "pipe/p_defines.h" -diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c -index e0e65e7..e2fadd3 100644 ---- a/src/gallium/drivers/nvfx/nv04_2d.c -+++ b/src/gallium/drivers/nvfx/nv04_2d.c -@@ -34,11 +34,11 @@ - #include <stdio.h> - #include <stdint.h> - #include <nouveau/nouveau_device.h> --#include <nouveau/nouveau_pushbuf.h> - #include <nouveau/nouveau_channel.h> - #include <nouveau/nouveau_bo.h> - #include <nouveau/nouveau_notifier.h> - #include <nouveau/nouveau_grobj.h> -+#include <nouveau/nv04_pushbuf.h> - #include "nv04_2d.h" - - #include "nouveau/nv_object.xml.h" -diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c -index 597664e..339b317 100644 ---- a/src/gallium/drivers/nvfx/nvfx_vbo.c -+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c -@@ -9,8 +9,7 @@ - #include "nvfx_resource.h" - - #include "nouveau/nouveau_channel.h" -- --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - static inline unsigned - util_guess_unique_indices_count(unsigned mode, unsigned indices) -diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -index 8036b18..c5ac128 100644 ---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h -+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -@@ -38,7 +38,6 @@ - #include <assert.h> - - #include "nouveau_device.h" --#include "nouveau_pushbuf.h" - #include "nouveau_grobj.h" - #include "nouveau_channel.h" - #include "nouveau_bo.h" -@@ -46,6 +45,7 @@ - #include "nouveau_screen.h" - #include "nouveau_state.h" - #include "nouveau_surface.h" -+#include "nv04_pushbuf.h" - - #define DRIVER_DATE "20091015" - #define DRIVER_AUTHOR "Nouveau" --- -cgit v0.8.3-6-g21f6 diff --git a/multilib/lib32-mpg123/PKGBUILD b/multilib/lib32-mpg123/PKGBUILD deleted file mode 100644 index 67c21cdbc..000000000 --- a/multilib/lib32-mpg123/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 45641 2011-04-26 13:38:33Z bluewind $ -# Maintainer: Hugo Doria <hugo@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -_pkgbasename=mpg123 -pkgname=lib32-$_pkgbasename -pkgver=1.13.3 -pkgrel=1 -pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (32-bit)" -arch=('x86_64' 'mips64el') -url="http://sourceforge.net/projects/mpg123" -license=('GPL2' 'LGPL2.1') -depends=('lib32-glibc' 'lib32-libtool' 'lib32-alsa-lib' $_pkgbasename) -makedepends=('lib32-sdl' gcc-multilib libtool-multilib) -optdepends=('lib32-sdl: for additional audio support') -options=('libtool') -source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('b1f990ce76dcf2fdf9d53ac39fc6bc7e') -sha1sums=('899af289bfcbbb13cbe66d5d0541c25cecf5400d') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - ./configure --prefix=/usr --with-audio="alsa sdl" --with-cpu=i586 --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-ncurses/PKGBUILD b/multilib/lib32-ncurses/PKGBUILD deleted file mode 100644 index 8d9c67c54..000000000 --- a/multilib/lib32-ncurses/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 35258 2010-12-18 00:55:35Z heftig $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -_pkgbasename=ncurses -pkgname=lib32-${_pkgbasename} -pkgver=5.7 -pkgrel=6 -pkgdesc="System V Release 4.0 curses emulation library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.gnu.org/software/ncurses/" -license=('MIT') -depends=('lib32-glibc' ${_pkgbasename}) -makedepends=("gcc-multilib") -source=(ftp://ftp.gnu.org/pub/gnu/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz - set_field_buffer.patch) -md5sums=('cce05daf61a64501ef6cd8da1f727ec6' - '04c8d6d95140a29d72c0eb685a2eeffd') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/ - mkdir ncurses{,w}-build - - # http://permalink.gmane.org/gmane.comp.lib.ncurses.bugs/3559 - patch -Np1 -i ${srcdir}/set_field_buffer.patch - - cd ${srcdir}/ncursesw-build - ../${_pkgbasename}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \ - --with-shared --with-normal --without-debug --without-ada \ - --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32 - make - - # libncurses.so.5 for external binary support - cd ${srcdir}/ncurses-build -# [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long" - ../${_pkgbasename}-${pkgver}/configure --prefix=/usr \ - --with-shared --with-normal --without-debug --without-ada \ - --with-install-prefix=${pkgdir} $CONFIGFLAG --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/ncursesw-build - make install - - install -dm755 ${pkgdir}/usr/lib32 - - # Fool packages looking to link to non-wide-character ncurses libraries - for lib in curses ncurses form panel menu; do - rm -f ${pkgdir}/usr/lib32/lib${lib}.so - echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib32/lib${lib}.so - ln -sf lib${lib}w.a ${pkgdir}/usr/lib32/lib${lib}.a - done - ln -sf libncurses++w.a ${pkgdir}/usr/lib32/libncurses++.a - - # Some packages look for -lcurses during build - rm -f ${pkgdir}/usr/lib32/libcursesw.so - echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib32/libcursesw.so - ln -sf libncurses.so ${pkgdir}/usr/lib32/libcurses.so - ln -sf libncursesw.a ${pkgdir}/usr/lib32/libcursesw.a - ln -sf libncurses.a ${pkgdir}/usr/lib32/libcurses.a - - # non-widec compatibility library - cd ${srcdir}/ncurses-build - install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib32/libncurses.so.${pkgver} - ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib32/libncurses.so.5 - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-ncurses/set_field_buffer.patch b/multilib/lib32-ncurses/set_field_buffer.patch deleted file mode 100644 index a2132043e..000000000 --- a/multilib/lib32-ncurses/set_field_buffer.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- src/ncurses-5.7/form/frm_driver.c 2008/10/18 16:25:00 1.88 -+++ src/ncurses-5.7/form/frm_driver.c 2008/12/06 23:08:12 -@@ -4366,6 +4366,7 @@ - delwin(field->working); - field->working = newpad(field->drows, field->dcols); - } -+ len = Buffer_Length(field); - wclear(field->working); - mvwaddstr(field->working, 0, 0, value); diff --git a/multilib/lib32-nspr/PKGBUILD b/multilib/lib32-nspr/PKGBUILD deleted file mode 100644 index 335a53872..000000000 --- a/multilib/lib32-nspr/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 26713 2010-09-15 22:57:32Z bluewind $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=nspr -pkgname=lib32-$_pkgbasename -pkgver=4.8.6 -pkgrel=2 -pkgdesc="Netscape Portable Runtime (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.mozilla.org/projects/nspr/" -license=('MPL' 'GPL') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('zip' 'gcc-multilib') -options=(!emptydirs) -source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz - nspr.pc.in) -md5sums=('592c275728c29d193fdba8009165990b' - 'bce1611f3117b53fc904cab549c09967') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - unset CFLAGS - unset CXXFLAGS - ./mozilla/nsprpub/configure \ - --prefix=/usr \ - --libdir=/usr/lib32 \ - --includedir=/usr/include/nspr \ - --enable-optimize \ - --disable-debug ${confflags} - make - - NSPR_LIBS=`./config/nspr-config --libs` - NSPR_CFLAGS=`./config/nspr-config --cflags` - NSPR_VERSION=`./config/nspr-config --version` - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib32," \ - -e "s,%prefix%,/usr," \ - -e "s,%exec_prefix%,/usr/bin," \ - -e "s,%includedir%,/usr/include/nspr," \ - -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \ - -e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \ - -e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${srcdir}/nspr.pc" -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -D "${srcdir}/nspr.pc" "${pkgdir}"/usr/lib32/pkgconfig/nspr.pc - chmod 644 "${pkgdir}/usr/lib32/pkgconfig/nspr.pc" - ln -sf nspr.pc "${pkgdir}/usr/lib32/pkgconfig/mozilla-nspr.pc" - - chmod 644 ${pkgdir}/usr/lib32/*.a - - rm -rf "${pkgdir}"/usr/{bin,share,include} -} diff --git a/multilib/lib32-nspr/nspr.pc.in b/multilib/lib32-nspr/nspr.pc.in deleted file mode 100644 index 1d8f4a0ca..000000000 --- a/multilib/lib32-nspr/nspr.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSPR -Description: The Netscape Portable Runtime -Version: %NSPR_VERSION% -Libs: %FULL_NSPR_LIBS% -Cflags: %FULL_NSPR_CFLAGS% diff --git a/multilib/lib32-nss/PKGBUILD b/multilib/lib32-nss/PKGBUILD deleted file mode 100644 index 99321becc..000000000 --- a/multilib/lib32-nss/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 35060 2010-12-15 09:33:55Z heftig $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=nss -pkgname=lib32-$_pkgbasename -pkgver=3.12.8 -pkgrel=1 -pkgdesc="Mozilla's Netscape Security Services Library that implements PKI support (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.mozilla.org/projects/security/pki/nss/" -license=('MPL' 'GPL') -_nsprver=4.8.6 -depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.6.17' "$_pkgbasename" 'lib32-zlib') -makedepends=('gcc-multilib' 'perl') -source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz - nss-no-rpath.patch - nss.pc.in - add_spi+cacert_ca_certs.patch - ssl-renegotiate-transitional.patch) -options=('!strip') -md5sums=('40bf1bb0c7567827d3768d1fc6081100' - 'e5c97db0c884d5f4cfda21e562dc9bba' - 'c547b030c57fe1ed8b77c73bf52b3ded' - '7f39c19b1dfd62d7db7d8bf19f156fed' - 'd83c7b61abb7e9f8f7bcd157183d1ade') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian - patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch" - # Adds transitional SSL renegotiate support - patch from Debian - patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch" - # Removes rpath - patch -Np0 -i "${srcdir}/nss-no-rpath.patch" - - make -C mozilla/security/nss/lib/ckfw/builtins generate - - unset CFLAGS - unset CXXFLAGS - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - export BUILD_OPT=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` - export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` - - make -j 1 -C mozilla/security/coreconf - make -j 1 -C mozilla/security/dbm - make -j 1 -C mozilla/security/nss - - NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - - sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib32,g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr/bin,g" \ - -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,${_nsprver},g" \ - -e "s,%NSS_VERSION%,${pkgver},g" > \ - "${srcdir}/nss.pc" -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - install -m644 "${srcdir}"/nss.pc "${pkgdir}/usr/lib32/pkgconfig/nss.pc" - ln -sf nss.pc "${pkgdir}/usr/lib32/pkgconfig/mozilla-nss.pc" - chmod 644 ${pkgdir}/usr/lib32/pkgconfig/*.pc - - for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ - libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so - do - install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib32/" - done - - install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib32/" - install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib32/" - -} diff --git a/multilib/lib32-nss/add_spi+cacert_ca_certs.patch b/multilib/lib32-nss/add_spi+cacert_ca_certs.patch deleted file mode 100644 index 1cc7c18f5..000000000 --- a/multilib/lib32-nss/add_spi+cacert_ca_certs.patch +++ /dev/null @@ -1,561 +0,0 @@ ---- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -+++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -@@ -20926,3 +20926,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 1 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 -+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 -+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 -+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 -+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 -+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 -+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 -+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 -+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 -+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 -+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 -+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 -+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 -+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 -+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 -+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 -+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 -+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 -+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 -+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 -+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 -+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 -+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 -+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 -+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 -+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 -+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 -+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 -+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 -+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 -+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 -+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 -+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 -+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 -+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 -+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 -+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 -+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 -+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 -+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 -+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 -+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 -+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 -+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 -+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 -+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 -+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 -+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 -+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 -+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 -+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 -+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 -+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 -+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 -+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 -+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 -+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 -+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 -+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 -+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 -+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 -+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 -+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 -+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 -+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 -+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 -+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 -+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 -+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 -+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 -+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 -+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 -+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 -+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 -+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 -+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 -+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 -+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 -+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 -+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 -+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 -+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 -+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 -+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 -+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 -+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 -+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 -+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 -+\103 -+END -+ -+# Trust for Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 -+\166\316\217\063 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 3 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 -+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 -+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 -+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 -+\063\040\122\157\157\164 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 -+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 -+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 -+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 -+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 -+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 -+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 -+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 -+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 -+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 -+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 -+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 -+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 -+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 -+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 -+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 -+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 -+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 -+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 -+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 -+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 -+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 -+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 -+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 -+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 -+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 -+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 -+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 -+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 -+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 -+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 -+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 -+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 -+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 -+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 -+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 -+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 -+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 -+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 -+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 -+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 -+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 -+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 -+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 -+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 -+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 -+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 -+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 -+END -+ -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 -+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 -+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 -+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 -+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 -+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 -+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 -+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 -+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 -+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 -+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 -+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 -+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 -+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 -+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 -+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 -+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 -+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 -+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 -+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 -+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 -+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 -+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 -+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 -+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 -+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 -+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 -+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 -+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 -+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 -+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 -+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 -+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 -+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 -+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 -+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 -+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 -+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 -+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 -+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 -+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 -+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 -+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 -+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 -+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 -+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 -+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 -+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 -+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 -+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 -+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 -+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 -+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 -+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 -+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 -+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 -+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 -+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 -+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 -+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 -+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 -+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 -+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 -+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 -+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 -+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 -+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 -+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 -+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 -+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 -+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 -+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 -+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 -+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 -+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 -+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 -+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 -+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 -+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 -+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 -+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 -+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 -+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 -+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 -+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 -+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 -+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 -+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 -+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 -+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 -+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 -+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 -+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 -+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 -+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 -+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 -+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 -+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 -+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 -+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 -+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 -+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 -+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 -+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 -+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 -+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 -+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 -+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 -+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 -+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 -+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 -+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 -+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 -+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 -+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 -+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 -+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 -+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 -+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 -+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 -+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 -+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 -+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 -+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 -+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 -+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 -+\243\140 -+END -+ -+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 -+\251\220\103\034 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/multilib/lib32-nss/nss-no-rpath.patch b/multilib/lib32-nss/nss-no-rpath.patch deleted file mode 100644 index 35ea57315..000000000 --- a/multilib/lib32-nss/nss-no-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 -+++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 -@@ -52,9 +52,9 @@ - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' - endif - endif - diff --git a/multilib/lib32-nss/nss-nolocalsql.patch b/multilib/lib32-nss/nss-nolocalsql.patch deleted file mode 100644 index dc75a223f..000000000 --- a/multilib/lib32-nss/nss-nolocalsql.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile ---- ./mozilla/security/nss/lib/Makefile.nolocalsql 2010-02-27 16:40:25.891777537 -0800 -+++ ./mozilla/security/nss/lib/Makefile 2010-02-27 16:41:59.175902327 -0800 -@@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB - ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS. - endif - --ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE --SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. --endif --endif -+#ifndef MOZILLA_CLIENT -+#ifndef NSS_USE_SYSTEM_SQLITE -+#SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. -+#endif -+#endif - - ifndef MOZILLA_CLIENT - ifeq ($(OS_ARCH),Linux) -diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn ---- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2010-02-27 16:44:24.998777709 -0800 -+++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2010-02-27 16:45:08.533803472 -0800 -@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def - - DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" - --ifdef MOZILLA_CLIENT --INCLUDES += -I$(DIST)/include/sqlite3 --endif -+#ifdef MOZILLA_CLIENT -+#INCLUDES += -I$(DIST)/include/sqlite3 -+#endif - - CSRCS = \ - dbmshim.c \ -diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn ---- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2010-02-27 16:42:52.213902231 -0800 -+++ ./mozilla/security/nss/lib/softoken/manifest.mn 2010-02-27 16:43:34.040776788 -0800 -@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def - - DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" - --ifdef MOZILLA_CLIENT --INCLUDES += -I$(DIST)/include/sqlite3 --endif -+#ifdef MOZILLA_CLIENT -+#INCLUDES += -I$(DIST)/include/sqlite3 -+#endif - - EXPORTS = \ - secmodt.h \ diff --git a/multilib/lib32-nss/nss.pc.in b/multilib/lib32-nss/nss.pc.in deleted file mode 100644 index d47b9e146..000000000 --- a/multilib/lib32-nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 -Cflags: -I${includedir} diff --git a/multilib/lib32-nss/ssl-renegotiate-transitional.patch b/multilib/lib32-nss/ssl-renegotiate-transitional.patch deleted file mode 100644 index f457c5551..000000000 --- a/multilib/lib32-nss/ssl-renegotiate-transitional.patch +++ /dev/null @@ -1,21 +0,0 @@ -Enable transitional scheme for ssl renegotiation: - -(from mozilla/security/nss/lib/ssl/ssl.h) -Disallow unsafe renegotiation in server sockets only, but allow clients -to continue to renegotiate with vulnerable servers. -This value should only be used during the transition period when few -servers have been upgraded. - -diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c -index f1d1921..c074360 100644 ---- a/mozilla/security/nss/lib/ssl/sslsock.c -+++ b/mozilla/security/nss/lib/ssl/sslsock.c -@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { - PR_FALSE, /* noLocks */ - PR_FALSE, /* enableSessionTickets */ - PR_FALSE, /* enableDeflate */ -- 2, /* enableRenegotiation (default: requires extension) */ -+ 3, /* enableRenegotiation (default: transitional) */ - PR_FALSE, /* requireSafeNegotiation */ - }; - diff --git a/multilib/lib32-openal/PKGBUILD b/multilib/lib32-openal/PKGBUILD deleted file mode 100644 index 6f3ecf254..000000000 --- a/multilib/lib32-openal/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 42890 2011-03-22 08:03:47Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Jason Chu <jchu@xentac.net> - -_pkgbasename=openal -pkgname=lib32-$_pkgbasename -pkgver=1.13 -pkgrel=2 -pkgdesc="OpenAL audio library for use with opengl (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.openal.org/" -license=('LGPL') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'lib32-sdl' 'lib32-libpulse' 'pkgconfig' 'cmake' gcc-multilib) -options=('!libtool') -source=(http://kcat.strangesoft.net/openal-releases/openal-soft-${pkgver}.tar.bz2) -md5sums=('58b7d2809790c70681b825644c5f3614') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-soft-${pkgver}/build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D LIB_SUFFIX=32 .. - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-soft-${pkgver}/build - make DESTDIR=${pkgdir}/ install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-openssl/PKGBUILD b/multilib/lib32-openssl/PKGBUILD deleted file mode 100644 index b9efc62b6..000000000 --- a/multilib/lib32-openssl/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 39457 2011-02-10 15:44:47Z bluewind $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -_pkgbasename=openssl -pkgname=lib32-$_pkgbasename -_ver=1.0.0d -# use a pacman compatible version scheme -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 -pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit)' -arch=('x86_64' 'mips64el') -url='https://www.openssl.org' -license=('custom:BSD') -depends=(lib32-zlib $_pkgbasename) -optdepends=('ca-certificates' perl gcc-multilib) -options=('!makeflags') -source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz" - 'no-rpath.patch' - 'ca-dir.patch') -md5sums=('40b6ea380cc8a5bf9734c2f8bf7e701e' - 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90') - - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/$_pkgbasename-$_ver - - # remove rpath: http://bugs.archlinux.org/task/14367 - patch -p0 -i $srcdir/no-rpath.patch - # set ca dir to /etc/ssl by default - patch -p0 -i $srcdir/ca-dir.patch - # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - ./Configure linux-elf --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \ - shared zlib enable-md2 -Wa,--noexecstack - - make - - # the test fails due to missing write permissions in /etc/ssl - # revert this patch for make test - #patch -p0 -R -i $srcdir/ca-dir.patch - #make test - #patch -p0 -i $srcdir/ca-dir.patch -} - -package() { - cd $srcdir/$_pkgbasename-$_ver - make INSTALL_PREFIX=$pkgdir install - - rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/etc" - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-openssl/ca-dir.patch b/multilib/lib32-openssl/ca-dir.patch deleted file mode 100644 index 41d1386d3..000000000 --- a/multilib/lib32-openssl/ca-dir.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200 -+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200 -@@ -53,7 +53,7 @@ - $X509="$openssl x509"; - $PKCS12="$openssl pkcs12"; - --$CATOP="./demoCA"; -+$CATOP="/etc/ssl"; - $CAKEY="cakey.pem"; - $CAREQ="careq.pem"; - $CACERT="cacert.pem"; ---- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200 -+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200 -@@ -68,7 +68,7 @@ - X509="$OPENSSL x509" - PKCS12="openssl pkcs12" - --if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi -+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi - CAKEY=./cakey.pem - CAREQ=./careq.pem - CACERT=./cacert.pem ---- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200 -+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200 -@@ -39,7 +39,7 @@ - #################################################################### - [ CA_default ] - --dir = ./demoCA # Where everything is kept -+dir = /etc/ssl # Where everything is kept - certs = $dir/certs # Where the issued certs are kept - crl_dir = $dir/crl # Where the issued crl are kept - database = $dir/index.txt # database index file. diff --git a/multilib/lib32-openssl/no-rpath.patch b/multilib/lib32-openssl/no-rpath.patch deleted file mode 100644 index ebd95e23d..000000000 --- a/multilib/lib32-openssl/no-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200 -+++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100 -@@ -153,7 +153,7 @@ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - --DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(CFLAGS)" - - #This is rather special. It's a special target with which one can link - #applications without bothering with any features that have anything to diff --git a/multilib/lib32-pango/PKGBUILD b/multilib/lib32-pango/PKGBUILD deleted file mode 100644 index 1a94dab96..000000000 --- a/multilib/lib32-pango/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 27942 2010-09-30 15:32:18Z heftig $ -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> -# Maintainer: Biru Ionut <ionut@archlinux.ro> -_pkgbasename=pango -pkgname=lib32-$_pkgbasename -pkgver=1.28.3 -pkgrel=1 -pkgdesc="A library for layout and rendering of text (32-bit)" -arch=('x86_64' 'mips64el') -license=('LGPL') -depends=('lib32-glib2>=2.25.15' 'lib32-cairo>=1.10.0' 'lib32-libxft>=2.1.14' - 'lib32-freetype2>=2.4.2' $_pkgbasename) -makedepends=("gcc-multilib") -options=('!libtool' '!emptydirs') -install=pango.install -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.28/${_pkgbasename}-${pkgver}.tar.bz2 - pango-modules-conffile.patch) -url="http://www.pango.org/" -sha256sums=('5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632' - '4a178b60dd420ae53baeabbecfaaeca4070a4b777b2b3f36d137cd70b5a270c3') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -p0 < ${srcdir}/pango-modules-conffile.patch - # No libthai support yet - ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \ - --localstatedir=/var --with-included-modules=basic-fc \ - --with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc \ - --disable-introspection - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "$pkgdir"/etc - rm -rf "$pkgdir"/usr/{bin/pango-view,share,include} - mv "$pkgdir"/usr/bin/pango-querymodules "$pkgdir"/usr/bin/pango-querymodules-32 -} diff --git a/multilib/lib32-pango/pango-modules-conffile.patch b/multilib/lib32-pango/pango-modules-conffile.patch deleted file mode 100644 index a959cf1c8..000000000 --- a/multilib/lib32-pango/pango-modules-conffile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pango/modules.c.orig 2010-08-26 06:45:49.329259966 +0200 -+++ pango/modules.c 2010-08-26 06:46:13.786685177 +0200 -@@ -529,7 +529,7 @@ - - if (!file_str) - file_str = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+ "pango.modules-32", - NULL); - - files = pango_split_file_list (file_str); -@@ -640,7 +640,7 @@ - if (!no_module_warning) - { - gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+ "pango.modules-32", - NULL); - g_critical ("No modules found:\n" - "No builtin or dynamically loaded modules were found.\n" diff --git a/multilib/lib32-pango/pango.install b/multilib/lib32-pango/pango.install deleted file mode 100644 index 173b6820f..000000000 --- a/multilib/lib32-pango/pango.install +++ /dev/null @@ -1,21 +0,0 @@ -# arg 1: the new package version -post_install() { - # we need to ldconfig first, in case xfree86's libs aren't - # in ld.so.cache yet - sbin/ldconfig -r . - usr/bin/pango-querymodules-32 >etc/pango/pango.modules-32 -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ -f etc/pango/pango.modules-32 ]; then - rm etc/pango/pango.modules-32 - fi - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - rm etc/pango/pango.modules-32 -} diff --git a/multilib/lib32-pcre/PKGBUILD b/multilib/lib32-pcre/PKGBUILD deleted file mode 100644 index e03418258..000000000 --- a/multilib/lib32-pcre/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 45653 2011-04-26 16:31:21Z svenstaro $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=pcre -pkgname=lib32-$_pkgbasename -pkgver=8.12 -pkgrel=1 -pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)" -arch=('x86_64' 'mips64el') -url="http://pcre.sourceforge.net" -license=('custom') -depends=('lib32-gcc-libs' $_pkgbasename) -makedepends=('gcc-multilib') -options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('f14a9fef3c92f3fc6c5ac92d7a2c7eb3') - -build() { - cd "${srcdir}"/${_pkgbasename}-${pkgver} - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --enable-utf8 --enable-unicode-properties - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-pixman/PKGBUILD b/multilib/lib32-pixman/PKGBUILD deleted file mode 100644 index bbb54aac2..000000000 --- a/multilib/lib32-pixman/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 38980 2011-02-04 14:53:22Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -_pkgbasename=pixman -pkgname=lib32-$_pkgbasename -pkgver=0.20.2 -pkgrel=1 -pkgdesc="Pixman library (32-bit)" -arch=('x86_64' 'mips64el') -url="http://xorg.freedesktop.org" -license=('custom') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://xorg.freedesktop.org/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2) -sha1sums=('9972c8f8ce484f7649d9f588168cd29f61c05c63') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/include - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD deleted file mode 100644 index 889848621..000000000 --- a/multilib/lib32-qt/PKGBUILD +++ /dev/null @@ -1,94 +0,0 @@ -# $Id: PKGBUILD 46350 2011-05-05 17:50:49Z bluewind $ -# Maintainer: Florian Pritz <flo@xssn.at> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -_pkgbasename=qt -pkgname=lib32-$_pkgbasename -pkgver=4.7.3 -pkgrel=1 -pkgdesc='A cross-platform application and UI framework (32-bit)' -arch=('x86_64' 'mips64el') -url='http://qt.nokia.com/' -license=('GPL3' 'LGPL') -depends=(lib32-{fontconfig,sqlite3,alsa-lib,glib2,dbus-core,openssl} - lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi} $_pkgbasename) -optdepends=('lib32-libxinerama: Xinerama support' - 'lib32-libxcursor: Xcursor support' - 'lib32-libxfixes: Xfixes support') -makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2}) -options=('!libtool') -_pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz") -md5sums=('49b96eefb1224cc529af6fe5608654fe') - -build() { - unset QMAKESPEC - export QT4DIR=$srcdir/$_pkgfqn - export PATH=${QT4DIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/$_pkgfqn - - sed -e "s|-O2|$CXXFLAGS -m32|" \ - -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ - -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \ - -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ - -i mkspecs/common/g++.conf - - ./configure -confirm-license -opensource -v -platform linux-g++-32 \ - -prefix /usr \ - -libdir /usr/lib32 \ - -plugindir /usr/lib32/qt/plugins \ - -importdir /usr/lib32/qt/imports \ - -datadir /usr/share/qt \ - -translationdir /usr/share/qt/translations \ - -sysconfdir /etc \ - -largefile \ - -system-sqlite \ - -xmlpatterns \ - -no-phonon \ - -no-phonon-backend \ - -svg \ - -webkit \ - -script \ - -scripttools \ - -system-zlib \ - -system-libtiff \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -nomake tools \ - -no-rpath \ - -openssl-linked \ - -optimized-qmake \ - -dbus \ - -reduce-relocations \ - -no-separate-debug-info \ - -gtkstyle \ - -opengl \ - -no-openvg \ - -glib - - make -} - -package() { - cd $srcdir/$_pkgfqn - make INSTALL_ROOT=$pkgdir install - - # Fix wrong path in pkgconfig files - find ${pkgdir}/usr/lib32/pkgconfig -type f -name '*.pc' \ - -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - # Fix wrong path in prl files - find ${pkgdir}/usr/lib32 -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-readline/PKGBUILD b/multilib/lib32-readline/PKGBUILD deleted file mode 100644 index ca5425faf..000000000 --- a/multilib/lib32-readline/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 26740 2010-09-15 23:02:31Z bluewind $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -_pkgbasename=readline -pkgname=lib32-$_pkgbasename -_patchlevel=002 #prepare for some patches -pkgver=6.1.$_patchlevel -pkgrel=3 -pkgdesc="GNU readline library (32-bit)" -arch=(x86_64 'mips64el') -url="http://tiswww.case.edu/php/chet/readline/rltop.html" -license=('GPL') -depends=('lib32-glibc' 'lib32-ncurses' $_pkgbasename) -makedepends=('gcc-multilib') -source=(http://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz) -if [ $_patchlevel -gt 00 ]; then - for (( p=1; p<=$_patchlevel; p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-6.1-patches/readline61-$(printf "%03d" $p)) - done -fi -md5sums=('fc2f7e714fe792db1ce6ddc4c9fb4ef3' - 'c642f2e84d820884b0bf9fd176bc6c3f' - '1a76781a1ea734e831588285db7ec9b1') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-6.1 - for p in ../readline61-*; 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 - - ./configure --prefix=/usr --libdir=/usr/lib32 - make SHLIB_LIBS=-lncurses -} - -package() { - cd ${srcdir}/${_pkgbasename}-6.1 - - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-sdl/PKGBUILD b/multilib/lib32-sdl/PKGBUILD deleted file mode 100644 index 460067c9b..000000000 --- a/multilib/lib32-sdl/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 33692 2010-11-27 16:54:21Z heftig $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -_pkgbasename=sdl -pkgname=lib32-$_pkgbasename -pkgver=1.2.14 -pkgrel=8 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.libsdl.org" -license=('LGPL') -depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) -options=('!libtool') -source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-joystick-crash.diff - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-fix-disappearing-cursor.patch) -md5sums=('e52086d1b508fa0b76c52ee30b55bec4' - '9d8890b3817736a5d365f7497f096634' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'a6cf3e71b653aa97d0d8ae6c0a789807') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff - patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch - ./configure --prefix=/usr --disable-nasm --enable-alsa \ - --with-x --disable-rpath --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/SDL-${pkgver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-sdl/sdl-1.2.14-fix-disappearing-cursor.patch b/multilib/lib32-sdl/sdl-1.2.14-fix-disappearing-cursor.patch deleted file mode 100644 index fcd3c314d..000000000 --- a/multilib/lib32-sdl/sdl-1.2.14-fix-disappearing-cursor.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: SDL-1.2.14/src/video/x11/SDL_x11events.c -=================================================================== ---- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -@@ -444,8 +444,10 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( xevent.xcrossing.detail != NotifyInferior ) { -- if ( this->input_grab == SDL_GRAB_OFF ) { -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) && -+ (xevent.xcrossing.detail != NotifyInferior) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { - posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); - } else { - posted = SDL_PrivateMouseMotion(0, 0, diff --git a/multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch b/multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch deleted file mode 100644 index 7d3e5acfc..000000000 --- a/multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 -@@ -423,12 +423,15 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( this->input_grab == SDL_GRAB_OFF ) { -- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { -+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ } -+ posted = SDL_PrivateMouseMotion(0, 0, -+ xevent.xcrossing.x, -+ xevent.xcrossing.y); - } -- posted = SDL_PrivateMouseMotion(0, 0, -- xevent.xcrossing.x, -- xevent.xcrossing.y); - } - break; - diff --git a/multilib/lib32-sdl/sdl-1.2.14-joystick-crash.diff b/multilib/lib32-sdl/sdl-1.2.14-joystick-crash.diff deleted file mode 100644 index 949e18b96..000000000 --- a/multilib/lib32-sdl/sdl-1.2.14-joystick-crash.diff +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix crash with joystick detection. -Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c -=================================================================== ---- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:37:36.000000000 -0500 -+++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:38:27.000000000 -0500 -@@ -700,7 +700,7 @@ - continue; - } - if ( test_bit(i, absbit) ) { -- int values[5]; -+ int values[6]; - - if ( ioctl(fd, EVIOCGABS(i), values) < 0 ) - continue; diff --git a/multilib/lib32-sdl_image/PKGBUILD b/multilib/lib32-sdl_image/PKGBUILD deleted file mode 100644 index 061fc3caf..000000000 --- a/multilib/lib32-sdl_image/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 29403 2010-10-14 00:20:35Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: SpepS <dreamspepser at yahoo dot it> - -_pkgbasename=sdl_image -pkgname=lib32-$_pkgbasename -pkgver=1.2.10 -pkgrel=3 -pkgdesc="A simple library to load images of various formats as SDL surfaces (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.libsdl.org/projects/SDL_image/" -license=('LGPL') -depends=('lib32-sdl' 'lib32-libpng' 'lib32-libjpeg' 'lib32-libtiff' 'lib32-zlib' "$_pkgbasename") -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz) -md5sums=('6c06584b31559e2b59f2b982d0d1f628') - -build() { - export CC='gcc -m32' - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - - cd ${srcdir}/SDL_image-${pkgver} - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/SDL_image-${pkgver} - - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/include -} - -# vim: sw=2:ts=2 et: diff --git a/multilib/lib32-sdl_ttf/PKGBUILD b/multilib/lib32-sdl_ttf/PKGBUILD deleted file mode 100644 index 046c04589..000000000 --- a/multilib/lib32-sdl_ttf/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 35154 2010-12-16 21:15:47Z heftig $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Esa lakaniemi <esalaka@gmail.com> - -_pkgbasename=sdl_ttf -pkgname=lib32-$_pkgbasename -pkgver=2.0.10 -pkgrel=3 -pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (32-bit)" -arch=('x86_64' 'mips64el') -url="http://www.libsdl.org/projects/SDL_ttf/" -license=('LGPL') -options=('!libtool') -depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename) -makedepends=('gcc-multilib') -source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz) -sha256sums=('7d38704bcc7c34029c2dcb73b2d4857e8ad76341c6e0faed279eb9f743c66c6a') - -build() { - cd "${srcdir}"/SDL_ttf-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 CC="gcc -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - make -} - -package() { - cd "${srcdir}"/SDL_ttf-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/include -} - -# vim: sw=2:ts=2 et: diff --git a/multilib/lib32-speex/PKGBUILD b/multilib/lib32-speex/PKGBUILD deleted file mode 100644 index 39ab6e756..000000000 --- a/multilib/lib32-speex/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 26746 2010-09-15 23:03:23Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=speex -pkgname=lib32-$_pkgbasename -pkgver=1.2rc1 -pkgrel=3 -pkgdesc="A free codec for free speech (32-bit)" -arch=(x86_64 'mips64el') -license=('BSD') -depends=('lib32-libogg' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://downloads.us.xiph.org/releases/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz) -md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae') -url="http://www.speex.org/" - -build() { - cd $srcdir/speex-$pkgver - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/speex-$pkgver - make DESTDIR=$pkgdir install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-sqlite3/PKGBUILD b/multilib/lib32-sqlite3/PKGBUILD deleted file mode 100644 index 02e8ff780..000000000 --- a/multilib/lib32-sqlite3/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Biru Ionut <ionut@archlinux.ro> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> -# Contributor: Kaos < gianlucaatlas dot gmail dot com > - -_pkgbasename=sqlite3 -pkgname=lib32-sqlite3 -_amalgamationver=3070400 -pkgver=3.7.4 -pkgrel=1 -pkgdesc="A C library that implements an SQL database engine (32-bit)" -arch=('x86_64' 'mips64el') -license=('custom') -url="http://www.sqlite.org/" -depends=(lib32-glibc $_pkgbasename) -makedepends=('tcl' 'gcc-multilib' 'lib32-readline') -source=(http://www.sqlite.org/sqlite-src-${_amalgamationver}.zip) -options=(!libtool) -md5sums=('2b5c53328505893599de6e2055996d7a') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/sqlite-src-${_amalgamationver} - export LTLINK_EXTRAS="-ldl" - export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --enable-threadsafe \ - --enable-threads-override-locks \ - --enable-cross-thread-connections \ - --disable-static --disable-tcl \ - --enable-load-extension - - # rpath removal - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - - make -} - - -package() { - cd ${srcdir}/sqlite-src-${_amalgamationver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-talloc/PKGBUILD b/multilib/lib32-talloc/PKGBUILD deleted file mode 100644 index ed0642994..000000000 --- a/multilib/lib32-talloc/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 29311 2010-10-12 21:12:22Z lcarlier $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -_pkgbasename=talloc -pkgname=lib32-$_pkgbasename -pkgver=2.0.1 -pkgrel=1 -pkgdesc="talloc is a hierarchical pool based memory allocator with destructors (32-bit)" -arch=(x86_64 'mips64el') -license=('GPL3') -url="http://talloc.samba.org/" -source=(http://samba.org/ftp/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz) -depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib) -md5sums=('c6e736540145ca58cb3dcb42f91cf57b') - -build() { - export CC="gcc -m32" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc/samba \ - --localstatedir=/var \ - --enable-talloc-compat1 \ - --enable-largefile \ - --libdir=/usr/lib32 - - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - make DESTDIR=$pkgdir/ install - - # fix permission - chmod 644 $pkgdir/usr/lib32/libtalloc.a - rm -rf $pkgdir/usr/include -} - diff --git a/multilib/lib32-tdb/PKGBUILD b/multilib/lib32-tdb/PKGBUILD deleted file mode 100644 index 3de057af9..000000000 --- a/multilib/lib32-tdb/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Florian Pritz <flo@xssn.at> - -_pkgbasename=tdb -pkgname=lib32-$_pkgbasename -pkgver=1.2.1 -pkgrel=3 -pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits (32-bit)" -arch=(x86_64 'mips64el') -license=('GPL3') -url="http://tdb.samba.org/" -depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib libxslt) -options=(force) -source=(http://samba.org/ftp/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('73ea81282a82e5c959d9c082af2d0215') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr \ - --localstatedir=/var \ - --sysconfdir=/etc/samba \ - --libdir=/usr/lib32 \ - --disable-python - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make -j1 DESTDIR="$pkgdir" install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD deleted file mode 100644 index 3545cd2b4..000000000 --- a/multilib/lib32-udev/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=('lib32-udev') -pkgver=166 -pkgrel=1 -arch=('x86_64' 'mips64el') -pkgdesc="The userspace dev tools (udev) (32-bit)" -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -options=(!makeflags !libtool) -depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') -makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) -md5sums=('4db27d73fdbe94f47fd89fdd105c2dfb') - -build() { - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/udev-$pkgver - - ./configure --libdir=/usr/lib32 - make -} - -package() { - - cd $srcdir/udev-$pkgver - - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/{etc,include,lib,libexec,sbin,share} - rm -rf ${pkgdir}/usr/lib32/girepository* -} diff --git a/multilib/lib32-util-linux/PKGBUILD b/multilib/lib32-util-linux/PKGBUILD deleted file mode 100644 index 30196cad0..000000000 --- a/multilib/lib32-util-linux/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 41742 2011-03-08 19:17:58Z dreisner $ -# Maintainer: judd <jvinet@zeroflux.org> - -_pkgbasename=util-linux -pkgname=lib32-$_pkgbasename -pkgver=2.19 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux (32-bit)" -url="http://userweb.kernel.org/~kzak/util-linux-ng/" -arch=('x86_64' 'mips64el') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib') -provides=('lib32-util-linux-ng') -conflicts=('lib32-util-linux-ng') -replaces=('lib32-util-linux-ng') -license=('GPL2') -options=('!libtool' '!emptydirs') -source=(ftp://ftp.kernel.org/pub/linux/utils/${_pkgbasename}/v2.19/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('590ca71aad0b254e2631d84401f28255') - -shopt -s extglob - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c - mkdir -p "${pkgdir}/var/lib/hwclock" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./autogen.sh - ./configure --without-ncurses --libdir=/usr/lib32 - - cd shlibs - for lib in *; do - make -C $lib - done -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="$pkgdir" install - - # remove unnecessary files - cd "$pkgdir" - rm -rf !(usr) - cd usr - rm -rf !(lib32) -} diff --git a/multilib/lib32-v4l-utils/PKGBUILD b/multilib/lib32-v4l-utils/PKGBUILD deleted file mode 100644 index a51321121..000000000 --- a/multilib/lib32-v4l-utils/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 88966 2010-08-26 18:32:27Z thomas $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -_pkgbasename=v4l-utils -pkgname=lib32-$_pkgbasename -pkgver=0.8.3 -pkgrel=1 -pkgdesc="Userspace tools and conversion library for Video 4 Linux (32-bit)" -arch=('x86_64' 'mips64el') -url="http://freshmeat.net/projects/libv4l" -provides=("lib32-libv4l=$pkgver") -replaces=('lib32-libv4l') -conflicts=('lib32-libv4l') -license=('LGPL') -makedepends=('gcc-multilib') -depends=('lib32-gcc-libs' $_pkgbasename) -source=(http://linuxtv.org/downloads/v4l-utils/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('525ebed7ef6e0f6a4bb68fe10403a3725eb1ec31a4c557c68256079b00e283b5') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - make PREFIX=/usr LIBDIR=/usr/lib32 -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make install PREFIX=/usr LIBDIR=/usr/lib32 DESTDIR="${pkgdir}/" - rm -rf "${pkgdir}"/{usr/{include,share,bin,sbin},etc} -} diff --git a/multilib/lib32-xcb-util/PKGBUILD b/multilib/lib32-xcb-util/PKGBUILD deleted file mode 100644 index e59b87c0f..000000000 --- a/multilib/lib32-xcb-util/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 26758 2010-09-15 23:05:03Z bluewind $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=xcb-util -pkgname=lib32-xcb-util -pkgver=0.3.6 -pkgrel=3 -pkgdesc="Utility libraries for XC Binding (32-bit)" -arch=('x86_64' 'mips64el') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('lib32-glibc' 'lib32-libxcb' $_pkgbasename) -makedepends=('gperf' 'gcc-multilib') -options=('!libtool') -source=(http://xcb.freedesktop.org/dist/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('dd8968b8ee613cb027a8ef1fcbdc8fc9') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-zlib/PKGBUILD b/multilib/lib32-zlib/PKGBUILD deleted file mode 100644 index 738a04c9a..000000000 --- a/multilib/lib32-zlib/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 35298 2010-12-18 01:45:49Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -_pkgbasename=zlib -pkgname=lib32-$_pkgbasename -pkgver=1.2.5 -pkgrel=6 -pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP (32-bit)' -arch=('x86_64' 'mips64el') -license=('custom') -url="http://www.zlib.net/" -depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!makeflags') -source=("http://zlib.net/zlib-${pkgver}.tar.gz" - 'zlib-1.2.5-lfs-decls.patch') -md5sums=('c735eab2d659a96e5a594c9e8541ad63' - '4cb279ea3beab621f3526bf7b7ab99e5') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/zlib-$pkgver - # see http://bugs.archlinux.org/task/19280 - patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch - # work around gcc bug; see https://bugs.archlinux.org/task/20647 - export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK" - ./configure --prefix=/usr \ - --libdir=/usr/lib32 - make - make check -} - -package() { - cd ${srcdir}/zlib-$pkgver - make install DESTDIR=${pkgdir} - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-zlib/zlib-1.2.5-lfs-decls.patch b/multilib/lib32-zlib/zlib-1.2.5-lfs-decls.patch deleted file mode 100644 index 36e26af03..000000000 --- a/multilib/lib32-zlib/zlib-1.2.5-lfs-decls.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: zlib-1.2.5/zlib.h -=================================================================== ---- zlib-1.2.5.orig/zlib.h -+++ zlib-1.2.5/zlib.h -@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF( - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); diff --git a/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD deleted file mode 100644 index 4d9479136..000000000 --- a/multilib/libtool-multilib/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 35242 2010-12-17 21:48:01Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -# NOTE: requires rebuilt with each new gcc version - -pkgbase=libtool-multilib -pkgname=(libtool-multilib lib32-libtool) -pkgver=2.4 -pkgrel=2 -pkgdesc="A generic library support script for multilib" -arch=('x86_64' 'mips64el') -url="http://www.gnu.org/software/libtool" -license=('GPL') -makedepends=(sh tar texinfo gcc-multilib) -options=('!libtool') -source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz) -md5sums=('4e6144439d95d7332dc50ace6dd24c55') - -build() { - cd "$srcdir" - - rm -rf libtool-64 libtool-32 - mv libtool-$pkgver libtool-64 - cp -a libtool-64 libtool-32 - -msg2 "Building libtool-64..." - - cd "$srcdir/libtool-64" - ./configure --prefix=/usr - make - make check - -msg2 "Building libtool-32..." - - export CC="gcc -m32" - export CXX="g++ -m32" - - cd "$srcdir/libtool-32" - ./configure --prefix=/usr --libdir=/usr/lib32 - make - make check -} - -package_libtool-multilib() { - groups=('multilib-devel') - depends=(sh tar texinfo "lib32-libtool=$pkgver-$pkgrel") - provides=("libtool=$pkgver-$pkgrel") - conflicts=(libtool) - install=libtool.install - - cd "$srcdir/libtool-64" - make DESTDIR="$pkgdir" install -} - -package_lib32-libtool() { - pkgdesc="A generic library support script (32-bit)" - depends=(lib32-glibc) - - cd "$srcdir/libtool-32" - make DESTDIR="$pkgdir" install - rm -r "$pkgdir"/usr/{bin,include,share} -} diff --git a/multilib/libtool-multilib/libtool.install b/multilib/libtool-multilib/libtool.install deleted file mode 100644 index 424c8cb88..000000000 --- a/multilib/libtool-multilib/libtool.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=/usr/share/info -filelist=(libtool.info libtool.info-1 libtool.info-2) - -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 -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD deleted file mode 100644 index c9ab1d72f..000000000 --- a/multilib/nspluginwrapper/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 47193 2011-05-18 13:14:48Z bluewind $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=nspluginwrapper -pkgver=1.4.0 -pkgrel=3 -pkgdesc="Cross-platform NPAPI compatible plugin viewer" -arch=('x86_64') -url="http://nspluginwrapper.davidben.net/" -license=('GPL') -depends=('curl' 'lib32-libxt' 'lib32-gcc-libs' 'gtk2' 'lib32-gtk2') -makedepends=('gcc-multilib') -install="install" -source=(http://web.mit.edu/davidben/Public/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('39b9034dc840ac6a21701406d96449e578b787aad7f6a09d97113776cf8251b3') -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --with-lib32=lib32 --with-lib64=lib - make -j1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make -j1 DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/nspluginwrapper/install b/multilib/nspluginwrapper/install deleted file mode 100644 index 78e196fdb..000000000 --- a/multilib/nspluginwrapper/install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - for i in `nspluginwrapper -l | grep -v "^ "`; do - /usr/bin/nspluginwrapper -u "$i" - done -} diff --git a/multilib/q4wine/PKGBUILD b/multilib/q4wine/PKGBUILD deleted file mode 100644 index 11c178090..000000000 --- a/multilib/q4wine/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 36222 2010-12-28 10:47:42Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com> - -pkgname=q4wine -pkgver=0.120_r1 -pkgrel=1 -pkgdesc="A Qt4 GUI for Wine" -arch=("i686" "x86_64" 'mips64el') -url="http://sourceforge.net/projects/${pkgname}/" -license=("GPL3") -depends=("qt" "wine" "sqlite3" "which" "icoutils") -makedepends=("cmake") -optdepends=("winetricks") -options=('!emptydirs' 'force') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2) -md5sums=('1ed212026d1f082ac57f12a61694f7bc') - -build() { - cd ${srcdir}/${pkgname}-${pkgver/_/-} - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_WINETRIKS=ON . - make - make DESTDIR=${pkgdir} install - install -D ${startdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop -} diff --git a/multilib/q4wine/q4wine.desktop b/multilib/q4wine/q4wine.desktop deleted file mode 100644 index 2b1415848..000000000 --- a/multilib/q4wine/q4wine.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Name=Q4Wine -GenericName=A Qt4 GUI for Wine -Comment=A Qt4 GUI for Wine -#Version=0.1 -Type=Application -Categories=KDE;Qt;Settings -Terminal=false -Encoding=UTF-8 -Icon=wine -Exec=q4wine -#ServiceTypes=inode/directory -#Actions=Create; -#X-KDE-Submenu= -#X-KDE-Priority=TopLevel -#X-KDE-Icon=tgz -X-KDE-StartupNotify=true -#X-DCOP-ServiceType=Unique diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD deleted file mode 100644 index 60b95fce0..000000000 --- a/multilib/wine/PKGBUILD +++ /dev/null @@ -1,144 +0,0 @@ -# $Id: PKGBUILD 46925 2011-05-13 19:38:18Z bluewind $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Eduardo Romero <eduardo@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=wine -pkgver=1.3.20 -pkgrel=1 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('2d9fe8755172a21ddc453d720a497ad9') - -pkgdesc="A compatibility layer for running Windows programs" -url="http://www.winehq.com" -arch=(i686 x86_64 'mips64el') -license=(LGPL) -install=wine.install - -depends=( - fontconfig lib32-fontconfig - mesa lib32-mesa - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxxf86dga lib32-libxxf86dga - alsa-lib lib32-alsa-lib - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libxpm lib32-libxpm - libpng lib32-libpng - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libxslt lib32-libxslt - libldap lib32-libldap - lcms lib32-lcms - mpg123 lib32-mpg123 - openal lib32-openal - jack lib32-jack - libcups lib32-libcups - gnutls lib32-gnutls - v4l-utils lib32-v4l-utils - oss -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - lcms lib32-lcms - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - jack lib32-jack - libcups lib32-libcups - gnutls lib32-gnutls - v4l-utils lib32-v4l-utils - oss -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -else - provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('bin32-wine' 'wine-wow64') - replaces=('bin32-wine') -fi - -build() { - cd "$srcdir" - - # Allow ccache to work - mv $pkgname-$_pkgbasever $pkgname - - # Get rid of old build dirs - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-32-build - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $pkgname-64-build - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib \ - --with-x \ - --enable-win64 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-x \ - "${_wine32opts[@]}" - - make -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi -} - -# vim:set ts=8 sts=2 sw=2 et: diff --git a/multilib/wine/wine.install b/multilib/wine/wine.install deleted file mode 100644 index f71262186..000000000 --- a/multilib/wine/wine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - echo "If you are on x86_64, the default WINEARCH will be win64." - echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - echo "See the Arch wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} diff --git a/multilib/wine_gecko/PKGBUILD b/multilib/wine_gecko/PKGBUILD deleted file mode 100644 index e0f37fd53..000000000 --- a/multilib/wine_gecko/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 42670 2011-03-19 08:38:12Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Nicky726 (Nicky726 <at> gmail <dot> com) -# Contributor: Allan McRae (allan <at> archlinux <dot> org) -# Contributor: Alexander 'bas' Brovikov (bas <at> it-core <dot> org) - -pkgname=wine_gecko -pkgver=1.2.0 -pkgrel=1 -pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer" -arch=(i686 x86_64 'mips64el') -url="http://wiki.winehq.org/Gecko" -license=(MPL) -depends=('wine>=1.3.16') -source=(http://downloads.sourceforge.net/project/wine/Wine%20Gecko/$pkgver/$pkgname-$pkgver-x86{,_64}.msi) -md5sums=('f2ed548494c86c511892b1c02491c8c4' - '26489d8d1dfa34b5783b3e567edcaa9f') - -if [[ $CARCH == i686 ]]; then - # Strip x86_64 msi - source=(${source[0]}) - md5sums=(${md5sums[0]}) -fi - -package() { - cd "$srcdir" - _geckodir="$pkgdir/usr/share/wine/gecko" - install -Dm644 $pkgname-$pkgver-x86.msi "$_geckodir/$pkgname-$pkgver-x86.msi" - if [[ $CARCH == x86_64 ]]; then - install -m644 $pkgname-$pkgver-x86_64.msi "$_geckodir/" - fi -} diff --git a/multilib/zsnes/PKGBUILD b/multilib/zsnes/PKGBUILD deleted file mode 100644 index 9a056094f..000000000 --- a/multilib/zsnes/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 28220 2010-10-03 23:52:11Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Frank Tetzel <frank.tetzel@mailbox.tu-dresden.de> -# Contributor: Hugo Doria <hugo@archlinux.org> -# Contributor: Aurelien Foret <orelien@chez.com> - -pkgname=zsnes -pkgver=1.51 -pkgrel=7 -pkgdesc="Super Nintendo emulator" -url="http://www.zsnes.com/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') - -if [ $CARCH == "x86_64" ]; then - depends=('gcc-libs-multilib' 'lib32-sdl' 'lib32-libpng>=1.4.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa') - makedepends=('nasm' 'gcc-multilib') -else - depends=('gcc-libs' 'sdl' 'libpng>=1.4.0' 'libgl' 'ncurses' 'mesa') - makedepends=('nasm' 'gcc') -fi - -source=(http://downloads.sourceforge.net/${pkgname}/zsnes151src.tar.bz2 - zsnes.patch - zsnes.desktop - zsnes_icon.png) -md5sums=('7071186bf80632ae88a153239498d8c9' - '3af40c7d674ebfce1bb1ab6b7e9a8fe4' - 'b100b2aa342c551167d7c5dcdcde9dd4' - 'b5260c02adfc3b7ff725041214b00bfd') - -build() { - cd ${srcdir}/${pkgname}_1_51/ - patch -p1 -i ../zsnes.patch || return 1 - - cd ${srcdir}/${pkgname}_1_51/src -if [ $CARCH == "x86_64" ]; then - export CC="gcc -m32" - export CXX="g++ -m32" -fi - ./autogen.sh --prefix=/usr \ - x_libraries=/usr/lib \ - force_arch=i686 \ - --enable-release - - make || return 1 - make DESTDIR=${pkgdir} install - - # adding --mandir= to autoconf line fails - install -dm755 ${pkgdir}/usr/share - - install -Dm644 ${srcdir}/zsnes.desktop ${pkgdir}/usr/share/applications/zsnes.desktop - install -Dm644 ${srcdir}/zsnes_icon.png ${pkgdir}/usr/share/pixmaps/zsnes_icon.png - - mv ${pkgdir}/usr/man ${pkgdir}/usr/share -} diff --git a/multilib/zsnes/zsnes.desktop b/multilib/zsnes/zsnes.desktop deleted file mode 100644 index db13ada4c..000000000 --- a/multilib/zsnes/zsnes.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Zsnes -Comment=Super Nintendo emulator -Exec=/usr/bin/zsnes -Icon=/usr/share/pixmaps/zsnes_icon.png -Terminal=false -Type=Application -Categories=Application;Game -StartupNotify=false diff --git a/multilib/zsnes/zsnes.patch b/multilib/zsnes/zsnes.patch deleted file mode 100644 index d0d12f2fb..000000000 --- a/multilib/zsnes/zsnes.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in ---- zsnes_1_51//src/Makefile.in 2007-01-24 21:54:12.000000000 +0100 -+++ zsnes_1_51_new//src/Makefile.in 2010-09-06 00:03:04.715810431 +0200 -@@ -95,7 +95,7 @@ - %.o: %.cpp - @CXX@ @CXXFLAGS@ -o $@ -c $< - %.o %.h: %.psr $(PSR) -- ./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $< -+ ./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $< - - default: main - all: main tools -@@ -133,7 +133,7 @@ - - include makefile.dep - makefile.dep: $(TOOL_D)/depbuild Makefile -- $(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep -+ $(TOOL_D)/depbuild "@CC@" "@CFLAGS@" "@NASMPATH@" "@NFLAGS@" $(Z_OBJS) > makefile.dep - - Makefile: Makefile.in config.status - ./config.status -diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp ---- zsnes_1_51//src/parsegen.cpp 2007-10-31 05:30:26.000000000 +0100 -+++ zsnes_1_51_new//src/parsegen.cpp 2010-09-05 15:48:36.903333444 +0200 -@@ -19,6 +19,9 @@ - Config file handler creator by Nach (C) 2005-2007 - */ - -+#include <cstring> -+#include <cstdlib> -+ - #if !defined(__GNUC__) && !defined(_MSC_VER) - #error You are using an unsupported compiler - #endif -@@ -1822,7 +1825,7 @@ - } - } - --int main(size_t argc, const char *const *const argv) -+int main(int argc, const char *const *const argv) - { - const char *cheader_file = 0; - bool compile = false; -diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp ---- zsnes_1_51//src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100 -+++ zsnes_1_51_new//src/tools/depbuild.cpp 2010-09-05 15:48:36.903333444 +0200 -@@ -183,7 +183,7 @@ - } - } - --int main(size_t argc, const char *const *const argv) -+int main(int argc, const char *const *const argv) - { - if (argc < 5) - { -diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h ---- zsnes_1_51//src/tools/strutil.h 2006-12-27 12:04:05.000000000 +0100 -+++ zsnes_1_51_new//src/tools/strutil.h 2010-09-05 15:48:36.903333444 +0200 -@@ -15,6 +15,9 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#include <cstring> -+#include <cstdlib> -+ - /* - This is part of a toolkit used to assist in ZSNES development - */ diff --git a/multilib/zsnes/zsnes_icon.png b/multilib/zsnes/zsnes_icon.png Binary files differdeleted file mode 100644 index 31608ba06..000000000 --- a/multilib/zsnes/zsnes_icon.png +++ /dev/null diff --git a/staging/cairo-perl/PKGBUILD b/staging/cairo-perl/PKGBUILD deleted file mode 100644 index b697e5e16..000000000 --- a/staging/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/staging/claws-mail-extra-plugins/PKGBUILD b/staging/claws-mail-extra-plugins/PKGBUILD deleted file mode 100644 index 9d233d726..000000000 --- a/staging/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/staging/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/staging/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch deleted file mode 100644 index efc06a472..000000000 --- a/staging/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/staging/dvdrip/PKGBUILD b/staging/dvdrip/PKGBUILD deleted file mode 100644 index 17838b169..000000000 --- a/staging/dvdrip/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 125147 2011-05-25 19:02:09Z foutrelis $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> - -pkgname=dvdrip -pkgver=0.98.11 -pkgrel=7 -pkgdesc="A Gtk frontend for transcode writen in Perl" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.exit1.org/dvdrip/" -install=${pkgname}.install -depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick' - 'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow') -optdepends=('ogmtools: for ogm/odd video creation' - 'lsdvd: fast reading of DVD table') -source=(http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz \ - ${pkgname}.desktop) -options=('!emptydirs' '!makeflags') -md5sums=('6dfa4199d451757a37eea233a07da4c0' - 'e91cf411928fd0500d07a0022b4ef546') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete - - install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/dvdrip/dvdrip.desktop b/staging/dvdrip/dvdrip.desktop deleted file mode 100644 index dd19b4aae..000000000 --- a/staging/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/staging/dvdrip/dvdrip.install b/staging/dvdrip/dvdrip.install deleted file mode 100644 index 4cd6160c4..000000000 --- a/staging/dvdrip/dvdrip.install +++ /dev/null @@ -1,19 +0,0 @@ -# this is the scrollkeeper handling sample file - -post_install() { - echo "update desktop mime database..." - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - /bin/true -} - -post_remove() { - echo "update desktop mime database..." - update-desktop-database -q -} diff --git a/staging/frozen-bubble/PKGBUILD b/staging/frozen-bubble/PKGBUILD deleted file mode 100644 index eac81509b..000000000 --- a/staging/frozen-bubble/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 124828 2011-05-24 16:19:16Z heftig $ -# 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=2 -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') - -package() { - cd "$srcdir/$pkgname-$_pkgver" - - # gcc bug? - CFLAGS+=" -Doff64_t=__off64_t" - - # install module in vendor directories - perl Build.PL installdirs=vendor destdir="$pkgdir" - - perl Build - perl Build install - - 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/staging/frozen-bubble/frozen-bubble.desktop b/staging/frozen-bubble/frozen-bubble.desktop deleted file mode 100644 index 76a7bcd88..000000000 --- a/staging/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/staging/gconf-perl/PKGBUILD b/staging/gconf-perl/PKGBUILD deleted file mode 100644 index e4f58af63..000000000 --- a/staging/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/staging/git/ChangeLog b/staging/git/ChangeLog deleted file mode 100644 index 76298e68f..000000000 --- a/staging/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/staging/git/PKGBUILD b/staging/git/PKGBUILD deleted file mode 100644 index 0a96745dd..000000000 --- a/staging/git/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 125150 2011-05-25 19:02:49Z foutrelis $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=git -pkgver=1.7.5.2 -pkgrel=2 -pkgdesc="the fast distributed version control system" -arch=(i686 x86_64) -url="http://git-scm.com/" -license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.12.2') -makedepends=('python2' 'emacs') -optdepends=('tk: gitk and git gui' - 'perl-libwww: git svn' - 'perl-term-readkey: git svn' - 'perl-mime-tools: git send-email' - 'perl-net-smtp-ssl: git send-email TLS support' - 'perl-authen-sasl: git send-email TLS support' - 'python2: various helper scripts' - 'subversion: git svn' - 'cvsps: git cvsimport') -replaces=('git-core') -provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') -source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" \ - "http://kernel.org/pub/software/scm/git/git-manpages-${pkgver}.tar.bz2" - git-daemon - git-daemon.conf) -changelog=ChangeLog - -build() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" - - cd contrib/emacs - make prefix=/usr -} - -package() { - export PYTHON_PATH='/usr/bin/python2' - cd "$srcdir/$pkgname-$pkgver" - make prefix=/usr gitexecdir=/usr/lib/git-core \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install - - # bash completion - mkdir -p $pkgdir/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git - # more contrib stuff - cp -a ./contrib $pkgdir/usr/share/git/ - # scripts are for python 2.x - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ - $(find "$pkgdir" -name '*.py') \ - "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview} - - # emacs interface - cd contrib/emacs - make prefix=/usr DESTDIR="$pkgdir" install - - # how 'bout some manpages? - for mansect in man1 man5 man7; do - for manpage in "$srcdir"/$mansect/*; do - install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage) - done - done - - # remove perllocal.pod, .packlist, and empty directories. - rm -rf "$pkgdir"/usr/lib/perl5 - - # git daemon script - install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon - install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf -} - -md5sums=('f79ab8fe79b35346b499f131cbf381a4' - '43fc5538f137231f5c96e7da5eb6c934' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('65dbb9789a1ff8aa7e4f7e156b9ce36ef101810608ed55a297156348d70f9349' - '8521210a77809d189a3fe72e2bd13df50ecf8ec58e7098ec1655dfdb4086b6ca' - '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' - 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/staging/git/git-daemon b/staging/git/git-daemon deleted file mode 100644 index 21ba73ed5..000000000 --- a/staging/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/staging/git/git-daemon.conf b/staging/git/git-daemon.conf deleted file mode 100644 index 3f9a12060..000000000 --- a/staging/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/staging/glade-perl/PKGBUILD b/staging/glade-perl/PKGBUILD deleted file mode 100644 index 96d77bced..000000000 --- a/staging/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/staging/glew/PKGBUILD b/staging/glew/PKGBUILD deleted file mode 100644 index 6270e8c8f..000000000 --- a/staging/glew/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 125318 2011-05-25 20:28:27Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: SleepyDog - -pkgname=glew -pkgver=1.6.0 -pkgrel=1 -pkgdesc="The OpenGL Extension Wrangler Library" -arch=('i686' 'x86_64') -url="http://glew.sourceforge.net" -license=('BSD' 'MIT' 'GPL') -depends=('libxmu' 'libxi' 'mesa') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('ed555d15d0f01239b262c4cf803e97d60d8a18b6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|lib64|lib|' config/Makefile.linux - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GLEW_DEST="${pkgdir}/usr" install.all - install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a - chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} -} diff --git a/staging/glib-perl/PKGBUILD b/staging/glib-perl/PKGBUILD deleted file mode 100644 index 89610fe1e..000000000 --- a/staging/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/staging/gnome-perl/PKGBUILD b/staging/gnome-perl/PKGBUILD deleted file mode 100644 index 81f68ee25..000000000 --- a/staging/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/staging/gnome-vfs-perl/PKGBUILD b/staging/gnome-vfs-perl/PKGBUILD deleted file mode 100644 index 3960f5285..000000000 --- a/staging/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/staging/gnomecanvas-perl/PKGBUILD b/staging/gnomecanvas-perl/PKGBUILD deleted file mode 100644 index 2563caae4..000000000 --- a/staging/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/staging/gnumeric/PKGBUILD b/staging/gnumeric/PKGBUILD deleted file mode 100644 index 2fd9e4799..000000000 --- a/staging/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/staging/gnumeric/gnumeric.install b/staging/gnumeric/gnumeric.install deleted file mode 100644 index 50ee0a7e2..000000000 --- a/staging/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/staging/graphviz/LICENSE b/staging/graphviz/LICENSE deleted file mode 100644 index 16cc69a52..000000000 --- a/staging/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/staging/graphviz/PKGBUILD b/staging/graphviz/PKGBUILD deleted file mode 100644 index c31b3977d..000000000 --- a/staging/graphviz/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 124548 2011-05-22 22:43:30Z bisson $ -# Maintainer: kevin <kevin@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -pkgname=graphviz -pkgver=2.28.0 -pkgrel=2 -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') -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') -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/staging/graphviz/install b/staging/graphviz/install deleted file mode 100644 index 00510e3f6..000000000 --- a/staging/graphviz/install +++ /dev/null @@ -1,17 +0,0 @@ -# arg 1: the new package version -post_install() { - # Create plugin config /usr/lib/graphviz/config6 - rm -f usr/lib/graphviz/config{,6} - usr/bin/dot -c -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - rm -f usr/lib/graphviz/config{,6} -} diff --git a/staging/gtk2-perl/PKGBUILD b/staging/gtk2-perl/PKGBUILD deleted file mode 100644 index 215b21109..000000000 --- a/staging/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/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD deleted file mode 100644 index d09e302dd..000000000 --- a/staging/hugin/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 125347 2011-05-26 02:15:23Z eric $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=hugin -pkgver=2010.4.0 -pkgrel=4 -pkgdesc="A frontend to the panorama-tools" -arch=('i686' 'x86_64') -url="http://hugin.sourceforge.net/" -license=('LGPL') -depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' - 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') -makedepends=('zip' 'cmake' 'boost') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) -md5sums=('bfd716655461987312b2f2f00c90dcc5' - '4393c7b31da60f230c85e63a6a2e43a0') -sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' - '52798a155a037f853f41402f797e8a4cb6bb3e07') - -build() { - cd "${srcdir}" - (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) - mkdir build && cd build - - cmake "${srcdir}/${pkgname}-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ - -DENABLE_LAPACK=yes - - make -} - -package(){ - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/hugin/hugin-gcc46.patch b/staging/hugin/hugin-gcc46.patch deleted file mode 100644 index 98a70ad50..000000000 --- a/staging/hugin/hugin-gcc46.patch +++ /dev/null @@ -1,16 +0,0 @@ - -diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx ---- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 -+++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 -@@ -41,6 +41,7 @@ - #define VIGRA_MULTI_ITERATOR_HXX - - #include <sys/types.h> -+#include <stddef.h> - #include "tinyvector.hxx" - #include "iteratortags.hxx" - - - - - diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install deleted file mode 100644 index 362749233..000000000 --- a/staging/hugin/hugin.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD deleted file mode 100644 index 39f9e8830..000000000 --- a/staging/imagemagick/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 124573 2011-05-23 01:23:35Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=imagemagick -pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.6.9.10 -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=('cf8940e964be608ddae152b90a576282' - 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('18d141e904853c68a43f53862bc67e3c8b66d664' - '23405f80904b1de94ebd7bd6fe2a332471b8c283') - -build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - - sed '/AC_PATH_XTRA/d' -i configure.ac - autoreconf - patch -Np0 -i ../perlmagick.rpath.patch - - ./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/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch deleted file mode 100644 index 958c0f2ee..000000000 --- a/staging/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/staging/irssi/PKGBUILD b/staging/irssi/PKGBUILD deleted file mode 100644 index bba878633..000000000 --- a/staging/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/staging/koffice/PKGBUILD b/staging/koffice/PKGBUILD deleted file mode 100644 index 1884dd92c..000000000 --- a/staging/koffice/PKGBUILD +++ /dev/null @@ -1,301 +0,0 @@ -# $Id: PKGBUILD 125678 2011-05-28 00:58:39Z andrea $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > - -pkgbase=koffice -pkgname=( - 'koffice-filters' - 'koffice-interfaces' - 'koffice-libs' - 'koffice-plugins' - 'koffice-pics' - 'koffice-servicetypes' - 'koffice-templates' - 'koffice-tools' - 'koffice-karbon' - 'koffice-karbon-doc' -# 'koffice-kchart' -# 'koffice-kchart-doc' - 'koffice-kexi' - 'koffice-kexi-doc' - 'koffice-kformula' - 'koffice-kformula-doc' - 'koffice-kounavail' - 'koffice-kplato' -# 'koffice-kplato-doc' - 'koffice-kpresenter' - 'koffice-kpresenter-doc' - 'koffice-krita' -# 'koffice-krita-doc' # no krita-doc anymore upstream - 'koffice-kspread' - 'koffice-kspread-doc' - 'koffice-kword' -# 'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources) - 'koffice-handbook' - 'koffice-thesaurus-doc' -# 'koffice-kdgantt' # still an empty package -) -pkgver=2.3.3 -pkgrel=4 -arch=('i686' 'x86_64') -url='http://koffice.kde.org' -license=('GPL' 'LGPL' 'FDL') -makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' - 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'kdegraphics-libs') -groups=('koffice') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'kde4-koffice-libwpg02.patch' 'gcc46.patch') -sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' - '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' - 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" - patch -p1 -i "${srcdir}"/gcc46.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -##### 1st package common files, depends, optdepends of the koffice applications ##### - -package_koffice-filters(){ - pkgdesc="Filters for the KDE office suite" - optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' - 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' - 'kdegraphics-libs: support for raw images') - install=filters.install - cd "${srcdir}/build/filters" - make DESTDIR="${pkgdir}" install -} - -package_koffice-interfaces(){ - pkgdesc="Interfaces for the KDE office suite" - depends=('kdelibs' 'koffice-libs') - cd "${srcdir}/build/interfaces" - make DESTDIR="${pkgdir}" install -} - -package_koffice-libs(){ - pkgdesc="Libs for the KDE office suite" - depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes') - cd "${srcdir}/build/libs" - make DESTDIR="${pkgdir}" install -} - -package_koffice-plugins(){ - pkgdesc="Plugins for the KDE office suite" - depends=('koffice-libs') - replaces=('koffice-kchart') - conflicts=('koffice-kchart') - cd "${srcdir}/build/plugins" - make DESTDIR="${pkgdir}" install -} - -package_koffice-pics(){ - pkgdesc="Icons for the KDE office suite" - install=koffice.install - cd "${srcdir}/build/pics" - make DESTDIR="${pkgdir}" install -} - -package_koffice-servicetypes(){ - pkgdesc="Servicetypes for the KDE office suite" - cd "${srcdir}/build/servicetypes" - make DESTDIR="${pkgdir}" install -} - -package_koffice-templates(){ - pkgdesc="Templates for the KDE office suite" - cd "${srcdir}/build/templates" - make DESTDIR="${pkgdir}" install -} - -package_koffice-tools(){ - pkgdesc="Tools for the KDE office suite" - depends=('koffice-libs') - cd "${srcdir}/build/tools" - make DESTDIR="${pkgdir}" install -} - -#### package common files done ##### - -#### package apps and their docs ##### - -package_koffice-karbon(){ - pkgdesc="Vector drawing application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-karbon-doc(){ - pkgdesc="Documentation for karbon" - cd "${srcdir}/build/doc/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi(){ - pkgdesc="Integrated data management application for the KDE office suite" - depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3') - cd "${srcdir}/build/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi-doc(){ - pkgdesc="Documentation for kexi" - cd "${srcdir}/build/doc/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula(){ - pkgdesc="Formula editor for the KDE office suite" - depends=('kdelibs' 'koffice-libs') - cd "${srcdir}/build/kformula" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula-doc() { - pkgdesc="Documentation for koffice-kformula" - cd "${srcdir}/build/doc/kformula" - make DESTDIR="${pkgdir}" install -} - - -package_koffice-kounavail(){ - pkgdesc="Kounavail for the KDE office suite" - depends=('kdelibs' 'koffice-libs') - cd "${srcdir}/build/kounavail" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kplato(){ - pkgdesc="Project management application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \ - 'koffice-plugins' 'koffice-kword') - install=koffice.install - cd "${srcdir}/build/kplato" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-kplato-doc(){ -# pkgdesc="Documentation for kplato" -# cd ${srcdir}/build/doc/kplato -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-kpresenter(){ - pkgdesc="Presentation tool for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kpresenter-doc(){ - pkgdesc="Documentation for kpresenter" - cd "${srcdir}/build/doc/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-krita(){ - pkgdesc="Graphics editor for KDE" - depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \ - 'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \ - 'openexr' 'opengtl') - optdepends=('koffice-filters: import/export filters') - install=krita.install - cd "${srcdir}/build/krita" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-krita-doc(){ -# pkgdesc="Documentation for krita" -# cd ${srcdir}/build/doc/krita -# make DESTDIR="${pkgdir}" install -#} - - -package_koffice-kspread(){ - pkgdesc="Spreadsheet application for KDE" - depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kspread-doc(){ - pkgdesc="Documentation for kspread" - cd "${srcdir}/build/doc/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kword(){ - pkgdesc="Wordprocessor for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \ - 'koffice-kounavail' 'koffice-plugins') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kword" - make DESTDIR="${pkgdir}" install - - # some sed lines to have python2 in extension scripts - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py" -} - -#package_koffice-kword-doc(){ -# pkgdesc="Documentation for kword" -# cd ${srcdir}/build/doc/kword -# make DESTDIR="${pkgdir}" install -#} - -##### package apps done ##### - -#package_koffice-kchart(){ -# pkgdesc="Charting tool for KDE" -# depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates') -# optdepends=('koffice-filters: import/export filters') -# install=koffice.install -# cd "${srcdir}/build/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kchart-doc(){ -# pkgdesc="Documentation for kchart" -# cd "${srcdir}/build/doc/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kdgantt(){ -# pkgdesc="Gantt for KDE" -# cd "${srcdir}/build/kdgantt" -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-handbook() { - pkgdesc="Documentation for koffice" - cd "${srcdir}/build/doc/koffice" - make DESTDIR="${pkgdir}" install -} - -package_koffice-thesaurus-doc(){ - pkgdesc="Documentation for koffice-thesaurus" - cd "${srcdir}/build/doc/thesaurus" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/koffice/filters.install b/staging/koffice/filters.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/staging/koffice/filters.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/koffice/gcc46.patch b/staging/koffice/gcc46.patch deleted file mode 100644 index dcf8a4f85..000000000 --- a/staging/koffice/gcc46.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc ---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 2011-02-17 06:13:40.000000000 -0600 -+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc 2011-02-19 21:15:56.597142885 -0600 -@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp - return IT_FLOAT16; - case Imf::FLOAT: - return IT_FLOAT32; -+ default: -+ // shouldn't reach here -+ return IT_UNSUPPORTED; - } - } - -@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace( - case IT_UNKNOWN: - case IT_UNSUPPORTED: - return 0; -+ default: -+ // shouldn't reach here -+ return 0; - } - } - diff --git a/staging/koffice/kde4-koffice-libwpg02.patch b/staging/koffice/kde4-koffice-libwpg02.patch deleted file mode 100644 index e2a55a216..000000000 --- a/staging/koffice/kde4-koffice-libwpg02.patch +++ /dev/null @@ -1,1323 +0,0 @@ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt ---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt 2011-01-18 07:40:25.000000000 +0100 -@@ -1,16 +1,11 @@ - -- - include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/) - --set(wpgimport_PART_SRCS --WPGImport.cpp --OdgExporter.cxx --FileOutputHandler.cxx --GraphicsElement.cxx) -+set(wpgimport_PART_SRCS WPGImport.cpp) - - kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS}) - --target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES}) -+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES}) - - install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,95 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "FileOutputHandler.hxx" -- --FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) : -- mbIsTagOpened(false), -- mContentStream(contentStream) --{ --} -- --void FileOutputHandler::startDocument() --{ --} -- --void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << "<" << psName; -- -- for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++) -- { -- mContentStream << " " << (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\""; -- } -- mbIsTagOpened = true; -- msOpenedTagName = psName; --} -- --void FileOutputHandler::endElement(const char *psName) --{ -- if (mbIsTagOpened) -- { -- if( msOpenedTagName == psName ) -- { -- mContentStream << "/>"; -- mbIsTagOpened = false; -- } -- else // should not happen, but handle it -- { -- mContentStream << ">"; -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } -- } -- else -- { -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } --} -- --void FileOutputHandler::characters(const std::string &sCharacters) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << sCharacters.c_str(); --} -- --void FileOutputHandler::endDocument() --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,49 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef FILEOUTPUTHANDLER_H --#define FILEOUTPUTHANDLER_H -- --#include <iostream> --#include <sstream> --#include <string> --#include "GraphicsHandler.hxx" -- --class FileOutputHandler : public GraphicsHandler --{ -- public: -- explicit FileOutputHandler(std::ostringstream &contentStream); -- virtual void startDocument(); -- virtual void endDocument(); -- virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList); -- virtual void endElement(const char *psName); -- virtual void characters(const std::string &sCharacters); -- -- private: -- bool mbIsTagOpened; -- std::string msOpenedTagName; -- std::ostringstream &mContentStream; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,66 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <string.h> -- --#define ASCII_SPACE 0x0020 -- --void TagGraphicsElement::print() const --{ --} -- --void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->startElement(getTagName().c_str(), maAttrList); --} -- --void OpenTagGraphicsElement::print() const --{ -- TagGraphicsElement::print(); --} -- --void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue) --{ -- std::pair<std::string, std::string> tmpAttribute; -- tmpAttribute.first = szAttributeName; -- tmpAttribute.second = sAttributeValue; -- maAttrList.push_back(tmpAttribute); --} -- --void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- -- pHandler->endElement(getTagName().c_str()); --} -- --void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->characters(msData); --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,84 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpd.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef _GRAPHICSELEMENT_H --#define _GRAPHICSELEMENT_H --#include <string> --#include <map> --#include <vector> -- --#include "GraphicsHandler.hxx" -- --class GraphicsElement --{ --public: -- virtual ~GraphicsElement() {} -- virtual void write(GraphicsHandler *pHandler) const = 0; -- virtual void print() const {} --}; -- --class TagGraphicsElement : public GraphicsElement --{ --public: -- explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {} -- const std::string &getTagName() const { return msTagName; } -- virtual void print() const; --private: -- const std::string msTagName; --}; -- --class OpenTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- ~OpenTagGraphicsElement() {} -- void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue); -- virtual void write(GraphicsHandler *pHandler) const; -- virtual void print () const; --private: -- std::vector<std::pair<std::string, std::string> > maAttrList; --}; -- --class CloseTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- virtual void write(GraphicsHandler *pHandler) const; --}; -- --class CharDataGraphicsElement : public GraphicsElement --{ --public: -- CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {} -- virtual void write(GraphicsHandler *pHandler) const; --private: -- std::string msData; --}; -- -- --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,43 +0,0 @@ --/* -- * Copyright (C) 2004 William Lachance (wlach@interlog.com) -- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License -- * as published by the Free Software Foundation; either version 2 -- * of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * Contributor(s): Martin Gallwey (gallwey@sun.com) -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ --#ifndef _GRAPHICSHANDLER_H --#define _GRAPHICSHANDLER_H --#include <string> --#include <map> --#include <vector> -- --class GraphicsHandler --{ --public: -- virtual ~GraphicsHandler() {} -- virtual void startDocument() = 0; -- virtual void endDocument() = 0; -- virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0; -- virtual void endElement(const char *psName) = 0; -- virtual void characters(const std::string &sCharacters) = 0; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,662 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "OdgExporter.hxx" --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <locale.h> -- --static std::string doubleToString(const double value) --{ -- std::ostringstream tempStream; -- tempStream << value; -- std::string decimalPoint(localeconv()->decimal_point); -- if ((decimalPoint.size() == 0) || (decimalPoint == ".")) -- return tempStream.str(); -- std::string stringValue(tempStream.str()); -- if (!stringValue.empty()) -- { -- std::string::size_type pos; -- while ((pos = stringValue.find(decimalPoint)) != std::string::npos) -- stringValue.replace(pos,decimalPoint.size(),"."); -- } -- return stringValue; --} -- -- --OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML): -- mpHandler(pHandler), -- m_fillRule(AlternatingFill), -- m_gradientIndex(1), -- m_dashIndex(1), -- m_styleIndex(1), -- m_width(0.0f), -- m_height(0.0f), -- m_isFlatXML(isFlatXML) --{ --} -- --OdgExporter::~OdgExporter() --{ -- for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- delete (*iterStroke); -- -- for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- delete (*iterGradient); -- -- for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- delete (*iterAutomaticStyles); -- -- for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- delete (*bodyIter); --} -- --void OdgExporter::startGraphics(double width, double height) --{ -- m_gradientIndex = 1; -- m_dashIndex = 1; -- m_styleIndex = 1; -- m_width = width; -- m_height = height; -- -- -- mpHandler->startDocument(); -- OpenTagGraphicsElement tmpOfficeDocumentContent("office:document"); -- tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); -- tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office"); -- tmpOfficeDocumentContent.addAttribute("office:version", "1.0"); -- if (m_isFlatXML) -- tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing"); -- tmpOfficeDocumentContent.write(mpHandler); -- -- OpenTagGraphicsElement("office:settings").write(mpHandler); -- -- OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set"); -- configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings"); -- configItemSetOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement configItemOpenElement1("config:config-item"); -- configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop"); -- configItemOpenElement1.addAttribute("config:type", "int"); -- configItemOpenElement1.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement2("config:config-item"); -- configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft"); -- configItemOpenElement2.addAttribute("config:type", "int"); -- configItemOpenElement2.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement3("config:config-item"); -- configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth"); -- configItemOpenElement3.addAttribute("config:type", "int"); -- configItemOpenElement3.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * width); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement4("config:config-item"); -- configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight"); -- configItemOpenElement4.addAttribute("config:type", "int"); -- configItemOpenElement4.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * height); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- mpHandler->endElement("config:config-item-set"); -- -- mpHandler->endElement("office:settings"); -- --} -- --void OdgExporter::endGraphics() --{ -- OpenTagGraphicsElement("office:styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- (*iterStroke)->write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- (*iterGradient)->write(mpHandler); -- -- mpHandler->endElement("office:styles"); -- -- OpenTagGraphicsElement("office:automatic-styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- (*iterAutomaticStyles)->write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout"); -- tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0"); -- tmpStylePageLayoutOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in"); -- m_value.str(""); -- m_value << doubleToString(m_width) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(m_height) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str()); -- m_value.str(""); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait"); -- tmpStylePageLayoutPropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:page-layout-properties"); -- -- mpHandler->endElement("style:page-layout"); -- -- OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style"); -- tmpStyleStyleOpenElement.addAttribute("style:name", "dp1"); -- tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page"); -- tmpStyleStyleOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties"); -- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border"); -- tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none"); -- tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:drawing-page-properties"); -- -- mpHandler->endElement("style:style"); -- -- mpHandler->endElement("office:automatic-styles"); -- -- OpenTagGraphicsElement("office:master-styles").write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page"); -- tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default"); -- tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0"); -- tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpStyleMasterPageOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:master-page"); -- -- mpHandler->endElement("office:master-styles"); -- -- OpenTagGraphicsElement("office:body").write(mpHandler); -- -- OpenTagGraphicsElement("office:drawing").write(mpHandler); -- -- OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page"); -- tmpDrawPageOpenElement.addAttribute("draw:name", "page1"); -- tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default"); -- tmpDrawPageOpenElement.write(mpHandler); -- -- for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- { -- (*bodyIter)->write(mpHandler); -- } -- -- mpHandler->endElement("draw:page"); -- mpHandler->endElement("office:drawing"); -- mpHandler->endElement("office:body"); -- mpHandler->endElement("office:document"); -- -- mpHandler->endDocument(); --} -- --void OdgExporter::setPen(const libwpg::WPGPen& pen) --{ -- m_pen = pen; --} -- --void OdgExporter::setBrush(const libwpg::WPGBrush& brush) --{ -- m_brush = brush; --} -- --void OdgExporter::setFillRule(FillRule rule) --{ -- m_fillRule = rule; --} -- --void OdgExporter::startLayer(unsigned int) --{ --} -- --void OdgExporter::endLayer(unsigned int) --{ --} -- --void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double ) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawRectElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x2-rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y2-rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rx) << "in"; -- // FIXME: what to do when rx != ry ? -- pDrawRectElement->addAttribute("draw:corner-radius", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect"))); --} -- --void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawEllipseElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.x - rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.y - ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse"))); --} -- --void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices) --{ -- if(vertices.count() < 2) -- return; -- -- if(vertices.count() == 2) -- { -- const libwpg::WPGPoint& p1 = vertices[0]; -- const libwpg::WPGPoint& p2 = vertices[1]; -- -- writeStyle(); -- OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawLineElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawLineElement->addAttribute("draw:text-style-name", "P1"); -- pDrawLineElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p1.x) << "in"; -- pDrawLineElement->addAttribute("svg:x1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p1.y) << "in"; -- pDrawLineElement->addAttribute("svg:y1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.x) << "in"; -- pDrawLineElement->addAttribute("svg:x2", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.y) << "in"; -- pDrawLineElement->addAttribute("svg:y2", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line"))); -- } -- else -- { -- // draw as path -- libwpg::WPGPath path; -- path.moveTo(vertices[0]); -- for(unsigned long ii = 1; ii < vertices.count(); ii++) -- path.lineTo(vertices[ii]); -- path.closed = true; -- drawPath(path); -- } --} -- --void OdgExporter::drawPath(const libwpg::WPGPath& path) --{ -- if(path.count() == 0) -- return; -- -- // try to find the bounding box -- // this is simple convex hull technique, the bounding box might not be -- // accurate but that should be enough for this purpose -- libwpg::WPGPoint p = path.element(0).point; -- libwpg::WPGPoint q = path.element(0).point; -- for(unsigned k = 0; k < path.count(); k++) -- { -- libwpg::WPGPathElement element = path.element(k); -- p.x = (p.x > element.point.x) ? element.point.x : p.x; -- p.y = (p.y > element.point.y) ? element.point.y : p.y; -- q.x = (q.x < element.point.x) ? element.point.x : q.x; -- q.y = (q.y < element.point.y) ? element.point.y : q.y; -- if(element.type == libwpg::WPGPathElement::CurveToElement) -- { -- p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x; -- p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y; -- q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x; -- q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y; -- p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x; -- p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y; -- q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x; -- q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y; -- } -- } -- double vw = q.x - p.x; -- double vh = q.y - p.y; -- -- writeStyle(); -- -- OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawPathElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawPathElement->addAttribute("draw:text-style-name", "P1"); -- pDrawPathElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p.x) << "in"; -- pDrawPathElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p.y) << "in"; -- pDrawPathElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vw) << "in"; -- pDrawPathElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vh) << "in"; -- pDrawPathElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540); -- pDrawPathElement->addAttribute("svg:viewBox", m_value.str()); -- m_value.str(""); -- -- for(unsigned i = 0; i < path.count(); i++) -- { -- libwpg::WPGPathElement element = path.element(i); -- libwpg::WPGPoint point = element.point; -- switch(element.type) -- { -- // 2540 is 2.54*1000, 2.54 in = 1 in -- case libwpg::WPGPathElement::MoveToElement: -- m_value << "M" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::LineToElement: -- m_value << "L" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::CurveToElement: -- m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " "; -- m_value << (int)((element.extra1.y-p.y)*2540) << " "; -- m_value << (int)((element.extra2.x-p.x)*2540) << " "; -- m_value << (int)((element.extra2.y-p.y)*2540) << " "; -- m_value << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- default: -- break; -- } -- } -- if(path.closed) -- m_value << " Z"; -- pDrawPathElement->addAttribute("svg:d", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path"))); --} -- -- --void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap) --{ -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary; -- bitmap.generateBase64DIB(base64Binary); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- --void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData) --{ -- if (binaryData.mimeType.length() <= 0) -- return; -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary = binaryData.getBase64Data(); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- -- --static std::string colorToHex(const libwpg::WPGColor& color) --{ -- char hexdigits[] = "0123456789abcdef"; -- char buffer[] = "123456"; -- buffer[0] = hexdigits[(color.red >> 4) & 15]; -- buffer[1] = hexdigits[color.red & 15]; -- buffer[2] = hexdigits[(color.green >> 4) & 15]; -- buffer[3] = hexdigits[color.green & 15]; -- buffer[4] = hexdigits[(color.blue >> 4) & 15]; -- buffer[5] = hexdigits[color.blue & 15]; -- return std::string(buffer); --} -- --void OdgExporter::writeStyle() --{ -- m_value.str(""); -- m_name.str(""); -- -- if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) ) -- { -- // ODG only supports dashes with the same length of spaces inbetween -- // here we take the first space and assume everything else the same -- // note that dash length is written in percentage -- double distance = m_pen.dashArray.at(1); -- OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash"); -- tmpDrawStrokeDashElement->addAttribute("draw:style", "rect"); -- m_value << "Dash_" << m_dashIndex++; -- tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(distance*100) << "%"; -- tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str()); -- m_value.str(""); -- for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++) -- { -- m_name << "draw:dots" << i+1; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1"); -- m_name.str(""); -- m_name << "draw:dots" << i+1 << "-length"; -- m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%"; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str()); -- m_name.str(""); -- m_value.str(""); -- } -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement)); -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash"))); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient"); -- tmpDrawGradientElement->addAttribute("draw:style", "linear"); -- m_value << "Gradient_" << m_gradientIndex++; -- tmpDrawGradientElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- -- // ODG angle unit is 0.1 degree -- double angle = -m_brush.gradient.angle(); -- while(angle < 0) -- angle += 360; -- while(angle > 360) -- angle -= 360; -- -- m_value << (unsigned)(angle*10); -- tmpDrawGradientElement->addAttribute("draw:angle", m_value.str()); -- m_value.str(""); -- -- libwpg::WPGColor startColor = m_brush.gradient.stopColor(0); -- libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1); -- m_value << "#" << colorToHex(startColor); -- tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(stopColor); -- tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str()); -- m_value.str(""); -- tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:border", "0%"); -- mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement)); -- mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient"))); -- } -- -- OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style"); -- m_value << "gr" << m_styleIndex; -- tmpStyleStyleElement->addAttribute("style:name", m_value.str()); -- m_value.str(""); -- tmpStyleStyleElement->addAttribute("style:family", "graphic"); -- tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard"); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement)); -- -- OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties"); -- -- if(m_pen.width > 0.0) -- { -- m_value << doubleToString(m_pen.width) << "in"; -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(m_pen.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str()); -- m_value.str(""); -- -- if(!m_pen.solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash"); -- m_value << "Dash_" << m_dashIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str()); -- m_value.str(""); -- } -- } -- else -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::NoBrush) -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::Solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid"); -- m_value << "#" << colorToHex(m_brush.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str()); -- m_value.str(""); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient"); -- m_value << "Gradient_" << m_gradientIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str()); -- m_value.str(""); -- } -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement)); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties"))); -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style"))); -- m_styleIndex++; --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,116 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef __ODGEXPORTER_H__ --#define __ODGEXPORTER_H__ -- --#include <iostream> --#include <sstream> --#include <string> -- --#include <libwpg/libwpg.h> --#include "GraphicsElement.hxx" -- --class OdgExporter : public libwpg::WPGPaintInterface { --public: -- explicit OdgExporter(GraphicsHandler *pHandler, -- const bool isFlatXML = false); -- ~OdgExporter(); -- --#if LIBWPG_VERSION_MINOR<2 -- void startGraphics(double imageWidth, double imageHeight); -- void endGraphics(); -- void startLayer(unsigned int id); -- void endLayer(unsigned int id); -- -- void setPen(const libwpg::WPGPen& pen); -- void setBrush(const libwpg::WPGBrush& brush); -- void setFillRule(FillRule rule); -- -- void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry); -- void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry); -- void drawPolygon(const libwpg::WPGPointArray& vertices); -- void drawPath(const libwpg::WPGPath& path); -- void drawBitmap(const libwpg::WPGBitmap& bitmap); -- void drawImageObject(const libwpg::WPGBinaryData& binaryData); -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- libwpg::WPGPen m_pen; -- libwpg::WPGBrush m_brush; -- FillRule m_fillRule; -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#else -- virtual void startGraphics(const ::WPXPropertyList &propList); -- virtual void endGraphics(); -- virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient); -- virtual void startLayer(const ::WPXPropertyList &propList); -- virtual void endLayer(); -- virtual void drawRectangle(const ::WPXPropertyList& propList); -- virtual void drawEllipse(const ::WPXPropertyList& propList); -- virtual void drawPolygon(const ::WPXPropertyListVector &vertices); -- virtual void drawPath(const ::WPXPropertyListVector &path); -- virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData); -- virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList); -- virtual void endEmbeddedGraphics(); -- virtual void drawPolyline(const ::WPXPropertyListVector &vertices); -- virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path); -- virtual void endTextObject(); -- virtual void startTextLine(const ::WPXPropertyList &propList); -- virtual void endTextLine(); -- virtual void startTextSpan(const ::WPXPropertyList &propList); -- virtual void endTextSpan(); -- virtual void insertText(const ::WPXString &str); -- -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#endif --}; -- --#endif // __ODGEXPORTER_H__ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp ---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp 2011-01-02 17:46:15.000000000 +0100 -@@ -20,28 +20,26 @@ - #include <WPGImport.h> - #include <WPGImport.moc> - --#include <QBuffer> --#include <QByteArray> --#include <QString> -- --#include <kdebug.h> - #include <KoFilterChain.h> - #include <KoGlobal.h> - #include <KoUnit.h> -+#include <KoXmlWriter.h> -+ - #include <kpluginfactory.h> -+#include <KDebug> - --#include <KoXmlWriter.h> -+ -+#include <QtCore/QString> -+#include <QtCore/QFile> - - #include <libwpg/libwpg.h> - #if LIBWPG_VERSION_MINOR<2 - #include <libwpg/WPGStreamImplementation.h> - #else - #include <libwpd-stream/libwpd-stream.h> -+#include <libwpd/libwpd.h> - #endif - --#include "FileOutputHandler.hxx" --#include "OdgExporter.hxx" -- - #include <iostream> - - K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();) -@@ -56,35 +54,13 @@ - { - } - --static QByteArray createManifest() --{ -- KoXmlWriter* manifestWriter; -- QByteArray manifestData; -- QBuffer manifestBuffer(&manifestData); -- -- manifestBuffer.open(QIODevice::WriteOnly); -- manifestWriter = new KoXmlWriter(&manifestBuffer); -- -- manifestWriter->startDocument("manifest:manifest"); -- manifestWriter->startElement("manifest:manifest"); -- manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0"); -- manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics"); -- //manifestWriter->addManifestEntry( "styles.xml", "text/xml" ); -- manifestWriter->addManifestEntry("content.xml", "text/xml"); -- manifestWriter->endElement(); -- manifestWriter->endDocument(); -- delete manifestWriter; -- -- return manifestData; --} -- - - KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to) - { - if (from != "application/x-wpg") - return KoFilter::NotImplemented; - -- if (to != "application/vnd.oasis.opendocument.graphics") -+ if (to != "image/svg+xml") - return KoFilter::NotImplemented; - - #if LIBWPG_VERSION_MINOR<2 -@@ -96,6 +72,7 @@ - input = olestream; - } - } -+ libwpg::WPGString output; - #else - WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit()); - if (input->isOLEStream()) { -@@ -105,59 +82,31 @@ - input = olestream; - } - } -+ ::WPXString output; - #endif - - if (!libwpg::WPGraphics::isSupported(input)) { -- std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl; -+ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!"; - delete input; - return KoFilter::NotImplemented; - } - -- // do the conversion -- std::ostringstream tmpStringStream; -- FileOutputHandler tmpHandler(tmpStringStream); -- OdgExporter exporter(&tmpHandler); -- libwpg::WPGraphics::parse(input, &exporter); -- delete input; -- -- -- // create output store -- KoStore* storeout; -- storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write, -- "application/vnd.oasis.opendocument.graphics", KoStore::Zip); -- -- if (!storeout) { -- kWarning() << "Couldn't open the requested file."; -- return KoFilter::FileNotFound; -- } -- --#if 0 -- if (!storeout->open("styles.xml")) { -- kWarning() << "Couldn't open the file 'styles.xml'."; -- return KoFilter::CreationError; -+ if (!libwpg::WPGraphics::generateSVG(input, output)) { -+ kWarning() << "ERROR: SVG Generation failed!"; -+ delete input; -+ return KoFilter::ParsingError; - } -- //storeout->write( createStyles() ); -- storeout->close(); --#endif - -- if (!storeout->open("content.xml")) { -- kWarning() << "Couldn't open the file 'content.xml'."; -- return KoFilter::CreationError; -- } -- storeout->write(tmpStringStream.str().c_str()); -- storeout->close(); -+ delete input; - -- // store document manifest -- storeout->enterDirectory("META-INF"); -- if (!storeout->open("manifest.xml")) { -- kWarning() << "Couldn't open the file 'META-INF/manifest.xml'."; -- return KoFilter::CreationError; -+ QFile outputFile(m_chain->outputFile()); -+ if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) { -+ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile(); -+ return KoFilter::InternalError; - } -- storeout->write(createManifest()); -- storeout->close(); - -- // we are done! -- delete storeout; -+ outputFile.write(output.cstr()); -+ outputFile.close(); - - return KoFilter::OK; - } - diff --git a/staging/koffice/koffice.install b/staging/koffice/koffice.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/koffice/koffice.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/staging/koffice/krita.install b/staging/koffice/krita.install deleted file mode 100644 index ce5c32e1b..000000000 --- a/staging/koffice/krita.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/staging/libproxy/PKGBUILD b/staging/libproxy/PKGBUILD deleted file mode 100644 index 7fde7ae6d..000000000 --- a/staging/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/staging/mod_perl/PKGBUILD b/staging/mod_perl/PKGBUILD deleted file mode 100644 index 33f4e7901..000000000 --- a/staging/mod_perl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 125232 2011-05-25 19:12:54Z foutrelis $ -# Maintainer: Firmicus <francois.archlinux.org> -# Contributor: Tom K <tomk@runbox.com> - -pkgname=mod_perl -pkgver=2.0.5 -pkgrel=2 -pkgdesc="Apache module that embeds the Perl interpreter within the server" -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl=5.12.3' 'apache' 'db' 'apr-util') -license=('APACHE') -arch=('i686' 'x86_64') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz) -md5sums=('03d01d135a122bd8cebd0cd5b185d674') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} -} diff --git a/staging/net-snmp/PKGBUILD b/staging/net-snmp/PKGBUILD deleted file mode 100644 index 42faa88a3..000000000 --- a/staging/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/staging/net-snmp/libnl-2.patch b/staging/net-snmp/libnl-2.patch deleted file mode 100644 index 7c140fe83..000000000 --- a/staging/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/staging/net-snmp/snmpd.rc b/staging/net-snmp/snmpd.rc deleted file mode 100644 index 9f1b83f64..000000000 --- a/staging/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/staging/pango-perl/PKGBUILD b/staging/pango-perl/PKGBUILD deleted file mode 100644 index ad489dec4..000000000 --- a/staging/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/staging/perl-alien-sdl/PKGBUILD b/staging/perl-alien-sdl/PKGBUILD deleted file mode 100644 index 25bd18eeb..000000000 --- a/staging/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/staging/perl-bit-vector/PKGBUILD b/staging/perl-bit-vector/PKGBUILD deleted file mode 100644 index ebdc0719d..000000000 --- a/staging/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/staging/perl-compress-bzip2/PKGBUILD b/staging/perl-compress-bzip2/PKGBUILD deleted file mode 100644 index ad5f788ac..000000000 --- a/staging/perl-compress-bzip2/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 124543 2011-05-22 21:27:46Z angvp $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -pkgname=perl-compress-bzip2 -_realname=Compress-Bzip2 -pkgver=2.09 -pkgrel=2 -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/staging/perl-crypt-ssleay/PKGBUILD b/staging/perl-crypt-ssleay/PKGBUILD deleted file mode 100644 index 37f315f89..000000000 --- a/staging/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/staging/perl-dbd-mysql/PKGBUILD b/staging/perl-dbd-mysql/PKGBUILD deleted file mode 100644 index 42d22d211..000000000 --- a/staging/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/staging/perl-dbd-sqlite/PKGBUILD b/staging/perl-dbd-sqlite/PKGBUILD deleted file mode 100644 index 298cc2008..000000000 --- a/staging/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/staging/perl-dbi/PKGBUILD b/staging/perl-dbi/PKGBUILD deleted file mode 100644 index 42f7a5770..000000000 --- a/staging/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/staging/perl-digest-nilsimsa/PKGBUILD b/staging/perl-digest-nilsimsa/PKGBUILD deleted file mode 100644 index 40e9ae353..000000000 --- a/staging/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/staging/perl-digest-sha1/PKGBUILD b/staging/perl-digest-sha1/PKGBUILD deleted file mode 100644 index eaae5e528..000000000 --- a/staging/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/staging/perl-event/PKGBUILD b/staging/perl-event/PKGBUILD deleted file mode 100644 index 3e20ec4c2..000000000 --- a/staging/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/staging/perl-fcgi/PKGBUILD b/staging/perl-fcgi/PKGBUILD deleted file mode 100644 index d44eddf2a..000000000 --- a/staging/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/staging/perl-html-parser/PKGBUILD b/staging/perl-html-parser/PKGBUILD deleted file mode 100644 index 7e3b0a701..000000000 --- a/staging/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/staging/perl-libintl-perl/PKGBUILD b/staging/perl-libintl-perl/PKGBUILD deleted file mode 100644 index af266d871..000000000 --- a/staging/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/staging/perl-locale-gettext/PKGBUILD b/staging/perl-locale-gettext/PKGBUILD deleted file mode 100644 index 6f916e28e..000000000 --- a/staging/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/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch b/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch deleted file mode 100644 index ad675516b..000000000 --- a/staging/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/staging/perl-net-dns/PKGBUILD b/staging/perl-net-dns/PKGBUILD deleted file mode 100644 index 1a4f7c0cc..000000000 --- a/staging/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/staging/perl-net-ssleay/PKGBUILD b/staging/perl-net-ssleay/PKGBUILD deleted file mode 100644 index 6620fbd6f..000000000 --- a/staging/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/staging/perl-net-upnp/PKGBUILD b/staging/perl-net-upnp/PKGBUILD deleted file mode 100644 index e54c70917..000000000 --- a/staging/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/staging/perl-netaddr-ip/PKGBUILD b/staging/perl-netaddr-ip/PKGBUILD deleted file mode 100644 index fa6549515..000000000 --- a/staging/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/staging/perl-sdl/PKGBUILD b/staging/perl-sdl/PKGBUILD deleted file mode 100644 index 27ef6a6c2..000000000 --- a/staging/perl-sdl/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124823 2011-05-24 15:53:48Z heftig $ -# 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=2 -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') - -package() { - cd "$srcdir/SDL-$pkgver" - - # install module in vendor directories - perl Build.PL installdirs=vendor destdir="$pkgdir" - - perl Build - perl Build install -} diff --git a/staging/perl-template-toolkit/PKGBUILD b/staging/perl-template-toolkit/PKGBUILD deleted file mode 100644 index d955edfdd..000000000 --- a/staging/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/staging/perl-term-readkey/PKGBUILD b/staging/perl-term-readkey/PKGBUILD deleted file mode 100644 index 25f9e397d..000000000 --- a/staging/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/staging/perl-text-iconv/PKGBUILD b/staging/perl-text-iconv/PKGBUILD deleted file mode 100644 index acd6932e2..000000000 --- a/staging/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/staging/perl-time-hires/PKGBUILD b/staging/perl-time-hires/PKGBUILD deleted file mode 100644 index db9ddcb7f..000000000 --- a/staging/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/staging/perl-tk/PKGBUILD b/staging/perl-tk/PKGBUILD deleted file mode 100644 index 2a80a320e..000000000 --- a/staging/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/staging/perl-unicode-string/PKGBUILD b/staging/perl-unicode-string/PKGBUILD deleted file mode 100644 index c8bcd6c7a..000000000 --- a/staging/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/staging/perl-xml-parser/PKGBUILD b/staging/perl-xml-parser/PKGBUILD deleted file mode 100644 index 46ffa0923..000000000 --- a/staging/perl-xml-parser/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 124562 2011-05-22 23:45:41Z 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.40 -pkgrel=3 -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/C/CH/CHORNY/${_realname}-${pkgver}.tar.gz") -md5sums=('c66e9adba003d0667cc40115ccd837a5') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist. - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete -} diff --git a/staging/perl-yaml-syck/PKGBUILD b/staging/perl-yaml-syck/PKGBUILD deleted file mode 100644 index c2ab5a4f8..000000000 --- a/staging/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/staging/perl/ChangeLog b/staging/perl/ChangeLog deleted file mode 100644 index f6c2500df..000000000 --- a/staging/perl/ChangeLog +++ /dev/null @@ -1,57 +0,0 @@ -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/staging/perl/PKGBUILD b/staging/perl/PKGBUILD deleted file mode 100644 index aabf4dbc0..000000000 --- a/staging/perl/PKGBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# $Id: PKGBUILD 124529 2011-05-22 19:14:50Z 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.0 -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>=4.8' 'coreutils' 'glibc' 'sh') -changelog=ChangeLog -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh) -install=perl.install -options=('!makeflags' '!purge') -md5sums=('e7457deea78330c5f8eebb2fd2a45479' - 'f86eb0dba1638ca6d1c8fff1b06c2a71') - -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} - 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 so set paths to perl scripts. - install -D -m755 ${srcdir}/perlbin.sh \ - ${pkgdir}/etc/profile.d/perlbin.sh - - (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 -} - diff --git a/staging/perl/fix-h2ph-and-tests.patch b/staging/perl/fix-h2ph-and-tests.patch deleted file mode 100644 index a2d176ec6..000000000 --- a/staging/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/staging/perl/perl.install b/staging/perl/perl.install deleted file mode 100644 index 3f7d58f23..000000000 --- a/staging/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/staging/perl/perlbin.sh b/staging/perl/perlbin.sh deleted file mode 100755 index 09811a8b4..000000000 --- a/staging/perl/perlbin.sh +++ /dev/null @@ -1,23 +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/staging/pidgin/PKGBUILD b/staging/pidgin/PKGBUILD deleted file mode 100644 index 3ed646b74..000000000 --- a/staging/pidgin/PKGBUILD +++ /dev/null @@ -1,114 +0,0 @@ -# $Id: PKGBUILD 124935 2011-05-25 09:46:33Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> - -pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.7.11 -pkgrel=6 -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-pidgin.patch - nm09-more.patch) -md5sums=('07c2a2535b4d7436b5ec7685fe063fec' - '744a21b4dbaf949dba7cd3b75b12b4fe' - 'a673659d86c7a65aa710f7c8c7feda82') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Update for NetworkManager 0.9 connection states - # (http://developer.pidgin.im/ticket/13505) - # (http://developer.pidgin.im/ticket/13859) - patch -Np1 -i "$srcdir/nm09-pidgin.patch" - patch -Np1 -i "$srcdir/nm09-more.patch" - - # Use Python 2 - sed -i 's/env python$/\02/' */plugins/*.py \ - libpurple/purple-{remote,notifications-example,url-handler} - - ./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/staging/pidgin/nm09-more.patch b/staging/pidgin/nm09-more.patch deleted file mode 100644 index 8c708df9a..000000000 --- a/staging/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/staging/pidgin/nm09-pidgin.patch b/staging/pidgin/nm09-pidgin.patch deleted file mode 100644 index 1c2471d1f..000000000 --- a/staging/pidgin/nm09-pidgin.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c ---- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600 -+++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600 -@@ -71,6 +71,10 @@ - #include <dbus/dbus-glib.h> - #include <NetworkManager.h> - -+#if !defined(NM_CHECK_VERSION) -+#define NM_CHECK_VERSION(x,y,z) 0 -+#endif -+ - static DBusGConnection *nm_conn = NULL; - static DBusGProxy *nm_proxy = NULL; - static DBusGProxy *dbus_proxy = NULL; -@@ -863,7 +867,13 @@ nm_update_state(NMState state) - - switch(state) - { -+#if NM_CHECK_VERSION(0,8,992) -+ case NM_STATE_CONNECTED_LOCAL: -+ case NM_STATE_CONNECTED_SITE: -+ case NM_STATE_CONNECTED_GLOBAL: -+#else - case NM_STATE_CONNECTED: -+#endif - /* Call res_init in case DNS servers have changed */ - res_init(); - /* update STUN IP in case we it changed (theoretically we could -@@ -880,6 +890,9 @@ nm_update_state(NMState state) - case NM_STATE_ASLEEP: - case NM_STATE_CONNECTING: - case NM_STATE_DISCONNECTED: -+#if NM_CHECK_VERSION(0,8,992) -+ case NM_STATE_DISCONNECTING: -+#endif - if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) - break; - if (ui_ops != NULL && ui_ops->network_disconnected != NULL) diff --git a/staging/pidgin/pidgin.install b/staging/pidgin/pidgin.install deleted file mode 100644 index 1a05f573e..000000000 --- a/staging/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/staging/postgresql/PKGBUILD b/staging/postgresql/PKGBUILD deleted file mode 100644 index d5a887585..000000000 --- a/staging/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/staging/postgresql/build.patch b/staging/postgresql/build.patch deleted file mode 100644 index c8f665d12..000000000 --- a/staging/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/staging/postgresql/perl-5.14-fix.patch b/staging/postgresql/perl-5.14-fix.patch deleted file mode 100644 index 82ef7d688..000000000 --- a/staging/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/staging/postgresql/postgresql b/staging/postgresql/postgresql deleted file mode 100755 index 0fbe94036..000000000 --- a/staging/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/staging/postgresql/postgresql.confd b/staging/postgresql/postgresql.confd deleted file mode 100644 index 5f8fa034c..000000000 --- a/staging/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/staging/postgresql/postgresql.install b/staging/postgresql/postgresql.install deleted file mode 100644 index d65bb6a7f..000000000 --- a/staging/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/staging/postgresql/postgresql.logrotate b/staging/postgresql/postgresql.logrotate deleted file mode 100644 index 9c36918be..000000000 --- a/staging/postgresql/postgresql.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/postgresql.log { - copytruncate - missingok -} diff --git a/staging/postgresql/postgresql.pam b/staging/postgresql/postgresql.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/staging/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/staging/rasqal/PKGBUILD b/staging/rasqal/PKGBUILD deleted file mode 100644 index c246d1528..000000000 --- a/staging/rasqal/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 121005 2011-04-27 20:12:19Z andrea $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Lawrence Lee <valheru@facticius.net> - -pkgname=rasqal -pkgver=0.9.25 -pkgrel=2 -pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" -url="http://librdf.org/rasqal" -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -depends=('raptor>=2.0.2' 'mpfr') -options=('!libtool') -source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) -md5sums=('ee12d7ad59c581eb65db89c851672c0a') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --disable-static \ - --enable-release - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/razor/PKGBUILD b/staging/razor/PKGBUILD deleted file mode 100644 index 87905b577..000000000 --- a/staging/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/staging/redland/PKGBUILD b/staging/redland/PKGBUILD deleted file mode 100644 index f8b337c91..000000000 --- a/staging/redland/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# $Id: PKGBUILD 121010 2011-04-27 20:14:39Z andrea $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Francois Charette <francois.archlinux.org> - -pkgbase=redland -pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') -pkgver=1.0.13 -pkgrel=2 -url="http://librdf.org/" -license=("GPL") -arch=('i686' 'x86_64') -makedepends=('rasqal>=0.9.25' 'raptor>=2.0.2' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') -options=('!libtool') -source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz - rpath.diff) -md5sums=('96c15f36f842ad7e1c9d225e4ca97b68' - 'acc85e784f01a656bd56777f95880787') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --enable-release \ - --disable-static \ - --with-raptor=system \ - --with-rasqal=system \ - --with-sqlite=3 - - # nuke rpath - patch -Np0 -i ${srcdir}/rpath.diff - - make -} - -package_redland() { - pkgdesc="Library that provides a high-level interface to RDF data" - depends=('rasqal>=0.9.25' 'raptor>=2.0.2' 'libtool') - - cd ${srcdir}/${pkgbase}-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/lib/redland -} - -package_redland-storage-mysql() { - pkgdesc="MySQL storage support for Redland" - depends=('redland' 'libmysqlclient') - - cd ${srcdir}/${pkgbase}-${pkgver} - install -dm755 ${pkgdir}/usr/lib/redland - install -m755 src/.libs/librdf_storage_mysql.so ${pkgdir}/usr/lib/redland/librdf_storage_mysql.so -} - -package_redland-storage-postgresql() { - pkgdesc="PostgreSQL storage support for Redland" - depends=('redland' 'postgresql-libs') - - cd ${srcdir}/${pkgbase}-${pkgver} - install -dm755 ${pkgdir}/usr/lib/redland - install -m755 src/.libs/librdf_storage_postgresql.so ${pkgdir}/usr/lib/redland/ -} - -package_redland-storage-virtuoso() { - pkgdesc="Virtuoso storage support for Redland" - depends=('redland' 'unixodbc' 'db') - - cd ${srcdir}/${pkgbase}-${pkgver} - install -dm755 ${pkgdir}/usr/lib/redland - install -m755 src/.libs/librdf_storage_virtuoso.so ${pkgdir}/usr/lib/redland/ -} - -package_redland-storage-sqlite() { - pkgdesc="SQLite storage support for Redland" - depends=('redland' 'sqlite3' 'db') - - cd ${srcdir}/${pkgbase}-${pkgver} - install -dm755 ${pkgdir}/usr/lib/redland - install -m755 src/.libs/librdf_storage_sqlite.so ${pkgdir}/usr/lib/redland/ -} diff --git a/staging/redland/rpath.diff b/staging/redland/rpath.diff deleted file mode 100644 index 831bc80ed..000000000 --- a/staging/redland/rpath.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- libtool 2011-02-20 10:46:47.000000000 +0100 -+++ libtool.new 2011-02-20 10:52:58.285764909 +0100 -@@ -324,7 +324,7 @@ - - # Flag to hardcode $libdir into a binary during linking. - # This must work even if $libdir does not exist --hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" -+hardcode_libdir_flag_spec=" " - - # If ld is used when linking, flag to hardcode $libdir into a binary - # during linking. This must work even if $libdir does not exist. diff --git a/staging/rxvt-unicode/ChangeLog b/staging/rxvt-unicode/ChangeLog deleted file mode 100644 index d4275a700..000000000 --- a/staging/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/staging/rxvt-unicode/PKGBUILD b/staging/rxvt-unicode/PKGBUILD deleted file mode 100644 index a72fa7c11..000000000 --- a/staging/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/staging/rxvt-unicode/rxvt-unicode.desktop b/staging/rxvt-unicode/rxvt-unicode.desktop deleted file mode 100644 index 68d613dbd..000000000 --- a/staging/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/staging/slv2/PKGBUILD b/staging/slv2/PKGBUILD deleted file mode 100644 index bc8c1b69a..000000000 --- a/staging/slv2/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 120997 2011-04-27 20:04:54Z andrea $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Leslie P. Polzer <polzer@stardawn.org> - -pkgname=slv2 -pkgver=0.6.6 -pkgrel=5 -pkgdesc="Library for LV2 hosts" -arch=('i686' 'x86_64') -url="http://drobilla.net/software/slv2" -license=('GPL') -depends=('redland>=1.0.13' 'lv2core' 'jack') -makedepends=('python2') -install=$pkgname.install -changelog=$pkgname.changelog -source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2) -md5sums=('b8e8e0e82dd04324fcd533e8acd1ce85') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - python2 waf configure --prefix=/usr - python2 waf build $MAKEFLAGS -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - python2 waf install --destdir="$pkgdir/" -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/slv2/slv2.changelog b/staging/slv2/slv2.changelog deleted file mode 100644 index f394a5067..000000000 --- a/staging/slv2/slv2.changelog +++ /dev/null @@ -1,23 +0,0 @@ -22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> - - * 0.6.6-3: - raptor rebuild - -24 Nov 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> - - * PKGBUILD : - Get rid of sed and use python2 directly for waf. - waf fix for python transition already included previously (unlogged). - Release only (no need binary update; no runtime python requirement). - -9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> - - * 0.6.6-2 : - Brought into extra from community for ardour - - adds "LV2" plug-ins support - - * PKGBUILD : - Minor cosmetic ammendments. - - * slv2.changelog : - Added this changelog. diff --git a/staging/slv2/slv2.install b/staging/slv2/slv2.install deleted file mode 100644 index c980ddfab..000000000 --- a/staging/slv2/slv2.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - echo "Updating Shared Library Links" - /sbin/ldconfig -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/spamassassin/PKGBUILD b/staging/spamassassin/PKGBUILD deleted file mode 100644 index 6b97ea8c1..000000000 --- a/staging/spamassassin/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 125325 2011-05-25 21:40:50Z remy $ -# Maintainer: Dale Blount <dale@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=spamassassin -pkgver=3.3.1 -pkgrel=5 -pkgdesc="A mail filter to identify spam." -arch=(i686 x86_64) -license=(APACHE) -url="http://spamassassin.apache.org" -depends=('perl>=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ - 'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \ - 'perl-libwww' 'perl-mail-spf' \ - 'zlib' 're2c') - # perl-archive-tar perl-io-zlib) -makedepends=('razor' 'perl-dbi') -optdepends=('razor: to identify collaborately-flagged spam' - 'gnupg: gpg support, without this use --nogpg flag for sa-update' - 're2c: regexp compiler, for compiling rules with sa-compile') -backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \ - etc/mail/spamassassin/init.pre \ - etc/mail/spamassassin/v310.pre \ - etc/mail/spamassassin/v312.pre \ - etc/mail/spamassassin/v320.pre) -install=${pkgname}.install -options=(!emptydirs) -source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz \ - spamd.conf.d spamd) -md5sums=('5a93f81fda315411560ff5da099382d2' - 'af501c6b0bb937a2775b747cc4b6d150' - '0534d3071a526a27ddc2b297afa03b04') - -build() { - cd ${srcdir}/Mail-SpamAssassin-${pkgver} - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor \ - CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no - /usr/bin/make -} - -check() { - cd ${srcdir}/Mail-SpamAssassin-${pkgver} - /usr/bin/make test || true -} - -package() { - cd ${srcdir}/Mail-SpamAssassin-${pkgver} - /usr/bin/make DESTDIR=${pkgdir} install - - /bin/install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd - /bin/install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd -} diff --git a/staging/spamassassin/spamassassin.install b/staging/spamassassin/spamassassin.install deleted file mode 100644 index 5109956c9..000000000 --- a/staging/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/staging/spamassassin/spamd b/staging/spamassassin/spamd deleted file mode 100644 index 11d35f7cd..000000000 --- a/staging/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/staging/spamassassin/spamd.conf.d b/staging/spamassassin/spamd.conf.d deleted file mode 100644 index 4295e0073..000000000 --- a/staging/spamassassin/spamd.conf.d +++ /dev/null @@ -1 +0,0 @@ -SPAMD_OPTS="-c" diff --git a/staging/vim/PKGBUILD b/staging/vim/PKGBUILD deleted file mode 100644 index 603de624a..000000000 --- a/staging/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/staging/vim/archlinux.vim b/staging/vim/archlinux.vim deleted file mode 100644 index 148bb930f..000000000 --- a/staging/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/staging/vim/gvim.desktop b/staging/vim/gvim.desktop deleted file mode 100644 index 56fd61b8f..000000000 --- a/staging/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/staging/vim/gvim.install b/staging/vim/gvim.install deleted file mode 100644 index 0a8d3b0a9..000000000 --- a/staging/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/staging/vim/vimrc b/staging/vim/vimrc deleted file mode 100644 index 92d3ff980..000000000 --- a/staging/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/staging/weechat/PKGBUILD b/staging/weechat/PKGBUILD deleted file mode 100644 index 7e2144efc..000000000 --- a/staging/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/alex/PKGBUILD b/testing/alex/PKGBUILD deleted file mode 100644 index d49dc3d6f..000000000 --- a/testing/alex/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 120390 2011-04-23 17:05:09Z vesa $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Philip Nilsson <pnilsson@nullref.se> - -pkgname=alex -pkgver=2.3.5 -pkgrel=1.2 -pkgdesc='a lexical analyser generator for Haskell' -arch=('i686' 'x86_64') -url='http://www.haskell.org/alex/' -license=('custom:BSD3') -depends=('gmp') -makedepends=('ghc=7.0.3') -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") - -build() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname - runghc Setup.lhs build -} - -package() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs copy --destdir=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 - - # doc/ contains only license which already installed into proper place - rm -rf $pkgdir/usr/share/doc -} -md5sums=('5e08c688ded0dcff98eaad6fc03a9402') diff --git a/testing/archboot/PKGBUILD b/testing/archboot/PKGBUILD deleted file mode 100644 index bb665e5e0..000000000 --- a/testing/archboot/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 124155 2011-05-17 06:46:14Z tpowa $ -# Maintainer : Tobias Powalowski <tpowa@archlinux.org> - -pkgname=archboot -pkgver=2011.05 -pkgrel=2 -pkgdesc="Advanced, modular arch boot/install image creation utility" -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://www.archlinux.org/" -depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'ndiswrapper>=1.56-9' 'ndiswrapper-utils>=1.56-2' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'tiacx>=20080210-21' 'tiacx-firmware>=2-3' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'ndiswrapper-lts>=1.56-5' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1') -optdepends=('grub2-bios: for grub2 support' - 'grub2-efi-i386: for grub2 support' - 'grub2-efi-x86_64: for grub2 support' - 'efibootmgr: for grub2 support' - 'clamav: for clamav support' -) -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c) -backup=('etc/archboot/allinone.conf' - 'etc/archboot/allinone-lts.conf' - 'etc/archboot/default.conf' - 'etc/archboot/default-ftp.conf' - 'etc/archboot/default-pxelinux.conf' - 'etc/archboot/default-ftp-pxelinux.conf' - 'etc/archboot/presets/allinone' - 'etc/archboot/presets/allinone-lts' - 'etc/archboot/presets/isolinux' - 'etc/archboot/presets/isolinux-ftp' - 'etc/archboot/presets/syslinux' - 'etc/archboot/presets/syslinux-ftp' - 'etc/archboot/presets/pxelinux' - 'etc/archboot/presets/pxelinux-ftp' -) -install=archboot.install - -### to bump the depends list use this: -#for i in $(grep ^depends= PKGBUILD | sed -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done - -build() -{ - cd $srcdir/$pkgname-$pkgver-$pkgrel - mv * $pkgdir/ - # vmware-detect - cd $startdir/src - gcc -o vmware-detect vmware-detect.c - install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect -} -md5sums=('e6d26e24c7491a3203421bd14e570c04' - '7e2b03463747cb22ab388e79a09fa0cb') diff --git a/testing/archboot/archboot.install b/testing/archboot/archboot.install deleted file mode 100644 index 315f97d7e..000000000 --- a/testing/archboot/archboot.install +++ /dev/null @@ -1,20 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -post_install() { - cat << EOF -ARCHBOOT usage: ---------------- ---> Main config files were installed to '/etc/archboot/'. - Preset files were installed to '/etc/archboot/presets'. - Modify them to your needs. ---> Use the preset files as config file of your build tool: - mkisolinux, mksyslinux or mkpxelinux ---> For Allinone ISOs use archboot-allinone.sh -EOF -} - -post_upgrade() { - post_install $1 -} diff --git a/testing/archboot/vmware-detect.c b/testing/archboot/vmware-detect.c deleted file mode 100644 index d242a388d..000000000 --- a/testing/archboot/vmware-detect.c +++ /dev/null @@ -1,13 +0,0 @@ -#include <stdio.h> -int main() { - unsigned char idtr[6]; - asm("sidt %0" : "=m" (idtr)); - if(0xff==idtr[5]) - { - return 0; - } - else - { - return 1; - } -} diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone deleted file mode 100644 index 509c311f6..000000000 --- a/testing/bind/127.0.0.zone +++ /dev/null @@ -1,11 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD deleted file mode 100644 index 8df2eb03d..000000000 --- a/testing/bind/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 125623 2011-05-27 08:34:32Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Mario Vazquez <mario_vazq@hotmail.com> - -pkgname=bind - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P2 -_pkgver=9.8.0-P2 -pkgrel=1 - -pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols' -arch=('i686' 'x86_64') -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -provides=('dns-server') -backup=('etc/logrotate.d/named' - 'etc/conf.d/named' - 'etc/named.conf') -depends=('openssl' 'krb5' 'libxml2') -options=('!makeflags' '!libtool') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz" - 'root.hint::ftp://ftp.rs.internic.net/domain/db.cache' - 'so_bsdcompat.patch' - 'notools.patch' - 'named' - 'named.conf' - 'named.conf.d' - 'named.logrotate' - 'localhost.zone' - '127.0.0.zone') -sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' - 'ee52947062c1582858187716b776afa3613608fb' - 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' - '17444f9d759a4bde7688bdaa304dac57a138e4c1' - '46232e9db243c6c05e170a1781d7a7f413be5d03' - '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' - '7848edbfb9a848843f57c11c02b0289eefd42d00' - '9ffb5c3f72390a517aeae557e32349d5d278cb63' - '76a0d4cd1b913db177a5a375bebc47e5956866ec' - '53be0f1437ebe595240d8dbdd819939582b97fb9') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - - patch -p1 -i ../so_bsdcompat.patch - patch -p1 -i ../notools.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-gssapi \ - --with-libxml2 \ - --with-libtool \ - --with-dlz-dlopen \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - - make DESTDIR="${pkgdir}" install - - rmdir "${pkgdir}/var/run" - install -d "${pkgdir}"/usr/share/doc/bind - install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - install -D -m755 ../named "${pkgdir}"/etc/rc.d/named - install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named - install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named - install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf - - install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ -} diff --git a/testing/bind/install b/testing/bind/install deleted file mode 100644 index e3a1397cb..000000000 --- a/testing/bind/install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group named >/dev/null || groupadd -g 40 named - getent passwd named >/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named - passwd -l named &>/dev/null - - touch var/log/named.log - chown named:named var/log/named.log - - # create an rndc.key if it doesn't already exist - if [ ! -s etc/rndc.key ]; then - usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key - chown root:named etc/rndc.key - chmod 640 etc/rndc.key - fi -} - -pre_remove() { - getent passwd named &>/dev/null && userdel named >/dev/null - getent group named &>/dev/null && groupdel named >/dev/null - return 0 -} diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone deleted file mode 100644 index e3ff9641c..000000000 --- a/testing/bind/localhost.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN localhost. -@ 1D IN SOA @ root ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS @ - 1D IN A 127.0.0.1 diff --git a/testing/bind/named b/testing/bind/named deleted file mode 100755 index 7907f9983..000000000 --- a/testing/bind/named +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/named - -[[ -d /var/run/named ]] || mkdir -p /var/run/named -chown named:named /var/run/named - -PIDFILE=/var/run/named/named.pid -PID=$(cat $PIDFILE 2>/dev/null) -readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } - -case "$1" in - start) - stat_busy "Starting BIND" - [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon named - stat_done - fi - ;; - stop) - stat_busy "Stopping BIND" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon named - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading BIND" - [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|reload|restart}" -esac -exit 0 diff --git a/testing/bind/named.conf b/testing/bind/named.conf deleted file mode 100644 index 38fb12cbe..000000000 --- a/testing/bind/named.conf +++ /dev/null @@ -1,64 +0,0 @@ -// -// /etc/named.conf -// - -options { - directory "/var/named"; - pid-file "/var/run/named/named.pid"; - auth-nxdomain yes; - datasize default; -// Uncomment these to enable IPv6 connections support -// IPv4 will still work: -// listen-on-v6 { any; }; -// Add this for no IPv4: -// listen-on { none; }; - - // Default security settings. - allow-recursion { 127.0.0.1; }; - allow-transfer { none; }; - allow-update { none; }; - version none; - hostname none; - server-id none; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-transfer { any; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "127.0.0.zone"; - allow-transfer { any; }; -}; - -zone "." IN { - type hint; - file "root.hint"; -}; - -//zone "example.org" IN { -// type slave; -// file "example.zone"; -// masters { -// 192.168.1.100; -// }; -// allow-query { any; }; -// allow-transfer { any; }; -//}; - -logging { - channel xfer-log { - file "/var/log/named.log"; - print-category yes; - print-severity yes; - print-time yes; - severity info; - }; - category xfer-in { xfer-log; }; - category xfer-out { xfer-log; }; - category notify { xfer-log; }; -}; - diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/testing/bind/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate deleted file mode 100644 index ef1a2d032..000000000 --- a/testing/bind/named.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/named.log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/bind/notools.patch b/testing/bind/notools.patch deleted file mode 100644 index 0ad083a01..000000000 --- a/testing/bind/notools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2011-05-27 10:12:59.392416094 +0200 -+++ new/bin/Makefile.in 2011-05-27 10:13:12.372521984 +0200 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -+SUBDIRS = named rndc dnssec tests tools \ - check confgen @PKCS11_TOOLS@ - TARGETS = - diff --git a/testing/bind/so_bsdcompat.patch b/testing/bind/so_bsdcompat.patch deleted file mode 100644 index 4d7031fcc..000000000 --- a/testing/bind/so_bsdcompat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c ---- old/lib/isc/unix/socket.c 2011-02-18 05:01:16.000000000 +0100 -+++ new/lib/isc/unix/socket.c 2011-05-27 10:12:01.685269374 +0200 -@@ -712,6 +712,8 @@ - } - #endif - -+#undef SO_BSDCOMPAT -+ - static void - socket_log(isc__socket_t *sock, isc_sockaddr_t *address, - isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/testing/bison/ChangeLog b/testing/bison/ChangeLog deleted file mode 100644 index 5bb22be1d..000000000 --- a/testing/bison/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2010-03-25 Eric Belanger <eric@archlinux.org> - - * bison 2.4.2-1 - * Upstream update - * Removed texinfo dependency in install scriptlet - * Updated license - * Added sh depends - -2008-12-11 Eric Belanger <eric@archlinux.org> - - * bison 2.4.1-1 - * Upstream update - -2008-11-08 Eric Belanger <eric@archlinux.org> - - * bison 2.4-1 - * Upstream update - * Added info file support - * Added ChangeLog diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD deleted file mode 100644 index ebf2c0fc5..000000000 --- a/testing/bison/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124065 2011-05-16 12:02:28Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> - -pkgname=bison -pkgver=2.5 -pkgrel=1 -pkgdesc="The GNU general-purpose parser generator" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/bison/bison.html" -depends=('glibc' 'm4' 'sh') -groups=('base-devel') -install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9dba20116b13fc61a0846b0058fbe004') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --datadir=/usr/share - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/bison/bison.install b/testing/bison/bison.install deleted file mode 100644 index 0081a194f..000000000 --- a/testing/bison/bison.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file=bison.info.gz - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null -} diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD deleted file mode 100644 index 12829b5d1..000000000 --- a/testing/dnsutils/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 125626 2011-05-27 10:41:33Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> -# Contributor: mario <mario_vazq@hotmail.com> - -pkgname=dnsutils - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P2 -_pkgver=9.8.0-P2 -pkgrel=1 - -pkgdesc='Various DNS utilities - dig host nslookup nsupdate' -arch=('i686' 'x86_64') -url='https://www.isc.org/software/bind' -license=('custom:ISC') -depends=('openssl' 'idnkit') -replaces=('bind-tools' 'host') -options=('!makeflags') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'tools-only.patch') -sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' - 'ac88c89e25c26d73095a3dd85e1ca1070d184ded') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../tools-only.patch - export STD_CDEFINES='-DDIG_SIGCHASE' - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-openssl=yes \ - --with-idn=yes \ - --disable-linux-caps \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}/bin" - - make DESTDIR="${pkgdir}" install - - install -Dm644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/dnsutils/tools-only.patch b/testing/dnsutils/tools-only.patch deleted file mode 100644 index b46b71f60..000000000 --- a/testing/dnsutils/tools-only.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in ---- bind-9.7.1-P2.orig/bin/Makefile.in 2009-10-05 08:07:08.000000000 -0400 -+++ bind-9.7.1-P2/bin/Makefile.in 2010-07-22 15:55:00.000000000 -0400 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig nsupdate - TARGETS = - - @BIND9_MAKE_RULES@ -diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in ---- bind-9.7.1-P2.orig/lib/Makefile.in 2007-06-19 19:47:13.000000000 -0400 -+++ bind-9.7.1-P2/lib/Makefile.in 2010-07-22 15:56:29.000000000 -0400 -@@ -23,7 +23,7 @@ - # Attempt to disable parallel processing. - .NOTPARALLEL: - .NO_PARALLEL: --SUBDIRS = isc isccc dns isccfg bind9 lwres tests -+SUBDIRS = isc dns isccfg bind9 lwres - TARGETS = - - @BIND9_MAKE_RULES@ diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD deleted file mode 100644 index 89927c6f6..000000000 --- a/testing/ghc/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 120001 2011-04-18 09:44:35Z 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=1 -pkgdesc="The Glasgow Haskell Compiler" -arch=(i686 x86_64 'mips64el') -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 - - # FS#17875 - sed -i 's/INSTALL_SHELL_WRAPPER = YES/INSTALL_SHELL_WRAPPER = NO/' utils/haddock/ghc.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 - - rm $pkgdir/usr/bin/haddock -} - -md5sums=('946a18a0dc30437db72c0d3fdf26ca42' - '5a3e0880c80b1dcecf779ff2e63a9c0d') -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/haddock/PKGBUILD b/testing/haddock/PKGBUILD deleted file mode 100644 index adfe76b8c..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' 'mips64el') -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 06680157c..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 -pkgdesc="A library for writing CGI programs" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.0.2-2' 'haskell-mtl=2.0.1.0-2' 'haskell-network=2.3.0.2-2' 'haskell-parsec=3.1.1-2' 'haskell-xhtml=3000.2.0.1-7') -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 f570bc221..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 -pkgdesc="Fully evaluate data structures" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-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 00946fb2e..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 -pkgdesc="Martin Erwig's Functional Graph Library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -makedepends=() -depends=('ghc=7.0.2-2' 'haskell-mtl=2.0.1.0-2') -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 --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 1a4efb892..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' 'mips64el') -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 7760c10f5..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=6 -pkgdesc="A binding for the OpenGL Utility Toolkit" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -makedepends=() -depends=('ghc=7.0.2-2' 'haskell-opengl=2.2.3.0-6' '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 --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 c34c4763b..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 -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' 'mips64el') -depends=('ghc=7.0.2-2' 'haskell-syb=0.3-2' 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 30c8af470..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 -pkgdesc="HTML combinator library" -url="http://hackage.haskell.org/package/html" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-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 1d4431362..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 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.0.2-2' sh 'haskell-network=2.3.0.2-2' 'haskell-parsec=3.1.1-2' 'haskell-mtl=2.0.1.0-2') -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 fdd2808d1..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 -pkgdesc="A unit testing framework for Haskell" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-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 39947fcbf..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=2 -pkgdesc="Monad transformer library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-2 sh 'haskell-transformers=0.2.2.0-2') -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 f2182e7f6..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 -pkgdesc="Networking-related facilities" -url="http://hackage.haskell.org/package/network" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-2 sh 'haskell-parsec=3.1.1-2') -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 e6dd664db..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=6 -pkgdesc="A binding for the OpenGL graphics system" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -makedepends=() -depends=('ghc=7.0.2-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 --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 b868c2e2c..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 -pkgdesc="Parallel programming library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-2 sh 'haskell-deepseq=1.1.0.2-2') -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 87ef7c91a..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 -pkgdesc="Monadic parser combinators" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-2 sh 'haskell-mtl=2.0.1.0-2') -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 10bf275f9..000000000 --- a/testing/haskell-platform/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -pkgname=haskell-platform -pkgver=2011.2.0.0 -pkgrel=3 -pkgdesc="The Haskell Platform" -url="http://hackage.haskell.org/platform/" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.0.2-2' - 'haskell-glut=2.1.2.1-6' - 'haskell-http=4000.1.1-3' - 'haskell-hunit=1.2.2.3-2' - 'haskell-opengl=2.2.3.0-6' - 'haskell-quickcheck=2.4.0.1-3' - 'haskell-cgi=3001.1.7.4-3' - 'haskell-deepseq=1.1.0.2-2' - 'haskell-fgl=5.4.2.3-4' - 'haskell-haskell-src=1.0.1.4-2' - 'haskell-html=1.0.1.2-9' - 'haskell-mtl=2.0.1.0-2' - 'haskell-network=2.3.0.2-2' - 'haskell-parallel=3.1.0.1-3' - 'haskell-parsec=3.1.1-2' - 'haskell-regex-base=0.93.2-4' - 'haskell-regex-compat=0.93.1-4' - 'haskell-regex-posix=0.94.4-2' - 'haskell-stm=2.2.0.1-2' - 'haskell-syb=0.3-2' - 'haskell-text=0.11.0.5-2' - 'haskell-transformers=0.2.2.0-2' - 'haskell-xhtml=3000.2.0.1-7' - 'haskell-zlib=0.5.3.1-2' - 'cabal-install=0.10.2' - 'alex=2.3.5' - 'happy=1.18.6' - 'haddock=2.9.2') - -build() { - return 0 -} diff --git a/testing/haskell-quickcheck/PKGBUILD b/testing/haskell-quickcheck/PKGBUILD deleted file mode 100644 index 809a94484..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 -pkgdesc="Automatic testing of Haskell programs" -url="http://hackage.haskell.org/package/QuickCheck" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-2 haskell-mtl=2.0.1.0-2 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 5f212f71e..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 -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' 'mips64el') -depends=(ghc=7.0.2-2 sh 'haskell-mtl=2.0.1.0-2') -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 06f9fded1..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 -pkgdesc="Replaces and enhances Text.Regex" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-2 sh 'haskell-regex-base=0.93.2-4' 'haskell-regex-posix=0.94.4-2') -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 257b5b430..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 -pkgdesc="The posix regex backend for regex-base" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-2 sh 'haskell-regex-base=0.93.2-4') -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 e0412423b..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 -pkgdesc="A modular composable concurrency abstraction." -url="http://hackage.haskell.org/package/stm" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-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 0db1b5c99..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 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.0.2-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 857b0f796..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 -pkgdesc="An efficient packed Unicode text type." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.0.2-2' sh 'haskell-deepseq=1.1.0.2-2') -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 ea81addc7..000000000 --- a/testing/haskell-transformers/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# $Id: PKGBUILD 115140 2011-03-17 09:11:21Z vesa $ - -_hkgname=transformers -pkgname=haskell-transformers -pkgver=0.2.2.0 -pkgrel=2 -pkgdesc="Concrete functor and monad transformers" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-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 812b3a388..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 -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' 'mips64el') -depends=(ghc=7.0.2-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 06a6b9f54..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 -pkgdesc="Compression and decompression in the gzip and zlib formats" -url="http://hackage.haskell.org/package/zlib" -license=('custom:BSD3') -arch=('i686' 'x86_64' 'mips64el') -depends=(ghc=7.0.2-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/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD deleted file mode 100644 index de6d0365a..000000000 --- a/testing/iproute2/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 122628 2011-05-05 08:47:16Z ronald $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=iproute2 -pkgver=2.6.38 -pkgrel=2 -pkgdesc="IP Routing Utilities" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.linux-foundation.org/en/Net:Iproute2" -depends=('perl') -makedepends=('linux-atm') -optdepends=('linux-atm: ATM support') -provides=('iproute') -conflicts=('iproute') -replaces=('iproute') -options=('!makeflags') -backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ - 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2 - 'iproute2-fhs.patch') -sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a' - '2416b11252364d7a6c742eabb4a6924a75637a46') - -build() { - cd $srcdir/iproute2-${pkgver} - - # set correct fhs structure - patch -Np1 -i ${srcdir}/iproute2-fhs.patch - - ./configure - - make -} - -package() { - cd $srcdir/iproute2-${pkgver} - - make DESTDIR=$pkgdir install - - # libnetlink isn't installed, install it FS#19385 - install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h - install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a -} diff --git a/testing/iproute2/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch deleted file mode 100644 index 2608414db..000000000 --- a/testing/iproute2/iproute2-fhs.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile ---- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100 -+++ iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100 -@@ -1,11 +1,12 @@ - DESTDIR=/usr/ - ROOTDIR=$(DESTDIR) - LIBDIR=/usr/lib/ --SBINDIR=/sbin -+SBINDIR=/usr/sbin - CONFDIR=/etc/iproute2 --DOCDIR=/share/doc/iproute2 --MANDIR=/share/man -+DOCDIR=/usr/share/doc/iproute2 -+MANDIR=/usr/share/man - ARPDDIR=/var/lib/arpd -+SHAREDIR=/usr/share - - # Path to db_185.h include - DBM_INCLUDE:=$(ROOTDIR)/usr/include -diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c ---- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100 -+++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100 -@@ -24,8 +24,8 @@ - #include "utils.h" - #include "tc_util.h" - --#ifndef LIBDIR --#define LIBDIR "/usr/lib/" -+#ifndef SHAREDIR -+#define SHAREDIR "/usr/share" - #endif - - const char *get_tc_lib(void) -@@ -34,7 +34,7 @@ - - lib_dir = getenv("TC_LIB_DIR"); - if (!lib_dir) -- lib_dir = LIBDIR "/tc/"; -+ lib_dir = SHAREDIR "/tc/"; - - return lib_dir; - } -diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile ---- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200 -+++ iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200 -@@ -20,9 +20,9 @@ - $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm - - install: all -- mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc - for i in $(DISTDATA); \ -- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \ - done - - clean: -diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile ---- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200 -+++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200 -@@ -99,18 +99,11 @@ - $(AR) rcs $@ $(TCLIB) - - install: all -- mkdir -p $(MODDESTDIR) -- install -m 0755 tc $(DESTDIR)$(SBINDIR) -- for i in $(TCSO); \ -- do install -m 755 $$i $(MODDESTDIR); \ -- done -- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ -- if [ -f $(MODDESTDIR)/m_xt.so ]; \ -- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \ -- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \ -- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ -- fi; \ -- fi -+ mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) -+ for i in $(TCSO); \ -+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ done - - clean: - rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD deleted file mode 100644 index c26ddfb00..000000000 --- a/testing/less/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 125524 2011-05-26 14:15:10Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=less -pkgver=443 -pkgrel=2 -pkgdesc="A terminal based program for viewing text files" -license=('GPL3') -arch=('i686' 'x86_64') -url="http://www.greenwoodsoftware.com/less" -groups=('base') -depends=('ncurses' 'pcre') -source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('47db098fb3cdaf847b3c4be05ee954fc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}"/usr install - install -dm755 "${pkgdir}"/bin - mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin -} diff --git a/testing/less/zless b/testing/less/zless deleted file mode 100644 index 93d560bc5..000000000 --- a/testing/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/testing/make/PKGBUILD b/testing/make/PKGBUILD deleted file mode 100644 index 832522a78..000000000 --- a/testing/make/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 110342 2011-02-18 22:21:30Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=make -pkgver=3.82 -pkgrel=3 -pkgdesc="GNU make utility to maintain groups of programs" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/make" -license=('GPL3') -groups=('base-devel') -depends=('glibc' 'sh') -install=$pkgname.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - bug30612.patch - bug30723.patch - make-3.82-sort-blank.patch) -md5sums=('1a11100f3c63fcf5753818e59d63088f' - 'c8f496b22191f9fb9420ab14c1a19a47' - '662e6450e19a5acdaa5c9fcb8ad78dea' - '7d01a99f389d8f08dec93ed479071ee4') - - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # http://savannah.gnu.org/bugs/?30612 - patch -Np1 -i $srcdir/bug30612.patch - - # http://savannah.gnu.org/bugs/?30723 - patch -Np1 -i $srcdir/bug30723.patch - - # https://bugs.archlinux.org/task/22733 (fix from Fedora) - patch -Np1 -i $srcdir/make-3.82-sort-blank.patch - - ./configure --prefix=/usr - make - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/make/bug30612.patch b/testing/make/bug30612.patch deleted file mode 100644 index fb843bcd9..000000000 --- a/testing/make/bug30612.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c ---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 -+++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 -@@ -1,3 +1,4 @@ -+ - /* Argument parsing and main program of GNU Make. - Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -@@ -1138,7 +1139,7 @@ - a macro and some compilers (MSVC) don't like conditionals in macros. */ - { - const char *features = "target-specific order-only second-expansion" -- " else-if shortest-stem undefine" -+ " else-if shortest-stem undefine oneshell" - #ifndef NO_ARCHIVES - " archives" - #endif -diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c ---- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 -+++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 -@@ -3028,7 +3028,7 @@ - { - /* This looks like the first element in an open archive group. - A valid group MUST have ')' as the last character. */ -- const char *e = p + nlen; -+ const char *e = p; - do - { - e = next_token (e); -@@ -3084,19 +3084,19 @@ - Go to the next item in the string. */ - if (flags & PARSEFS_NOGLOB) - { -- NEWELT (concat (2, prefix, tp)); -+ NEWELT (concat (2, prefix, tmpbuf)); - continue; - } - - /* If we get here we know we're doing glob expansion. - TP is a string in tmpbuf. NLEN is no longer used. - We may need to do more work: after this NAME will be set. */ -- name = tp; -+ name = tmpbuf; - - /* Expand tilde if applicable. */ -- if (tp[0] == '~') -+ if (tmpbuf[0] == '~') - { -- tildep = tilde_expand (tp); -+ tildep = tilde_expand (tmpbuf); - if (tildep != 0) - name = tildep; - } -@@ -3152,7 +3152,11 @@ - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next = found; -+ if (*newp) -+ (*newp)->next = found; -+ else -+ *newp = found; -+ - - /* Find and set the new end. Massage names if necessary. */ - while (1) diff --git a/testing/make/bug30723.patch b/testing/make/bug30723.patch deleted file mode 100644 index 84e7ebe7a..000000000 --- a/testing/make/bug30723.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c ---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 -+++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 -@@ -2093,7 +2093,7 @@ - const char *pv = define_makeflags (1, 1); - char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); - sprintf (p, "MAKEFLAGS=%s", pv); -- putenv (p); -+ putenv (allocated_variable_expand (p)); - } - - if (ISDB (DB_BASIC)) diff --git a/testing/make/make-3.82-sort-blank.patch b/testing/make/make-3.82-sort-blank.patch deleted file mode 100644 index 2e73f5b7c..000000000 --- a/testing/make/make-3.82-sort-blank.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urp make-3.82/function.c make-3.82-pm/function.c ---- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 -+++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 -@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c - { - char c = *(t++); - -- if (! isspace ((unsigned char)c)) -+ if (! isblank ((unsigned char)c)) - continue; - - ++wordi; - -- while (isspace ((unsigned char)*t)) -+ while (isblank ((unsigned char)*t)) - ++t; - } diff --git a/testing/make/make.install b/testing/make/make.install deleted file mode 100644 index 6cf8b0dc4..000000000 --- a/testing/make/make.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(make.info make.info-1 make.info-2) - -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/mesa/LICENSE b/testing/mesa/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/testing/mesa/LICENSE +++ /dev/null @@ -1,82 +0,0 @@ -Disclaimer - -Mesa is a 3-D graphics library with an API which is very similar to -that of OpenGL* -To the extent that Mesa utilizes the OpenGL command syntax or state -machine, it is being used with authorization from Silicon Graphics, -Inc.(SGI). However, the author does not possess an OpenGL license -from SGI, and makes no claim that Mesa is in any way a compatible -replacement for OpenGL or associated with SGI. Those who want a -licensed implementation of OpenGL should contact a licensed -vendor. - -Please do not refer to the library as MesaGL (for legal -reasons). It's just Mesa or The Mesa 3-D graphics -library - -* OpenGL is a trademark of Silicon Graphics Incorporated. - -License / Copyright Information - -The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. - -The core Mesa library is licensed according to the terms of the MIT license. -This allows integration with the XFree86, Xorg and DRI projects. - -The default Mesa license is as follows: - -Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Attention, Contributors - -When contributing to the Mesa project you must agree to the licensing terms -of the component to which you're contributing. -The following section lists the primary components of the Mesa distribution -and their respective licenses. - - -Mesa Component Licenses - -Component Location Primary Author License ----------------------------------------------------------------------------- -Main Mesa code src/mesa/ Brian Paul Mesa (MIT) - -Device drivers src/mesa/drivers/* See drivers See drivers - -Ext headers include/GL/glext.h SGI SGI Free B - include/GL/glxext.h - -GLUT src/glut/ Mark Kilgard Mark's copyright - -Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL - -SGI GLU library src/glu/sgi/ SGI SGI Free B - -demo programs progs/demos/ various see source files - -X demos progs/xdemos/ Brian Paul see source files - -SGI demos progs/samples/ SGI SGI copyright - -RedBook demos progs/redbook/ SGI SGI copyright diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD deleted file mode 100644 index 02506cbe2..000000000 --- a/testing/mesa/PKGBUILD +++ /dev/null @@ -1,235 +0,0 @@ -# $Id: PKGBUILD 125601 2011-05-26 20:48:20Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=mesa -pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'sis-dri') # 'llvm-dri') - -_git=true -#_git=false - -if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110526 - else - pkgver=7.10.2 -fi -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' - 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake' 'llvm') -url="http://mesa3d.sourceforge.net" -license=('custom') -source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch mesa-7.5-mips-wmb.patch) -if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7b3f40b70dc7dd602897d364011089047583c5d - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-f7b3f40b70dc7dd602897d364011089047583c5d.tar.bz2') - else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" -) -fi -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '3ec78f340f9387abd7a37b195e764cbf' - '67c87b77cc2236b52a3b47dad3fbb5d4' - 'ca2b343a0b8077fda38077c547b80fc3') - -build() { -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - autoreconf -vfi - else - cd "${srcdir}/Mesa-${pkgver}" -fi - -if [ "${_git}" != "true" ]; then -#backport from master to fix gnome-shell shader -#https://bugs.freedesktop.org/show_bug.cgi?id=35714 -patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch" -patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" -fi - - # WMB for MIPS patch from Fedora - patch -Np1 -i $srcdir/mesa-7.5-mips-wmb.patch - -if [ "${_git}" = "true" ]; then - ./autogen.sh --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-dri-drivers=sis \ - --enable-gallium-llvm \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx,egl \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl - # --enable-gallium-svga \ - - # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg - #The source code to implement ARB_texture_float extension is included and can be toggled on at compile time only by those who purchased a license from SGI, or are in a country where the patent does not apply. - - #--enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177 - - else - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-dri-drivers=sis \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --disable-gallium-egl -fi - - make -} - -package_libgl() { - depends=('libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" - - bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" - - cd src/mesa/drivers/dri - #make -C swrast DESTDIR="${pkgdir}" install -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install -fi - ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so" - ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" -} - -package_libgles() { - depends=('libgl') - pkgdesc="Mesa GLES libraries and headers" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/GLES" - install -m755 -d "${pkgdir}/usr/include/GLES2" - bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" -} - -package_libegl() { - depends=('libgl') - pkgdesc="Mesa libEGL libraries and headers" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install - else - cd "${srcdir}/Mesa-${pkgver}" -fi - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/" - install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/include/KHR" - install -m755 -d "${pkgdir}/usr/share" - install -m755 -d "${pkgdir}/usr/share/doc" - install -m755 -d "${pkgdir}/usr/share/doc/libegl" - bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" -if [ "${_git}" != "true" ]; then - install -m755 -d "${pkgdir}/usr/lib/egl" - bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" -fi - bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" - bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" - bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libegl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" -} - -package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3-D graphics libraries and include files" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib/libGL.so"* - rm -f "${pkgdir}/usr/lib/libGLESv"* - rm -f "${pkgdir}/usr/lib/libEGL"* - rm -rf "${pkgdir}/usr/lib/egl" - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc} - rm -rf "${pkgdir}/usr/lib/xorg" - rm -f "${pkgdir}/usr/include/GL/glew.h" - rm -f "${pkgdir}/usr/include/GL/glxew.h" - rm -f "${pkgdir}/usr/include/GL/wglew.h" - rm -f "${pkgdir}/usr/include/GL/glut.h" - rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - -package_sis-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for SiS" - conflicts=('xf86-video-sis<0.10.2') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C sis DESTDIR="${pkgdir}" install -} - -#package_llvm-dri() { -# depends=("libgl=${pkgver}") -# pkgdesc="Mesa common LLVM support" - -#if [ "${_git}" = "true" ]; then -# cd ${srcdir}/mesa-*/src/gallium -# else -# cd "${srcdir}/Mesa-${pkgver}/src/gallium" -#fi - - # gallium llvmpipe -#if [ "${_git}" = "true" ]; then -# make -C drivers/llvmpipe DESTDIR="${pkgdir}" install -# #make -C targets/dri-swrast DESTDIR="${pkgdir}" install -# else -# make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -#fi -#} diff --git a/testing/mesa/gnome-shell-shader-fix.patch b/testing/mesa/gnome-shell-shader-fix.patch deleted file mode 100644 index 3b3f37591..000000000 --- a/testing/mesa/gnome-shell-shader-fix.patch +++ /dev/null @@ -1,535 +0,0 @@ -From 3f625689acd570e4f14cc2ebaa43a425d13954ff Mon Sep 17 00:00:00 2001 -From: Christoph Bumiller <e0425955@student.tuwien.ac.at> -Date: Thu, 31 Mar 2011 13:49:33 +0000 -Subject: nv50: copy regalloc fixes from nvc0 - -Should fix gnome-shell's fade shader. - -Unification of the shader backend which is supposed to remove the -code duplication is still WIP. ---- -diff --git a/src/gallium/drivers/nv50/nv50_pc.h b/src/gallium/drivers/nv50/nv50_pc.h -index e6f3815..a9a3248 100644 ---- a/src/gallium/drivers/nv50/nv50_pc.h -+++ b/src/gallium/drivers/nv50/nv50_pc.h -@@ -228,6 +228,8 @@ struct nv_ref { - ubyte flags; /* not used yet */ - }; - -+#define NV_REF_FLAG_REGALLOC_PRIV (1 << 0) -+ - struct nv_basic_block; - - struct nv_instruction { -@@ -263,6 +265,15 @@ struct nv_instruction { - ubyte quadop; - }; - -+static INLINE int -+nvi_vector_size(struct nv_instruction *nvi) -+{ -+ int i; -+ assert(nvi); -+ for (i = 0; i < 4 && nvi->def[i]; ++i); -+ return i; -+} -+ - #define CFG_EDGE_FORWARD 0 - #define CFG_EDGE_BACK 1 - #define CFG_EDGE_LOOP_ENTER 2 -diff --git a/src/gallium/drivers/nv50/nv50_pc_regalloc.c b/src/gallium/drivers/nv50/nv50_pc_regalloc.c -index 39ae366..657df2c 100644 ---- a/src/gallium/drivers/nv50/nv50_pc_regalloc.c -+++ b/src/gallium/drivers/nv50/nv50_pc_regalloc.c -@@ -32,14 +32,39 @@ - #include "util/u_simple_list.h" - - #define NUM_REGISTER_FILES 4 -+#define MAX_REGISTER_COUNT 256 - - struct register_set { - struct nv_pc *pc; - - uint32_t last[NUM_REGISTER_FILES]; -- uint32_t bits[NUM_REGISTER_FILES][8]; -+ uint32_t bits[NUM_REGISTER_FILES][(MAX_REGISTER_COUNT + 31) / 32]; - }; - -+/* using OR because a set bit means occupied/unavailable, aliasing is allowed */ -+static void -+intersect_register_sets(struct register_set *dst, -+ struct register_set *src1, struct register_set *src2) -+{ -+ int i, j; -+ -+ for (i = 0; i < NUM_REGISTER_FILES; ++i) { -+ for (j = 0; j < (MAX_REGISTER_COUNT + 31) / 32; ++j) -+ dst->bits[i][j] = src1->bits[i][j] | src2->bits[i][j]; -+ } -+} -+ -+static void -+mask_register_set(struct register_set *set, uint32_t mask, uint32_t umask) -+{ -+ int i, j; -+ -+ for (i = 0; i < NUM_REGISTER_FILES; ++i) { -+ for (j = 0; j < (MAX_REGISTER_COUNT + 31) / 32; ++j) -+ set->bits[i][j] = (set->bits[i][j] | mask) & umask; -+ } -+} -+ - struct nv_pc_pass { - struct nv_pc *pc; - -@@ -61,11 +86,15 @@ ranges_coalesce(struct nv_range *range) - } - } - -+/* @return: TRUE if @new_range can be freed (i.e. was not reused) */ - static boolean - add_range_ex(struct nv_value *val, int bgn, int end, struct nv_range *new_range) - { - struct nv_range *range, **nextp = &val->livei; - -+ if (bgn == end) /* [a, a) is invalid / empty */ -+ return TRUE; -+ - for (range = val->livei; range; range = range->next) { - if (end < range->bgn) - break; /* insert before */ -@@ -251,6 +280,8 @@ reg_occupy(struct register_set *set, struct nv_value *val) - id <<= s; - m = (1 << (1 << s)) - 1; - -+ assert(s >= 0); /* XXX: remove me */ -+ - set->bits[f][id / 32] |= m << (id % 32); - - if (set->pc->max_reg[f] < id) -@@ -286,15 +317,12 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - if (a->join->reg.id == b->join->reg.id) - return TRUE; - --#if 1 - /* either a or b or both have been assigned */ - - if (a->join->reg.id >= 0 && b->join->reg.id >= 0) - return FALSE; - else - if (b->join->reg.id >= 0) { -- if (a->join->reg.id >= 0) -- return FALSE; - val = a; - a = b; - b = val; -@@ -309,8 +337,6 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - return FALSE; - } - return TRUE; --#endif -- return FALSE; - } - - static INLINE void -@@ -336,14 +362,14 @@ do_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - assert(b->join == a->join); - } - --static INLINE void -+static INLINE boolean - try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - { - if (!join_allowed(ctx, a, b)) { - #ifdef NV50_RA_DEBUG_JOIN - debug_printf("cannot join %i to %i: not allowed\n", b->n, a->n); - #endif -- return; -+ return FALSE; - } - if (livei_have_overlap(a->join, b->join)) { - #ifdef NV50_RA_DEBUG_JOIN -@@ -351,10 +377,27 @@ try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - livei_print(a); - livei_print(b); - #endif -- return; -+ return FALSE; - } - - do_join_values(ctx, a, b); -+ -+ return TRUE; -+} -+ -+static void -+join_values_nofail(struct nv_pc_pass *ctx, -+ struct nv_value *a, struct nv_value *b, boolean type_only) -+{ -+ if (type_only) { -+ assert(join_allowed(ctx, a, b)); -+ do_join_values(ctx, a, b); -+ } else { -+ boolean ok = try_join_values(ctx, a, b); -+ if (!ok) { -+ NOUVEAU_ERR("failed to coalesce values\n"); -+ } -+ } - } - - static INLINE boolean -@@ -369,20 +412,32 @@ need_new_else_block(struct nv_basic_block *b, struct nv_basic_block *p) - return (b->num_in > 1) && (n == 2); - } - -+/* Look for the @phi's operand whose definition reaches @b. */ - static int - phi_opnd_for_bb(struct nv_instruction *phi, struct nv_basic_block *b, - struct nv_basic_block *tb) - { -+ struct nv_ref *srci, *srcj; - int i, j; - -- for (j = -1, i = 0; i < 4 && phi->src[i]; ++i) { -- if (!nvbb_reachable_by(b, phi->src[i]->value->insn->bb, tb)) -+ for (j = -1, i = 0; i < 6 && phi->src[i]; ++i) { -+ srci = phi->src[i]; -+ /* if already replaced, check with original source first */ -+ if (srci->flags & NV_REF_FLAG_REGALLOC_PRIV) -+ srci = srci->value->insn->src[0]; -+ if (!nvbb_reachable_by(b, srci->value->insn->bb, NULL)) - continue; - /* NOTE: back-edges are ignored by the reachable-by check */ -- if (j < 0 || !nvbb_reachable_by(phi->src[j]->value->insn->bb, -- phi->src[i]->value->insn->bb, tb)) -+ if (j < 0 || !nvbb_reachable_by(srcj->value->insn->bb, -+ srci->value->insn->bb, NULL)) { - j = i; -+ srcj = srci; -+ } - } -+ if (j >= 0 && nvbb_reachable_by(b, phi->def[0]->insn->bb, NULL)) -+ if (!nvbb_reachable_by(srcj->value->insn->bb, -+ phi->def[0]->insn->bb, NULL)) -+ j = -1; - return j; - } - -@@ -429,16 +484,21 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b) - ctx->pc->current_block = pn; - - for (i = b->phi; i && i->opcode == NV_OP_PHI; i = i->next) { -- if ((j = phi_opnd_for_bb(i, p, b)) < 0) -- continue; -- val = i->src[j]->value; -- -- if (i->src[j]->flags) { -- val = val->insn->src[0]->value; -- while (j < 4 && i->src[j]) -- ++j; -- assert(j < 4); -+ j = phi_opnd_for_bb(i, p, b); -+ -+ if (j < 0) { -+ val = i->def[0]; -+ } else { -+ val = i->src[j]->value; -+ if (i->src[j]->flags & NV_REF_FLAG_REGALLOC_PRIV) { -+ j = -1; -+ /* use original value, we already encountered & replaced it */ -+ val = val->insn->src[0]->value; -+ } - } -+ if (j < 0) /* need an additional source ? */ -+ for (j = 0; j < 5 && i->src[j] && i->src[j]->value != val; ++j); -+ assert(j < 5); - - ni = new_instruction(ctx->pc, NV_OP_MOV); - -@@ -452,7 +512,7 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b) - - nv_reference(ctx->pc, &i->src[j], ni->def[0]); - -- i->src[j]->flags = 1; -+ i->src[j]->flags |= NV_REF_FLAG_REGALLOC_PRIV; - } - - if (pn != p && pn->exit) { -@@ -470,45 +530,50 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b) - return 0; - } - -+#define JOIN_MASK_PHI (1 << 0) -+#define JOIN_MASK_SELECT (1 << 1) -+#define JOIN_MASK_MOV (1 << 2) -+#define JOIN_MASK_TEX (1 << 3) -+ - static int --pass_join_values(struct nv_pc_pass *ctx, int iter) -+pass_join_values(struct nv_pc_pass *ctx, unsigned mask) - { - int c, n; - - for (n = 0; n < ctx->num_insns; ++n) { -- struct nv_instruction *i = ctx->insns[n]; -+ struct nv_instruction *nvi, *i = ctx->insns[n]; - - switch (i->opcode) { - case NV_OP_PHI: -- if (iter != 2) -+ if (!(mask & JOIN_MASK_PHI)) - break; -- for (c = 0; c < 4 && i->src[c]; ++c) -- try_join_values(ctx, i->def[0], i->src[c]->value); -+ for (c = 0; c < 5 && i->src[c]; ++c) -+ join_values_nofail(ctx, i->def[0], i->src[c]->value, FALSE); - break; - case NV_OP_MOV: -- if ((iter == 2) && i->src[0]->value->insn && -- !nv_is_vector_op(i->src[0]->value->join->insn->opcode)) -+ if (!(mask & JOIN_MASK_MOV)) -+ break; -+ nvi = i->src[0]->value->join->insn; -+ if (nvi && !nv_is_vector_op(nvi->opcode)) - try_join_values(ctx, i->def[0], i->src[0]->value); - break; - case NV_OP_SELECT: -- if (iter != 1) -+ if (!(mask & JOIN_MASK_SELECT)) - break; -- for (c = 0; c < 4 && i->src[c]; ++c) { -- assert(join_allowed(ctx, i->def[0], i->src[c]->value)); -- do_join_values(ctx, i->def[0], i->src[c]->value); -- } -+ for (c = 0; c < 5 && i->src[c]; ++c) -+ join_values_nofail(ctx, i->def[0], i->src[c]->value, TRUE); - break; - case NV_OP_TEX: - case NV_OP_TXB: - case NV_OP_TXL: - case NV_OP_TXQ: -- if (iter) -+ if (!(mask & JOIN_MASK_TEX)) - break; -- for (c = 0; c < 4; ++c) { -- if (!i->src[c]) -- break; -- do_join_values(ctx, i->def[c], i->src[c]->value); -- } -+ /* This should work without conflicts because we always generate -+ * extra MOVs for the sources of a TEX. -+ */ -+ for (c = 0; c < 4 && i->src[c]; ++c) -+ join_values_nofail(ctx, i->def[c], i->src[c]->value, TRUE); - break; - default: - break; -@@ -643,15 +708,15 @@ static void collect_live_values(struct nv_basic_block *b, const int n) - { - int i; - -- if (b->out[0]) { -- if (b->out[1]) { /* what to do about back-edges ? */ -+ if (b->out[0] && b->out_kind[0] != CFG_EDGE_FAKE) { -+ if (b->out[1] && b->out_kind[1] != CFG_EDGE_FAKE) { - for (i = 0; i < n; ++i) - b->live_set[i] = b->out[0]->live_set[i] | b->out[1]->live_set[i]; - } else { - memcpy(b->live_set, b->out[0]->live_set, n * sizeof(uint32_t)); - } - } else -- if (b->out[1]) { -+ if (b->out[1] && b->out_kind[1] != CFG_EDGE_FAKE) { - memcpy(b->live_set, b->out[1]->live_set, n * sizeof(uint32_t)); - } else { - memset(b->live_set, 0, n * sizeof(uint32_t)); -@@ -770,8 +835,8 @@ insert_ordered_tail(struct nv_value *list, struct nv_value *nval) - struct nv_value *elem; - - for (elem = list->prev; -- elem != list && elem->livei->bgn > nval->livei->bgn; -- elem = elem->prev); -+ elem != list && elem->livei->bgn > nval->livei->bgn; -+ elem = elem->prev); - /* now elem begins before or at the same time as val */ - - nval->prev = elem; -@@ -780,44 +845,49 @@ insert_ordered_tail(struct nv_value *list, struct nv_value *nval) - elem->next = nval; - } - --static int --pass_linear_scan(struct nv_pc_pass *ctx, int iter) -+static void -+collect_register_values(struct nv_pc_pass *ctx, struct nv_value *head, -+ boolean assigned_only) - { -- struct nv_instruction *i; -- struct register_set f, free; -+ struct nv_value *val; - int k, n; -- struct nv_value *cur, *val, *tmp[2]; -- struct nv_value active, inactive, handled, unhandled; - -- make_empty_list(&active); -- make_empty_list(&inactive); -- make_empty_list(&handled); -- make_empty_list(&unhandled); -- -- nv50_ctor_register_set(ctx->pc, &free); -+ make_empty_list(head); - -- /* joined values should have range = NULL and thus not be added; -- * also, fixed memory values won't be added because they're not -- * def'd, just used -- */ - for (n = 0; n < ctx->num_insns; ++n) { -- i = ctx->insns[n]; -+ struct nv_instruction *i = ctx->insns[n]; - -+ /* for joined values, only the representative will have livei != NULL */ - for (k = 0; k < 4; ++k) { - if (i->def[k] && i->def[k]->livei) -- insert_ordered_tail(&unhandled, i->def[k]); -- else -- if (0 && i->def[k]) -- debug_printf("skipping def'd value %i: no livei\n", i->def[k]->n); -+ if (!assigned_only || i->def[k]->reg.id >= 0) -+ insert_ordered_tail(head, i->def[k]); - } - if (i->flags_def && i->flags_def->livei) -- insert_ordered_tail(&unhandled, i->flags_def); -+ if (!assigned_only || i->flags_def->reg.id >= 0) -+ insert_ordered_tail(head, i->flags_def); - } - -- for (val = unhandled.next; val != unhandled.prev; val = val->next) { -+ for (val = head->next; val != head->prev; val = val->next) { - assert(val->join == val); - assert(val->livei->bgn <= val->next->livei->bgn); - } -+} -+ -+static int -+pass_linear_scan(struct nv_pc_pass *ctx, int iter) -+{ -+ struct register_set f, free; -+ struct nv_value *cur, *val, *tmp[2]; -+ struct nv_value active, inactive, handled, unhandled; -+ -+ make_empty_list(&active); -+ make_empty_list(&inactive); -+ make_empty_list(&handled); -+ -+ nv50_ctor_register_set(ctx->pc, &free); -+ -+ collect_register_values(ctx, &unhandled, FALSE); - - foreach_s(cur, tmp[0], &unhandled) { - remove_from_list(cur); -@@ -854,13 +924,7 @@ pass_linear_scan(struct nv_pc_pass *ctx, int iter) - reg_occupy(&f, val); - - if (cur->reg.id < 0) { -- boolean mem = FALSE; -- -- if (nv_is_vector_op(cur->insn->opcode)) -- mem = !reg_assign(&f, &cur->insn->def[0], 4); -- else -- if (iter) -- mem = !reg_assign(&f, &cur, 1); -+ boolean mem = !reg_assign(&f, &cur, 1); - - if (mem) { - NOUVEAU_ERR("out of registers\n"); -@@ -874,6 +938,67 @@ pass_linear_scan(struct nv_pc_pass *ctx, int iter) - return 0; - } - -+/* Allocate values defined by instructions such as TEX, which have to be -+ * assigned to consecutive registers. -+ * Linear scan doesn't really work here since the values can have different -+ * live intervals. -+ */ -+static int -+pass_allocate_constrained_values(struct nv_pc_pass *ctx) -+{ -+ struct nv_value regvals, *val; -+ struct nv_instruction *i; -+ struct nv_value *defs[4]; -+ struct register_set regs[4]; -+ int n, vsize, c; -+ uint32_t mask; -+ boolean mem; -+ -+ collect_register_values(ctx, ®vals, TRUE); -+ -+ for (n = 0; n < ctx->num_insns; ++n) { -+ i = ctx->insns[n]; -+ vsize = nvi_vector_size(i); -+ if (!(vsize > 1)) -+ continue; -+ assert(vsize <= 4); -+ for (c = 0; c < vsize; ++c) -+ defs[c] = i->def[c]->join; -+ -+ if (defs[0]->reg.id >= 0) { -+ for (c = 1; c < vsize; ++c) -+ assert(defs[c]->reg.id >= 0); -+ continue; -+ } -+ -+ for (c = 0; c < vsize; ++c) { -+ nv50_ctor_register_set(ctx->pc, ®s[c]); -+ -+ foreach(val, ®vals) { -+ if (val->reg.id >= 0 && livei_have_overlap(val, defs[c])) -+ reg_occupy(®s[c], val); -+ } -+ mask = 0x11111111; -+ if (vsize == 2) /* granularity is 2 and not 4 */ -+ mask |= 0x11111111 << 2; -+ mask_register_set(®s[c], 0, mask << c); -+ -+ if (defs[c]->livei) -+ insert_ordered_tail(®vals, defs[c]); -+ } -+ for (c = 1; c < vsize; ++c) -+ intersect_register_sets(®s[0], ®s[0], ®s[c]); -+ -+ mem = !reg_assign(®s[0], &defs[0], vsize); -+ -+ if (mem) { -+ NOUVEAU_ERR("out of registers\n"); -+ abort(); -+ } -+ } -+ return 0; -+} -+ - static int - nv_pc_pass1(struct nv_pc *pc, struct nv_basic_block *root) - { -@@ -923,16 +1048,16 @@ nv_pc_pass1(struct nv_pc *pc, struct nv_basic_block *root) - livei_print(&pc->values[i]); - #endif - -- ret = pass_join_values(ctx, 0); -+ ret = pass_join_values(ctx, JOIN_MASK_PHI); - if (ret) - goto out; -- ret = pass_linear_scan(ctx, 0); -+ ret = pass_join_values(ctx, JOIN_MASK_SELECT | JOIN_MASK_TEX); - if (ret) - goto out; -- ret = pass_join_values(ctx, 1); -+ ret = pass_join_values(ctx, JOIN_MASK_MOV); - if (ret) - goto out; -- ret = pass_join_values(ctx, 2); -+ ret = pass_allocate_constrained_values(ctx); - if (ret) - goto out; - ret = pass_linear_scan(ctx, 1); --- -cgit v0.8.3-6-g21f6 diff --git a/testing/mesa/nouveau-fix-header.patch b/testing/mesa/nouveau-fix-header.patch deleted file mode 100644 index 38aa996f1..000000000 --- a/testing/mesa/nouveau-fix-header.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 -From: Ben Skeggs <bskeggs@redhat.com> -Date: Mon, 20 Dec 2010 03:39:36 +0000 -Subject: nouveau: fix includes for latest libdrm - -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> ---- -diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h -index ab480ca..747b084 100644 ---- a/src/gallium/drivers/nouveau/nouveau_winsys.h -+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h -@@ -10,7 +10,7 @@ - #include "nouveau/nouveau_grobj.h" - #include "nouveau/nouveau_notifier.h" - #include "nouveau/nouveau_resource.h" --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - #ifndef NV04_PFIFO_MAX_PACKET_LEN - #define NV04_PFIFO_MAX_PACKET_LEN 2047 -diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c -index ce48022..a99df76 100644 ---- a/src/gallium/drivers/nv50/nv50_surface.c -+++ b/src/gallium/drivers/nv50/nv50_surface.c -@@ -22,7 +22,7 @@ - - #define __NOUVEAU_PUSH_H__ - #include <stdint.h> --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - #include "nv50_context.h" - #include "nv50_resource.h" - #include "pipe/p_defines.h" -diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c -index e0e65e7..e2fadd3 100644 ---- a/src/gallium/drivers/nvfx/nv04_2d.c -+++ b/src/gallium/drivers/nvfx/nv04_2d.c -@@ -34,11 +34,11 @@ - #include <stdio.h> - #include <stdint.h> - #include <nouveau/nouveau_device.h> --#include <nouveau/nouveau_pushbuf.h> - #include <nouveau/nouveau_channel.h> - #include <nouveau/nouveau_bo.h> - #include <nouveau/nouveau_notifier.h> - #include <nouveau/nouveau_grobj.h> -+#include <nouveau/nv04_pushbuf.h> - #include "nv04_2d.h" - - #include "nouveau/nv_object.xml.h" -diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c -index 597664e..339b317 100644 ---- a/src/gallium/drivers/nvfx/nvfx_vbo.c -+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c -@@ -9,8 +9,7 @@ - #include "nvfx_resource.h" - - #include "nouveau/nouveau_channel.h" -- --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - static inline unsigned - util_guess_unique_indices_count(unsigned mode, unsigned indices) -diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -index 8036b18..c5ac128 100644 ---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h -+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -@@ -38,7 +38,6 @@ - #include <assert.h> - - #include "nouveau_device.h" --#include "nouveau_pushbuf.h" - #include "nouveau_grobj.h" - #include "nouveau_channel.h" - #include "nouveau_bo.h" -@@ -46,6 +45,7 @@ - #include "nouveau_screen.h" - #include "nouveau_state.h" - #include "nouveau_surface.h" -+#include "nv04_pushbuf.h" - - #define DRIVER_DATE "20091015" - #define DRIVER_AUTHOR "Nouveau" --- -cgit v0.8.3-6-g21f6 diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD deleted file mode 100644 index e58f87add..000000000 --- a/testing/mkinitcpio-busybox/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 123921 2011-05-14 11:29:02Z thomas $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=mkinitcpio-busybox -pkgver=1.18.4 -pkgrel=1 -pkgdesc="base initramfs tools" -arch=('i686' 'x86_64') -url="http://www.busybox.net/" -license=('GPL') -depends=('glibc') -source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 - config) -sha256sums=('4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa' - 'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194') - -build() { - cd "${srcdir}/busybox-${pkgver}" - - unset CFLAGS CXXFLAGS - if [ ${CARCH} = "x86_64" ]; then - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - else - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - fi - make -} - -package() { - install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox" -} -# vim:set ts=2 sw=2 et: diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config deleted file mode 100644 index 1aa333faf..000000000 --- a/testing/mkinitcpio-busybox/config +++ /dev/null @@ -1,986 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.18.2 -# Wed Jan 26 23:08:18 2011 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_DESKTOP is not set -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_INCLUDE_SUSv2 is not set -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_UNICODE_SUPPORT=y -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=3 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_USE_TERMIOS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -# CONFIG_GUNZIP is not set -# CONFIG_GZIP is not set -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -# CONFIG_LZOP is not set -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_LZMA is not set -# CONFIG_UNXZ is not set -# CONFIG_XZ is not set -# CONFIG_UNZIP is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_BASE64 is not set -# CONFIG_CAL is not set -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -CONFIG_CP=y -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -CONFIG_CUT=y -CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -# CONFIG_FOLD is not set -# CONFIG_FSYNC is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -# CONFIG_LENGTH is not set -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -# CONFIG_SHA256SUM is not set -# CONFIG_SHA512SUM is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -# CONFIG_STTY is not set -# CONFIG_SUM is not set -# CONFIG_SYNC is not set -# CONFIG_TAC is not set -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TOUCH=y -CONFIG_TRUE=y -# CONFIG_TTY is not set -CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_FGCONSOLE is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETFONT=y -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_PATCH is not set -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -# CONFIG_FEATURE_ALLOW_EXEC is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_MAXDEPTH is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -# CONFIG_FEATURE_FIND_USER is not set -# CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set -# CONFIG_FEATURE_FIND_DEPTH is not set -# CONFIG_FEATURE_FIND_PAREN is not set -# CONFIG_FEATURE_FIND_SIZE is not set -# CONFIG_FEATURE_FIND_PRUNE is not set -# CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set -# CONFIG_FEATURE_FIND_REGEX is not set -# CONFIG_FEATURE_FIND_CONTEXT is not set -# CONFIG_FEATURE_FIND_LINKS is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -# CONFIG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="" -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set -# CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=0 -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELUSER is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_GETTY is not set -# CONFIG_LOGIN is not set -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -CONFIG_MODINFO=y -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_DEPMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" - -# -# Linux System Utilities -# -# CONFIG_BLOCKDEV is not set -# CONFIG_REV is not set -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKID is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -# CONFIG_MKFS_VFAT is not set -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -# CONFIG_MKSWAP is not set -# CONFIG_FEATURE_MKSWAP_UUID is not set -# CONFIG_MORE is not set -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -# CONFIG_SWAPONOFF is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -CONFIG_VOLUMEID=y - -# -# Filesystem/Volume identification -# -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set - -# -# Miscellaneous Utilities -# -# CONFIG_CONSPY is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_IONICE is not set -# CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETSID is not set -CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_VOLNAME is not set -# CONFIG_WALL is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_NBDCLIENT is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -# CONFIG_NC_110_COMPAT is not set -CONFIG_FEATURE_IPV6=y -# CONFIG_FEATURE_UNIX_LOCAL is not set -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -# CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NETSTAT=y -CONFIG_FEATURE_NETSTAT_WIDE=y -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -# CONFIG_TCPSVD is not set -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y -# CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -# CONFIG_UDPSVD is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -# CONFIG_ZCIP is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -CONFIG_FEATURE_MIME_CHARSET="" -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set - -# -# Process Utilities -# -# CONFIG_IOSTAT is not set -# CONFIG_MPSTAT is not set -# CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set -# CONFIG_SMEMCAP is not set -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -# CONFIG_PKILL is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -# CONFIG_FEATURE_SHOW_THREADS is not set -CONFIG_UPTIME=y -# CONFIG_WATCH is not set - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Shells -# -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_CTTYHACK=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -# CONFIG_SH_MATH_SUPPORT_64 is not set -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -# CONFIG_FEATURE_KLOGD_KLOGCTL is not set -# CONFIG_LOGGER is not set diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD deleted file mode 100644 index 60394a46b..000000000 --- a/testing/network-manager-applet/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 125653 2011-05-27 18:09:01Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Arjan Timmerman <arjan@archlinux.org> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Tor Krill <tor@krill.nu> -# Contributor: Will Rea <sillywilly@gmail.com> - -pkgname=network-manager-applet -pkgver=0.8.9997 -pkgrel=1 -pkgdesc="GNOME frontends to NetWorkmanager" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' - 'notification-daemon' 'libnotify' 'gnome-icon-theme' - 'mobile-broadband-provider-info' 'gconf') -makedepends=('intltool' 'gnome-bluetooth' 'gtk-doc') -optdepends=('gnome-bluetooth: for PAN/DUN support') -options=('!libtool') -install=network-manager-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('1620e52bfdba18f3640e57a3d450e913ad73a6e529dd0bad895d4c07700018ab') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static \ - --disable-maintainer-mode - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install deleted file mode 100644 index 9922d12b2..000000000 --- a/testing/network-manager-applet/network-manager-applet.install +++ /dev/null @@ -1,18 +0,0 @@ -pkgname=network-manager-applet - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf deleted file mode 100644 index c37b59680..000000000 --- a/testing/networkmanager/NetworkManager.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -plugins=keyfile diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD deleted file mode 100644 index ecfc88f0a..000000000 --- a/testing/networkmanager/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 125645 2011-05-27 17:39:58Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinxu.org> -# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Tor Krill <tor@krill.nu> -# Contributor: Will Rea <sillywilly@gmail.com> -# Contributor: Valentine Sinitsyn <e_val@inbox.ru> - -pkgname=networkmanager -pkgver=0.8.9997 -pkgrel=1 -pkgdesc="Network Management daemon" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'gtk-doc') -optdepends=('modemmanager: for modem management service' - 'dhclient: alternative DHCP/DHCPv6 client' - 'iptables: Connection sharing' - 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support') -options=('!libtool') -backup=('etc/NetworkManager/NetworkManager.conf') -install=networkmanager.install -source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2 - NetworkManager.conf disable_set_hostname.patch) -sha256sums=('af2e08546cfcd51731be8f4d944b77876ba2eca93cf4f15509caf5572cac6596' - '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553') - -build() { - cd "${srcdir}/NetworkManager-${pkgver}" - - patch -Np1 -i "${srcdir}/disable_set_hostname.patch" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/networkmanager \ - --with-crypto=nss \ - --with-distro=arch \ - --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/sbin/dhcpcd \ - --with-iptables=/usr/sbin/iptables \ - --disable-static \ - --enable-more-warnings=no \ - --disable-wimax - - make -} - -package() { - cd "${srcdir}/NetworkManager-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" - - rm -rf "${pkgdir}/var/run/" -} diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch deleted file mode 100644 index 6c9e2f6c6..000000000 --- a/testing/networkmanager/disable_set_hostname.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur NetworkManager-0.8.2.orig/src/nm-policy.c NetworkManager-0.8.2/src/nm-policy.c ---- NetworkManager-0.8.2.orig/src/nm-policy.c 2010-11-03 12:58:42.000000000 -0700 -+++ NetworkManager-0.8.2/src/nm-policy.c 2010-11-23 06:22:32.436707081 -0800 -@@ -342,6 +342,7 @@ - return; - } - -+#if 0 - /* Try automatically determined hostname from the best device's IP config */ - if (!best4) - best4 = get_best_ip4_device (policy->manager, &best_req4); -@@ -396,6 +397,7 @@ - } - } - -+#endif - /* If no automatically-configured hostname, try using the hostname from - * when NM started up. - */ diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install deleted file mode 100644 index de40c17ed..000000000 --- a/testing/networkmanager/networkmanager.install +++ /dev/null @@ -1,9 +0,0 @@ -post_upgrade() { - (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG -ATTENTION: - /etc/NetworkManager/nm-system-settings.conf has been replaced - by /etc/NetworkManager/NetworkManager.conf. Make sure you move - any custom settings to the new config file. -MSG - true -} diff --git a/testing/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD deleted file mode 100644 index d0d7111b6..000000000 --- a/testing/openvpn/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 123913 2011-05-14 10:10:30Z thomas $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=openvpn -pkgver=2.2.0 -pkgrel=1 -pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" -arch=(i686 x86_64) -url="http://openvpn.net/index.php/open-source.html" -depends=('openssl' 'lzo2') -license=('custom') -backup=(usr/share/openvpn/easy-rsa/vars - usr/share/openvpn/easy-rsa/openssl.cnf - etc/conf.d/openvpn-tapdev) -source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz - openvpn.rc - openvpn-tapdev.rc - openvpn-tapdev.conf) -md5sums=('4f440603eac45fec7be218b87d570834' - 'a3809b9727f0c2af2d0770f5c7442db2' - 'd2c48e970088d679dd3c2afd914ff731' - '722f483c9e3ce2ec66d3301aaf7cf3d5') - -build() { - cd $srcdir/$pkgname-$pkgver - # Build openvpn - CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure --prefix=/usr --enable-password-save --mandir=/usr/share/man - make - - # Build plugins - for plug in auth-pam down-root; do - cd $srcdir/$pkgname-$pkgver/plugin/$plug - make - done -} - -package() { - cd $srcdir/$pkgname-$pkgver - # Install openvpn - make DESTDIR=$pkgdir install - install -d -m755 $pkgdir/etc/openvpn - # Install examples - install -d -m755 $pkgdir/usr/share/openvpn - cp -r sample-config-files $pkgdir/usr/share/openvpn/examples - find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \; - find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \; - # Install license - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - # Install plugins - for plug in auth-pam down-root; do - cd $srcdir/$pkgname-$pkgver/plugin/$plug - install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so - done - # Install easy-rsa - cd $srcdir/$pkgname-$pkgver - make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa - # Install rc scripts - install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn - install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev - install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev -} diff --git a/testing/openvpn/openvpn-tapdev.conf b/testing/openvpn/openvpn-tapdev.conf deleted file mode 100644 index afa5586dd..000000000 --- a/testing/openvpn/openvpn-tapdev.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# /etc/conf.d/openvpn-tapdev -# -# Place openvpn-tapdev before network into your DAEMONS array -# This will create permanent tap devices which you can use for bridging -# -# Example: -# TAPDEVS="work home" -# Will create two tap devices "work" and "home" -# - -TAPDEVS="" diff --git a/testing/openvpn/openvpn-tapdev.rc b/testing/openvpn/openvpn-tapdev.rc deleted file mode 100755 index 2c51f8248..000000000 --- a/testing/openvpn/openvpn-tapdev.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -. /etc/conf.d/openvpn-tapdev - -case "$1" in - start) - stat_busy "Creating tap devices for OpenVPN ... " - success=0 - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn-tapdev - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Destroying tap devices for OpenVPN ..." - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - rm_daemon openvpn-tapdev - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openvpn/openvpn.rc b/testing/openvpn/openvpn.rc deleted file mode 100755 index 96c28b641..000000000 --- a/testing/openvpn/openvpn.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -CFGDIR="/etc/openvpn" -STATEDIR="/var/run/openvpn" - -case "$1" in - start) - stat_busy "Starting OpenVPN ... " - success=0 - mkdir -p "${STATEDIR}" - for cfg in "${CFGDIR}"/*.conf; do - stat_append "$(basename "${cfg}" .conf) " - /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping OpenVPN ..." - for pidfile in "${STATEDIR}"/*.pid; do - stat_append "$(basename "${pidfile}" .pid) " - kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null - rm -f "${pidfile}" - done - rm_daemon openvpn - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/pixman/PKGBUILD b/testing/pixman/PKGBUILD deleted file mode 100644 index bbc0360f6..000000000 --- a/testing/pixman/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 124049 2011-05-16 10:05:58Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=pixman -pkgver=0.22.0 -pkgrel=1 -pkgdesc="Pixman library" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org" -license=('custom') -depends=('glibc') -options=('!libtool') -source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d24ea233755d7dce9f0d93136ad99fba8d4e4fa0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} diff --git a/testing/pkg-config/PKGBUILD b/testing/pkg-config/PKGBUILD deleted file mode 100644 index 95ed134c6..000000000 --- a/testing/pkg-config/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 124806 2011-05-24 14:39:31Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> - -pkgname=pkg-config -pkgver=0.26 -pkgrel=1 -pkgdesc="A system for managing library compile/link flags" -arch=('i686' 'x86_64') -url="http://pkgconfig.freedesktop.org/wiki/" -license=('GPL') -groups=('base-devel') -depends=('glibc' 'popt' 'glib2') -provides=("pkgconfig=${pkgver}") -conflicts=('pkgconfig') -replaces=('pkgconfig') -source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('47525c26a9ba7ba14bf85e01509a7234') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # Use system popt - ./configure --prefix=/usr --with-installed-popt - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install -} diff --git a/testing/pkg-config/autoconf-2.66.patch b/testing/pkg-config/autoconf-2.66.patch deleted file mode 100644 index 14cabdf9f..000000000 --- a/testing/pkg-config/autoconf-2.66.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur pkg-config-0.25-old//pkg.m4 pkg-config-0.25/pkg.m4 ---- pkg-config-0.25-old//pkg.m4 2009-12-07 06:39:02.000000000 +1000 -+++ pkg-config-0.25/pkg.m4 2010-07-15 14:44:37.466942978 +1000 -@@ -135,7 +135,7 @@ - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT])[]dnl - ]) - elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) diff --git a/testing/pyalpm/PKGBUILD b/testing/pyalpm/PKGBUILD deleted file mode 100644 index 0db22e4d7..000000000 --- a/testing/pyalpm/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainer : Rémy Oudompheng <remy@archlinux.org> - -pkgname=pyalpm -pkgver=0.4.2 -pkgrel=1 -pkgdesc="Libalpm bindings for Python 3" -arch=('i686' 'x86_64') -url="http://projects.archlinux.org/users/remy/pyalpm.git/" -license=('GPL') -depends=('python>=3.2' 'pacman<3.6') -source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") -md5sums=('d5d45cafa98050a4d3c77e4a8f597ff3') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - python setup.py build -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - python setup.py install --root=${pkgdir} -} - diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD deleted file mode 100644 index fee69d2c1..000000000 --- a/testing/sudo/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 124889 2011-05-24 21:47:33Z eric $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sudo -_ver=1.8.1p2 -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 -pkgdesc="Give certain users the ability to run some commands as root" -arch=('i686' 'x86_64') -url="http://www.sudo.ws/sudo/" -license=('custom') -depends=('glibc' 'pam') -backup=('etc/sudoers' 'etc/pam.d/sudo') -options=('!libtool' '!makeflags') -source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz - sudo.pam) -md5sums=('e8330f0e63b0ecb2e12b5c76922818cc' - '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') - -build() { - cd "$srcdir/$pkgname-$_ver" - - ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ - --with-env-editor --with-all-insults --with-logfac=auth - make -} - -package() { - cd "$srcdir/$pkgname-$_ver" - install -dm755 "$pkgdir/var/lib" - - make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" - - install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" -} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam deleted file mode 100644 index 4e586cd22..000000000 --- a/testing/sudo/sudo.pam +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so diff --git a/testing/udev/80-drivers.rules b/testing/udev/80-drivers.rules deleted file mode 100644 index 56ac06cb4..000000000 --- a/testing/udev/80-drivers.rules +++ /dev/null @@ -1,14 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION=="remove", GOTO="drivers_end" - -DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms" -SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block" -SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block" -SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block" -SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg" -SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev" - -LABEL="drivers_end" diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules deleted file mode 100644 index 3e71a9118..000000000 --- a/testing/udev/81-arch.rules +++ /dev/null @@ -1,114 +0,0 @@ -# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org> -# do not edit this file, it will be overwritten on update -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# There are a number of modifiers that are allowed to be used in some of the -# fields. See the udev man page for a full description of them. -# global stuff -# - -##################################### -###### Hotplug rules - begin -# Only additional modules, -# which are not detectable, -# are loaded here! -##################################### -# check if the device has already been claimed by a driver -ACTION!="add", GOTO="drivers_end" - -#PNP addon modules -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog" - -# PARPORT addon modules -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev" - -# fix ide cdrom detection on old proliant servers -SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic" - -LABEL="drivers_end" -##################################### -##### Hotplug rules - end -##################################### - -##################################### -# Additional Archlinux -# Permissions and Symlinks - begin -##################################### - -# permission for sg devices -KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" - -# permissions for IDE CD devices -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" - -# permissions for SCSI CD devices -SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical" -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical" - -# permissions for removable devices like cardreaders or sticks -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" - -# permissions for firewire external drives -KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" - -# permissions for usb to scsi external adapters -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" - -# permissions for ide storage like pcmcia card readers -ACTION!="add", GOTO="pcmcia_end" -SUBSYSTEM!="block", GOTO="pcmcia_end" -KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -KERNEL=="hd*", IMPORT{parent}=="ID_*" -KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" -LABEL="pcmcia_end" - -# permissions for SCSI scanners -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" - -# mem -KERNEL=="ram0", SYMLINK+="ramdisk" -KERNEL=="ram1", SYMLINK+="ram" - -# video4linux - -KERNEL=="vbi0", SYMLINK+="vbi" -KERNEL=="radio0", SYMLINK+="radio" -KERNEL=="radio[0-9]*", GROUP="video" -KERNEL=="video0", SYMLINK+="video" -KERNEL=="vtx0", SYMLINK+="vtx" - -# video devices -### xorg resets those permissions, adjust your xorg.conf! -KERNEL=="3dfx*", GROUP="video" -KERNEL=="fb[0-9]*", GROUP="video" - -# misc -KERNEL=="sgi_fetchop", MODE="0666" -KERNEL=="sonypi", MODE="0666" - -# USB devices -KERNEL=="legousbtower*", MODE="0666" - -# kbd devices -KERNEL=="kbd", MODE="0664" - -# miscellaneous -KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664" -####################################### -# Permissions and Symlinks - end -####################################### diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD deleted file mode 100644 index 0db5f45cf..000000000 --- a/testing/udev/PKGBUILD +++ /dev/null @@ -1,106 +0,0 @@ -# $Id: PKGBUILD 125635 2011-05-27 11:47:52Z tomegun $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> -# Maintainer: Tom Gundersen <teg@jklm.no> - -pkgbase="udev" -pkgname=('udev' 'udev-compat') -pkgver=171 -pkgrel=1 -arch=(i686 x86_64) -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -groups=('base') -# older initscripts versions required start_udev -options=(!makeflags !libtool) -makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 - 80-drivers.rules - 81-arch.rules - load-modules.sh - static-audio-nodes-permissions.patch) - -build() { - cd $srcdir/$pkgbase-$pkgver - # fix https://bugs.archlinux.org/task/24362 (will be in udev-172) - patch -Np1 -i ../static-audio-nodes-permissions.patch - ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ - --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\ - --disable-rule-generator - make -} - -package_udev() { - pkgdesc="The userspace dev tools (udev)" - depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' - 'module-init-tools>=3.11' 'pciutils') - install=udev.install - backup=(etc/udev/udev.conf - etc/modprobe.d/framebuffer_blacklist.conf) - conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') - replaces=('devfsd') - - cd $srcdir/$pkgbase-$pkgver - make DESTDIR=${pkgdir} install - # Replace original 80-drivers.rules with custom one. - install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules - # Install our rule for permissions and symlinks - install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules - # install our module loading subsystem - install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh - - # create framebuffer blacklist - mkdir -p $pkgdir/etc/modprobe.d/ - for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do - echo "blacklist $mod" - done | sort -u > $pkgdir/etc/modprobe.d/framebuffer_blacklist.conf - - # create static devices in /lib/udev/devices/ - mkdir ${pkgdir}/lib/udev/devices/pts - mkdir ${pkgdir}/lib/udev/devices/shm - - mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1 - mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3 - mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5 - mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 - - ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd - ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin - ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout - ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr - ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core - - # these static devices are created for convenience, to autoload the modules if necessary - # /dev/loop0 - mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 - chgrp disk ${pkgdir}/lib/udev/devices/loop0 - # /dev/net/tun - mkdir ${pkgdir}/lib/udev/devices/net - mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200 - # /dev/fuse - mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 - # /dev/ppp - mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/lib/udev/rules.d/*.rules; do - sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' $i - done -} - -package_udev-compat() { - pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" - depends=('udev') - groups=('') - cd $srcdir/$pkgbase-$pkgver - install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules -} -md5sums=('bdf4617284be2ecac11767437417e209' - '4427855146513a4703ab5c7eb8a0156e' - 'd8725e64fd0ce6e784ae795fae424c0a' - 'f91fddc67609b45b244a624977c4247b' - '4f625aea95a5597afd8cdf189421f193') diff --git a/testing/udev/load-modules.sh b/testing/udev/load-modules.sh deleted file mode 100755 index 1e2af913e..000000000 --- a/testing/udev/load-modules.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# Implement blacklisting for udev-loaded modules - -[ $# -ne 1 ] && exit 1 - -. /etc/rc.conf - -# grab modules from rc.conf -BLACKLIST="${MOD_BLACKLIST[@]}" -MODPROBE="/sbin/modprobe" -LOGGER="/usr/bin/logger" -RESOLVEALIAS="${MODPROBE} --resolve-alias" -USEBLACKLIST="--use-blacklist" - -if [ -f /proc/cmdline ]; then - for cmd in $(cat /proc/cmdline); do - case $cmd in - disablemodules=*) eval $cmd ;; - load_modules=off) exit ;; - esac - done - #parse cmdline entries of the form "disablemodules=x,y,z" - if [ -n "$disablemodules" ]; then - BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')" - fi -fi - -#MODULES entries in rc.conf that begin with ! are blacklisted -for mod in ${MODULES[@]}; do - if [ "${mod}" != "${mod#!}" ]; then - BLACKLIST="$BLACKLIST ${mod#!}" - fi -done - -if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then - if [ -n "${BLACKLIST}" ]; then - # If an alias name is on the blacklist, load no modules for this device - if echo "${BLACKLIST}" | /bin/grep -q -e " $1 " -e "^$1 " -e " $1\$"; then - $LOGGER -p info -t "$(basename $0)" "Not loading module alias '$1' because it is blacklisted" - exit - fi - #sanitize the blacklist - BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')" - # Try to find all modules for the alias - mods=$($RESOLVEALIAS $1) - # If no modules could be found, try if the alias name is a module name - # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour - [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST="" - [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name" - for mod in ${mods}; do - # Find the module and all its dependencies - deps="$($MODPROBE -i --show-depends ${mod})" - [ $? -ne 0 ] && continue - - #sanitize the module names - deps="$(echo "$deps" | sed \ - -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \ - -e 's|-|_|g')" - - # If the module or any of its dependencies is blacklisted, don't load it - for dep in $deps; do - if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then - if [ "${dep}" = "${mod}" ]; then - $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted" - else - $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted" - fi - continue 2 - fi - done - # modprobe usually uses the "blacklist" statements from modprobe.conf only to blacklist all aliases - # of a module, but not the module itself. We use --use-blacklist here so that modprobe also blacklists - # module names if we resolved alias names manually above - $MODPROBE $USEBLACKLIST ${mod} - done - else - $MODPROBE $USEBLACKLIST $1 - fi -fi -# vim: set et ts=4: diff --git a/testing/udev/static-audio-nodes-permissions.patch b/testing/udev/static-audio-nodes-permissions.patch deleted file mode 100644 index b1fc4f935..000000000 --- a/testing/udev/static-audio-nodes-permissions.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3e227830ad6494700e18ae03297e8fb833ff26bf Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Fri, 27 May 2011 02:50:29 +0200 -Subject: [PATCH] rules: apply 'audio' group of the static snd/{seq,timer} - nodes - ---- - rules/rules.d/50-udev-default.rules | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules -index cd745ef..cacb533 100644 ---- a/rules/rules.d/50-udev-default.rules -+++ b/rules/rules.d/50-udev-default.rules -@@ -38,7 +38,8 @@ SUBSYSTEM=="graphics", GROUP="video" - SUBSYSTEM=="drm", GROUP="video" - - # sound --SUBSYSTEM=="sound", GROUP="audio" -+SUBSYSTEM=="sound", GROUP="audio", \ -+ OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" - - # DVB (video) - SUBSYSTEM=="dvb", GROUP="video" --- -1.7.5.3 - diff --git a/testing/udev/udev.install b/testing/udev/udev.install deleted file mode 100644 index b2ed69467..000000000 --- a/testing/udev/udev.install +++ /dev/null @@ -1,49 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 100)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "----------" - echo "udev >=098 rules syntax has changed, please update your own rules." - echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules." - echo "Please read the instructions carefully before reboot." - echo "They are located in /etc/udev/readme-udev-arch.txt" - echo "----------" - fi - if [ "$(vercmp $2 169)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "---------------" - echo "Kernel 2.6.32 or newer is now required." - echo "OSS emulation modules are not loaded by default, add to rc.conf if needed." - echo "Arch specific cd symlinks are now no longer created." - echo "cd and net persistent rules will no longer be autogenerated," - echo "see <https://wiki.archlinux.org/index.php/Udev> for details." - echo "Errors are now logged (possibly to the console) by default." - echo "---------------" - fi -} - -post_install() { - # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist - # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible - ROOTDIR="" - [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) - [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR} - if [ ! -c ${ROOTDIR}/dev/console ]; then - rm -f ${ROOTDIR}/dev/console - mknod -m600 ${ROOTDIR}/dev/console c 5 1 - fi - if [ ! -c ${ROOTDIR}/dev/null ]; then - rm -f ${ROOTDIR}/dev/null - mknod -m644 ${ROOTDIR}/dev/null c 1 3 - fi - if [ ! -c ${ROOTDIR}/dev/zero ]; then - rm -f ${ROOTDIR}/dev/zero - mknod -m644 ${ROOTDIR}/dev/zero c 1 5 - fi - if [ -n "${ROOTDIR}" ]; then - umount ${ROOTDIR} - rmdir ${ROOTDIR} - fi -} diff --git a/testing/vigra/PKGBUILD b/testing/vigra/PKGBUILD deleted file mode 100644 index 400bd5898..000000000 --- a/testing/vigra/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 124225 2011-05-17 18:01:10Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> - -pkgname=vigra -pkgver=1.7.1 -pkgrel=1 -pkgdesc="Computer vision library" -arch=('i686' 'x86_64') -url="http://hci.iwr.uni-heidelberg.de/vigra/" -license=('custom:MIT') -depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw') -makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy') -optdepends=('python2: for python bindings' - 'boost-libs: for python bindings') -options=('!libtool') -source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz - vigra-1.7.1.gcc460.patch) -md5sums=('2bde208e0fd7626770169dd4fa097282' - '25ef8bc26bc38ee67e5b512d2acd0166') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_VIGRANUMPY=1 \ - -DDOCINSTALL=share/doc - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - # license - install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/vigra/vigra-1.7.1.gcc460.patch b/testing/vigra/vigra-1.7.1.gcc460.patch deleted file mode 100644 index 46f194dbc..000000000 --- a/testing/vigra/vigra-1.7.1.gcc460.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx ---- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000 -+++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000 -@@ -43,6 +43,7 @@ - #include <set> - #include <list> - #include <numeric> -+#include <stddef.h> - #include "mathutil.hxx" - #include "array_vector.hxx" - #include "sized_int.hxx" -diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx ---- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000 -+++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000 -@@ -57,6 +57,7 @@ - #include <fstream> - #include <cstring> - #include <vector> -+#include <stddef.h> - #include "vigra/multi_array.hxx" - - namespace vigra { -diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx ---- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000 -+++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000 -@@ -41,6 +41,7 @@ - #define VIGRA_MULTI_ITERATOR_HXX - - #include <sys/types.h> -+#include <stddef.h> - #include "tinyvector.hxx" - #include "iteratortags.hxx" - diff --git a/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/" -} diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD deleted file mode 100644 index c10416455..000000000 --- a/testing/xf86-video-ati/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 125569 2011-05-26 19:49:03Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-ati -pkgver=6.14.2 -pkgrel=1 -pkgdesc="X.org ati video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=(libpciaccess libdrm udev pixman ati-dri) -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') -conflicts=('xorg-server<1.10.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -md5sums=('111ec4aef32a4298df7e38afa8bef373') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make "DESTDIR=${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-ati/ati-fix-build-1.10.patch b/testing/xf86-video-ati/ati-fix-build-1.10.patch deleted file mode 100644 index 75980cbf3..000000000 --- a/testing/xf86-video-ati/ati-fix-build-1.10.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001 -From: Sedat Dilek <sedat.dilek@googlemail.com> -Date: Fri, 25 Feb 2011 21:48:14 +0100 -Subject: [PATCH] UMS: Fix build against xserver 1.10-rc3 - -This issue was introduced due to last minute backout of RandR-1.4 -in xserver 1.10-rc3. - -Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard. -See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>. - -Note: -The ddx needs a rebuild as the X video driver ABI changed to version 10.0. - -Reported-by: Alex Deucher <alexdeucher@gmail.com> -CC: Keith Packard <keithp@keithp.com> -Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> ---- - src/radeon_output.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/radeon_output.c b/src/radeon_output.c -index 15cef06..ccde346 100644 ---- a/src/radeon_output.c -+++ b/src/radeon_output.c -@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output) - xf86CrtcPtr crtc = output->crtc; - - if (crtc->enabled) { --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0) -+#ifdef RANDR_14_INTERFACE - xf86CrtcSetRec crtc_set_rec; - - crtc_set_rec.flags = (XF86CrtcSetMode | --- -1.7.1 - - diff --git a/testing/xorg-appres/PKGBUILD b/testing/xorg-appres/PKGBUILD deleted file mode 100644 index 9af921b3b..000000000 --- a/testing/xorg-appres/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113951 2011-03-10 22:00:42Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-appres -pkgver=1.0.3 -pkgrel=2 -pkgdesc="List X application resource database" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxt') -makedepends=('xorg-util-macros') -conflicts=('xorg-res-utils') -source=(http://xorg.freedesktop.org/archive/individual/app/appres-${pkgver}.tar.bz2) -sha1sums=('7303f12fae8cce92da2dbd88c9d31d816dc5da06') - -build() { - cd "${srcdir}/appres-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-bdftopcf/PKGBUILD b/testing/xorg-bdftopcf/PKGBUILD deleted file mode 100644 index 80920d665..000000000 --- a/testing/xorg-bdftopcf/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113655 2011-03-10 14:27:34Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-bdftopcf -pkgver=1.0.3 -pkgrel=1 -pkgdesc="Convert X font from Bitmap Distribution Format to Portable Compiled Format" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxfont') -makedepends=('xorg-util-macros' 'xproto') -groups=('xorg' 'xorg-apps') -source=(http://xorg.freedesktop.org/archive/individual/app/bdftopcf-${pkgver}.tar.bz2) -sha1sums=('146b4ece2867479045c3b4593b22c9f1d21da14a') - -build() { - cd "${srcdir}/bdftopcf-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-font-util/PKGBUILD b/testing/xorg-font-util/PKGBUILD deleted file mode 100644 index 09ec5570f..000000000 --- a/testing/xorg-font-util/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-font-util -pkgver=1.2.0 -pkgrel=1 -pkgdesc="X.Org font utilities" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -makedepends=('xorg-util-macros') -replaces=('font-util') -provides=('font-util') -conflicts=('font-util') -groups=('xorg-fonts' 'xorg') -source=(${url}/releases/individual/font/font-util-${pkgver}.tar.bz2) -sha1sums=('011fa9c8fe08d9f6f848df570374ed1cb7488146') - -build() { - cd "${srcdir}/font-util-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-mapdir=/usr/share/fonts/util --with-fontrootdir=/usr/share/fonts - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-iceauth/PKGBUILD b/testing/xorg-iceauth/PKGBUILD deleted file mode 100644 index 7489c6c08..000000000 --- a/testing/xorg-iceauth/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113660 2011-03-10 14:29:50Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-iceauth -pkgver=1.0.4 -pkgrel=2 -pkgdesc="ICE authority file utility" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libice') -makedepends=('xorg-util-macros' 'xproto') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2) -sha1sums=('9b446c0d1815dce48bdea32db7dea7e429f6a310') - -build() { - cd "${srcdir}/iceauth-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-luit/PKGBUILD b/testing/xorg-luit/PKGBUILD deleted file mode 100644 index 3b7f03484..000000000 --- a/testing/xorg-luit/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 113665 2011-03-10 14:31:25Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-luit -pkgver=1.1.0 -pkgrel=2 -pkgdesc="Filter that can be run between an arbitrary application and -a UTF-8 terminal emulator" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libfontenc') -groups=('xorg' 'xorg-apps') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2) -sha1sums=('fa974b417f6b65c241398d8d011207c6facb0766') - -build() { - cd "${srcdir}/luit-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-mkfontscale/PKGBUILD b/testing/xorg-mkfontscale/PKGBUILD deleted file mode 100644 index fd5ee0a7f..000000000 --- a/testing/xorg-mkfontscale/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113678 2011-03-10 14:41:30Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-mkfontscale -pkgver=1.0.8 -pkgrel=1 -pkgdesc="Create an index of scalable font files for X" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('freetype2' 'libfontenc') -makedepends=('xorg-util-macros' 'xproto') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2) -sha1sums=('accfb12751bf3b7ae7b28c1b0b863d5be871398f') - -build() { - cd "${srcdir}/mkfontscale-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-oclock/PKGBUILD b/testing/xorg-oclock/PKGBUILD deleted file mode 100644 index 0453c41e4..000000000 --- a/testing/xorg-oclock/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-oclock -pkgver=1.0.2 -pkgrel=1 -pkgdesc="Round X clock" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxmu' 'libxext') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/oclock-${pkgver}.tar.bz2) -sha1sums=('ba606d39fba6021c4db76d79751779f7b5c862e9') - -build() { - cd "${srcdir}/oclock-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/testing/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD deleted file mode 100644 index bd16d9086..000000000 --- a/testing/xorg-server/PKGBUILD +++ /dev/null @@ -1,189 +0,0 @@ -# $Id: PKGBUILD 119887 2011-04-16 12:07:45Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=xorg-server -pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.10.1 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - bg-none-revert.patch - glx-pixmap-crash.patch - xserver-1.10-pointer-barriers.patch - xorg-redhat-die-ugly-pattern-die-die-die.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf) -sha1sums=('59ada4c9a59f7f1eb4b68c359e9cd58272aa4809' - '629c6d8d52126eab81ee1b72a9e4209535f8cb81' - '19e7164dcf9814ad64231b50a46f651b0e68a27a' - '1b95e91384a57d966428c7db98ed06f4cc562f91' - '0efcdf61bde3c0cd813072b94e2b30ab922775b9' - 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' - '6838fc00ef4618c924a77e0fb03c05346080908a' - '993798f3d22ad672d769dae5f48d1fa068d5578f') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - # Get rid of the ugly pattern - patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" - - # Add pointer barrier support, patch from Fedora - patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch" - - # Patches from ~ajax/xserver xserver-next branch - patch -Np1 -i "${srcdir}/bg-none-revert.patch" - patch -Np1 -i "${srcdir}/glx-pixmap-crash.patch" - - autoreconf - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-install-setuid \ - --enable-config-udev \ - --disable-config-dbus \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - make - - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 doc/man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - provides=('x-server') - groups=('xorg') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -package_xorg-server-devel() { - pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/testing/xorg-server/bg-none-revert.patch b/testing/xorg-server/bg-none-revert.patch deleted file mode 100644 index 1a38f1f41..000000000 --- a/testing/xorg-server/bg-none-revert.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3bc6ed2d8c9028ec28015d05b60af67a194f3694 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 29 Mar 2011 14:09:46 +0000 -Subject: Revert "composite: Don't backfill non-bg-None windows" - -This reverts commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc. - -Bugzilla: https://bugs.freedesktop.org/34427 - -Acked-by: Alex Deucher <alexdeucher@gmail.com> -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/composite/compalloc.c b/composite/compalloc.c -index e4064f6..7164c0d 100644 ---- a/composite/compalloc.c -+++ b/composite/compalloc.c -@@ -508,17 +508,6 @@ compUnredirectOneSubwindow (WindowPtr pParent, WindowPtr pWin) - return Success; - } - --static int --bgNoneVisitWindow(WindowPtr pWin, void *null) --{ -- if (pWin->backgroundState != BackgroundPixmap) -- return WT_WALKCHILDREN; -- if (pWin->background.pixmap != None) -- return WT_WALKCHILDREN; -- -- return WT_STOPWALKING; --} -- - static PixmapPtr - compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map) - { -@@ -539,21 +528,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map) - if (!map) - return pPixmap; - -- /* -- * If there's no bg=None in the tree, we're done. -- * -- * We could optimize this more by collection the regions of all the -- * bg=None subwindows and feeding that in as the clip for the -- * CopyArea below, but since window trees are shallow these days it -- * might not be worth the effort. -- */ -- if (TraverseTree(pWin, bgNoneVisitWindow, NULL) == WT_NOMATCH) -- return pPixmap; -- -- /* -- * Copy bits from the parent into the new pixmap so that it will -- * have "reasonable" contents in case for background None areas. -- */ - if (pParent->drawable.depth == pWin->drawable.depth) - { - GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen); --- -cgit v0.8.3-6-g21f6 diff --git a/testing/xorg-server/glx-pixmap-crash.patch b/testing/xorg-server/glx-pixmap-crash.patch deleted file mode 100644 index 48f258eb5..000000000 --- a/testing/xorg-server/glx-pixmap-crash.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 390ba6686d1baf80627c01d4a4273981d6606cc9 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 28 Mar 2011 16:30:09 +0000 -Subject: glx: Fix lifetime tracking for pixmaps - -GLX pixmaps take a reference on the underlying pixmap; X and GLX pixmap -IDs can be destroyed in either order with no error. Only windows need -to be tracked under both XIDs. - -Fixes piglit/glx-pixmap-life. - -Reviewed-by: Michel Dänzer <michel@daenzer.net> -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index 66d4c7e..d5b764f 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -1127,10 +1127,11 @@ DoCreateGLXDrawable(ClientPtr client, __GLXscreen *pGlxScreen, - return BadAlloc; - } - -- /* Add the glx drawable under the XID of the underlying X drawable -- * too. That way we'll get a callback in DrawableGone and can -- * clean up properly when the drawable is destroyed. */ -- if (drawableId != glxDrawableId && -+ /* -+ * Windows aren't refcounted, so track both the X and the GLX window -+ * so we get called regardless of destruction order. -+ */ -+ if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW && - !AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) { - pGlxDraw->destroy (pGlxDraw); - return BadAlloc; -@@ -1161,6 +1162,8 @@ DoCreateGLXPixmap(ClientPtr client, __GLXscreen *pGlxScreen, __GLXconfig *config - err = DoCreateGLXDrawable(client, pGlxScreen, config, pDraw, drawableId, - glxDrawableId, GLX_DRAWABLE_PIXMAP); - -+ ((PixmapPtr)pDraw)->refcnt++; -+ - return err; - } - -diff --git a/glx/glxext.c b/glx/glxext.c -index 3f3dd79..9cfc096 100644 ---- a/glx/glxext.c -+++ b/glx/glxext.c -@@ -118,15 +118,15 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid) - { - __GLXcontext *c, *next; - -- /* If this drawable was created using glx 1.3 drawable -- * constructors, we added it as a glx drawable resource under both -- * its glx drawable ID and it X drawable ID. Remove the other -- * resource now so we don't a callback for freed memory. */ -- if (glxPriv->drawId != glxPriv->pDraw->id) { -- if (xid == glxPriv->drawId) -- FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE); -- else -- FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE); -+ if (glxPriv->type == GLX_DRAWABLE_WINDOW) { -+ /* If this was created by glXCreateWindow, free the matching resource */ -+ if (glxPriv->drawId != glxPriv->pDraw->id) { -+ if (xid == glxPriv->drawId) -+ FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE); -+ else -+ FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE); -+ } -+ /* otherwise this window was implicitly created by MakeCurrent */ - } - - for (c = glxAllContexts; c; c = next) { -@@ -143,6 +143,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid) - c->readPriv = NULL; - } - -+ /* drop our reference to any backing pixmap */ -+ if (glxPriv->type == GLX_DRAWABLE_PIXMAP) -+ glxPriv->pDraw->pScreen->DestroyPixmap((PixmapPtr)glxPriv->pDraw); -+ - glxPriv->destroy(glxPriv); - - return True; --- -cgit v0.8.3-6-g21f6 diff --git a/testing/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch b/testing/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch deleted file mode 100644 index 4e782f1c6..000000000 --- a/testing/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch +++ /dev/null @@ -1,16 +0,0 @@ -Remove the default root window grey stipple pattern, replacing it with -blackness. - ---- xc/programs/Xserver/dix/window.c.die-ugly-pattern-die-die-die Tue Feb 12 16:33:04 2002 -+++ xc/programs/Xserver/dix/window.c Tue Feb 12 16:45:32 2002 -@@ -119,8 +119,8 @@ - * - ******/ - --static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11}; --static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88}; -+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00}; -+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00}; - - int screenIsSaved = SCREEN_SAVER_OFF; - diff --git a/testing/xorg-server/xserver-1.10-pointer-barriers.patch b/testing/xorg-server/xserver-1.10-pointer-barriers.patch deleted file mode 100644 index 099565436..000000000 --- a/testing/xorg-server/xserver-1.10-pointer-barriers.patch +++ /dev/null @@ -1,1054 +0,0 @@ -From 14f1112bec18ccece8e732fe6c200a56546230c7 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Thu, 17 Mar 2011 13:56:17 -0400 -Subject: [PATCH] CRTC confine and pointer barriers - ---- - dix/events.c | 7 + - dix/getevents.c | 12 +- - include/dix.h | 1 + - include/protocol-versions.h | 2 +- - mi/mipointer.c | 16 ++- - mi/mipointer.h | 6 + - randr/randr.c | 2 + - randr/randrstr.h | 4 + - randr/rrcrtc.c | 155 ++++++++++++++++ - test/Makefile.am | 4 +- - xfixes/cursor.c | 408 ++++++++++++++++++++++++++++++++++++++++++- - xfixes/xfixes.c | 24 ++- - xfixes/xfixes.h | 17 ++ - xfixes/xfixesint.h | 16 ++ - 14 files changed, 658 insertions(+), 16 deletions(-) - -diff --git a/dix/events.c b/dix/events.c -index 07f8b05..d2be84f 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -328,6 +328,13 @@ IsMaster(DeviceIntPtr dev) - return dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD; - } - -+Bool -+IsFloating(DeviceIntPtr dev) -+{ -+ return GetMaster(dev, MASTER_KEYBOARD) == NULL; -+} -+ -+ - /** - * Max event opcode. - */ -diff --git a/dix/getevents.c b/dix/getevents.c -index 794df42..c66e516 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -812,7 +812,11 @@ accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms) - * miPointerSetPosition() and then scale back into device coordinates (if - * needed). miPSP will change x/y if the screen was crossed. - * -+ * The coordinates provided are always absolute. The parameter mode whether -+ * it was relative or absolute movement that landed us at those coordinates. -+ * - * @param dev The device to be moved. -+ * @param mode Movement mode (Absolute or Relative) - * @param x Pointer to current x-axis value, may be modified. - * @param y Pointer to current y-axis value, may be modified. - * @param x_frac Fractional part of current x-axis value, may be modified. -@@ -824,7 +828,8 @@ accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms) - * @param screeny_frac Fractional part of screen y coordinate, as above. - */ - static void --positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac, -+positionSprite(DeviceIntPtr dev, int mode, -+ int *x, int *y, float x_frac, float y_frac, - ScreenPtr scr, int *screenx, int *screeny, float *screenx_frac, float *screeny_frac) - { - int old_screenx, old_screeny; -@@ -863,7 +868,7 @@ positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac, - old_screeny = *screeny; - /* This takes care of crossing screens for us, as well as clipping - * to the current screen. */ -- miPointerSetPosition(dev, screenx, screeny); -+ _miPointerSetPosition(dev, mode, screenx, screeny); - - if (dev->u.master) { - dev->u.master->last.valuators[0] = *screenx; -@@ -1193,7 +1198,8 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons, - - set_raw_valuators(raw, &mask, raw->valuators.data); - -- positionSprite(pDev, &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac); -+ positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, -+ &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac); - updateHistory(pDev, &mask, ms); - - /* Update the valuators with the true value sent to the client*/ -diff --git a/include/dix.h b/include/dix.h -index 12e4b59..3f99098 100644 ---- a/include/dix.h -+++ b/include/dix.h -@@ -570,6 +570,7 @@ extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev); - extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev); - extern Bool IsPointerEvent(InternalEvent *event); - extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev); -+extern _X_EXPORT Bool IsFloating(DeviceIntPtr dev); - - extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master); - extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what); -diff --git a/include/protocol-versions.h b/include/protocol-versions.h -index 1d33bdd..1dc66ad 100644 ---- a/include/protocol-versions.h -+++ b/include/protocol-versions.h -@@ -126,7 +126,7 @@ - #define SERVER_XF86VIDMODE_MINOR_VERSION 2 - - /* Fixes */ --#define SERVER_XFIXES_MAJOR_VERSION 4 -+#define SERVER_XFIXES_MAJOR_VERSION 5 - #define SERVER_XFIXES_MINOR_VERSION 0 - - /* X Input */ -diff --git a/mi/mipointer.c b/mi/mipointer.c -index 554397a..85f1949 100644 ---- a/mi/mipointer.c -+++ b/mi/mipointer.c -@@ -229,6 +229,10 @@ miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen, - SetupScreen (pScreen); - - GenerateEvent = generateEvent; -+ -+ if (pScreen->ConstrainCursorHarder) -+ pScreen->ConstrainCursorHarder(pDev, pScreen, Absolute, &x, &y); -+ - /* device dependent - must pend signal and call miPointerWarpCursor */ - (*pScreenPriv->screenFuncs->WarpCursor) (pDev, pScreen, x, y); - if (!generateEvent) -@@ -484,7 +488,7 @@ miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen, - } - - void --miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) -+_miPointerSetPosition(DeviceIntPtr pDev, int mode, int *x, int *y) - { - miPointerScreenPtr pScreenPriv; - ScreenPtr pScreen; -@@ -529,6 +533,9 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) - if (*y >= pPointer->limits.y2) - *y = pPointer->limits.y2 - 1; - -+ if (pScreen->ConstrainCursorHarder) -+ pScreen->ConstrainCursorHarder(pDev, pScreen, mode, x, y); -+ - if (pPointer->x == *x && pPointer->y == *y && - pPointer->pScreen == pScreen) - return; -@@ -536,6 +543,13 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) - miPointerMoveNoEvent(pDev, pScreen, *x, *y); - } - -+/* ABI hack */ -+void -+miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) -+{ -+ _miPointerSetPosition(pDev, Absolute, x, y); -+} -+ - void - miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y) - { -diff --git a/mi/mipointer.h b/mi/mipointer.h -index 3c86110..6b6010c 100644 ---- a/mi/mipointer.h -+++ b/mi/mipointer.h -@@ -131,6 +131,12 @@ extern _X_EXPORT void miPointerGetPosition( - - /* Moves the cursor to the specified position. May clip the co-ordinates: - * x and y are modified in-place. */ -+extern _X_EXPORT void _miPointerSetPosition( -+ DeviceIntPtr pDev, -+ int mode, -+ int *x, -+ int *y); -+ - extern _X_EXPORT void miPointerSetPosition( - DeviceIntPtr pDev, - int *x, -diff --git a/randr/randr.c b/randr/randr.c -index 6077705..d337129 100644 ---- a/randr/randr.c -+++ b/randr/randr.c -@@ -270,6 +270,8 @@ Bool RRScreenInit(ScreenPtr pScreen) - - wrap (pScrPriv, pScreen, CloseScreen, RRCloseScreen); - -+ pScreen->ConstrainCursorHarder = RRConstrainCursorHarder; -+ - pScrPriv->numOutputs = 0; - pScrPriv->outputs = NULL; - pScrPriv->numCrtcs = 0; -diff --git a/randr/randrstr.h b/randr/randrstr.h -index 7ea6080..d8dd37d 100644 ---- a/randr/randrstr.h -+++ b/randr/randrstr.h -@@ -297,6 +297,7 @@ typedef struct _rrScrPriv { - int rate; - int size; - #endif -+ Bool discontiguous; - } rrScrPrivRec, *rrScrPrivPtr; - - extern _X_EXPORT DevPrivateKeyRec rrPrivKeyRec; -@@ -700,6 +701,9 @@ ProcRRGetPanning (ClientPtr client); - int - ProcRRSetPanning (ClientPtr client); - -+void -+RRConstrainCursorHarder (DeviceIntPtr, ScreenPtr, int, int *, int *); -+ - /* rrdispatch.c */ - extern _X_EXPORT Bool - RRClientKnowsRates (ClientPtr pClient); -diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c -index 98206a2..d4d8f2a 100644 ---- a/randr/rrcrtc.c -+++ b/randr/rrcrtc.c -@@ -1,5 +1,6 @@ - /* - * Copyright © 2006 Keith Packard -+ * Copyright 2010 Red Hat, Inc - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that -@@ -22,6 +23,7 @@ - - #include "randrstr.h" - #include "swaprep.h" -+#include "mipointer.h" - - RESTYPE RRCrtcType; - -@@ -292,6 +294,92 @@ RRCrtcPendingProperties (RRCrtcPtr crtc) - return FALSE; - } - -+static void -+crtc_bounds(RRCrtcPtr crtc, int *left, int *right, int *top, int *bottom) -+{ -+ *left = crtc->x; -+ *top = crtc->y; -+ -+ switch (crtc->rotation) { -+ case RR_Rotate_0: -+ case RR_Rotate_180: -+ default: -+ *right = crtc->x + crtc->mode->mode.width; -+ *bottom = crtc->y + crtc->mode->mode.height; -+ return; -+ case RR_Rotate_90: -+ case RR_Rotate_270: -+ *right = crtc->x + crtc->mode->mode.height; -+ *bottom = crtc->y + crtc->mode->mode.width; -+ return; -+ } -+} -+ -+/* overlapping counts as adjacent */ -+static Bool -+crtcs_adjacent(const RRCrtcPtr a, const RRCrtcPtr b) -+{ -+ /* left, right, top, bottom... */ -+ int al, ar, at, ab; -+ int bl, br, bt, bb; -+ int cl, cr, ct, cb; /* the overlap, if any */ -+ -+ crtc_bounds(a, &al, &ar, &at, &ab); -+ crtc_bounds(b, &bl, &br, &bt, &bb); -+ -+ cl = max(al, bl); -+ cr = min(ar, br); -+ ct = max(at, bt); -+ cb = min(ab, bb); -+ -+ return (cl <= cr) && (ct <= cb); -+} -+ -+/* Depth-first search and mark all CRTCs reachable from cur */ -+static void -+mark_crtcs (rrScrPrivPtr pScrPriv, int *reachable, int cur) -+{ -+ int i; -+ reachable[cur] = TRUE; -+ for (i = 0; i < pScrPriv->numCrtcs; ++i) { -+ if (reachable[i] || !pScrPriv->crtcs[i]->mode) -+ continue; -+ if (crtcs_adjacent(pScrPriv->crtcs[cur], pScrPriv->crtcs[i])) -+ mark_crtcs(pScrPriv, reachable, i); -+ } -+} -+ -+static void -+RRComputeContiguity (ScreenPtr pScreen) -+{ -+ rrScrPriv(pScreen); -+ Bool discontiguous = TRUE; -+ int i, n = pScrPriv->numCrtcs; -+ -+ int *reachable = calloc(n, sizeof(int)); -+ if (!reachable) -+ goto out; -+ -+ /* Find first enabled CRTC and start search for reachable CRTCs from it */ -+ for (i = 0; i < n; ++i) { -+ if (pScrPriv->crtcs[i]->mode) { -+ mark_crtcs(pScrPriv, reachable, i); -+ break; -+ } -+ } -+ -+ /* Check that all enabled CRTCs were marked as reachable */ -+ for (i = 0; i < n; ++i) -+ if (pScrPriv->crtcs[i]->mode && !reachable[i]) -+ goto out; -+ -+ discontiguous = FALSE; -+ -+out: -+ free(reachable); -+ pScrPriv->discontiguous = discontiguous; -+} -+ - /* - * Request that the Crtc be reconfigured - */ -@@ -306,6 +394,7 @@ RRCrtcSet (RRCrtcPtr crtc, - { - ScreenPtr pScreen = crtc->pScreen; - Bool ret = FALSE; -+ Bool recompute = TRUE; - rrScrPriv(pScreen); - - /* See if nothing changed */ -@@ -318,6 +407,7 @@ RRCrtcSet (RRCrtcPtr crtc, - !RRCrtcPendingProperties (crtc) && - !RRCrtcPendingTransform (crtc)) - { -+ recompute = FALSE; - ret = TRUE; - } - else -@@ -381,6 +471,10 @@ RRCrtcSet (RRCrtcPtr crtc, - RRPostPendingProperties (outputs[o]); - } - } -+ -+ if (recompute) -+ RRComputeContiguity(pScreen); -+ - return ret; - } - -@@ -1349,3 +1443,64 @@ ProcRRGetCrtcTransform (ClientPtr client) - free(reply); - return Success; - } -+ -+void -+RRConstrainCursorHarder(DeviceIntPtr pDev, ScreenPtr pScreen, int mode, int *x, int *y) -+{ -+ rrScrPriv (pScreen); -+ int i; -+ -+ /* intentional dead space -> let it float */ -+ if (pScrPriv->discontiguous) -+ return; -+ -+ /* if we're moving inside a crtc, we're fine */ -+ for (i = 0; i < pScrPriv->numCrtcs; i++) { -+ RRCrtcPtr crtc = pScrPriv->crtcs[i]; -+ -+ int left, right, top, bottom; -+ -+ if (!crtc->mode) -+ continue; -+ -+ crtc_bounds(crtc, &left, &right, &top, &bottom); -+ -+ if ((*x >= left) && (*x <= right) && (*y >= top) && (*y <= bottom)) -+ return; -+ } -+ -+ /* if we're trying to escape, clamp to the CRTC we're coming from */ -+ for (i = 0; i < pScrPriv->numCrtcs; i++) { -+ RRCrtcPtr crtc = pScrPriv->crtcs[i]; -+ int nx, ny; -+ int left, right, top, bottom; -+ -+ if (!crtc->mode) -+ continue; -+ -+ crtc_bounds(crtc, &left, &right, &top, &bottom); -+ miPointerGetPosition(pDev, &nx, &ny); -+ -+ if ((nx >= left) && (nx <= right) && (ny >= top) && (ny <= bottom)) { -+ if ((*x <= left) || (*x >= right)) { -+ int dx = *x - nx; -+ -+ if (dx > 0) -+ *x = right; -+ else if (dx < 0) -+ *x = left; -+ } -+ -+ if ((*y <= top) || (*y >= bottom)) { -+ int dy = *y - ny; -+ -+ if (dy > 0) -+ *y = bottom; -+ else if (dy < 0) -+ *y = top; -+ } -+ -+ return; -+ } -+ } -+} -diff --git a/test/Makefile.am b/test/Makefile.am -index 456221e..ccdb859 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -1,6 +1,6 @@ - if UNITTESTS - SUBDIRS= . xi2 --check_PROGRAMS = xkb input xtest -+check_PROGRAMS = xkb input xtest list fixes - check_LTLIBRARIES = libxservertest.la - - TESTS=$(check_PROGRAMS) -@@ -16,6 +16,8 @@ endif - xkb_LDADD=$(TEST_LDADD) - input_LDADD=$(TEST_LDADD) - xtest_LDADD=$(TEST_LDADD) -+list_LDADD=$(TEST_LDADD) -+fixes_LDADD=$(TEST_LDADD) - - libxservertest_la_LIBADD = \ - $(XSERVER_LIBS) \ -diff --git a/xfixes/cursor.c b/xfixes/cursor.c -index fb608f6..5c55c95 100644 ---- a/xfixes/cursor.c -+++ b/xfixes/cursor.c -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright 2010 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), -@@ -50,13 +51,16 @@ - #include "cursorstr.h" - #include "dixevents.h" - #include "servermd.h" -+#include "mipointer.h" - #include "inputstr.h" - #include "windowstr.h" - #include "xace.h" -+#include "list.h" - - static RESTYPE CursorClientType; - static RESTYPE CursorHideCountType; - static RESTYPE CursorWindowType; -+RESTYPE PointerBarrierType; - static CursorPtr CursorCurrent[MAXDEVICES]; - - static DevPrivateKeyRec CursorScreenPrivateKeyRec; -@@ -107,6 +111,14 @@ typedef struct _CursorHideCountRec { - XID resource; - } CursorHideCountRec; - -+typedef struct PointerBarrierClient *PointerBarrierClientPtr; -+ -+struct PointerBarrierClient { -+ ScreenPtr screen; -+ struct PointerBarrier barrier; -+ struct list entry; -+}; -+ - /* - * Wrap DisplayCursor to catch cursor change events - */ -@@ -114,7 +126,9 @@ typedef struct _CursorHideCountRec { - typedef struct _CursorScreen { - DisplayCursorProcPtr DisplayCursor; - CloseScreenProcPtr CloseScreen; -+ ConstrainCursorHarderProcPtr ConstrainCursorHarder; - CursorHideCountPtr pCursorHideCounts; -+ struct list barriers; - } CursorScreenRec, *CursorScreenPtr; - - #define GetCursorScreen(s) ((CursorScreenPtr)dixLookupPrivate(&(s)->devPrivates, CursorScreenPrivateKey)) -@@ -184,9 +198,11 @@ CursorCloseScreen (int index, ScreenPtr pScreen) - Bool ret; - CloseScreenProcPtr close_proc; - DisplayCursorProcPtr display_proc; -+ ConstrainCursorHarderProcPtr constrain_proc; - - Unwrap (cs, pScreen, CloseScreen, close_proc); - Unwrap (cs, pScreen, DisplayCursor, display_proc); -+ Unwrap (cs, pScreen, ConstrainCursorHarder, constrain_proc); - deleteCursorHideCountsForScreen(pScreen); - ret = (*pScreen->CloseScreen) (index, pScreen); - free(cs); -@@ -1029,6 +1045,391 @@ CursorFreeWindow (pointer data, XID id) - return 1; - } - -+static BOOL -+barrier_is_horizontal(const struct PointerBarrier *barrier) -+{ -+ return barrier->y1 == barrier->y2; -+} -+ -+static BOOL -+barrier_is_vertical(const struct PointerBarrier *barrier) -+{ -+ return barrier->x1 == barrier->x2; -+} -+ -+/** -+ * @return The set of barrier movement directions the movement vector -+ * x1/y1 → x2/y2 represents. -+ */ -+int -+barrier_get_direction(int x1, int y1, int x2, int y2) -+{ -+ int direction = 0; -+ -+ /* which way are we trying to go */ -+ if (x2 > x1) -+ direction |= BarrierPositiveX; -+ if (x2 < x1) -+ direction |= BarrierNegativeX; -+ if (y2 > y1) -+ direction |= BarrierPositiveY; -+ if (y2 < y1) -+ direction |= BarrierNegativeY; -+ -+ return direction; -+} -+ -+/** -+ * Test if the barrier may block movement in the direction defined by -+ * x1/y1 → x2/y2. This function only tests whether the directions could be -+ * blocked, it does not test if the barrier actually blocks the movement. -+ * -+ * @return TRUE if the barrier blocks the direction of movement or FALSE -+ * otherwise. -+ */ -+BOOL -+barrier_is_blocking_direction(const struct PointerBarrier *barrier, int direction) -+{ -+ /* Barriers define which way is ok, not which way is blocking */ -+ return (barrier->directions & direction) != direction; -+} -+ -+/** -+ * Test if the movement vector x1/y1 → x2/y2 is intersecting with the -+ * barrier. A movement vector with the startpoint or endpoint on the barrier -+ * itself counts as intersecting. -+ * -+ * @param x1 X start coordinate of movement vector -+ * @param y1 Y start coordinate of movement vector -+ * @param x2 X end coordinate of movement vector -+ * @param y2 Y end coordinate of movement vector -+ * @param[out] distance The distance between the start point and the -+ * intersection with the barrier (if applicable). -+ * @return TRUE if the barrier intersects with the given vector -+ */ -+BOOL -+barrier_is_blocking(const struct PointerBarrier *barrier, -+ int x1, int y1, int x2, int y2, -+ double *distance) -+{ -+ BOOL rc = FALSE; -+ float ua, ub, ud; -+ int dir = barrier_get_direction(x1, y1, x2, y2); -+ -+ /* Algorithm below doesn't handle edge cases well, hence the extra -+ * checks. */ -+ if (barrier_is_vertical(barrier)) { -+ /* handle immediate barrier adjacency, moving away */ -+ if (dir & BarrierPositiveX && x1 == barrier->x1) -+ return FALSE; -+ if (dir & BarrierNegativeX && x1 == (barrier->x1 - 1)) -+ return FALSE; -+ /* startpoint on barrier */ -+ if (x1 == barrier->x1 && y1 >= barrier->y1 && y1 <= barrier->y2) { -+ *distance = 0; -+ return TRUE; -+ } -+ /* endpoint on barrier */ -+ if (x2 == barrier->x1 && y2 >= barrier->y1 && y2 <= barrier->y2) { -+ *distance = abs(x2 - x1); -+ return TRUE; -+ } -+ } else { -+ /* handle immediate barrier adjacency, moving away */ -+ if (dir & BarrierPositiveY && y1 == barrier->y1) -+ return FALSE; -+ if (dir & BarrierNegativeY && y1 == (barrier->y1 - 1)) -+ return FALSE; -+ /* startpoint on barrier */ -+ if (y1 == barrier->y1 && x1 >= barrier->x1 && x1 <= barrier->x2) { -+ *distance = 0; -+ return TRUE; -+ } -+ /* endpoint on barrier */ -+ if (y2 == barrier->y1 && x2 >= barrier->x1 && x2 <= barrier->x2) { -+ *distance = abs(y2 - y1); -+ return TRUE; -+ } -+ } -+ -+ /* not an edge case, compute distance */ -+ ua = 0; -+ ud = (barrier->y2 - barrier->y1) * (x2 - x1) - (barrier->x2 - barrier->x1) * (y2 - y1); -+ if (ud != 0) { -+ ua = ((barrier->x2 - barrier->x1) * (y1 - barrier->y1) - -+ (barrier->y2 - barrier->y1) * (x1 - barrier->x1)) / ud; -+ ub = ((x2 - x1) * (y1 - barrier->y1) - -+ (y2 - y1) * (x1 - barrier->x1)) / ud; -+ if (ua < 0 || ua > 1 || ub < 0 || ub > 1) -+ ua = 0; -+ } -+ -+ if (ua > 0 && ua <= 1) -+ { -+ double ix = barrier->x1 + ua * (barrier->x2 - barrier->x1); -+ double iy = barrier->y1 + ua * (barrier->y2 - barrier->y1); -+ -+ *distance = sqrt(pow(x1 - ix, 2) + pow(y1 - iy, 2)); -+ rc = TRUE; -+ } -+ -+ return rc; -+} -+ -+/** -+ * Find the nearest barrier that is blocking movement from x1/y1 to x2/y2. -+ * -+ * @param dir Only barriers blocking movement in direction dir are checked -+ * @param x1 X start coordinate of movement vector -+ * @param y1 Y start coordinate of movement vector -+ * @param x2 X end coordinate of movement vector -+ * @param y2 Y end coordinate of movement vector -+ * @return The barrier nearest to the movement origin that blocks this movement. -+ */ -+static struct PointerBarrier* -+barrier_find_nearest(CursorScreenPtr cs, int dir, -+ int x1, int y1, int x2, int y2) -+{ -+ struct PointerBarrierClient *c; -+ struct PointerBarrier *nearest = NULL; -+ double min_distance = INT_MAX; /* can't get higher than that in X anyway */ -+ -+ list_for_each_entry(c, &cs->barriers, entry) { -+ struct PointerBarrier *b = &c->barrier; -+ double distance; -+ -+ if (!barrier_is_blocking_direction(b, dir)) -+ continue; -+ -+ if (barrier_is_blocking(b, x1, y1, x2, y2, &distance)) -+ { -+ if (min_distance > distance) -+ { -+ min_distance = distance; -+ nearest = b; -+ } -+ } -+ } -+ -+ return nearest; -+} -+ -+/** -+ * Clamp to the given barrier given the movement direction specified in dir. -+ * -+ * @param barrier The barrier to clamp to -+ * @param dir The movement direction -+ * @param[out] x The clamped x coordinate. -+ * @param[out] y The clamped x coordinate. -+ */ -+void -+barrier_clamp_to_barrier(struct PointerBarrier *barrier, int dir, int *x, int *y) -+{ -+ if (barrier_is_vertical(barrier)) { -+ if ((dir & BarrierNegativeX) & ~barrier->directions) -+ *x = barrier->x1; -+ if ((dir & BarrierPositiveX) & ~barrier->directions) -+ *x = barrier->x1 - 1; -+ } -+ if (barrier_is_horizontal(barrier)) -+ { -+ if ((dir & BarrierNegativeY) & ~barrier->directions) -+ *y = barrier->y1; -+ if ((dir & BarrierPositiveY) & ~barrier->directions) -+ *y = barrier->y1 - 1; -+ } -+} -+ -+static void -+CursorConstrainCursorHarder(DeviceIntPtr dev, ScreenPtr screen, int mode, int *x, int *y) -+{ -+ CursorScreenPtr cs = GetCursorScreen(screen); -+ -+ if (!list_is_empty(&cs->barriers) && !IsFloating(dev) && mode == Relative) { -+ int ox, oy; -+ int dir; -+ struct PointerBarrier *nearest = NULL; -+ -+ /* where are we coming from */ -+ miPointerGetPosition(dev, &ox, &oy); -+ -+ /* How this works: -+ * Given the origin and the movement vector, get the nearest barrier -+ * to the origin that is blocking the movement. -+ * Clamp to that barrier. -+ * Then, check from the clamped position to the original -+ * destination, again finding the nearest barrier and clamping. -+ */ -+ dir = barrier_get_direction(ox, oy, *x, *y); -+ -+ nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); -+ if (nearest) { -+ barrier_clamp_to_barrier(nearest, dir, x, y); -+ -+ if (barrier_is_vertical(nearest)) { -+ dir &= ~(BarrierNegativeX | BarrierPositiveX); -+ ox = *x; -+ } else if (barrier_is_horizontal(nearest)) { -+ dir &= ~(BarrierNegativeY | BarrierPositiveY); -+ oy = *y; -+ } -+ -+ nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); -+ if (nearest) { -+ barrier_clamp_to_barrier(nearest, dir, x, y); -+ } -+ } -+ } -+ -+ if (cs->ConstrainCursorHarder) { -+ screen->ConstrainCursorHarder = cs->ConstrainCursorHarder; -+ screen->ConstrainCursorHarder(dev, screen, mode, x, y); -+ screen->ConstrainCursorHarder = CursorConstrainCursorHarder; -+ } -+} -+ -+static struct PointerBarrierClient * -+CreatePointerBarrierClient(ScreenPtr screen, ClientPtr client, -+ xXFixesCreatePointerBarrierReq *stuff) -+{ -+ CursorScreenPtr cs = GetCursorScreen(screen); -+ struct PointerBarrierClient *ret = malloc(sizeof(*ret)); -+ -+ if (ret) { -+ ret->screen = screen; -+ ret->barrier.x1 = min(stuff->x1, stuff->x2); -+ ret->barrier.x2 = max(stuff->x1, stuff->x2); -+ ret->barrier.y1 = min(stuff->y1, stuff->y2); -+ ret->barrier.y2 = max(stuff->y1, stuff->y2); -+ ret->barrier.directions = stuff->directions & 0x0f; -+ if (barrier_is_horizontal(&ret->barrier)) -+ ret->barrier.directions &= ~(BarrierPositiveX | BarrierNegativeX); -+ if (barrier_is_vertical(&ret->barrier)) -+ ret->barrier.directions &= ~(BarrierPositiveY | BarrierNegativeY); -+ list_add(&ret->entry, &cs->barriers); -+ } -+ -+ return ret; -+} -+ -+int -+ProcXFixesCreatePointerBarrier (ClientPtr client) -+{ -+ int err; -+ WindowPtr pWin; -+ struct PointerBarrierClient *barrier; -+ struct PointerBarrier b; -+ REQUEST (xXFixesCreatePointerBarrierReq); -+ -+ REQUEST_SIZE_MATCH(xXFixesCreatePointerBarrierReq); -+ LEGAL_NEW_RESOURCE(stuff->barrier, client); -+ -+ err = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess); -+ if (err != Success) { -+ client->errorValue = stuff->window; -+ return err; -+ } -+ -+ /* This sure does need fixing. */ -+ if (stuff->num_devices) -+ return BadImplementation; -+ -+ b.x1 = stuff->x1; -+ b.x2 = stuff->x2; -+ b.y1 = stuff->y1; -+ b.y2 = stuff->y2; -+ -+ if (!barrier_is_horizontal(&b) && !barrier_is_vertical(&b)) -+ return BadValue; -+ -+ /* no 0-sized barriers */ -+ if (barrier_is_horizontal(&b) && barrier_is_vertical(&b)) -+ return BadValue; -+ -+ if (!(barrier = CreatePointerBarrierClient(pWin->drawable.pScreen, -+ client, stuff))) -+ return BadAlloc; -+ -+ if (!AddResource(stuff->barrier, PointerBarrierType, &barrier->barrier)) -+ return BadAlloc; -+ -+ return Success; -+} -+ -+int -+SProcXFixesCreatePointerBarrier (ClientPtr client) -+{ -+ int n; -+ REQUEST(xXFixesCreatePointerBarrierReq); -+ -+ swaps(&stuff->length, n); -+ REQUEST_SIZE_MATCH(xXFixesCreatePointerBarrierReq); -+ swapl(&stuff->barrier, n); -+ swapl(&stuff->window, n); -+ swaps(&stuff->x1, n); -+ swaps(&stuff->y1, n); -+ swaps(&stuff->x2, n); -+ swaps(&stuff->y2, n); -+ swapl(&stuff->directions, n); -+ return ProcXFixesVector[stuff->xfixesReqType](client); -+} -+ -+static int -+CursorFreeBarrier(void *data, XID id) -+{ -+ struct PointerBarrierClient *b = NULL, *barrier; -+ ScreenPtr screen; -+ CursorScreenPtr cs; -+ -+ barrier = container_of(data, struct PointerBarrierClient, barrier); -+ screen = barrier->screen; -+ cs = GetCursorScreen(screen); -+ -+ /* find and unlink from the screen private */ -+ list_for_each_entry(b, &cs->barriers, entry) { -+ if (b == barrier) { -+ list_del(&b->entry); -+ break; -+ } -+ } -+ -+ free(barrier); -+ return Success; -+} -+ -+int -+ProcXFixesDestroyPointerBarrier (ClientPtr client) -+{ -+ int err; -+ void *barrier; -+ REQUEST (xXFixesDestroyPointerBarrierReq); -+ -+ REQUEST_SIZE_MATCH(xXFixesDestroyPointerBarrierReq); -+ -+ err = dixLookupResourceByType((void **)&barrier, stuff->barrier, -+ PointerBarrierType, client, -+ DixDestroyAccess); -+ if (err != Success) { -+ client->errorValue = stuff->barrier; -+ return err; -+ } -+ -+ FreeResource(stuff->barrier, RT_NONE); -+ return Success; -+} -+ -+int -+SProcXFixesDestroyPointerBarrier (ClientPtr client) -+{ -+ int n; -+ REQUEST(xXFixesDestroyPointerBarrierReq); -+ -+ swaps(&stuff->length, n); -+ REQUEST_SIZE_MATCH(xXFixesDestroyPointerBarrierReq); -+ swapl(&stuff->barrier, n); -+ return ProcXFixesVector[stuff->xfixesReqType](client); -+} -+ - Bool - XFixesCursorInit (void) - { -@@ -1048,8 +1449,10 @@ XFixesCursorInit (void) - cs = (CursorScreenPtr) calloc(1, sizeof (CursorScreenRec)); - if (!cs) - return FALSE; -+ list_init(&cs->barriers); - Wrap (cs, pScreen, CloseScreen, CursorCloseScreen); - Wrap (cs, pScreen, DisplayCursor, CursorDisplayCursor); -+ Wrap (cs, pScreen, ConstrainCursorHarder, CursorConstrainCursorHarder); - cs->pCursorHideCounts = NULL; - SetCursorScreen (pScreen, cs); - } -@@ -1059,7 +1462,10 @@ XFixesCursorInit (void) - "XFixesCursorHideCount"); - CursorWindowType = CreateNewResourceType(CursorFreeWindow, - "XFixesCursorWindow"); -+ PointerBarrierType = CreateNewResourceType(CursorFreeBarrier, -+ "XFixesPointerBarrier"); - -- return CursorClientType && CursorHideCountType && CursorWindowType; -+ return CursorClientType && CursorHideCountType && CursorWindowType && -+ PointerBarrierType; - } - -diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c -index e8c7bf1..a57884b 100644 ---- a/xfixes/xfixes.c -+++ b/xfixes/xfixes.c -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright 2010 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), -@@ -47,10 +48,6 @@ - - #include "xfixesint.h" - #include "protocol-versions.h" --/* -- * Must use these instead of the constants from xfixeswire.h. They advertise -- * what we implement, not what the protocol headers define. -- */ - - static unsigned char XFixesReqCode; - int XFixesEventBase; -@@ -97,11 +94,12 @@ ProcXFixesQueryVersion(ClientPtr client) - - /* Major version controls available requests */ - static const int version_requests[] = { -- X_XFixesQueryVersion, /* before client sends QueryVersion */ -- X_XFixesGetCursorImage, /* Version 1 */ -- X_XFixesChangeCursorByName, /* Version 2 */ -- X_XFixesExpandRegion, /* Version 3 */ -- X_XFixesShowCursor, /* Version 4 */ -+ X_XFixesQueryVersion, /* before client sends QueryVersion */ -+ X_XFixesGetCursorImage, /* Version 1 */ -+ X_XFixesChangeCursorByName, /* Version 2 */ -+ X_XFixesExpandRegion, /* Version 3 */ -+ X_XFixesShowCursor, /* Version 4 */ -+ X_XFixesDestroyPointerBarrier, /* Version 5 */ - }; - - #define NUM_VERSION_REQUESTS (sizeof (version_requests) / sizeof (version_requests[0])) -@@ -142,6 +140,9 @@ int (*ProcXFixesVector[XFixesNumberRequests])(ClientPtr) = { - /*************** Version 4 ****************/ - ProcXFixesHideCursor, - ProcXFixesShowCursor, -+/*************** Version 5 ****************/ -+ ProcXFixesCreatePointerBarrier, -+ ProcXFixesDestroyPointerBarrier, - }; - - static int -@@ -205,6 +206,9 @@ static int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr) = { - /*************** Version 4 ****************/ - SProcXFixesHideCursor, - SProcXFixesShowCursor, -+/*************** Version 5 ****************/ -+ SProcXFixesCreatePointerBarrier, -+ SProcXFixesDestroyPointerBarrier, - }; - - static int -@@ -260,6 +264,8 @@ XFixesExtensionInit(void) - EventSwapVector[XFixesEventBase + XFixesCursorNotify] = - (EventSwapPtr) SXFixesCursorNotifyEvent; - SetResourceTypeErrorValue(RegionResType, XFixesErrorBase + BadRegion); -+ SetResourceTypeErrorValue(PointerBarrierType, -+ XFixesErrorBase + BadBarrier); - } - } - -diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h -index 1638350..5765e64 100644 ---- a/xfixes/xfixes.h -+++ b/xfixes/xfixes.h -@@ -30,6 +30,7 @@ - #include "resource.h" - - extern _X_EXPORT RESTYPE RegionResType; -+extern _X_EXPORT RESTYPE PointerBarrierType; - extern _X_EXPORT int XFixesErrorBase; - - #define VERIFY_REGION(pRegion, rid, client, mode) \ -@@ -51,5 +52,21 @@ extern _X_EXPORT int XFixesErrorBase; - extern _X_EXPORT RegionPtr - XFixesRegionCopy (RegionPtr pRegion); - -+struct PointerBarrier { -+ CARD16 x1, x2, y1, y2; -+ CARD32 directions; -+}; -+ -+ -+extern int -+barrier_get_direction(int, int, int, int); -+extern BOOL -+barrier_is_blocking(const struct PointerBarrier*, int, int, int, int, double*); -+extern BOOL -+barrier_is_blocking_direction(const struct PointerBarrier*, int); -+extern void -+barrier_clamp_to_barrier(struct PointerBarrier *barrier, int dir, int *x, int *y); -+ -+ - - #endif /* _XFIXES_H_ */ -diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h -index d005369..6ba276e 100644 ---- a/xfixes/xfixesint.h -+++ b/xfixes/xfixesint.h -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright 2010 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), -@@ -278,6 +279,21 @@ ProcXFixesShowCursor (ClientPtr client); - int - SProcXFixesShowCursor (ClientPtr client); - -+/* Version 5 */ -+ -+int -+ProcXFixesCreatePointerBarrier (ClientPtr client); -+ -+int -+SProcXFixesCreatePointerBarrier (ClientPtr client); -+ -+int -+ProcXFixesDestroyPointerBarrier (ClientPtr client); -+ -+int -+SProcXFixesDestroyPointerBarrier (ClientPtr client); -+ -+/* Xinerama */ - extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests])(ClientPtr); - void PanoramiXFixesInit (void); - void PanoramiXFixesReset (void); --- -1.7.4 - diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/testing/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/testing/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may 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, -.\" or (at your option) any later version. -.\" -.\" This 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 with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/testing/xorg-sessreg/PKGBUILD b/testing/xorg-sessreg/PKGBUILD deleted file mode 100644 index 9b1f56573..000000000 --- a/testing/xorg-sessreg/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113683 2011-03-10 14:43:23Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-sessreg -pkgver=1.0.6 -pkgrel=2 -pkgdesc="Register X sessions in system utmp/utmpx databases" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-util-macros' 'xproto') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2) -sha1sums=('6f260f1ddc366da070a6d60301b9fb64a99c119a') - -build() { - cd "${srcdir}/sessreg-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-setxkbmap/PKGBUILD b/testing/xorg-setxkbmap/PKGBUILD deleted file mode 100644 index 2aceaead9..000000000 --- a/testing/xorg-setxkbmap/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113688 2011-03-10 14:45:16Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-setxkbmap -pkgver=1.2.0 -pkgrel=2 -pkgdesc="Set the keyboard using the X Keyboard Extension" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxkbfile') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(${url}/releases/individual/app/setxkbmap-${pkgver}.tar.bz2) -sha1sums=('860785e16313d30792fe62604f65d84281812322') - -build() { - cd "${srcdir}/setxkbmap-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-smproxy/PKGBUILD b/testing/xorg-smproxy/PKGBUILD deleted file mode 100644 index 7fd915c9c..000000000 --- a/testing/xorg-smproxy/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113698 2011-03-10 14:47:17Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-smproxy -pkgver=1.0.4 -pkgrel=2 -pkgdesc="Allows X applications that do not support X11R6 session management to participate in an X11R6 session" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libsm' 'libxt' 'libxmu') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/smproxy-${pkgver}.tar.bz2) -sha1sums=('ea9639b6d0669f157ac62b807cdba64f509b25ed') - -build() { - cd "${srcdir}/smproxy-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-twm/PKGBUILD b/testing/xorg-twm/PKGBUILD deleted file mode 100644 index 802fb69ba..000000000 --- a/testing/xorg-twm/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 113881 2011-03-10 17:47:05Z jgc $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-twm -pkgver=1.0.6 -pkgrel=2 -pkgdesc="Tab Window Manager for the X Window System" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -backup=(etc/X11/twm/system.twmrc) -license=('custom') -depends=('libxmu') -makedepends=('xorg-util-macros') -source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2) -sha1sums=('5c28194c9c620b34df56fdee140d662425ba8a86') - -build() { - cd "${srcdir}/twm-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/twm-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11/twm" - install -m644 src/system.twmrc "${pkgdir}/etc/X11/twm/" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} diff --git a/testing/xorg-x11perf/PKGBUILD b/testing/xorg-x11perf/PKGBUILD deleted file mode 100644 index 42fc8adc9..000000000 --- a/testing/xorg-x11perf/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 113703 2011-03-10 14:49:36Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-x11perf -pkgver=1.5.3 -pkgrel=2 -pkgdesc="Simple X server performance benchmarker" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxmu' 'libxrender' 'libxft' 'libxext') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/x11perf-${pkgver}.tar.bz2) -sha1sums=('2fd00ba38c36c569751bbe3d60917df2a39e10ba') - -build() { - cd "${srcdir}/x11perf-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/x11perf-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xauth/PKGBUILD b/testing/xorg-xauth/PKGBUILD deleted file mode 100644 index 26935f83f..000000000 --- a/testing/xorg-xauth/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113711 2011-03-10 14:51:46Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xauth -pkgver=1.0.5 -pkgrel=2 -pkgdesc="X.Org authorization settings program" -arch=(i686 x86_64 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('libxmu') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(${url}/releases/individual/app/xauth-${pkgver}.tar.bz2) -sha1sums=('6d94b5822e8ce08630a8ff510230246d5ed45290') - -build() { - cd "${srcdir}/xauth-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xbacklight/PKGBUILD b/testing/xorg-xbacklight/PKGBUILD deleted file mode 100644 index 2b1a3c230..000000000 --- a/testing/xorg-xbacklight/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113718 2011-03-10 14:54:32Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xbacklight -pkgver=1.1.2 -pkgrel=2 -pkgdesc="RandR-based backlight control application" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxrandr' 'libx11') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xbacklight-${pkgver}.tar.bz2) -sha1sums=('e297b359ab83f3844ca5ea1c23280b2f8bb71cfd') - -build() { - cd "${srcdir}/xbacklight-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xbiff/PKGBUILD b/testing/xorg-xbiff/PKGBUILD deleted file mode 100644 index 47bd31dd8..000000000 --- a/testing/xorg-xbiff/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 108983 2011-02-05 10:35:36Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xbiff -pkgver=1.0.3 -pkgrel=1 -pkgdesc="Watch mailboxes for new message delivery" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'libxext') -makedepends=('xorg-util-macros' 'xbitmaps') -source=(http://xorg.freedesktop.org/archive/individual/app/xbiff-${pkgver}.tar.bz2) -sha1sums=('17337a951264f0f96f6d03893f9dfd9cf8f12a5a') - -build() { - cd "${srcdir}/xbiff-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/xbiff-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xcalc/PKGBUILD b/testing/xorg-xcalc/PKGBUILD deleted file mode 100644 index d4d16a8c4..000000000 --- a/testing/xorg-xcalc/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xcalc -pkgver=1.0.4.1 -pkgrel=1 -pkgdesc="Scientific calculator for X" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xcalc-${pkgver}.tar.bz2) -sha1sums=('2206fc4bf3719c43fa13a6c64a37b40607d8e5e2') - -build() { - cd "${srcdir}/xcalc-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xclipboard/PKGBUILD b/testing/xorg-xclipboard/PKGBUILD deleted file mode 100644 index 60c4d624b..000000000 --- a/testing/xorg-xclipboard/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xclipboard -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X clipboard manager" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'libxmu' 'libxt' 'libx11') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xclipboard-${pkgver}.tar.bz2) -sha1sums=('922ddf89acd0781156e9ccdf191a3e0c6376415a') - -build() { - cd "${srcdir}/xclipboard-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xclock/PKGBUILD b/testing/xorg-xclock/PKGBUILD deleted file mode 100644 index f3d2ee24e..000000000 --- a/testing/xorg-xclock/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xclock -pkgver=1.0.5 -pkgrel=1 -pkgdesc="X clock" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxmu' 'libxaw' 'libxrender' 'libxft' 'libxkbfile') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xclock-${pkgver}.tar.bz2) -sha1sums=('1651ac8961c0aa287a6a7412ee5e6d3bfc3bb3e2') - -build() { - cd "${srcdir}/xclock-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xcmsdb/PKGBUILD b/testing/xorg-xcmsdb/PKGBUILD deleted file mode 100644 index 9687e02fb..000000000 --- a/testing/xorg-xcmsdb/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113723 2011-03-10 14:58:44Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xcmsdb -pkgver=1.0.3 -pkgrel=2 -pkgdesc="Device Color Characterization utility for X Color Management System" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xcmsdb-${pkgver}.tar.bz2) -sha1sums=('14df39b4d5518f551302c210131dcc5bac03f3ff') - -build() { - cd "${srcdir}/xcmsdb-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xconsole/PKGBUILD b/testing/xorg-xconsole/PKGBUILD deleted file mode 100644 index 1ecc9eeac..000000000 --- a/testing/xorg-xconsole/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xconsole -pkgver=1.0.4 -pkgrel=1 -pkgdesc="Monitor system console messages with X" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'libxmu' 'libxt' 'libx11') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xconsole-${pkgver}.tar.bz2) -sha1sums=('195299d4948ba4c62e961ddd0bd4572283244715') - -build() { - cd "${srcdir}/xconsole-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xcursorgen/PKGBUILD b/testing/xorg-xcursorgen/PKGBUILD deleted file mode 100644 index 31e374a1d..000000000 --- a/testing/xorg-xcursorgen/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113731 2011-03-10 15:00:48Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xcursorgen -pkgver=1.0.4 -pkgrel=2 -pkgdesc="Create an X cursor file from PNG images" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxcursor' 'libpng') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xcursorgen-${pkgver}.tar.bz2) -sha1sums=('244c180aae8cc07175b93f314d5bbbf24171658a') - -build() { - cd "${srcdir}/xcursorgen-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xdm/LICENSE b/testing/xorg-xdm/LICENSE deleted file mode 100644 index 5f8d6fcc0..000000000 --- a/testing/xorg-xdm/LICENSE +++ /dev/null @@ -1,132 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/app/ - -Copyright 1988, 1989, 1990, 1991, 1994, 1998 -The Open Group -Copyright 2002 Sun Microsystems, Inc. All rights reserved. - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - -prngc.c: -Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. -Copyright (c) 2001-2002 Damien Miller. 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. - -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. - -dm_socket.h, dm_error.h, dm_auth.h -Copyright 1998 by Thomas E. Dickey <dickey@clark.net> - - All Rights Reserved - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name(s) of the above copyright -holders shall not be used in advertising or otherwise to promote the -sale, use or other dealings in this Software without prior written -authorization. - -genauth.c: -Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. 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, and the entire permission notice in its entirety, - including the disclaimer of warranties. -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 author may not be used to endorse or promote - products derived from this software without specific prior - written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF -WHICH ARE HEREBY 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 NOT ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. - -Makefile.am -Copyright 2005 Red Hat, Inc. - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of Red Hat not be used in -advertising or publicity pertaining to distribution of the software without -specific, written prior permission. Red Hat makes no -representations about the suitability of this software for any purpose. It -is provided "as is" without express or implied warranty. - -RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. diff --git a/testing/xorg-xdm/PKGBUILD b/testing/xorg-xdm/PKGBUILD deleted file mode 100644 index ddce2fa0a..000000000 --- a/testing/xorg-xdm/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 105533 2011-01-10 11:03:46Z jgc $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -pkgname=xorg-xdm -pkgver=1.1.10 -pkgrel=2 -pkgdesc="X Display Manager" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft') -makedepends=('pkgconfig') -backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession) -options=('!libtool') -source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2 - Xsession-loginshell.patch - Xsession-xsm.patch - xdm.pam) -md5sums=('329383040cdbda5b5c8ce6c7e1120c97' - '234ae568e7b22cbc09433bb396ff3d80' - '2c30078c50bc653d72eb5114506eb313' - '419d6289ba6f851135f5c70c0e3cbec4') - -build() { - cd "${srcdir}/xdm-${pkgver}" - patch -Np0 -i "${srcdir}/Xsession-loginshell.patch" - patch -Np1 -i "${srcdir}/Xsession-xsm.patch" - ./configure --prefix=/usr \ - --disable-xdm-auth \ - --disable-static \ - --with-xdmconfigdir=/etc/X11/xdm \ - --with-xdmscriptdir=/etc/X11/xdm \ - --with-pixmapdir=/usr/share/xdm/pixmaps - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/var/lib/xdm" - install -m755 -d "${pkgdir}/etc/pam.d" - install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/* -} diff --git a/testing/xorg-xdm/Xsession-loginshell.patch b/testing/xorg-xdm/Xsession-loginshell.patch deleted file mode 100644 index 3710752ef..000000000 --- a/testing/xorg-xdm/Xsession-loginshell.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- config/Xsession.cpp.orig 2008-06-21 13:57:36.000000000 +0000 -+++ config/Xsession.cpp 2008-06-21 14:01:25.000000000 +0000 -@@ -56,11 +56,7 @@ - resources=$HOME/.Xresources - - if [ -s "$startup" ]; then -- if [ -x "$startup" ]; then -- exec "$startup" -- else -- exec /bin/sh "$startup" -- fi -+ exec /bin/sh -ls -c "$startup" - else - if [ -r "$resources" ]; then - BINDIR/xrdb -load "$resources" diff --git a/testing/xorg-xdm/Xsession-xsm.patch b/testing/xorg-xdm/Xsession-xsm.patch deleted file mode 100644 index a2d4d6cc6..000000000 --- a/testing/xorg-xdm/Xsession-xsm.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp ---- xdm-1.1.8-orig/config/Xsession.cpp 2008-05-21 14:08:45.000000000 -0400 -+++ xdm-1.1.8/config/Xsession.cpp 2009-04-28 02:56:11.000000000 -0400 -@@ -54,6 +54,7 @@ - - startup=$HOME/.xsession - resources=$HOME/.Xresources -+xinitrc=$HOME/.xinitrc - - if [ -s "$startup" ]; then - if [ -x "$startup" ]; then -@@ -83,5 +84,9 @@ - exec `eval $XDESKTOP` - } - #endif -- exec BINDIR/xsm -+ if [ -r "$xinitrc" ]; then -+ exec /bin/sh -ls -c "$xinitrc" -+ else -+ exec /bin/sh -l /etc/X11/xinit/xinitrc -+ fi - fi diff --git a/testing/xorg-xdm/xdm.pam b/testing/xorg-xdm/xdm.pam deleted file mode 100644 index 862b83fa2..000000000 --- a/testing/xorg-xdm/xdm.pam +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so diff --git a/testing/xorg-xdpyinfo/PKGBUILD b/testing/xorg-xdpyinfo/PKGBUILD deleted file mode 100644 index 084e22b54..000000000 --- a/testing/xorg-xdpyinfo/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113736 2011-03-10 15:06:24Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xdpyinfo -pkgver=1.2.0 -pkgrel=2 -pkgdesc="Display information utility for X" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'libxcomposite' 'libxinerama' 'libdmx') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2) -sha1sums=('5d53cd31afd40bdc4575b5347f2cda67f135f5f2') - -build() { - cd "${srcdir}/xdpyinfo-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xdriinfo/PKGBUILD b/testing/xorg-xdriinfo/PKGBUILD deleted file mode 100644 index f247c07ee..000000000 --- a/testing/xorg-xdriinfo/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113746 2011-03-10 15:15:21Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xdriinfo -pkgver=1.0.4 -pkgrel=2 -pkgdesc="Query configuration information of DRI drivers" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libgl') -makedepends=('xorg-util-macros' 'glproto' 'mesa') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xdriinfo-${pkgver}.tar.bz2) -sha1sums=('723482b3fc627d7cc6124fec43dd1c21d102daaa') - -build() { - cd "${srcdir}/xdriinfo-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xedit/PKGBUILD b/testing/xorg-xedit/PKGBUILD deleted file mode 100644 index d9f9d49d7..000000000 --- a/testing/xorg-xedit/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xedit -pkgver=1.2.0 -pkgrel=1 -pkgdesc="Simple text editor for X" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'libxmu' 'libxt' 'libx11') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xedit-${pkgver}.tar.bz2) -sha1sums=('e6f8735d09c9da67bba3cd3c39f34f5d1fc79a70') - -build() { - cd "${srcdir}/xedit-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xev/PKGBUILD b/testing/xorg-xev/PKGBUILD deleted file mode 100644 index 7e981106a..000000000 --- a/testing/xorg-xev/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113751 2011-03-10 15:22:05Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xev -pkgver=1.1.0 -pkgrel=2 -pkgdesc="Print contents of X events" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xev-${pkgver}.tar.bz2) -sha1sums=('77dcbdaa2046db56f31936f921843bd05df2255f') - -build() { - cd "${srcdir}/xev-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xeyes/PKGBUILD b/testing/xorg-xeyes/PKGBUILD deleted file mode 100644 index 5c18175bb..000000000 --- a/testing/xorg-xeyes/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xeyes -pkgver=1.1.1 -pkgrel=1 -pkgdesc="Follow the mouse/SHAPE extension X demo" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxt' 'libxext' 'libxmu' 'libxrender') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xeyes-${pkgver}.tar.bz2) -sha1sums=('efe6116d31a7f69e4fb6038613e52b0960b9b61c') - -build() { - cd "${srcdir}/xeyes-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xfd/PKGBUILD b/testing/xorg-xfd/PKGBUILD deleted file mode 100644 index 5c4bba1c6..000000000 --- a/testing/xorg-xfd/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xfd -pkgver=1.1.0 -pkgrel=1 -pkgdesc="Displays all the characters in a font using either the X11 core protocol or libXft2" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'fontconfig' 'libxft' 'libxrender' 'libxmu') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xfd-${pkgver}.tar.bz2) -sha1sums=('9cf24f00b428bc02d8635634cdb3b7422e7d74a5') - -build() { - cd "${srcdir}/xfd-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xfontsel/PKGBUILD b/testing/xorg-xfontsel/PKGBUILD deleted file mode 100644 index 827003048..000000000 --- a/testing/xorg-xfontsel/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xfontsel -pkgver=1.0.3 -pkgrel=1 -pkgdesc="Point and click selection of X11 font names" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'libxmu' 'libxt' 'libx11') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xfontsel-${pkgver}.tar.bz2) -sha1sums=('df2eb12b90339b7091bd362b095344015ec8b6fa') - -build() { - cd "${srcdir}/xfontsel-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xfs/PKGBUILD b/testing/xorg-xfs/PKGBUILD deleted file mode 100644 index cb7244db9..000000000 --- a/testing/xorg-xfs/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 108976 2011-02-05 10:30:46Z andyrtr $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xfs -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X.Org X11 xfs font server" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -backup=('etc/X11/fs/config') -depends=('xorg-font-utils' 'libxfont>=1.4.0' 'libfs>=1.0.2' 'libx11>=1.2.2') -makedepends=('pkgconfig' 'xtrans') -source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2 - ${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2 - ${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2 - ${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2 - ${url}/releases/individual/app/showfont-1.0.3.tar.bz2 - xfs.rc) -md5sums=('e02c6cae689c082b8c98a421df8f8670' - 'aae6fa48b5c2ce9186a5ff4ccc14a1d4' - '9b50d967ac6d4bae9bffb62a5e527a50' - 'fc1f42aac16d6b76c79a1a3a0fb6a53b' - '50b466ab6ed4a5b8df5abf1ef844309a' - '251f5447f64151e9bb096ebc9f999c3f') - -build() { - cd "${srcdir}" - pushd xfs-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc - make configdir=/etc/X11/fs - popd - - for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do - if [ -d "${i}" ]; then - pushd "${i}" - ./configure --prefix=/usr - make - popd - fi - done -} - -package() { - cd "${srcdir}" - pushd xfs-${pkgver} - make configdir=/etc/X11/fs DESTDIR="${pkgdir}" install - sed -i -e 's|/lib/X11/|/share/|g' "${pkgdir}/etc/X11/fs/config" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs" - popd - - for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do - if [ -d "${i}" ]; then - pushd "${i}" - make DESTDIR="${pkgdir}" install - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}" - popd - fi - done - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/xfs.rc" "${pkgdir}/etc/rc.d/xfs" -} diff --git a/testing/xorg-xfs/xfs.rc b/testing/xorg-xfs/xfs.rc deleted file mode 100644 index caac86106..000000000 --- a/testing/xorg-xfs/xfs.rc +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/xfs` -case "$1" in - start) - stat_busy "Starting X.Org fontserver" - if [ -z "$PID" ]; then - /usr/bin/xfs -daemon &> /dev/null - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon xfs - stat_done - fi - ;; - stop) - stat_busy "Stopping X.Org fontserver" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon xfs - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading X.Org fontserver configuration" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac diff --git a/testing/xorg-xgamma/PKGBUILD b/testing/xorg-xgamma/PKGBUILD deleted file mode 100644 index fd9a43f7c..000000000 --- a/testing/xorg-xgamma/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113756 2011-03-10 15:23:53Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xgamma -pkgver=1.0.4 -pkgrel=2 -pkgdesc="Alter a monitor's gamma correction" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxxf86vm') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xgamma-${pkgver}.tar.bz2) -sha1sums=('c4124b42618c6d4bc9eb9690348b5d60e4c9daed') - -build() { - cd "${srcdir}/xgamma-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xhost/PKGBUILD b/testing/xorg-xhost/PKGBUILD deleted file mode 100644 index 82519eab8..000000000 --- a/testing/xorg-xhost/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113761 2011-03-10 15:26:14Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xhost -pkgver=1.0.4 -pkgrel=2 -pkgdesc="Server access control program for X" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxmu') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xhost-${pkgver}.tar.bz2) -sha1sums=('b4fde9899861f1a97395f8c7197db00cc44242a7') - -build() { - cd "${srcdir}/xhost-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff b/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff deleted file mode 100644 index 99e8a6754..000000000 --- a/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff +++ /dev/null @@ -1,20 +0,0 @@ -Move startx auth files in /tmp so they are removed on reboot. -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736 -The trap patch didn't seem to work on reboot. ---- - startx.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: xinit/startx.cpp -=================================================================== ---- xinit.orig/startx.cpp -+++ xinit/startx.cpp -@@ -273,7 +273,7 @@ - dummy=0 - - XCOMM create a file with auth information for the server. ':0' is a dummy. -- xserverauthfile=$HOME/.serverauth.$$ -+ xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX` - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM - xauth -q -f "$xserverauthfile" << EOF - add :$dummy . $mcookie diff --git a/testing/xorg-xinit/PKGBUILD b/testing/xorg-xinit/PKGBUILD deleted file mode 100644 index 4fb60183c..000000000 --- a/testing/xorg-xinit/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 113891 2011-03-10 19:11:37Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xorg-xinit -pkgver=1.3.0 -pkgrel=3 -pkgdesc="X.Org initialisation program " -arch=(i686 x86_64 'mips64el') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('libx11' 'xorg-xauth') -makedepends=('xorg-util-macros') -optdepends=('xorg-twm' 'xterm') -backup=('etc/skel/.xinitrc' - 'etc/skel/.xsession' - 'etc/X11/xinit/xserverrc' - 'etc/X11/xinit/xinitrc') -source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 - 06_move_serverauthfile_into_tmp.diff - xinitrc - xsession - xserverrc) -options=(!emptydirs) -md5sums=('bc4e8b7d1919597cc37a0d24aa149dda' - 'abd072ec435ce084cf4e89c58f83d45c' - 'c7b406c3c5c1e8011b3ac7d6b29c1a2c' - '7873d97db30d6c279ed37e3559e7c59d' - 'c5baef10fdb7239594daee72a94ddab3') - -build() { - cd "${srcdir}/xinit-${pkgver}" - patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff" - sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp - ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit - make -} - -package() { - cd "${srcdir}/xinit-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/skel" - install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc" - install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession" - install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xinit/xinitrc b/testing/xorg-xinit/xinitrc deleted file mode 100644 index dbd080d00..000000000 --- a/testing/xorg-xinit/xinitrc +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) - -if [ -d /etc/X11/xinit/xinitrc.d ]; then - for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -# exec gnome-session -# exec startkde -# exec startxfce4 -# ...or the Window Manager of your choice diff --git a/testing/xorg-xinit/xserverrc b/testing/xorg-xinit/xserverrc deleted file mode 100644 index 6f746cdce..000000000 --- a/testing/xorg-xinit/xserverrc +++ /dev/null @@ -1 +0,0 @@ -exec /usr/bin/X -nolisten tcp "$@" diff --git a/testing/xorg-xinit/xsession b/testing/xorg-xinit/xsession deleted file mode 100644 index a16dc0b84..000000000 --- a/testing/xorg-xinit/xsession +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -/bin/bash --login -i ~/.xinitrc - diff --git a/testing/xorg-xinput/PKGBUILD b/testing/xorg-xinput/PKGBUILD deleted file mode 100644 index a7afa3c17..000000000 --- a/testing/xorg-xinput/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113766 2011-03-10 15:27:48Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xinput -pkgver=1.5.3 -pkgrel=2 -pkgdesc="Small commandline tool to configure devices" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxi') -makedepends=('xorg-util-macros' 'inputproto') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xinput-${pkgver}.tar.bz2) -sha1sums=('70f258279acaa45fb77820ae3f8c2bee9f2d2235') - -build() { - cd "${srcdir}/xinput-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xkbcomp/PKGBUILD b/testing/xorg-xkbcomp/PKGBUILD deleted file mode 100644 index 10d77df9d..000000000 --- a/testing/xorg-xkbcomp/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113771 2011-03-10 15:39:50Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xkbcomp -pkgver=1.2.1 -pkgrel=2 -pkgdesc="X Keyboard description compiler" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxkbfile') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(${url}/releases/individual/app/xkbcomp-${pkgver}.tar.bz2) -sha1sums=('02d7e7b67a6ef3035f92f9e541252bf85e3f0385') - -build() { - cd "${srcdir}/xkbcomp-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xkbevd/PKGBUILD b/testing/xorg-xkbevd/PKGBUILD deleted file mode 100644 index e95a0944d..000000000 --- a/testing/xorg-xkbevd/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113776 2011-03-10 15:41:46Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xkbevd -pkgver=1.1.2 -pkgrel=2 -pkgdesc="XKB event daemon" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxkbfile') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(${url}/releases/individual/app/xkbevd-${pkgver}.tar.bz2) -sha1sums=('f7d4eb5485c2b450266e4e467106f4d8560f4edd') - -build() { - cd "${srcdir}/xkbevd-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xkbutils/PKGBUILD b/testing/xorg-xkbutils/PKGBUILD deleted file mode 100644 index 81e2c9050..000000000 --- a/testing/xorg-xkbutils/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113779 2011-03-10 15:42:12Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xkbutils -pkgver=1.0.3 -pkgrel=2 -pkgdesc="XKB utility demos" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'libxt' 'libx11') -makedepends=('xorg-util-macros' 'xproto' 'inputproto') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xkbutils-${pkgver}.tar.bz2) -sha1sums=('e5a2619b9449f95e02b520b492de0575bc4551d6') - -build() { - cd "${srcdir}/xkbutils-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xkill/PKGBUILD b/testing/xorg-xkill/PKGBUILD deleted file mode 100644 index a2b3f1580..000000000 --- a/testing/xorg-xkill/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113786 2011-03-10 15:44:09Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xkill -pkgver=1.0.3 -pkgrel=2 -pkgdesc="Kill a client by its X resource" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxmu') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xkill-${pkgver}.tar.bz2) -sha1sums=('bab7b9c7f3bc053d743eb339cf5fa496bace57e5') - -build() { - cd "${srcdir}/xkill-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xload/PKGBUILD b/testing/xorg-xload/PKGBUILD deleted file mode 100644 index 1451a91a0..000000000 --- a/testing/xorg-xload/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xload -pkgver=1.1.0 -pkgrel=1 -pkgdesc="System load average display for X" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'libxmu' 'libxt' 'libx11') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xload-${pkgver}.tar.bz2) -sha1sums=('dcad93d769b0614466f1e48fed5dd956349cfcfb') - -build() { - cd "${srcdir}/xload-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xlogo/PKGBUILD b/testing/xorg-xlogo/PKGBUILD deleted file mode 100644 index 56fbc99e2..000000000 --- a/testing/xorg-xlogo/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xlogo -pkgver=1.0.3 -pkgrel=1 -pkgdesc="Draw [old] X logo" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libsm' 'libxaw' 'libxmu' 'libxt' 'libxext' 'libx11' 'libxrender' 'libxft') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xlogo-${pkgver}.tar.bz2) -sha1sums=('5016e74ba16ac80f3eac1c97738a6afbfc8b3bdd') - -build() { - cd "${srcdir}/xlogo-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xlsatoms/PKGBUILD b/testing/xorg-xlsatoms/PKGBUILD deleted file mode 100644 index 9a7f32f6e..000000000 --- a/testing/xorg-xlsatoms/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113790 2011-03-10 15:44:47Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xlsatoms -pkgver=1.1.0 -pkgrel=2 -pkgdesc="List interned atoms defined on server" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxcb') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xlsatoms-${pkgver}.tar.bz2) -sha1sums=('2982df6844d60cd12a09208808ab6baa767fe35f') - -build() { - cd "${srcdir}/xlsatoms-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xlsclients/PKGBUILD b/testing/xorg-xlsclients/PKGBUILD deleted file mode 100644 index 46ecd019c..000000000 --- a/testing/xorg-xlsclients/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113796 2011-03-10 15:46:24Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xlsclients -pkgver=1.1.1 -pkgrel=2 -pkgdesc="List client applications running on a display" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxcb' 'xcb-util') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xlsclients-${pkgver}.tar.bz2) -sha1sums=('67bfdcb089e8669df7ec5bc7a137e037047f2535') - -build() { - cd "${srcdir}/xlsclients-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xmag/PKGBUILD b/testing/xorg-xmag/PKGBUILD deleted file mode 100644 index 4e3728a34..000000000 --- a/testing/xorg-xmag/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xmag -pkgver=1.0.4 -pkgrel=1 -pkgdesc="Magnify parts of the screen" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'libxmu' 'libxt' 'libx11') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xmag-${pkgver}.tar.bz2) -sha1sums=('95695d4d4a731e5deb4196a0cc6d04ecaba023fe') - -build() { - cd "${srcdir}/xmag-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xman/PKGBUILD b/testing/xorg-xman/PKGBUILD deleted file mode 100644 index 49e9fd5db..000000000 --- a/testing/xorg-xman/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xman -pkgver=1.1.1 -pkgrel=1 -pkgdesc="Unix manual page viewer" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw' 'libxt') -makedepends=('xorg-util-macros' 'xproto' 'libxmu') -source=(http://xorg.freedesktop.org/archive/individual/app/xman-${pkgver}.tar.bz2) -sha1sums=('c8e1170e837da4bc280ee907030b3f9245608ef2') - -build() { - cd "${srcdir}/xman-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xmessage/PKGBUILD b/testing/xorg-xmessage/PKGBUILD deleted file mode 100644 index 82c3fe420..000000000 --- a/testing/xorg-xmessage/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xmessage -pkgver=1.0.3 -pkgrel=1 -pkgdesc="Display a message or query in a window" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxaw') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xmessage-${pkgver}.tar.bz2) -sha1sums=('a8bfefbbe7785fa0e58ed4f596f4d79ba0b4d9b2') - -build() { - cd "${srcdir}/xmessage-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xmodmap/PKGBUILD b/testing/xorg-xmodmap/PKGBUILD deleted file mode 100644 index 92942a1e3..000000000 --- a/testing/xorg-xmodmap/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113801 2011-03-10 15:47:06Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xmodmap -pkgver=1.0.5 -pkgrel=2 -pkgdesc="Utility for modifying keymaps and button mappings" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xmodmap-${pkgver}.tar.bz2) -sha1sums=('c97fb42f40b094868f6ef445f25c600f326b1942') - -build() { - cd "${srcdir}/xmodmap-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xpr/PKGBUILD b/testing/xorg-xpr/PKGBUILD deleted file mode 100644 index 6bd56b68f..000000000 --- a/testing/xorg-xpr/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 113806 2011-03-10 15:48:32Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xpr -pkgver=1.0.3 -pkgrel=2 -pkgdesc="Print an X window dump from xwd" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxmu') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xpr-${pkgver}.tar.bz2 - copyright.patch) -sha1sums=('9dbd0ff136b612285e00d92d0c7675a4207b1c4a' - 'd2649781330400b83cf3553d9cfd6e02dd93a2bd') - -build() { - cd "${srcdir}/xpr-${pkgver}" - patch -Np1 -i "${srcdir}/copyright.patch" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xpr/copyright.patch b/testing/xorg-xpr/copyright.patch deleted file mode 100644 index 18e718246..000000000 --- a/testing/xorg-xpr/copyright.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 11569289123fb178e23fd1aa284e9fa10e6c1e8c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri, 06 Aug 2010 22:09:48 +0000 -Subject: Fill in COPYING file with copyright notices from source code - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -diff --git a/COPYING b/COPYING -index 7f33cbf..0f9d8e0 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,53 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. - --Please submit updated COPYING files to the Xorg bugzilla: -+Copyright (c) 1985, 1988 X Consortium - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -+Permission is hereby granted, free of charge, to any person obtaining -+a copy of this software and associated documentation files (the -+"Software"), to deal in the Software without restriction, including -+without limitation the rights to use, copy, modify, merge, publish, -+distribute, sublicense, and/or sell copies of the Software, and to -+permit persons to whom the Software is furnished to do so, subject to -+the following conditions: - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+The above copyright notice and this permission notice shall be included -+in all copies or substantial portions of the Software. - --http://lists.freedesktop.org/mailman/listinfo/xorg -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR -+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+OTHER DEALINGS IN THE SOFTWARE. -+ -+Except as contained in this notice, the name of the X Consortium shall -+not be used in advertising or otherwise to promote the sale, use or -+other dealings in this Software without prior written authorization -+from the X Consortium. -+ -+Copyright 1986 by Marvin Solomon and the University of Wisconsin -+ -+Permission to use, copy, modify, and distribute this -+software and its documentation for any purpose and without -+fee is hereby granted, provided that the above copyright -+notice appear in all copies and that both that copyright -+notice and this permission notice appear in supporting -+documentation, and that the names of Marvin Solomon and -+the University of Wisconsin not be used in -+advertising or publicity pertaining to distribution of the -+software without specific, written prior permission. -+Neither Marvin Solomon nor the University of Wisconsin -+makes any representations about the suitability of -+this software for any purpose. It is provided "as is" -+without express or implied warranty. -+ -+Copyright (c) 1988 by Hewlett-Packard Company -+ -+Permission to use, copy, modify, and distribute this software -+and its documentation for any purpose and without fee is hereby -+granted, provided that the above copyright notice appear in all -+copies and that both that copyright notice and this permission -+notice appear in supporting documentation, and that -+Hewlett-Packard not be used in advertising or publicity -+pertaining to distribution of the software without specific, written -+prior permission. --- -cgit v0.8.3-6-g21f6 diff --git a/testing/xorg-xprop/PKGBUILD b/testing/xorg-xprop/PKGBUILD deleted file mode 100644 index 6864ab180..000000000 --- a/testing/xorg-xprop/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113811 2011-03-10 15:49:11Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xprop -pkgver=1.2.0 -pkgrel=2 -pkgdesc="Property displayer for X" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xprop-${pkgver}.tar.bz2) -sha1sums=('278f83c5077eed1d96c180bdc0a6f22ba5279a66') - -build() { - cd "${srcdir}/xprop-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xrandr/PKGBUILD b/testing/xorg-xrandr/PKGBUILD deleted file mode 100644 index d92a05d1d..000000000 --- a/testing/xorg-xrandr/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 113816 2011-03-10 15:50:41Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xrandr -pkgver=1.3.4 -pkgrel=2 -pkgdesc="Primitive command line interface to RandR extension" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxrandr' 'libx11') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xrandr-${pkgver}.tar.bz2) -sha1sums=('637949501b8a45d32d9cab809e8822ee45b69414') - -build() { - cd "${srcdir}/xrandr-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - rm -f "${pkgdir}/usr/bin/xkeystone" -} diff --git a/testing/xorg-xrdb/PKGBUILD b/testing/xorg-xrdb/PKGBUILD deleted file mode 100644 index 60fb89669..000000000 --- a/testing/xorg-xrdb/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 118463 2011-04-07 07:16:02Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xrdb -pkgver=1.0.9 -pkgrel=1 -pkgdesc="X server resource database utility" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxmu' 'mcpp') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2) -sha1sums=('efa5f2420411988d6a6e142934393fd272507857') - -build() { - cd "${srcdir}/xrdb-${pkgver}" - ./configure --prefix=/usr --with-cpp=/usr/bin/mcpp - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xrefresh/PKGBUILD b/testing/xorg-xrefresh/PKGBUILD deleted file mode 100644 index de950df12..000000000 --- a/testing/xorg-xrefresh/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113826 2011-03-10 15:53:23Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xrefresh -pkgver=1.0.4 -pkgrel=2 -pkgdesc="Refresh all or part of an X screen" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xrefresh-${pkgver}.tar.bz2) -sha1sums=('5e85ee14ea9a357c1d4372bbc068a8d452a134aa') - -build() { - cd "${srcdir}/xrefresh-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xset/PKGBUILD b/testing/xorg-xset/PKGBUILD deleted file mode 100644 index caebe0d8f..000000000 --- a/testing/xorg-xset/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113831 2011-03-10 15:57:21Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xset -pkgver=1.2.1 -pkgrel=2 -pkgdesc="User preference utility for X" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxmu') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xset-${pkgver}.tar.bz2) -sha1sums=('9b1eb8835637dd70eea1a1365df5d909a306cc2c') - -build() { - cd "${srcdir}/xset-${pkgver}" - ./configure --prefix=/usr --without-fontcache --without-xf86misc - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xsetroot/PKGBUILD b/testing/xorg-xsetroot/PKGBUILD deleted file mode 100644 index 3758d9c6a..000000000 --- a/testing/xorg-xsetroot/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113846 2011-03-10 16:01:58Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xsetroot -pkgver=1.1.0 -pkgrel=2 -pkgdesc="Classic X utility to set your root window background to a given pattern or color" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxmu' 'libx11' 'libxcursor') -makedepends=('xorg-util-macros' 'xbitmaps') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xsetroot-${pkgver}.tar.bz2) -sha1sums=('1ef9ddd80c7013dc6d33e5c421537eb8b0427da4') - -build() { - cd "${srcdir}/xsetroot-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xvidtune/PKGBUILD b/testing/xorg-xvidtune/PKGBUILD deleted file mode 100644 index e7426b638..000000000 --- a/testing/xorg-xvidtune/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xvidtune -pkgver=1.0.2 -pkgrel=1 -pkgdesc="Video mode tuner for Xorg" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxxf86vm' 'libxt' 'libxaw' 'libxmu' 'libx11') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xvidtune-${pkgver}.tar.bz2) -sha1sums=('2f3f821943018c07efd4547afa4313ac92718b1e') - -build() { - cd "${srcdir}/xvidtune-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xvinfo/PKGBUILD b/testing/xorg-xvinfo/PKGBUILD deleted file mode 100644 index 4684113fb..000000000 --- a/testing/xorg-xvinfo/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113836 2011-03-10 15:58:02Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xvinfo -pkgver=1.1.1 -pkgrel=2 -pkgdesc="Prints out the capabilities of any video adaptors associated with the display that are accessible through the X-Video extension" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11' 'libxv') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xvinfo-${pkgver}.tar.bz2) -sha1sums=('dc326464748fa608da50386112a89024804c1910') - -build() { - cd "${srcdir}/xvinfo-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xwd/PKGBUILD b/testing/xorg-xwd/PKGBUILD deleted file mode 100644 index a4de8a9f1..000000000 --- a/testing/xorg-xwd/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113841 2011-03-10 16:01:03Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xwd -pkgver=1.0.4 -pkgrel=2 -pkgdesc="X Window System image dumping utility" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xwd-${pkgver}.tar.bz2) -sha1sums=('4ef4fd9072a507e9a1ee88ba1d28b314006cc109') - -build() { - cd "${srcdir}/xwd-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xwininfo/PKGBUILD b/testing/xorg-xwininfo/PKGBUILD deleted file mode 100644 index 8f17bce09..000000000 --- a/testing/xorg-xwininfo/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113851 2011-03-10 16:03:22Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xwininfo -pkgver=1.1.1 -pkgrel=2 -pkgdesc="Command-line utility to print information about windows on an X server" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libxcb') -makedepends=('xorg-util-macros' 'libx11') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xwininfo-${pkgver}.tar.bz2) -sha1sums=('945e5d51632876e304e001003c8068f34ffe299e') - -build() { - cd "${srcdir}/xwininfo-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xorg-xwud/PKGBUILD b/testing/xorg-xwud/PKGBUILD deleted file mode 100644 index 5b7a4a430..000000000 --- a/testing/xorg-xwud/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 113855 2011-03-10 16:04:19Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xorg-xwud -pkgver=1.0.3 -pkgrel=2 -pkgdesc="X Window System image undumping utility" -arch=(i686 x86_64 'mips64el') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libx11') -makedepends=('xorg-util-macros') -groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xwud-${pkgver}.tar.bz2) -sha1sums=('2e706d50c7039e3daa4963d36ab703e48aa652ed') - -build() { - cd "${srcdir}/xwud-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} |
